From c8b64ef689442f9989f818d9d592542da95843a4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 8 Oct 2006 22:05:06 +0000
Subject: [PATCH] we can safely use the stable version again

svn path=/nixu/trunk/; revision=6680
---
 fill-disk.sh | 2 +-
 make-disk.sh | 2 +-
 pkgs.nix     | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index fc9fc78deb7..52078fad147 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -248,7 +248,7 @@ unset NIX_CONF_DIR
 ## Fix this. Probably nix-instantiate, then nix-store -r.
 ## Also make sure everything gets installed into an actual profile!
 
-$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nixUnstable
+$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nix
 $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils
 $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep
 #$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel
diff --git a/make-disk.sh b/make-disk.sh
index 186e42e549b..6e9893a345a 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -35,7 +35,7 @@ initrd=/tmp/initram.img
 initdir=${archivesDir}/initdir
 initscript=$archivesDir/scripts/init.sh
 
-nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
+nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
 nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
 nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
diff --git a/pkgs.nix b/pkgs.nix
index b774ce33fb7..794ccce4ed8 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,7 +2,7 @@ rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
     findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
-    e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
+    e2fsprogs nettools nix subversion gcc wget which vim less screen
     openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
     gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
     module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
@@ -13,8 +13,7 @@ rec {
     e2fsprogs nettools subversion gcc wget which vim less screen openssh
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
-    nano;
-    nix = nixUnstable;
+    nano nix;
   };
 
   #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet