diff options
| author | Lara <lara@uwu.is> | 2022-01-06 20:32:55 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-07 08:29:28 +0000 |
| commit | b8b7c9c679f17b2cdc0a0b3a2258170e41c02a4f (patch) | |
| tree | a858ef9ad16d6667356e901d1334d132577957f4 | |
| parent | Merge pull request #150378 from NixOS/backport-150291-to-release-21.11 (diff) | |
| download | nixpkgs-origin/backport-153764-to-release-21.11.tar.gz | |
gitlab: 14.6.0 -> 14.6.1origin/backport-153764-to-release-21.11
(cherry picked from commit e1cae8c30cbe9a5f6b256cfc43fd9a636e1be2d1)
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4a1e7f46ea38..4a47fdeaf2b2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.6.0", - "repo_hash": "0b77nh7xq5qalzhvfmsymmkrb78lmaffk464b074wi5c8gy3f5dn", + "version": "14.6.1", + "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1", "yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.6.0-ee", + "rev": "v14.6.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.6.0", + "GITALY_SERVER_VERSION": "14.6.1", "GITLAB_PAGES_VERSION": "1.49.0", "GITLAB_SHELL_VERSION": "13.22.1", - "GITLAB_WORKHORSE_VERSION": "14.6.0" + "GITLAB_WORKHORSE_VERSION": "14.6.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 6afefefb4b5f..7952cd0a07f4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,7 +33,7 @@ let }; }; - version = "14.6.0"; + version = "14.6.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -45,7 +45,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-YiDZtWRb1PnCAv+UCPRQFoCA12vf3xoHoJ1i/hW+vMg="; + sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4="; }; vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index fd8bdd2aef17..0ac84d8aa012 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.6.0"; + version = "14.6.1"; src = fetchFromGitLab { owner = data.owner; |