From patchwork Fri Aug 7 02:21:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 23539 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CB8E227BBE3; Fri, 7 Aug 2020 03:28:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A1FB91732D for ; Fri, 7 Aug 2020 03:28:08 +0100 (BST) Received: from localhost ([::1]:33114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3s76-0007yD-8Z for patchwork@mira.cbaines.net; Thu, 06 Aug 2020 22:28:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3s71-0007y7-10 for guix-patches@gnu.org; Thu, 06 Aug 2020 22:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3s70-0004tk-O6 for guix-patches@gnu.org; Thu, 06 Aug 2020 22:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k3s70-00055v-LT for guix-patches@gnu.org; Thu, 06 Aug 2020 22:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42735] [PATCH] pre-inst-env: don't use GUIX_PACKAGE_PATH Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Aug 2020 02:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42735@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159676726319531 (code B ref -1); Fri, 07 Aug 2020 02:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Aug 2020 02:27:43 +0000 Received: from localhost ([127.0.0.1]:55291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3s6h-00054u-4V for submit@debbugs.gnu.org; Thu, 06 Aug 2020 22:27:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:35570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3s6d-00054T-Ck for submit@debbugs.gnu.org; Thu, 06 Aug 2020 22:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3s6d-0007x3-7N for guix-patches@gnu.org; Thu, 06 Aug 2020 22:27:39 -0400 Received: from cyberdimension.org ([2001:910:1314:ffff::1]:34412 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1k3s6b-0004rl-Dg for guix-patches@gnu.org; Thu, 06 Aug 2020 22:27:38 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id db68c4c8; Fri, 7 Aug 2020 02:24:39 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id d25d4df4; Fri, 7 Aug 2020 02:24:39 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Fri, 7 Aug 2020 04:21:42 +0200 Message-Id: <20200807022142.26296-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:910:1314:ffff::1; envelope-from=GNUtoo@cyberdimension.org; helo=gnutoo.cyberdimension.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches ./pre-inst-env is supposed to use only the packages definitions that are in the guix source tree and not the host packages. However if GUIX_PACKAGE_PATH is set, it will use host packages as well. In addition, when packages are defined in both the guix source tree and in GUIX_PACKAGE_PATH, GUIX_PACKAGE_PATH will take the precedence and guix will print warnings like that: guix build: warning: ambiguous package specification `libsamsung-ipc' guix build: warning: choosing libsamsung-ipc@0.1 from /home/[...]/.config/guix/local/replicant.scm:31:2 That situation can happen when working in a new package in GUIX_PACKAGE_PATH and then importing the package in the guix source tree to add it upstream. Signed-off-by: Denis 'GNUtoo' Carikli --- build-aux/pre-inst-env.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index e0aa7fe868..698a7994fb 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -59,4 +59,8 @@ export NIX_HASH GUIX_UNINSTALLED=1 export GUIX_UNINSTALLED +# Make sure we don't use local package definitions +GUIX_PACKAGE_PATH="" +export GUIX_PACKAGE_PATH + exec "$@"