From patchwork Sat Mar 22 17:09:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40641 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 ADF0227BBEA; Sat, 22 Mar 2025 17:11:55 +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 30D9627BBE2 for ; Sat, 22 Mar 2025 17:11:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw2NS-0000fx-0s; Sat, 22 Mar 2025 13:11:18 -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 1tw2NG-0000X4-4i for guix-patches@gnu.org; Sat, 22 Mar 2025 13:11:06 -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 1tw2NF-0007ke-KR for guix-patches@gnu.org; Sat, 22 Mar 2025 13:11:05 -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=2OlJOpXbzCdo092btpiQRoyzzeuwcGYFggRu3k7cf6o=; b=F2aPkrnd0Emz59ae1VS1EGdIjK4TecL7O7hiI36H/GlpoJUMTPz7qB3MSeZt7G0myBe/7ZsWNm3QDUIhumVd10hu7edvGebBhwvG2wYiJQfT98Gnx1rZr1IKM4bQQRCFpGv3JW5WLL3geX6AD2P1yxYcGRT45Xr34TDiz4A+eYqrrPHh3NNtkCFI8TOOxsg5w/K1wc2PclWxoCPuFQyPwX1+nNASHIDpNG8leC+W2kewgd/XI//KkBHwBNj5cpGEzRMdMLLiPH6Uc/GXrHJdV5FF8m087sDQR+knSE9OtlCM1MJivZaj4vK6gx1n19F07KVb9i4arJu0cKYlCVfiyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw2NF-0007Ii-Ep for guix-patches@gnu.org; Sat, 22 Mar 2025 13:11:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 07/13] services: gitolite-service-type: Do not install gitolite package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:11:05 +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> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266343027769 (code B ref 77186); Sat, 22 Mar 2025 17:11:05 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:10:30 +0000 Received: from localhost ([127.0.0.1]:45249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Mf-0007Di-IR for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:30 -0400 Received: from wolfsden.cz ([37.205.8.62]:57572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2ME-000752-Eh for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:10:05 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 10543380464; Sat, 22 Mar 2025 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663401; bh=E241oCd5BDBjw8ZaGsQGbGBpjoZqjisRErfytr9pfgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RKFp+oOpsnObGRUxbQXjwJIeZbj0o3QTVGZuti74JDx9eX8FkNLe1uBVlNNA4Rstc A1v6ZhuwdPXQDwqYk2mEoLw1nUTSRzWmt5QypQbW5GrZ8ScC+0kG1jakBtytsOOOcB vbz4Ti5Zs5uEVDTbbd1x2dcmpBTWMt8/X0YM+oUQRQ9BoyieC442Q8yCkrg11teLsA lpBtrleL9471bRqjVRCo7dwygVCdl3kns13MGogflYPMA44hKIcvzXDxeBRrwc8gLd +Snq1xneiyoPCbu81R/yAVcxDG10FdguhV0b8WJEN+54TKPXzNwDMk4vtwksBBR5JT vvg2+iGcnZ2Wy6wNiWzKeKfB+aAcD2Obs7q0p+dD5jCKPxh4ayTS76Aylls5c1QplX aiDqh2tlLXCWV4ACIclBRAgMverka9NC1OZl1ged/Ne/4wE2ryx4JDmgYXRuez/J5h ZBuk7rS4+5f0uC54khhLejCyJmeriaoVwdj8r7YroTFCbpkJVIYrsDxxA0FXQyfHwO Hv6UM6cbetkEg89CX0sj+Tij8szFZYC8At7QDCq0ldgQ0eWtCTHzAX4l5HoeBUwjnl h2PKPyhBFw27l7Fa46VVPinivi6mIEJFryi48E40HAeSbxG0H+VK25KGB8KY1lYXlF 3f48NxMO7vFD9DZmR2RGfjwg= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 98B58380635; Sat, 22 Mar 2025 17:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742663400; bh=E241oCd5BDBjw8ZaGsQGbGBpjoZqjisRErfytr9pfgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nsOd6+IsBaAhmYguBsXldLoHM89iJA5SahmixLK6P7OckDHsaFZCsGBB5FXV0EOF8 Wr6Xm6t4MNOWAWgzh8wt6h7ylw6IM484ZtxNlxDcIElHHBm5SRDbN9XLB+c+9167rq Q3is08SgCjIXXQ/Pe6FSaCjB+FF6YTNrVR+Dk/dAhnkoI9OOR2KUbee3ErL0Bj6Vh6 WJAmKKJwtw7GIq+2ChHmb197eQyNxTrGEPZrIzIw7TjdtUsOqSsPECRafvSZJenF87 cKsUBM6+KoPYDS0Y3L8xg318GJMWLNa6wGLrhktaWAPrs7fLTh0m/1sQLjnOoeMZAQ un78wtzN7wppUL7+Jsp0Fij1thRjja025mPA3+GuDvzHuiDiPI/0O4H6zt58NZi1dH eoSiPCyyT9m/nRUNHJU4hFJLfPqtJklTkAQDyruwJlVrIET7DjrlqqDYT87CenDTcG 4NpOoCLNXcUp+VOZypZMvQsuEgqJx15d7+s5JGGzwZoibsEUza6LvVd1foYjpbkaL3 y6uU17KmJTrp5Aj5gJCjFs2XygfMJ7bBDxkc/zxMNi4s2ylDLA1lqFcO5Mb2paGyaB AlwQm15k3Szglmda5vaeauD00hyDYiiQuKhjaSiPWiBEv5gDtGtjd5dGbq6XcdqThR 1R5qsh8aRrfeRoiCPafA5yqk= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:09:08 +0100 Message-ID: <1e8a46dfc6861ebc9552ee2ca5ee17c6f48ccf34.1742663354.git.~@wolfsden.cz> 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 It is not ideal to pollute the path with the binaries from the gitolite package, so adjust the package to support that and the service to no longer install it. * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> {'patch-scripts}: Use store file name of gitolite-shell. * gnu/services/version-control.scm (gitolite-service-type): Drop the extension of profile-service-type. Change-Id: I25459ccd80bda892b6d188b2b6fa99baee339cba --- v2: Add copyright. gnu/packages/version-control.scm | 6 +++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) -- 2.48.1 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..cd624d3d57 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2025 Artyom V. Poptsov ;;; Copyright © 2025 Dariqq +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2365,11 +2366,10 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append " " (search-input-file inputs "bin/grep") " "))) - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") - "gitolite-shell $user")))) + (string-append + #$output "/bin/gitolite-shell $user"))))) (add-before 'install 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index 87f134cb23..e39bb509c2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -429,15 +429,7 @@ (define gitolite-service-type (list (service-extension activation-service-type gitolite-activation) (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) + gitolite-accounts))) (description "Set up @command{gitolite}, a Git hosting tool providing access over SSH. By default, the @code{git} user is used, but this is configurable.