From 084dcdbd3aadb8eb39ca19974623ae81d76456fc Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 3 Feb 2022 15:21:57 +0100 Subject: [PATCH] Upgrade cargo2nix --- nix/common.nix | 3 ++- 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"; }; /* diff --git a/shell.nix b/shell.nix index 57e95e01..bb2030f2 100644 --- a/shell.nix +++ b/shell.nix @@ -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 [