summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-07-12 18:00:23 +0200
committerlassulus <lassulus@lassul.us>2017-07-12 19:09:50 +0200
commit007608f01290516f45eeb56874d507bca01fb57d (patch)
treedf70f63c6b4a3ffa9446dcd0f6881fdeacb0ba6e
parentbe2a5a88c4914f27571e19ffd73389fc0cb6c3d9 (diff)
tv source: make nixpkgs ref easily overridable
-rw-r--r--tv/source.nix37
1 files changed, 21 insertions, 16 deletions
diff --git a/tv/source.nix b/tv/source.nix
index 7306cd954..4ede976d3 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
+ ]