From patchwork Tue Jul 11 18:14:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Kosior X-Patchwork-Id: 51677 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 B9C1A27BBE9; Tue, 11 Jul 2023 20:56:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9200027BBE9 for ; Tue, 11 Jul 2023 20:56:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJJSy-00073f-II; Tue, 11 Jul 2023 15:56:08 -0400 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 1qJHt9-0005l0-AJ for guix-patches@gnu.org; Tue, 11 Jul 2023 14:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qJHt9-0008KX-09 for guix-patches@gnu.org; Tue, 11 Jul 2023 14:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qJHt7-00070T-Rg; Tue, 11 Jul 2023 14:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64573] [PATCH 1/3] guix: build: python-build-system: Don't process user site dir Resent-From: Wojtek Kosior Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 11 Jul 2023 18:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64573@debbugs.gnu.org Cc: Wojtek Kosior , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 64573-submit@debbugs.gnu.org id=B64573.168909929026875 (code B ref 64573); Tue, 11 Jul 2023 18:15:01 +0000 Received: (at 64573) by debbugs.gnu.org; 11 Jul 2023 18:14:50 +0000 Received: from localhost ([127.0.0.1]:51005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJHsw-0006zP-CT for submit@debbugs.gnu.org; Tue, 11 Jul 2023 14:14:50 -0400 Received: from koszko.org ([93.95.227.159]:49658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJHsu-0006zH-KX for 64573@debbugs.gnu.org; Tue, 11 Jul 2023 14:14:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=koszko.org; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=FphfeolugLMMuFUtWAnUxa/GCZAj9KkOVqHLL8GObFs=; b=g3aws3G1f44MCUkrKS62Eq1fg6 IVdIQ40bYFoXDGw/YGiiGnqQc37MMm4HOd45jmUpEzQ18eyTr77SlBUBlcQCpGK7mFHqcpwL8U1kD LdzqTKvIPuJIgp87uh2v5ceXMqZkuDJakoWQwt1bT6Y82nhJipCo6RHBOh+bwbX9JYgV+g4KLsD72 M0gGUGwWF+k6JX725l1iiqeyZ9O8WRYgMobVXGIA3U9P7KiugijL4OnQA5A26QcviUkXI8IEzMUwp IU8RElpIyoImsio4mPxuFGn5reW+RhpYUJTV3kq+T2D3tpgzgtQWw6zMekkXlkYmMdB4LSWXDyv1l ZWyQ6rgz3xqRAGCPvmFTHFdhCIjcJ6wygmU+Xdh6c/8BK8p26/l0djSXMS4YyEmHlMx1fA+YwaH26 3xArYCuFC2Hzr2Sp9bV2RJ1J2wEpdmsAidnfeg9fYxCRYWwRmCXC+YplSr5NQZdyg/di+LZwHZKAT 2PCjwusTIXwGORCUGUyqwXspvUj+zhRi169p8Jo1k6PRwbWKpLAlek/BfXkrbspd5T+iwyHdg8399 gSXgy0xzbj1lpKR0ICTYmkGUCMpRI1fZfaoSbpHP6aIT+VmmL25itCXS3MJus7bnNC56udS93pUhL rbWAtdBxZHQRbs3FQdTiyB2bpd8Sy/ZnB9L1Rlzis=; Received: from [77.252.47.107] (helo=localhost.localdomain) by koszko.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qJHst-0007hX-RB; Tue, 11 Jul 2023 20:14:48 +0200 Date: Tue, 11 Jul 2023 20:14:38 +0200 Message-Id: <9a11c2f1af6036714c5e998ddf2554f34da4ffe2.1689093931.git.koszko@koszko.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 11 Jul 2023 15:56:06 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Wojtek Kosior X-ACL-Warn: , Wojtek Kosior via Guix-patches X-Patchwork-Original-From: Wojtek Kosior via Guix-patches via From: Wojtek Kosior Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/python-build-system.scm (wrap): Define PYTHONNOUSERSITE for programs so they don't incorrectly pick up local, pip-installed libraries. --- guix/build/python-build-system.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index aa04664b25..93aafc4aa9 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -241,12 +241,16 @@ (define* (wrap #:key inputs outputs #:allow-other-keys) (define %sh (delay (search-input-file inputs "bin/bash"))) (define (sh) (force %sh)) - (let* ((var `("GUIX_PYTHONPATH" prefix - ,(search-path-as-string->list - (or (getenv "GUIX_PYTHONPATH") ""))))) + (let* ((var-pythonpath `("GUIX_PYTHONPATH" prefix + ,(search-path-as-string->list + (or (getenv "GUIX_PYTHONPATH") "")))) + ;; Harden applications by preventing Python from automatically + ;; picking up libraries in user site directory. + (var-usersite '("PYTHONNOUSERSITE" = ("GUIX_WRAPPER")))) (for-each (lambda (dir) (let ((files (list-of-files dir))) - (for-each (cut wrap-program <> #:sh (sh) var) + (for-each (cut wrap-program <> #:sh (sh) + var-pythonpath var-usersite) files))) bindirs)))