gitlab-runner: 14.5.2 -> 14.6.0 (#151600)

authored by Max Wittig and committed by GitHub b03be589 80ab168c

+2 -33
-30
pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch
··· 1 - From 13c633bf0075daa6ff973f368a25cf205caa017e Mon Sep 17 00:00:00 2001 2 - From: Pascal Bach <pascal.bach@nextrem.ch> 3 - Date: Sat, 11 Dec 2021 10:07:01 +0100 4 - Subject: [PATCH] gitlab-runner: don't checked for fixed runtime 5 - 6 - We already use 1.16.12 which has the proper fix 7 - --- 8 - helpers/patches/issue_28732/syscall.go | 7 +------ 9 - 1 file changed, 1 insertion(+), 6 deletions(-) 10 - 11 - diff --git a/helpers/patches/issue_28732/syscall.go b/helpers/patches/issue_28732/syscall.go 12 - index 580513b57..fa9e4cc85 100644 13 - --- a/helpers/patches/issue_28732/syscall.go 14 - +++ b/helpers/patches/issue_28732/syscall.go 15 - @@ -2,11 +2,6 @@ 16 - 17 - package issue_28732 18 - 19 - -import ( 20 - - "syscall" 21 - -) 22 - - 23 - func AssertFixPresent() { 24 - - // Ensure that Issue28732Fix fixed runtime is used 25 - - syscall.Issue28732Fix() 26 - + // Issue already fixed by using go 1.16.12 27 - } 28 - -- 29 - 2.34.0 30 -
···
+2 -3
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
··· 1 { lib, buildGoPackage, fetchFromGitLab, fetchurl }: 2 3 let 4 - version = "14.5.2"; 5 in 6 buildGoPackage rec { 7 inherit version; ··· 19 owner = "gitlab-org"; 20 repo = "gitlab-runner"; 21 rev = "v${version}"; 22 - sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd"; 23 }; 24 25 patches = [ 26 ./fix-shell-path.patch 27 - ./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch 28 ]; 29 30 meta = with lib; {
··· 1 { lib, buildGoPackage, fetchFromGitLab, fetchurl }: 2 3 let 4 + version = "14.6.0"; 5 in 6 buildGoPackage rec { 7 inherit version; ··· 19 owner = "gitlab-org"; 20 repo = "gitlab-runner"; 21 rev = "v${version}"; 22 + sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; 23 }; 24 25 patches = [ 26 ./fix-shell-path.patch 27 ]; 28 29 meta = with lib; {