From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJere-0003Qo-3H for guix-patches@gnu.org; Fri, 18 May 2018 08:52:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJerb-0006wf-0Z for guix-patches@gnu.org; Fri, 18 May 2018 08:52:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJera-0006w5-Kx for guix-patches@gnu.org; Fri, 18 May 2018 08:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fJera-0001OM-8T for guix-patches@gnu.org; Fri, 18 May 2018 08:52:02 -0400 Subject: [bug#31488] [PATCH] gnu: git: Add "credential-netrc" output. Resent-Message-ID: MIME-Version: 1.0 Date: Fri, 18 May 2018 12:50:53 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Tobias Geerinckx-Rice" Message-ID: <05bf126b898739e7f24a31d6e0778853@tobias.gr> In-Reply-To: <20180518092207.2457-1-ambrevar@gmail.com> References: <20180518092207.2457-1-ambrevar@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Pierre Neidhardt , 31488@debbugs.gnu.org Pierre,=0A=0A[Forgive my MUA's disdain for whitespace. I'm working on it.= ]=0A=0AMay 18, 2018 11:22 AM, "Pierre Neidhardt" wro= te:=0A> @@ -217,6 +218,8 @@ as well as the classic centralized workflow."= )=0A> (("/bin/sh") (which "sh"))=0A> (("/usr/bin/perl") (which "perl"))= =0A> (("/usr/bin/python") (which "python")))=0A> + (substitute* "contrib/= credential/netrc/git-credential-netrc"=0A> + (("/usr/bin/perl") (which "p= erl")))=0A> #t))=0A> (add-after 'configure 'add-PM.stamp=0A> (lambda _=0A= =0AThis phase is (still) called =E2=80=98patch-makefiles=E2=80=99. Could = you tweak the name or move this to its own phase?=0A=0AI've a preference = for the latter, since it can then probably be moved before 'install-crede= ntial-netrc below to keep things together, but it's a slight one.=0A=0AAl= l that typed: is this even needed? It doesn't seem to be. The only mentio= n of perl is the shebang, and those are already handled by the build syst= em.=0A=0A> @@ -271,6 +274,13 @@ as well as the classic centralized workfl= ow.")=0A> (copy-file "contrib/completion/git-completion.bash"=0A> (string= -append completions "/git"))=0A> #t)))=0A> + (add-after 'install 'install= -credential-netrc=0A> + (lambda* (#:key outputs #:allow-other-keys)=0A> += (let* ((netrc (assoc-ref outputs "credential-netrc"))=0A> + (bin (string= -append netrc "/bin")))=0A> + (mkdir-p bin)=0A=0AINSTALL-FILE already imp= lies MKDIR-P. That's one of its main features over COPY-FILE.=0A=0A> + (i= nstall-file "contrib/credential/netrc/git-credential-netrc" bin)=0A> + #t= )))=0A> (add-after 'install 'split=0A> (lambda* (#:key inputs outputs #:a= llow-other-keys)=0A> ;; Split the binaries to the various outputs.=0A=0AI= 'll let others comment on the multiple outputs. I'm their resident fetish= ist, but not sufficiently informed to judge the =E2=80=98clutter=E2=80=99= vs. 48 KiB argument.=0A=0ASorry to reduce your work to a potential one-l= iner. The rest looks good to me. ;-)=0A=0AThanks!=0A=0AT G-R=0A=0ASent fr= om a Web browser. Excuse or enjoy my brevity.