diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-02-03 15:21:57 +0100 |
|---|---|---|
| committer | Jill <kokakiwi@deuxfleurs.fr> | 2022-02-10 17:55:50 +0100 |
| commit | 084dcdbd3aadb8eb39ca19974623ae81d76456fc (patch) | |
| tree | 89a2840519ac8ec26f64c59d474f1e1f7421c4bd | |
| parent | 3baa841d6f62a75bf74ed0c26499b447c50bf32f (diff) | |
| download | garage-084dcdbd3aadb8eb39ca19974623ae81d76456fc.tar.gz garage-084dcdbd3aadb8eb39ca19974623ae81d76456fc.zip | |
Upgrade cargo2nix
| -rw-r--r-- | nix/common.nix | 3 | ||||
| -rw-r--r-- | shell.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nix/common.nix b/nix/common.nix index eafaa088..bf14b6c6 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -10,7 +10,8 @@ rec { cargo2nixSrc = fetchGit { # As of 2021-10-06 url = "https://github.com/superboum/cargo2nix"; - rev = "1364752cd784764db2ef5b1e1248727cebfae2ce"; + ref = "backward-compat"; + rev = "08d963f32a774353ee8acf3f61749915875c1ec4"; }; /* @@ -76,7 +76,7 @@ function refresh_toolchain { pkgs.rustPlatform.rust.cargo pkgs.clippy pkgs.rustfmt - /*(pkgs.callPackage cargo2nix {}).package*/ + /* cargo2nix.packages.x86_64-linux.cargo2nix */ ] else []) ++ (if integration then [ |