diff options
| author | lassulus <lass@aidsballs.de> | 2016-08-21 13:16:56 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-08-21 13:16:56 +0200 |
| commit | d50198d880c4be21413f9bb536b784005204beb9 (patch) | |
| tree | 28ea56d3694e7239e532474f677a95f6604c00c5 /makefu/2configs/default.nix | |
| parent | 3eb5f58a0ee9778006d4e37fee17e0b3e096a52a (diff) | |
| parent | d1c4d12cee228cba1da4da7bba82b6cf6cb708ec (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/default.nix')
| -rw-r--r-- | makefu/2configs/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 7e4c87cfb..cdaa38f27 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -22,10 +22,17 @@ with config.krebs.lib; build = { user = config.krebs.users.makefu; source = let inherit (config.krebs.build) host user; in { - nixpkgs.git = { - url = https://github.com/nixos/nixpkgs; - ref = "125ffff"; # stable @ 2016-07-20 - }; + nixpkgs = if config.makefu.full-populate or (getEnv "dummy_secrets" == "true") then + { # stable @ 2016-07-20 + git = { url = https://github.com/nixos/nixpkgs; ref = "125ffff"; }; + } + else + # TODO use http, once it is implemented + # right now it is simply extracted revision folder + + ## 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 + { file = "/home/makefu/store/125ffff";}; secrets.file = if getEnv "dummy_secrets" == "true" then toString <stockholm/makefu/6tests/data/secrets> |