From 2fe41e0fad4d3a54a5c2a603d204a2434f70ba5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 13:47:23 +0200 Subject: gnu: r-pracma: Update to 2.0.4. * gnu/packages/maths.scm (r-pracma): Update to 2.0.4. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cefc53d67d..fce5db162c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1583,12 +1583,12 @@ programming problems.") (define-public r-pracma (package (name "r-pracma") - (version "1.9.5") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "19nr2jlkbcdgvw3gx5hry12av565lmvqd5q4h7zlch3q13avwwl2")))) + (base32 "1z3i90mkzwvp9di17caf4934z2xlb2imm3hwxllcrbwvmnmhrwyc")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) -- cgit v1.2.3 From 133cba8cb5c278080ae701fba1c339ae50cc124f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:25:14 +0200 Subject: gnu: armadillo: Update to 7.800.2. * gnu/packages/maths.scm (armadillo): Update to 7.800.2. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fce5db162c..40ab048316 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2159,14 +2159,14 @@ full text searching.") (define-public armadillo (package (name "armadillo") - (version "7.600.2") + (version "7.800.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/arma/armadillo-" version ".tar.xz")) (sha256 (base32 - "0bac9y46m61zxinj51l82w06v01ra9vw7a9j6rrwdjhznkkdb437")))) + "1qqzy7dp891j9v7062mv1599hdwr97vqzrd3j2fl8c3gmc00dmzg")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test target (inputs -- cgit v1.2.3 From 498d2553ed3a99217ef5f3567ace77165d49e597 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 14:29:53 +0200 Subject: gnu: Remove armadillo-for-rcpparmadillo. This package is no longer useful, because upstream does not keep the tarballs of older releases. We use the bundled armadillo sources in the r-rccparmadillo package instead. * gnu/packages/maths.scm (armadillo-for-rcpparmadillo): Remove variable. --- gnu/packages/maths.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 40ab048316..a877fe5ca2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2185,17 +2185,6 @@ provides efficient classes for vectors, matrices and cubes, as well as 150+ associated functions (eg. contiguous and non-contiguous submatrix views).") (license license:mpl2.0))) -(define-public armadillo-for-rcpparmadillo - (package (inherit armadillo) - (version "7.600.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/arma/armadillo-" - version ".tar.xz")) - (sha256 - (base32 - "1dxgfd2r9lbh24nszvqm2lag439s0srxaf1l86f6ww6waqm5r8zk")))))) - (define-public muparser ;; When switching download sites, muparser re-issued a 2.2.5 release with a ;; different hash. In order to make `guix package --upgrade` work correctly, -- cgit v1.2.3 From fe418cc5b28f82b07034bb3115906cf4f23c72ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Apr 2017 15:41:14 +0200 Subject: gnu: armadillo: Change license to ASL 2.0. Armadillo versions 7.800 and onwards are licensed under the Apache License 2.0. * gnu/packages/maths.scm (armadillo)[license]: Change to ASL 2.0. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a877fe5ca2..5a06afa220 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2183,7 +2183,7 @@ environments. It can be used for machine learning, pattern recognition, signal processing, bioinformatics, statistics, econometrics, etc. The library provides efficient classes for vectors, matrices and cubes, as well as 150+ associated functions (eg. contiguous and non-contiguous submatrix views).") - (license license:mpl2.0))) + (license license:asl2.0))) (define-public muparser ;; When switching download sites, muparser re-issued a 2.2.5 release with a -- cgit v1.2.3 From 6b6aca9b363d9c453892b41691734a03fabe1faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Apr 2017 18:13:30 +0200 Subject: gnu: flann: Move .mex file to a separate "octave" output. That way the closure of flann:out is down from 1 GiB to 290 MiB. * gnu/packages/maths.scm (flann)[outputs]: New field. [arguments]: Add 'set-octave-directory' phase. --- gnu/packages/maths.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5a06afa220..38beb88d0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2719,6 +2719,8 @@ in finite element programs.") (base32 "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz")))) (build-system cmake-build-system) + (outputs '("out" + "octave")) ;46 MiB .mex file that pulls Octave (native-inputs `(("unzip" ,unzip))) (inputs @@ -2736,6 +2738,14 @@ in finite element programs.") ;; Save 12 MiB by not installing .a files. Passing ;; '-DBUILD_STATIC_LIBS=OFF' has no effect. #:phases (modify-phases %standard-phases + (add-before 'configure 'set-octave-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the .mex file in the "octave" output. + (let ((out (assoc-ref outputs "octave"))) + (substitute* "src/matlab/CMakeLists.txt" + (("share/flann/octave") + (string-append out "/share/flann/octave"))) + #t))) (add-after 'install 'remove-static-libraries (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 181170c6ee871d4410a5ffabd4bc517a1d5cbc80 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 3 Apr 2017 21:16:55 +0530 Subject: gnu: octave: Build with gl2ps support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (octave)[inputs]: Add gl2ps. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38beb88d0a..a924764db0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1001,6 +1001,7 @@ can solve two kinds of problems: (inputs `(("lapack" ,lapack) ("readline" ,readline) + ("gl2ps" ,gl2ps) ("glpk" ,glpk) ("fftw" ,fftw) ("fftwf" ,fftwf) -- cgit v1.2.3 From d1e4ad1b02b2ea888557d3272c50b676faf18ca4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Apr 2017 18:06:57 +0200 Subject: gnu: Fix typos in descriptions. * gnu/packages/admin.scm (di)[description]: Likewise. * gnu/packages/bioinformatics.scm (r-annotate)[description]: Likewise. * gnu/packages/datastructures.scm (sparsehash)[description]: Likewise. * gnu/packages/dns.scm (knot)[description]: Likewise. * gnu/packages/emacs.scm (emacs-idle-highlight)[synopsis, description]: Likewise. * gnu/packages/gnome.scm (libpeas)[description]: Likewise. * gnu/packages/gtk.scm (python2-pygtk)[description]: Likewise. * gnu/packages/kde-frameworks.scm (kactivities)[description]: Fix typo. * gnu/packages/libevent.scm (perl-anyevent)[description]: Likewise. * gnu/packages/machine-learning.scm (ghmm)[description]: Likewise. * gnu/packages/mail.scm (mlmmj)[description]: Likewise. * gnu/packages/maths.scm (vc)[description]: Likewise. * gnu/packages/music.scm (gx-super-fuzz-lv2)[description]: Likewise. * gnu/packages/networking.scm (nload)[description]: Likewise. * gnu/packages/python.scm (python-execnet)[description]: Likewise. * gnu/packages/terminals.scm (tilda)[description]: Likewise. * gnu/packages/python.scm (python-execnet, python-tables) (python2-coverage-test-runner, python2-rope)[description]: Likewise. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a924764db0..272a0979ad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3003,7 +3003,7 @@ compilers and compiler versions as well as portability between different vector instruction sets. Thus, an application written with Vc can be compiled for: @enumerate @item AVX and AVX2 -@item SSE2 upto SSE4.2 or SSE4a +@item SSE2 up to SSE4.2 or SSE4a @item Scalar @item MIC @item NEON (in development) -- cgit v1.2.3 From 7d873e0c2690bf5742cf41b001af906ebbecde37 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 22 Apr 2017 13:33:09 -0400 Subject: gnu: gnuplot: Update to 5.0.6. * gnu/packages/maths.scm (gnuplot): Update to 5.0.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 272a0979ad..0a11da9eaf 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -489,7 +489,7 @@ singular value problems.") (define-public gnuplot (package (name "gnuplot") - (version "5.0.5") + (version "5.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" @@ -497,7 +497,7 @@ singular value problems.") version ".tar.gz")) (sha256 (base32 - "0lr065qdlgss8lmy31l7hkmnk9fp4lvqq9qgb1f1209f36zy1wr5")))) + "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv")))) (build-system gnu-build-system) (inputs `(("readline" ,readline) ("cairo" ,cairo) -- cgit v1.2.3 From 300200b6370c3ab506df202853602dccb7368b6c Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 27 Apr 2017 17:06:53 +0200 Subject: gnu: Add netcdf-fortran. * gnu/packages/maths.scm (netcdf-fortran): New variable. --- gnu/packages/maths.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0a11da9eaf..4e70bd8d1c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -850,6 +850,30 @@ sharing of scientific data.") "--disable-shared" "--with-pic" ,flags)))))) +(define-public netcdf-fortran + (package + (name "netcdf-fortran") + (version "4.4.4") + (source (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-fortran-" + version ".tar.gz")) + (sha256 + (base32 + "0xaxdcg1p83zmypwml3swsnr3ccn38inwldyr1l3wa4dbwbrblxj")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-tests? #f)) + (inputs + `(("netcdf" ,netcdf))) + (native-inputs + `(("gfortran" ,gfortran))) + (synopsis "Fortran interface for the netCDF library") + (description (package-description netcdf)) + (home-page (package-home-page netcdf)) + (license (package-license netcdf)))) + (define-public nlopt (package (name "nlopt") -- cgit v1.2.3 From 7adaab9fe713a8696772e46a8bad632f397bdd83 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 18 Mar 2017 07:15:58 +1000 Subject: gnu: Add ocaml4.01-gsl. * gnu/packages/maths.scm (ocaml4.01-gsl): New variable. --- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4e70bd8d1c..88a46f8e9b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -311,6 +311,9 @@ numbers.") the OCaml language.") (license license:gpl3+))) +(define-public ocaml4.01-gsl + (package-with-ocaml4.01 ocaml-gsl)) + (define-public glpk (package (name "glpk") -- cgit v1.2.3