aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-10-02 13:28:40 +0200
committerAlex Auvolat <alex@adnab.me>2023-10-02 13:28:40 +0200
commitec247ec4c67afb0424bbb8e6b94749f52d804ed9 (patch)
tree7d2bb00a15368970d6bf59d7ddf523259056788d
parentf211085cd287fd781d33d0a3b1e2297078fe8bbd (diff)
downloadtricot-ec247ec4c67afb0424bbb8e6b94749f52d804ed9.tar.gz
tricot-ec247ec4c67afb0424bbb8e6b94749f52d804ed9.zip
flake.nix: update rustc
-rw-r--r--flake.lock67
-rw-r--r--flake.nix7
2 files changed, 61 insertions, 13 deletions
diff --git a/flake.lock b/flake.lock
index 4b5713d..5699221 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,8 +55,42 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
+ "lastModified": 1696234590,
+ "narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
"lastModified": 1665657542,
"narHash": "sha256-mojxNyzbvmp8NtVtxqiHGhRfjCALLfk9i/Uup68Y5q8=",
"owner": "NixOS",
@@ -74,26 +108,20 @@
"root": {
"inputs": {
"cargo2nix": "cargo2nix",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
}
},
"rust-overlay": {
"inputs": {
- "flake-utils": [
- "cargo2nix",
- "flake-utils"
- ],
- "nixpkgs": [
- "cargo2nix",
- "nixpkgs"
- ]
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1664247556,
- "narHash": "sha256-J4vazHU3609ekn7dr+3wfqPo5WGlZVAgV7jfux352L0=",
+ "lastModified": 1682389182,
+ "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "524db9c9ea7bc7743bb74cdd45b6d46ea3fcc2ab",
+ "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
"type": "github"
},
"original": {
@@ -101,6 +129,21 @@
"repo": "rust-overlay",
"type": "github"
}
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 351bd41..e3aafb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,11 @@
inputs.cargo2nix = {
# As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
+
+ # Rust overlay as of 2023-04-25
+ inputs.rust-overlay.url =
+ "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c";
+
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -15,7 +20,7 @@
overlays = [ cargo2nix.overlays.default ];
};
packageFun = import ./Cargo.nix;
- rustVersion = "1.63.0";
+ rustVersion = "1.68.0";
compile = args: compileMode:
let