From 56e0e2fbeae1f778be663b7c78dd9a65d062402b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Mar 2007 15:44:23 +0000 Subject: [PATCH] * Latest unstable Nix. Add OpenSSL as a dependency. svn path=/nixpkgs/trunk/; revision=8137 --- pkgs/misc/nix/unstable.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/nix/unstable.nix b/pkgs/misc/nix/unstable.nix index 56030eb69be2..6eb7998bf4c2 100644 --- a/pkgs/misc/nix/unstable.nix +++ b/pkgs/misc/nix/unstable.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.11pre8085"; + name = "nix-0.11pre8133"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8085/nix-0.11pre8085.tar.bz2; - md5 = "5690869fc2d3ef70a221b42282315980"; + url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8133/nix-0.11pre8133.tar.bz2; + md5 = "33c28fcd97d5ae64e9219897b36cc6e4)"; }; - 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 8427abfdc665..9aa7f144c4d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3102,7 +3102,7 @@ rec { # The bleeding edge. nixUnstable = import ../misc/nix/unstable.nix { - inherit fetchurl stdenv perl curl bzip2; + inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; db4 = db45; };