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')

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 49c5be760ff16615527aa88aeada15534b01dc84 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 18:35:28 +0200
Subject: tv netcup: init at 1.0.0

---
 tv/5pkgs/netcup/default.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tv/5pkgs/netcup/default.nix

(limited to 'tv')

diff --git a/tv/5pkgs/netcup/default.nix b/tv/5pkgs/netcup/default.nix
new file mode 100644
index 000000000..2443e9e73
--- /dev/null
+++ b/tv/5pkgs/netcup/default.nix
@@ -0,0 +1,32 @@
+{ coreutils, curl, fetchgit, gawk, gnugrep, gnused, jq, stdenv, w3m, ... }:
+with import <stockholm/lib>;
+let
+  readJSON = path: fromJSON (readFile path);
+  sed.escape = replaceChars ["/"] ["\\/"]; # close enough
+  PATH = makeBinPath [
+    coreutils
+    curl
+    gawk
+    gnugrep
+    gnused
+    jq
+    w3m
+  ];
+in
+stdenv.mkDerivation {
+  name = "netcup-1.0.0";
+  src = fetchgit {
+    url = "http://cgit.cd.krebsco.de/netcup";
+    rev = "tags/v1.0.0";
+    sha256 = "0m6mk16pblvnapxykxdccvphslbv1gjfziyr86bnqin1xb1g99bq";
+  };
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+  patchPhase = ''
+    path=${shell.escape (sed.escape PATH)}
+    sed -i "1s/.*/&\nPATH=$path/" vcp
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp vcp $out/bin
+  '';
+}
-- 
cgit v1.2.3


From c1a423b6857f2140a9c9b425f9d5f81a679537bb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 18:36:17 +0200
Subject: xu pkgs += netcup

---
 tv/1systems/xu.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index a84da38db..a7e0b839d 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -54,6 +54,7 @@ with import <stockholm/lib>;
         jq
         mkpasswd
         netcat
+        netcup
         nix-repl
         nmap
         p7zip
-- 
cgit v1.2.3