rustscan: 2.0.1 -> 2.1.0, add figsoda as a maintainer

1 files changed, 13 insertions, 15 deletions

diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
index 8f7498083cc20..79a1fd1195f02 100644
--- a/pkgs/tools/security/rustscan/default.nix
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -1,38 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, nmap, Security }:
+{ lib, rustPlatform, fetchCrate, nmap, stdenv, Security, perl, python3 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rustscan";
-  version = "2.0.1";
+  version = "2.1.0";
 
-  src = fetchFromGitHub {
-    owner = "RustScan";
-    repo = pname;
-    rev = version;
-    sha256 = "0fdbsz1v7bb5dm3zqjs1qf73lb1m4qzkqyb3h3hbyrp9vklgxsgw";
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-f9QFsVGGKoWqZGIg8Z8FgZGcUo5M8MFNUavK69SgHkg=";
   };
 
-  cargoSha256 = "0658jbx59qrsgpfczzlfrbp2qm7kh0c5561bsxzmgiri7fcz9w0n";
+  cargoSha256 = "sha256-ZoDE7SJ6snWTFvYXHZdVCC6UCug2wGghH93FfDTDsv0=";
 
   postPatch = ''
-    substituteInPlace src/main.rs \
-      --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")'
+    substituteInPlace src/scripts/mod.rs \
+      --replace 'call_format = "nmap' 'call_format = "${nmap}/bin/nmap'
+    patchShebangs fixtures/.rustscan_scripts/*
   '';
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
+  checkInputs = [ perl python3 ];
+
+  # these tests require network access
   checkFlags = [
-    "--skip=infer_ulimit_lowering_no_panic"
-    "--skip=google_dns_runs"
     "--skip=parse_correct_host_addresses"
     "--skip=parse_hosts_file_and_incorrect_hosts"
-    "--skip=run_perl_script"
-    "--skip=run_python_script"
   ];
 
   meta = with lib; {
     description = "Faster Nmap Scanning with Rust";
     homepage = "https://github.com/RustScan/RustScan";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ figsoda ];
   };
 }