From d789b01f088f20f83c59786b3e229355f2bd526a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 28 Jun 2025 18:17:20 +0200
Subject: [PATCH 1/2] john: add update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/jo/john/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index c3270044195f..6e11c7cce38f 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  unstableGitUpdater,
   openssl,
   nss,
   nspr,
@@ -133,6 +134,10 @@ stdenv.mkDerivation {
     done
   '';
 
+  passthru.updateScript = unstableGitUpdater {
+    tagFormat = "[0-9].*";
+  };
+
   meta = {
     description = "John the Ripper password cracker";
     license = [

From 64276138cac5127d7400039d028a5b43dbea088a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 28 Jun 2025 18:27:24 +0200
Subject: [PATCH 2/2] john: rolling-2604 -> 1.9.0-Jumbo-1-unstable-2026-04-13

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/jo/john/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index 6e11c7cce38f..3ce8d1cc4e7c 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation {
   pname = "john";
-  version = "rolling-2604";
+  version = "1.9.0-Jumbo-1-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     owner = "openwall";
     repo = "john";
     rev = "f514ece8ec4ae5e38ad75aaa322eac86d73dcd76";
-    hash = "sha256-Fzt9KnMFBTdPpQMSlXe/zG9LMylAZnC6uzU4yJ6HSUk=";
+    hash = "sha256-zO1/KUJe3LvYCGlwVpNg5uDwPRD0ql/7anErb7tywC0=";
   };
 
   patches = lib.optionals withOpenCL [
@@ -41,9 +41,6 @@ stdenv.mkDerivation {
     })
   ];
 
-  # Fix build with gcc 15
-  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
-
   postPatch = ''
     sed -ri -e '
       s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
@@ -110,9 +107,7 @@ stdenv.mkDerivation {
     ]);
   # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl
 
-  # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g    -lpcap -fopenmp -o ../run/vncpcap2john
-  # gcc: error: memdbg.o: No such file or directory
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   postInstall = ''
     mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/share/john/opencl" "$out/${perlPackages.perl.libPrefix}"