Merge pull request #62686 from dtzWill/update/jtr-1.9.0

john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1
NixOS · Jun 7, 2019 · 762ee9e · 762ee9e
2 parents 4fcf0bb + 0e3a443
commit 762ee9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
@@ -6,15 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "john-${version}";
-  version = "1.8.0-jumbo-1";
+  version = "1.9.0-jumbo-1";
 
   src = fetchurl {
-    url = "http://www.openwall.com/john/j/${name}.tar.xz";
-    sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
+    url = "http://www.openwall.com/john/k/${name}.tar.xz";
+    sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
   };
 
-  patches = [ ./gcc5.patch ];
-
   postPatch = ''
     sed -ri -e '
       s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!

diff --git a/pkgs/tools/security/john/gcc5.patch b/pkgs/tools/security/john/gcc5.patch