From 80b43ad878aea3a63abd6ee865188e74bf68ebfb Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 25 Sep 2025 22:36:21 +0200
Subject: [PATCH] gitlab: 18.4.0 -> 18.4.1

https://about.gitlab.com/releases/2025/09/25/patch-release-gitlab-18-4-1-released/
---
 pkgs/by-name/gi/gitaly/package.nix                   |  4 ++--
 .../by-name/gi/gitlab-container-registry/package.nix |  8 ++++----
 pkgs/by-name/gi/gitlab-pages/package.nix             |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                     | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix  |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock          |  3 +++
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix            |  3 +++
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 106f7751f50d..b3bb574d94aa 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.4.0";
+  version = "18.4.1";
   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-Xg+JRw/W93n6FGjjQRTULuCTRQxvPyyQJKACQNaYyyg=";
+      hash = "sha256-NsPOxnX8BF9J1SqTj6DhPUWSEq7E5+grumPlwHPbA/8=";
     };
 
     vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 38ebb7b4b294..524e46299197 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,18 +6,18 @@
 
 buildGo124Module rec {
   pname = "gitlab-container-registry";
-  version = "4.27.0";
-  rev = "v${version}-gitlab-ahmed-master-test";
+  version = "4.28.0";
+  rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-lcM0HjseQ4N7rndDx95aC6MWb+Ggwz3UIhSvbC8oxus=";
+    hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
   };
 
-  vendorHash = "sha256-ALPK9h5Isniis7QPz9DXokeBd+hWMDJ7ts9/sGNrFMk=";
+  vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index db0a76e54d20..e3cf786769ab 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.4.0";
+  version = "18.4.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-yaIqPr5f2GdRtgLn2XQHNBf0n0O97WlOcCdIule53eA=";
+    hash = "sha256-C4zdBsZ+Sz9S5lQ5qivqmrlM6C6jEepq152v3XQvA6E=";
   };
 
   vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 85ef14d9b5aa..bc1acf521add 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "18.4.0",
-  "repo_hash": "0vp4wnipbl8v9vm4xjvwqgzgff4i9xn5p690vw4yvngs7gnclv11",
+  "version": "18.4.1",
+  "repo_hash": "0wqk6vcjsnv84qbngzri4klg299kk154cadl98zf9vzypv5l66rz",
   "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.4.0-ee",
+  "rev": "v18.4.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.4.0",
-    "GITLAB_PAGES_VERSION": "18.4.0",
+    "GITALY_SERVER_VERSION": "18.4.1",
+    "GITLAB_PAGES_VERSION": "18.4.1",
     "GITLAB_SHELL_VERSION": "14.45.2",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
-    "GITLAB_WORKHORSE_VERSION": "18.4.0"
+    "GITLAB_WORKHORSE_VERSION": "18.4.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index ee4461faf8d7..9be3bea4f005 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.4.0";
+  version = "18.4.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index 55bb4449a788..48e3e7112d1a 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -27,8 +27,11 @@ PATH
     gitlab-active-context (0.0.1)
       activerecord
       activesupport
+      aws-sdk-core
       connection_pool
       elasticsearch
+      faraday-typhoeus
+      faraday_middleware-aws-sigv4
       opensearch-ruby
       pg
       zeitwerk
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index f59cd14b5116..a35d3cb71ccc 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -2790,8 +2790,11 @@ src: {
     dependencies = [
       "activerecord"
       "activesupport"
+      "aws-sdk-core"
       "connection_pool"
       "elasticsearch"
+      "faraday-typhoeus"
+      "faraday_middleware-aws-sigv4"
       "opensearch-ruby"
       "pg"
       "zeitwerk"