diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-09-05 14:51:26 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-09-05 14:51:26 +0200 |
| commit | b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6 (patch) | |
| tree | ef83c7e3d19be38223a71a92d963e29fb0bb1051 /pkgs/development/tools/misc | |
| parent | 5b6c2380adb4c4ddb0f87152cef0016333ea5a4d (diff) | |
| parent | 3b3629a35baa1064adf4057ac5d6c2b99962b877 (diff) | |
| download | nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar.gz nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar.bz2 nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar.lz nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar.xz nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.tar.zst nixpkgs-b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6.zip | |
Merge remote-tracking branch 'origin/python-unstable' into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/gnum4/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/gnum4/s_isdir.patch | 14 |
2 files changed, 3 insertions, 26 deletions
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index d0b5911b71d..50e05e4829a 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -7,27 +7,18 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.18"; + version = "1.4.19"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; + sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - # Upstream is aware of it; it may be in the next release. - patches = - [ - ./s_isdir.patch - (fetchurl { - url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; - sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; - }) - ] - ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; + patches = lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = "https://www.gnu.org/software/m4/"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch deleted file mode 100644 index a009a4ba446..00000000000 --- a/pkgs/development/tools/misc/gnum4/s_isdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fails to build with glibc 2.12.1 without this patch. - -http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html - ---- a/src/path.c -+++ b/src/path.c -@@ -22,6 +22,7 @@ - /* Handling of path search of included files via the builtins "include" - and "sinclude". */ - - #include "m4.h" -+#include "sys/stat.h" - - struct includes |