public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "allow out-of-tree nixos modules" 

This reverts commit b609ff4fcf.

It turns out this can just be done using "require".
This commit is contained in:
Mathijs Kwik 2012-07-21 18:30:58 +02:00
parent b609ff4fcf
commit 26bf696350
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
default.nix
View File

@ -1,15 +1,12 @@
{ configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config> { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
, extraModulesPath ? builtins.getEnv "NIXOS_EXTRA_MODULES"
, system ? builtins.currentSystem , system ? builtins.currentSystem
}: }:
let let
extraModules = if extraModulesPath == "" then [] else import extraModulesPath;
eval = import ./lib/eval-config.nix { eval = import ./lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration ] ++ extraModules; modules = [ configuration ];
}; };
inherit (eval) config pkgs; inherit (eval) config pkgs;
@ -17,7 +14,7 @@ let
# This is for `nixos-rebuild build-vm'. # This is for `nixos-rebuild build-vm'.
vmConfig = (import ./lib/eval-config.nix { vmConfig = (import ./lib/eval-config.nix {
inherit system; inherit system;
modules = [ configuration ./modules/virtualisation/qemu-vm.nix ] ++ extraModules; modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
}).config; }).config;
# This is for `nixos-rebuild build-vm-with-bootloader'. # This is for `nixos-rebuild build-vm-with-bootloader'.
@ -27,7 +24,7 @@ let
[ configuration [ configuration
./modules/virtualisation/qemu-vm.nix ./modules/virtualisation/qemu-vm.nix
{ virtualisation.useBootLoader = true; } { virtualisation.useBootLoader = true; }
] ++ extraModules; ];
}).config; }).config;
in in

1
modules/security/sudo.nix
View File

@ -35,7 +35,6 @@ in
# Environment variables to keep for root and %wheel. # Environment variables to keep for root and %wheel.
Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
Defaults:root,%wheel env_keep+=NIX_PATH Defaults:root,%wheel env_keep+=NIX_PATH
Defaults:root,%wheel env_keep+=NIXOS_EXTRA_MODULES
Defaults:root,%wheel env_keep+=TERMINFO_DIRS Defaults:root,%wheel env_keep+=TERMINFO_DIRS
# Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.