about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-28 19:09:56 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-03-02 07:01:42 -0600
commit0da421ce17a0226e4880c596702adcc58cb19d6c (patch)
tree6f325383c8f9dc017597d664a0915fbd094def10
parent80e883a7c31b78124c48fa3f60111f1b60c64671 (diff)
downloadnixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar.gz
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar.bz2
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar.lz
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar.xz
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.tar.zst
nixlib-0da421ce17a0226e4880c596702adcc58cb19d6c.zip
nixos/tests: fix Plasma 5 test
-rw-r--r--nixos/release-combined.nix2
-rw-r--r--nixos/release.nix2
-rw-r--r--nixos/tests/plasma5.nix (renamed from nixos/tests/kde5.nix)3
3 files changed, 4 insertions, 3 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 6c048e8a0aca..341724b58475 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -72,7 +72,7 @@ in rec {
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
-        (all nixos.tests.kde5)
+        (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)
diff --git a/nixos/release.nix b/nixos/release.nix
index 2bfe8eada0b8..face44b94e2a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -255,7 +255,7 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
-  tests.kde5 = callTest tests/kde5.nix {};
+  tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.keystone = callTest tests/keystone.nix {};
diff --git a/nixos/tests/kde5.nix b/nixos/tests/plasma5.nix
index 2b61d6f3f0a1..3dd5121607a0 100644
--- a/nixos/tests/kde5.nix
+++ b/nixos/tests/plasma5.nix
@@ -17,7 +17,8 @@ import ./make-test.nix ({ pkgs, ...} :
         user = "alice";
       };
     };
-    services.xserver.desktopManager.kde5.enable = true;
+    services.xserver.desktopManager.plasma5.enable = true;
+    services.xserver.desktopManager.default = "plasma5";
     virtualisation.writableStore = false; # FIXME
   };