From 453ef6397b8d621122dda2c5e948ffe333b83d0e Mon Sep 17 00:00:00 2001
From: sempiternal-aurora
 <78790545+sempiternal-aurora@users.noreply.github.com>
Date: Fri, 24 Apr 2026 21:58:15 +1000
Subject: [PATCH] j: 9.6.2 -> 9.7.1

https://code.jsoftware.com/wiki/System/ReleaseNotes/J9.7

Fixes: #479840
---
 pkgs/by-name/j/j/package.nix | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix
index bbcb3854a019..dd4ed59c1fe4 100644
--- a/pkgs/by-name/j/j/package.nix
+++ b/pkgs/by-name/j/j/package.nix
@@ -7,28 +7,7 @@
   avx2Support ? stdenv.hostPlatform.avx2Support,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "j";
-  version = "9.6.2";
-
-  src = fetchFromGitHub {
-    owner = "jsoftware";
-    repo = "jsource";
-    tag = version;
-    hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU=";
-  };
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ gmp ];
-
-  patches = [
-    ./fix-install-path.patch
-  ];
-
-  enableParallelBuilding = true;
-
-  dontConfigure = true;
-
+let
   # Emulate jplatform64.sh configuration variables
   jplatform =
     if stdenv.hostPlatform.isDarwin then
@@ -49,6 +28,28 @@ stdenv.mkDerivation rec {
       if stdenv.hostPlatform.isDarwin then "j64arm" else "j64"
     else
       "unsupported";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "j";
+  version = "9.7.1";
+
+  src = fetchFromGitHub {
+    owner = "jsoftware";
+    repo = "jsource";
+    tag = finalAttrs.version;
+    hash = "sha256-fW6Tc0UEPYFTgEFMUxZaVm2NU5LNFqszifqOqfdFJZY=";
+  };
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ gmp ];
+
+  patches = [
+    ./fix-install-path.patch
+  ];
+
+  enableParallelBuilding = true;
+
+  dontConfigure = true;
 
   env.NIX_LDFLAGS = "-lgmp";
 
@@ -94,4 +95,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     mainProgram = "jconsole";
   };
-}
+})