From d5cb89b024a347d3f27e45f6f1f5332ff22905c6 Mon Sep 17 00:00:00 2001
From: Maciej Pasternacki <maciej@3ofcoins.net>
Date: Sun, 8 Jan 2023 17:00:51 +0100
Subject: [PATCH 1/2] nixos/gitlab-runner: fix problems introduced by last
 #209716

---
 .../services/continuous-integration/gitlab-runner.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index d18c4cff0405..3f697739bef0 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -9,14 +9,14 @@ let
   The hash is recorded in the runner's name because we can't do better yet
   See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29350 for more details
   */
-  genRunnerName = service: let
+  genRunnerName = name: service: let
       hash = substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service)));
-    in if service ? description
+    in if service ? description && service.description != null
     then "${hash} ${service.description}"
     else "${name}_${config.networking.hostName}_${hash}";
 
   hashedServices = mapAttrs'
-    (name: service: nameValuePair (genRunnerName service) service) cfg.services;
+    (name: service: nameValuePair (genRunnerName name service) service) cfg.services;
   configPath = ''"$HOME"/.gitlab-runner/config.toml'';
   configureScript = pkgs.writeShellApplication {
     name = "gitlab-runner-configure";
@@ -38,7 +38,7 @@ let
     '' else ''
       export CONFIG_FILE=${configPath}
 
-      mkdir -p "$(dirname "${configPath}")"
+      mkdir -p "$(dirname ${configPath})"
       touch ${configPath}
 
       # update global options

From c3ec444a612d33027c9629b83b9faaf1fd6ddedc Mon Sep 17 00:00:00 2001
From: Maciej Pasternacki <maciej@3ofcoins.net>
Date: Sun, 8 Jan 2023 17:06:20 +0100
Subject: [PATCH 2/2] nixos/gitlab-runner: fix style issues flagged by statix

---
 .../services/continuous-integration/gitlab-runner.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 3f697739bef0..3e6dba16e8ac 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -534,9 +534,9 @@ in {
     };
   };
   config = mkIf cfg.enable {
-    warnings = (mapAttrsToList
+    warnings = mapAttrsToList
       (n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.")
-      (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services));
+      (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services);
 
     environment.systemPackages = [ cfg.package ];
     systemd.services.gitlab-runner = {
@@ -570,7 +570,7 @@ in {
         ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure";
         ExecStart = "${startScript}/bin/gitlab-runner-start";
         ExecReload = "!${configureScript}/bin/gitlab-runner-configure";
-      } // optionalAttrs (cfg.gracefulTermination) {
+      } // optionalAttrs cfg.gracefulTermination {
         TimeoutStopSec = "${cfg.gracefulTimeout}";
         KillSignal = "SIGQUIT";
         KillMode = "process";