summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-01-10 23:39:35 +0100
committerGitHub <noreply@github.com>2022-01-10 23:39:35 +0100
commit71df0bba7a9627bec67a4fc2c1e17955fc423222 (patch)
tree0b2babdd8a65470cd3846db65b9e1c3a95935ab3
parentMerge pull request #153748 from NixOS/backport-153399-to-release-21.11 (diff)
downloadnixpkgs-71df0bba7a9627bec67a4fc2c1e17955fc423222.tar.gz
gitlab: 14.6.0 -> 14.6.1 (#153811)
(cherry picked from commit e1cae8c30cbe9a5f6b256cfc43fd9a636e1be2d1) Co-authored-by: Lara <lara@uwu.is>
-rw-r--r--pkgs/applications/version-management/gitlab/data.json10
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix2
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;