diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-02-03 15:21:57 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-02-03 15:21:57 +0100 |
| commit | 30f16081497b3cc29de9ad02031846d14b212704 (patch) | |
| tree | ae47b51f49fda83d3410131aac1f79ae419a5832 | |
| parent | 06ad505cb5c8a4c98fdd83f67bdabea332e6689a (diff) | |
| download | garage-30f16081497b3cc29de9ad02031846d14b212704.tar.gz garage-30f16081497b3cc29de9ad02031846d14b212704.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"; }; /* @@ -70,7 +70,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 [ |