diff options
| author | Florian Klink <flokli@flokli.de> | 2021-07-13 01:04:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 01:04:54 +0200 |
| commit | 66f419c4b120d6dbfeb38a6791321a726c058c6e (patch) | |
| tree | 0a2c07809474572c8f5ac16d026a81d81f1b459c /pkgs/applications/version-management | |
| parent | 886556c8bc3fa70dea5f167a699b074bcbaa47c9 (diff) | |
| parent | c5a0551dc49b287d12d043298f9b7a4c8c355885 (diff) | |
| download | nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar.gz nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar.bz2 nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar.lz nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar.xz nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.tar.zst nixpkgs-66f419c4b120d6dbfeb38a6791321a726c058c6e.zip | |
Merge pull request #129734 from yu-re-ka/feature/gitlab-14-0-5
gitlab: 14.0.2 -> 14.0.5
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bdc83b8e30b..b214b663ae6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.0.2", - "repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286", + "version": "14.0.5", + "repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.0.2-ee", + "rev": "v14.0.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.0.2", + "GITALY_SERVER_VERSION": "14.0.5", "GITLAB_PAGES_VERSION": "1.40.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.0.2" + "GITLAB_WORKHORSE_VERSION": "14.0.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5aff7a34365..ced652e68d9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "14.0.2"; + version = "14.0.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY="; + sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM="; }; vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 94c14a739d3..e237c4fd480 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.0.2"; + version = "14.0.5"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 55839138c3a..62222b56396 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1667,4 +1667,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.1.4 + 2.2.20 |