diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-09-09 10:10:57 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-09-09 10:12:38 -0500 |
| commit | e5a79b0eaeb10e91b002c3d710df1564c684a93b (patch) | |
| tree | 75495fe37dd5ab3cc4639ed3db69900fa1eda384 /nixos | |
| parent | 0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469 (diff) | |
| download | nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar.gz nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar.bz2 nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar.lz nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar.xz nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.tar.zst nixlib-e5a79b0eaeb10e91b002c3d710df1564c684a93b.zip | |
nixos/tests/kde5: rename from sddm-kde5 and run by default
(cherry picked from commit 701f02a6eed902835e3d2a27838723cd9a7bb66a)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/kde5.nix (renamed from nixos/tests/sddm-kde5.nix) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2eb40416bd02..70b29aa23a5b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -73,6 +73,7 @@ in rec { (all nixos.tests.ipv6) (all nixos.tests.i3wm) (all nixos.tests.kde4) + (all nixos.tests.kde5) #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) diff --git a/nixos/release.nix b/nixos/release.nix index a5b4ab5f04cf..9ac96959a083 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -251,6 +251,7 @@ in rec { tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.kde4 = callTest tests/kde4.nix {}; + tests.kde5 = callTest tests/kde5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); @@ -284,7 +285,6 @@ in rec { tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.sddm = callTest tests/sddm.nix {}; - tests.sddm-kde5 = callTest tests/sddm-kde5.nix {}; tests.simple = callTest tests/simple.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; diff --git a/nixos/tests/sddm-kde5.nix b/nixos/tests/kde5.nix index 787dd2f8cbdd..787dd2f8cbdd 100644 --- a/nixos/tests/sddm-kde5.nix +++ b/nixos/tests/kde5.nix |