diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-11 17:54:00 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-11 17:54:00 +0200 |
| commit | 798f90c0fd8931ef114f7c7db32daa9f15824733 (patch) | |
| tree | e241892be8c85d05d297f11a5d312d41e2cb8f66 /makefu/2configs/default.nix | |
| parent | b6c5994e037ab92055f5cfdeb89f46864b348b39 (diff) | |
| parent | fa5816431ce0314b1c3260c763a87922b0ad485b (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"; }; } |