[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/20: gnu: python-fitsio: Use G-Expressions.
From: |
guix-commits |
Subject: |
10/20: gnu: python-fitsio: Use G-Expressions. |
Date: |
Thu, 25 May 2023 20:39:54 -0400 (EDT) |
monego pushed a commit to branch master
in repository guix.
commit 2e501ccc03a70ce546c1885951f131d711c93b59
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Wed May 24 22:51:44 2023 +0100
gnu: python-fitsio: Use G-Expressions.
* gnu/packages/astronomy.scm (python-fitsio): Use G-Expressions.
Signed-off-by: Vinicius Monego <monego@posteo.net>
---
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 a3a037a853..2c99d1051c 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -476,27 +476,28 @@ in FITS files.")
(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))
- 14/20: gnu: python-astral: Update to 3.2., (continued)
- 14/20: gnu: python-astral: Update to 3.2., guix-commits, 2023/05/25
- 08/20: gnu: python-reproject: Update to 0.10.0., guix-commits, 2023/05/25
- 04/20: gnu: python-sunpy: Update to 4.1.5., guix-commits, 2023/05/25
- 07/20: gnu: python-ccdproc: Enable tests., guix-commits, 2023/05/25
- 06/20: gnu: python-sgp4: Update to 2.22., guix-commits, 2023/05/25
- 11/20: gnu: python-astropy-healpix: Switch to pyproject-build-system., guix-commits, 2023/05/25
- 03/20: gnu: python-gwcs: Update to 0.18.3., guix-commits, 2023/05/25
- 02/20: gnu: python-asdf-wcs-schemas: Switch to pyproject-build-system., guix-commits, 2023/05/25
- 12/20: gnu: python-astroquery: Use G-Expressions., guix-commits, 2023/05/25
- 01/20: gnu: python-asdf-astropy: Update to 0.4.0., guix-commits, 2023/05/25
- 10/20: gnu: python-fitsio: Use G-Expressions.,
guix-commits <=
- 16/20: gnu: python-photutils: Update to 1.7.0., guix-commits, 2023/05/25
- 18/20: gnu: python-asdf: Update to 2.15.0., guix-commits, 2023/05/25
- 13/20: gnu: python-pynbody: Update to 1.3.1., guix-commits, 2023/05/25
- 15/20: gnu: python-poppy: Update to 1.1.1., guix-commits, 2023/05/25
- 17/20: gnu: python-ephem: Update to 4.1.4., guix-commits, 2023/05/25
- 19/20: gnu: python-asdf-coordinates-schemas: Update to 0.2.0., guix-commits, 2023/05/25
- 20/20: gnu: python-asdf: Enable tests., guix-commits, 2023/05/25