From patchwork Mon Mar 31 22:10:19 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: 41109 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 E2F0127BBEA; Mon, 31 Mar 2025 23:14:24 +0100 (BST) 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 596A027BBE2 for ; Mon, 31 Mar 2025 23:14:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzNN4-0000Ni-0J; Mon, 31 Mar 2025 18:12:43 -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 1tzNMY-0000DR-5M for guix-patches@gnu.org; Mon, 31 Mar 2025 18:12:11 -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 1tzNMX-0006zw-SP; Mon, 31 Mar 2025 18:12:09 -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=fTcrcosS1XXi2s4/h4RaIXEnTwxnm0PujO9CPz7KXfE=; b=Okq8N3QgxTYaJG5p+T0c43kII39DLXDxL/+rjqFpT04VMKSXDmCXTAcNAwGo7jI5JUa4fXIQmsrLx3cF5AaerPdtaau/iCAetXAAtlogarcJ8Yzhrqe+aELd6JXFGPHmGLY4iW1bT7IRoAZSylsVjC5WkCaEBLP3YHZb382Xl63dwF3tC91FsaMPZj3USmJzkmUnvSuf4cAmcGYvGFKwcE9cEndt8CYk74ouxKq/btQ7n01CEs7U8QvFwNgUOMZDIEe0fv1MJHx7gOpO9TOnYO45I6OmTcZASf1K7s+O4YXEpFv8WyamEFl+4p5BguIh6tQBgZ9/g0SZ+byvlfHrsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzNMX-0000cO-MA; Mon, 31 Mar 2025 18:12:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 13/14] 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: Mon, 31 Mar 2025 22:12:09 +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.17434590752033 (code B ref 77186); Mon, 31 Mar 2025 22:12:09 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:15 +0000 Received: from localhost ([127.0.0.1]:43370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLe-0000Wb-UM for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:15 -0400 Received: from wolfsden.cz ([37.205.8.62]:41028) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL9-0000Qi-SX for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 86E963792AE; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=xwelrJMlNep8GA3BZRuJ9A4bM5DICLkvr87FUKA5kWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eEJc/AJCI1+KY9zAaXRhEXMtn3OwkSQKaJEmBivd4ALfOx/S4jUDB9bwtzLmuzGqI DCdIR6ES4/lAtTAvg3DI9cP0tCwfXrxr3fmeA4CtetxgGgw2vWexawvIkpEAZ0ifdX 1adC4kTzuilLM77MWTzd+uH9dXOt0edsAoJWG+GyaLtI0NUl0/ayTnNxG2WgUR7nGD LjgCdGGtcp7xDQPgMWMIxZlDV3u18hBcdio6JRIL0waxKeU8wTIHLPboxAIIBpFdXf 6LA0xef5pZhVvDTJxAZLR5vbfKNi9IK/sElVaXAevUZ7lgc707ZJ+CoOoHI8TvEvoP A5u6v01ZK7CrQm7B3MUaeB7PwVmDPfXBdTiWmYvAFALLp/qqJxxSsn4Svs4DVgP7+/ bHtTlD7BWUTnq53jwD/qqLQBEu26KTT9d7cBQcWaU2NqaLi3/jEa00+5qPnlt2QYzK UVo7ACgH6vH8rGEgumSnKvzvHiiVwAItGuklnC0XsNN+s2jT/WYU1/mAdC3pbNG89T G6H28z/Yf+TmcsvSMDLUmv26FCbYRIm47p+B2Z0Us8iVaV7RFzZfxIGZGOKzDrBQL4 vhfyIS6f5epYnIcg35U8tLXcrni/1igcR12Mq2sbAbp7ivr09501/koSpD6pcv0mis NTZ47novT1MCh5Mk1diCI72Q= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 242013796A8; Mon, 31 Mar 2025 22:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459039; bh=xwelrJMlNep8GA3BZRuJ9A4bM5DICLkvr87FUKA5kWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eEJc/AJCI1+KY9zAaXRhEXMtn3OwkSQKaJEmBivd4ALfOx/S4jUDB9bwtzLmuzGqI DCdIR6ES4/lAtTAvg3DI9cP0tCwfXrxr3fmeA4CtetxgGgw2vWexawvIkpEAZ0ifdX 1adC4kTzuilLM77MWTzd+uH9dXOt0edsAoJWG+GyaLtI0NUl0/ayTnNxG2WgUR7nGD LjgCdGGtcp7xDQPgMWMIxZlDV3u18hBcdio6JRIL0waxKeU8wTIHLPboxAIIBpFdXf 6LA0xef5pZhVvDTJxAZLR5vbfKNi9IK/sElVaXAevUZ7lgc707ZJ+CoOoHI8TvEvoP A5u6v01ZK7CrQm7B3MUaeB7PwVmDPfXBdTiWmYvAFALLp/qqJxxSsn4Svs4DVgP7+/ bHtTlD7BWUTnq53jwD/qqLQBEu26KTT9d7cBQcWaU2NqaLi3/jEa00+5qPnlt2QYzK UVo7ACgH6vH8rGEgumSnKvzvHiiVwAItGuklnC0XsNN+s2jT/WYU1/mAdC3pbNG89T G6H28z/Yf+TmcsvSMDLUmv26FCbYRIm47p+B2Z0Us8iVaV7RFzZfxIGZGOKzDrBQL4 vhfyIS6f5epYnIcg35U8tLXcrni/1igcR12Mq2sbAbp7ivr09501/koSpD6pcv0mis NTZ47novT1MCh5Mk1diCI72Q= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:19 +0200 Message-ID: <358fa9172eda0124f7da41af8810f710f9a85eef.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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 fec6457c08..ad4a623916 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41106,6 +41106,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