summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2022-03-15 19:54:40 -0300
committerGitHub <noreply@github.com>2022-03-15 19:54:40 -0300
commit78f072f575cc537f3d725c737c2b47dc7decf342 (patch)
treec3d713cb1677d611542166649fc4e6e73f623b26 /pkgs/development/compilers
parente04a2dc30f4a335b6450ea82d3e439e3d4b74953 (diff)
parente1f2441674443c73c93960cbb3254903c08313e3 (diff)
downloadnixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar.gz
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar.bz2
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar.lz
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar.xz
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.tar.zst
nixpkgs-78f072f575cc537f3d725c737c2b47dc7decf342.zip
Merge pull request #164308 from AndersonTorres/new-misc
4th: 3.62.5 -> 3.64.0
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/4th/001-install-manual-fixup.diff12
-rw-r--r--pkgs/development/compilers/4th/default.nix17
2 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/compilers/4th/001-install-manual-fixup.diff b/pkgs/development/compilers/4th/001-install-manual-fixup.diff
new file mode 100644
index 00000000000..6002e7a0d99
--- /dev/null
+++ b/pkgs/development/compilers/4th/001-install-manual-fixup.diff
@@ -0,0 +1,12 @@
+diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile
+--- 4th-3.64.0-old/sources/Makefile	2022-03-15 12:37:45.925122854 -0300
++++ 4th-3.64.0-new/sources/Makefile	2022-03-15 12:38:50.987870211 -0300
+@@ -125,7 +125,7 @@
+ 
+ install: mostlyinstall
+ 	install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1
+-	install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/
++	install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/
+ 
+ uninstall:
+ 	-rm -f $(LIBRARIES)/lib4th.{a,so*}
diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix
index a8923879c06..d76a5cc733c 100644
--- a/pkgs/development/compilers/4th/default.nix
+++ b/pkgs/development/compilers/4th/default.nix
@@ -2,13 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "4th";
-  version = "3.62.5";
+  version = "3.64.0";
 
   src = fetchurl {
     url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
-    sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw=";
+    hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg=";
   };
 
+  patches = [
+    # Fix install manual; report this patch to upstream
+    ./001-install-manual-fixup.diff
+  ];
+
   dontConfigure = true;
 
   makeFlags = [
@@ -31,9 +36,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A portable Forth compiler";
     homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
-    license = licenses.lgpl3;
-    platforms = platforms.all;
+    description = "A portable Forth compiler";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
   };
 }
+# TODO: set Makefile according to platform