From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uARnMbwEM2BdFwAA0tVLHw (envelope-from ) for ; Mon, 22 Feb 2021 01:11:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gGQ5LbwEM2DKPwAAB5/wlQ (envelope-from ) for ; Mon, 22 Feb 2021 01:11:24 +0000 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 0CB611D402 for ; Mon, 22 Feb 2021 02:11:24 +0100 (CET) Received: from localhost ([::1]:48692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDzkw-0008Jh-R3 for larch@yhetil.org; Sun, 21 Feb 2021 20:11:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDzkc-0008Is-9v for guix-patches@gnu.org; Sun, 21 Feb 2021 20:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDzkc-0002jx-20 for guix-patches@gnu.org; Sun, 21 Feb 2021 20:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDzkb-0008Dz-UP for guix-patches@gnu.org; Sun, 21 Feb 2021 20:11:01 -0500 Subject: bug#46247: [PATCH] gnu: git: Add credential-libsecret output. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 22 Feb 2021 01:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 46247 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?UTF-8?Q?L=C3=A9o?= Le Bouter Cc: 46247-close@debbugs.gnu.org Mail-Followup-To: 46247@debbugs.gnu.org, cmmarusich@gmail.com, lle-bout@zaclys.net Received: via spool by 46247-done@debbugs.gnu.org id=D46247.161395624031579 (code D ref 46247); Mon, 22 Feb 2021 01:11:01 +0000 Received: (at 46247-close) by debbugs.gnu.org; 22 Feb 2021 01:10:40 +0000 Received: from localhost ([127.0.0.1]:55297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDzkG-0008DH-6M for submit@debbugs.gnu.org; Sun, 21 Feb 2021 20:10:40 -0500 Received: from mail-pf1-f176.google.com ([209.85.210.176]:44760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDzkC-0008D2-Ot for 46247-close@debbugs.gnu.org; Sun, 21 Feb 2021 20:10:38 -0500 Received: by mail-pf1-f176.google.com with SMTP id t29so5600676pfg.11 for <46247-close@debbugs.gnu.org>; Sun, 21 Feb 2021 17:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=sqIi59OzGiUsWYPIpZFsiALCYOrrTxOjW+fPgmzJoPA=; b=iHhBjzlgzimduKKjgEmfL48C68zUbv3r+pOtyt7LxtsmcjjJSqLWNsb8IF88uVEosE RFrabwCl7gDVLmyAZMjM3TUc17pzIrB4Ke54+C8p0BBjZ4qsXCJLIXdgFOEF2fo6+Mdt Djkwiwi+VjfmxFIca9ZV3vOYuQ+aPzZvwFuutpn6uWNwZvdMi0yAWKdFlJk8cmYQS5lB 3rY+EE+vD5KyCoIVtXABPrvYY+uDwGhcpdjqlEZYCZYfQ8Fb7pP4PrfV1MdanmVFxtAg O+1WCKnhBBB6pNTMh6G1l0EdcoqtmUvrwauvSrkK/Y0SKk2oH9HscReiopS9iUhmMF27 MXrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=sqIi59OzGiUsWYPIpZFsiALCYOrrTxOjW+fPgmzJoPA=; b=a7KoRRkNMcEk408SXbwoc/E7ZwVWvFBzGjv9DiByLAfScgYZLCUsakl3A+qhT0jnyd RZQiKRuh28S1VjRSdLDoTMkcAaHaFjaOWvaRwHNdpsBVnAL+SXMrmWCqa6D+CLPCCcZF zpEZ5XnFrVvR7QlMfxxrThQhCkzxMZfuBBcL7EFhRsXJWV4YQJv2jupxjk+MhPnzsKxA 4/tHQ12vtUDMaGg+gEXwWnhZjexovYgM7BObUp87s4q/OXPi4x3DbkcFACW/Sx7LQA0z rOtie9Iza1UvNMLvHVQg8npqQJiS0QWmFa0BBasm7fFpZOEjGfqUfxNI+/RIPJ3/nKe5 nQFw== X-Gm-Message-State: AOAM532pGvhl2dUpgdYbOgUG5sHPyMmh4UPxTNGDRqe2s7C8rBeumIjW IvOn/YsPs5VC2DR+lykaWdlBXWiLyOp2OA== X-Google-Smtp-Source: ABdhPJybfbEkN9ASIPSqYyHEKnRjI80RlN4QUovzTUv5xim8W0SVIJ4fLSdApSzm7yLGNT+53OvFxQ== X-Received: by 2002:a62:7e01:0:b029:1ed:8173:40a1 with SMTP id z1-20020a627e010000b02901ed817340a1mr6261724pfc.6.1613956230248; Sun, 21 Feb 2021 17:10:30 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id x12sm17050700pfp.214.2021.02.21.17.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 17:10:29 -0800 (PST) From: Chris Marusich References: <20210201233518.31176-1-lle-bout@zaclys.net> Date: Sun, 21 Feb 2021 17:10:28 -0800 In-Reply-To: <20210201233518.31176-1-lle-bout@zaclys.net> ("=?UTF-8?Q?L=C3=A9o?= Le Bouter"'s message of "Tue, 2 Feb 2021 00:35:18 +0100") Message-ID: <87zgzw6h6j.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.37 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=iHhBjzlg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 0CB611D402 X-Spam-Score: -3.37 X-Migadu-Scanner: scn1.migadu.com X-TUID: xCw+3dFiH6Fr --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi L=C3=A9o, I've committed this, with minor changes, as c53ee79c4ce187b185a070977f69ad9d4fb55179. L=C3=A9o Le Bouter writes: > + (add-after 'install 'install-credential-libsecret > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((libsecret (assoc-ref outputs "credential-libsecret")= )) > + (with-directory-excursion "contrib/credential/libsecret" > + ((assoc-ref gnu:%standard-phases 'build)) > + (install-file "git-credential-libsecret" > + (string-append libsecret "/bin")))))) A few days ago, I tested your patch (applied to 19783b9f553e433743fd695302df8cac4ec91ae1, which at the time was the latest commit on master). Unfortunately, it caused git-minimal to fail to build: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env guix build git ... starting phase `install-credential-libsecret' make: pkg-config: No such file or directory make: pkg-config: No such file or directory gcc -g -O2 -o git-credential-libsecret.o -c git-credential-libsecret.c git-credential-libsecret.c:29:10: fatal error: glib.h: No such file or dire= ctory #include ^~~~~~~~ compilation terminated. make: *** [Makefile:19: git-credential-libsecret.o] Error 1 command "make" "-j" "2" failed with status 2 builder for `/gnu/store/fwfv6k7jl8f77awgvs0lg3dnlx85nxd9-git-minimal-2.30.1= .drv' failed with exit code 1 build of /gnu/store/fwfv6k7jl8f77awgvs0lg3dnlx85nxd9-git-minimal-2.30.1.drv= failed View build log at '/var/log/guix/drvs/fw/fv6k7jl8f77awgvs0lg3dnlx85nxd9-git= -minimal-2.30.1.drv.bz2'. guix build: error: build of `/gnu/store/fwfv6k7jl8f77awgvs0lg3dnlx85nxd9-gi= t-minimal-2.30.1.drv' failed =2D-8<---------------cut here---------------end--------------->8--- The same command (./pre-inst-env guix build git) succeeded on commit 19783b9f553e433743fd695302df8cac4ec91ae1. The problem was that git-minimal inherits the arguments (thus the phases) from git, so it needs to also delete the newly added phase: (delete 'build-subtree) (delete 'split) (delete 'install-man-pages) (delete 'install-subtree) (delete 'install-credential-netrc) (delete 'install-credential-libsecret) I also took the liberty of adding #t at the end of the new phase. My understanding is that all successful phases should still be returning #t, as described below, so please take care to always return #t at the end of every phase: https://lists.gnu.org/archive/html/guix-devel/2018-01/msg00353.html https://lists.gnu.org/archive/html/guix-devel/2018-05/msg00369.html Thank you for the contribution! I hope it streamlines your workflow! =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmAzBIQACgkQ3UCaFdgi Rp1aJRAA0+lFgRzaAWto6r3SwVYPJ5DfqBnktCODLWpYOzwE7JrfRHyS9dgukE/+ 0kT3P1Fkl9MQiOcRQP0BDfC31MHfUqzkk3GB8nu9ZFLoBTwUjnLB2DLJXhfW/zgK GedegOopNEmTNZp5OIjzaBMsUPNYPNnDbJLdABkmt1A7QcFx4fawZeJOvLeBRwzR 9IoxxuEHZpoVJqT0outjEBoDHGF6w1i/Ov8VwBBd1sChl7yYGbUFsRQNaGiwPdIw YtclYvnkNJzTJcr6tKQTxzXnEjuxDRhUtoxgXUZoEpZ95FXj29usuZK/PeHYDvPj enWlqwRRu1Td4WJoyKHnJrVseDlcC2yQ68h8BaQLvjm9GCf5qbiQkT+tKqFsXFAo YkDjIfVoHW//QZp+HynUX/Zt1hLjLJZBkrF4fmzTTRhwpX4XgTlk2Eo/pxFXRqS8 CGEkeodd9VmrcOFSQFvoE6LOd5gKiaxkzJp6INtsBnRVIIW7jwOdaTWEiu4/i2en P15dldiBL2B8NIpPEmJdouefVdDyijrg3GTalMc45aNtWXKIlfphMmUpvHwEIVhR dYVsSiq6GqOAGwBAM+MYqnfBh02lHXgunGuprBmI2OF4WBjbT5cNLZVdvf1pIBr7 J3mwV4emZUbw1VYmNn7+nJYCOIlvRI3Yc75M5X4KB+YR14bpFzo= =vMm6 -----END PGP SIGNATURE----- --=-=-=--