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

* Fix some Hydra dependencies that broke due to the Perl upgrade.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33020
This commit is contained in:
Eelco Dolstra 2012-03-12 15:31:14 +00:00
parent 5b6856ff52
commit 29df27f469
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/misc/binutils/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
let basename = "binutils-2.21.1a"; in let basename = "binutils-2.21.1a"; in
stdenv.mkDerivation rec { stdenv.mkDerivation ( rec {
name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl { src = fetchurl {
@ -65,4 +65,9 @@ stdenv.mkDerivation rec {
collision due to the ld/as wrappers/symlinks in the latter. */ collision due to the ld/as wrappers/symlinks in the latter. */
priority = "10"; priority = "10";
}; };
} } // (stdenv.lib.optionalAttrs gold {
postInstall = ''
rm $out/bin/ld
ln -sf $out/bin/ld.gold $out/bin/ld
'';
} ) )

11
pkgs/development/tools/misc/hydra/default.nix
View File

@ -40,18 +40,19 @@ stdenv.mkDerivation {
name = "hydra-${version}"; name = "hydra-${version}";
src = fetchurl { src = fetchurl {
url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz; url = "http://hydra.nixos.org/build/1264023/download/2/hydra-${version}.tar.gz";
sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz"; sha256 = "62cecc2da9cb0353ab4eb1f66b6783c0195421c35ba6b6eace9d3b56a9275631";
}; };
configureFlags = "--with-nix=${nix}"; configureFlags = "--with-nix=${nix}";
buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ;
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") (
libxslt sqlite subversion openssh nix coreutils findutils [ libxslt sqlite subversion openssh nix coreutils findutils
gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz
rpm dpkg cdrkit])); rpm dpkg cdrkit
]));
postInstall = '' postInstall = ''
for i in "$out/bin/"*; do for i in "$out/bin/"*; do

38
pkgs/top-level/perl-packages.nix
View File

@ -956,11 +956,11 @@ rec {
propagatedBuildInputs = [ FileFindRule ]; propagatedBuildInputs = [ FileFindRule ];
}; };
DataDump = buildPerlPackage { DataDump = buildPerlPackage rec {
name = "Data-Dump-1.11"; name = "Data-Dump-1.21";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz; url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
sha256 = "0h5y40b6drgsf87nhwhqx1dprq70f98ibm03l9al4ndq7mrx97dd"; sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx";
}; };
}; };
@ -1082,10 +1082,10 @@ rec {
}; };
DateTimeLocale = buildPerlPackage rec { DateTimeLocale = buildPerlPackage rec {
name = "DateTime-Locale-0.42"; name = "DateTime-Locale-0.45";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
sha256 = "1cvp9a4j6vy3xpbv6ipzcz1paw7gzal7lkrbm5ipiilji47d5gaw"; sha256 = "175grkrxiv012n6ch3z1sip4zprcili6m5zqi3njdk5c1gdvi8ca";
}; };
propagatedBuildInputs = [ListMoreUtils ParamsValidate]; propagatedBuildInputs = [ListMoreUtils ParamsValidate];
}; };
@ -1259,12 +1259,12 @@ rec {
}; };
EmailAbstract = buildPerlPackage rec { EmailAbstract = buildPerlPackage rec {
name = "Email-Abstract-3.001"; name = "Email-Abstract-3.004";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
sha256 = "1ziy44ibnwg4wjlm5lqdrys8x8xndxkzycnjwp2s6harjy2fqqxw"; sha256 = "0fiaagxc2hy5g3qiipv4cspkwbaggdmsxbll1f4jx2qnq5hm668d";
}; };
propagatedBuildInputs = [EmailSimple]; propagatedBuildInputs = [ EmailSimple MROCompat ];
}; };
EmailAddress = buildPerlPackage rec { EmailAddress = buildPerlPackage rec {
@ -3330,10 +3330,10 @@ rec {
}; };
TestDeep = buildPerlPackage rec { TestDeep = buildPerlPackage rec {
name = "Test-Deep-0.106"; name = "Test-Deep-0.109";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/F/FD/FDALY/${name}.tar.gz"; url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "1ix4jc5k696sjhv01mvypmmf7a6kpm5wmgq01j644zjkaxh1minz"; sha256 = "0nqqxj00ln3b4pma47bj2rcpblpvipfrchqbcxahlq9lh1q4p5s6";
}; };
propagatedBuildInputs = [TestTester TestNoWarnings]; propagatedBuildInputs = [TestTester TestNoWarnings];
}; };
@ -3374,10 +3374,10 @@ rec {
}; };
TestLongString = buildPerlPackage rec { TestLongString = buildPerlPackage rec {
name = "Test-LongString-0.11"; name = "Test-LongString-0.15";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "0ln3117nfxzq7yxmfk77nnr7116inbjq4bf5v2p0hqlj4damx03d"; sha256 = "0r2i3a35l116ccwx88jwiii2fq4b8wm16sl1lkxm2kh44s4z7s5s";
}; };
}; };
@ -3511,13 +3511,13 @@ rec {
}; };
TestWarn = buildPerlPackage rec { TestWarn = buildPerlPackage rec {
name = "Test-Warn-0.21"; name = "Test-Warn-0.23";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.zip"; url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "0kc09lgl8irx01m276zndl7rsi0dhpkzdc5i1zm077pcj2z9ccmg"; sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0";
}; };
propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode]; propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode];
buildInputs = [TestPod pkgs.unzip]; buildInputs = [TestPod];
}; };
TestWWWMechanize = buildPerlPackage rec { TestWWWMechanize = buildPerlPackage rec {