diff options
| author | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
| commit | 183b001e1aca601e420ef07ec4944a15c13a8d2c (patch) | |
| tree | 9d34f79c2ee7cb073a39ab44ef2795055a42d067 /krebs/2configs | |
| parent | ea85e788ae2a6ca24ccb997372542f7f2a104080 (diff) | |
| parent | e083b18e34519f30bba79dfd894c3b828fd13da7 (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/buildbot-all.nix | 5 | ||||
| -rw-r--r-- | krebs/2configs/hw/x220.nix | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix index 8a647012..5ea78f22 100644 --- a/krebs/2configs/buildbot-all.nix +++ b/krebs/2configs/buildbot-all.nix @@ -1,13 +1,10 @@ with import <stockholm/lib>; { lib, config, pkgs, ... }: { - imports = [ - <stockholm/krebs/2configs/repo-sync.nix> - ]; - networking.firewall.allowedTCPPorts = [ 80 8010 9989 ]; 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 44743b87..90a1a111 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"; |