Author: rob
Date: Fri Nov 26 14:54:27 2010
New Revision: 24878
URL: https://svn.nixos.org/websvn/nix/?rev=24878&sc=1
Log:
make gettext version explicit
Modified:
hydra-config/gnu/trunk/binutils/release.nix
hydra-config/gnu/trunk/cpio/release.nix
hydra-config/gnu/trunk/cppi/release.nix
hydra-config/gnu/trunk/diffutils/release.nix
hydra-config/gnu/trunk/findutils/release.nix
hydra-config/gnu/trunk/glibc/release.nix
hydra-config/gnu/trunk/gnutls/release.nix
hydra-config/gnu/trunk/gsasl/release.nix
hydra-config/gnu/trunk/guile/release.nix
hydra-config/gnu/trunk/gzip/release.nix
hydra-config/gnu/trunk/libgcrypt/release.nix
hydra-config/gnu/trunk/libgpg-error/release.nix
hydra-config/gnu/trunk/libidn/release.nix
hydra-config/gnu/trunk/libredwg/release.nix
hydra-config/gnu/trunk/myserver/release.nix
hydra-config/gnu/trunk/patch/release.nix
Modified: hydra-config/gnu/trunk/binutils/release.nix
==============================================================================
--- hydra-config/gnu/trunk/binutils/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/binutils/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -59,7 +59,7 @@
src = binutilsSrc;
autoconfPhase = "true";
buildInputs = with pkgs;
- [ texinfo gettext flex2535 bison ];
+ [ texinfo gettext_0_17 flex2535 bison ];
distPhase =
''
Modified: hydra-config/gnu/trunk/cpio/release.nix
==============================================================================
--- hydra-config/gnu/trunk/cpio/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/cpio/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -80,7 +80,7 @@
buildInputs = [
git
- gettext
+ gettext_0_17
cvs
texinfo
man
Modified: hydra-config/gnu/trunk/cppi/release.nix
==============================================================================
--- hydra-config/gnu/trunk/cppi/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/cppi/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -66,7 +66,7 @@
buildInputs = [
automake111x
texinfo
- gettext
+ gettext_0_17
git
wget
perl
Modified: hydra-config/gnu/trunk/diffutils/release.nix
==============================================================================
--- hydra-config/gnu/trunk/diffutils/release.nix Fri Nov 26 14:54:05
2010 (r24877)
+++ hydra-config/gnu/trunk/diffutils/release.nix Fri Nov 26 14:54:27
2010 (r24878)
@@ -55,7 +55,7 @@
buildInputs = [
git
- gettext
+ gettext_0_17
cvs
texinfo
perl
Modified: hydra-config/gnu/trunk/findutils/release.nix
==============================================================================
--- hydra-config/gnu/trunk/findutils/release.nix Fri Nov 26 14:54:05
2010 (r24877)
+++ hydra-config/gnu/trunk/findutils/release.nix Fri Nov 26 14:54:27
2010 (r24878)
@@ -49,7 +49,7 @@
name = "findutils-tarball";
src = findutilsSrc;
buildInputs =
- [ automake111x gettext gperf bison groff git
+ [ automake111x gettext_0_17 gperf bison groff git
texinfo xz
cvs # for `autopoint'
];
Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/glibc/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -41,7 +41,7 @@
inherit (pkgs) releaseTools;
- buildInputsFrom = pkgs: with pkgs; [ gettext texinfo perl ];
+ buildInputsFrom = pkgs: with pkgs; [ gettext_0_17 texinfo perl ];
# Build out-of-tree; don't produce self rpaths.
preConfigure =
Modified: hydra-config/gnu/trunk/gnutls/release.nix
==============================================================================
--- hydra-config/gnu/trunk/gnutls/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/gnutls/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -46,7 +46,7 @@
inherit (pkgs) releaseTools;
buildInputsFrom = pkgs: with pkgs;
- [ zlib lzo guile gettext pkgconfig perl nettle]
+ [ zlib lzo guile gettext_0_17 pkgconfig perl nettle]
++ stdenv.lib.optional stdenv.isLinux valgrind
++ stdenv.lib.optional (stdenv.isDarwin || stdenv.isBSD) libiconv;
Modified: hydra-config/gnu/trunk/gsasl/release.nix
==============================================================================
--- hydra-config/gnu/trunk/gsasl/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/gsasl/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -44,7 +44,7 @@
inherit (pkgs) releaseTools;
buildInputsFrom = pkgs: with pkgs;
- [ gettext pkgconfig perl gss ghostscript ]
+ [ gettext_0_17 pkgconfig perl gss ghostscript ]
++ stdenv.lib.optional stdenv.isLinux valgrind;
jobs = rec {
Modified: hydra-config/gnu/trunk/guile/release.nix
==============================================================================
--- hydra-config/gnu/trunk/guile/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/guile/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -134,7 +134,7 @@
automake111x
autoconf
flex2535
- gettext
+ gettext_0_17
git
gnum4 # this should be a propagated build input of Autotools
texinfo
Modified: hydra-config/gnu/trunk/gzip/release.nix
==============================================================================
--- hydra-config/gnu/trunk/gzip/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/gzip/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -74,7 +74,7 @@
buildInputs = with pkgs; [
automake111x
texinfo
- gettext
+ gettext_0_17
git
perl
rsync
Modified: hydra-config/gnu/trunk/libgcrypt/release.nix
==============================================================================
--- hydra-config/gnu/trunk/libgcrypt/release.nix Fri Nov 26 14:54:05
2010 (r24877)
+++ hydra-config/gnu/trunk/libgcrypt/release.nix Fri Nov 26 14:54:27
2010 (r24878)
@@ -43,7 +43,7 @@
buildInputsFrom = pkgs: with pkgs;
# On Darwin libintl is needed.
- stdenv.lib.optional stdenv.isDarwin gettext;
+ stdenv.lib.optional stdenv.isDarwin gettext_0_17;
jobs = rec {
Modified: hydra-config/gnu/trunk/libgpg-error/release.nix
==============================================================================
--- hydra-config/gnu/trunk/libgpg-error/release.nix Fri Nov 26 14:54:05
2010 (r24877)
+++ hydra-config/gnu/trunk/libgpg-error/release.nix Fri Nov 26 14:54:27
2010 (r24878)
@@ -22,7 +22,7 @@
inherit (pkgs) releaseTools;
- buildInputsFrom = pkgs: with pkgs; [ gettext ];
+ buildInputsFrom = pkgs: with pkgs; [ gettext_0_17 ];
jobs = rec {
Modified: hydra-config/gnu/trunk/libidn/release.nix
==============================================================================
--- hydra-config/gnu/trunk/libidn/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/libidn/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -105,7 +105,7 @@
buildInputs = (buildInputsFrom pkgs)
++ (with pkgs;
- [ autoconf automake111x libtool gettext
+ [ autoconf automake111x libtool gettext_0_17
git texinfo gperf gengetopt transfig
ghostscript # for `fig2dev'
cvs # for `autopoint'
Modified: hydra-config/gnu/trunk/libredwg/release.nix
==============================================================================
--- hydra-config/gnu/trunk/libredwg/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/libredwg/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -45,7 +45,7 @@
name = "libredwg";
src = libredwgSrc;
buildInputs =
- [ gettext texinfo automake111x python swig
+ [ gettext_0_17 texinfo automake111x python swig
];
inherit meta;
};
Modified: hydra-config/gnu/trunk/myserver/release.nix
==============================================================================
--- hydra-config/gnu/trunk/myserver/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/myserver/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -72,7 +72,7 @@
buildInputs = (buildInputsFrom pkgs)
++ (with pkgs;
[ autoconf automake111x perl git
- gettext cvs # cvs is used by `autopoint'
+ gettext_0_17 cvs # cvs is used by `autopoint'
]);
inherit meta;
Modified: hydra-config/gnu/trunk/patch/release.nix
==============================================================================
--- hydra-config/gnu/trunk/patch/release.nix Fri Nov 26 14:54:05 2010
(r24877)
+++ hydra-config/gnu/trunk/patch/release.nix Fri Nov 26 14:54:27 2010
(r24878)
@@ -49,7 +49,7 @@
name = "patch";
src = patchSrc;
buildInputs =
- [ git xz gettext texinfo automake111x
+ [ git xz gettext_0_17 texinfo automake111x
bison # the `testing' branch needs it
];
autoconfPhase =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
