Merge remote-tracking branch 'cd/master'

tv/1systems/xu.nix

@@ -54,6 +54,7 @@ with import <stockholm/lib>;
         jq
         mkpasswd
         netcat
+        netcup
         nix-repl
         nmap
         p7zip

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 = {
+      environment.variables =
-        CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+        flip genAttrs (_: "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") [
-        GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+          "CURL_CA_BUNDLE"
-        SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+          "GIT_SSL_CAINFO"
-      };
+          "SSL_CERT_FILE"
-    })
+        ];
+    }
 
     {
       services.cron.enable = false;

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
+  '';
+}