summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-07-09 19:23:01 +0200
committerlassulus <lass@blue.r>2018-07-09 19:23:01 +0200
commit6308cd0d357a5d1d94592981de8960c78aebc490 (patch)
treec83fa4f9978b6a14194b34ea0a26b392ed748355
parentc9c23c347d4b553662de820fa32868024451bb94 (diff)
parentd3ec5d2a07af04cc9bb72960f29e3cf069a35f2e (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--makefu/1systems/nextgum/config.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/makefu/1systems/nextgum/config.nix b/makefu/1systems/nextgum/config.nix
index a23ccf7b2..93171d23a 100644
--- a/makefu/1systems/nextgum/config.nix
+++ b/makefu/1systems/nextgum/config.nix
@@ -52,7 +52,7 @@ in {
<stockholm/makefu/2configs/iodined.nix>
## buildbot
- #<stockholm/makefu/2configs/remote-build/slave.nix>
+ <stockholm/makefu/2configs/remote-build/slave.nix>
# Removed until move: no extra mails
# <stockholm/makefu/2configs/urlwatch>
@@ -94,6 +94,7 @@ in {
## Temporary:
# <stockholm/makefu/2configs/temp/rst-issue.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix>
+ <stockholm/makefu/2configs/virtualisation/libvirt.nix>
#{
# services.dockerRegistry.enable = true;