From e3fa245e259b627523ebe1f5ebd94e7f7aafec54 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:08:47 +0200 Subject: [PATCH 1/4] buildkite-agent: move to by-name (cherry picked from commit 7d7fd84248b387be5f21e07b3db0548e0d021505) --- .../default.nix => by-name/bu/buildkite-agent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/continuous-integration/buildkite-agent/default.nix => by-name/bu/buildkite-agent/package.nix} (100%) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/by-name/bu/buildkite-agent/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/by-name/bu/buildkite-agent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f54fce79166d9..e177daea387e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18202,8 +18202,6 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; - buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; From e6a019c9140d4893858365e99494dd0e1a5974d1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 2 Aug 2024 22:59:32 +0300 Subject: [PATCH 2/4] buildkite-agent: 3.59.0 -> 3.76.1 This does not include the workaround we included in nixos unstable, as the behaviour is fixed with 3.77.0. (cherry picked from commit 129558261d9f1fb92c99f93ef259c698bc93db20) --- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 9189c59638246..44c6099fc40ba 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.59.0"; + version = "3.76.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-pYaxjXoNn6MOE2oHUSKrBzP5oKhtfJwSHFCkcpkyzas="; + sha256 = "sha256-0i2b7sVBkV5zcJo+K5kg2Ojbix0rlQRXHKAmL9PJs+g="; }; - vendorHash = "sha256-JSuam9Tn+ZekfLrj78tBncH7Q2aP4CaUgaaDkJ/azEw="; + vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash From 5db2327502d220e815be6ca48099266684160d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 04:00:27 +0000 Subject: [PATCH 3/4] buildkite-agent: 3.76.1 -> 3.76.2 (cherry picked from commit 9e3a3790f4d265f99e656520422043a9fd3efd02) --- pkgs/by-name/bu/buildkite-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 44c6099fc40ba..128813f7bea30 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.76.1"; + version = "3.76.2"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-0i2b7sVBkV5zcJo+K5kg2Ojbix0rlQRXHKAmL9PJs+g="; + sha256 = "sha256-XAMrc8HEdCGeI0l6u4n81xhiGkI39b7Poly5CP/b0R8="; }; vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs="; From e40e5d0871d258c4e9c1322f91e54640157fda09 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 8 Aug 2024 13:21:33 +0300 Subject: [PATCH 4/4] buildkite-agent: 3.76.2 -> 3.77.0 (cherry picked from commit bccb2f7c8435daad2fda86a204bc1fdd0125a485) --- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 128813f7bea30..8da59b372413c 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.76.2"; + version = "3.77.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-XAMrc8HEdCGeI0l6u4n81xhiGkI39b7Poly5CP/b0R8="; + sha256 = "sha256-QsSCIAy0ekkZiqO/cFcPNNkXa3FLL3Z1LJoKsjzB6jw="; }; - vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs="; + vendorHash = "sha256-xp836ZT2x20ZbkTEubhiZlLmK9n2F8mCSWZTHmAuu6A="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash