From ec26b85a34eaa16c57f033d9802231dad3341de2 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Oct 2022 01:28:13 +0000 Subject: [PATCH] prometheus-nats-exporter: unpin go1.17 --- pkgs/servers/monitoring/prometheus/nats-exporter.nix | 5 +++++ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index 8019599752b6..4a7b3507730d 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -13,6 +13,11 @@ buildGoModule rec { vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ="; + preCheck = '' + # Fix `insecure algorithm SHA1-RSA` problem + export GODEBUG=x509sha1=1; + ''; + meta = with lib; { description = "Exporter for NATS metrics"; homepage = "https://github.com/nats-io/prometheus-nats-exporter"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85c3236e3c15..23ad5dc44a1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23916,10 +23916,7 @@ with pkgs; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; - prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { };