[PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[Eric Bavier]

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

Hello Guix,

This patch adds a few more inputs to our octave package.  Arpack is 
needed for the "eigs" function.  Previously, we had the fltk input, but 
without glu it's essentially useless.

I had wanted to also add Suitesparse, but there are some compilation 
problems yet.

I took the liberty of wrapping some lines to 80 columns at the same 
time.

-- 
`~Eric

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-octave-Add-fftw-arpack-and-glu-inputs.patch --]
[-- Type: text/x-diff; name=0001-gnu-octave-Add-fftw-arpack-and-glu-inputs.patch, Size: 3100 bytes --]

From d412eca63adfded2aae5d19777d0928784a2b58f Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Fri, 8 May 2015 14:44:29 -0500
Subject: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

* gnu/packages/maths.scm (octave)[inputs]: Add fftw, fftwf, arpack,
  and glu.
  [description]: Wrap to 80 columns.
---
 gnu/packages/maths.scm |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 417af4a..db82934 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -382,6 +382,9 @@ extremely large and complex data collections.")
      `(("lapack" ,lapack)
        ("readline" ,readline)
        ("glpk" ,glpk)
+       ("fftw" ,fftw)
+       ("fftwf" ,fftwf)
+       ("arpack" ,arpack-ng)
        ("curl" ,curl)
        ("pcre" ,pcre)
        ("fltk" ,fltk)
@@ -390,16 +393,18 @@ extremely large and complex data collections.")
        ("hdf5" ,hdf5)
        ("libxft" ,libxft)
        ("mesa" ,mesa)
+       ("glu" ,glu)
        ("zlib" ,zlib)))
     (native-inputs
      `(("gfortran" ,gfortran-4.8)
        ("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
+       ;; 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)
@@ -411,11 +416,11 @@ extremely large and complex data collections.")
 			    "/bin/sh"))))
     (home-page "http://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.")
+    (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+)))
 
 (define-public gmsh
-- 
1.7.9.5

Re: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[Mark H Weaver]

Eric Bavier <ericbavier@openmailbox.org> writes:

> This patch adds a few more inputs to our octave package.  Arpack is
> needed for the "eigs" function.  Previously, we had the fltk input,
> but without glu it's essentially useless.
>
> I had wanted to also add Suitesparse, but there are some compilation
> problems yet.
>
> I took the liberty of wrapping some lines to 80 columns at the same
> time.

Okay.

> From d412eca63adfded2aae5d19777d0928784a2b58f Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Fri, 8 May 2015 14:44:29 -0500
> Subject: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.
>
> * gnu/packages/maths.scm (octave)[inputs]: Add fftw, fftwf, arpack,
>   and glu.
>   [description]: Wrap to 80 columns.

[...]

> @@ -411,11 +416,11 @@ extremely large and complex data collections.")
>  			    "/bin/sh"))))
>      (home-page "http://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.")
> +    (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.")

As you have it now, the first line of the string will actually be much
shorter than the others.

Instead, please put the open quote on the next line, below the 'd' in
"description", and then reformat.  I think you'll find that it breaks
the lines as they were before, but the source code will then fit within
80 columns.

Otherwise, it looks good to me.  Okay to push with this change.

     Thanks!
       Mark

Re: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[Eric Bavier]

On Sat, 09 May 2015 08:56:10 -0400
Mark H Weaver <mhw@netris.org> wrote:

> Eric Bavier <ericbavier@openmailbox.org> writes:
> 
> > @@ -411,11 +416,11 @@ extremely large and complex data collections.")
> >  			    "/bin/sh"))))
> >      (home-page "http://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.")
> > +    (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.")
> 
> As you have it now, the first line of the string will actually be much
> shorter than the others.

In what situations is this an actual issue?  The recutils output will
re-wrap lines already (e.g. 'guix search' and 'guix package --show').

`~Eric

Re: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[Mark H Weaver]

Eric Bavier <ericbavier@openmailbox.org> writes:

> On Sat, 09 May 2015 08:56:10 -0400
> Mark H Weaver <mhw@netris.org> wrote:
>
>> Eric Bavier <ericbavier@openmailbox.org> writes:
>> 
>> > @@ -411,11 +416,11 @@ extremely large and complex data collections.")
>> >  			    "/bin/sh"))))
>> >      (home-page "http://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.")
>> > +    (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.")
>> 
>> As you have it now, the first line of the string will actually be much
>> shorter than the others.
>
> In what situations is this an actual issue?  The recutils output will
> re-wrap lines already (e.g. 'guix search' and 'guix package --show').

Indeed, I didn't know that we did that.  I suppose it doesn't matter
then.

     Thanks!
       Mark

Re: [PATCH] gnu: octave: Add fftw, arpack, and glu inputs.

[Eric Bavier]

On Sun, 10 May 2015 15:46:10 -0400
Mark H Weaver <mhw@netris.org> wrote:

> Eric Bavier <ericbavier@openmailbox.org> writes:
> 
> > On Sat, 09 May 2015 08:56:10 -0400
> > Mark H Weaver <mhw@netris.org> wrote:
> >
> >> Eric Bavier <ericbavier@openmailbox.org> writes:
> >> 
> >> > @@ -411,11 +416,11 @@ extremely large and complex data collections.")
> >> >  			    "/bin/sh"))))
> >> >      (home-page "http://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.")
> >> > +    (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.")
> >> 
> >> As you have it now, the first line of the string will actually be much
> >> shorter than the others.
> >
> > In what situations is this an actual issue?  The recutils output will
> > re-wrap lines already (e.g. 'guix search' and 'guix package --show').
> 
> Indeed, I didn't know that we did that.  I suppose it doesn't matter
> then.

Ok.  Just wanted to make sure I wasn't missing something.

Thanks,
`~Eric