diff options
| author | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-01-04 00:21:13 +0100 |
| commit | 8c6bd7431c8620fa65466e880fbd38e2c555367d (patch) | |
| tree | 9d73f67cf751a6f3f99b6a5a0c3dd0ddaee16382 /krebs/2configs | |
| parent | 6ad170e7621668fdcf03aab37d1f9843e446d2da (diff) | |
| parent | a9f803207243425d5c06ce82820c27a4de8af5ad (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/buildbot-all.nix | 1 | ||||
| -rw-r--r-- | krebs/2configs/hw/x220.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index 8a647012f..ca994e996 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -9,5 +9,6 @@ with import <stockholm/lib>; krebs.ci.enable = true; krebs.ci.treeStableTimer = 1; krebs.ci.hosts = filter (getAttr "ci") (attrValues config.krebs.hosts); + krebs.ci.tests = [ "deploy" ]; } diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index 44743b87d..90a1a111f 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -23,7 +23,7 @@ with import <stockholm/lib>; pkgs.vaapiVdpau ]; - security.rngd.enable = true; + security.rngd.enable = mkDefault true; services.xserver = { videoDriver = "intel"; |