summary refs log tree commit diff
path: root/lib/tests/modules
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-01-09 18:20:12 +0100
committerGitHub <noreply@github.com>2020-01-09 18:20:12 +0100
commite9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8 (patch)
tree6843c9cf711a97041ba6c964e7a8528e1ae0cae0 /lib/tests/modules
parent4052aa377e4b1f50ee3f7b147177d1f1d966cf1b (diff)
parenta6462a4a8b9d55586f8706484c155b2de2a34877 (diff)
downloadnixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar.gz
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar.bz2
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar.lz
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar.xz
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.tar.zst
nixpkgs-e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8.zip
Merge pull request #76857 from Infinisil/recursive-disableModules
Apply `disabledModules` recursively
Diffstat (limited to 'lib/tests/modules')
-rw-r--r--lib/tests/modules/disable-recursive/bar.nix5
-rw-r--r--lib/tests/modules/disable-recursive/disable-bar.nix7
-rw-r--r--lib/tests/modules/disable-recursive/disable-foo.nix7
-rw-r--r--lib/tests/modules/disable-recursive/foo.nix5
-rw-r--r--lib/tests/modules/disable-recursive/main.nix8
5 files changed, 32 insertions, 0 deletions
diff --git a/lib/tests/modules/disable-recursive/bar.nix b/lib/tests/modules/disable-recursive/bar.nix
new file mode 100644
index 00000000000..4d9240a432d
--- /dev/null
+++ b/lib/tests/modules/disable-recursive/bar.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../declare-enable.nix
+  ];
+}
diff --git a/lib/tests/modules/disable-recursive/disable-bar.nix b/lib/tests/modules/disable-recursive/disable-bar.nix
new file mode 100644
index 00000000000..987b2802ae8
--- /dev/null
+++ b/lib/tests/modules/disable-recursive/disable-bar.nix
@@ -0,0 +1,7 @@
+{
+
+  disabledModules = [
+    ./bar.nix
+  ];
+
+}
diff --git a/lib/tests/modules/disable-recursive/disable-foo.nix b/lib/tests/modules/disable-recursive/disable-foo.nix
new file mode 100644
index 00000000000..5b68a3c4610
--- /dev/null
+++ b/lib/tests/modules/disable-recursive/disable-foo.nix
@@ -0,0 +1,7 @@
+{
+
+  disabledModules = [
+    ./foo.nix
+  ];
+
+}
diff --git a/lib/tests/modules/disable-recursive/foo.nix b/lib/tests/modules/disable-recursive/foo.nix
new file mode 100644
index 00000000000..4d9240a432d
--- /dev/null
+++ b/lib/tests/modules/disable-recursive/foo.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../declare-enable.nix
+  ];
+}
diff --git a/lib/tests/modules/disable-recursive/main.nix b/lib/tests/modules/disable-recursive/main.nix
new file mode 100644
index 00000000000..48a3c6218cf
--- /dev/null
+++ b/lib/tests/modules/disable-recursive/main.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./foo.nix
+    ./bar.nix
+  ];
+
+  enable = true;
+}