diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
| commit | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (patch) | |
| tree | d9ddecb505723c8c45ca2837e08e121f41b49fd2 /lib/tests/modules.sh | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| parent | de66fc6a2a2483f4bbbb759c55176643df6e38ba (diff) | |
Merge master into staging-next
Diffstat (limited to 'lib/tests/modules.sh')
| -rwxr-xr-x | lib/tests/modules.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index c8340ff7f157..8cd632a439cd 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -174,8 +174,7 @@ checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules. checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix ## Paths should be allowed as values and work as expected -# Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/76861 -#checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix +checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix # Check that disabledModules works recursively and correctly checkConfigOutput "true" config.enable ./disable-recursive/main.nix |