[bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates.

[bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates.

[Sharlatan Hellseher]

Hi Guix,

The first update for this year including new packages, updates and refactoring
of exiting ones.

I'd like to highlight archived milestones:
* Each of disabled test has annotation
* All packages use G-Expression and no label style
* The number of packages using python-build-system reduced to 7
* Nearly all of the packages are on the latest upstream release versions
* There is non failing packages
* Number of packages are 107

In the next update cycle, I would add more new packages and update
python-astropy to the latest upstream release. Astropy v6.0.0 dropped support
for setup.py and now completely relies on pyproject.toml, which may require
additional work to build extensions. There is a known issue in the Python
community, which can be found at
https://github.com/pypa/setuptools/discussions/3388.

--8<---------------cut here---------------start------------->8---
libnova stackistry libpasastro python-stsynphot python-skyfield python-tweakwcs
python-synphot python-specutils python-dust-extinction python-ndcube
python-sunpy python-stcal python-pyvo python-drms python-crds libxisf gpredict
indi stellarium

/gnu/store/zqml8n4y02xrcmw01q8i06d46fddcrir-stellarium-23.4
/gnu/store/h497aylqnzrjpjz3lzafzxjaqi6fbwy5-indi-2.0.5
/gnu/store/ghi0f9bhx2wkp072jk4xz2lixbj26x4i-gpredict-2.2.1
/gnu/store/s0y47lhicvl476zy86rj5rnmzf0r37p3-libxisf-0.2.11
/gnu/store/148r3c1jrqgg8gshbm577q3gdmla0akg-python-crds-11.17.14
/gnu/store/aldzlx6w565l2adzs2632nlv4wlcxjx6-python-drms-0.7.1
/gnu/store/am0f5282zp58apvayy1jsqbqahk2vrh8-python-pyvo-1.5
/gnu/store/5himf99l9vhx6z0h39vdnsa5b92v1s3p-python-stcal-1.5.2
/gnu/store/rwfb964c13jlsqmm2v7g8rnx7djiigz7-python-sunpy-5.1.1
/gnu/store/yxzpzdvzi1p15pja4czfks1fjp7rylx2-python-ndcube-2.2.0
/gnu/store/xdbw1rinfvi8f5w37v6spav7g01wcv57-python-dust-extinction-1.3
/gnu/store/iyr84yl0bm287nfwhpjy8q9nvcc5d329-python-specutils-1.12.0
/gnu/store/2v7kh2c60gxj1anmn6b51mj3bdpnaqh1-python-synphot-1.3.0
/gnu/store/qf4k5699ff7fn94rh8wb7p124cnhdngx-python-tweakwcs-0.8.6
/gnu/store/lqpm8vb7mc0n1xln3ih3a6sjbvyw765c-python-skyfield-1.47
/gnu/store/kxaki362px06kkyl8d1nbd3gvyw5ryhq-python-stsynphot-1.3.0
/gnu/store/g1vkwl86rlk36kkghs9vgjygcxbjhz67-libpasastro-1.4.2
/gnu/store/8fmrj122s2gs4b3vzxr6zn9m8dzzqcj7-stackistry-0.3.0
/gnu/store/vwsjcr1pmbfkqx67mwpbb5kprhs576rj-libnova-0.16
--8<---------------cut here---------------end--------------->8---


Building the following 8 packages would ensure 57 dependent packages are
rebuilt: indi@2.0.5 phd2@2.6.12 stellarium@23.4 xygrib@1.2.6.1
python-cesium@0.12.1 python-astroalign@2.5.1 python-poliastro@0.17.0
python-jwst@1.12.5

--8<---------------cut here---------------start------------->8---
/gnu/store/b865hysxypywkjp56h5g9v5fd64bxcmc-python-jwst-1.12.5
/gnu/store/r93h0ciq8h643rzikgsszgpaba348v0w-python-poliastro-0.17.0
/gnu/store/5y1kdnhjia4icpklbxx06kcwql2ryr50-python-astroalign-2.5.1
/gnu/store/s46jrzyrk3h7zvdg43wmpivyzwrzqf4i-python-cesium-0.12.1
/gnu/store/bcdmgdd1darhlwbchybc0fbhhd7il5j3-xygrib-1.2.6.1
/gnu/store/zqml8n4y02xrcmw01q8i06d46fddcrir-stellarium-23.4
/gnu/store/m5bbkyaz2ndgq3qqw3g65zjxa66wqfi3-phd2-2.6.12
/gnu/store/h497aylqnzrjpjz3lzafzxjaqi6fbwy5-indi-2.0.5
--8<---------------cut here---------------end--------------->8---

Sharlatan Hellseher (19):
  gnu: stellarium: Update to 23.4.
  gnu: indi-2.0: Update to 2.0.5.
  gnu: gpredict: Update home-page and description.
  gnu: libxisf: Update to 0.2.11.
  gnu: python-crds: Update to 11.17.14.
  gnu: python-drms: Update to 0.7.1.
  gnu: python-pyvo: Update to 1.5.
  gnu: python-stcal: Update to 1.5.2.
  gnu: python-sunpy: Update to 5.1.1.
  gnu: Add python-ndcube.
  gnu: Add python-dust-extinction.
  gnu: Add python-specutils.
  gnu: python-synphot: Enable more options.
  gnu: python-tweakwcs: Update to 0.8.6.
  gnu: python-skyfield: Update to 1.47.
  gnu: python-stsynphot: Fix build.
  gnu: libpasastro: Use G-Expressions.
  gnu: stackistry: Use G-Expressions.
  gnu: libnova: Use G-Expressions.

 gnu/packages/astronomy.scm | 398 ++++++++++++++++++++++++++-----------
 1 file changed, 281 insertions(+), 117 deletions(-)


base-commit: 121de47decc1029c06f6e46e5f06d7fefe8e85ec
-- 
2.41.0

[bug#68641] [PATCH 01/19] gnu: stellarium: Update to 23.4.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (stellarium): Update to 23.4.
[inputs]: Add nlopt.

Change-Id: Id205ad84ff75a687f6c1fdababcf3040c0c55abd
---
 gnu/packages/astronomy.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 1e2c3f8caa..88c68db56c 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1277,7 +1277,7 @@ (define-public stackistry
 (define-public stellarium
   (package
     (name "stellarium")
-    (version "23.3")
+    (version "23.4")
     (source
      (origin
        (method git-fetch)
@@ -1286,7 +1286,7 @@ (define-public stellarium
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "15kl8kn5fmmppbm93w5ki7lpjn09lhyhn245v3jc335xifcwd2vd"))))
+        (base32 "11l3lql3cxj7s7q7n74qd4rhbjy374b4c0lpm0dr8s85mfrq6fmc"))))
     (build-system cmake-build-system)
     ;; TODO: Complete documentation build and split into dedicated outputs.
     (arguments
@@ -1312,6 +1312,7 @@ (define-public stellarium
            gpsd
            indi
            libnova
+           nlopt
            openssl
            qtbase-5
            qtcharts
-- 
2.41.0

[bug#68641] [PATCH 02/19] gnu: indi-2.0: Update to 2.0.5.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (indi-2.0): Update to 2.0.5.

Change-Id: I9cea7e7d11af5a142066f11a2185eb826570afb5
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 88c68db56c..ab7663d7f5 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3307,7 +3307,7 @@ (define-public imppg
 (define-public indi-2.0
   (package
     (name "indi")
-    (version "2.0.4")
+    (version "2.0.5")
     (source
      (origin
        (method git-fetch)
@@ -3316,7 +3316,7 @@ (define-public indi-2.0
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1pp72bqxrvdij47fqfrnyxwqw1w8prxvs1igjsazcw8ncbrdbbjc"))))
+        (base32 "1lmp5p1rsckb8j44g34wxpyjzzy2ff78llxyc84pv5xs9pay6p4z"))))
     (build-system cmake-build-system)
     (arguments
      ;; TODO: fix failing tests on aarch64-system.
-- 
2.41.0

[bug#68641] [PATCH 03/19] gnu: gpredict: Update home-page and description.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (gpredict)[home-page]: Update it according
to project's README.
[description]: Add feature detailed list.

Change-Id: If5edc6e50796c7753ac47fac082c267145723361
---
 gnu/packages/astronomy.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index ab7663d7f5..47fc3c8fd9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3196,6 +3196,8 @@ (define-public xplanet
     (license license:gpl2+)))
 
 (define-public gpredict
+  ;; The latest tag, 2.3, has no major difference with 2.2.1 and is dated for
+  ;; 2018. Additionally, there is some activity on the master branch.
   (package
     (name "gpredict")
     (version "2.2.1")
@@ -3222,14 +3224,32 @@ (define-public gpredict
      (list gettext-minimal intltool pkg-config))
     (inputs
      (list curl glib goocanvas gtk+))
-    (home-page "http://gpredict.oz9aec.net/index.php")
+    (home-page "https://oz9aec.dk/gpredict/")
     (synopsis "Satellite tracking and orbit prediction application")
     (description
      "Gpredict is a real-time satellite tracking and orbit prediction
 application.  It can track a large number of satellites and display their
 position and other data in lists, tables, maps, and polar plots (radar view).
 Gpredict can also predict the time of future passes for a satellite, and
-provide you with detailed information about each pass.")
+provide you with detailed information about each pass.
+
+Some core features of Gpredict include:
+
+@itemize
+@item Tracking of a large number of satellites only limited by the physical
+memory and processing power of the computer
+@item Display the tracking data in lists, maps, polar plots and any
+combination of these
+@item Have many modules open at the same either in a notebook or in their own
+windows.  The modules can also run in full-screen mode
+@item You can use many ground stations
+@item Predict upcoming passes
+@item Gpredict can run in real-time, simulated real-time (fast forward and
+backward), and manual time control
+@item Detailed information both the real time and non-real time modes
+@item Doppler tuning of radios via Hamlib rigctld
+@item Antenna rotator control via Hamlib rotctld
+@end itemize")
     (license license:gpl2+)))
 
 (define-public sgp4
-- 
2.41.0

[bug#68641] [PATCH 04/19] gnu: libxisf: Update to 0.2.11.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (libxisf): Update to 0.2.11.

Change-Id: I79242d42af3db660c46be0baf05e11ea7ac680f7
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 47fc3c8fd9..85116abcce 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3080,7 +3080,7 @@ (define-public libpasastro
 (define-public libxisf
   (package
     (name "libxisf")
-    (version "0.2.10")
+    (version "0.2.11")
     (source
      (origin
        (method git-fetch)
@@ -3089,7 +3089,7 @@ (define-public libxisf
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0q5qipn8887yhrk9pmi4fksxxmqas3w2aw2p194yhzkjapxk2k9h"))))
+        (base32 "02lnlsdg7f6pbcfk9amzh2k42wsb19d97yp2jq122lzivx9inwn1"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DUSE_BUNDLED_LIBS=OFF")))
-- 
2.41.0

[bug#68641] [PATCH 05/19] gnu: python-crds: Update to 11.17.14.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-crds): Update to 11.17.14.
[description]: Indent it and apply TexInfo style on URLs.

Change-Id: Icd298578cf685cfbc454d5b16b9f89c6d050b93a
---
 gnu/packages/astronomy.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 85116abcce..88d6129de5 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1859,13 +1859,13 @@ (define-public python-cdflib
 (define-public python-crds
   (package
     (name "python-crds")
-    (version "11.17.13")
+    (version "11.17.14")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "crds" version))
               (sha256
                (base32
-                "0jcvyiq3z2kbd8g33gk5r99rvhn9i50lz7ngqibdafh390dz5zhc"))))
+                "1z9lrwrb07s9kn28nammjx75qb0ky7srd9i40dnkmm9zsaqz5jfm"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -1897,14 +1897,14 @@ (define-public python-crds
     (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.")
+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 @url{http://hst-crds.stsci.edu} or
+@url{https://jwst-crds.stsci.edu/} which record information about reference
+files and provide related services.")
     (license license:bsd-3)))
 
 (define-public python-czml3
-- 
2.41.0

[bug#68641] [PATCH 06/19] gnu: python-drms: Update to 0.7.1.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-drms): Update to 0.7.1.

Change-Id: I3744efa8c87db7fcb743bf8dca4ec6a437a82951
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 88d6129de5..147af695be 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1941,13 +1941,13 @@ (define-public python-czml3
 (define-public python-drms
   (package
     (name "python-drms")
-    (version "0.7.0")
+    (version "0.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "drms" version))
        (sha256
-        (base32 "0smc39nndxqbznjcpnylsag1sc2ksfjhxh4dwiqbki8q6v5ahx84"))))
+        (base32 "01q00zwpbhik9lgbc42z6q791ybxc41rxgrj04fpcfkl3hcl0nyr"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-astropy
-- 
2.41.0

[bug#68641] [PATCH 07/19] gnu: python-pyvo: Update to 1.5.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-pyvo): Update to 1.5.
[propagated-inputs]: Remove python-mimeparse.

Change-Id: I4d3e19b95c034cf3c82cec55a198d9a927934971
---
 gnu/packages/astronomy.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 147af695be..4c867aa66a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2282,18 +2282,18 @@ (define-public python-pyavm
 (define-public python-pyvo
   (package
     (name "python-pyvo")
-    (version "1.4.2")
+    (version "1.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyvo" version))
        (sha256
-        (base32 "1jwmgpavw80mf9sigfz5p2cqh6vz5mvm11ziqmdp5zdccn42kzk6"))))
+        (base32 "1kyd4jbspldfpwwvwxfmhq2cxqp4kfbcsiyk4gjs0ib65idxdr45"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest-astropy python-requests-mock python-setuptools-scm))
     (propagated-inputs
-     (list python-astropy python-mimeparse python-pillow python-requests))
+     (list python-astropy python-pillow python-requests))
     (home-page "https://github.com/astropy/pyvo")
     (synopsis "Access Virtual Observatory data and services")
     (description
-- 
2.41.0

[bug#68641] [PATCH 08/19] gnu: python-stcal: Update to 1.5.2.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-stcal): Update to 1.5.2.
[propagated-inputs]: Add python-asdf-3.0 and python-gwcs.
[native-inputs]: Remove python-cython; add python-cython-3 and python-semantic-version.

Change-Id: I8b6a90a3c0b75ee43de4c7069950a4f9578ea825
---
 gnu/packages/astronomy.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 4c867aa66a..ce84b50e54 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2775,13 +2775,13 @@ (define-public python-stsci-stimage
 (define-public python-stcal
   (package
     (name "python-stcal")
-    (version "1.4.4")
+    (version "1.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "stcal" version))
        (sha256
-        (base32 "031ldihdmsdrwz4wl49bfk2bxmzbp1i3kidrw46xz936765zmnc0"))))
+        (base32 "0r1a9f476f8ivhrwbcny3rnj9s4plaps6p36c22w73g546d476b7"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -2796,16 +2796,19 @@ (define-public python-stcal
               (invoke "python" "setup.py" "build_ext" "--inplace"))))))
     (propagated-inputs
      (list opencv ;Provides OpenCV-Python
+           python-asdf-3.0
            python-astropy
+           python-gwcs
            python-numpy
            python-scipy))
     (native-inputs
-     (list python-cython
+     (list python-cython-3
            python-psutil
            python-pytest
            python-pytest-cov
            python-pytest-doctestplus
            python-pytest-openfiles
+           python-semantic-version
            python-setuptools-scm))
     (home-page "https://github.com/spacetelescope/stcal")
     (synopsis "STScI tools and algorithms used in calibration pipelines")
-- 
2.41.0

[bug#68641] [PATCH 09/19] gnu: python-sunpy: Update to 5.1.1.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-sunpy): Update to 5.1.1.
[arguments]<#:test-flags>: Ignore test_spice.py as SpicePy is not packed
yet and python-spicepy is optional.
<#:phases>{prepare-test-environment}: Add pytest.ini configuration file
to fix tests.

Change-Id: Icfb05ce29b376a05291e9f7020170e389d0081d2
---
 gnu/packages/astronomy.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index ce84b50e54..d757fc75d9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2440,13 +2440,13 @@ (define-public python-sgp4
 (define-public python-sunpy
   (package
     (name "python-sunpy")
-    (version "5.0.1")
+    (version "5.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "sunpy" version))
        (sha256
-        (base32 "1r4phc91k527kvpa2jd1d417x97wqyrm3ydayr9hshwz1k5v5ngf"))))
+        (base32 "07rfdj4v29kcb718sgjfsagazvnl11r01ciqjvazr5x3yadfqrwk"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -2456,7 +2456,9 @@ (define-public python-sunpy
                     ;; It struggles to find python-opencsv package info with
                     ;; 'importlib.metadata'
                     "not test_main_nonexisting_module"
-                    " and not test_main_stdlib_module"))
+                    " and not test_main_stdlib_module")
+              ;; Requries SpicePy not packed in Guix yet.
+              "--ignore=sunpy/coordinates/tests/test_spice.py")
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'install 'writable-compiler
@@ -2464,7 +2466,11 @@ (define-public python-sunpy
               (make-file-writable "sunpy/_compiler.c")))
           (add-before 'check 'prepare-test-environment
             (lambda _
-              (setenv "HOME" "/tmp"))))))
+              (setenv "HOME" "/tmp")
+              (call-with-output-file "pytest.ini"
+                (lambda (port)
+                  (format port "[pytest]
+python_files = test_*.py"))))))))
     (native-inputs
      (list opencv ; For tests, includes OpenCV-Python
            python-aiohttp
@@ -2501,6 +2507,7 @@ (define-public python-sunpy
            python-scikit-image
            python-scipy
            python-semantic-version
+           ;; python-spiceypy ; Not packed yet in Guix, long jorney.
            python-sqlalchemy
            python-tqdm
            python-zeep))
-- 
2.41.0

[bug#68641] [PATCH 10/19] gnu: Add python-ndcube.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-ndcube): New variable.

Change-Id: I94087c7e02ca678531bcbf4eb3d035e2647768fd
---
 gnu/packages/astronomy.scm | 49 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index d757fc75d9..1a11aac534 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2076,6 +2076,55 @@ (define-public python-mpl-animators
 the easy construction of interactive matplotlib widget based animations.")
     (license license:bsd-3)))
 
+(define-public python-ndcube
+  (package
+    (name "python-ndcube")
+    (version "2.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ndcube" version))
+       (sha256
+        (base32 "1b3vbnm438j5jb48vilp145lq137fbrg1l4845rc55mz2p025x34"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-home-env
+            (lambda _
+              ;; Tests require HOME to be set.
+              ;;  Permission denied: '/homeless-shelter'
+              (setenv "HOME" "/tmp"))))))
+    (propagated-inputs
+     (list python-astropy
+           python-gwcs
+           python-matplotlib
+           python-mpl-animators
+           python-numpy
+           python-reproject))
+    (native-inputs
+     (list python-dask
+           python-pytest
+           python-pytest-astropy
+           python-pytest-mpl
+           python-scipy
+           python-setuptools-scm
+           python-sunpy))
+    (home-page "https://docs.sunpy.org/projects/ndcube/")
+    (synopsis "Multi-dimensional contiguous and non-contiguous coordinate aware arrays")
+    (description
+     "@code{ndcube} is a package for manipulating, inspecting and visualizing
+multi-dimensional contiguous and non-contiguous coordinate-aware data arrays.
+
+It combines data, uncertainties, units, metadata, masking, and coordinate
+transformations into classes with unified slicing and generic coordinate
+transformations and plotting/animation capabilities.  It is designed to handle
+data of any number of dimensions and axis types (e.g. spatial, temporal,
+spectral, etc.) whose relationship between the array elements and the real world
+can be described by @acronym{WCS, World Coordinate System} translations.")
+    (license license:bsd-2)))
+
 (define-public python-photutils
   (package
     (name "python-photutils")
-- 
2.41.0

[bug#68641] [PATCH 11/19] gnu: Add python-dust-extinction.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-dust-extinction): New variable.

Change-Id: I6fecfede0c347d032555b8f81bcf4f7072fc1129
---
 gnu/packages/astronomy.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 1a11aac534..c5e7da59f9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2006,6 +2006,28 @@ (define-public python-drizzle
 code to be greatly simplified.")
     (license license:bsd-3)))
 
+(define-public python-dust-extinction
+  (package
+    (name "python-dust-extinction")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "dust_extinction" version))
+       (sha256
+        (base32 "14zy6kyrfi4ash7qg1k3im1zzgr2r7rnaggzk0ar3jlfmsii743k"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs
+     (list python-astropy python-scipy))
+    (native-inputs
+     (list python-pytest-astropy))
+    (home-page "http://dust-extinction.readthedocs.io/")
+    (synopsis "Interstellar Dust Extinction Models")
+    (description
+     "This package provides astronomical interstellar dust extinction curves
+implemented using the astropy.modeling framework.")
+    (license license:bsd-3)))
+
 (define-public python-ephem
   (package
     (name "python-ephem")
-- 
2.41.0

[bug#68641] [PATCH 12/19] gnu: Add python-specutils.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-specutils): New variable.

Change-Id: Id109b9b1c385b7fe3ff9a3a5406d1930c8ff1ffb
---
 gnu/packages/astronomy.scm | 49 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c5e7da59f9..7e1dd3ed82 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2704,6 +2704,55 @@ (define-public python-spectral-cube
 @end itemize")
     (license license:bsd-3)))
 
+(define-public python-specutils
+  (package
+    (name "python-specutils")
+    (version "1.12.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "specutils" version))
+       (sha256
+        (base32 "10nq00q71cyj0p74g3kyzb4hrwkbvhsd6m5zvxifc035rfnvc2qv"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; Disabling test requiring access to download
+      ;; https://datacenter.iers.org/data/9/finals2000A.all
+      ;; XXX: Check if test data may be packed as stand along package.
+      #:test-flags #~(list "-k" "not test_create_spectral_axis")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-home-env
+            (lambda _
+              ;; Tests require HOME to be set.
+              ;;  Permission denied: '/homeless-shelter'
+              (setenv "HOME" "/tmp"))))))
+    (propagated-inputs
+     (list ;; python-stdatamodels ; cycle with python-synphot, optional.
+           python-asdf
+           python-asdf-astropy
+           python-gwcs
+           python-ndcube
+           python-numpy
+           python-scipy))
+    (native-inputs
+     (list python-matplotlib
+           python-pytest-astropy
+           python-semantic-version
+           python-setuptools-scm
+           python-spectral-cube))
+    (home-page "https://specutils.readthedocs.io/")
+    (synopsis "Package for spectroscopic astronomical data")
+    (description
+     "@code{specutils} is a Python package for representing, loading, manipulating,
+and analyzing astronomical spectroscopic data.  The generic data containers and
+accompanying modules provide a toolbox that the astronomical community can use
+to build more domain-specific packages.  For more details about the underlying
+principles,
+see @url{https://github.com/astropy/astropy-APEs/blob/main/APE13.rst, APE13}.")
+    (license license:bsd-3)))
+
 (define-public python-spherical-geometry
   (package
     (name "python-spherical-geometry")
-- 
2.41.0

[bug#68641] [PATCH 12/19] gnu: Add python-specutils.

[Maxim Cournoyer]

Hi,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> * gnu/packages/astronomy.scm (python-specutils): New variable.
>
> Change-Id: Id109b9b1c385b7fe3ff9a3a5406d1930c8ff1ffb
> ---
>  gnu/packages/astronomy.scm | 49 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)
>
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index c5e7da59f9..7e1dd3ed82 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -2704,6 +2704,55 @@ (define-public python-spectral-cube
>  @end itemize")
>      (license license:bsd-3)))
>  
> +(define-public python-specutils
> +  (package
> +    (name "python-specutils")
> +    (version "1.12.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "specutils" version))
> +       (sha256
> +        (base32 "10nq00q71cyj0p74g3kyzb4hrwkbvhsd6m5zvxifc035rfnvc2qv"))))
> +    (build-system pyproject-build-system)
> +    (arguments
> +     (list
> +      ;; Disabling test requiring access to download
> +      ;; https://datacenter.iers.org/data/9/finals2000A.all

If you enclose the URL between < > to distinguish it from the rest of
the text, you can then add a trailing '.' to the end of the comment.

> +      ;; XXX: Check if test data may be packed as stand along package.

typo: standalone.

-- 
Thanks,
Maxim

[bug#68641] [PATCH 13/19] gnu: python-synphot: Enable more options.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-synphot)[propagated-inputs]: Add
python-dust-extinction and python-specutils. Sort alphabetically.
[native-inputs]: Add python-semantic-version.

Change-Id: If4dbcf2765508d7c7e2b7580193367ed2d038b6f
---
 gnu/packages/astronomy.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 7e1dd3ed82..8263d2d954 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3945,14 +3945,15 @@ (define-public python-synphot
                   (format port "[pytest]
 python_files = test_*.py"))))))))
     (propagated-inputs
-     (list ;; python-dust-extinction ; XXX: Not packed yet, optional.
-           ;; python-specutils       ; XXX: Not packed yet, optional.
-           python-astropy
+     (list python-astropy
+           python-dust-extinction
            python-numpy
-           python-scipy))
+           python-scipy
+           python-specutils ))
     (native-inputs
      (list python-pytest
            python-pytest-astropy
+           python-semantic-version
            python-setuptools-scm))
     (home-page "https://github.com/spacetelescope/synphot_refactor")
     (synopsis "Synthetic photometry using Astropy")
-- 
2.41.0

[bug#68641] [PATCH 13/19] gnu: python-synphot: Enable more options.

[Maxim Cournoyer]

Hello,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> * gnu/packages/astronomy.scm (python-synphot)[propagated-inputs]: Add

nitpick: Reading the modern 'standards' info manual, they suggest to use
space between e.g. (variable) [conditional] <what>

-- 
Thanks,
Maxim

[bug#68641] [PATCH 14/19] gnu: python-tweakwcs: Update to 0.8.6.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-tweakwcs): Update to 0.8.6.

Change-Id: Icfbb7680a5e208d68f5b8da3fa3fdd35a358ecf5
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 8263d2d954..13046f700a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3966,13 +3966,13 @@ (define-public python-synphot
 (define-public python-tweakwcs
   (package
     (name "python-tweakwcs")
-    (version "0.8.5")
+    (version "0.8.6")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "tweakwcs" version))
               (sha256
                (base32
-                "15gc2rc2isx3va6wbn4k1hi5qh49gq15cgbb2qqkbznd7f7d5ifv"))))
+                "1j75i02xzd36gp7pf6gks6nmp4ivi9cbphya4l69py5p62iaab99"))))
     (build-system pyproject-build-system)
     (propagated-inputs (list python-astropy
                              python-gwcs
-- 
2.41.0

[bug#68641] [PATCH 15/19] gnu: python-skyfield: Update to 1.47.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-skyfield): Update to 1.47.
[inputs]: Remove python-certifi, python-jplephem, python-numpy, and python-sgp4.
[propagated-inputs]: Add python-certifi, python-jplephem, python-numpy, and python-sgp4.

Change-Id: If5a9a47077edcebe83449c4c54a49189dea61c5a
---
 gnu/packages/astronomy.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 13046f700a..5adba72439 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -4485,20 +4485,23 @@ (define-public python-astroalign
 (define-public python-skyfield
   (package
     (name "python-skyfield")
-    (version "1.46")
+    (version "1.47")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "skyfield" version))
        (sha256
-        (base32 "1r4kpsh1pa4h3diyxy3gyapp0rykfjdqmn5w348a2ck2qkdlx997"))))
+        (base32 "0272pwk88csmrrl44fc4l52agd68pkg4zbmdhs7gliq5q9wf3hrs"))))
     (build-system python-build-system)
     (arguments
-     ;; NOTE: (Sharlatan-20210207T163305+0000): tests depend on custom test
-     ;; framework https://github.com/brandon-rhodes/assay
+     ;; XXX: Tests depend on custom test framework
+     ;; https://github.com/brandon-rhodes/assay
      `(#:tests? #f))
-    (inputs
-     (list python-certifi python-jplephem python-numpy python-sgp4))
+    (propagated-inputs
+     (list python-certifi
+           python-jplephem
+           python-numpy
+           python-sgp4))
     (home-page "https://rhodesmill.org/skyfield/")
     (synopsis "Astronomy for Python")
     (description
-- 
2.41.0

[bug#68641] [PATCH 16/19] gnu: python-stsynphot: Fix build.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (python-stsynphot): Fix build.
[native-inputs]: Add python-semantic-version.

Change-Id: I72b086c6a0461293c2191e39e25b3c803279bf60
---
 gnu/packages/astronomy.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 5adba72439..dd7473df49 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3036,8 +3036,11 @@ (define-public python-stsynphot
                              python-numpy
                              python-scipy
                              python-synphot))
-    (native-inputs (list python-pytest python-pytest-astropy
-                         python-pytest-astropy-header python-setuptools-scm))
+    (native-inputs (list python-pytest
+                         python-pytest-astropy
+                         python-pytest-astropy-header
+                         python-semantic-version
+                         python-setuptools-scm))
     (home-page "https://github.com/spacetelescope/stsynphot_refactor")
     (synopsis "Synthetic photometry using Astropy for HST and JWST")
     (description
-- 
2.41.0

[bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (libpasastro):
[supported-systems]: Add it.
[arguments]: Rewrite using G-expressions.
[description]; Remove trailing \n.

Change-Id: Ic0e79394be1110566f5481963fdd167985c1a770
---
 gnu/packages/astronomy.scm | 41 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index dd7473df49..c049e6e67f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3179,23 +3179,30 @@ (define-public libpasastro
        (sha256
         (base32 "1na3gyb3nzb5gdgccs1653j2gnz6w3v1mqzhyhkx3yqw8bs3q5x0"))))
     (build-system gnu-build-system)
+    (supported-systems '("i686-linux" "x86_64-linux"
+                         "armhf-linux" "aarch64-linux"))
     (arguments
-     `(#:tests? #f
-       #:make-flags
-       (list
-        ,(match (or (%current-target-system) (%current-system))
-           ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")
-            "OS_TARGET=linux")
-           (_ #f))
-        ,(match (or (%current-target-system) (%current-system))
-           ("i686-linux" "CPU_TARGET=i386")
-           ("x86_64-linux" "CPU_TARGET=x86_64")
-           ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l")
-           (_ #f))
-        (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list
+      #:tests? #f ; no tests provided
+      #:make-flags
+      #~(list
+         ;; Keep OS detection for the case when Hurd would be suitable to try.
+         #$@(if (target-linux?) '("OS_TARGET=linux") '())
+         ;; Enable buildtime CPU detection where supported,
+         ;; and set a suitable CPU target variable.
+         #$@(match (or (%current-target-system)
+                       (%current-system))
+              ("i686-linux"
+               '("CPU_TARGET=i386"))
+              ("x86_64-linux"
+               '("CPU_TARGET=x86_64"))
+              ((or "armhf-linux" "aarch64-linux")
+               '("CPU_TARGET=armv7l"))
+              (_ '()))
+         (string-append "PREFIX=" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure))))
     (home-page "https://github.com/pchev/libpasastro")
     (synopsis "Interface to astronomy library for use from Pascal program")
     (description
@@ -3207,7 +3214,7 @@ (define-public libpasastro
 @item @code{libpasplan404.so}: Interface with Plan404 to compute planets position.
 @item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS.
 @item @code{libpasspice.so}: To work with NAIF/SPICE kernel.
-@end itemize\n")
+@end itemize")
       (license license:gpl2+)))
 
 (define-public libxisf
-- 
2.41.0

[bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 4060 bytes --]

$ file /gnu/store/qb3jlcb068iv6fz1sqypr12zrcxgi6aq-libpasastro-1.4.2/lib/libpasgetdss.so.1.1
/gnu/store/qb3jlcb068iv6fz1sqypr12zrcxgi6aq-libpasastro-1.4.2/lib/libpasgetdss.so.1.1: ELF 64-bit LSB shared object, UCB RISC-V, RVC, double-float ABI, version 1 (SYSV), dynamically linked, stripped

This package compiles just fine for riscv64 so there's no reason to
limit it to only certain architectures.

On Sun, Jan 21, 2024 at 04:53:57PM +0000, Sharlatan Hellseher wrote:
> * gnu/packages/astronomy.scm (libpasastro):
> [supported-systems]: Add it.
> [arguments]: Rewrite using G-expressions.
> [description]; Remove trailing \n.
> 
> Change-Id: Ic0e79394be1110566f5481963fdd167985c1a770
> ---
>  gnu/packages/astronomy.scm | 41 ++++++++++++++++++++++----------------
>  1 file changed, 24 insertions(+), 17 deletions(-)
> 
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index dd7473df49..c049e6e67f 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -3179,23 +3179,30 @@ (define-public libpasastro
>         (sha256
>          (base32 "1na3gyb3nzb5gdgccs1653j2gnz6w3v1mqzhyhkx3yqw8bs3q5x0"))))
>      (build-system gnu-build-system)
> +    (supported-systems '("i686-linux" "x86_64-linux"
> +                         "armhf-linux" "aarch64-linux"))
>      (arguments
> -     `(#:tests? #f
> -       #:make-flags
> -       (list
> -        ,(match (or (%current-target-system) (%current-system))
> -           ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")
> -            "OS_TARGET=linux")
> -           (_ #f))
> -        ,(match (or (%current-target-system) (%current-system))
> -           ("i686-linux" "CPU_TARGET=i386")
> -           ("x86_64-linux" "CPU_TARGET=x86_64")
> -           ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l")
> -           (_ #f))
> -        (string-append "PREFIX=" (assoc-ref %outputs "out")))
> -       #:phases
> -       (modify-phases %standard-phases
> -         (delete 'configure))))
> +     (list
> +      #:tests? #f ; no tests provided
> +      #:make-flags
> +      #~(list
> +         ;; Keep OS detection for the case when Hurd would be suitable to try.
> +         #$@(if (target-linux?) '("OS_TARGET=linux") '())
> +         ;; Enable buildtime CPU detection where supported,
> +         ;; and set a suitable CPU target variable.

(%current-target-system) returns i686-linux-gnu for the first one, so
it'd probably be better to use cond and (target-x86-32?) for the first
one.

I'm not actually convinced you need any of the flags for OS_TARGET or
CPU_TARGET (except perhaps for cross-compiling), does it make a
difference between compiled with or without?

> +         #$@(match (or (%current-target-system)
> +                       (%current-system))
> +              ("i686-linux"
> +               '("CPU_TARGET=i386"))
> +              ("x86_64-linux"
> +               '("CPU_TARGET=x86_64"))
> +              ((or "armhf-linux" "aarch64-linux")
> +               '("CPU_TARGET=armv7l"))
> +              (_ '()))
> +         (string-append "PREFIX=" #$output))
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (delete 'configure))))
>      (home-page "https://github.com/pchev/libpasastro")
>      (synopsis "Interface to astronomy library for use from Pascal program")
>      (description
> @@ -3207,7 +3214,7 @@ (define-public libpasastro
>  @item @code{libpasplan404.so}: Interface with Plan404 to compute planets position.
>  @item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS.
>  @item @code{libpasspice.so}: To work with NAIF/SPICE kernel.
> -@end itemize\n")
> +@end itemize")
>        (license license:gpl2+)))
>  
>  (define-public libxisf
> -- 
> 2.41.0
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#68641] [PATCH 18/19] gnu: stackistry: Use G-Expressions.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (stackistry): Update package style by using
G-Expressions. Apply indention.
[arguments]<#:tests?>: Use it instead of deleting check phase.
<#:phases>: Remove trailing #f from each lambda.

Change-Id: I30f3906719713f0d47dc2049564bc2691ba3cd5d
---
 gnu/packages/astronomy.scm | 79 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c049e6e67f..99b22fa39e 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1227,52 +1227,51 @@ (define-public stackistry
         (base32 "0rz29v33n0x0k40hv3v79ym5ylch1v0pbph4i21809gz2al5p7dq"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list
-        (string-append
-         "SKRY_INCLUDE_PATH=" (assoc-ref %build-inputs "libskry") "/include")
-        (string-append
-         "SKRY_LIB_PATH=-L" (assoc-ref %build-inputs "libskry") "/lib")
-        (string-append
-         "LIBAV_INCLUDE_PATH=" (assoc-ref %build-inputs "ffmpeg") "/include"))
-       #:phases
-       (modify-phases %standard-phases
-         ;; no configure and tests are provided
-         (delete 'configure)
-         (delete 'check)
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "src/main.cpp"
-               (("\"\\.\\.\", \"lang\"")
-                "\"../share/stackistry\", \"lang\""))
-             (substitute* "src/utils.cpp"
-               (("\"\\.\\.\", \"icons\"")
-                "\"../share/stackistry\", \"icons\""))
-             #t))
-         (replace 'install
-           ;; The Makefile lacks an ‘install’ target.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (icons (string-append out "/share/stackistry/icons"))
-                    (lang (string-append out "/share/stackistry/lang")))
-               (copy-recursively "bin" bin)
-               (copy-recursively "icons" icons)
-               (copy-recursively "lang" lang))
-             #t)))))
+     (list
+      #:tests? #f ; No test target
+      #:make-flags
+      #~(list
+         (string-append
+          "SKRY_INCLUDE_PATH=" #$(this-package-input "libskry") "/include")
+         (string-append
+          "SKRY_LIB_PATH=-L" #$(this-package-input "libskry") "/lib")
+         (string-append
+          "LIBAV_INCLUDE_PATH=" #$(this-package-input "ffmpeg") "/include"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; no configure and tests are provided
+          (delete 'configure)
+          (add-after 'unpack 'fix-paths
+            (lambda _
+              (substitute* "src/main.cpp"
+                (("\"\\.\\.\", \"lang\"")
+                 "\"../share/stackistry\", \"lang\""))
+              (substitute* "src/utils.cpp"
+                (("\"\\.\\.\", \"icons\"")
+                 "\"../share/stackistry\", \"icons\""))))
+          (replace 'install
+            ;; The Makefile lacks an ‘install’ target.
+            (lambda _
+              (let* ((out #$output)
+                     (bin (string-append out "/bin"))
+                     (icons (string-append out "/share/stackistry/icons"))
+                     (lang (string-append out "/share/stackistry/lang")))
+                (copy-recursively "bin" bin)
+                (copy-recursively "icons" icons)
+                (copy-recursively "lang" lang)))))))
     (native-inputs
      (list pkg-config))
-     (inputs
-      (list gtkmm-3 libskry ffmpeg-4))
-     (home-page "https://github.com/GreatAttractor/stackistry")
-     (synopsis "Astronomical lucky imaging/image stacking tool")
-     (description
-      "Stackistry implements the lucky imaging principle of astronomical
+    (inputs
+     (list gtkmm-3 libskry ffmpeg-4))
+    (home-page "https://github.com/GreatAttractor/stackistry")
+    (synopsis "Astronomical lucky imaging/image stacking tool")
+    (description
+     "Stackistry implements the lucky imaging principle of astronomical
 imaging: creating a high-quality still image out of a series of many (possibly
 thousands) low quality ones (blurred, deformed, noisy).  The resulting image
 stack typically requires post-processing, including sharpening (e.g. via
 deconvolution).  Such post-processing is not performed by Stackistry.")
-     (license license:gpl3+)))
+    (license license:gpl3+)))
 
 (define-public stellarium
   (package
-- 
2.41.0

[bug#68641] [PATCH 19/19] gnu: libnova: Use G-Expressions.

[Sharlatan Hellseher]

* gnu/packages/astronomy.scm (libnova): Adjust package style by applying
G-Expressions and fix indention.
[arguments]<#:phases>: Remove trailing #f from lambda.

Change-Id: I63d239464fd3cb166449ef8904b5fd72326cb853
---
 gnu/packages/astronomy.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 99b22fa39e..400ce933b3 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3053,24 +3053,24 @@ (define-public libnova
     (name "libnova")
     (version "0.16")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://git.code.sf.net/p/libnova/libnova.git")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32
-          "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.code.sf.net/p/libnova/libnova.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-git-version
-           (lambda _
-             (substitute* "./git-version-gen"
-               (("/bin/sh") (which "sh")))
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-git-version
+            (lambda _
+              (substitute* "./git-version-gen"
+                (("/bin/sh") (which "sh"))))))))
     (native-inputs
      (list autoconf automake libtool))
     (synopsis "Celestial mechanics, astrometry and astrodynamics library")
-- 
2.41.0

[bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates.

[Maxim Cournoyer]

Hello Sharlatan!

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> Hi Guix,
>
> The first update for this year including new packages, updates and refactoring
> of exiting ones.
>
> I'd like to highlight archived milestones:
> * Each of disabled test has annotation
> * All packages use G-Expression and no label style
> * The number of packages using python-build-system reduced to 7
> * Nearly all of the packages are on the latest upstream release versions
> * There is non failing packages
> * Number of packages are 107
>
> In the next update cycle, I would add more new packages and update
> python-astropy to the latest upstream release. Astropy v6.0.0 dropped support
> for setup.py and now completely relies on pyproject.toml, which may require
> additional work to build extensions. There is a known issue in the Python
> community, which can be found at
> https://github.com/pypa/setuptools/discussions/3388.

Thank you!  This is all very neatly crafted and tested.  The attention
to detail is much appreciated.

[...]

> Sharlatan Hellseher (19):
>   gnu: stellarium: Update to 23.4.
>   gnu: indi-2.0: Update to 2.0.5.
>   gnu: gpredict: Update home-page and description.
>   gnu: libxisf: Update to 0.2.11.
>   gnu: python-crds: Update to 11.17.14.
>   gnu: python-drms: Update to 0.7.1.
>   gnu: python-pyvo: Update to 1.5.
>   gnu: python-stcal: Update to 1.5.2.
>   gnu: python-sunpy: Update to 5.1.1.
>   gnu: Add python-ndcube.
>   gnu: Add python-dust-extinction.
>   gnu: Add python-specutils.
>   gnu: python-synphot: Enable more options.
>   gnu: python-tweakwcs: Update to 0.8.6.
>   gnu: python-skyfield: Update to 1.47.
>   gnu: python-stsynphot: Fix build.
>   gnu: libpasastro: Use G-Expressions.
>   gnu: stackistry: Use G-Expressions.
>   gnu: libnova: Use G-Expressions.
>

I've added a few mostly innocuous comments in one or two of the series.
Feel free to adjust as you see fit and push the series.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]


Hi Efraim,

Thank you for the review and feedback!

> This package compiles just fine for riscv64 so there's no reason to
> limit it to only certain architectures.

That's is a great new, I did not try to build it on any other OS or
platform. The reason I've add that flags is not a standard Makfile
coming with the project.

https://github.com/pchev/libpasastro/blob/master/Makefile

--8<---------------cut here---------------start------------->8---
all:
ifeq ($(OS_TARGET),win32)
	$(MAKE) -C getdss -f Makefile.win32 all
	$(MAKE) -C plan404 -f Makefile.win32 all
	$(MAKE) -C wcs -f Makefile.win32 all
 else
 ifeq ($(OS_TARGET),win64)
	$(MAKE) -C getdss -f Makefile.win64 all
	$(MAKE) -C plan404 -f Makefile.win64 all
	$(MAKE) -C wcs -f Makefile.win64 all
 else
 ifeq ($(CPU_TARGET),i386)
	$(MAKE) -C getdss all arch_flags=-m32
	$(MAKE) -C plan404 all arch_flags=-m32
	$(MAKE) -C wcs all arch_flags=-m32
 else
 ifeq ($(CPU_TARGET),x86_64)
	$(MAKE) -C getdss all arch_flags=-m64
	$(MAKE) -C plan404 all arch_flags=-m64
	$(MAKE) -C wcs all arch_flags=-m64
 else
	$(MAKE) -C getdss all
	$(MAKE) -C plan404 all
	$(MAKE) -C wcs all
 endif
 endif
 endif
endif

clean:
ifeq ($(OS_TARGET),win32)
        $(MAKE) -C getdss -f Makefile.win32 clean
        $(MAKE) -C plan404 -f Makefile.win32 clean
        $(MAKE) -C wcs -f Makefile.win32 clean
else
ifeq ($(OS_TARGET),win64)
        $(MAKE) -C getdss -f Makefile.win64 clean
        $(MAKE) -C plan404 -f Makefile.win64 clean
        $(MAKE) -C wcs -f Makefile.win64 clean
else
	$(MAKE) -C getdss clean
	$(MAKE) -C plan404 clean
	$(MAKE) -C wcs clean
endif
endif

ifeq ($(OS_TARGET),darwin)
install:
	./install_darwin.sh $(PREFIX)
else
install:
	./install.sh $(PREFIX) $(CPU_TARGET)
install_win:
	./install_win.sh win32 $(PREFIX)
install_win64:
	./install_win.sh win64 $(PREFIX)
endif
--8<---------------cut here---------------end--------------->8---

> (%current-target-system) returns i686-linux-gnu for the first one, so
> it'd probably be better to use cond and (target-x86-32?) for the first
> one.
>
> I'm not actually convinced you need any of the flags for OS_TARGET or
> CPU_TARGET (except perhaps for cross-compiling), does it make a
> difference between compiled with or without?

I would dedicate some time to figure out how to satisfy custom Makefile
to be compatible for larger range of systems available in Guix. Putting
to my TODO for 2024/02 updates.

Regards,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#68641: [PATCH 00/19] gnu: Astronomy 2024/01 updates.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]


Hi Maxim,

> This is all very neatly crafted and tested. The attention to detail is
> much appreciated.
Thank you for worm feedback!

I've amended mentioned commit log and comments. Pushed as
2266754382..8f86cbd5e9 to master.

Regards,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#68641] [PATCH 00/19] gnu: Astronomy 2024/01 updates.

[Sharlatan Hellseher]

worm -> wArm =)

It was long day....

Thanks,
Oleg

-- 
VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.