diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 13:06:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 13:06:45 +0200 |
| commit | 1428d00aa4a58095ba510145eb25233591ac6051 (patch) | |
| tree | b4f73764acaeb3c21a70a9c57cca55e59681515c /pkgs/tools/security | |
| parent | e3ee9c098a64deb30e8d9edb180e613b93046f45 (diff) | |
| parent | 6767396e380b39128e5decf30d6cb87481a75490 (diff) | |
| download | nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.gz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.bz2 nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.lz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.xz nixlib-1428d00aa4a58095ba510145eb25233591ac6051.tar.zst nixlib-1428d00aa4a58095ba510145eb25233591ac6051.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnu-pw-mgr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/masscan/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index e71d313e20ab..d58585c4069d 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "gnu-pw-mgr-${version}"; - version = "2.3.3"; + version = "2.4.2"; src = fetchurl { url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; - sha256 = "04xh38j7l0sfnb01kp05xc908pvqfc0lph94k7n9bi46zy3qy7ma"; + sha256 = "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17"; }; buildInputs = [ gnulib ]; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 26497659d23d..e33681c45e0e 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "masscan-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = "39061a5e9ef158dde1e6618f6fbf379739934a73"; - sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; + rev = "${version}"; + sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 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.hml + 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 |