From patchwork Mon Sep 6 06:07:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 32659 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 0CF5F27BBE3; Mon, 6 Sep 2021 07:08:23 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 ESMTPS id 50F8D27BBE1 for ; Mon, 6 Sep 2021 07:08:22 +0100 (BST) Received: from localhost ([::1]:40412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mN7np-0007wN-FW for patchwork@mira.cbaines.net; Mon, 06 Sep 2021 02:08:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mN7nW-0007vj-Oz for guix-patches@gnu.org; Mon, 06 Sep 2021 02:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mN7nW-00063N-Di for guix-patches@gnu.org; Mon, 06 Sep 2021 02:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mN7nW-0007Du-5k for guix-patches@gnu.org; Mon, 06 Sep 2021 02:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50421] [PATCH core-updates-frozen] gnu: Replace PYTHONPATH with GUIX_PYTHONPATH. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Sep 2021 06:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50421@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163090847627750 (code B ref -1); Mon, 06 Sep 2021 06:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Sep 2021 06:07:56 +0000 Received: from localhost ([127.0.0.1]:51462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mN7nI-0007DL-DJ for submit@debbugs.gnu.org; Mon, 06 Sep 2021 02:07:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:43710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mN7nG-0007DD-3l for submit@debbugs.gnu.org; Mon, 06 Sep 2021 02:07:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mN7nF-0007q6-VM for guix-patches@gnu.org; Mon, 06 Sep 2021 02:07:45 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mN7nD-0005l0-0b for guix-patches@gnu.org; Mon, 06 Sep 2021 02:07:45 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BDCEC240104 for ; Mon, 6 Sep 2021 08:07:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1630908458; bh=qzR2qlx83xrYzu1eVbdYBVL+swxXJMlIkCsxGeaxOAs=; h=From:To:Cc:Subject:Date:From; b=FqLSp+likpn4tg0EpW0yus3lwipZXZjmdsBfOnvIioYlJEzTzQGj3kP5GwJn8lOFd iwR8OVXfwcCtaBEW9qJ4DXoOlsAWfyymxU/n9WyPXPnCCJnI8rDt2R1HqQf59zicvS 9oK2qhDAsDSa81s/Kr73i804pkHrKXUIa4uOQfQxMCRbB7YoFtkN2o7GSUYf5S0h+t ETEKkdpVrv/iRXCRLwocd6nNdmJdoPVtiV0uYdLufSwUIISiISZRO/cM8K4PVUdVQ2 pc+aOMv13hISdwSGlgFAuNrqDc5E2FimNEL+K4I9qxNx/qSSZBLwefa3rLf/XIcwev 1GPfKAmmMfLWw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H2ycB0f0Cz9rxb; Mon, 6 Sep 2021 08:07:37 +0200 (CEST) From: Felix Gruber Date: Mon, 6 Sep 2021 06:07:22 +0000 Message-Id: <20210906060722.2072-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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 In packages that do not use python-build-system, PYTHONPATH is generally not defined. Instead we can use GUIX_PYTHONPATH which should contain all Python dependencies. * gnu/packages/bioinformatics.scm (shorah)[arguments]: Replace PYTHONPATH with GUIX_PYTHONPATH. * gnu/packages/debug.scm (c-vise)[arguments]: Idem. * gnu/packages/gnome.scm (drawing, apostrophe, ocrfeeder)[arguments]: Idem. * gnu/packages/music.scm (a2jmidid)[arguments]: Idem. * gnu/packages/syndication.scm (gfeeds)[arguments]: Idem. * gnu/packages/xdisorg.scm (gammastep)[arguments]: Idem. --- gnu/packages/bioinformatics.scm | 3 ++- gnu/packages/debug.scm | 3 ++- gnu/packages/gnome.scm | 7 ++++--- gnu/packages/music.scm | 2 +- gnu/packages/syndication.scm | 3 ++- gnu/packages/xdisorg.scm | 3 ++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cbc018a360..0718b5e31c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Tim Howes ;;; Copyright © 2021 Hong Li +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -7788,7 +7789,7 @@ data. It also generates basic statistics for your sequences.") ,(version-major+minor (package-version python)) "/site-packages")) - (pythonpath (getenv "PYTHONPATH")) + (pythonpath (getenv "GUIX_PYTHONPATH")) (script (string-append out "/bin/shorah"))) (chmod script #o555) (wrap-program script `("PYTHONPATH" ":" prefix (,site ,pythonpath)))))) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f4ef2fd5e1..6507c82fcc 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -213,7 +214,7 @@ tools that process C/C++ code.") (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (python-path (getenv "PYTHONPATH"))) + (python-path (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append out "/bin/cvise") `("PYTHONPATH" ":" prefix (,python-path))) #t)))))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0e9c47458..e9e15460ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2021 Trevor Hass ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -4205,7 +4206,7 @@ engineering.") (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (native-inputs @@ -11582,7 +11583,7 @@ GTK+. It integrates well with the GNOME desktop environment.") (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) `("PATH" prefix (,(dirname (search-input-file inputs @@ -12218,7 +12219,7 @@ world.") (package-version python)) "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (native-inputs diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2c43f70aff..178f23c821 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6886,7 +6886,7 @@ It is provided as an LV2 plugin and as a standalone Jack application.") (substitute* (string-append bin "a2j") (("a2j_control") (string-append bin "a2j_control"))) (wrap-program (string-append bin "a2j_control") - `("PYTHONPATH" prefix (,(getenv "PYTHONPATH")))) + `("PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH")))) #t)))))) (build-system meson-build-system) (inputs diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 215e8e32cb..a06fa4404e 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -605,7 +606,7 @@ that aims to be quite fast and comfortable to its user.") (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") "/bin/gfeeds") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))) #t))))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8502cb67eb..6f05b8056b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2021 Niklas Eklund ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 ikasero +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -1557,7 +1558,7 @@ protocol.") ;; to Python libraries. (wrap-program (string-append (assoc-ref outputs "out") "/bin/gammastep-indicator") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))))))) (native-inputs