public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnugrep: Update to 2.20

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-06 20:44:26 +02:00
parent 7456ae4f5c
commit ae863192e6
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/text/gnugrep/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "gnugrep-${version}"; name = "gnugrep-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz"; url = "mirror://gnu/grep/grep-${version}.tar.xz";
sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7"; sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh";
}; };
buildInputs = [ pcre ] buildInputs = [ pcre libiconvOrNull ];
++ stdenv.lib.optional (libiconv != null) libiconv;
patches = [ ./test-localeconv.patch ]; NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv";
NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv";
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
@ -37,7 +34,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ ]; maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };

18
pkgs/tools/text/gnugrep/test-localeconv.patch
View File

@ -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, ""));

4
pkgs/top-level/all-packages.nix
View File

@ -1192,9 +1192,7 @@ let
guile = guile_1_8; guile = guile_1_8;
}; };
gnugrep = callPackage ../tools/text/gnugrep { gnugrep = callPackage ../tools/text/gnugrep { };
libiconv = libiconvOrNull;
};
gnulib = callPackage ../development/tools/gnulib { }; gnulib = callPackage ../development/tools/gnulib { };