From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2C5pCJo+o2R1KwAASxT56A (envelope-from ) for ; Mon, 03 Jul 2023 23:33:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KG2aB5o+o2QGIQEAG6o9tA (envelope-from ) for ; Mon, 03 Jul 2023 23:33:14 +0200 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 E187D1685C for ; Mon, 3 Jul 2023 23:33:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGRAP-00051G-Vx; Mon, 03 Jul 2023 17:33:06 -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 1qGRAO-00050v-6v for guix-patches@gnu.org; Mon, 03 Jul 2023 17:33:04 -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 1qGRAN-0006hj-J3 for guix-patches@gnu.org; Mon, 03 Jul 2023 17:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGRAL-0006IZ-OD; Mon, 03 Jul 2023 17:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64447] [PATCH] gnu: python-pymol: Fix launch script. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 21:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64447 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64447@debbugs.gnu.org Cc: David Elsing , andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net Received: via spool by submit@debbugs.gnu.org id=B.168841992224130 (code B ref -1); Mon, 03 Jul 2023 21:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2023 21:32:02 +0000 Received: from localhost ([127.0.0.1]:34570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGR9N-0006H8-Vj for submit@debbugs.gnu.org; Mon, 03 Jul 2023 17:32:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:55316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGR9K-0006Gi-ET for submit@debbugs.gnu.org; Mon, 03 Jul 2023 17:32:01 -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 1qGR9F-0004TD-Hy for guix-patches@gnu.org; Mon, 03 Jul 2023 17:31:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGR9D-0006YF-7G for guix-patches@gnu.org; Mon, 03 Jul 2023 17:31:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 31E26240027 for ; Mon, 3 Jul 2023 23:31:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1688419909; bh=CAumRDTUoW2mQQM7ZRxlruxdMAzzaCVYWQC45bAVKFQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=psvb2YZuHZ8raLSJewDGKJHLV1yYWCYbdu5LSKluqCLVNFeUB65fR6plfHxzuhrXU etjs6QPoTfsqazOvQv0PCCqLmr0WFP0q09loaLO8ziO0CI9aQ/Bnvud7/hoZ7Mesoi qQyY+fAuP6kSUC+MxaSueuJPMtDP67cKXfDVhKdLbCrvjoadNALCQlQxIx1EDNE0m6 b7kzXngM3y0Ma3803XFHJWK10JrCgmS6AYDkcqvDwixhibuAInEe1UXZb4JbeeELeg ueJb2et6xfZkGLrXqj2iO79vlFQeI1cUFr2mdtw7ilcz1QiZWa+15Nk4B2FCEGrWtP Bw5s3rEvF+k6Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qvzdc5xXYz9rxG; Mon, 3 Jul 2023 23:31:48 +0200 (CEST) From: David Elsing Date: Mon, 3 Jul 2023 21:31:10 +0000 Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688419993; a=rsa-sha256; cv=none; b=u0GQgHM8cglo9JOyj+ht7R7XNhi6Ns/5l9t6uhXTCnCNebuzTkLvyBOgQjyyiAW8GM/mPm 2hd8oSARQ/rTawcWQOpETgOQMtPOb+Ah+FP9z07mQAil/MVjmKQ2xQmxKY8vMWl4MhPLb+ b0Xs9WLg/lpGdcXB1khkARo5QLtg2+mgTs7LBYTlVX40g4WwdNnMLN5wZu6wj23DaTSgef CYuk8Sgb7gYY8Jz9+Q7vP1HJ+iB86EYWDF/LxCnbrodAXYpqCZvkizSUHlaLdzuigTuoEZ hTtQuFeHAUKAHncz7mgBxAJuf8bq7W+lw6TFA+rHROCOkd13l1Pz+R/27KQOog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=psvb2YZu; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688419993; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Zd2kjczjrmPsvbL5PlqMvWuDGrZHNtbJ23NrIn5+2lo=; b=EWcxREF5b6TBekqEuUzGVfE+8vATuQHp/zLe/Wihsx3oYdX28tr0kSrsQzXLWgXKSI8FYo 5D7erFiVlo1OWH6w++uEPOLAbKES24ixhimuR12jfhb1MZeSBQunjNRVVmlztvw/Dd4TOP B7lsTSEuVF7U8PoaaFXRliP5uQQsSixGwH4GC4JreV8sddKjDL4MwV/HFfYQEgbDlVCe/E dZugkCAfD4kYEvy2IzEH7lEshkSHQQDWdKvWggED28oxLYl7n/IYx9P2GtLwEL3H81HIs3 UILBVavUgL8iQzzvQtfKgesLJpKLXnt/IV/RtVGWNtOADXUOE1Z2T1RDwcuw2A== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=psvb2YZu; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.16 X-Spam-Score: -2.16 X-Migadu-Queue-Id: E187D1685C X-TUID: ggX/S+JaF28l * gnu/packages/chemistry.scm (python-pymol)[#:phases]: Add ‘disable-unchroot’. [native-inputs]: Remove python-setuptools. --- gnu/packages/chemistry.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index cddccf8aea..1f8b051a85 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Ricardo Wurmus -;;; Copyright © 2022 David Elsing +;;; Copyright © 2022, 2023 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -554,6 +554,12 @@ (define-public python-pymol (assoc-ref inputs "libxml2") "/include/libxml2:" (getenv "CPLUS_INCLUDE_PATH"))))) + ;; Prevent deleting the leading / in the __init__.py path in the + ;; launch script. + (add-after 'unpack 'disable-unchroot + (lambda _ + (substitute* "setup.py" + (("self\\.unchroot") "")))) ;; The setup.py script does not support one of the Python build ;; system's default flags, "--single-version-externally-managed". (replace 'install @@ -572,8 +578,7 @@ (define-public python-pymol python-pyqt glm netcdf)) - (native-inputs - (list catch2 python-setuptools)) + (native-inputs (list catch2)) (home-page "https://pymol.org") (synopsis "Molecular visualization system") (description "PyMOL is a capable molecular viewer and renderer. It can be -- 2.40.1