From a57f0acd0640a1c27d0435b87c4aa47c7df141e7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 12 Jun 2025 06:22:32 +0100 Subject: [PATCH] gnum4: 1.4.19 -> 1.4.20 Changes: https://lists.gnu.org/archive/html/m4-announce/2025-05/msg00000.html --- pkgs/by-name/gn/gnum4/loong-fix-build.patch | 30 --------------------- pkgs/by-name/gn/gnum4/package.nix | 6 ++--- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/gn/gnum4/loong-fix-build.patch diff --git a/pkgs/by-name/gn/gnum4/loong-fix-build.patch b/pkgs/by-name/gn/gnum4/loong-fix-build.patch deleted file mode 100644 index d5243357928b3..0000000000000 --- a/pkgs/by-name/gn/gnum4/loong-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with line number tweak, and change to generated file added as well.] -From: Sun Haiyong -Date: Tue, 31 Aug 2021 11:11:52 +0800 -Subject: [PATCH] stack-direction: Add support for loongarch CPU - -* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch, -set "sv_cv_stack_direction" to "-1" . ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -31,6 +31,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ ---- a/configure -+++ b/configure -@@ -46399,6 +46399,7 @@ else $as_nop - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ --- -2.17.2 - diff --git a/pkgs/by-name/gn/gnum4/package.nix b/pkgs/by-name/gn/gnum4/package.nix index 1b264ffc1290f..991acc179af0a 100644 --- a/pkgs/by-name/gn/gnum4/package.nix +++ b/pkgs/by-name/gn/gnum4/package.nix @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.19"; + version = "1.4.20"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; + hash = "sha256-rGmJ7l0q7YFzl4BjDMLOCX4qZUb+uWpKVNs31GoUUuQ="; }; - # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild - patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch =