diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 95365cd9caa1..a8456d09f989 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,17 +1,7 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.3.2"; - # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 - docker_x86_64 = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "0np2ijgrq6yg3r0744qlj9a9va7y996f7csfs4ajyfqq3vm7jz2g"; - }; - - docker_arm = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0adjczad3y2f55i76pcp1q2kzdwqr04y59bslb9523s4dlav9jcd"; - }; + version = "14.6.0"; in buildGoPackage rec { inherit version; @@ -29,16 +19,13 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "15mwyhr7a4b9vl7c0qz299qv91h3kcmf6d6p5vjjrm1phiy3bpgf"; + sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; }; - patches = [ ./fix-shell-path.patch ]; - - postInstall = '' - install -d $out/bin/helper-images - ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz - ''; + patches = [ + ./fix-shell-path.patch + ./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch + ]; meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; |