diff options
author | tv <tv@krebsco.de> | 2017-07-12 18:00:23 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-07-12 19:09:50 +0200 |
commit | b0811bd377bf12d3fc750a058268daa71d48d5f8 (patch) | |
tree | 0d0ee5fc19a5614d17227d2f6901e047b840b9a9 | |
parent | 4698c7733b63bc12072e7a2b29e870c459cf629c (diff) |
tv source: make nixpkgs ref easily overridable
-rw-r--r-- | tv/source.nix | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/tv/source.nix b/tv/source.nix index 7306cd9..4ede976 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -1,22 +1,27 @@ with import <stockholm/lib>; -host@{ name, secure ? false }: let +host@{ name, secure ? false, override ? {} }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "tv"; _file = <stockholm> + "/tv/1systems/${name}/source.nix"; in - evalSource (toString _file) { - nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; - secrets.file = getAttr builder { - buildbot = toString <stockholm/tv/dummy_secrets>; - tv = "/home/tv/secrets/${name}"; - }; - stockholm.file = toString <stockholm>; - secrets-common.file = "/home/tv/secrets/common"; - nixpkgs.git = { - url = https://github.com/NixOS/nixpkgs; - ref = "1b57bf274ae5c76e91b2b264d8aa8bfcecb72102"; # nixos-17.03 - }; - } // optionalAttrs secure { - secrets-master.file = "/home/tv/secrets/master"; - } + evalSource (toString _file) [ + { + nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; + nixpkgs.git = { + # nixos-17.03 + ref = mkDefault "1b57bf274ae5c76e91b2b264d8aa8bfcecb72102"; + url = https://github.com/NixOS/nixpkgs; + }; + secrets.file = getAttr builder { + buildbot = toString <stockholm/tv/dummy_secrets>; + tv = "/home/tv/secrets/${name}"; + }; + secrets-common.file = "/home/tv/secrets/common"; + stockholm.file = toString <stockholm>; + } + (mkIf secure { + secrets-master.file = "/home/tv/secrets/master"; + }) + override + ] |