diff options
Diffstat (limited to 'pkgs/servers/monitoring/grafana-agent/default.nix')
| -rw-r--r-- | pkgs/servers/monitoring/grafana-agent/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 745e5f5e25d51..910c8d6558e8c 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,28 +15,28 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.4"; + version = "0.41.1"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-TWA+anmiKFgK6nb8ipoqRF+HdPMf2JDSU2DeA8fpDlQ="; + hash = "sha256-A/h8Mwtor4VUT7e7TsNiE/0OOXCSq38GAf9j7c8ZDKk="; }; - vendorHash = "sha256-xsFD5eAHIWcwayTm5BUAnOHX4AvZXOSJuxvBwCTToeE="; + vendorHash = "sha256-W29GZoZfgjdSwGiFz4udGA9gXgmM0xIDEGld7ZE1ycQ="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/web/ui/yarn.lock"; + yarnLock = src + "/internal/web/ui/yarn.lock"; hash = "sha256-WqbIg18qUNcs9O2wh7DAzwXKb60iEuPL8zFCIgScqI0="; }; ldflags = let - prefix = "github.com/grafana/agent/pkg/build"; + prefix = "github.com/grafana/agent/internal/build"; in [ "-s" "-w" - # https://github.com/grafana/agent/blob/d672eba4ca8cb010ad8a9caef4f8b66ea6ee3ef2/Makefile#L125 + # https://github.com/grafana/agent/blob/v0.41.0/Makefile#L132-L137 "-X ${prefix}.Version=${version}" "-X ${prefix}.Branch=v${version}" "-X ${prefix}.Revision=v${version}" @@ -56,13 +56,13 @@ buildGoModule rec { subPackages = [ "cmd/grafana-agent" "cmd/grafana-agentctl" - "web/ui" + "internal/web/ui" ]; preBuild = '' export HOME="$TMPDIR" - pushd web/ui + pushd internal/web/ui fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $frontendYarnOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive @@ -105,7 +105,7 @@ buildGoModule rec { }; meta = { - description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; + description = "Lightweight subset of Prometheus and more, optimized for Grafana Cloud"; license = lib.licenses.asl20; homepage = "https://grafana.com/products/cloud"; changelog = "https://github.com/grafana/agent/blob/${src.rev}/CHANGELOG.md"; |