From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Isaac Subject: [PATCH 1/2] gnu: octave: Build with curl and graphicsmagick. Date: Tue, 7 Mar 2017 22:56:46 +0530 Message-ID: <20170307172647.944-1-arunisaac@systemreboot.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clItJ-0002lu-IH for guix-devel@gnu.org; Tue, 07 Mar 2017 12:27:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clItF-0005VG-Lk for guix-devel@gnu.org; Tue, 07 Mar 2017 12:27:17 -0500 Received: from [117.218.232.8] (port=51542 helo=systemreboot.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clItF-0005Tc-1H for guix-devel@gnu.org; Tue, 07 Mar 2017 12:27:13 -0500 Received: from [103.194.14.49] (helo=systemreboot.net) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.88) (envelope-from ) id 1clIt8-0000gc-Vw for guix-devel@gnu.org; Tue, 07 Mar 2017 22:57:07 +0530 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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