From a048f59f44f0dc2cac6ba41d5c45608799068849 Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Sat, 27 Sep 2025 05:39:38 +0300
Subject: [PATCH 1/2] john: fix hash mismatch on source

---
 pkgs/by-name/jo/john/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index e4953f51ffad..7587c6039d25 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     owner = "openwall";
     repo = "john";
     rev = "f9fedd238b0b1d69181c1fef033b85c787e96e57";
-    hash = "sha256-zvoN+8Sx6qpVg2JeRLOIH1ehfl3tFTv7r5wQZ44Qsbc=";
+    hash = "sha256-XMT5Sbp2XrAnfTHxXyJdw0kA/ZtfOiYrX/flCFLHJ6s=";
   };
 
   patches = lib.optionals withOpenCL [

From 699cb82fc110d01f7d5278dd54ffcc2fc8f98e6a Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Sun, 28 Sep 2025 00:52:11 +0300
Subject: [PATCH 2/2] john: remove use of `with lib;`

---
 pkgs/by-name/jo/john/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix
index 7587c6039d25..231b8217a495 100644
--- a/pkgs/by-name/jo/john/package.nix
+++ b/pkgs/by-name/jo/john/package.nix
@@ -130,15 +130,18 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "John the Ripper password cracker";
-    license = [ licenses.gpl2Plus ] ++ lib.optionals enableUnfree [ licenses.unfreeRedistributable ];
+    license = [
+      lib.licenses.gpl2Plus
+    ]
+    ++ lib.optionals enableUnfree [ lib.licenses.unfreeRedistributable ];
     homepage = "https://github.com/openwall/john/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       offline
       matthewbauer
       cherrykitten
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }