Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7049885300c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52d2d62caa67
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 24, 2018

  1. gitlab-runner: 10.3.0 -> 10.4.0

    @bachp
    bachp committed Jan 24, 2018
    Copy the full SHA
    029e80a View commit details

Commits on Jan 25, 2018

  1. Merge pull request #34243 from bachp/gitlab-runner-10.4.0 

    gitlab-runner: 10.3.0 -> 10.4.0
    @adisbladis
    adisbladis authored Jan 25, 2018
    Copy the full SHA
    52d2d62 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:

let
version = "10.3.0";
version = "10.4.0";
# 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}/docker/prebuilt-x86_64.tar.xz";
sha256 = "0nhxxx2wxnli5nfz8vxqc0mwdjzj836zx3zmywnfyy1k2zybjijv";
sha256 = "0fcddi1mwgj831abn628zcpwsah3mmvrbdi851pjf8vraynwr2xa";
};

docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0jacimz4p9k5s9j510g3vn7gg8pybpa20j4cvz4pffrcwl1lgk4i";
sha256 = "1zlk3i9jzmsqz5r3kzg08z9hyhidw9dpv5ji46bnbjis8q3dlw54";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "0wjy5bbz6bw0na57vglcwzn17q980x6j24qkschqx49rjyk3fz2i";
sha256 = "0kp6h53d1q652i4wp94hydy1ixlgmqh92sjsc6pqicnfc7nvwgfq";
};

patches = [ ./fix-shell-path.patch ];