* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33971

4 files changed, 28 insertions, 9 deletions

diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix
new file mode 100644
index 000000000000..ecbd46de52c2
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix
@@ -0,0 +1,19 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "0.14.0";
+  sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 13534b7dbd4b..9c17b9b78f7f 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre30527";
+  name = "disnix-0.3pre32254";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1926928/download/4/disnix-0.3pre30527.tar.gz;
-    sha256 = "1mdcxyrz60nxcyn116i41nhh94r9hacvyilkjyjfiyf8d58pji1y";
+    url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
+    sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index f9c9aa8c593e..93cd2f3f846d 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2pre31830";
+  name = "disnixos-0.2pre33586";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/1934498/download/3/disnixos-0.2pre31830.tar.gz;
-    sha256 = "02f2b4lk1gr24rqs56az82b3h3mnqrk1m48bcj21x109g4vrlpmm";
+    url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
+    sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
   };
   
   buildInputs = [ socat pkgconfig disnix ];
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index ce62eb1e5621..912248b694c3 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2632_b8fb0ce";
+  name = "nix-1.0pre2668_46cdc6a";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2";
-    sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da";
+    url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2";
+    sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a";
   };
 
   buildNativeInputs = [ perl pkgconfig ];