Merge pull request #292122 from emilylange/grafana-agent

grafana-agent: add passthru.updateScript, 0.39.2 -> 0.40.2

authored by Emily and committed by GitHub 632ebb90 f46d58c5

+17 -11
+17 -11
pkgs/servers/monitoring/grafana-agent/default.nix
··· 2 2 , buildGoModule 3 3 , fetchFromGitHub 4 4 , fetchYarnDeps 5 - , prefetch-yarn-deps 6 5 , grafana-agent 6 + , nix-update-script 7 7 , nixosTests 8 8 , nodejs 9 + , prefetch-yarn-deps 9 10 , stdenv 10 11 , systemd 11 12 , testers ··· 14 15 15 16 buildGoModule rec { 16 17 pname = "grafana-agent"; 17 - version = "0.39.2"; 18 + version = "0.40.2"; 18 19 19 20 src = fetchFromGitHub { 20 21 owner = "grafana"; 21 22 repo = "agent"; 22 23 rev = "v${version}"; 23 - hash = "sha256-KwXkCTKnoXHL2RFpJjjwtIolEpqCM6te5wMk9xQNOqE="; 24 + hash = "sha256-muSgFBg+/XWx2f9EGYYLQ0wUzZ7AxEC2F19A5Qs5cgw="; 24 25 }; 25 26 26 - vendorHash = "sha256-aSHO5SoMem14Fc6DirqtYBVWJQtf5mzCT3T33mMyhkc="; 27 + vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; 27 28 proxyVendor = true; # darwin/linux hash mismatch 28 29 29 30 frontendYarnOfflineCache = fetchYarnDeps { 30 31 yarnLock = src + "/web/ui/yarn.lock"; 31 - hash = "sha256-rT0UCInISo/p60xzQC7wAJFuKFByIzhNf0RxFFJx+3k="; 32 + hash = "sha256-WqbIg18qUNcs9O2wh7DAzwXKb60iEuPL8zFCIgScqI0="; 32 33 }; 33 34 34 35 ldflags = let ··· 89 90 $out/bin/grafana-agent 90 91 ''; 91 92 92 - passthru.tests = { 93 - inherit (nixosTests) grafana-agent; 94 - version = testers.testVersion { 95 - inherit version; 96 - command = "${lib.getExe grafana-agent} --version"; 97 - package = grafana-agent; 93 + passthru = { 94 + tests = { 95 + inherit (nixosTests) grafana-agent; 96 + version = testers.testVersion { 97 + inherit version; 98 + command = "${lib.getExe grafana-agent} --version"; 99 + package = grafana-agent; 100 + }; 98 101 }; 102 + updateScript = nix-update-script { }; 103 + # alias for nix-update to be able to find and update this attribute 104 + offlineCache = frontendYarnOfflineCache; 99 105 }; 100 106 101 107 meta = {