From a7d27b2201036a2d318f788570ad69ff3ef93445 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Mar 2007 09:24:14 +0000
Subject: [PATCH] * Move nix to tools/package-management, and use the latest
 unstable   release.

svn path=/nixpkgs/trunk/; revision=8477
---
 .../package-management}/nix-static/builder.sh               | 0
 .../package-management}/nix-static/default.nix              | 0
 .../package-management}/nix-static/nix-0.10pre5679.patch    | 0
 .../nix-static/nix-0.10pre5896-static.patch                 | 0
 pkgs/{misc => tools/package-management}/nix/default.nix     | 0
 pkgs/{misc => tools/package-management}/nix/unstable.nix    | 6 +++---
 pkgs/top-level/all-packages.nix                             | 6 +++---
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{misc => tools/package-management}/nix-static/builder.sh (100%)
 rename pkgs/{misc => tools/package-management}/nix-static/default.nix (100%)
 rename pkgs/{misc => tools/package-management}/nix-static/nix-0.10pre5679.patch (100%)
 rename pkgs/{misc => tools/package-management}/nix-static/nix-0.10pre5896-static.patch (100%)
 rename pkgs/{misc => tools/package-management}/nix/default.nix (100%)
 rename pkgs/{misc => tools/package-management}/nix/unstable.nix (74%)

diff --git a/pkgs/misc/nix-static/builder.sh b/pkgs/tools/package-management/nix-static/builder.sh
similarity index 100%
rename from pkgs/misc/nix-static/builder.sh
rename to pkgs/tools/package-management/nix-static/builder.sh
diff --git a/pkgs/misc/nix-static/default.nix b/pkgs/tools/package-management/nix-static/default.nix
similarity index 100%
rename from pkgs/misc/nix-static/default.nix
rename to pkgs/tools/package-management/nix-static/default.nix
diff --git a/pkgs/misc/nix-static/nix-0.10pre5679.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch
similarity index 100%
rename from pkgs/misc/nix-static/nix-0.10pre5679.patch
rename to pkgs/tools/package-management/nix-static/nix-0.10pre5679.patch
diff --git a/pkgs/misc/nix-static/nix-0.10pre5896-static.patch b/pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch
similarity index 100%
rename from pkgs/misc/nix-static/nix-0.10pre5896-static.patch
rename to pkgs/tools/package-management/nix-static/nix-0.10pre5896-static.patch
diff --git a/pkgs/misc/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
similarity index 100%
rename from pkgs/misc/nix/default.nix
rename to pkgs/tools/package-management/nix/default.nix
diff --git a/pkgs/misc/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
similarity index 74%
rename from pkgs/misc/nix/unstable.nix
rename to pkgs/tools/package-management/nix/unstable.nix
index 28d2da7f8690..6bd428a2612a 100644
--- a/pkgs/misc/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "nix-0.11pre8349";
+  name = "nix-0.11pre8456";
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8349/nix-0.11pre8349.tar.bz2;
-    md5 = "5f09f4986399b60e35d1815d9c003a2e";
+    url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8456/nix-0.11pre8456.tar.bz2;
+    md5 = "7c6939f94f2a5fe8586df3d39b0e1ab5";
   };
   
   buildInputs = [perl curl openssl];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3defbda5a123..4f327befd25b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3171,20 +3171,20 @@ rec {
     inherit stdenv fetchurl jdk;
   };
 
-  nix = import ../misc/nix {
+  nix = import ../tools/package-management/nix {
     inherit fetchurl stdenv perl curl bzip2;
     aterm = aterm242fixes;
     db4 = db44;
   };
 
-  nixStatic = import ../misc/nix-static {
+  nixStatic = import ../tools/package-management/nix-static {
     inherit fetchurl stdenv perl curl autoconf automake libtool;
     aterm = aterm242fixes;
     bdb = db4;
   };
 
   # The bleeding edge.
-  nixUnstable = import ../misc/nix/unstable.nix {
+  nixUnstable = import ../tools/package-management/nix/unstable.nix {
     inherit fetchurl stdenv perl curl bzip2 openssl;
     aterm = aterm242fixes;
     db4 = db45;