diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-01 18:20:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-01 21:56:01 +0100 |
| commit | fcec3e1c72ad7ac7eaacd00c8fc87dc04696fdb0 (patch) | |
| tree | b4a375a8a105886206cc6646128c283a6d8f6680 /lib/tests/modules | |
| parent | 4150920a51c911b45a39f512b4292c1de63990c3 (diff) | |
Revert "modules: add support for module replacement with disabledModules"
This reverts commit 3f2566689d14f1d7778d55ca807d1dad2f4695d1 for now. Evaluation of the tested job got broken, blocking nixos-unstable.
Diffstat (limited to 'lib/tests/modules')
| -rw-r--r-- | lib/tests/modules/default.nix | 1 | ||||
| -rw-r--r-- | lib/tests/modules/disable-declare-enable.nix | 5 | ||||
| -rw-r--r-- | lib/tests/modules/disable-define-enable.nix | 5 | ||||
| -rw-r--r-- | lib/tests/modules/disable-enable-modules.nix | 5 |
4 files changed, 0 insertions, 16 deletions
diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix index 5b0947104198c..c5ce9cb3e3b80 100644 --- a/lib/tests/modules/default.nix +++ b/lib/tests/modules/default.nix @@ -3,6 +3,5 @@ { inherit (lib.evalModules { inherit modules; - specialArgs.modulesPath = ./.; }) config options; } diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix deleted file mode 100644 index a373ee7e550eb..0000000000000 --- a/lib/tests/modules/disable-declare-enable.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ ./declare-enable.nix ]; -} diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix deleted file mode 100644 index 0d84a7c3cb6c8..0000000000000 --- a/lib/tests/modules/disable-define-enable.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ ./define-enable.nix ]; -} diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix deleted file mode 100644 index c325f4e074318..0000000000000 --- a/lib/tests/modules/disable-enable-modules.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - disabledModules = [ "define-enable.nix" "declare-enable.nix" ]; -} |