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

Assorted GNU updates.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21047
This commit is contained in:
Ludovic Courtès
2010-04-13 08:37:54 +00:00
parent 19b9811012
commit 99d51d0e92
8 changed files with 21 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/gnugrep/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{stdenv, fetchurl, pcre}:
let version = "2.5.4"; in
let version = "2.6.3"; in
stdenv.mkDerivation {
name = "gnugrep-${version}";
src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.bz2";
sha256 = "0800lj1ywf43x5jnjyga56araak0f601sd9k5q1vv3s5057cdgha";
url = "mirror://gnu/grep/grep-${version}.tar.gz";
sha256 = "0rnnljzcpb2sl5zabww7gbzk9r6kp8kycsqrf909d6jdak8yah53";
};
buildInputs = [pcre];
pkgs/tools/text/gnused/default.nix
+8 -8
View File
@@ -1,15 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "gnused-4.1.5";
name = "gnused-4.2.1";
src = fetchurl {
url = mirror://gnu/sed/sed-4.1.5.tar.gz;
md5 = "7a1cbbbb3341287308e140bd4834c3ba";
url = mirror://gnu/sed/sed-4.2.1.tar.gz;
md5 = "0q1hzjvr6pzhaagidg7pj76k1fzz5nl15np7p72w9zcpw0f58ww7";
};
# !!! hack: this should go away in gnused > 4.1.5
patches = [./gettext-fix.patch];
meta = {
homepage = http://www.gnu.org/software/sed/;
@@ -24,6 +21,9 @@ stdenv.mkDerivation {
multiple occurrences of a string within a file.
'';
license = "GPLv2+";
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
pkgs/tools/text/gnused/gettext-fix.patch
-32
View File
@@ -1,32 +0,0 @@
diff -rc sed-4.1.5-orig/configure sed-4.1.5/configure
*** sed-4.1.5-orig/configure Fri Feb 3 10:24:40 2006
--- sed-4.1.5/configure Fri Jul 14 12:50:13 2006
***************
*** 11265,11277 ****
esac
done ;;
gettext-fix )
! sed -e '/^mkinstalldirs *=/a\' \
! -e "install_sh=$install_sh" \
-e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
intl/Makefile > intl/Makefile.tmp
mv intl/Makefile.tmp intl/Makefile
! sed -e '/^mkinstalldirs *=/a\' \
! -e "install_sh=$install_sh" \
-e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
po/Makefile > po/Makefile.tmp
mv po/Makefile.tmp po/Makefile ;;
--- 11265,11277 ----
esac
done ;;
gettext-fix )
! sed -e "/^mkinstalldirs *=/a\\
! install_sh=$install_sh" \
-e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
intl/Makefile > intl/Makefile.tmp
mv intl/Makefile.tmp intl/Makefile
! sed -e "/^mkinstalldirs *=/a\\
! install_sh=$install_sh" \
-e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
po/Makefile > po/Makefile.tmp
mv po/Makefile.tmp po/Makefile ;;