From 6dd5c9ee3f236cb118bf74417ef03ed319b769c8 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 28 Feb 2024 18:22:34 +0100 Subject: [PATCH 1/4] grafana-agent: add `passthru.updateScript` `nix-update` has support for `fetchYarnDeps` via the attribute name `offlineCache`. Our yarn FOD is called `frontendYarnOfflineCache`, which I find more descriptive and would like to keep this way. To work around this requirement, this adds an alias in `passthru`. The addition of `passthru.updateScript` also allows `nixpkgs-update` to update this package when the yarn FOD hash needs to be updated. See the following error from the last `nixpkgs-update` run: https://r.ryantm.com/log/grafana-agent/2024-02-27.log --- .../monitoring/grafana-agent/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 6ddaf2ba07a2..a2506ef1a594 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,10 +2,11 @@ , buildGoModule , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps , grafana-agent +, nix-update-script , nixosTests , nodejs +, prefetch-yarn-deps , stdenv , systemd , testers @@ -89,13 +90,18 @@ buildGoModule rec { $out/bin/grafana-agent ''; - passthru.tests = { - inherit (nixosTests) grafana-agent; - version = testers.testVersion { - inherit version; - command = "${lib.getExe grafana-agent} --version"; - package = grafana-agent; + passthru = { + tests = { + inherit (nixosTests) grafana-agent; + version = testers.testVersion { + inherit version; + command = "${lib.getExe grafana-agent} --version"; + package = grafana-agent; + }; }; + updateScript = nix-update-script { }; + # alias for nix-update to be able to find and update this attribute + offlineCache = frontendYarnOfflineCache; }; meta = { From 2a515ecdc01c028a1530bf1dde8dcb1f4f76ce74 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 28 Feb 2024 18:37:15 +0100 Subject: [PATCH 2/4] grafana-agent: 0.39.2 -> 0.40.0 https://github.com/grafana/agent/releases/tag/v0.40.0 https://github.com/grafana/agent/blob/v0.40.0/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.39.2...v0.40.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 a2506ef1a594..312e352529a7 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-KwXkCTKnoXHL2RFpJjjwtIolEpqCM6te5wMk9xQNOqE="; + hash = "sha256-Ob1cg1E0EYTOyzHc32OLH6EUgC20CVoZZjD9M8ZQj28="; }; - vendorHash = "sha256-aSHO5SoMem14Fc6DirqtYBVWJQtf5mzCT3T33mMyhkc="; + vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/web/ui/yarn.lock"; - hash = "sha256-rT0UCInISo/p60xzQC7wAJFuKFByIzhNf0RxFFJx+3k="; + hash = "sha256-WqbIg18qUNcs9O2wh7DAzwXKb60iEuPL8zFCIgScqI0="; }; ldflags = let From 7807e3a953933dab6b9df314a7933eebde55fcd2 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 1 Mar 2024 01:58:07 +0100 Subject: [PATCH 3/4] grafana-agent: 0.40.0 -> 0.40.1 https://github.com/grafana/agent/releases/tag/v0.40.1 https://github.com/grafana/agent/blob/v0.40.1/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.40.0...v0.40.1 --- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 312e352529a7..90db4427252a 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-Ob1cg1E0EYTOyzHc32OLH6EUgC20CVoZZjD9M8ZQj28="; + hash = "sha256-MvdCcARy3D/TXMW3qmq3W7j1Rc2Ofw1aNPVNIu1ba0M="; }; vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; From 3ab086e217e73323c4ae8aa84ffaaa871a6817b6 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 5 Mar 2024 23:29:30 +0100 Subject: [PATCH 4/4] grafana-agent: 0.40.1 -> 0.40.2 https://github.com/grafana/agent/releases/tag/v0.40.2 https://github.com/grafana/agent/blob/v0.40.2/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.40.1...v0.40.2 --- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 90db4427252a..622147f92f97 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.1"; + version = "0.40.2"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-MvdCcARy3D/TXMW3qmq3W7j1Rc2Ofw1aNPVNIu1ba0M="; + hash = "sha256-muSgFBg+/XWx2f9EGYYLQ0wUzZ7AxEC2F19A5Qs5cgw="; }; vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g=";