diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2020-01-12 14:19:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 14:19:04 +0100 |
| commit | 9884cb3ed004984696a64915849afe175ac5c597 (patch) | |
| tree | 6a6b40e2d3abaa9d552f6d3fdffebd07f3bfbeb4 /lib/tests/modules.sh | |
| parent | a23a985594bf7c3eb543bdaf1e7a9c5b6ddd6099 (diff) | |
| parent | 9d4b59b54949f0849ab9db9d30bc4cce7a205787 (diff) | |
| download | nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar.gz nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar.bz2 nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar.lz nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar.xz nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.tar.zst nixpkgs-9884cb3ed004984696a64915849afe175ac5c597.zip | |
Merge pull request #76861 from Infinisil/paths-as-submodules
lib/types: Allow paths as submodule values
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 c8340ff7f15..8cd632a439c 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 |