summary refs log tree commit diff
path: root/pkgs/servers/monitoring
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-04-02 18:01:07 +0000
committerGitHub <noreply@github.com>2022-04-02 18:01:07 +0000
commitfc17fe64173caad8e33a1a9545f1059c51a06320 (patch)
treebdc6b1b4f9b2c612524fa35cfc516c33ef41d952 /pkgs/servers/monitoring
parent66754ae952bb2ffd16e793f4be00ffecb9253e28 (diff)
parent2efcca0cb4439c340707f3fe6ea3e807d3a35321 (diff)
downloadnixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar.gz
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar.bz2
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar.lz
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar.xz
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.tar.zst
nixpkgs-fc17fe64173caad8e33a1a9545f1059c51a06320.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r--pkgs/servers/monitoring/net-snmp/default.nix2
-rw-r--r--pkgs/servers/monitoring/prometheus/wireguard-exporter.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 884b358644a..432542a1120 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     for f in "$lib/lib/"*.la $bin/bin/net-snmp-config $bin/bin/net-snmp-create-v3-user; do
-      sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f
+      sed 's|-L${openssl.dev}|-L${lib.getLib openssl}|g' -i $f
     done
     mkdir $dev/bin
     mv $bin/bin/net-snmp-config $dev/bin
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 61cf36f882d..cfa2d1d43a1 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "sha256-eVGyBynKZLGlsaLwUOx7cJWdRHl65S0Wk1K5c9T8ysQ=";
+    sha256 = "sha256-m29/whlmhIkLin84NOWs2NVZcXNpVsyyHZ1CLp4FXd0=";
   };
 
-  cargoSha256 = "sha256-JbFoaMTs6TPYq2qgBkT7WX1itMXohgcWbC1UvaXOi8o=";
+  cargoSha256 = "sha256-XK4hjBIcOx6JMv61gOpIXaZy7Unw+Bk84TEb+8Fib6Q=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];