[PATCH 1/2] gnu: octave: Build with curl and graphicsmagick.

[Arun Isaac]

* gnu/packages/maths.scm (octave)[inputs]: Add curl and graphicsmagick.
---
 gnu/packages/maths.scm | 107 +++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9533f5f0a..3abdf5375 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages multiprecision)
@@ -923,62 +924,64 @@ can solve two kinds of problems:
 ;; the following packages: texinfo, less, ghostscript, gnuplot.
 (define-public octave
   (package
-    (name "octave")
-    (version "4.2.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/octave/octave-"
-                          version ".tar.lz"))
-      (sha256
-       (base32
-        "09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("lapack" ,lapack)
-       ("readline" ,readline)
-       ("glpk" ,glpk)
-       ("fftw" ,fftw)
-       ("fftwf" ,fftwf)
-       ("arpack" ,arpack-ng)
-       ("pcre" ,pcre)
-       ("fltk" ,fltk)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("hdf5" ,hdf5)
-       ("libxft" ,libxft)
-       ("mesa" ,mesa)
-       ("glu" ,glu)
-       ("zlib" ,zlib)))
-    (native-inputs
-     `(("lzip" ,lzip)
-       ("gfortran" ,gfortran)
-       ("pkg-config" ,pkg-config)
-       ("perl" ,perl)
-       ;; The following inputs are not actually used in the build process.
-       ;; However, the ./configure gratuitously tests for their existence and
-       ;; assumes that programs not present at build time are also not, and
-       ;; can never be, available at run time!  If these inputs are therefore
-       ;; not present, support for them will be built out.  However, Octave
-       ;; will still run without them, albeit without the features they
-       ;; provide.
-       ("less" ,less)
-       ("texinfo" ,texinfo)
-       ("ghostscript" ,ghostscript)
-       ("gnuplot" ,gnuplot)))
-    (arguments
-     `(#:configure-flags
-       (list (string-append "--with-shell="
-                            (assoc-ref %build-inputs "bash")
-                            "/bin/sh"))))
-    (home-page "https://www.gnu.org/software/octave/";)
-    (synopsis "High-level language for numerical computation")
-    (description "GNU Octave is a high-level interpreted language that is
+   (name "octave")
+   (version "4.2.1")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "mirror://gnu/octave/octave-"
+                         version ".tar.lz"))
+     (sha256
+      (base32
+       "09zhhch79jw3ynw39vizx0i2cbd2bjz3sp38pjdzraqrbivpwp92"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("lapack" ,lapack)
+      ("readline" ,readline)
+      ("glpk" ,glpk)
+      ("fftw" ,fftw)
+      ("fftwf" ,fftwf)
+      ("arpack" ,arpack-ng)
+      ("pcre" ,pcre)
+      ("fltk" ,fltk)
+      ("fontconfig" ,fontconfig)
+      ("freetype" ,freetype)
+      ("hdf5" ,hdf5)
+      ("libxft" ,libxft)
+      ("mesa" ,mesa)
+      ("glu" ,glu)
+      ("zlib" ,zlib)
+      ("curl" ,curl)
+      ("graphicsmagick" ,graphicsmagick)))
+   (native-inputs
+    `(("lzip" ,lzip)
+      ("gfortran" ,gfortran)
+      ("pkg-config" ,pkg-config)
+      ("perl" ,perl)
+      ;; The following inputs are not actually used in the build process.
+      ;; However, the ./configure gratuitously tests for their existence and
+      ;; assumes that programs not present at build time are also not, and
+      ;; can never be, available at run time!  If these inputs are therefore
+      ;; not present, support for them will be built out.  However, Octave
+      ;; will still run without them, albeit without the features they
+      ;; provide.
+      ("less" ,less)
+      ("texinfo" ,texinfo)
+      ("ghostscript" ,ghostscript)
+      ("gnuplot" ,gnuplot)))
+   (arguments
+    `(#:configure-flags
+      (list (string-append "--with-shell="
+                           (assoc-ref %build-inputs "bash")
+                           "/bin/sh"))))
+   (home-page "https://www.gnu.org/software/octave/";)
+   (synopsis "High-level language for numerical computation")
+   (description "GNU Octave is a high-level interpreted language that is
 specialized for numerical computations.  It can be used for both linear and
 non-linear applications and it provides great support for visualizing results.
 Work may be performed both at the interactive command-line as well as via
 script files.")
-    (license license:gpl3+)))
+   (license license:gpl3+)))
 
 (define-public opencascade-oce
   (package
-- 
2.11.0