diff options
| author | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
| commit | 183b001e1aca601e420ef07ec4944a15c13a8d2c (patch) | |
| tree | 9d34f79c2ee7cb073a39ab44ef2795055a42d067 /tv/source.nix | |
| parent | ea85e788ae2a6ca24ccb997372542f7f2a104080 (diff) | |
| parent | e083b18e34519f30bba79dfd894c3b828fd13da7 (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'tv/source.nix')
| -rw-r--r-- | tv/source.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tv/source.nix b/tv/source.nix index f3bda2715..b5e3f7cd7 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -1,8 +1,10 @@ with import <stockholm/lib>; -host@{ name, secure ? false, override ? {} }: let - builder = if getEnv "dummy_secrets" == "true" - then "buildbot" - else "tv"; +{ name +, dummy_secrets ? getEnv "dummy_secrets" == "true" +, override ? {} +, secure ? false +}@host: let + builder = if dummy_secrets then "buildbot" else "tv"; _file = <stockholm> + "/tv/1systems/${name}/source.nix"; in evalSource (toString _file) [ @@ -10,7 +12,7 @@ in nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; nixpkgs.git = { # nixos-17.09 - ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887"; + ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72"; url = https://github.com/NixOS/nixpkgs; }; secrets.file = getAttr builder { |