diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-25 17:41:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-25 17:41:03 +0000 |
| commit | 60b3f95ad86826faf95680a3529ced1c322d4d87 (patch) | |
| tree | 161a66b8f4738a02e808e3f0d716192961d3ec9b /default.nix | |
| parent | c96f0d75f0b5cc389dd5aff584f61e8973c78f75 (diff) | |
| download | nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar.gz nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar.bz2 nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar.lz nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar.xz nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.tar.zst nixlib-60b3f95ad86826faf95680a3529ced1c322d4d87.zip | |
* Move the definition of the set of system packages to
modules/config/system-path.nix. system/system.nix is now almost empty. * Removed the cleanStart option - it should be possible to get the same functionality by overriding config.system.path (or defining config.system.systemPackages with a higher priority - don't know if that works though). svn path=/nixos/branches/modular-nixos/; revision=15727
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/default.nix b/default.nix index 9dd73430b668..affb6fdc3ea9 100644 --- a/default.nix +++ b/default.nix @@ -19,7 +19,6 @@ in grubMenuBuilder kernel modulesTree - nix system systemPath config @@ -40,7 +39,9 @@ in modulesClosure ; - nixFallback = system.nix; + nix = system.config.environment.nix; + + nixFallback = (import nixpkgs {}).nixUnstable; manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it |