diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/tools/security/nmap | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/tools/security/nmap')
| -rw-r--r-- | pkgs/tools/security/nmap/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 3bc5758aad44b..bf9c7a4fc4613 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.70"; + version = "7.80"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; + sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; }; patches = [ ./zenmap.patch ] |