swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-runner: 14.6.0 -> 14.7.0 (#155813)

Browse source
This commit is contained in:
Max Wittig 2022-01-20 19:35:44 +01:00 committed by GitHub
parent 6b7e9edac5
commit 44d0167638
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch
View file

@ -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

5
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file

@ -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; {