From 9bf8e19e02bf98c5c14664bae9aea67c8f1309eb Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 30 Aug 2023 15:54:34 +0200 Subject: [PATCH 1/2] grafana-agent: fix building of go-modules.drv from scratch Unbreaks building the go-modules.drv from source (read: not substituted from cache.nixos.org). Regression from cc4dcc08be45ee7889e99a4015a6523e641e6e65 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 0dd4234e9fcb..808a999f37de 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -70,6 +70,12 @@ buildGoModule rec { popd ''; + # do not pass preBuild to go-modules.drv, as it would otherwise fail to build. + # but even if it would work, it simply isn't needed in that scope. + overrideModAttrs = (_: { + preBuild = null; + }); + # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); From 1aecfb2564bc47d1d4617620efd2b17ad6a59017 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 30 Aug 2023 16:01:09 +0200 Subject: [PATCH 2/2] grafana-agent: 0.35.4 -> 0.36.0 https://github.com/grafana/agent/releases/tag/v0.36.0 https://github.com/grafana/agent/blob/v0.36.0/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.35.4...v0.36.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 808a999f37de..620d3aebc4a1 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.35.4"; + version = "0.36.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-3pUKqmqnRm3/e/fhAV5cq16wcK/f7KWb3aoFbPXCC3o="; + hash = "sha256-YUEla8VvLi0H0Utu0vQNqSbZH8C9BeF8BGWRb2R61P8="; }; - vendorHash = "sha256-vzrp20Mg6AA0h3+5+qbKRa7nhx/hgiIHG6RNXLATpHE="; + vendorHash = "sha256-Si7qZYq23XlWFPp+C5qIJw7n0Zk/Rx+yo643m+gSRcg="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/web/ui/yarn.lock"; - hash = "sha256-xJEPubIDjlZQL70UGha1MHbeek6KFPaxZGb5IRgMlTA="; + hash = "sha256-sUFxuliLupGEJY1xFA2V4W2gwHxtUgst3Vrywh1owAo="; }; ldflags = let