From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 01 18:18:20 2024 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= From: ashish.is@lostca.se To: guix-patches@gnu.org Subject: [PATCH] gnu: make-gitolite: Fix inputs references 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-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit Cc: Ashish SHUKLA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 01 19:31:15 2024 Received: (at 74639) by debbugs.gnu.org; 2 Dec 2024 00:31:16 +0000 Received: from localhost ([127.0.0.1]:53556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHuLL-0002HI-Hj for submit@debbugs.gnu.org; Sun, 01 Dec 2024 19:31:15 -0500 Received: from mx.boiledscript.com ([88.99.243.112]:59136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHuLI-0002H8-GP for 74639@debbugs.gnu.org; Sun, 01 Dec 2024 19:31:14 -0500 Date: Mon, 02 Dec 2024 08:31:10 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1733099471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2if+ib2Xz5JhokiXeBwZGLKsMg/urAYuecVzWKu2Er8=; b=RI0rpo1ThTPqS70QjHO80bYZu2/jtAzsczKHOY5MIhaUSr/eCZ78tQdCBrsYxYAcl5Bfaq it8hOTuekEYGt9KZ+p6X1eMs0P5/f5ZtkYyIDN/ggwC9vp2bFQ5Il1L9NbT9MS13pgBXPt qY+k10UzKOXQTsmj2JA+O0HVd89NsI1xD376L4pjtJz6M7Rjpk6z38HtqJoRXykRhztX/e vbf5fhGqJ8HqU5FzPRU2nu3X7s51+ZmaJuNoEjJGhOE5MZ5IzvaBuMWjm4MDmELP/agaFc ProknrNXE/Hes+d6VPquzIFugtD88JHrg76kAXHiTeta3dDCQA8yCl+wXSLOVQ== Message-ID: <87ttbndiy9.wl-hako@ultrarare.space> From: Hilton Chain To: Ashish SHUKLA Subject: Re: [bug#74639] [PATCH] gnu: make-gitolite: Fix inputs references In-Reply-To: <4cf43336d8892d405b0a70809b7f7e83a6012a91.1733094907.git.ashish.is@lostca.se> References: <4cf43336d8892d405b0a70809b7f7e83a6012a91.1733094907.git.ashish.is@lostca.se> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-7 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74639 Cc: 74639@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ashish, On Mon, 02 Dec 2024 07:15:07 +0800, ashish.is--- via Guix-patches via wrote: > > 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. The commit message format we use doesn't have this ("{...}") level I think?= You can use "[#:phases]<...>" here instead. > Change-Id: Ia2468235b43c257ee1816d19325671d373ed2870 > --- > Hi, > > When trying to override inputs of "gitolite", I noticed it's hardcoding t= hem > 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(-) Please avoid operating on input labels directly when possible, in this case= you can use =A1search-input-file=A2. Thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 02 04:49:18 2024 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= From: ashish.is@lostca.se To: 74639@debbugs.gnu.org Subject: [PATCH v2] gnu: make-gitolite: Fix inputs references 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74639 Cc: Hilton Chain , Ashish SHUKLA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 02 04:50:14 2024 Received: (at control) by debbugs.gnu.org; 2 Dec 2024 09:50:14 +0000 Received: from localhost ([127.0.0.1]:54305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI34H-0005ci-TE for submit@debbugs.gnu.org; Mon, 02 Dec 2024 04:50:14 -0500 Received: from anamika.lostca.se ([65.21.75.227]:53380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tI34F-0005Yw-Oj for control@debbugs.gnu.org; Mon, 02 Dec 2024 04:50:12 -0500 Received: from localhost (unknown [IPv6:2a02:9140:3880:c000:c23e:1437:ed80:c8f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 4318A3F0A0 for ; Mon, 2 Dec 2024 09:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1733133006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7xGNtYlxnvR42E9mwnlp4jJkdtRyuRPg3KOMkxuhxXo=; b=lEVLFQIGerZRfYQN4IZxAUkb/0Ns9JVtZR7MSmnRuAnH2xrVqgn9/ZbZh/p1yaX+chXQ1+ vKf+kKHQWMYz2td8HKmN/a4oH6og1ryls3CZG69WHxqaiggMKgtXvFKAO9j7HVd6JKfroS lctzxUJLH89u4nT0HRrfUteL3iHHrPE= Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8; format=Flowed Date: Mon, 02 Dec 2024 09:50:05 +0000 Message-Id: Subject: retitle bug From: "Ashish SHUKLA" To: X-Mailer: aerc 0.18.2 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) retitle 74639 [PATCH v2] gnu: make-gitolite: Fix inputs references quit --=20 Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 "If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixin) From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 08 02:49:43 2024 Received: (at 74639-done) by debbugs.gnu.org; 8 Dec 2024 07:49:43 +0000 Received: from localhost ([127.0.0.1]:49544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKC2w-0001k4-Ji for submit@debbugs.gnu.org; Sun, 08 Dec 2024 02:49:43 -0500 Received: from mx.boiledscript.com ([88.99.243.112]:55886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKC2u-0001jw-1l for 74639-done@debbugs.gnu.org; Sun, 08 Dec 2024 02:49:41 -0500 Date: Sun, 08 Dec 2024 15:45:27 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1733644149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=btTNhmEIs4P2Rtt4JgDc46GayGZKIuBsVq76vYHcosA=; b=TB9hGc3+L8BBgCpTDZpTe81wFCcqggTC7jYhZYZQNJceZJG47mC8p2zXTAIMP+9DTDpxt6 jlhzG//3PWNFlZdyLBB2NW3/ISeP10mMFD87AHZmt2RRv5+Y2sZ4wn7ZfcPdmSNN+P1/4c 618Q5hZGZ6aPiGFLU0bNt63j+1BiVUR7CjTnWQxJcGlWScAJraLf1gIP7vngAe/NHZ7JXA 15D8fh6rUHziF/qnV38lYYFsby+gjSI2UTlBSEyNve/1ZcjAVKijB32/Shdgh7u4sHbcoo nOL9dDRLY/pwAsYtJb4dqTDRpFqZjxYoY/2M1uagh8/eJKApGo2QV8NUMDZCnA== Message-ID: <87ttbevcrs.wl-hako@ultrarare.space> From: Hilton Chain To: ashish.is@lostca.se Subject: Re: [PATCH v2] gnu: make-gitolite: Fix inputs references In-Reply-To: <94fc32094ab6a62d1949f458bdde55327fe5a4fd.1733132903.git.ashish.is@lostca.se> References: <87ttbndiy9.wl-hako@ultrarare.space> <94fc32094ab6a62d1949f458bdde55327fe5a4fd.1733132903.git.ashish.is@lostca.se> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74639-done Cc: 74639-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ashish, On Mon, 02 Dec 2024 17:48:23 +0800, ashish.is@lostca.se wrote: > > 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(-) Applied v2 as 810cc4764a27ddac3e15f325b02a4f665067f4ac with following change: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3987a6e3dc..b4863698e5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2078,18 +2078,21 @@ (define* (make-gitolite #:optional (extra-inputs '())) ;; invokes Perl. (substitute* (find-files ".") ((" perl -") - (string-append " " (search-input-file inputs "/bin/perl") " -"))) + (string-append + " " (search-input-file inputs "bin/perl") " -"))) (substitute* (find-files "src/triggers" ".*") ((" sed ") - (string-append " " (search-input-file inputs "/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 " " (search-input-file inputs "/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. @@ -2102,20 +2105,24 @@ (define* (make-gitolite #:optional (extra-inputs '())) ;; pubkey (substitute* "src/lib/Gitolite/Setup.pm" (("\"cat ") - (string-append "\"" (search-input-file inputs "/bin/cat") " ")) + (string-append + "\"" (search-input-file inputs "bin/cat") " ")) (("\"ssh-keygen") - (string-append "\"" (search-input-file inputs "/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") - (search-input-file inputs "/bin/perl"))) + (search-input-file inputs "bin/perl"))) (substitute* "src/lib/Gitolite/Common.pm" (("\"ssh-keygen") - (string-append "\"" (search-input-file inputs "/bin/ssh-keygen"))) + (string-append + "\"" (search-input-file inputs "bin/ssh-keygen"))) (("\"logger\"") - (string-append "\"" (search-input-file inputs "/bin/logger") "\""))) + (string-append + "\"" (search-input-file inputs "bin/logger") "\""))) (substitute* "src/lib/Gitolite/Cache.pm" (("/usr/sbin/redis-server") "redis-server")) @@ -2139,13 +2146,17 @@ (define* (make-gitolite #:optional (extra-inputs '())) (for-each (lambda (file-name) (wrap-program (string-append #$output file-name) `("PATH" ":" prefix - ,(map (lambda (dir) + ,(append + (map (lambda (command) + (dirname + (search-input-file + inputs + (string-append "bin/" command)))) + '("chmod" "find" "git")) + (map (lambda (dir) (string-append dir "/bin")) (list #$output - (assoc-ref inputs "coreutils") - (assoc-ref inputs "findutils") - (assoc-ref inputs "git") - #$@extra-inputs))))) + #$@extra-inputs)))))) '("/bin/gitolite" "/bin/gitolite-shell"))))))) (inputs (append (list bash-minimal coreutils findutils git inetutils openssh perl) --8<---------------cut here---------------end--------------->8--- Thanks From unknown Wed Aug 20 00:02:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 05 Jan 2025 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator