From 41306a7f7767fe0cf3c78db225f482a6c16cf8fc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 17:53:41 +0200
Subject: lib.eval-source: allow source to be a list

---
 lib/eval-source.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/eval-source.nix b/lib/eval-source.nix
index de5f0b43c..468fc92d1 100644
--- a/lib/eval-source.nix
+++ b/lib/eval-source.nix
@@ -3,13 +3,11 @@ let
   eval = _file: source: evalModules {
     modules = singleton {
       inherit _file;
+      imports = map (source: { inherit source; }) (toList source);
       options.source = mkOption {
         type = types.attrsOf types.source;
         default = {};
       };
-      config = {
-        inherit source;
-      };
     };
   };
 in
-- 
cgit v1.2.3


From 1f4ecce80fde62324b683b4f7d85adbbe1ce97a5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 18:00:23 +0200
Subject: 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
+  ]
-- 
cgit v1.2.3


From cf87abf900db22e9f7148981df2923e5fba6ade9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 12 Jul 2017 18:01:18 +0200
Subject: tv alnus source: overrid nixpkgs ref

---
 tv/1systems/alnus/config.nix | 1 -
 tv/1systems/alnus/source.nix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index d08a2901b..dd9e594fc 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -58,7 +58,6 @@ with import <stockholm/lib>;
   krebs.build = {
     host = config.krebs.hosts.alnus;
     user = mkForce config.krebs.users.dv;
-    source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
   };
 
   networking.networkmanager.enable = true;
diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
index f9dcefee6..c3ed4dcfb 100644
--- a/tv/1systems/alnus/source.nix
+++ b/tv/1systems/alnus/source.nix
@@ -1,3 +1,4 @@
 import <stockholm/tv/source.nix> {
   name = "alnus";
+  override.nixpkgs.git.ref = "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
 }
-- 
cgit v1.2.3