aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/astronomy.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-02-20 17:36:56 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-02-20 17:36:56 +0100
commit7f69459aca16756f35f08049c64a1bd77d23f33e (patch)
tree1d267fb62feab89de5d97582672540cbaa37392c /gnu/packages/astronomy.scm
parent4a82722a658220ec1e10f9f2d5d77407d38db90e (diff)
parentb1989c12501e880afab62d3ff961791906fef350 (diff)
downloadguix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar
guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/astronomy.scm')
-rw-r--r--gnu/packages/astronomy.scm15
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c3a591baa3..8cf9d9e4a5 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -21,6 +21,7 @@
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (gnu packages image)
#:use-module (gnu packages compression)
#:use-module (gnu packages gettext)
@@ -34,16 +35,18 @@
(define-public cfitsio
(package
(name "cfitsio")
- (version "3390")
+ (version "3.420")
(source
(origin
(method url-fetch)
(uri (string-append
- "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version
- ".tar.gz"))
+ "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
+ name (string-replace-substring version "." "") ".tar.gz"))
(sha256
- (base32 "02gllydm63irwbqqisa3mrskw1fphm5rlplglz3mq9whi3rxilv2"))))
+ (base32 "1f0nmki45h9kw7vxpxiav9cb6vs3qqi6zrp2lpci5yhqc5isl43c"))))
(build-system gnu-build-system)
+ ;; XXX Building with curl currently breaks wcslib. It doesn't use
+ ;; pkg-config and hence won't link with -lcurl.
(arguments
`(#:tests? #f ; no tests
#:phases
@@ -52,10 +55,10 @@
(lambda _
(substitute* "Makefile.in" (("/bin/") ""))
#t)))))
- (home-page "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html")
+ (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html")
(synopsis "Library for reading and writing FITS files")
(description "CFITSIO provides simple high-level routines for reading and
-writing FITS (Flexible Image Transport System) files that insulate the
+writing @dfn{FITS} (Flexible Image Transport System) files that insulate the
programmer from the internal complexities of the FITS format. CFITSIO also
provides many advanced features for manipulating and filtering the information
in FITS files.")