diff options
author | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
commit | 65165f422d8e08f29ec269a3ce98e7ebfa22c622 (patch) | |
tree | 13d15f63626129c439840a4b406e3fe4e693096f /makefu/2configs/default.nix | |
parent | 38d26c551cf3c53151120646a893a13990b21c5c (diff) | |
parent | 8458ffd7a00a3e4c734755de7d72f95458d1bb52 (diff) |
Merge remote-tracking branch 'prism/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"; }; } |