Patchwork [1/3] gnu: Add cfitsio

login
register
mail settings
Submitter John Darrington
Date Aug. 30, 2016, 7:21 p.m.
Message ID <1472584872-19300-1-git-send-email-jmd@gnu.org>
Download mbox | patch
Permalink /patch/15094/
State New
Headers show

Comments

John Darrington - Aug. 30, 2016, 7:21 p.m.
* gnu/packages/astronomy.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk               |  1 +
 gnu/packages/astronomy.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 gnu/packages/astronomy.scm
Leo Famulari - Aug. 30, 2016, 8:47 p.m.
On Tue, Aug 30, 2016 at 09:21:10PM +0200, John Darrington wrote:
> +       (uri (string-append
> +        "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version
> +        ".tar.gz")) 

I would indent this based on (string-append).

> +         (add-after 'unpack 'replace-slash-bin

I would call this "patch-paths" or something like that, in order to
communicate the intention.

Otherwise LGTM.
Alex Kost - Aug. 31, 2016, 6:45 a.m.
John Darrington (2016-08-30 22:21 +0300) wrote:

> * gnu/packages/astronomy.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
> ---
>  gnu/local.mk               |  1 +
>  gnu/packages/astronomy.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 54 insertions(+)
>  create mode 100644 gnu/packages/astronomy.scm
>
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index d75ab54..26c4151 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -42,6 +42,7 @@ GNU_SYSTEM_MODULES =				\
>    %D%/packages/apr.scm				\
>    %D%/packages/aspell.scm			\
>    %D%/packages/assembly.scm			\
> +  %D%/packages/astronomy.scm			\
>    %D%/packages/attr.scm				\
>    %D%/packages/audacity.scm			\
>    %D%/packages/audio.scm			\
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> new file mode 100644
> index 0000000..881e549
> --- /dev/null
> +++ b/gnu/packages/astronomy.scm
> @@ -0,0 +1,53 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2016 John Darrington <jmd@gnu.org>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages astronomy)
> +  #:use-module (guix packages)
> +  #:use-module (guix licenses)
> +  #:use-module (guix download)
> +  #:use-module (guix build-system gnu))
> +
> +(define-public cfitsio
> +  (package
> +    (name "cfitsio")
> +    (version "3390")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +        "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version
> +        ".tar.gz")) 
                      ^
Please indent the above lines properly and remove the trailing space, I
would write it like this:

          (uri (string-append
                "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/"
                name version ".tar.gz"))


> +       (sha256
> +        (base32 "02gllydm63irwbqqisa3mrskw1fphm5rlplglz3mq9whi3rxilv2"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f ; no tests
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'replace-slash-bin
> +           (lambda _
> +             (substitute* "Makefile.in" (("/bin/") "")))))))

Please add #t in the end of this phase.

> +    (home-page "http://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
> +programmer from the internal complexities of the FITS format. CFITSIO also
> +provides many advanced features for manipulating and filtering the information
> +in FITS files.")
> +    (license (license:non-copyleft "file://License.txt"
> +                          "See License.txt in the distribution."))))
                             ^^^^^^^^^
Indentation here

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d75ab54..26c4151 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -42,6 +42,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/packages/apr.scm				\
   %D%/packages/aspell.scm			\
   %D%/packages/assembly.scm			\
+  %D%/packages/astronomy.scm			\
   %D%/packages/attr.scm				\
   %D%/packages/audacity.scm			\
   %D%/packages/audio.scm			\
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
new file mode 100644
index 0000000..881e549
--- /dev/null
+++ b/gnu/packages/astronomy.scm
@@ -0,0 +1,53 @@ 
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 John Darrington <jmd@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages astronomy)
+  #:use-module (guix packages)
+  #:use-module (guix licenses)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public cfitsio
+  (package
+    (name "cfitsio")
+    (version "3390")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+        "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" name version
+        ".tar.gz")) 
+       (sha256
+        (base32 "02gllydm63irwbqqisa3mrskw1fphm5rlplglz3mq9whi3rxilv2"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'replace-slash-bin
+           (lambda _
+             (substitute* "Makefile.in" (("/bin/") "")))))))
+    (home-page "http://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
+programmer from the internal complexities of the FITS format. CFITSIO also
+provides many advanced features for manipulating and filtering the information
+in FITS files.")
+    (license (license:non-copyleft "file://License.txt"
+                          "See License.txt in the distribution."))))