diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-02-03 16:24:53 +0000 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-02-28 22:43:59 +0000 |
| commit | 11284f55f6364a3272a35f18ab394932e220aa90 (patch) | |
| tree | bc7e111c4f66f8a906ccd307b1811f114e1e4427 /gnu/packages/astronomy.scm | |
| parent | 751017da491d59f4236e246e022819f92c163dc3 (diff) | |
gnu: casacore: Update to 3.6.1.
* gnu/packages/astronomy.scm (casacore): Update to 3.6.1.
[argument] <phases>: Add 'hide-gfortran.
[inputs]: Add gsl.
Change-Id: I702427857cf001d583b775189f9d8f5d35fc7183
Diffstat (limited to 'gnu/packages/astronomy.scm')
| -rw-r--r-- | gnu/packages/astronomy.scm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 52c295d98a..1cd4d74359 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -401,7 +401,7 @@ rendering of the atmosphere model and examine its properties. (define-public casacore (package (name "casacore") - (version "3.4.0") + (version "3.6.1") (source (origin (method git-fetch) @@ -410,7 +410,7 @@ rendering of the atmosphere model and examine its properties. (commit (string-append "v" version)))) (sha256 (base32 - "05ar5gykgh4dm826xplj5ri5rw7znhxrvin2l67a3mjwfys7r2a0")) + "0ja0ss1cjfx9j2pnmqzr51ipxrfij7i2c4bq4nqkgaxfk5q447i5")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -458,7 +458,18 @@ rendering of the atmosphere model and examine its properties. (lambda _ (substitute* "build-tools/casacore_assay" (("QSUBP=.*$") "QSUBP=\n") - (("YODP=.*$") "YODP=\n"))))))) + (("YODP=.*$") "YODP=\n")))) + ;; XXX: It fails to find the stdlib types when the gfortran header + ;; is used. Remove gfortran from CPLUS_INCLUDE_PATH as a + ;; workaround. Taken from <https://issues.guix.gnu.org/73439#45>. + (add-after 'set-paths 'hide-gfortran + (lambda _ + (let ((gfortran #$(this-package-input "gfortran"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gfortran "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")))))))) (native-inputs (list bison boost @@ -469,6 +480,7 @@ rendering of the atmosphere model and examine its properties. fftw fftwf gfortran + gsl hdf5 ncurses openblas |