From 265c313feb8f87448e7cd99bcce534e840fbfa8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Nov 2006 12:49:46 +0000 Subject: [PATCH] * Revive nixUnstable. svn path=/nixpkgs/trunk/; revision=7060 --- pkgs/misc/nix/unstable.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/nix/unstable.nix diff --git a/pkgs/misc/nix/unstable.nix b/pkgs/misc/nix/unstable.nix new file mode 100644 index 00000000000..8bd9f0273f8 --- /dev/null +++ b/pkgs/misc/nix/unstable.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2 +, storeDir ? "/nix/store" +, stateDir ? "/nix/var" +}: + +stdenv.mkDerivation { + name = "nix-0.11pre7038"; + + src = fetchurl { + url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre7038/nix-0.11pre7038.tar.bz2; + md5 = "a63837b67064900deaa67416fc67430d"; + }; + + buildInputs = [perl curl]; + + configureFlags = " + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} + --disable-init-state"; + + meta = { + description = "The Nix Deployment System"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a54c7df6d29..9eefb0eb661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2831,7 +2831,12 @@ rec { bdb = db4; }; - nixUnstable = nix; + # The bleeding edge. + nixUnstable = import ../misc/nix/unstable.nix { + inherit fetchurl stdenv perl curl bzip2; + aterm = aterm242fixes; + db4 = db45; + }; polytable = import ../misc/tex/polytable { inherit fetchurl stdenv tetex lazylist;