From 5ec82632f2f7b7af054cee545fadb1c69c927aa6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Jan 2008 13:05:24 +0000
Subject: [PATCH] * Use Nix 0.11.

svn path=/nixos/trunk/; revision=10048
---
 system/options.nix | 22 +++++++++++-----------
 system/system.nix  |  2 --
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 9c903433e1e..0059011f28f 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1768,22 +1768,22 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     nix = mkOption {
-        default = pkgs: pkgs.nixUnstable;
-        example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
-        description = "
-          Use non-default Nix easily. Be careful, though, not to break everything.
-        ";
+      default = pkgs: pkgs.nix;
+      example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
+      description = ''
+        Use non-default Nix easily. Be careful, though, not to break everything.
+      '';
     };
 
   };
   
   nesting = {
-	  children = mkOption {
-	      default = [];
-	      description = "
-		Additional configurations to build.
-	      ";
-	  };
+    children = mkOption {
+      default = [];
+      description = ''
+        Additional configurations to build.
+      '';
+    };
   };
 
 }
diff --git a/system/system.nix b/system/system.nix
index c0edff9778d..825fbf4a434 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -31,7 +31,6 @@ rec {
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  /*nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature*/
   nix = config.environment.nix pkgs;
 
   kernel = config.boot.kernel pkgs;
@@ -237,7 +236,6 @@ rec {
     pkgs.utillinux
     pkgs.wirelesstools
     nix
-    (pkgs.lowPrio (pkgs.nixUnstable)) /* Better safe than sorry */
     nixosInstall
     nixosRebuild
     nixosCheckout