diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 00:01:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 00:01:58 +0000 |
| commit | dda98f3673b1a64316700aa47b611cd04044eb35 (patch) | |
| tree | 029704ddf118f76f982bb7e4c30cc68301294a32 /pkgs/development/tools | |
| parent | 57c3d06e2c3846d4ad7585936b4e4538982a1603 (diff) | |
| parent | 8bcd5dc77b4306af6c900a0340799d6751c4d4d3 (diff) | |
| download | nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar.gz nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar.bz2 nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar.lz nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar.xz nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.tar.zst nixpkgs-dda98f3673b1a64316700aa47b611cd04044eb35.zip | |
Merge staging-next into staging
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/database/sqldeveloper/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e89c784df74..ff5799df4ac 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.1"; + version = "14.1.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}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8"; + sha256 = "09p0biig07plf9qiwpsdllh6midi8kzpzk2s71rmms491g4634k2"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4"; + sha256 = "0z5q5y9lsznwglpg7sd5af51v9640m85v4x4dcj5j37w24bi4wq0"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7"; + sha256 = "1v2yxs92awwn4m6hq6wc53whfmk6fr4l6j87amcbdzcm4ikzxcvk"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 2e361076ae4..ef95263185c 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -79,6 +79,6 @@ in homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ma27 ]; + maintainers = with maintainers; [ ardumont ]; }; } |