3 files changed, 7 insertions, 23 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index f4bd472a4..033cb94d1 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -110,7 +110,8 @@
     <stockholm/krebs/2configs/shack/prometheus/server.nix>
     <stockholm/krebs/2configs/shack/prometheus/blackbox.nix>
     #<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
-    <stockholm/krebs/2configs/shack/prometheus/alertmanager-telegram.nix>
+    # TODO: alertmanager 0.24+ supports telegram
+    # <stockholm/krebs/2configs/shack/prometheus/alertmanager-telegram.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.puyak;
diff --git a/krebs/2configs/shack/prometheus/alertmanager-telegram.nix b/krebs/2configs/shack/prometheus/alertmanager-telegram.nix
deleted file mode 100644
index 8527001cb..000000000
--- a/krebs/2configs/shack/prometheus/alertmanager-telegram.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, ...}:
-{
-  systemd.services.alertmanager-bot-telegram = {
-    wantedBy = [ "multi-user.target" ];
-    after = [ "ip-up.target" ];
-    serviceConfig = {
-      EnvironmentFile = toString <secrets/shack/telegram_bot.env>;
-      DynamicUser = true;
-      StateDirectory = "alertbot";
-      ExecStart = ''${pkgs.alertmanager-bot-telegram}/bin/alertmanager-bot \
-        --alertmanager.url=http://alert.prometheus.shack --log.level=info \
-        --store=bolt --bolt.path=/var/lib/alertbot/bot.db \
-        --listen.addr="0.0.0.0:16320" \
-        --template.paths=${./templates}/shack.tmpl'';
-    };
-  };
-}
diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
index c6f866e56..1def3167c 100644
--- a/krebs/5pkgs/simple/passwdqc-utils/default.nix
+++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix
@@ -1,17 +1,17 @@
 { fetchurl, lib, stdenv
 , libxcrypt
-, pam
+, linux-pam
 , wordset-file ? null, # set your own wordset-file
 }:
 
 stdenv.mkDerivation rec {
-  name = "passwdqc-utils-${version}";
-  version = "1.3.0";
-  buildInputs = [ libxcrypt pam ];
+  pname = "passwdqc-utils";
+  version = "2.0.2";
+  buildInputs = [ libxcrypt linux-pam ];
 
   src = fetchurl {
     url = "http://www.openwall.com/passwdqc/passwdqc-${version}.tar.gz";
-    sha256 = "0l3zbrp4pvah0dz33m48aqlz9nx663cc1fqhnlwr0p853b10la93";
+    hash = "sha256-/x9QV2TAIPakSEseDMT9vy4/cbUikm2QtHCRBMoGBKs=";
   };
 
   buildTargets = "utils";