From 94020f90f96c6db6b22f108adb8bd83b61969f69 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 10 Jun 2023 00:53:41 -0700 Subject: gnu: gnuastro: Update to 0.20 * gnu/packages/astronomy.scm (gnuastro: Update to 0.20 Signed-off-by: Christopher Baines --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 964e72642c..1371b24667 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -651,7 +651,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") (define-public gnuastro (package (name "gnuastro") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) @@ -659,7 +659,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") version ".tar.lz")) (sha256 (base32 - "192q3i4zlfmwfcchlf9lnpfgys9dssh7npr5qx0gzn3d2fri0xbz")))) + "05bkad0xbax9k0m2g2507mdmjg2109sfg72dsx16f44yj55llh2n")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From b08be61a026fae900d37c158fd1b251bf21f5450 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:31 +0100 Subject: gnu: Add python-pysynphot. * gnp/packages/astronomy.scm (python-pysynphot): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1371b24667..25b6d6a07e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2687,6 +2687,38 @@ astrophysical simulations supporting PKDGRAV/Gasoline, Gadget, Gadget4/Arepo, N-Chilada and RAMSES AMR outputs.") (license license:gpl3+))) +(define-public python-pysynphot + (package + (name "python-pysynphot") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pysynphot" version)) + (sha256 + (base32 + "1rr29m63bnj47f6gvbvg3pm1296x14ad29c6qd0sdj4f4ilrzhj5")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'set-env-data-path + (lambda _ + (setenv "PYSYN_CDBS" + (string-append #$output "/crds"))))))) + (native-inputs (list python-pytest python-pytest-remotedata + python-setuptools-scm)) + (propagated-inputs (list python-astropy python-beautifulsoup4 python-numpy + python-pytest-astropy-header python-six)) + (home-page "https://github.com/spacetelescope/pysynphot") + (synopsis "Python Synthetic Photometry Utilities") + (description + "Astrolib PySynphot (hereafter referred to only as pysynphot) is an +object-oriented replacement for STSDAS SYNPHOT synthetic photometry package in +IRAF. @code{pysynphot} simulates photometric data and spectra as they are +observed with the Hubble Space Telescope (HST). Passbands for standard +photometric systems are available, and users can incorporate their own filters, +spectra, and data.") + (license license:bsd-3))) + (define-public python-sep (package (inherit libsep) -- cgit 1.4.1 From 2ff90902c07ad377f94d94bd2b047e7170171a41 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:32 +0100 Subject: gnu: Add python-rad. * gnu/packages/astronomy.scm (python-rad): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 25b6d6a07e..93f19f9195 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3082,6 +3082,36 @@ the entire transformation pipeline from input coordinates (detector by default) to world coordinates.") (license license:bsd-3))) +(define-public python-rad + (package + (name "python-rad") + (version "0.15.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "rad" version)) + (sha256 + (base32 + "0j51pkywxdaqrfz162rdsywlvx1mbb2h0gi5framvhf25i1im7mb")))) + (build-system pyproject-build-system) + (arguments + (list #:test-flags #~(list "-k" "not remote_data"))) + (native-inputs (list python-astropy + python-pytest + python-pytest-doctestplus + python-pytest-openfiles + python-semantic-version + python-setuptools-scm)) + (propagated-inputs (list python-asdf python-asdf-astropy)) + (home-page "https://github.com/spacetelescope/rad") + (synopsis "Roman Attribute Dictionary") + (description + "@acronym{RAD, The Roman Attribute Dictionary} is package which defines +schemas for the Nancy Grace Roman Space Telescope shared attributes for +processing and archive. These schemas are schemas for the ASDF file file +format, which are used by ASDF to serialize and deserialize data for the Nancy +Grace Roman Space Telescope.") + (license license:bsd-3))) + (define-public python-astroalign (package (name "python-astroalign") -- cgit 1.4.1 From 8c1171da28b7f7bb42cfd11de428249b4e396a8e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:33 +0100 Subject: gnu: Add python-roman-datamodels. * gnu/packages/astronomy.scm (python-roman-datamodels): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 93f19f9195..4bca7cf4e0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3112,6 +3112,49 @@ format, which are used by ASDF to serialize and deserialize data for the Nancy Grace Roman Space Telescope.") (license license:bsd-3))) +(define-public python-roman-datamodels + (package + (name "python-roman-datamodels") + (version "0.15.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "roman_datamodels" version)) + (sha256 + (base32 + "0frhm1cqqd8934yizhm4fy78y38q2w9ncm4rv1n74hfypkyis4ap")))) + (build-system pyproject-build-system) + (arguments + ;; XXX: Check how to make all tests enabled, probably some more inner + ;; input chain needs to be upgraded, keep them disabled to make the build + ;; green. + (list #:test-flags #~(list "-k" + (string-append "not test_will_validate" + " and not test_will_strict_validate" + " and not test_nuke_validation")))) + (propagated-inputs (list python-asdf + python-asdf-astropy + python-asdf-standard + python-astropy + python-gwcs + python-numpy + python-psutil + python-rad)) + (native-inputs (list python-pytest python-pytest-doctestplus + python-pytest-openfiles python-semantic-version + python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/roman_datamodels") + (synopsis "Roman Datamodels Support") + (description + "This package provides a Python package of Roman Datamodels for the +calibration pipelines started with the @acronym{JWST, James Webb Space +Telescope} calibration pipelines. The goal for the JWST pipelines was motivated +primarily by the need to support FITS data files, specifically with isolating +the details of where metadata and data were located in the FITS file from the +representation of the same items within the Python code. That is not a concern +for Roman since FITS format data files will not be used by the Roman calibration +pipelines.") + (license license:bsd-3))) + (define-public python-astroalign (package (name "python-astroalign") -- cgit 1.4.1 From 04cf30e15323fa56c1f0ce7e4e8f3981dab9f99a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:34 +0100 Subject: gnu: Add python-stsci-image. * gnu/packages/astronomy.scm (python-stsci-image): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4bca7cf4e0..80bf8a68f8 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2045,6 +2045,34 @@ spherical polygons that represent arbitrary regions of the sky.") ;; QD_LIBRARY_LICENSE.rst for bandeled QD source (license license:bsd-3))) +(define-public python-stsci-image + (package + (name "python-stsci-image") + (version "2.3.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "stsci.image" version)) + (sha256 + (base32 + "1vnp4256nbdvapa69cmm80sjz11ygxa49abr9nbvssj6nyyp5icb")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running + ;; the tests. + (invoke "python" "setup.py" "build_ext" + "--inplace")))))) + (propagated-inputs (list python-numpy python-scipy)) + (native-inputs (list python-pytest python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/stsci.image") + (synopsis "Image array manipulation functions") + (description + "This package provides Python modules of @acronym{STScI, Space Telescope +Science Institute} image array manipulation functions.") + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 995443acacea93b3cec5aca364189c14aa370ea1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:35 +0100 Subject: gnu: Add python-stsci-imagestats. * gnu/packages/astronomy.scm (python-stsci-imagestats): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 80bf8a68f8..cba285816e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2073,6 +2073,31 @@ spherical polygons that represent arbitrary regions of the sky.") Science Institute} image array manipulation functions.") (license license:bsd-3))) +(define-public python-stsci-imagestats + (package + (name "python-stsci-imagestats") + (version "1.6.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "stsci.imagestats" version)) + (sha256 + (base32 + "14457izlbnks84dyza75ib3nvx2w8nhlqm9vc1zb7hbhknb5gjvw")))) + (build-system python-build-system) + (arguments + (list #:tests? #f)) ;No tests + (propagated-inputs (list python-numpy)) + (native-inputs (list python-setuptools-scm)) + (home-page "https://stsciimagestats.readthedocs.io/en/latest/") + (synopsis "Compute sigma-clipped statistics on data arrays") + (description + "@code{stsci.imagestats} is a package designed to compute various +statistics on image data using sigma-clipping iterations. It is designed to +replicate core behaviour of the IRAF's +@url{http://stsdas.stsci.edu/cgi-bin/gethelp.cgi?imstatistics, imstatistics +task}.") + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 95c1e5121a1238c745860d7a7033bdb30c91b7cf Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:36 +0100 Subject: gnu: Add python-stsci-stimage. * gnu/packages/astronomy.scm (python-stsci-stimage): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index cba285816e..2f708ff652 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2098,6 +2098,30 @@ replicate core behaviour of the IRAF's task}.") (license license:bsd-3))) +(define-public python-stsci-stimage + (package + (name "python-stsci-stimage") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "stsci.stimage" version)) + (sha256 + (base32 + "0i7xby1gaiplvbqqv8a4f4cw1is8fwj89mix1z3bqrykqi3n24g0")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Fix failing tests. There are errors to load test files. + #:tests? #f)) + (propagated-inputs (list python-numpy)) + (native-inputs (list python-codecov python-pytest python-pytest-cov + python-setuptools-scm)) + (home-page "https://stscistimage.readthedocs.io/en/latest/") + (synopsis "STScI image processing") + (description "This package provides an astronomical Python package with +image processing functions: @code{xyxymatch}, @code{geomap}.") + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 308bee5f000703f063f5fbccd1c439e8c905a09c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:37 +0100 Subject: gnu: Add python-tweakwcs. * gnu/packages/astronomy.scm (python-tweakwcs): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2f708ff652..c411af0e54 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2832,6 +2832,40 @@ Takes a WGS84 (GPS) latitude/longitude as input as well as an UTC or local datetime object.") (license license:lgpl3+))) +(define-public python-tweakwcs + (package + (name "python-tweakwcs") + (version "0.8.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "tweakwcs" version)) + (sha256 + (base32 + "1500w737n9vf5hv16xkybk4shl7g4wfzb2ji9mc4vgzj41gkrwl4")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-astropy + python-gwcs + python-numpy + python-packaging + python-spherical-geometry + python-stsci-imagestats + python-stsci-stimage)) + (native-inputs (list python-codecov + python-pytest + python-pytest-cov + python-scipy + python-semantic-version + python-setuptools-scm)) + (home-page "https://tweakwcs.readthedocs.io/en/latest/") + (synopsis + "Algorithms for matching and aligning catalogs and for tweaking the WCS") + (description + "@code{tweakwcs} is a package that provides core algorithms for computing +and applying corrections to @code{WCS} objects such as to minimize mismatch +between image and reference catalogs. Currently only aligning images with +@code{FITS WCS} and @code{JWST gWCS} are supported.") + (license license:bsd-3))) + (define-public python-asdf (package (name "python-asdf") -- cgit 1.4.1 From c0dfd0470945b1e2d560aa2efc348283b8be0d39 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:38 +0100 Subject: gnu: Add python-synphot. * gnu/packages/astronomy.scm (python-synphot): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c411af0e54..d82ff7c91f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2832,6 +2832,33 @@ Takes a WGS84 (GPS) latitude/longitude as input as well as an UTC or local datetime object.") (license license:lgpl3+))) +(define-public python-synphot + (package + (name "python-synphot") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "synphot" version)) + (sha256 + (base32 + "02pjp1bnbyq7zi1bxqv56nif4ijd8fscmnn9ldrs8yvgsbmgdvlc")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Test needs more love to pass. + ;; ERROR collecting synphot/tests/test_utils.py + #:tests? #f)) + (propagated-inputs (list python-astropy python-numpy python-scipy)) + (native-inputs (list python-pytest python-pytest-astropy + python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/synphot_refactor") + (synopsis "Synthetic photometry using Astropy") + (description + "This package provides a replacement for IRAF STSDAS SYNPHOT and ASTROLIB +PYSYNPHOT, utilizing Astropy and covering the non-instrument specific portions +of the old packages.") + (license license:bsd-3))) + (define-public python-tweakwcs (package (name "python-tweakwcs") -- cgit 1.4.1 From 3a952dc04c980df43f9cbf1eacb2fb550e506e38 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:39 +0100 Subject: gnu: Add python-stsynphot. * gnu/packages/astronomy.scm (python-stsynphot): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d82ff7c91f..af35b75e8f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2122,6 +2122,40 @@ task}.") image processing functions: @code{xyxymatch}, @code{geomap}.") (license license:bsd-3))) +(define-public python-stsynphot + (package + (name "python-stsynphot") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "stsynphot" version)) + (sha256 + (base32 + "0qkdh47j84v7fzri7bmi1jcmggdqq0a8byamfm73d8mbz86v8sn4")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Tests fails on missing file, it might need to be downloaded, + ;; disable them for now. astropy.utils.exceptions.AstropyUserWarning: + ;; Failed to load Vega spectrum from + ;; /grp/redcat/trds/calspec/alpha_lyr_stis_010.fits; + #:tests? #f)) + (propagated-inputs (list python-astropy + python-beautifulsoup4 + python-matplotlib + python-numpy + python-scipy + python-synphot)) + (native-inputs (list python-pytest python-pytest-astropy + python-pytest-astropy-header python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/stsynphot_refactor") + (synopsis "Synthetic photometry using Astropy for HST and JWST") + (description + "This package provides a replacement for IRAF STSDAS SYNPHOT and ASTROLIB +PYSYNPHOT, utilizing Astropy covering instrument specific portions of the old +packages for HST.") + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 23bc5e12d44122991062ad68a489ab10949142aa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:41 +0100 Subject: gnu: Add python-crds. * gnu/packages/astronomy.scm (python-crds): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index af35b75e8f..8f3471daab 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1425,6 +1425,58 @@ attempting to maintain ISTP compliance @end itemize") (license license:expat))) +(define-public python-crds + (package + (name "python-crds") + (version "11.17.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "crds" version)) + (sha256 + (base32 + "0sdz1k4hrgrc2jwihp9ns7lx23kcz7f90c222q7aaqf9g3vvpqlr")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Tests require Internet access to https://hst-crds.stsci.edu and + ;; additional test data. See: + ;; https://github.com/spacetelescope/crds/blob/master/setup_test_cache + #:tests? #f)) + (propagated-inputs (list python-asdf + python-astropy + python-boto3 + python-filelock + python-lxml + python-numpy + python-parsley + python-pysynphot + python-roman-datamodels + python-stsynphot + python-requests)) + (native-inputs (list python-flake8 + python-ipython + python-lockfile + python-mock + python-nose + python-pylint + python-pytest + python-semantic-version + python-setuptools-scm)) + (home-page "https://hst-crds.stsci.edu") + (synopsis "Calibration Reference Data System for HST and JWST") + (description + "CRDS is a package used for working with astronomical reference files for +the HST and JWST telescopes. CRDS is useful for performing various operations +on reference files or reference file assignment rules. CRDS is used to assign, +check, and compare reference files and rules, and also to predict those datasets +which should potentially be reprocessed due to changes in reference files or +assignment rules. CRDS has versioned rules which define the assignment of +references for each type and instrument configuration. CRDS has web sites +corresponding to each project (http://hst-crds.stsci.edu or +https://jwst-crds.stsci.edu/) which record information about reference files and +provide related services.") + (license license:bsd-3))) + (define-public python-czml3 (package (name "python-czml3") -- cgit 1.4.1 From 2ff1c352d4032a588f4b0d8ebe0eb3e946fbc3e1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:42 +0100 Subject: gnu: Add python-stdatamodels. * gnu/packages/astronomy.scm (python-stdatamodels): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 8f3471daab..ac4b6eea96 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2174,6 +2174,48 @@ task}.") image processing functions: @code{xyxymatch}, @code{geomap}.") (license license:bsd-3))) +(define-public python-stdatamodels + (package + (name "python-stdatamodels") + (version "1.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "stdatamodels" version)) + (sha256 + (base32 + "1lssz5mnkzgraqa9mdg1w39scsikymcp3zpmsjb146r0pqnwnpzw")))) + (build-system pyproject-build-system) + (arguments + (list + ;; Disable tests requiring access to CRDS servers to download ~500MiB + ;; of data. + #:test-flags #~(list "-k" "not test_crds_selectors_vs_datamodel") + #:phases #~(modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (propagated-inputs (list python-asdf + python-asdf-astropy + python-astropy + python-jsonschema + python-numpy + python-psutil)) + (native-inputs (list python-crds + python-pytest + python-pytest-doctestplus + python-pytest-openfiles + python-scipy + python-semantic-version + python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/stdatamodels") + (synopsis + "Core support for DataModel classes used in calibration pipelines") + (description + "Provides DataModel, which is the base class for data models implemented in +the @acronym{JWST, James Webb Space Telescope} and @acronym{Roman, Nancy Grace +Roman Space Telescope} calibration software.") + (license license:bsd-3))) + (define-public python-stsynphot (package (name "python-stsynphot") -- cgit 1.4.1 From e5b8a87b40710590421915bec0d0c161b684b9fc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:43 +0100 Subject: gnu: Add python-stpipe. * gnu/packages/astronomy.scm (python-stpipe): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index ac4b6eea96..5c42512a0a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2216,6 +2216,29 @@ the @acronym{JWST, James Webb Space Telescope} and @acronym{Roman, Nancy Grace Roman Space Telescope} calibration software.") (license license:bsd-3))) +(define-public python-stpipe + (package + (name "python-stpipe") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "stpipe" version)) + (sha256 + (base32 + "17gnwzhl10vbg059lfprdyci19dlh3whkmb9rl7z25wr593rnvcp")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-asdf python-astropy python-crds + python-semantic-version python-stdatamodels)) + (native-inputs (list python-pytest python-pytest-doctestplus + python-pytest-openfiles python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/stpipe") + (synopsis "Framework for calibration pipeline software") + (description + "This package provides base classes and command-line tools for +implementing calibration pipeline software.") + ;; LICENSE Association of Universities for Research in Astronomy (AURA) + (license license:bsd-3))) + (define-public python-stsynphot (package (name "python-stsynphot") -- cgit 1.4.1 From 2095fe7b9671b69b060dff8be2a4eea89cd61923 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:44 +0100 Subject: gnu: Add python-bayesicfitting. * gnu/packages/astronomy.scm (python-bayesicfitting): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5c42512a0a..f2ef829ca9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1355,6 +1355,38 @@ be as fast as possible so some of the readability has been sacrificed, specifically in the C code.") (license license:bsd-3))) +(define-public python-bayesicfitting + (package + (name "python-bayesicfitting") + (version "3.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dokester/BayesicFitting") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07y9dr9wxhxrvhk0jjakhbyrgal60i92m7z7q14fp12k8x0gl69l")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover" + "test"))))))) + (propagated-inputs (list python-astropy python-future python-matplotlib + python-numpy python-scipy)) + (home-page "https://www.bayesicfitting.nl") + (synopsis "Python Toolbox for Astronimical Bayesian fitting") + (description + "The BayesicFitting package is a python version of the the fitter classes +in @acronym{HCSS, Herschel Common Science System}. HCSS was the all +encompassing software system for the operations and analysis of the ESA satelite +Herschel.") + (license license:gpl3+))) + (define-public python-ccdproc (package (name "python-ccdproc") -- cgit 1.4.1 From 2b085c4b41cd0aa888d9f4c027a23c483a7c73e5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:45 +0100 Subject: gnu: Add python-wiimatch. * gnu/packages/astronomy.scm (python-wiimatch): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f2ef829ca9..1655fd09aa 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3528,3 +3528,26 @@ astronomical images, especially when there is no WCS information available.") "Skyfield computes positions for the stars, planets, and satellites in orbit around the Earth.") (license license:expat))) + +(define-public python-wiimatch + (package + (name "python-wiimatch") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "wiimatch" version)) + (sha256 + (base32 + "0x6p5z6a2cqinckwlpinjxagvmswl149s1jn6ihmdxk4k0h8rrz0")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-numpy python-scipy)) + (native-inputs (list python-codecov python-pytest python-pytest-cov + python-pytest-doctestplus python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/wiimatch") + (synopsis + "Optimal matching of weighted N-dimensional image intensity data") + (description + "@code{wiimatch} is a package that provides core computational algorithms +for optimal @code{matching} of weighted N-dimensional image intensity data +using (multivariate) polynomials.") + (license license:bsd-3))) -- cgit 1.4.1 From f9616163d0666142d09f2a5b69a58732d18ca62e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:46 +0100 Subject: gnu: Add python-drizzle. * gnu/packages/astronomy.scm (python-drizzle): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1655fd09aa..42ce1c1dc8 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1577,6 +1577,53 @@ JSOC (@url{http://jsoc.stanford.edu/}) DRMS server by default, but can also be used with local NetDRMS sites.") (license license:bsd-2))) +(define-public python-drizzle + (package + (name "python-drizzle") + (version "1.13.7") + (source (origin + (method git-fetch) ;PyPi doesn't have the test data sets + (uri (git-reference + (url "https://github.com/spacetelescope/drizzle") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x591d9gjasds91fvwcf37bhxp5nra28g0vq5zkykczpc70ywiy8")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: 2 of 26 tests failed with AssertionError, disable them for now. + ;; Consider mention it in upstream. + #:test-flags #~(list "-k" + (string-append "not test_square_with_point" + " and not test_square_with_grid")) + #:phases #~(modify-phases %standard-phases + (add-before 'build 'set-env-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" + #$version))) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running + ;; the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs (list python-astropy python-numpy)) + (native-inputs (list python-coverage python-flake8 python-pytest + python-pytest-cov python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/drizzle") + (synopsis + "Astronomical tool for combining dithered images into a single image") + (description + "The drizzle library is a Python package for combining dithered images into +a single image. This library is derived from code used in DrizzlePac. Like +DrizzlePac, most of the code is implemented in the C language. The biggest +change from DrizzlePac is that this code passes an array that maps the input to +output image into the C code, while the DrizzlePac code computes the mapping by +using a Python callback. Switching to using an array allowed the code to be +greatly simplified.") + (license license:bsd-3))) + (define-public python-ephem (package (name "python-ephem") -- cgit 1.4.1 From 37bfbd4fcffc22d72dbd3aff1dd98866571479fe Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:47 +0100 Subject: gnu: Add python-stcal. * gnu/packages/astronomy.scm (python-stcal): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 42ce1c1dc8..507bff7835 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2253,6 +2253,35 @@ task}.") image processing functions: @code{xyxymatch}, @code{geomap}.") (license license:bsd-3))) +(define-public python-stcal + (package + (name "python-stcal") + (version "1.3.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "stcal" version)) + (sha256 + (base32 + "0yy0pwi3krvhxfby6nzgpgyz5il3sl1j29ihbk81dh9fdh3ys2n9")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;; XXX: Can't detect opencv-python version. The input + ;; opencv might not set the version correctly. + (delete 'sanity-check)))) + (propagated-inputs (list opencv ;Provides OpenCV-Python + python-astropy python-numpy python-scipy)) + (native-inputs (list python-psutil + python-pytest + python-pytest-cov + python-pytest-doctestplus + python-pytest-openfiles + python-setuptools-scm)) + (home-page "https://github.com/spacetelescope/stcal") + (synopsis "STScI tools and algorithms used in calibration pipelines") + (description "STScI tools and algorithms used in calibration pipelines.") + (license license:bsd-3))) + (define-public python-stdatamodels (package (name "python-stdatamodels") -- cgit 1.4.1 From 339be9dad527bb0805e35dc1816cf373d445ed91 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 May 2023 20:58:48 +0100 Subject: gnu: Add python-jwst. * gnu/packages/astronomy.scm (python-jwst): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 507bff7835..cdb6750f09 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2926,6 +2926,73 @@ Moon position, etc.") JPL ephemerides use to predict raw (x,y,z) planetary positions.") (license license:expat))) +(define-public python-jwst + (package + (name "python-jwst") + (version "1.10.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "jwst" version)) + (sha256 + (base32 + "1lmfyw2y7c84rs9xqavah9aidj478ijiiijlz6fag11xqn1vs98y")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Tests require access to https://jwst-crds-pub.stsci.edu server for + ;; getting data sets. + #:tests? #f + #:phases #~(modify-phases %standard-phases + ;; NOTE: (Sharlatan-20230529T113448+0100): opencv-python's + ;; version can't be detected, it could the way it's packed in + ;; Guix. Review failing sanity check with more efforts, + ;; disable for now to make package buildable. + (delete 'sanity-check)))) + ;; opencv provides OpenCV-Python which is Listed as install requirement. + (propagated-inputs (list opencv + python-asdf + python-asdf-astropy + python-astropy + python-bayesicfitting + python-crds + python-drizzle + python-gwcs + python-jsonschema + python-numpy + python-photutils + python-poppy + python-psutil + python-pyparsing + python-requests + python-scikit-image + python-scipy + python-spherical-geometry + python-stcal + python-stdatamodels + python-stpipe + python-stsci-image + python-stsci-imagestats + python-tweakwcs + python-wiimatch)) + (native-inputs (list python-codecov + python-colorama + python-flake8 + python-pytest + python-pytest-cov + python-pytest-doctestplus + python-pytest-openfiles + python-requests-mock + python-setuptools-scm)) + (home-page "https://jwst-pipeline.readthedocs.io/en/latest/") + (synopsis + "Python library for science observations from the James Webb Space Telescope") + (description + "This package provides an access to the JWST Science Calibration Pipeline +processes data from all JWST instruments and observing modes by applying various +science corrections sequentially, producing both fully-calibrated individual +exposures and high-level data products (mosaics, extracted spectra, etc.).") + (license license:bsd-3))) + (define-public python-pyerfa (package (name "python-pyerfa") -- cgit 1.4.1 From f821c06b676074c37451501e661515020a0a8b9a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Jul 2023 17:43:17 +0200 Subject: gnu: Add python-astroml. * gnu/packages/astronomy.scm (python-astroml): New variable. --- gnu/packages/astronomy.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index cdb6750f09..1dca667ef0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) + #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) @@ -463,6 +464,45 @@ in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) +(define-public python-astroml + (package + (name "python-astroml") + (version "1.0.2.post1") + (source (origin + (method url-fetch) + (uri (pypi-uri "astroML" version)) + (sha256 + (base32 + "14g2mcd5qdr3nn7icvjs84bjvx17l9glx81sbbna6v53i1x8l625")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + '(list "--ignore-glob=examples/*") + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'patch-build-system + (lambda _ + (substitute* "setup.cfg" + ;; Do not error out on deprecations + ((" error::DeprecationWarning.*") "") + ;; Do not test examples + (("testspaths = astroML doc examples") + "testspaths = astroML")))) + (add-before 'check 'pre-check + ;; Some tests need this + (lambda _ + (setenv "HOME" "/tmp")))))) + (propagated-inputs (list python-astropy python-matplotlib python-numpy + python-scikit-learn python-scipy)) + (native-inputs (list python-pytest-astropy-header python-pytest-cov + python-pytest-doctestplus python-pytest-remotedata)) + (home-page "https://astroml.org") + (synopsis "Tools for machine learning and data mining in astronomy") + (description "This package provides tools for machine learning and data +mining in astronomy.") + (license license:bsd-2))) + (define-public python-fitsio (package (name "python-fitsio") -- cgit 1.4.1 From 07f083e94f4f5c5f53e4d8aa644de2064a6256c9 Mon Sep 17 00:00:00 2001 From: Navid Afkhami Date: Mon, 3 Jul 2023 15:08:11 +0000 Subject: gnu: Add python-gatspy. * gnu/packages/bioinformatics.scm (python-gatspy): New variable. --- gnu/packages/astronomy.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1dca667ef0..3a1b584808 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -562,6 +562,39 @@ CFITSIO library. Among other things, it can @end itemize") (license license:gpl2+))) +(define-public python-gatspy + (package + (name "python-gatspy") + (version "0.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "gatspy" version)) + (sha256 + (base32 + "1gw2z6x8nikvnw2gkdl70gr81cwczd1pd7v8ry2kjn6k4kssrfav")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + ;; Tests need this + (add-before 'check 'set-HOME + (lambda _ (setenv "HOME" "/tmp")))) + #:test-flags + '(list "-k" + (string-append + ;; These tests require internet access + "not test_download_data.py" + ;; XXX: we don't have supersmoother + " and not test_supersmoother.py")))) + (propagated-inputs (list python-astroml python-numpy python-scipy)) + (native-inputs (list python-pytest python-nose python-setuptools-scm)) + (home-page "https://github.com/astroml/gatspy") + (synopsis "General tools for astronomical time series in Python") + (description "This package provides general tools for astronomical time +series in Python.") + (license license:bsd-2))) + (define-public qfits (package (name "qfits") -- cgit 1.4.1 From 25a604a2749aaac75c38d4774addac3c731d11a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:03 +0200 Subject: gnu: wcslib: Update to 8.1. * gnu/packages/astronomy.scm (wcslib): Update to 8.1. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3a1b584808..04bb4c277d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -665,7 +665,7 @@ feature detection and cosmetic corrections.") (define-public wcslib (package (name "wcslib") - (version "7.12") + (version "8.1") (source (origin (method url-fetch) @@ -673,7 +673,7 @@ feature detection and cosmetic corrections.") "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "1m3bx6gh5w3c7vvsqcki0x20mg8lilg13m0i8nh7za89w58dxy4w")))) + (base32 "17hjnkwn2rd5d9krw2n637q4y8ma4nzk2i55zzn8l2yimdpkxwib")))) (inputs (list cfitsio)) (build-system gnu-build-system) -- cgit 1.4.1 From f50c82ff2fd53125f9182cb35c6823385f18d6dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:01 +0200 Subject: gnu: wcslib: Download source over HTTPS. * gnu/packages/astronomy.scm (wcslib)[source]: Use HTTPS. --- gnu/packages/astronomy.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 04bb4c277d..7d903cc4aa 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -669,9 +669,8 @@ feature detection and cosmetic corrections.") (source (origin (method url-fetch) - (uri (string-append - "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version - ".tar.bz2")) + (uri (string-append "https://www.atnf.csiro.au/people/mcalabre/WCS/" + "wcslib-" version ".tar.bz2")) (sha256 (base32 "17hjnkwn2rd5d9krw2n637q4y8ma4nzk2i55zzn8l2yimdpkxwib")))) (inputs -- cgit 1.4.1 From a6f9df4c411f85c3430392d939040e9c60261083 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 2 Jul 2023 02:00:06 +0200 Subject: gnu: weightwatcher: Fix build. * gnu/packages/astronomy.scm (weightwatcher)[arguments]: Add #:configure-flags to build with GCC 10. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 7d903cc4aa..b47fa8fe1e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -712,6 +712,10 @@ header.") (sha256 (base32 "1zaqd8d9rpgcwjsp92q3lkfaa22i20gppb91dz34ym54swisjc2p")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "CFLAGS=-fcommon"))) ; fix build with GCC 10 (home-page "https://www.astromatic.net/software/weightwatcher") (synopsis "Weight-map/flag-map multiplexer and rasteriser") (description -- cgit 1.4.1 From 818405bb42d8ed157b007eb69b007183a2521dfd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:13 +0100 Subject: gnu: weightwatcher: Fetch sources from Git. They were removed from the home page. * gnu/packages/astronomy.scm (weightwatcher)[source]: Use GIT-FETCH and GIT-FILE-NAME. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b47fa8fe1e..bcc17b1056 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -706,11 +706,13 @@ header.") (version "1.12") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/weightwatcher/" - "weightwatcher-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/weightwatcher") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1zaqd8d9rpgcwjsp92q3lkfaa22i20gppb91dz34ym54swisjc2p")))) + (base32 "0701z6bdqq32jv7ga3n6jh27q684ni0hbfjm1mak7rh0qqx089gi")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From d62ceb7328eee6fccbecd212f4e7d9a6d9681aa1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:14 +0100 Subject: gnu: swarp: Update to 2.41.5. * gnu/packages/astronomy.scm (swarp): Update to 2.41.5. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add automake, autoconf, libtool, and pkg-config. [inputs]: Add cfitsio. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index bcc17b1056..b7dc45338c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1130,15 +1130,21 @@ project.") (define-public swarp (package (name "swarp") - (version "2.38.0") + (version "2.41.5") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/swarp/" - "swarp-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/swarp") + (commit (string-append version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1i670waqp54vin1cn08mqckcggm9zqd69nk7yya2vvqpdizn6jpm")))) + (base32 "00463r5rd4xl74xs4h1n4gl2qk7v9p5nw9x05pbzgh8jm77q90qq")))) (build-system gnu-build-system) + (native-inputs + (list automake autoconf libtool pkg-config)) + (inputs + (list cfitsio)) (home-page "https://www.astromatic.net/software/swarp") (synopsis "FITS image resampling and co-addition") (description -- cgit 1.4.1 From e5f6d0ecafba223031d8f379a91961842ca593a6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 2 Jul 2023 02:00:05 +0200 Subject: gnu: eye: Fix build. * gnu/packages/astronomy.scm (eye)[arguments]: Add #:configure-flags to build with GCC 10. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b7dc45338c..b2567b992a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -651,6 +651,10 @@ International Astronomical Union}.") (sha256 (base32 "092qhzcbrkcfidbx4bv9wz42w297n80jk7a6kwyi9a3fjfz81d7k")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "CPPFLAGS=-fcommon"))) ; fix build with GCC 10 (home-page "https://www.astromatic.net/software/eye") (synopsis "Small image feature detector using machine learning") (description -- cgit 1.4.1 From b67d61a05b15d2eae32eb5f84c82291c4ae7e57e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:15 +0100 Subject: gnu: eye: Fetch sources from Git. * gnu/packages/astronomy.scm (eye)[source]: Use GIT-FETCH and GIT-FILE-NAME. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b2567b992a..564dbbe71b 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -645,11 +645,13 @@ International Astronomical Union}.") (version "1.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/eye/" - "eye-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/eye") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "092qhzcbrkcfidbx4bv9wz42w297n80jk7a6kwyi9a3fjfz81d7k")))) + (base32 "1j8rpgz3fjp6fw0qmxgfqycf3n01fzxds4w12vgyrhbnk658ia41")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 5df23828429959fb9271678a7f5704be468e273c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:00 +0200 Subject: gnu: eye: Mark up description. * gnu/packages/astronomy.scm (eye)[description]: Use @acronym{} and @dfn{}. --- gnu/packages/astronomy.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 564dbbe71b..04cde447c4 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -660,12 +660,13 @@ International Astronomical Union}.") (home-page "https://www.astromatic.net/software/eye") (synopsis "Small image feature detector using machine learning") (description - "In EyE (Enhance Your Extraction) an artificial neural network connected to -pixels of a moving window (retina) is trained to associate these input stimuli -to the corresponding response in one or several output image(s). The resulting -filter can be loaded in SExtractor to operate complex, wildly non-linear filters -on astronomical images. Typical applications of EyE include adaptive filtering, -feature detection and cosmetic corrections.") + "In @acronym{EyE, Enhance Your Extraction} an artificial neural network +connected to pixels of a moving window (@dfn{retina}) is trained to associate +these input stimuli to the corresponding response in one or several output +image(s). The resulting filter can be loaded in SExtractor to operate +complex, wildly non-linear filters on astronomical images. Typical +applications of EyE include adaptive filtering, feature detection and cosmetic +corrections.") (license license:cecill))) (define-public wcslib -- cgit 1.4.1 From 047b7e55b315b8609e6bc2eaf18d5de36b155735 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:16 +0100 Subject: gnu: missfits: Fix build. * gnu/packages/astronomy.scm (missfits)[arguments]: Add CPPFLAGS to pass build with GCC 10. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 04cde447c4..27fe4260ec 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2678,6 +2678,13 @@ PixInsight. It implements XISF 1.0 specification.") (sha256 (base32 "04jrd7fsvzr14vdmwgj2f6v97gdcfyjyz6jppml3ghr9xh12jxv5")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; Address this link error: + ;; ld: ... multiple definition of ... first defined here + "CPPFLAGS=-fcommon"))) (home-page "https://www.astromatic.net/software/missfits") (synopsis "FITS files Maintenance program") (description -- cgit 1.4.1 From 6ea387bc614f16abacd9d3cab1a60911cd50c267 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:16 +0100 Subject: gnu: missfits: Fetch sources from Git. * gnu/packages/astronomy.scm (missfits)[source]: Use GIT-FETCH and GIT-FILE-NAME. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 27fe4260ec..13d30caae2 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2672,11 +2672,13 @@ PixInsight. It implements XISF 1.0 specification.") (version "2.8.0") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/missfits/" - "missfits-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/missfits") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "04jrd7fsvzr14vdmwgj2f6v97gdcfyjyz6jppml3ghr9xh12jxv5")))) + (base32 "12ndvrr3l5j7ph2i5f3qf0wqmv5ymsyjzxnnypqajsvliw72iprh")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From 9c0fe23dfe84898016f7006ae4ad2c0e426703c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:01 +0200 Subject: gnu: missfits: Mark up description. * gnu/packages/astronomy.scm (missfits)[description]: Use @acronym{} and @uref{}. --- gnu/packages/astronomy.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 13d30caae2..80ad8fa677 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2695,10 +2695,11 @@ on FITS files: @itemize @item add/edit FITS header keywords -@item split/join Multi-Extension-FITS (MEF) files +@item split/join @acronym{MEF, Multi-Extension-FITS} files @item unpack/pack FITS data-cubes -@item create/check/update FITS checksums, using R. Seaman's protocol - (see http://www.adass.org/adass/proceedings/adass94/seamanr.html) +@item create/check/update FITS checksums, using +@uref{http://www.adass.org/adass/proceedings/adass94/seamanr.html, +R. Seaman's protocol} @end itemize\n") (license license:gpl3+))) -- cgit 1.4.1 From 7ec0b32d21d2be18ae5acca2d3a60b046fc64306 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:17 +0100 Subject: gnu: skymaker: Fix build. * gnu/packages/astronomy.scm (skymaker)[arguments]: Build with GCC 10. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 80ad8fa677..334c040c65 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -969,6 +969,7 @@ interactively in the plotting window.") (arguments `(#:configure-flags (list + "CPPFLAGS=-fcommon" ; fix build with GCC 10 (string-append "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") (string-append -- cgit 1.4.1 From c0831eadefa2303a0206c0044f0ab5be492de6d3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:17 +0100 Subject: gnu: skymaker: Use G-expressions. * gnu/packages/astronomy.scm (skymaker)[arguments]: Rewrite as G-expressions. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 334c040c65..120614d2c0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -967,13 +967,14 @@ interactively in the plotting window.") (base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list + (list + #:configure-flags + #~(list "CPPFLAGS=-fcommon" ; fix build with GCC 10 (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") + "--with-fftw-libdir=" #$(this-package-input "fftw") "/lib") (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + "--with-fftw-incdir=" #$(this-package-input "fftw") "/include")))) (inputs `(("fftw" ,fftwf))) (home-page "https://www.astromatic.net/software/skymaker") -- cgit 1.4.1 From b85ae5e568a5057b194039f5f9b8e953adcd852b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:17 +0100 Subject: gnu: skymaker: Remove input labels. * gnu/packages/astronomy.scm (skymaker)[inputs]: Remove input labels. [arguments]: Adjust accordingly. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 120614d2c0..3e5a227522 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -972,11 +972,11 @@ interactively in the plotting window.") #~(list "CPPFLAGS=-fcommon" ; fix build with GCC 10 (string-append - "--with-fftw-libdir=" #$(this-package-input "fftw") "/lib") + "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib") (string-append - "--with-fftw-incdir=" #$(this-package-input "fftw") "/include")))) + "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include")))) (inputs - `(("fftw" ,fftwf))) + (list fftwf)) (home-page "https://www.astromatic.net/software/skymaker") (synopsis "Astronomical image simulator") (description -- cgit 1.4.1 From 0cd3858d33f83364859276c171dc4746eeb5bbe8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 2 Jul 2023 02:00:02 +0200 Subject: gnu: skymaker: Update to 4.2.0-0.1a69c47. * gnu/packages/astronomy.scm (skymaker): Update to 4.2.0-0.1a69c47. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Remove upstreamed -fcommon work-around. [native-inputs]: Add autoconf, automake, libtool, and pkg-config. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 61 ++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3e5a227522..6126ac7f35 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -955,36 +955,43 @@ interactively in the plotting window.") (license license:gpl2+))) (define-public skymaker - (package - (name "skymaker") - (version "3.10.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/skymaker/" - "skymaker-" version ".tar.gz")) - (sha256 - (base32 "03zvx7c89plp9559niqv5532r233kza3ir992rg3nxjksqmrqvx1")))) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags - #~(list - "CPPFLAGS=-fcommon" ; fix build with GCC 10 - (string-append - "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib") - (string-append - "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include")))) - (inputs - (list fftwf)) - (home-page "https://www.astromatic.net/software/skymaker") - (synopsis "Astronomical image simulator") - (description - "SkyMaker is a program that simulates astronomical images. It accepts + ;; XXX: No version tag available in GitHub. + ;; See: https://github.com/astromatic/skymaker/issues/3 + (let ((commit "1a69c4716bdc9b5c6d4a917b0bc2dbd47635c459") + (revision "0")) + (package + (name "skymaker") + (version (git-version "4.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/skymaker") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vin4vgvcmqmwjdchsxnap374559rksz55xmaliawnl3qpzxn1nk")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + (string-append + "--with-fftw-libdir=" #$(this-package-input "fftwf") "/lib") + (string-append + "--with-fftw-incdir=" #$(this-package-input "fftwf") "/include")))) + (native-inputs + (list autoconf automake libtool pkg-config)) + (inputs + (list fftwf)) + (home-page "https://www.astromatic.net/software/skymaker") + (synopsis "Astronomical image simulator") + (description + "SkyMaker is a program that simulates astronomical images. It accepts object lists in ASCII generated by the Stuff program to produce realistic astronomical fields. SkyMaker is part of the EFIGI (@url{https://www.astromatic.net/projects/efigi}) development project.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public stackistry (package -- cgit 1.4.1 From ca7b387645dad3c94ce9af851ef067aa0dad5992 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:00 +0200 Subject: gnu: skymaker: Use @uref{}. * gnu/packages/astronomy.scm (skymaker)[description]: Use @uref{} over @url{}. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6126ac7f35..5d6707dab7 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -989,8 +989,8 @@ interactively in the plotting window.") (description "SkyMaker is a program that simulates astronomical images. It accepts object lists in ASCII generated by the Stuff program to produce realistic -astronomical fields. SkyMaker is part of the EFIGI -(@url{https://www.astromatic.net/projects/efigi}) development project.") +astronomical fields. SkyMaker is part of the +@uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.") (license license:gpl3+)))) (define-public stackistry -- cgit 1.4.1 From 22a1e419c1c7ec2d491b74ccc9a8bf828e3cce8e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:18 +0100 Subject: gnu: stuff: Update to 2.0.1. * gnu/packages/astronomy.scm (stuff): Update to 2.0.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf, automake, libtool, and pkg-config. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5d6707dab7..16bb27c87a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1125,15 +1125,21 @@ objects.") (define-public stuff (package (name "stuff") - (version "1.26.0") + (version "2.0.1") (source (origin - (method url-fetch) - (uri (string-append "https://www.astromatic.net/download/stuff/" - "stuff-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/astromatic/stuff") + ;; XXX: No version tag available in GitHub. + ;; See: https://github.com/astromatic/stuff/issues/6 + (commit "9008dc022ef53331092da248cf0a794abd6783bf"))) + (file-name (git-file-name name version)) (sha256 - (base32 "1syibi3b86z9pikhicvkkmgxm916j732fdiw0agw0lq6z13fdcjm")))) + (base32 "004sry5lqqm7s9x4l3agysp3n63y3ga35x1rwwda4m6dc6zvla6b")))) (build-system gnu-build-system) + (native-inputs + (list autoconf automake libtool pkg-config)) (home-page "https://www.astromatic.net/software/stuff") (synopsis "Astronomical catalogue simulation") (description -- cgit 1.4.1 From 3718307833758a2b22e7448494f629afbcf27ded Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 Jul 2023 02:00:01 +0200 Subject: gnu: stuff: Mark up description. * gnu/packages/astronomy.scm (stuff)[description]: Use @uref{}. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 16bb27c87a..28cd2e9088 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1145,8 +1145,8 @@ objects.") (description "Stuff is a program that simulates \"perfect\" astronomical catalogues. It generates object lists in ASCII which can read by the SkyMaker program to -produce realistic astronomical fields. Stuff is part of the EFIGI development -project.") +produce realistic astronomical fields. Stuff is part of the +@uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.") (license license:gpl3+))) (define-public swarp -- cgit 1.4.1 From d427792cc49bc42371b7ffdd3a87a6d297032ccd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:19 +0100 Subject: gnu: xplanet: Update package style. * gnu/packages/astronomy.scm (xplanet)[arguments]: Use G-expressions. Improve code style. [inputs]: Remove labels. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 28cd2e9088..c84afcd01d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2738,28 +2738,28 @@ R. Seaman's protocol} "xplanet-1.3.1-libimage_gif.c.patch" "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; No NASA JPL cspice support. + "--without-cspice" + (string-append "CPPFLAGS=-I" #$(this-package-input "netpbm") + "/include/netpbm")))) (native-inputs (list pkg-config)) (inputs - `(("libx11" ,libx11) - ("libxscrnsaver" ,libxscrnsaver) - ("libice" ,libice) - ("freetype" ,freetype) - ("pango" ,pango) - ("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("netpbm" ,netpbm) - ("zlib" ,zlib))) - (arguments - `(#:configure-flags - (let ((netpbm (assoc-ref %build-inputs "netpbm"))) - (append (list - ;; Give correct path for pnm.h header to configure script - (string-append "CPPFLAGS=-I" netpbm "/include/netpbm") - ;; no nasa jpl cspice support - "--without-cspice" ))))) + (list freetype + giflib + libice + libjpeg-turbo + libpng + libtiff + libx11 + libxscrnsaver + netpbm + pango + zlib)) (home-page "https://xplanet.sourceforge.net/") (synopsis "Planetary body renderer") (description -- cgit 1.4.1 From b74e3e037eae28b684e9d3c0463b75d5e7b778f7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Subject: gnu: celestia-gtk: Use PACKAGE/INHERIT. * gnu/packages/astronomy.scm (celestia-gtk): Use PACKAGE/INHERIT macro. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c84afcd01d..0362d9512f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1225,8 +1225,7 @@ accurately in real time at any rate desired.") (license license:gpl2+)))) (define-public celestia-gtk - (package - (inherit celestia) + (package/inherit celestia (name "celestia-gtk") (inputs (append (alist-delete "freeglut" (package-inputs celestia)) -- cgit 1.4.1 From 0e1c5a9d7d58ca24fb3e70793d225f6fff1c0ab5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Subject: gnu: celestia-gtk: Use G-expressions. * gnu/packages/astronomy.scm (celestia-gtk)[arguments]: Rewrite using G-expressions. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 0362d9512f..bb132059ec 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1232,7 +1232,10 @@ accurately in real time at any rate desired.") `(("gtk2" ,gtk+-2) ("gtkglext" ,gtkglext)))) (arguments - `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF") + (list + #:configure-flags + #~(list "-DENABLE_GTK=ON" + "-DENABLE_QT=OFF") #:tests? #f)))) (define-public python-astropy -- cgit 1.4.1 From b89850f60db655c0c778cd06769f825e503ee5bd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Subject: gnu: celestia-gtk: Use MODIFY-INPUTS. * gnu/packages/astronomy.scm (celestia-gtk)[inputs]: Rewrite using MODIFY-INPUTS. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index bb132059ec..95c9e5c459 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1228,9 +1228,9 @@ accurately in real time at any rate desired.") (package/inherit celestia (name "celestia-gtk") (inputs - (append (alist-delete "freeglut" (package-inputs celestia)) - `(("gtk2" ,gtk+-2) - ("gtkglext" ,gtkglext)))) + (modify-inputs (package-inputs celestia) + (replace "freeglut" gtk+-2) + (prepend gtkglext))) (arguments (list #:configure-flags -- cgit 1.4.1 From 60b5da172b45cb6f5a09c46da0fa78cc587af516 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:20 +0100 Subject: gnu: celestia: Remove input labels. * gnu/packages/astronomy.scm (celestia)[native-inputs, inputs]: Remove input labels. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 95c9e5c459..0068c9a018 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1190,24 +1190,21 @@ any arbitrary astrometric projection defined in the WCS standard.") "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78")))) (build-system cmake-build-system) (native-inputs - `(("perl" ,perl) - ("libgit2" ,libgit2) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool) - ("gettext" ,gettext-minimal))) + (list gettext-minimal + libgit2 + libtool + perl + pkg-config)) (inputs - `(("glu" ,glu) - ("glew" ,glew) - ("libtheora" ,libtheora) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ;; maybe required? - ("mesa" ,mesa) - ;; optional: fmtlib, Eigen3; - ("fmt" ,fmt-7) - ("eigen" ,eigen) - ;; glut: for glut interface - ("freeglut" ,freeglut))) + (list eigen + fmt-7 + freeglut + glew + glu + libjpeg-turbo + libpng + libtheora + mesa)) (propagated-inputs (list lua)) (arguments @@ -1224,6 +1221,7 @@ time. The position and movement of solar system objects is calculated accurately in real time at any rate desired.") (license license:gpl2+)))) + (define-public celestia-gtk (package/inherit celestia (name "celestia-gtk") -- cgit 1.4.1 From 26b43211b28a0f7c64e9d0a8c58e4dbbbd171150 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:20 +0100 Subject: gnu: celestia: Use G-expressions. * gnu/packages/astronomy.scm (celestia)[arguments]: Rewrite as G-expressions. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 0068c9a018..bd47775459 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1189,6 +1189,12 @@ any arbitrary astrometric projection defined in the WCS standard.") (base32 "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78")))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DENABLE_GLUT=ON" + "-DENABLE_QT=OFF") + #:tests? #f)) ; no tests (native-inputs (list gettext-minimal libgit2 @@ -1207,9 +1213,6 @@ any arbitrary astrometric projection defined in the WCS standard.") mesa)) (propagated-inputs (list lua)) - (arguments - `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF") - #:tests? #f)) ;no tests (home-page "https://celestia.space/") (synopsis "Real-time 3D visualization of space") (description -- cgit 1.4.1 From 8e9727e32cc9f8eea97be8384b197f82c62e3acf Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:20 +0100 Subject: gnu: celestia: Update to 1.6.3. * gnu/packages/astronomy.scm (celestia): Update to 1.6.3. [source]: Use Git tag. [build-system]: Switch to the GNU build system; CMake build files are gone. [arguments]: Adjust #:configure-flags accordingly. Add a new patch-lua-version phase. [native-inputs]: Add autoconf and automake. [inputs]: Remove eigen, fmt-7, and glew. * (celestia-gtk): Adjust accordingly. [inputs]: Add cairo, libxmu, libtheora, and pango-1.42. [arguments]: Use SUBSTITUTE-KEYWORD-ARGUMENTS and adjust #:configure-flags. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 117 +++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 51 deletions(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index bd47775459..865ea1387d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington -;;; Copyright © 2018–2022 Tobias Geerinckx-Rice +;;; Copyright © 2018–2023 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2019 by Amar Singh ;;; Copyright © 2020 R Veera Kumar @@ -1175,54 +1175,67 @@ any arbitrary astrometric projection defined in the WCS standard.") (license license:gpl3+))) (define-public celestia - (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce")) - (package - (name "celestia") - (version (git-version "1.6.1" "815" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/celestiaproject/celestia") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78")))) - (build-system cmake-build-system) - (arguments - (list - #:configure-flags - #~(list "-DENABLE_GLUT=ON" - "-DENABLE_QT=OFF") - #:tests? #f)) ; no tests - (native-inputs - (list gettext-minimal - libgit2 - libtool - perl - pkg-config)) - (inputs - (list eigen - fmt-7 - freeglut - glew - glu - libjpeg-turbo - libpng - libtheora - mesa)) - (propagated-inputs - (list lua)) - (home-page "https://celestia.space/") - (synopsis "Real-time 3D visualization of space") - (description - "This simulation program lets you explore our universe in three + (package + (name "celestia") + (version "1.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/celestiaproject/celestia") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dzci5n7gcnm1vq916gsn9zddkhbzhbsakqxrpnmvzibsqznn6c8")))) + (build-system gnu-build-system) + (arguments + (list + #:modules + `((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-71)) + #:configure-flags + #~(list "--with-glut" + (string-append "--with-lua=" #$(this-package-input "lua"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-lua-version + (lambda _ + (let* ((_ version (package-name->name+version + #$(this-package-input "lua"))) + (components (string-split version #\.)) + (major+minor (string-join (take components 2) "."))) + (substitute* "configure.ac" + (("lua5.3") + (string-append "lua-" major+minor))))))))) + (native-inputs + (list autoconf + automake + gettext-minimal + libgit2 + libtool + perl + pkg-config)) + (inputs + (list freeglut + glu + libjpeg-turbo + libpng + libtheora + mesa)) + (propagated-inputs + (list lua)) + (home-page "https://celestia.space/") + (synopsis "Real-time 3D visualization of space") + (description + "This simulation program lets you explore our universe in three dimensions. Celestia simulates many different types of celestial objects. From planets and moons to star clusters and galaxies, you can visit every object in the expandable database and view it from any point in space and time. The position and movement of solar system objects is calculated accurately in real time at any rate desired.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public celestia-gtk @@ -1231,13 +1244,15 @@ accurately in real time at any rate desired.") (inputs (modify-inputs (package-inputs celestia) (replace "freeglut" gtk+-2) - (prepend gtkglext))) - (arguments - (list - #:configure-flags - #~(list "-DENABLE_GTK=ON" - "-DENABLE_QT=OFF") - #:tests? #f)))) + (prepend cairo gtkglext libxmu libtheora pango-1.42))) + (arguments + (substitute-keyword-arguments (package-arguments celestia) + ((#:configure-flags flags '()) + #~(append #$flags + (list "--enable-cairo" + "--enable-theora" + "--without-glut" + "--with-gtk"))))))) (define-public python-astropy (package -- cgit 1.4.1 From e639d6998e8b7230a5a9ab196e24a802916b31ce Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Subject: gnu: celestia-gtk: Add custom synopsis. * (celestia-gtk)[synopsis]: Describe this GTK+ variant. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/astronomy.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/astronomy.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 865ea1387d..d3f3711bd1 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1252,7 +1252,8 @@ accurately in real time at any rate desired.") (list "--enable-cairo" "--enable-theora" "--without-glut" - "--with-gtk"))))))) + "--with-gtk"))))) + (synopsis "Real-time 3D visualization of space (using GTK+)"))) (define-public python-astropy (package -- cgit 1.4.1