From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:55772)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gjUTO-00053C-5K
	for guix-patches@gnu.org; Tue, 15 Jan 2019 14:34:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gjUOV-0002FZ-Ts
	for guix-patches@gnu.org; Tue, 15 Jan 2019 14:29:04 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:32872)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gjUOU-0002DK-90
	for guix-patches@gnu.org; Tue, 15 Jan 2019 14:29:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gjUOU-0003Tr-4N
	for guix-patches@gnu.org; Tue, 15 Jan 2019 14:29:02 -0500
Subject: [bug#34060] [PATCH 06/10] pull: Build profile with
	'channel-instances->derivation'.
Resent-Message-ID: <handler.34060.B34060.154758049413325@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20190113154733.29737-1-ludo@gnu.org>
	<20190113154733.29737-6-ludo@gnu.org>
Date: Tue, 15 Jan 2019 20:27:57 +0100
In-Reply-To: <20190113154733.29737-6-ludo@gnu.org> ("Ludovic
	\=\?utf-8\?Q\?Cou\?\= \=\?utf-8\?Q\?rt\=C3\=A8s\=22's\?\=
	message of "Sun, 13 Jan 2019 16:47:29 +0100")
Message-ID: <87lg3lyb42.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 34060@debbugs.gnu.org

Ludovic Court=C3=A8s <ludo@gnu.org> skribis:

> * guix/scripts/package.scm (build-and-use-profile): Rename 'manifest' to
> 'manifest-or-derivation' and allow it to be a derivation.
> * guix/scripts/pull.scm (build-and-install): Use
> 'channel-instances->derivation' instead of 'channel-instances->manifest'.
> ---
>  guix/scripts/package.scm | 41 ++++++++++++++++++++++------------------
>  guix/scripts/pull.scm    |  4 ++--
>  2 files changed, 25 insertions(+), 20 deletions(-)
>
> diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
> index 872a7303fc..4f483ac141 100644
> --- a/guix/scripts/package.scm
> +++ b/guix/scripts/package.scm
> @@ -118,24 +118,27 @@ denote ranges as interpreted by 'matching-generatio=
ns'."
>            (else
>             (leave (G_ "invalid syntax: ~a~%") pattern)))))
>=20=20
> -(define* (build-and-use-profile store profile manifest
> +(define* (build-and-use-profile store profile manifest-or-derivation

I realized that this hack could be avoided by simply adding a #:hooks
parameter here, which is what I ended up doing in commit
5fbdc9a5aa63fd51c65d30fe3d30608d01fe1bc8.

Ludo=E2=80=99.