From f5f8c736d067bfc5630cc34e89962b07c3d04e99 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 3 Oct 2024 17:30:24 +0200 Subject: [PATCH] build(nix): pin nightly rust pin to version before https://github.com/rust-lang-ci/rust/commit/0399709cdc3c5cc22327e9f657dc7956546a0457 https://github.com/rust-lang/rust/pull/130781 https://github.com/rust-lang/rust/issues/131206 Signed-off-by: Roman Volosatovs --- flake.lock | 14 ++++++++------ flake.nix | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 515f391..765a680 100644 --- a/flake.lock +++ b/flake.lock @@ -77,16 +77,17 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726116637, - "narHash": "sha256-tU2GhwU887mPg6C4c2k+CEBAnKY6R0tSeQYtoqjZmLM=", + "lastModified": 1727159616, + "narHash": "sha256-1VjZ+khJwZphRJZy2HvbMSCgi3OV7mu8RjVzqCxVi2k=", "owner": "nix-community", "repo": "fenix", - "rev": "96a04a213838c5001619ad57400c5a176fa040b1", + "rev": "4306d494985e00719573bbdeb863c27c6d83dc9c", "type": "github" }, "original": { "owner": "nix-community", "repo": "fenix", + "rev": "4306d494985e00719573bbdeb863c27c6d83dc9c", "type": "github" } }, @@ -456,16 +457,17 @@ ] }, "locked": { - "lastModified": 1726107922, - "narHash": "sha256-G8P6YT/U55G4YILkL/I0NaEqYYoL05Rfs7y/tI4mqqI=", + "lastModified": 1727144949, + "narHash": "sha256-uMZMjoCS2nf40TAE1686SJl3OXWfdfM+BDEfRdr+uLc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb1cf4398436a12f1f8b07da08d94fc72fcb1a69", + "rev": "2e19799819104b46019d339e78d21c14372d3666", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", + "rev": "2e19799819104b46019d339e78d21c14372d3666", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 680ee68..11a881e 100644 --- a/flake.nix +++ b/flake.nix @@ -12,13 +12,13 @@ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; - description = "Simple, yet extensible nix flake bootstrapping library for real-world projects"; + description = "Simple and extensible nix flake bootstrapping library for real-world projects"; inputs.advisory-db.flake = false; inputs.advisory-db.url = "github:rustsec/advisory-db"; inputs.crane.url = "github:ipetkov/crane/v0.17.3"; inputs.fenix.inputs.nixpkgs.follows = "nixpkgs-nixos"; - inputs.fenix.url = "github:nix-community/fenix"; + inputs.fenix.url = "github:nix-community/fenix/4306d494985e00719573bbdeb863c27c6d83dc9c"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.macos-sdk.url = "https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz"; inputs.macos-sdk.flake = false; @@ -28,7 +28,7 @@ inputs.nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; inputs.nixpkgs-nixos.url = "github:nixos/nixpkgs/nixos-24.05"; inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs-nixos"; - inputs.rust-overlay.url = "github:oxalica/rust-overlay"; + inputs.rust-overlay.url = "github:oxalica/rust-overlay/2e19799819104b46019d339e78d21c14372d3666"; outputs = inputs: let lib = import ./lib inputs;