summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaya <github@uwu.is>2024-08-19 12:37:38 +0200
committerYaya <github@uwu.is>2024-08-22 12:29:35 +0200
commit30e2ce37efa6123ac6ce1190359517547e7c9ed0 (patch)
treecb5a9c948ec6054477216570ab340e70abbf6764
parentgitlab: 17.2.0 -> 17.2.1 (diff)
downloadnixpkgs-30e2ce37efa6123ac6ce1190359517547e7c9ed0.tar.gz
gitlab: 17.2.1 -> 17.2.2
https://about.gitlab.com/releases/2024/08/07/patch-release-gitlab-17-2-2-released/ https://gitlab.com/gitlab-org/gitlab/-/blob/v17.2.2-ee/CHANGELOG.md Fixes CVE-2024-2800 Fixes CVE-2024-3035 Fixes CVE-2024-3114 Fixes CVE-2024-3958 Fixes CVE-2024-4207 Fixes CVE-2024-4210 Fixes CVE-2024-4784 Fixes CVE-2024-5423 Fixes CVE-2024-6329 Fixes CVE-2024-6356 Fixes CVE-2024-7586 (cherry picked from commit a4ea8e7033e1bd234f2552790e0b987f4507aac7)
-rw-r--r--pkgs/applications/version-management/gitlab/data.json14
-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
-rw-r--r--pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock2
-rw-r--r--pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix2
6 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 656c510fd8a9..60ef72756c34 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
{
- "version": "17.2.1",
- "repo_hash": "0bn5pz1rvnzvjm4yxpz651cz3zvar1mwd8wjxi0c34bv631g7903",
- "yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn",
+ "version": "17.2.2",
+ "repo_hash": "1gk29bwd6vzikjg28p30wgdq9a46l4qbnac5r0h2mwih1sm8hlbc",
+ "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v17.2.1-ee",
+ "rev": "v17.2.2-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "17.2.1",
- "GITLAB_PAGES_VERSION": "17.2.1",
+ "GITALY_SERVER_VERSION": "17.2.2",
+ "GITLAB_PAGES_VERSION": "17.2.2",
"GITLAB_SHELL_VERSION": "14.37.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
- "GITLAB_WORKHORSE_VERSION": "17.2.1"
+ "GITLAB_WORKHORSE_VERSION": "17.2.2"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 2c69b73dfa35..8d62fee32bf1 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -7,7 +7,7 @@
}:
let
- version = "17.2.1";
+ version = "17.2.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,7 +21,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- hash = "sha256-X4ZkeVwuyiFNucqH6zI9slegvrFksu9Ve6rRNoNy9TI=";
+ hash = "sha256-4K0unlvhAnTIiuyRUNm0dXG5sJsxIuo8HkUQvUK7ws4=";
};
vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index 7453dae1d339..5c934a5afc83 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
- version = "17.2.1";
+ version = "17.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- hash = "sha256-4viJD8i+9vVPQISpGB9tZFqCk/LonfcPZy9uYoDu3Qw=";
+ hash = "sha256-AtLsy2hHxqr3XyTItLfMoTmrUsM707Kme7jE2jAAfyc=";
};
vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 937c3a2736b8..77ba5813469d 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 = "17.2.1";
+ version = "17.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 3a520314aa47..f8d33908e6ca 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -2279,4 +2279,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.5.11
+ 2.5.16
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 10c3460eded1..325a467cd624 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -2789,7 +2789,7 @@ src:
version = "1.45.0";
};
google-protobuf = {
- groups = ["default"];
+ groups = ["default" "development" "opentelemetry" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];