waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: bump rust version in nix 

- Had to move to cargo2nix/unstable;
the previous release topped out at 1.61.0,
but dependency `clap_lex v0.3.2` requires >= 1.64.0
This commit is contained in:
waalge 2023-03-08 11:03:50 +00:00
parent 95997822dc
commit e8feb10505
3 changed files with 1025 additions and 1087 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2066
Cargo.nix generated vendored
View File

File diff suppressed because it is too large Load Diff

40
flake.lock generated vendored
View File

@ -8,16 +8,16 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1655189312,
"narHash": "sha256-gpJ57OgIebUpO+7F00VltxSEy6dz2x6HeJ5BcRM8rDA=",
"lastModified": 1673511833,
"narHash": "sha256-pna6AwbAQtdvdayBpCzHw6W/Dp7WM+X+481Boy5vmK8=",
"owner": "cargo2nix",
"repo": "cargo2nix",
"rev": "c149357cc3d17f2849c73eb7a09d07a307cdcfe8",
"rev": "8fb57a670f7993bfc24099c33eb9c5abb51f29a2",
"type": "github"
},
"original": {
"owner": "cargo2nix",
"ref": "release-0.11.0",
"ref": "unstable",
"repo": "cargo2nix",
"type": "github"
}
@ -28,11 +28,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1671489820,
"narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=",
"lastModified": 1677856503,
"narHash": "sha256-TW8my47VpavO/PXA5hIumUcX80cj0AufojjUTdUonLw=",
"owner": "numtide",
"repo": "devshell",
"rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634",
"rev": "643d1857fea4e71e7f251cb574f59b1d63778085",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -89,27 +89,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1654275867,
"narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=",
"lastModified": 1673493429,
"narHash": "sha256-VXxm2j2aXp24WaGp0tA2exHca2z3HwhSnHJq3yMz1wI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0",
"rev": "8547ffbfd182b323bfd523f11bbd356e9718521a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-22.05",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1643381941,
"narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
"lastModified": 1677383253,
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5",
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
"type": "github"
},
"original": {
@ -145,11 +145,11 @@
]
},
"locked": {
"lastModified": 1653878966,
"narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=",
"lastModified": 1673490397,
"narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8526d618af012a923ca116be9603e818b502a8db",
"rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6",
"type": "github"
},
"original": {

6
flake.nix
View File

@ -6,7 +6,7 @@
#
{
inputs = {
cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0";
cargo2nix.url = "github:cargo2nix/cargo2nix/unstable";
flake-utils.follows = "cargo2nix/flake-utils";
nixpkgs.follows = "cargo2nix/nixpkgs";
devshell.url = "github:numtide/devshell";
@ -23,11 +23,11 @@
system: let
pkgs = import nixpkgs {
inherit system;
overlays = [cargo2nix.overlays.default devshell.overlay];
overlays = [cargo2nix.overlays.default devshell.overlays.default];
};
rustPkgs = pkgs.rustBuilder.makePackageSet {
rustVersion = "1.61.0";
rustVersion = "1.64.0";
packageFun = import ./Cargo.nix;
};