Skip to content

gawk: 5.2.2 -> 5.3.0, remove libsigsegv #272962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
katexochen wants to merge 2 commits into from
Closed

gawk: 5.2.2 -> 5.3.0, remove libsigsegv #272962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9398329
gawk: 5.2.2 -> 5.3.0
r-ryantm Nov 3, 2023
72f9789
gawk: remove libsigsegv
katexochen Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkgs/stdenv/linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,7 @@ in
gawk gmp gnumake gnused gnutar gnugrep gnupatch patchelf ed file
]
# Library dependencies
++ map getLib (
[ attr acl zlib gnugrep.pcre2 libidn2 libunistring ]
++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
)
++ map getLib [ attr acl zlib gnugrep.pcre2 libidn2 libunistring ]
# More complicated cases
++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] )
++ [ linuxHeaders # propagated from .dev
Expand Down
14 changes: 3 additions & 11 deletions pkgs/tools/text/gawk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{ lib, stdenv, fetchurl
# TODO: links -lsigsegv but loses the reference for some reason
, withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
, interactive ? false, readline
, autoreconfHook # no-pma fix

Expand All @@ -18,11 +16,11 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null;

stdenv.mkDerivation rec {
pname = "gawk" + lib.optionalString interactive "-interactive";
version = "5.2.2";
version = "5.3.0";

src = fetchurl {
url = "mirror://gnu/gawk/gawk-${version}.tar.xz";
hash = "sha256-PB/OFEa0y+4c0nO9fsZLyH2J9hU3RxzT4F4zqWWiUOk=";
hash = "sha256-ypwW09EdD/jGnXncC0cmfhMppps5t5mJVgTtRH08qQs=";
};

# PIE is incompatible with the "persistent malloc" ("pma") feature.
Expand All @@ -39,12 +37,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]
++ lib.optional (doCheck && stdenv.isLinux) glibcLocales;

buildInputs = lib.optional withSigsegv libsigsegv
++ lib.optional interactive readline
buildInputs = lib.optional interactive readline
++ lib.optional stdenv.isDarwin locale;

configureFlags = [
(if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
(if interactive then "--with-readline=${readline.dev}" else "--without-readline")
];

Expand All @@ -59,10 +55,6 @@ stdenv.mkDerivation rec {
ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
'';

passthru = {
libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap
};

meta = with lib; {
homepage = "https://www.gnu.org/software/gawk/";
description = "GNU implementation of the Awk programming language";
Expand Down