GNU bug report logs - #63542
[PATCH 00/19]: gnu: astronomy: May updates.

Previous Next

Full log

Message #38 received at 63542 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 63542 <at> debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Subject: [PATCH 10/19] gnu: python-fitsio: Use Gexp.
Date: Wed, 17 May 2023 00:23:39 +0100

* gnu/packages/astronomy.scm (python-fitsio): Adjust package style by
using Gexp.
---
 gnu/packages/astronomy.scm | 39 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index afde394708..25b372b06d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -476,27 +476,28 @@ (define-public python-fitsio
        (modules '((guix build utils)))
        (snippet
         ;; Remove the bundled cfitsio
-        `(begin
-           (delete-file-recursively "cfitsio3490")
-           (substitute* "MANIFEST.in"
-             (("recursive-include cfitsio3490.*$\n") ""))))))
+        #~(begin
+            (delete-file-recursively "cfitsio3490")
+            (substitute* "MANIFEST.in"
+              (("recursive-include cfitsio3490.*$\n") ""))))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'unbundle-cfitsio
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let* ((cfitsio (assoc-ref inputs "cfitsio"))
-                    (includedir (string-append "\"" cfitsio "/include\""))
-                    (libdir (string-append "\"" cfitsio "/lib\"")))
-               ;; Use Guix' cfitsio instead of the bundled one
-               (substitute* "setup.py"
-                 (("self.use_system_fitsio = False") "pass")
-                 (("self.system_fitsio_includedir = None") "pass")
-                 (("self.system_fitsio_libdir = None") "pass")
-                 (("self.use_system_fitsio") "True")
-                 (("self.system_fitsio_includedir") includedir)
-                 (("self.system_fitsio_libdir") libdir))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'unbundle-cfitsio
+            (lambda _
+              (let* ((cfitsio #$(this-package-input "cfitsio"))
+                     (includedir (string-append "\"" cfitsio "/include\""))
+                     (libdir (string-append "\"" cfitsio "/lib\"")))
+                ;; Use Guix' cfitsio instead of the bundled one
+                (substitute* "setup.py"
+                  (("self.use_system_fitsio = False") "pass")
+                  (("self.system_fitsio_includedir = None") "pass")
+                  (("self.system_fitsio_libdir = None") "pass")
+                  (("self.use_system_fitsio") "True")
+                  (("self.system_fitsio_includedir") includedir)
+                  (("self.system_fitsio_libdir") libdir))))))))
     (inputs (list curl))
     (propagated-inputs
      (list python-numpy cfitsio))
-- 
2.39.2

Previous Next

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