From 5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jan 2008 11:30:41 +0000
Subject: [PATCH] * Nix 0.11.

svn path=/nixpkgs/trunk/; revision=10036
---
 pkgs/tools/package-management/nix/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix               |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 55c20a4b837..128bc23dd4b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2
+{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation {
-  name = "nix-0.10.1";
+  name = "nix-0.11";
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2;
-    md5 = "22dc0c024ca5bb477da0b38ba834dbf2";
+    url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2;
+    md5 = "890c25ac0005ff466683869efc288b67";
   };
   
-  buildInputs = [perl curl];
+  buildInputs = [perl curl openssl];
 
   configureFlags = "
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 065da543d9a..ac7fef880a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4907,9 +4907,9 @@ rec {
   };
 
   nix = import ../tools/package-management/nix {
-    inherit fetchurl stdenv perl curl bzip2;
+    inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
-    db4 = db44;
+    db4 = db45;
   };
 
   nixStatic = import ../tools/package-management/nix-static {