gnugrep: Update to 2.20
This commit is contained in:
parent
7456ae4f5c
commit
ae863192e6
|
@ -1,21 +1,18 @@
|
|||
{ stdenv, fetchurl, pcre, libiconv ? null }:
|
||||
{ stdenv, fetchurl, pcre, libiconvOrNull }:
|
||||
|
||||
let version = "2.14"; in
|
||||
let version = "2.20"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnugrep-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/grep/grep-${version}.tar.xz";
|
||||
sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7";
|
||||
sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre ]
|
||||
++ stdenv.lib.optional (libiconv != null) libiconv;
|
||||
buildInputs = [ pcre libiconvOrNull ];
|
||||
|
||||
patches = [ ./test-localeconv.patch ];
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv";
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv";
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
|
@ -37,7 +34,7 @@ stdenv.mkDerivation {
|
|||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
--- grep-2.14/gnulib-tests/test-localeconv.c.orig 2013-02-15 18:41:50.213433059 +0000
|
||||
+++ grep-2.14/gnulib-tests/test-localeconv.c 2013-02-15 18:50:33.964751303 +0000
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
ASSERT (STREQ (l->decimal_point, "."));
|
||||
ASSERT (STREQ (l->thousands_sep, ""));
|
||||
-#if !defined __FreeBSD__
|
||||
+#if !(defined __FreeBSD__ || defined __sun)
|
||||
ASSERT (STREQ (l->grouping, ""));
|
||||
#endif
|
||||
|
||||
ASSERT (STREQ (l->mon_decimal_point, ""));
|
||||
ASSERT (STREQ (l->mon_thousands_sep, ""));
|
||||
-#if !defined __FreeBSD__
|
||||
+#if !(defined __FreeBSD__ || defined __sun)
|
||||
ASSERT (STREQ (l->mon_grouping, ""));
|
||||
#endif
|
||||
ASSERT (STREQ (l->positive_sign, ""));
|
|
@ -1192,9 +1192,7 @@ let
|
|||
guile = guile_1_8;
|
||||
};
|
||||
|
||||
gnugrep = callPackage ../tools/text/gnugrep {
|
||||
libiconv = libiconvOrNull;
|
||||
};
|
||||
gnugrep = callPackage ../tools/text/gnugrep { };
|
||||
|
||||
gnulib = callPackage ../development/tools/gnulib { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue