diff options
| author | Janne Heß <janne@hess.ooo> | 2023-05-21 23:45:04 +0200 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2023-05-21 23:47:43 +0200 |
| commit | 0f0e98dd5ef635037997f97e9269bd6d97f7e068 (patch) | |
| tree | 48bfb3ce0618ccd9c5d4134007e93d6d0e8d0396 /pkgs/tools/text/gawk | |
| parent | fe05fe6f645e2e8799b0f8d4630bfd1d060e36a8 (diff) | |
| download | nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar.gz nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar.bz2 nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar.lz nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar.xz nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.tar.zst nixlib-0f0e98dd5ef635037997f97e9269bd6d97f7e068.zip | |
gawk: 5.2.1 -> 5.2.2
This is a bugfix release: https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00008.html
Diffstat (limited to 'pkgs/tools/text/gawk')
| -rw-r--r-- | pkgs/tools/text/gawk/darwin-no-pma.patch | 31 | ||||
| -rw-r--r-- | pkgs/tools/text/gawk/default.nix | 10 |
2 files changed, 2 insertions, 39 deletions
diff --git a/pkgs/tools/text/gawk/darwin-no-pma.patch b/pkgs/tools/text/gawk/darwin-no-pma.patch deleted file mode 100644 index f198acd41af1..000000000000 --- a/pkgs/tools/text/gawk/darwin-no-pma.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=e0b7737930f8a677d3c509f8ce72b9130965ec0a ---- a/m4/pma.m4 -+++ b/m4/pma.m4 -@@ -23,15 +23,18 @@ then - [LDFLAGS="${LDFLAGS} -no-pie" - export LDFLAGS]) - ;; -- *darwin*) -- # 23 October 2022: See README_d/README.macosx for -- # the details on what's happening here. See also -- # the manual. -- -- # Compile as Intel binary all the time, even on M1. -- CFLAGS="${CFLAGS} -arch x86_64" -- LDFLAGS="${LDFLAGS} -Xlinker -no_pie" -- export CFLAGS LDFLAGS -+ *darwin*) -+ # 27 November 2022: PMA only works on Intel. -+ case $host in -+ x86_64-*) -+ LDFLAGS="${LDFLAGS} -Xlinker -no_pie" -+ export LDFLAGS -+ ;; -+ *) -+ # disable on all other macOS systems -+ use_persistent_malloc=no -+ ;; -+ esac - ;; - *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* ) - true # nothing do, exes on these systems are not PIE diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c376411e6f7f..8fe044a9e218 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -18,19 +18,13 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; - hash = "sha256-ZzVTuR+eGMxXku1RB1341RDJBA9VCm904Jya3SQ6fk8="; + hash = "sha256-PB/OFEa0y+4c0nO9fsZLyH2J9hU3RxzT4F4zqWWiUOk="; }; - patches = [ - # Pull upstream fix for aarch64-darwin where pma does not work. - # Can be removed after next gawk release. - ./darwin-no-pma.patch - ]; - # PIE is incompatible with the "persistent malloc" ("pma") feature. # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` # wrapped still passes `-pie` flag to linker and breaks linkage. |