Armael/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity

Upgrade cargo2nix

Browse source
This commit is contained in:
Quentin 2022-02-03 15:21:57 +01:00 committed by Jill
parent 3baa841d6f
commit 084dcdbd3a
Signed by untrusted user: KokaKiwi
GPG key ID: 09A5A2688F13FAC1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/common.nix
View file

@ -10,7 +10,8 @@ rec {
cargo2nixSrc = fetchGit { cargo2nixSrc = fetchGit {
# As of 2021-10-06 # As of 2021-10-06
url = "https://github.com/superboum/cargo2nix"; url = "https://github.com/superboum/cargo2nix";
rev = "1364752cd784764db2ef5b1e1248727cebfae2ce"; ref = "backward-compat";
rev = "08d963f32a774353ee8acf3f61749915875c1ec4";
}; };
/* /*

2
shell.nix
View file

@ -76,7 +76,7 @@ function refresh_toolchain {
pkgs.rustPlatform.rust.cargo pkgs.rustPlatform.rust.cargo
pkgs.clippy pkgs.clippy
pkgs.rustfmt pkgs.rustfmt
/*(pkgs.callPackage cargo2nix {}).package*/ /* cargo2nix.packages.x86_64-linux.cargo2nix */
] else []) ] else [])
++ ++
(if integration then [ (if integration then [