gforth: 0.7.9_20230518 -> 0.7.9_20251001 (#449792)

pkgs/by-name/gf/gforth/boot-forth.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Forth implementation of the GNU project (outdated version used to bootstrap)";
     homepage = "https://www.gnu.org/software/gforth/";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
   };
 }

pkgs/by-name/gf/gforth/package.nix

@@ -4,8 +4,10 @@
   fetchFromGitHub,
   callPackage,
   autoreconfHook,
+  gitUpdater,
   texinfo,
   libffi,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -13,24 +15,27 @@ let
   bootForth = callPackage ./boot-forth.nix { };
   lispDir = "${placeholder "out"}/share/emacs/site-lisp";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
-
   pname = "gforth";
-  version = "0.7.9_20230518";
+  version = "0.7.9_20251001";
 
   src = fetchFromGitHub {
     owner = "forthy42";
     repo = "gforth";
-    rev = version;
+    rev = finalAttrs.version;
-    hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU=";
+    hash = "sha256-u9snXcFa/YYvITgMBY8FRYyyLFhHCP6hWA5ljwdKGLk=";
   };
 
+  patches = [ ./use-nproc-instead-of-fhs.patch ];
+
   nativeBuildInputs = [
+    writableTmpDirAsHomeHook
     autoreconfHook
     texinfo
     bootForth
     swig
   ];
+
   buildInputs = [
     libffi
   ];
@@ -48,11 +53,15 @@ stdenv.mkDerivation rec {
     mkdir -p ${lispDir}
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Forth implementation of the GNU project";
-    homepage = "https://github.com/forthy42/gforth";
+    homepage = "https://www.gnu.org/software/gforth";
-    license = lib.licenses.gpl3;
+    downloadPage = "https://github.com/forthy42/gforth";
+    license = lib.licenses.gpl3Plus;
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi
     platforms = lib.platforms.all;
+    mainProgram = "gforth";
   };
-}
+})

pkgs/by-name/gf/gforth/use-nproc-instead-of-fhs.patch

@@ -0,0 +1,16 @@
+diff --git i/cilk.fs w/cilk.fs
+index 9c675d06..df858f3d 100644
+--- i/cilk.fs
++++ w/cilk.fs
+@@ -25,9 +25,8 @@ e? os-type 2dup s" darwin" string-prefix? -rot s" openbsd" string-prefix? or [IF
+     s>number drop
+     r> free throw
+ [ELSE] e? os-type s" linux" search nip nip [IF]
+-	s" /sys/devices/system/cpu/present" slurp-file over >r
+-	#lf -scan '-' $split 2nip
+-	s>number drop 1+
++	s" nproc" r/o open-pipe throw slurp-fid over >r
++	s>number drop
+ 	r> free throw
+     [ELSE]
+ 	1 \ we don't know