diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-18 08:25:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-18 08:25:25 +0200 |
| commit | 9d87ccabce3516cf1cf5654bd95cdc9471f8615e (patch) | |
| tree | 0e5f35c10b1a24950685880a51035b3c722bcc9b /pkgs/development/tools | |
| parent | 488fb5829a677fdf8c52d2abb38834e0d3dc3068 (diff) | |
| parent | 28ac30930934a5a0f40b6c585bc967ae3bbbd348 (diff) | |
| download | nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar.gz nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar.bz2 nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar.lz nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar.xz nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.tar.zst nixlib-9d87ccabce3516cf1cf5654bd95cdc9471f8615e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/go-langserver/default.nix | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index aa262fd54952..c75baf454b34 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.0"; + version = "11.9.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}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3"; + sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par"; + sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h"; + sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index 84efaf2a4b63..ec0e565eabd6 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -1,18 +1,17 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "go-langserver-${version}"; - version = "unstable-2018-03-05"; - rev = "5d7a5dd74738978d635f709669241f164c120ebd"; + pname = "go-langserver"; + version = "2.0.0"; goPackagePath = "github.com/sourcegraph/go-langserver"; subPackages = [ "." ]; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "sourcegraph"; repo = "go-langserver"; - sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz"; + sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; }; meta = with stdenv.lib; { |