From 04b711f516c978e84b334a82008d40dfaad1de1b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 27 Dec 2017 15:32:02 +0100
Subject: tv nixpkgs: d0f0657 -> 53e6d67

---
 tv/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/source.nix')

diff --git a/tv/source.nix b/tv/source.nix
index f3bda271..31308fc9 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -10,7 +10,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 {
-- 
cgit v1.2.3


From 84fdbeba2ceee152a128f5e9013043c172c07ecf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 2 Jan 2018 20:22:44 +0100
Subject: tv source: turn dummy_secrets into an argument

---
 tv/source.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tv/source.nix')

diff --git a/tv/source.nix b/tv/source.nix
index 31308fc9..b5e3f7cd 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) [
-- 
cgit v1.2.3