From 1f4ecce80fde62324b683b4f7d85adbbe1ce97a5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 18:00:23 +0200
Subject: [PATCH] tv source: make nixpkgs ref easily overridable
---
tv/source.nix | 37 +++++++++++++++++++++----------------
1 file 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
+ ]