summary refs log tree commit diff
path: root/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-08 15:59:15 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-02-08 15:59:15 +0000
commitce250ffb37ec6fc6059c38fa4f23f598f0f50350 (patch)
treed8a683a2d8affe9910920afef063f54d69442752 /default.nix
parent1f81bcae40cec8ffeb08aff1746388ec69466666 (diff)
downloadnixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar.gz
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar.bz2
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar.lz
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar.xz
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.tar.zst
nixlib-ce250ffb37ec6fc6059c38fa4f23f598f0f50350.zip
* Installation CD: include a lot of modules (SATA, PATA, Firewire,
  USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index 09c9a1569d88..fcf12b80479f 100644
--- a/default.nix
+++ b/default.nix
@@ -18,14 +18,18 @@ in
     initialRamdisk
     kernel
     nix
-    nixosCheckout
-    nixosInstall
-    nixosRebuild
     system
     systemPath
     config
     ;
 
+  inherit (system.nixosTools)
+    nixosCheckout
+    nixosHardwareScan
+    nixosInstall
+    nixosRebuild
+    ;    
+    
   nixFallback = system.nix;
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it