diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-27 23:14:38 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-27 23:14:38 +0000 |
commit | 3c6ae39a0d810c098f503710278c46c8cd015003 (patch) | |
tree | e4c512cf3b9d0e20e3926ec2a6051fef3dec5d2f /default.nix | |
parent | 0109b7e44fa8fa949b6a33b2a30c3c8dbc8f6616 (diff) | |
download | nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar.gz nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar.bz2 nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar.lz nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar.xz nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.tar.zst nixpkgs-3c6ae39a0d810c098f503710278c46c8cd015003.zip |
* Refactoring: moved some options out of system/options.nix (almost
empty now), do more of bashrc.sh declaratively, and moved nsswitch generation to modules/config/nsswitch.nix. svn path=/nixos/branches/modular-nixos/; revision=15754
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/default.nix b/default.nix index df69ee4c3e2..17a417306b2 100644 --- a/default.nix +++ b/default.nix @@ -23,11 +23,9 @@ in config.environment.checkConfigurationOptions optionDeclarations config; - nix = config.environment.nix; - + # The following are used by nixos-rebuild. nixFallback = pkgs.nixUnstable; - - manifests = config.installer.manifests; # exported here because nixos-rebuild uses it + manifests = config.installer.manifests; tests = config.tests; } |