dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #316736 from emilylange/grafana-agent

Browse Source 
grafana-agent: 0.40.5 -> 0.41.0
This commit is contained in:
Florian Klink 2024-06-04 17:02:43 +02:00 committed by GitHub
commit cc6971ae9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/servers/monitoring/grafana-agent/default.nix
View File

@ -15,28 +15,28 @@
buildGoModule rec {
pname = "grafana-agent";
version = "0.40.5";
version = "0.41.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "agent";
rev = "v${version}";
hash = "sha256-Ctv/s9lgZQ9uCXx+xwJlNVe1ycQnQHtziVNafdYVBig=";
hash = "sha256-I763iHBMWnfGzh6KyGGzZekafseEIetnflnVVvro/cE=";
};
vendorHash = "sha256-pI2hk91wqMVaZ5/6uegoQOh94p4zb7Tvn2CtOMRhZME=";
vendorHash = "sha256-ueU9n57KUiUe2kXcxDsxpidjwmDLN8eoFO9nQRkZyKY=";
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