From patchwork Sat Mar 22 17:09:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40639 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9E4527BBEA; Sat, 22 Mar 2025 17:11:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34B5827BBE2 for ; Sat, 22 Mar 2025 17:11:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw2NT-0000iO-MP; Sat, 22 Mar 2025 13:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tw2NH-0000ZJ-OU for guix-patches@gnu.org; Sat, 22 Mar 2025 13:11:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tw2NH-0007l2-8b; Sat, 22 Mar 2025 13:11:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=a/L4ZGZvd6ccsgJSXOcZ/NacmhLAC3aFqNfRq7tGTLw=; b=NYJcjMKOx0hb8WMYNAOytUptvAp+dbMYW47kRQe023JxziQ4ofp+HfQ00syDxlY5Ctjah+pHXmeJXJgF6OJ5LWPAkxsf9CCkF9/ul6WL/jXJ/InmxLC8TtTFF9i68CyfbeK2ExhzXFnGj+rusadXklN0VyvAXiEyPNe5tWiZVn1bzM5pFseUE8KSavCPzY0OEUA9N2lUTz26mxlLz6UZ4y7K51yFxJ4HV5ks533fXQQ4UQhGROFoqMjnbbs/nTdhHCCHfitXrFND5BRpDIdgxxrAyATzMm+Keg7GLmBpyWl9BodQexEXx9ftg4wATtpt+VV1+54hF+2pSWFYkJUscA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw2NH-0007J9-3M; Sat, 22 Mar 2025 13:11:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 13/13] services: gitolite-git-configuration: Add extra-content field. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77186@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266343527797 (code B ref 77186); Sat, 22 Mar 2025 17:11:07 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:35 +0000 Received: from localhost ([127.0.0.1]:45255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Ml-0007EB-8V for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:35 -0400 Received: from wolfsden.cz ([37.205.8.62]:54878) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2MH-000762-BT for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:07 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 504B637F47F; Sat, 22 Mar 2025 17:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663404; bh=aAAGsqvP4Bcb/PVdVVns/gkcyTE8Zf9QSWJ+7Bo5Enw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tHv4oLA0lWCYR9g8AykBQt8si+HlI6GZ0rggooIl3A0IkGSBSRIV1HeCdmuOYhlAY YwoRkmVhBkYlKaHmrMnqQ04fj+RzzVDUkadLGBsO5vNGjx1gcUOYARMH5lj+cJlXxO NFY4v9OYe4dl12bvG1GdRY+Uzc4FMO27o1gH/v1OesN/31JtBBijFKdHndDQV6D3NH +r9ICGqtFt3bilqk/h5WR9X9WkBKprj74Wth8WSDZlxquJKlG0nUAsQaEkPYXMopWi CyJi6kzQcGRwhnIgL7/qS71Imi0hr4a+j9G3AmAlNhQ5nxQDzNFEqwv3oSr6Fuy0qW sqa6lve6GT7gn9rcKutk0idSVvihJEK9+NLA7s9DjFrzol8RsPceekreu9PmjcQtCn zB4ddMnwThMe8x96bLNw3PLMOyBc//wN55Tj745H1BGqoLZHeJmgcKLDAuQPwKR19t LQr6COO9boNbfJs7Eyy2NLdeWlW143mby/kZSqZ4qJIGL69BFW5/egbxuEWUEXt2jC hFxRGHATxMpbW+HcT6+Rg+00sdbmwJVR7hhrXwBRnS+5I/cTFux0b3F7UwdQtZHoxu C+mxVVLlHHmY6fZirSmXSapD374Jrb620cWOOOSozJkxErUX7wMy3qhPD6pQuL3QHp kgiByLa0bXqRSffPmjWyCIfw= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id DA39F380E85; Sat, 22 Mar 2025 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663403; bh=aAAGsqvP4Bcb/PVdVVns/gkcyTE8Zf9QSWJ+7Bo5Enw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WYAhCwKy2aiojXoaLds6uuHyddHeXfmb9RGpAiOEj3ZmCXhFWmJroBeis1zKWF6Hc lLPG7Xom3rjIyhmQj8egql9t2BbQ6T/SLfzFBJmtva583RA0vnOo3oxQgeLnjJLpbf ftf3L+beUkqED/ZBGRP34cIkTK/LuDIHODr7tcWnwQZKU6TipwpnpAPmBMe97SBEjQ yF2Cf2K0k6PKkkVnoED//Dmz8rsxhGuhgld36aMQJknimsJa922TBEOFZwLQbD+Uso liVGc0hicDTvyNg0vqvPs5UCGfuJcrAb04ATQ4h6t0qKFeoHP6C+NriHiapmPxXKmI NatjkW8pqky8U5g0YwXSGyCffP+SdlCMpZGCgNFvMU2bD29xzvuqAaQBgv19PH8qLC 8jhF+7Ei5vS94U2wt5sdJzD883665PwMh92GxVl8URbYsjf8S60pcytySaElY0lloi mNfRWyygSSOzwxTqp8lzTLQhRMAxiFR8E/3Q1P8bDMw14RrWDL/xgG95lQgMsvROtg J2glVKWbOvctEdG7ZV8KpDIobf5FqP/Eh9m1cbT/Wt9dJ5aY9q6QVdOvMzcQ7zDJj4 vL376uDF0qoS8qm46Delak0/u2cvGBNRUertSAGw+N9q6EMA7M3I9VuGOSDgIkmCon t3Aj38VPPg7iV/XVT599U5HQ= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:14 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> References: <39fb02cc97f30aa37523d9f5f9390264d53fcf8b.1742663354.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/version-control.scm (): Add extra-content field. (gitolite-git-configuration-compiler): Handle it during configuration file generation. * doc/guix.texi (Version Control Services): Document it. Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f --- doc/guix.texi | 3 +++ gnu/services/version-control.scm | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f8fa1ab3bd..311564c1d2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41192,6 +41192,9 @@ Version Control Services @item @code{receive-fsck-objects} (default: @code{#f}) If it is set to true, git-receive-pack will check all received objects. +@item @code{extra-content} (default: @code{""}) +Extra content to add verbatim into the git configuration file. + @end table @end deftp diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 1e21174ea9..e73e77e0b2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -74,6 +74,7 @@ (define-module (gnu services version-control) gitolite-git-configuration-email gitolite-git-configuration-default-branch gitolite-git-configuration-receive-fsck-objects + gitolite-git-configuration-extra-content gitolite-service-type @@ -339,12 +340,14 @@ (define-record-type* (default-branch gitolite-git-configuration-default-branch (default #f)) (receive-fsck-objects gitolite-git-configuration-receive-fsck-objects - (default #f))) + (default #f)) + (extra-content gitolite-git-configuration-extra-content + (default ""))) (define-gexp-compiler (gitolite-git-configuration-compiler (config ) system target) (match-record config - (name email default-branch receive-fsck-objects) + (name email default-branch receive-fsck-objects extra-content) (apply text-file* "gitconfig" `("[user]\n" "name = " ,name "\n" @@ -356,7 +359,8 @@ (define-gexp-compiler (gitolite-git-configuration-compiler ,@(if receive-fsck-objects `("[receive]\n" "fsckObjects = true\n") - '()))))) + '()) + ,extra-content "\n")))) (define-record-type* gitolite-configuration make-gitolite-configuration