summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-07-17 19:38:46 +0200
committerjeschli <jeschli@gmail.com>2018-07-17 19:38:46 +0200
commit113a6cb4192693d06651d8e51626c681accfc28b (patch)
tree80c00b9a158e2b57039ae49799a9f04b1ebc6228 /makefu
parent8abbda9061c7fc3f04ca580a7435085cab8a8c83 (diff)
parent74698c904460db569a3c6c8355c0b25a94c98800 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'makefu')
-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;