diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
| commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
| tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /nixos/release.nix | |
| parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
| parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
| download | nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixpkgs-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip | |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 0e7befbf129..78448b5c970 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -384,6 +384,7 @@ in rec { tests.sddm = callSubTests tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; tests.slim = callTest tests/slim.nix {}; + tests.slurm = callTest tests/slurm.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; |