From 29df27f4690f46bd17879a0041351af517fddafe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Mar 2012 15:31:14 +0000
Subject: [PATCH] * Fix some Hydra dependencies that broke due to the Perl
 upgrade.

svn path=/nixpkgs/trunk/; revision=33020
---
 .../tools/misc/binutils/default.nix           |  9 ++++-
 pkgs/development/tools/misc/hydra/default.nix | 13 ++++---
 pkgs/top-level/perl-packages.nix              | 38 +++++++++----------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 353cd9f40bce..94d861652722 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
 
 let basename = "binutils-2.21.1a"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation ( rec {
   name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
@@ -65,4 +65,9 @@ stdenv.mkDerivation rec {
        collision due to the ld/as wrappers/symlinks in the latter. */
     priority = "10";
   };
-}
+} // (stdenv.lib.optionalAttrs gold { 
+  postInstall = ''
+    rm $out/bin/ld
+    ln -sf $out/bin/ld.gold $out/bin/ld
+  '';
+} ) )
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index caa277bfbf5f..3dae4c7c6eee 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -40,18 +40,19 @@ stdenv.mkDerivation {
   name = "hydra-${version}";
 
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz;
-    sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz";
+    url = "http://hydra.nixos.org/build/1264023/download/2/hydra-${version}.tar.gz";
+    sha256 = "62cecc2da9cb0353ab4eb1f66b6783c0195421c35ba6b6eace9d3b56a9275631";
   };
 
   configureFlags = "--with-nix=${nix}";
 
   buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ;
 
-  hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
-    libxslt sqlite subversion openssh nix coreutils findutils
-    gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz
-    rpm dpkg cdrkit]));
+  hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( 
+    [ libxslt sqlite subversion openssh nix coreutils findutils
+      gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz
+      rpm dpkg cdrkit
+    ]));
 
   postInstall = ''
     for i in "$out/bin/"*; do
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 359ade8a0e1e..2ace23d1423c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -956,11 +956,11 @@ rec {
     propagatedBuildInputs = [ FileFindRule ];
   };
 
-  DataDump = buildPerlPackage {
-    name = "Data-Dump-1.11";
+  DataDump = buildPerlPackage rec {
+    name = "Data-Dump-1.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.11.tar.gz;
-      sha256 = "0h5y40b6drgsf87nhwhqx1dprq70f98ibm03l9al4ndq7mrx97dd";
+      url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
+      sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx";
     };
   };
 
@@ -1082,10 +1082,10 @@ rec {
   };
 
   DateTimeLocale = buildPerlPackage rec {
-    name = "DateTime-Locale-0.42";
+    name = "DateTime-Locale-0.45";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
-      sha256 = "1cvp9a4j6vy3xpbv6ipzcz1paw7gzal7lkrbm5ipiilji47d5gaw";
+      sha256 = "175grkrxiv012n6ch3z1sip4zprcili6m5zqi3njdk5c1gdvi8ca";
     };
     propagatedBuildInputs = [ListMoreUtils ParamsValidate];
   };
@@ -1259,12 +1259,12 @@ rec {
   };
 
   EmailAbstract = buildPerlPackage rec {
-    name = "Email-Abstract-3.001";
+    name = "Email-Abstract-3.004";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "1ziy44ibnwg4wjlm5lqdrys8x8xndxkzycnjwp2s6harjy2fqqxw";
+      sha256 = "0fiaagxc2hy5g3qiipv4cspkwbaggdmsxbll1f4jx2qnq5hm668d";
     };
-    propagatedBuildInputs = [EmailSimple];
+    propagatedBuildInputs = [ EmailSimple MROCompat ];
   };
 
   EmailAddress = buildPerlPackage rec {
@@ -3330,10 +3330,10 @@ rec {
   };
 
   TestDeep = buildPerlPackage rec {
-    name = "Test-Deep-0.106";
+    name = "Test-Deep-0.109";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/F/FD/FDALY/${name}.tar.gz";
-      sha256 = "1ix4jc5k696sjhv01mvypmmf7a6kpm5wmgq01j644zjkaxh1minz";
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "0nqqxj00ln3b4pma47bj2rcpblpvipfrchqbcxahlq9lh1q4p5s6";
     };
     propagatedBuildInputs = [TestTester TestNoWarnings];
   };
@@ -3374,10 +3374,10 @@ rec {
   };
 
   TestLongString = buildPerlPackage rec {
-    name = "Test-LongString-0.11";
+    name = "Test-LongString-0.15";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz";
-      sha256 = "0ln3117nfxzq7yxmfk77nnr7116inbjq4bf5v2p0hqlj4damx03d";
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "0r2i3a35l116ccwx88jwiii2fq4b8wm16sl1lkxm2kh44s4z7s5s";
     };
   };
 
@@ -3511,13 +3511,13 @@ rec {
   };
 
   TestWarn = buildPerlPackage rec {
-    name = "Test-Warn-0.21";
+    name = "Test-Warn-0.23";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.zip";
-      sha256 = "0kc09lgl8irx01m276zndl7rsi0dhpkzdc5i1zm077pcj2z9ccmg";
+      url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
+      sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0";
     };
     propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode];
-    buildInputs = [TestPod pkgs.unzip];
+    buildInputs = [TestPod];
   };
 
   TestWWWMechanize = buildPerlPackage rec {