From 497365e296b92e9f6df362f6efec337511355c4b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 16 Aug 2026 21:11:43 +0100 Subject: gnu: cfitsio: Update to 4.7.0. * gnu/packages/astronomy.scm (cfitsio): Update to 4.7.0. [source]: Switch to git-fetch. [phases]{patch-paths, post-install-check}: Remove phases. {check}: Use default check which passes well now. [properties]: Remove release-monitoring-url property. (cfitsio-4.4)[arguments]: Port old arguments from cfitsio. Relates-to: guix/guix!10702 --- gnu/packages/astronomy.scm | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d85423ba117..d5dee69312d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -703,36 +703,23 @@ on-line reference manual.") (define-public cfitsio (package (name "cfitsio") - (version "4.6.4") + (version "4.7.0") (source (origin - (method url-fetch) - (uri (string-append - "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" - "cfitsio-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + ;; FTP: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ + (url "https://github.com/HEASARC/cfitsio") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0m9w33w27wc452737x42gmbdwlzhhyq5x9irdylhx0n9j5xn6yr2")))) + (base32 "1a7fgsvyv3zgi5ni1c3brxrq7ivq63881hdxp8c1pyhzqsa74klk")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~(list "--enable-reentrant" - (string-append "--with-bzip2=" #$(this-package-input "bzip2"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* "Makefile.in" (("/bin/") "")))) - (delete 'check) - ;; TODO: Testing steps are sourced from docs/fitsio.pdf, implement - ;; the logic in Guile in the future. - (add-after 'install 'post-install-check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "make" "testprog") - (with-output-to-file "testprog.lis" (lambda _(invoke "./testprog"))) - (invoke "diff" "-r" "testprog.lis" "testprog.out") - (invoke "cmp" "-l" "testprog.fit" "testprog.std"))))))) + (string-append "--with-bzip2=" #$(this-package-input "bzip2"))))) (native-inputs (list gfortran)) (inputs (list bzip2 curl zlib)) (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") @@ -743,9 +730,6 @@ on-line reference manual.") programmer from the internal complexities of the FITS format. CFITSIO also provides many advanced features for manipulating and filtering the information in FITS files.") - (properties - '((release-monitoring-url . - "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"))) (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) @@ -762,7 +746,27 @@ in FITS files.") "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" "cfitsio-" version ".tar.gz")) (sha256 - (base32 "098x1l8ijwsjp2ivp3v7pamrmpgwj5xmgb4yppm9w3w044zxr8b6")))))) + (base32 "098x1l8ijwsjp2ivp3v7pamrmpgwj5xmgb4yppm9w3w044zxr8b6")))) + (arguments + (list + #:configure-flags + #~(list "--enable-reentrant" + (string-append "--with-bzip2=" #$(this-package-input "bzip2"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile.in" (("/bin/") "")))) + (delete 'check) + ;; TODO: Testing steps are sourced from docs/fitsio.pdf, implement + ;; the logic in Guile in the future. + (add-after 'install 'post-install-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "testprog") + (with-output-to-file "testprog.lis" (lambda _(invoke "./testprog"))) + (invoke "diff" "-r" "testprog.lis" "testprog.out") + (invoke "cmp" "-l" "testprog.fit" "testprog.std"))))))))) (define-public cianna (package -- cgit v1.2.3