summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaya <github@uwu.is>2023-06-06 09:06:53 +0200
committerGitHub <noreply@github.com>2023-06-06 09:06:53 +0200
commitd83945caa7624015f11b152bf5c6c4363ffe9f7c (patch)
treeefb3efcb7e7696a86623fea05e9564062e1f4739
parentMerge pull request #236154 from NixOS/backport-236108-to-release-22.11 (diff)
downloadnixpkgs-d83945caa7624015f11b152bf5c6c4363ffe9f7c.tar.gz
gitlab: 15.11.6 -> 15.11.7 (#236153)
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.0.2-ee/CHANGELOG.md Fixes CVE-2023-2442 Fixes CVE-2023-2199 Fixes CVE-2023-2198 Fixes CVE-2023-2132 Fixes CVE-2023-0121 Fixes CVE-2023-2589 Fixes CVE-2023-2015 Fixes CVE-2023-2485 Fixes CVE-2023-2001 Fixes CVE-2023-0921 Fixes CVE-2023-1204 Fixes CVE-2023-0508 Fixes CVE-2023-1825 Fixes CVE-2023-2013
-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-workhorse/default.nix2
3 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 038c87c64a34..4101cf250fec 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "15.11.6",
- "repo_hash": "sha256-qpYVYzxtMgWLXhMn+0TvDqRJOnerfc9OEU1Gs6Ys/Bc=",
+ "version": "15.11.7",
+ "repo_hash": "sha256-F9oo4eh+steQTKsUT5TGPa0QIRhbOd9xl8tm20p8Qus=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v15.11.6-ee",
+ "rev": "v15.11.7-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "15.11.6",
- "GITLAB_PAGES_VERSION": "15.11.6",
+ "GITALY_SERVER_VERSION": "15.11.7",
+ "GITLAB_PAGES_VERSION": "15.11.7",
"GITLAB_SHELL_VERSION": "14.18.0",
- "GITLAB_WORKHORSE_VERSION": "15.11.6"
+ "GITLAB_WORKHORSE_VERSION": "15.11.7"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 655604ee72c1..0d33712de6cc 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
- version = "15.11.6";
+ version = "15.11.7";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-n56Jqgu64+pN4bcH/Sh8/+4StpTEY529a4yVozqtK5Y=";
+ sha256 = "sha256-bgqyrI9HhctFHsQcKq1PA+bHujljUhyZHwrnhn0NItI=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 96362c489590..121e22a3a1f2 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 = "15.11.6";
+ version = "15.11.7";
src = fetchFromGitLab {
owner = data.owner;