From c4e4d9b3ea4f5d1e62dc264fc050d0cca66b4728 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 26 Nov 2025 20:49:24 +0100
Subject: [PATCH 1/2] Revert "gitlab-runner: apply patch for file variable
 handling"

This reverts commit f99787269a50f51d9c4a3f6aba51925588540e30.
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index beec1d63b257..4ebd67ead05d 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -4,7 +4,6 @@
   bash,
   buildGoModule,
   fetchFromGitLab,
-  fetchpatch,
   nix-update-script,
   versionCheckHook,
 }:
@@ -28,12 +27,6 @@ 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 = ''

From a6b72720c565b9ef945ff5c18046b404452b4b65 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 26 Nov 2025 20:49:32 +0100
Subject: [PATCH 2/2] Revert "gitlab-runner: 18.5.0 -> 18.6.0"

GitLab Runner 18.6 introduces quite a few regreissions including

- submodule (no fix available)
- variable handling (fix available)

This reverts commit dbb3a08e6f8d46d8e0c7ef5740e0a44fdd676c38.
---
 pkgs/by-name/gi/gitlab-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 4ebd67ead05d..0592229902ec 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.6.0";
+  version = "18.5.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SpfmFpL4bZbzC3T77EEbOoV9dVY3tLgcuE0gN4x1168=";
+    hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
   };
 
-  vendorHash = "sha256-9Ttmf/iTikSAlAIlmKSRMEDizPP4Iw0CttcR8oYLiMU=";
+  vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";
 
   # For patchShebangs
   buildInputs = [ bash ];