GNU bug report logs - #64447
[PATCH] gnu: python-pymol: Fix launch script.

Previous Next

Package: guix-patches;

Reported by: David Elsing <david.elsing <at> posteo.net>

Date: Mon, 3 Jul 2023 21:33:01 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Andreas Enge <andreas <at> enge.fr>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#64447: closed ([PATCH] gnu: python-pymol: Fix launch script.)
Date: Wed, 26 Jul 2023 14:18:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Wed, 26 Jul 2023 16:16:49 +0200
with message-id <ZMEq0YnoL_91ridD <at> jurong>
and subject line Re: [bug#64447] [PATCH] gnu: python-pymol: Fix launch script.
has caused the debbugs.gnu.org bug report #64447,
regarding [PATCH] gnu: python-pymol: Fix launch script.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
64447: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64447
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: David Elsing <david.elsing <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: David Elsing <david.elsing <at> posteo.net>
Subject: [PATCH] gnu: python-pymol: Fix launch script.
Date: Mon,  3 Jul 2023 21:31:10 +0000
* 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 <bjoern.hoefling <at> bjoernhoefling.de>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll <at> gmail.com>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado <at> elephly.net>
-;;; Copyright © 2022 David Elsing <david.elsing <at> posteo.net>
+;;; Copyright © 2022, 2023 David Elsing <david.elsing <at> posteo.net>
 ;;;
 ;;; 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



[Message part 3 (message/rfc822, inline)]
From: Andreas Enge <andreas <at> enge.fr>
To: David Elsing <david.elsing <at> posteo.net>
Cc: 64447-done <at> debbugs.gnu.org, efraim <at> flashner.co.il, bavier <at> posteo.net
Subject: Re: [bug#64447] [PATCH] gnu: python-pymol: Fix launch script.
Date: Wed, 26 Jul 2023 16:16:49 +0200
Applied, thanks!

Andreas



This bug report was last modified 1 year and 299 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.