summary refs log tree commit diff
path: root/nixos/release.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-18 17:48:37 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-18 17:48:37 -0400
commit5ccb99e372e0b811c330788fdc863937db020079 (patch)
treec09b9db67eb14b7adb38580e6972a142c032c636 /nixos/release.nix
parente1a538c0da9107c67dabb5b649b21d575fa1d812 (diff)
parent974fa94fd81204645150f03543288ddb481a8b67 (diff)
downloadnixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar.gz
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar.bz2
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar.lz
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar.xz
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.tar.zst
nixpkgs-5ccb99e372e0b811c330788fdc863937db020079.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/release.nix')
-rw-r--r--nixos/release.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index 04970f1c188..0e7befbf129 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -403,6 +403,7 @@ in rec {
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
+  tests.xss-lock = callTest tests/xss-lock.nix {};
   tests.yabar = callTest tests/yabar.nix {};
   tests.zookeeper = callTest tests/zookeeper.nix {};