Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2016-06-23 18:50:53 +02:00
commit f22111ea95
16 changed files with 6 additions and 1 deletions

View file

@ -26,7 +26,9 @@ with config.krebs.lib;
url = https://github.com/nixos/nixpkgs;
rev = "63b9785"; # stable @ 2016-06-01
};
secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
secrets = if getEnv "dummy_secrets" == "true"
then toString <stockholm/makefu/6tests/data/secrets>
else "/home/makefu/secrets/${config.krebs.build.host.name}";
stockholm = "/home/makefu/stockholm";
# Defaults for all stockholm users?

View file

@ -0,0 +1 @@
"derp"

View file

@ -0,0 +1 @@
{}

View file

@ -0,0 +1 @@
"derp"

View file

View file