diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-28 18:12:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 18:12:05 +0000 |
| commit | 1bce4703aac19ac57785a9b43a3ef9ed9f21869b (patch) | |
| tree | 62dc7c208a32b7de9615d43662e760ae108e28e7 /pkgs/development/tools | |
| parent | 68af28a926842bf219384468b7d4fb79249fff4f (diff) | |
| parent | 3a3d290719f5e57e8c5fea1b952856d9fc759362 (diff) | |
| download | nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar.gz nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar.bz2 nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar.lz nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar.xz nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.tar.zst nixpkgs-1bce4703aac19ac57785a9b43a3ef9ed9f21869b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index cbc2ceb21ab..314a1a8b057 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpbweI/grJNIRg/7lFd4tMhr9E2SPX+YUrzPJs0Gsik="; + sha256 = "sha256-tPjjYudUI+LlmdnEvHh+kUpAbmhiNPYhjf8fMglrzIM="; }; - vendorSha256 = "sha256-dXBGWTgUaVJCwf2LB1QdmSPP3BlKqZ28HUnq1oervNg="; + vendorSha256 = "sha256-JNVzy4WbpwH9ZfO78AHQM8pak/ZVQqapxxs9QraMhDo="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d154adbdc1b..e89c784df74 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 = "14.0.0"; + version = "14.0.1"; # 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 = "156dm6kg154fyn3axgw7kcpq9xz8mxdyhch8snp0vxzh941sc74w"; + sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0cnjbcc3bdiahff3iyxwppj9gwaj7r7x80hk2cv2q4hkdpsji655"; + sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "14g78m5h5d02k04lc07jc8yp7sqmfkjif589rb8wkb9jmbh7glmi"; + sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7"; }; patches = [ ./fix-shell-path.patch ]; |