From d999dc6d2536cb378e057a55759457fdfb5db7a4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 24 Oct 2016 14:38:54 +0200
Subject: tv: DRY up ca-bundle defs

---
 tv/2configs/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 39d0c4f6b..0854e53c2 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -112,13 +112,14 @@ with import <stockholm/lib>;
       };
     }
 
-    (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
-      environment.variables = {
-        CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-        GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-        SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-      };
-    })
+    {
+      environment.variables =
+        flip genAttrs (_: "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") [
+          "CURL_CA_BUNDLE"
+          "GIT_SSL_CAINFO"
+          "SSL_CERT_FILE"
+        ];
+    }
 
     {
       services.cron.enable = false;
-- 
cgit v1.2.3


From b364aa96c9b162fc6e87dbfdb9a643551a285f7f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 19:44:53 +0200
Subject: tv nixpkgs: e4fb65a -> 0195ab8

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

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 0854e53c2..1114ac1a5 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9";
+        ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3


From 102d2515bcf4939f064ed791d09a2bf7aab2ff32 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 3 Nov 2016 15:25:56 +0100
Subject: tv nixpkgs: 0195ab8 -> 238c7e0

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

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 1114ac1a5..514d313c1 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731";
+        ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3


From 9ae96685ec9ccadb84a5a7034d1fc627c95d94ec Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Nov 2016 20:50:59 +0100
Subject: tv nixpkgs: 238c7e0 -> 1e1112e

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

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 514d313c1..dbf311479 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e";
+        ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3