From 331e2a1c1075d4c3f2660da9210ee54ba93d7bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Apr 2023 03:33:47 +0200 Subject: [PATCH] prometheus-smokeping-prober: cleanup version --- .../monitoring/prometheus/smokeping-prober.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 8b1cbb962ade..617af9b8998e 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,18 +1,14 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: -let - baseVersion = "0.4.2"; - commit = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; -in buildGoModule rec { pname = "smokeping_prober"; - version = "${baseVersion}-g${commit}"; + version = "0.4.2"; ldflags = let - setVars = { - Version = baseVersion; - Revision = commit; - Branch = commit; + setVars = rec { + Version = version; + Revision = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; + Branch = Revision; BuildUser = "nix"; }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); @@ -21,9 +17,9 @@ buildGoModule rec { ]; src = fetchFromGitHub { - rev = commit; owner = "SuperQ"; repo = "smokeping_prober"; + rev = "v${version}"; sha256 = "1lpcjip6qxhalldgm6i2kgbajfqy3vwfyv9jy0jdpii13lv6mzlz"; }; vendorSha256 = "0p2jmlxpvpaqc445j39b4z4i3mnjrm25khv3sq6ylldcgfd31vz8";