Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2018-07-09 19:23:01 +02:00
commit 6308cd0d35

View File

@ -52,7 +52,7 @@ in {
<stockholm/makefu/2configs/iodined.nix> <stockholm/makefu/2configs/iodined.nix>
## buildbot ## buildbot
#<stockholm/makefu/2configs/remote-build/slave.nix> <stockholm/makefu/2configs/remote-build/slave.nix>
# Removed until move: no extra mails # Removed until move: no extra mails
# <stockholm/makefu/2configs/urlwatch> # <stockholm/makefu/2configs/urlwatch>
@ -94,6 +94,7 @@ in {
## Temporary: ## Temporary:
# <stockholm/makefu/2configs/temp/rst-issue.nix> # <stockholm/makefu/2configs/temp/rst-issue.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
#{ #{
# services.dockerRegistry.enable = true; # services.dockerRegistry.enable = true;