Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 2 default: remove trace, use || instead of or

Browse Source
This commit is contained in:
makefu 2016-09-07 15:52:18 +02:00
parent df48b1cce8
commit 907499c10b
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefu/2configs/default.nix
View File

@ -22,9 +22,9 @@ with config.krebs.lib;
build = { build = {
user = config.krebs.users.makefu; user = config.krebs.users.makefu;
source = let inherit (config.krebs.build) host user; in { source = let inherit (config.krebs.build) host user; in {
nixpkgs = if config.makefu.full-populate or (getEnv "dummy_secrets" == "true") then nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{ # stable @ 2016-07-20 { # stable @ 2016-07-20
git = trace "Populating nixpkgs via full clone" { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; }; git = { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; };
} }
else else
# TODO use http, once it is implemented # TODO use http, once it is implemented
@ -32,7 +32,7 @@ with config.krebs.lib;
## prepare so we do not have to wait for rsync: ## prepare so we do not have to wait for rsync:
## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs ## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs
trace "Populating nixpkgs with local directory" { file = "/home/makefu/store/125ffff";}; { file = "/home/makefu/store/125ffff";};
secrets.file = secrets.file =
if getEnv "dummy_secrets" == "true" if getEnv "dummy_secrets" == "true"
then toString <stockholm/makefu/6tests/data/secrets> then toString <stockholm/makefu/6tests/data/secrets>