Merge pull request #248538 from figsoda/dist

cargo-dist: 0.0.7 -> 0.1.0

1 files changed, 17 insertions, 6 deletions

diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix
index 64de4b3c70d83..1c9e073ecdd7a 100644
--- a/pkgs/development/tools/rust/cargo-dist/default.nix
+++ b/pkgs/development/tools/rust/cargo-dist/default.nix
@@ -6,21 +6,23 @@
 , xz
 , zstd
 , stdenv
+, darwin
+, git
 , rustup
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-dist";
-  version = "0.0.7";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
     rev = "v${version}";
-    hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA=";
+    hash = "sha256-yuBf6WgY+sGk7Y5/gZFHeawbHhsVIxabFlpiL4AUzK8=";
   };
 
-  cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q=";
+  cargoHash = "sha256-vfpSMa3NO95SPU4jSW1qKMUy4EGZloYNC3SyGwlTGC0=";
 
   nativeBuildInputs = [
     pkg-config
@@ -30,15 +32,24 @@ rustPlatform.buildRustPackage rec {
     bzip2
     xz
     zstd
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  nativeCheckInputs = [
+    git
+  ] ++ lib.optionals stdenv.isDarwin [
+    rustup
   ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 
-  nativeCheckInputs = lib.optionals stdenv.isDarwin [
-    rustup
-  ];
+  # remove tests that require internet access
+  postPatch = ''
+    rm cargo-dist/tests/integration-tests.rs
+  '';
 
   meta = with lib; {
     description = "A tool for building final distributable artifacts and uploading them to an archive";