From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gESvNgjvTGedOQAAe85BDQ:P1 (envelope-from ) for ; Sun, 01 Dec 2024 23:19:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gESvNgjvTGedOQAAe85BDQ (envelope-from ) for ; Mon, 02 Dec 2024 00:19:37 +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=ZJIWwSyk; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=OtAVoril; 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=1733095176; a=rsa-sha256; cv=none; b=E3PVotMTcWbSmh9lebfVAyQaY5EYxZqoKIg5PHw3Z1zvOFHallEudTWRKMf4wWelqIsm2f +TBq18cnVf19NN31TY8auaBjvTD7sBeS0eEIdatF3NtMpH2ClkVcwWBDlzmnP6PQAbxIQt GOS6TP6LOH+zSMTEEo9a+JqlYgcRplfD1KtU/R0pLsj9Bk9iYbDcHvvn539vu5Cmr62D9t YaHvayKfgF7XJzrxqN2c8wzVoQT4g42wEeQzlye5EhI3AiPpdEUTHMI+DoSLugbwKH6s36 Mcp/JdYDY7uepba0AiQMFxVnp+a8eB9bt2eGjJpsC1BtRwoTM/x9iBkLyIh5+w== 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=ZJIWwSyk; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=OtAVoril; 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=1733095176; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=LSGw9yA3T2F2bHktr9PEnlJogOC6XVZqH5ix4BB9xJw=; b=dh+ihjMb9kDBuouPwlXxe1XFxsskqvthiJFze3md3JnhqOfFYo41rXqtFJeW0a85jgpi8g nMiksba7AG0pspmyQQPljBHYaQBXpxSp+CMOhTC1GJaV4MhWLk9YScX68NsN1aeimzLAkW C+oVaaSymBwHp2Nhg8rQVVuAZwL4y41DEcHOg388p9+nseH4w/reIzCN9nOSGtXsbZYtUq YHcP6JPiLtUjP8v36ykohfAwKCRwVtKVLnlsoCWbMKo/MuN4EXNU3ruHZ3aVIyjZGQL0pR SwhMH11D/i6KlaLQz4R+L+Rxmdf4S2E4HKtdwnBjl0/VJo+llJ5doY6OBRAMxg== 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 88DBE828A2 for ; Mon, 02 Dec 2024 00:19:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHtDU-0004n3-7D; Sun, 01 Dec 2024 18:19:04 -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 1tHtDS-0004ms-Sh for guix-patches@gnu.org; Sun, 01 Dec 2024 18:19:02 -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 1tHtDS-0004PI-JU for guix-patches@gnu.org; Sun, 01 Dec 2024 18:19:02 -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:Date:From:To:Subject; bh=LSGw9yA3T2F2bHktr9PEnlJogOC6XVZqH5ix4BB9xJw=; b=ZJIWwSykyfxiwd1+LqLQiam2wfFcvhR1x5srgFkUVBVbbZssOtuOJpzkbJra2pGqbojJCa3Lqn79+950AMNRwhIN4gyedCajLvzhiPcnY3CzuRJAAIHVx+lgWb8OR21hL5EP2zkdW6tfzKvCyG6MHjK7kT6h12NrJ9aBlESE2Rq5GbWtPXKIco6n0D0za4I+AaPTgYe5Au79Q9cbGPEuOIJIX9I75283kmswxaK40IRd0SincO2aKx2NAr87yXNCGoU2s4zyNmiHnoxdfw777g2erkrumS8Wusnc2bIhyohFOLCH9VThq4GdK4YoZOVr2P5JZb6E2HO4CBhF5fqzYg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHtDS-0006ub-Dl for guix-patches@gnu.org; Sun, 01 Dec 2024 18:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74639] [PATCH] gnu: make-gitolite: Fix inputs references Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 23:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74639@debbugs.gnu.org Cc: Ashish SHUKLA X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173309510026495 (code B ref -1); Sun, 01 Dec 2024 23:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Dec 2024 23:18:20 +0000 Received: from localhost ([127.0.0.1]:53443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHtCl-0006tH-JB for submit@debbugs.gnu.org; Sun, 01 Dec 2024 18:18:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:54364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHtCj-0006t9-On for submit@debbugs.gnu.org; Sun, 01 Dec 2024 18:18:19 -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 1tHtCi-0004lU-UB for guix-patches@gnu.org; Sun, 01 Dec 2024 18:18:17 -0500 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHtCf-0004As-Sy for guix-patches@gnu.org; Sun, 01 Dec 2024 18:18:15 -0500 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:c000:5f:d79f:6f6a:47ac]) (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 B525C3EED0; Sun, 1 Dec 2024 23:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1733095082; 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; bh=LSGw9yA3T2F2bHktr9PEnlJogOC6XVZqH5ix4BB9xJw=; b=OtAVorilbAdRChMpf1j0Kb2IH1YkceTVrV0nnY/cxC9IdpEXGX1Tr7883B4y8Su/FY0Ztb 1yH2LIdIljMg6g9DuDm1i402kSVZ4HRTlClzRsaLMZ9t7jBHtpxYdYK/i4HZdX65lCgxf5 sC+coKSWCtycF2DX6KUpkEAWFIjW8Ug= Date: Mon, 2 Dec 2024 00:15:07 +0100 Message-ID: <4cf43336d8892d405b0a70809b7f7e83a6012a91.1733094907.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:4f9:3b:505c::2; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.52 X-Spam-Score: -3.52 X-Migadu-Queue-Id: 88DBE828A2 X-Migadu-Scanner: mx10.migadu.com X-TUID: nh1eilpHXGfe From: Ashish SHUKLA * gnu/packages/version-control.scm (make-gitolite)[arguments] {patch-scripts,patch-source,wrap-scripts}: Update functions to reference inputs from the inputs alist, instead of hardcoding. Change-Id: Ia2468235b43c257ee1816d19325671d373ed2870 --- Hi, When trying to override inputs of "gitolite", I noticed it's hardcoding them instead of referencing the "inputs" alist parameter which is passed to the phases, which makes overriding the inputs useless. This patches fixes that behaviour. Thanks! 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..eac3487cf1 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 " " (assoc-ref inputs "perl") "/bin/perl" " -"))) (substitute* (find-files "src/triggers" ".*") ((" sed ") - (string-append " " #$sed "/bin/sed" " "))) + (string-append " " (assoc-ref inputs "sed") "/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 " " (assoc-ref inputs "grep") "/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 "\"" (assoc-ref inputs "coreutils") "/bin/cat" " ")) (("\"ssh-keygen") - (string-append "\"" #$openssh "/bin/ssh-keygen"))) + (string-append "\"" (assoc-ref inputs "openssh") "/bin/ssh-keygen"))) (substitute* '("src/lib/Gitolite/Hooks/PostUpdate.pm" "src/lib/Gitolite/Hooks/Update.pm") (("/usr/bin/perl") - (string-append #$perl "/bin/perl"))) + (string-append (assoc-ref inputs "perl") "/bin/perl"))) (substitute* "src/lib/Gitolite/Common.pm" (("\"ssh-keygen") - (string-append "\"" #$openssh "/bin/ssh-keygen")) + (string-append "\"" (assoc-ref inputs "openssh") "/bin/ssh-keygen")) (("\"logger\"") - (string-append "\"" #$inetutils "/bin/logger\""))) + (string-append "\"" (assoc-ref inputs "inetutils") "/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 -- 2.47.1