[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#63542] [PATCH 10/19] gnu: python-fitsio: Use Gexp.
From: |
Sharlatan Hellseher |
Subject: |
[bug#63542] [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
- [bug#63542] [PATCH 01/19] gnu: python-asdf-astropy: Update to 0.4.0., (continued)
- [bug#63542] [PATCH 01/19] gnu: python-asdf-astropy: Update to 0.4.0., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 03/19] gnu: python-gwcs: Update to 0.18.3., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 04/19] gnu: python-sunpy: Update to 4.1.5., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 06/19] gnu: python-sgp4: Update to 2.22., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 08/19] gnu: python-reproject: Update to 0.10.0., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 05/19] gnu: python-spherical-geometry: Add update note., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 07/19] gnu: python-ccdproc: Enable tests., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 09/19] gnu: python-pyvo: Update to 1.4.1., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 19/19] gnu: python-asdf-coordinates-schemas: Update to 0.2.0., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 10/19] gnu: python-fitsio: Use Gexp.,
Sharlatan Hellseher <=
- [bug#63542] [PATCH 11/19] gnu: python-astropy-healpix: Use Gexp., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 15/19] gnu: python-poppy: Update to 1.1.1., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 17/19] gnu: python-ephem: Update to 4.1.4., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 18/19] gnu: python-asdf: Update to 2.15.0., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 12/19] gnu: python-astroquery: Use Gexp., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 13/19] gnu: python-pynbody: Update to 1.3.1, simplify., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 16/19] gnu: python-photutils: Update to 1.7.0., Sharlatan Hellseher, 2023/05/16
- [bug#63542] [PATCH 14/19] gnu: python-astral: Update to 3.2., Sharlatan Hellseher, 2023/05/16