From 6d5dec6f5a62c3f8cddf389c9c63bb77a31b39b6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:27:20 +0000 Subject: [PATCH 1/2] prometheus-node-exporter: Add versionCheckHook --- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 00fdc2b5c3b9..be970ad93fc4 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, nixosTests, + versionCheckHook, }: buildGoModule rec { @@ -36,6 +37,11 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "Prometheus exporter for machine metrics"; mainProgram = "node_exporter"; From 2f90ad13bfd82bb2efcc728df919846563ccfe01 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 18:29:19 +0000 Subject: [PATCH 2/2] prometheus-node-exporter: Use finalAttrs --- .../by-name/pr/prometheus-node-exporter/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index be970ad93fc4..ef311b013bdd 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -6,15 +6,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "node_exporter"; version = "1.10.2"; - rev = "v${version}"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "node_exporter"; + tag = "${finalAttrs.version}"; hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE="; }; @@ -28,8 +27,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/prometheus/common/version.Version=${version}" - "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Version=${finalAttrs.version}" + "-X github.com/prometheus/common/version.Revision=unknown" "-X github.com/prometheus/common/version.Branch=unknown" "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" "-X github.com/prometheus/common/version.BuildDate=unknown" @@ -46,7 +45,7 @@ buildGoModule rec { description = "Prometheus exporter for machine metrics"; mainProgram = "node_exporter"; homepage = "https://github.com/prometheus/node_exporter"; - changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/prometheus/node_exporter/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley @@ -55,4 +54,4 @@ buildGoModule rec { Frostman ]; }; -} +})