summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLara <lara@uwu.is>2022-01-23 11:10:13 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-01-23 16:03:21 +0000
commite1f332553ca4bf6296f891dbc745b8a008b07e1a (patch)
tree22f3e25b73de2e621402e8444b18495011ccd34d
parentMerge pull request #156323 from NixOS/backport-156249-to-release-21.11 (diff)
downloadnixpkgs-origin/backport-156296-to-release-21.11.tar.gz
(cherry picked from commit 60782fc57d2527c288376e65d80cec523bfdd389)
-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 121e9b144008..92160700167a 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "14.6.2",
- "repo_hash": "0n7l1f1w70nqb9ackcmi1yhx69a32zlkxa962v67782nn2vdcbiz",
+ "version": "14.6.3",
+ "repo_hash": "sha256-M8A6ZF1t+N48OTBhVwvOweITmavrl9+Z1Yqw4lxLk38=",
"yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v14.6.2-ee",
+ "rev": "v14.6.3-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "14.6.2",
+ "GITALY_SERVER_VERSION": "14.6.3",
"GITLAB_PAGES_VERSION": "1.49.0",
"GITLAB_SHELL_VERSION": "13.22.1",
- "GITLAB_WORKHORSE_VERSION": "14.6.2"
+ "GITLAB_WORKHORSE_VERSION": "14.6.3"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 8c7c14769d6c..00bd9d18b174 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.2";
+ version = "14.6.3";
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-a9qFAtQP5QtI+E6V3LBYAMYQbvhgOcn75l+6pSQPZ+0=";
+ sha256 = "sha256-b4gNIYMtwsV2qv3mjKYDnCCGGmQseoqaTGN7k9mR1B8=";
};
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 6977dd81e2b7..8e196e50d54f 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.2";
+ version = "14.6.3";
src = fetchFromGitLab {
owner = data.owner;