From b4aa756d94b1ce3afc6b8faa6d6827616baaa04f Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Thu, 19 Dec 2024 18:01:33 +0100
Subject: fix(treewide): Update to nixos release 24.11

---
 modules/nixos/vhack/git-server/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'modules/nixos')

diff --git a/modules/nixos/vhack/git-server/default.nix b/modules/nixos/vhack/git-server/default.nix
index 5c25bd7..a374f4c 100644
--- a/modules/nixos/vhack/git-server/default.nix
+++ b/modules/nixos/vhack/git-server/default.nix
@@ -11,12 +11,6 @@
     cgitPkg =
       config.services.cgit."${cfg.domain}".package;
   };
-
-  /*
-  Until <https://github.com/NixOS/nixpkgs/pull/317293> is merged into
-  nixpkgs, we have to do the list to string conversion ourselves:
-  */
-  toCgitRc = list: lib.strings.concatStringsSep " " list;
 in {
   options.vhack.git-server = {
     enable = lib.mkEnableOption ''
@@ -88,9 +82,12 @@ in {
           branch-sort = "age";
 
           # Allow users to download a repo checkout with these compression formats
-          snapshots = toCgitRc ["tar.gz" "zip"];
+          snapshots = ["tar.gz" "zip"];
           # The template used to generate the clone url for https clone.
-          clone-url = toCgitRc ["https://${cfg.domain}/$CGIT_REPO_URL" "ssh://git@${cfg.domain}/$CGIT_REPO_URL"];
+          clone-url = [
+            "https://${cfg.domain}/$CGIT_REPO_URL"
+            "ssh://git@${cfg.domain}/$CGIT_REPO_URL"
+          ];
           enable-http-clone = true;
 
           # TODO: We might want to add an logo and readme here <2024-07-31>
@@ -105,7 +102,7 @@ in {
           # "month", "quarter" and "year".
           max-stats = "week";
 
-          readme = toCgitRc [
+          readme = [
             ":README.md"
             ":readme.md"
             ":README.mkd"
-- 
cgit 1.4.1