Merge remote-tracking branch 'cd/master'

krebs/5pkgs/cac-api/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-api-1.1.0";
+  name = "cac-api-1.1.2";
 
   src = fetchgit {
     url = http://cgit.cd.krebsco.de/cac-api;
-    rev = "0809fae379239687ed1170e04311dc2880ef0aba";
-    sha256 = "357ced27c9ed88028967c934178a1d230bf38617a7494cd4632fabdd2a04fcdd";
+    rev = "67e93510e7742acae44db30275abbfe671aa9b7b";
+    sha256 = "1vxh57j7vrq5sg9j1sam0538kkkhqpgf230vvdz2ifzgkj01z27l";
   };
 
   phases = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       ncurses
       openssh
       sshpass
-    ]}
+    ]}:"$PATH"
     EOF
       # [1]: Disable fetching tasks; listtasks is currently broken:
       # Unknown column 'iod.apitask.cid' in 'field list'

tv/2configs/default.nix

@@ -49,6 +49,7 @@ with config.krebs.lib;
     }
     {
       security.sudo.extraConfig = ''
+        Defaults env_keep+="SSH_CLIENT"
         Defaults mailto="${config.krebs.users.tv.mail}"
         Defaults !lecture
       '';