From 326a6cd3768df2e03320e77f795ffdd01451fcc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Feb 2021 22:14:53 +0100 Subject: [PATCH 1/2] masscan: 1.3.1 -> 1.3.2 --- pkgs/tools/security/masscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index f92ac978f6e..2ea0eb498fe 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "masscan"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; rev = version; - sha256 = "sha256-gH0zOf2kl6cqws1nB3QPtaAjpvNAgbawXRx77bqJTIc="; + sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g="; }; nativeBuildInputs = [ makeWrapper ]; From 7b54fccc3df2301443c405bb2e3c001e393871b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Feb 2021 22:35:56 +0100 Subject: [PATCH 2/2] masscan: switch to installManPage --- pkgs/tools/security/masscan/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 2ea0eb498fe..b58163630c6 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, libpcap +}: stdenv.mkDerivation rec { pname = "masscan"; @@ -11,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; @@ -20,13 +26,13 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p $out/share/man/man8 + installManPage doc/masscan.8 + mkdir -p $out/share/{doc,licenses}/masscan mkdir -p $out/etc/masscan cp data/exclude.conf $out/etc/masscan cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.html - cp doc/masscan.8 $out/share/man/man8/masscan.8 cp LICENSE $out/share/licenses/masscan/LICENSE wrapProgram $out/bin/masscan --prefix LD_LIBRARY_PATH : "${libpcap}/lib"