summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaya <mak@nyantec.com>2023-06-29 09:39:44 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-06-29 11:19:07 +0000
commit111a51ffdfa5e064159c8d7cb2987155524e3765 (patch)
treea4f7c2541d56c0332ff96d97c16e3d2ab7916dd2
parentMerge pull request #240502 from NixOS/backport-235003-to-release-23.05 (diff)
downloadnixpkgs-origin/backport-240503-to-release-23.05.tar.gz
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.1.1-ee/CHANGELOG.md (cherry picked from commit 9f0b22c9b25cf37ffb42fa27a32f0456d6d45e2f)
-rw-r--r--pkgs/applications/version-management/gitlab/data.json12
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-pages/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix2
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 488bf1218053..d4acae1c4622 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "16.1.0",
- "repo_hash": "sha256-sRel6okv2NYV4As3+AudqVvJ1/eLQGJGFvs+BA14wis=",
+ "version": "16.1.1",
+ "repo_hash": "sha256-y0a2jEWFVLtekZvhBZFOSyeDj8DI2Jxf208r5rhRUm4=",
"yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v16.1.0-ee",
+ "rev": "v16.1.1-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "16.1.0",
- "GITLAB_PAGES_VERSION": "16.1.0",
+ "GITALY_SERVER_VERSION": "16.1.1",
+ "GITLAB_PAGES_VERSION": "16.1.1",
"GITLAB_SHELL_VERSION": "14.23.0",
- "GITLAB_WORKHORSE_VERSION": "16.1.0"
+ "GITLAB_WORKHORSE_VERSION": "16.1.1"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 38e8a72526f9..ed0385290610 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -13,7 +13,7 @@
}:
let
- version = "16.1.0";
+ version = "16.1.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-+Fnj9fgQQtyGMWOL5NkNON/N9p6POjAtpF2O06iKh90=";
+ sha256 = "sha256-bbAu9OIo1FT2KX186ajV5OUcvFpKUGaYPxY2S2RvXo8=";
};
vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index 8d96d160f756..5c7c3af92d4f 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
- version = "16.1.0";
+ version = "16.1.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- sha256 = "sha256-vAprB+pDwpr2Wq4aM0wnHlNzUvc1ajasdORwT0LDTTY=";
+ sha256 = "sha256-xXA1KIn0uEuW3r4KnZ1A5Ci/pCbuUdZTYraVzYfUdoA=";
};
vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 1f64e343056b..ce642b32e164 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 = "16.1.0";
+ version = "16.1.1";
src = fetchFromGitLab {
owner = data.owner;