From 402f15094d8bbc1fa3b69c8a3352caef0825f88a Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 21 Nov 2025 11:49:31 +0100
Subject: [PATCH] gitlab-runner: apply patch for file variable handling

Upstream introduced this regression in the 18.6.0 release, there's
currently no fix release, so introduce the patch.

(cherry picked from commit f99787269a50f51d9c4a3f6aba51925588540e30)
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 4ebd67ead05d..beec1d63b257 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -4,6 +4,7 @@
   bash,
   buildGoModule,
   fetchFromGitLab,
+  fetchpatch,
   nix-update-script,
   versionCheckHook,
 }:
@@ -27,6 +28,12 @@ buildGoModule (finalAttrs: {
   patches = [
     ./fix-shell-path.patch
     ./remove-bash-test.patch
+    # fix regression. remove with next release.
+    (fetchpatch {
+      name = "fix-shell-executor-not-working-with-variables-that-use-file-variables.patch";
+      url = "https://gitlab.com/gitlab-org/gitlab-runner/-/commit/6318fe8e38ca9774eb0f52fa2c68555cdad3ab44.patch";
+      hash = "sha256-GTdBo+7kHHpNs6JywjOII4NBcHjFYEZ3xhdGTcGKov4=";
+    })
   ];
 
   prePatch = ''