KokaKiwi/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

ci/upgrade-cargo2nix #1

Merged
KokaKiwi merged 2 commits from Deuxfleurs/garage:ci/upgrade-cargo2nix into integration-tests 2022-02-04 10:50:33 +00:00
Conversation 0 Commits 2 Files changed 6 +3 -2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 30f1608149 - Show all commits

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

@ -70,7 +70,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 [