From 049b48307ddf3d49c025686575593f106cc60fa4 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 22 Oct 2023 13:57:15 -0700 Subject: [PATCH 1/2] gitlab-runner: pin to Go 1.20 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a23e5416f95..7862e80fb343 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8578,7 +8578,9 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { + buildGoModule = buildGo120Module; + }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; From 72fdcbdccf2d7244073cf838adb14452271fb133 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 22 Oct 2023 13:59:53 -0700 Subject: [PATCH 2/2] gitlab-runner: 16.4.0 -> 16.5.0 https://gitlab.com/gitlab-org/gitlab-runner/blob/v16.5.0/CHANGELOG.md --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b6e11c7eb4b1..0e76b6897fba 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.4.0"; + version = "16.5.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-RIxGgS+7gNvexZLLtXymGZaODhax/oSi1gAUxXHZBp4="; + vendorHash = "sha256-C37ijxvyY9PG/Qn29Fmk0pxK+hq45kHIBveBltfIfTo="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-XYlrIUBT/zlnGYxckv36dqSEEpxUom/OJfqnL/HwYDo="; + sha256 = "sha256-NLidtwn1zT7BxzMEF5K41fwbZaICA/KuAr8MIjpJD+A="; }; patches = [