about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-05-22 14:24:20 +0000
committerGitHub <noreply@github.com>2024-05-22 14:24:20 +0000
commit796091cec8b16f2c07fe76279d4a49aa6537af4d (patch)
tree5d2b093a6fd3b4bbfe5f90e9ef89fc32b2c17735
parent4122e330f13c039e05d95774fa8c46789aed7a59 (diff)
gitlab: 16.10.5 -> 16.10.6 (#313673)
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.10.6-ee/CHANGELOG.md

Fixes CVE-2023-6195
Fixes CVE-2023-6682
Fixes CVE-2023-6688
Fixes CVE-2024-1211
Fixes CVE-2024-1539
Fixes CVE-2024-2454
Fixes CVE-2024-2651
Fixes CVE-2024-2878
Fixes CVE-2024-3976
Fixes CVE-2024-4539
Fixes CVE-2024-4597

(cherry picked from commit ba240b299db7bd32a9d62b98858ccc212e9d0690)

Co-authored-by: Yaya <github@uwu.is>
-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 03ad46e659436..bedc561743e70 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "16.10.5",
-  "repo_hash": "sha256-w2cXFIm588Q/SB1kO9dGCmxO3+Xee7BaCCipuVcnfXg=",
+  "version": "16.10.6",
+  "repo_hash": "sha256-+nEUyD+ryZicH7suh4MnQRDKMC3M3VWRdO4nZCi2LGs=",
   "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v16.10.5-ee",
+  "rev": "v16.10.6-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "16.10.5",
-    "GITLAB_PAGES_VERSION": "16.10.5",
+    "GITALY_SERVER_VERSION": "16.10.6",
+    "GITLAB_PAGES_VERSION": "16.10.6",
     "GITLAB_SHELL_VERSION": "14.34.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
-    "GITLAB_WORKHORSE_VERSION": "16.10.5"
+    "GITLAB_WORKHORSE_VERSION": "16.10.6"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 981e5cfcc5acf..469ea9e8231bc 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "16.10.5";
+  version = "16.10.6";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -18,7 +18,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-ctJfw4aU5qsv+I3rR9xZPGssYQpTnbn4MdTVOYapHqQ=";
+      hash = "sha256-C57p3H1L6ZQfjipGoQJup8u6ofir3rrxORtzUA1afL0=";
     };
 
     vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index e6fcc839fd9b2..11cc63e110faf 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 = "16.10.5";
+  version = "16.10.6";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-wuEYcwAKYO7YZs88NvE0AI5+aZ9JeLBAeXITc2jLGVo=";
+    hash = "sha256-30ojS+TBIJ4Qzg1jh2Bpdd2s2Yo2S+UqxRRdvNBvB/k=";
   };
 
   vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 0d0afde0766f4..1e251e8058267 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.10.5";
+  version = "16.10.6";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {