From patchwork Sat Mar 22 17:00:33 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: 40629 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 1817D27BBEA; Sat, 22 Mar 2025 17:03:19 +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 A9C0927BBE2 for ; Sat, 22 Mar 2025 17:03:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw2FY-0006g4-Nt; Sat, 22 Mar 2025 13:03:11 -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 1tw2EZ-0006M7-Qb for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02:07 -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 1tw2EZ-0005EM-G0; Sat, 22 Mar 2025 13:02: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=vMw7HL590zybnMm4P7PMR9I5RDOg6MZZJYUtYFos+t4=; b=noMwBBsgMnHYNnVMPmj0UeASCwkZ2PKHq1469OYsPczHX8v2cCqB7hX3zGGwwTUTyUgKug1ItYIOZ7moiFN8RV68vW3Jjq83PnJZc8B1mkNJI+w7lL10RHi4vHzkkaiLrdL/mDlY4u+fO4Qdh8tZJX+kznAj5T5DrVvYFyS40592qC24r/Buf34wcr94F6bgGeQU8LFtTT2Ic+ydPJfEwSY0Sdyw6JA5YKcekcEA0I1VTiWxcKBDnAd1OweB5S4XTA//d3J1BMOC2B9zM/lgyEDAKx3N71BdKuRU6fwrnbzhfHh0BDZABB3Q115apY8IsEOfqaNyfGj4rVUL401bHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw2EZ-0006i6-B8; Sat, 22 Mar 2025 13:02:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 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:02: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.174266288625639 (code B ref 77186); Sat, 22 Mar 2025 17:02:07 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:26 +0000 Received: from localhost ([127.0.0.1]:45114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Dt-0006fO-M3 for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:58380) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DI-0006bv-5a for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:49 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3174A3802FD; Sat, 22 Mar 2025 17:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662846; bh=RZ9wAiwBT82wj7XoQa/Zy/16wJkPaFotZ358UBIdToY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AalJbCNFyjkA4qvGr8tDsgWOUusQilv/C/vThketooVoCSZ+tJLZ23JJXI+Ntl9L1 ypnnf6ixRuIbIzS1WasS1U5K10RygXP6AebqDsq2P0AQv2w6cC6fVV1ap+lrhQNVtG ntzoJneZf4hFNNwG1GZXpCrmyi8CIX6be6ZEJHow0V9PKfwiJCbkKuSrAZT8qGsZvj IhKryK0aHt2h3b5pTrd9HYGogYAq3rWj5kqIe9NVW+jQzBByk5Pu1tpiw2UBIP3oQi DZbB9RkEx2d/oBgO1zHICVAKmTJ7ajUmFRxjuZMi7qU/M8dBa0r+cUqJnvMXr7DyB+ 9Vr/gzT/yA8PHuVNUuhZTYXFJ3/G/97YDrIYuHT6g9PtKDEKRKbpAE2djKYYSziZhM T+9/HDGbhtRiJ3JJbfLVDoDEuq2M1G02lG/TltPZrwfaAPzaoDUa0aUvyPJKI35ata uyKlFj8np3J05aGe3TRL4PbcnjPsrUMSwDpOQ8YbFtOIFYE82X99ZyVTUbSdD2g3Qp XBbEbV306E+dXSJaDew9spf8kkC2QvkSqA2Zjshv96uv9JZnM/1tvgCplGzvTj4Nn1 Q2dRf3YD7C7TD6GWfui3IglxAn6mYI3J2th2sxKMcyaXysWC1mTZZDvdXumwJXoUyO fb2yiTzig8Gkc3hw/+LhhJNc= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 2CBE037FEE0; Sat, 22 Mar 2025 17:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662845; bh=RZ9wAiwBT82wj7XoQa/Zy/16wJkPaFotZ358UBIdToY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NLc50yVKjb/RggKlCeKaRwwhAD0y4SMOrBHPKl7Ol8N/lSX19Ji2iuMMJl20LonGq UoR8FXX2asycRfYpvbeKhuLxSqc9mfq/iUCLVWESa83cfTdjb65CcDN6x9zE7tIQ1b pvMu1H/qUMEIdgUOLOaeUCFY2JcP+gEHeak7KnZVZpFQwj9OZ/2YVVbNOkelodtnXj XgbQ2sEw4nHcVLoXn0WuaENdxEgxU36IlMw8TD3R4vdeEuYWko33tMPQLLHi5SFlvc 7VNQ6SHWi9J/8IJJ8dEgwXlDP+tc91brpVVkj8a1ob2ckY5ZtOozCSOJZSJBdQgSPK aZzr+3r+UqBqlCjedltL89gD3VjPxmGmas55djnl68GGbkVGRXWDPj37Xs+KnONHpt 11Wx41MkFAQQzFPXmaRvUYPeq9jrwPMEIf/C1W3tIdMOfut+mswlpetKrDqd2AndUs ru/X6+k76BkmTnDfTQPSvH2r48VkftMEk6uGpba/ZOb/8NyKu/kQVebptojUlGObf0 4uFvQ2/5hIVRnPt50KC7fdVevrXFUUNooa6BxfiOuVh79WiFbFTR2sfDj0/UMbWDvm hYdxoml7r6IVPu6UMYQFV9utyTsY9AuL5Q4hud4X50pguEigm2YvW1kS33OVcMqi2Q wOzIerJTzETanjlccI/77cDI= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:33 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 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 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 4f36495740..05a3530fa1 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -73,6 +73,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 @@ -338,12 +339,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" @@ -355,7 +358,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