diff options
author | lassulus <lass@aidsballs.de> | 2016-10-06 07:45:31 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-10-06 07:45:31 +0200 |
commit | fa5816431ce0314b1c3260c763a87922b0ad485b (patch) | |
tree | 89f2f942ccdac038706ae6ac890a4111b42ca87d /makefu/2configs/default.nix | |
parent | 61ada606d8ee39c7f3f00be156af7843a6dfc16b (diff) | |
parent | 1daec454eb524925eebf407c54a0e9d925b2bb7a (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/default.nix')
-rw-r--r-- | makefu/2configs/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index cdaa38f27..a7c2a983e 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,7 +22,7 @@ with config.krebs.lib; build = { user = config.krebs.users.makefu; 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 git = { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; }; } |