diff options
| author | Max Wittig <max.wittig@siemens.com> | 2022-01-20 19:35:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 19:35:44 +0100 |
| commit | 44d01676382a72705636e97c3c3a5d3da3070009 (patch) | |
| tree | 27c6d84ed1e6e147202a4d49f5c8ee2a0d85f79a | |
| parent | 6b7e9edac55ab04bb7151b85cbc3210ef9969b39 (diff) | |
| download | nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar.gz nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar.bz2 nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar.lz nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar.xz nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.tar.zst nixpkgs-44d01676382a72705636e97c3c3a5d3da3070009.zip | |
gitlab-runner: 14.6.0 -> 14.7.0 (#155813)
2 files changed, 2 insertions, 33 deletions
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 a1736d83a65..00000000000 --- 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 <pascal.bach@nextrem.ch> -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 a8456d09f98..57e9d15dce6 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.6.0"; + version = "14.7.0"; in buildGoPackage rec { inherit version; @@ -19,12 +19,11 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; + sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl"; }; patches = [ ./fix-shell-path.patch - ./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch ]; meta = with lib; { |