From 6609c223b0e707ddfbb552d730e3bef3dc5bea65 Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Thu, 29 Sep 2022 20:58:54 +0000
Subject: [PATCH] gitlab: 15.4.0 -> 15.4.1

https://about.gitlab.com/releases/2022/09/29/security-release-gitlab-15-4-1-released/

Fixes CVE-2022-3283 CVE-2022-3060 CVE-2022-2904 CVE-2022-3018
      CVE-2022-3291 CVE-2022-3067 CVE-2022-2882 CVE-2022-3066
      CVE-2022-3286 CVE-2022-3285 CVE-2022-3330 CVE-2022-3351
      CVE-2022-3288 CVE-2022-3293 CVE-2022-3279 CVE-2022-3325
      CVE-2022-31107
---
 pkgs/applications/version-management/gitlab/data.json  | 10 +++++-----
 .../version-management/gitlab/gitaly/default.nix       |  4 ++--
 .../gitlab/gitlab-workhorse/default.nix                |  2 +-
 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 8ba5d6df7417..36fa987b8463 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "15.4.0",
-  "repo_hash": "sha256-AONzkIZbrOJkxGUYAunoWTc9xuCykKr4YkYeQQxRW8A=",
+  "version": "15.4.1",
+  "repo_hash": "sha256-z4J0ia9WxL+tJnoYNBtb6ZMuqGHiyhQ0tc0L8kzj26w=",
   "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v15.4.0-ee",
+  "rev": "v15.4.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "15.4.0",
+    "GITALY_SERVER_VERSION": "15.4.1",
     "GITLAB_PAGES_VERSION": "1.62.0",
     "GITLAB_SHELL_VERSION": "14.10.0",
-    "GITLAB_WORKHORSE_VERSION": "15.4.0"
+    "GITLAB_WORKHORSE_VERSION": "15.4.1"
   },
   "vendored_gems": [
     "bundler-checksum",
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 718deffbaa76..390581fe4472 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.4.0";
+  version = "15.4.1";
   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-cESZfLlwyC6khUrvS0LGfkvzCLudjFmlGXculYLrcDM=";
+      sha256 = "sha256-7f4TxCI/k2yirQxYI8i/6PXGVDs4x4ncIou1qH0TKAc=";
     };
 
     vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 31b0cf680034..cf58ee92860a 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.4.0";
+  version = "15.4.1";
 
   src = fetchFromGitLab {
     owner = data.owner;