From b03be5896e23609d7f417681e761d2a600d9103d Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Wed, 22 Dec 2021 16:49:03 +0100 Subject: [PATCH] gitlab-runner: 14.5.2 -> 14.6.0 (#151600) --- ...nner-don-t-checked-for-fixed-runtime.patch | 30 ------------------- .../gitlab-runner/default.nix | 5 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch deleted file mode 100644 index a1736d83a656..000000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13c633bf0075daa6ff973f368a25cf205caa017e Mon Sep 17 00:00:00 2001 -From: Pascal Bach -Date: Sat, 11 Dec 2021 10:07:01 +0100 -Subject: [PATCH] gitlab-runner: don't checked for fixed runtime - -We already use 1.16.12 which has the proper fix ---- - helpers/patches/issue_28732/syscall.go | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/helpers/patches/issue_28732/syscall.go b/helpers/patches/issue_28732/syscall.go -index 580513b57..fa9e4cc85 100644 ---- a/helpers/patches/issue_28732/syscall.go -+++ b/helpers/patches/issue_28732/syscall.go -@@ -2,11 +2,6 @@ - - package issue_28732 - --import ( -- "syscall" --) -- - func AssertFixPresent() { -- // Ensure that Issue28732Fix fixed runtime is used -- syscall.Issue28732Fix() -+ // Issue already fixed by using go 1.16.12 - } --- -2.34.0 - diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d902b5f4c6a1..2aa7e6542bf4 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, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.5.2"; + version = "14.6.0"; in buildGoPackage rec { inherit version; @@ -19,12 +19,11 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd"; + sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; }; patches = [ ./fix-shell-path.patch - ./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch ]; meta = with lib; {