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

Merge pull request #76857 from Infinisil/recursive-disableModules

Browse Source 
Apply `disabledModules` recursively
This commit is contained in:
Silvan Mosberger
2020-01-09 18:20:12 +01:00
committed by GitHub
parent 4052aa377e a6462a4a8b
commit e9c16ec186
10 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tests/modules.sh
View File

@@ -177,6 +177,12 @@ checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.
# Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/76861
#checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
# Check that disabledModules works recursively and correctly
checkConfigOutput "true" config.enable ./disable-recursive/main.nix
checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix}
checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix}
checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}
cat <<EOF
====== module tests ======
$pass Pass