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: a00a8805722c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5fdfffa46d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 5, 2017

  1. gitlab-runner_1_11: 1.11.4 -> 1.11.5

    @bachp
    bachp committed Jul 5, 2017
    Copy the full SHA
    52ceb98 View commit details

Commits on Jul 9, 2017

  1. Merge pull request #27155 from bachp/gitlab-runner-1.11.5 

    gitlab-runner_1_11: 1.11.4 -> 1.11.5
    @joachifm
    joachifm authored Jul 9, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c5fdfff View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
8 changes: 4 additions & 4 deletions pkgs/development/tools/continuous-integration/gitlab-runner/v1.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 = "1.11.4";
version = "1.11.5";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "1ijkzn8jkzx1dzxhkf17987ligyf758xzas6ysix5b781jnkdm8z";
sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0";
};

docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0sq2nndnkzqv2yjljg08xwa3ppddn6vqcivhfh43zwwmansvb9ha";
sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
sha256 = "1pm88546cijmrrcvvrajp2g6rsrzxhy83cwwwky8jjkl5w4hhmz4";
sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv";
};

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