summary refs log tree commit diff
path: root/pkgs/development/tools/rust/cargo-geiger/default.nix
diff options
context:
space:
mode:
authorEvan Stoll <evanjsx@gmail.com>2020-12-07 10:48:17 -0500
committerEvan Stoll <evanjsx@gmail.com>2020-12-07 10:57:14 -0500
commit8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7 (patch)
tree86b53ea11447e85678466b454a1ad66d36c9accf /pkgs/development/tools/rust/cargo-geiger/default.nix
parente9a431d343846858a7f2223bd8a2ff2d46035e4f (diff)
downloadnixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar.gz
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar.bz2
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar.lz
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar.xz
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.tar.zst
nixpkgs-8949b189a6f6e67c83db2f6d3a54d128d1e8d4a7.zip
cargo-geiger: 0.9.1 -> 0.10.2
* Remove cargo-lock.patch
  * Upstream crate now compiles fine without patch

* Use cargo-insta for testing
  * Using cargo-insta for testing, we can now run the test suite without
    skipping any tests
Diffstat (limited to 'pkgs/development/tools/rust/cargo-geiger/default.nix')
-rw-r--r--pkgs/development/tools/rust/cargo-geiger/default.nix24
1 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index 1e79a720a52..1a5273feeca 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -1,38 +1,26 @@
 { stdenv, lib, fetchFromGitHub
 , rustPlatform, pkgconfig, openssl
+# testing packages
+, cargo-insta
 # darwin dependencies
 , Security, CoreFoundation, libiconv
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-geiger";
-  version = "0.9.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "rust-secure-code";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0";
+    sha256 = "1z920p8i3gkjadyd6bqjk4i5yr5ds3m3sbcnf7plcqr69dsjr4b8";
   };
 
-  cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z";
-  cargoPatches = [ ./cargo-lock.patch ];
+  cargoSha256 = "1zh6fjfynkn4kgk1chigzd0sh4x1bagizyn7x6qyxgzc57a49bp7";
 
-  # Multiple tests require internet connectivity, so they are disabled here.
-  # If we ever get cargo-insta (https://crates.io/crates/insta) in tree,
-  # we might be able to run these with something like
-  # `cargo insta review` in the `preCheck` phase.
   checkPhase = ''
-    cd cargo-geiger/tests/snapshots
-    for file in *
-    do
-      mv $file r#$file
-    done
-    cd -
-    cargo test -- \
-    --skip test_package::case_2 \
-    --skip test_package::case_3 \
-    --skip test_package::case_6
+    ${cargo-insta}/bin/cargo-insta test
   '';
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];