From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yB23K/yCTWdZRgEAqHPOHw:P1 (envelope-from ) for ; Mon, 02 Dec 2024 09:50:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id yB23K/yCTWdZRgEAqHPOHw (envelope-from ) for ; Mon, 02 Dec 2024 10:50:52 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="SO3zT/8u"; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=atrX65cn; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733133052; a=rsa-sha256; cv=none; b=Ky19nhXnkgz25CjbT1yKmHQb0CSIaoBDuFcwKmGTeTHZvH0GobZTYAWFESXoG+USo7D7ZQ cHjFO/rPc6+LGer5YghzQ/BkgiObzzVUXH2pB60jq05+rALgMGjl4G8UJoeynekNzw2XSS Wv0/X/SjDmgTQyK1Bv6ZOAyyAry8+ScJDQt8WSV7kKqVxfK7WIqt1PMb5EpBEdXABsl8D+ yBisojTaHeYOzV269OjzHaUQM38FXNux96oXryb4mVp95/NxIE0fK3+imqmYlkWBaNP2Rs e4euUD9jIbLvytiXa+FtGPIN7gXv9fGtglhW+IVFkOb00lkJB1i2LKqU9FvcPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="SO3zT/8u"; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=atrX65cn; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733133052; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YLqp5Ndvm1ZyOb/zgMYAWAkxKeQYdzaO8za0JXMtejg=; b=LrWic1iuposIRc2xYkRbnTdTM0xTnQtNmf/2PKMVzC4BaQaEcQCQN6BH+nyyIezRoVj6Z3 1A5AYQfaIIvmmNsopNyYAQ0/ceKH/+h+qKYLI7LmR+K+1HAcyrKG5Vzn/+DKhieG6X+qZU wLyeUsvmIsN78PZfHV9vpWk4v8Y9XXi1CJc0jgm6a4wT6GeWLRGBCpt5hfDftgZF5776p+ G/9/IRhVVHrxpFGXqEw5dqCqOb64JJc/hTzdxM5uhSe160BmKx8n64KGVhRTIGdALB2Ox6 zqnj8+FZgDxT9U6xwPwHMoy0w98xkOG3aQH5L1RP6eTArjOhA+qXTUPU2ALHXg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 06BAA1A1B6 for ; Mon, 02 Dec 2024 10:50:52 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tI34l-0006pJ-Ui; Mon, 02 Dec 2024 04:50:43 -0500 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 1tI348-0006Ud-Qc for guix-patches@gnu.org; Mon, 02 Dec 2024 04:50:07 -0500 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 1tI346-00009D-Nn for guix-patches@gnu.org; Mon, 02 Dec 2024 04:50:04 -0500 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=YLqp5Ndvm1ZyOb/zgMYAWAkxKeQYdzaO8za0JXMtejg=; b=SO3zT/8u/gcQpW34Q2O8kj5QkomN1zjh4+17xZCRVQXwXp1uX+yu6U6VL5I/2MQTi0pjHNkZ1LqZJ+ld3xIqPFtL0ihXV4RSjvaYaA/+iHU44F1n5zGoryohVKQhwLXx1qunyqobBtpmmqODId2YEmlvJA+lK8HBg4uRa6xUdrZapPYoJPC/1XVcQhMxj/3zVLcQ3ZawThmikm8GAGFr8caE7kffesZ2rwlg7eFsmZSnfjMqPtATpeTlpniGFttT7cJqbZDbb+i4w6w0zS+d9q9IUfr899/I5Nug1Z/hZ+fI2+rfQ/MjbVulycSh05of6Uj2aGMRKeL3wPmHjFOT4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tI346-0005WC-9R for guix-patches@gnu.org; Mon, 02 Dec 2024 04:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74639] [PATCH v2] gnu: make-gitolite: Fix inputs references Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 09:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74639@debbugs.gnu.org Cc: Hilton Chain , Ashish SHUKLA Received: via spool by 74639-submit@debbugs.gnu.org id=B74639.173313295821126 (code B ref 74639); Mon, 02 Dec 2024 09:50:02 +0000 Received: (at 74639) by debbugs.gnu.org; 2 Dec 2024 09:49:18 +0000 Received: from localhost ([127.0.0.1]:54297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI33O-0005Ue-7m for submit@debbugs.gnu.org; Mon, 02 Dec 2024 04:49:18 -0500 Received: from anamika.lostca.se ([65.21.75.227]:54250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI33J-0005UE-UF for 74639@debbugs.gnu.org; Mon, 02 Dec 2024 04:49:16 -0500 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:c000:c23e:1437:ed80:c8f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id EB1543EFEE; Mon, 2 Dec 2024 09:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1733132947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YLqp5Ndvm1ZyOb/zgMYAWAkxKeQYdzaO8za0JXMtejg=; b=atrX65cnUUFvM6/Aop5PZL74MU26M+6Tw97ohJVGpfQu+rPznLPWT5ii8S2g/nIb2hUvfH UJVIuF2H3k3s29srpk7eOr2Wgu6tnCqCjLLa7T33EyF2zPvqt/yiVUMVPSELLnZ68AeV6P B2lHPC4FCf/odJ0hB39xrdOrSUVTx50= Date: Mon, 2 Dec 2024 10:48:23 +0100 Message-ID: <94fc32094ab6a62d1949f458bdde55327fe5a4fd.1733132903.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.47.1 In-Reply-To: <87ttbndiy9.wl-hako@ultrarare.space> References: <87ttbndiy9.wl-hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: ashish.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" From: "ashish.is--- via Guix-patches" via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.15 X-Spam-Score: -2.15 X-Migadu-Queue-Id: 06BAA1A1B6 X-Migadu-Scanner: mx12.migadu.com X-TUID: E9ob4ohg9hlR From: Ashish SHUKLA * gnu/packages/version-control.scm (make-gitolite)[#:phases] : Update functions to reference inputs from the inputs alist, instead of hardcoding. Change-Id: Ia2468235b43c257ee1816d19325671d373ed2870 --- Hi Hilton, Thanks for your comments. The patch is amended to incorporate your suggestions. gnu/packages/version-control.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c54833a8ec..ed19d481c9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2070,23 +2070,23 @@ (define* (make-gitolite #:optional (extra-inputs '())) (delete 'configure) (delete 'build) (add-before 'install 'patch-scripts - (lambda* _ + (lambda* (#:key inputs #:allow-other-keys) ;; This seems to take care of every shell script that ;; invokes Perl. (substitute* (find-files ".") ((" perl -") - (string-append " " #$perl "/bin/perl" " -"))) + (string-append " " (search-input-file inputs "/bin/perl") " -"))) (substitute* (find-files "src/triggers" ".*") ((" sed ") - (string-append " " #$sed "/bin/sed" " "))) + (string-append " " (search-input-file inputs "/bin/sed") " "))) (substitute* '("src/triggers/post-compile/update-gitweb-access-list" "src/triggers/post-compile/ssh-authkeys-split" "src/triggers/upstream") ((" grep ") - (string-append " " #$grep "/bin/grep" " "))) + (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. @@ -2094,25 +2094,25 @@ (define* (make-gitolite #:optional (extra-inputs '())) (("\\$glshell \\$user") "gitolite-shell $user")))) (add-before 'install 'patch-source - (lambda* _ + (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the ;; pubkey (substitute* "src/lib/Gitolite/Setup.pm" (("\"cat ") - (string-append "\"" #$coreutils "/bin/cat" " ")) + (string-append "\"" (search-input-file inputs "/bin/cat") " ")) (("\"ssh-keygen") - (string-append "\"" #$openssh "/bin/ssh-keygen"))) + (string-append "\"" (search-input-file inputs "/bin/ssh-keygen")))) (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" "src/lib/Gitolite/Hooks/Update.pm") (("/usr/bin/perl") - (string-append #$perl "/bin/perl"))) + (search-input-file inputs "/bin/perl"))) (substitute* "src/lib/Gitolite/Common.pm" (("\"ssh-keygen") - (string-append "\"" #$openssh "/bin/ssh-keygen")) + (string-append "\"" (search-input-file inputs "/bin/ssh-keygen"))) (("\"logger\"") - (string-append "\"" #$inetutils "/bin/logger\""))) + (string-append "\"" (search-input-file inputs "/bin/logger") "\""))) (substitute* "src/lib/Gitolite/Cache.pm" (("/usr/sbin/redis-server") "redis-server")) @@ -2132,16 +2132,16 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append bindir "/" script))) '("gitolite" "gitolite-shell"))))) (add-after 'install 'wrap-scripts - (lambda* _ + (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (file-name) (wrap-program (string-append #$output file-name) `("PATH" ":" prefix ,(map (lambda (dir) (string-append dir "/bin")) (list #$output - #$coreutils - #$findutils - #$git + (assoc-ref inputs "coreutils") + (assoc-ref inputs "findutils") + (assoc-ref inputs "git") #$@extra-inputs))))) '("/bin/gitolite" "/bin/gitolite-shell"))))))) (inputs base-commit: 858dd7e721d69a6087375395037a86640418f1fb prerequisite-patch-id: be2a7e1cff0d66ce722708694eced7289a0001bf prerequisite-patch-id: 2b0ad6deed9f2ccb23385848c5f053d40c455f5f prerequisite-patch-id: 906fe7cd5820d5117eb25e8336bea24bae006354 prerequisite-patch-id: 7f561f1954df967f31eef3fca1dc8cc8aeefdc83 prerequisite-patch-id: 7e5b81441f3522eaaba1d0f00339ce4e0dd6b58e prerequisite-patch-id: c5a0c62290f2e8266d7a93c997396a158a8385ab prerequisite-patch-id: 5b582114a923c594a599d28cedba4dda6795d326 prerequisite-patch-id: 22498d84439b2bf9f2d6f5935f8d1f3293b1de5d -- 2.47.1