diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-26 16:46:58 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-26 16:46:58 +0100 |
| commit | 8e43f278d0156e75eab245bb62bca89ca5de794f (patch) | |
| tree | 6691ec51a06c3a01d226cd29f5a68ec1f6b6acd7 | |
| parent | 61f2ea55e27e1649ea6ed23c11321e1cfeff0424 (diff) | |
| parent | 271c7843120dc079c6507fc2d7d08fff9105e3a5 (diff) | |
Merge remote-tracking branch 'cd/master'
| -rw-r--r-- | krebs/5pkgs/cac-api/default.nix | 8 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix index 30c0168f3..52ada4f1b 100644 --- a/krebs/5pkgs/cac-api/default.nix +++ b/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' diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 5a1e90bc4..9b83997bb 100644 --- a/tv/2configs/default.nix +++ b/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 ''; |