diff options
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 106 |
1 files changed, 49 insertions, 57 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0f495021f0..32fb87f150 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -692,15 +692,15 @@ can solve two kinds of problems: (define-public octave (package (name "octave") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/octave/octave-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "1hdxap3j88rpqjimnfhinym6z73wdi5dfa6fv85c13r1dk9qzk9r")))) + "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw")))) (build-system gnu-build-system) (inputs `(("lapack" ,lapack) @@ -709,9 +709,7 @@ can solve two kinds of problems: ("fftw" ,fftw) ("fftwf" ,fftwf) ("arpack" ,arpack-ng) - ("curl" ,curl) ("pcre" ,pcre) - ("cyrus-sasl" ,cyrus-sasl) ("fltk" ,fltk) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -719,7 +717,6 @@ can solve two kinds of problems: ("libxft" ,libxft) ("mesa" ,mesa) ("glu" ,glu) - ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs `(("gfortran" ,gfortran) @@ -2025,14 +2022,14 @@ packages.") (define-public atlas (package (name "atlas") - (version "3.10.2") + (version "3.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/math-atlas/Stable/" version "/atlas" version ".tar.bz2")) (sha256 (base32 - "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars")))) + "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216")))) (build-system gnu-build-system) (home-page "http://math-atlas.sourceforge.net/") (inputs `(("gfortran" ,gfortran) @@ -2079,59 +2076,54 @@ packages.") ,(string-append "--with-netlib-lapack-tarfile=" (assoc-ref %build-inputs "lapack-tar"))) #:phases - (alist-cons-after - 'install 'install-doc - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/atlas"))) - (mkdir-p doc) - (fold (lambda (file previous) - (and previous (zero? (system* "cp" file doc)))) - #t (find-files "../ATLAS/doc" ".*")))) - (alist-cons-after - 'check 'check-pt - (lambda _ (zero? (system* "make" "ptcheck"))) - ;; Fix files required to run configure. - (alist-cons-before - 'configure 'fix-/bin/sh + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/atlas"))) + (mkdir-p doc) + (fold (lambda (file previous) + (and previous (zero? (system* "cp" file doc)))) + #t (find-files "../ATLAS/doc" ".*"))))) + (add-after 'check 'check-pt + (lambda _ (zero? (system* "make" "ptcheck")))) + ;; Fix files required to run configure. + (add-before 'configure 'fix-/bin/sh (lambda _ ;; Use `sh', not `/bin/sh'. (substitute* (find-files "." "Makefile|configure|SpewMakeInc\\.c") (("/bin/sh") - "sh"))) - ;; Fix /bin/sh in generated make files. - (alist-cons-after - 'configure 'fix-/bin/sh-in-generated-files - (lambda _ - (substitute* (find-files "." "^[Mm]ake\\.inc.*") - (("/bin/sh") - "sh"))) - ;; ATLAS configure program does not accepts the default flags - ;; passed by the 'gnu-build-system'. - (alist-replace - 'configure - (lambda* (#:key native-inputs inputs outputs - (configure-flags '()) - #:allow-other-keys #:rest args) - (let* ((prefix (assoc-ref outputs "out")) - (bash (or (and=> (assoc-ref - (or native-inputs inputs) "bash") - (cut string-append <> "/bin/bash")) - "/bin/sh")) - (flags `(,(string-append "--prefix=" prefix) - ,@configure-flags)) - (abs-srcdir (getcwd)) - (srcdir (string-append "../" (basename abs-srcdir)))) - (format #t "source directory: ~s (relative from build: ~s)~%" - abs-srcdir srcdir) - (mkdir "../build") - (chdir "../build") - (format #t "build directory: ~s~%" (getcwd)) - (format #t "configure flags: ~s~%" flags) - (zero? (apply system* bash - (string-append srcdir "/configure") - flags)))) - %standard-phases))))))) + "sh")))) + ;; Fix /bin/sh in generated make files. + (add-after 'configure 'fix-/bin/sh-in-generated-files + (lambda _ + (substitute* (find-files "." "^[Mm]ake\\.inc.*") + (("/bin/sh") + "sh")))) + ;; ATLAS configure program does not accepts the default flags + ;; passed by the 'gnu-build-system'. + (replace 'configure + (lambda* (#:key native-inputs inputs outputs + (configure-flags '()) + #:allow-other-keys #:rest args) + (let* ((prefix (assoc-ref outputs "out")) + (bash (or (and=> (assoc-ref + (or native-inputs inputs) "bash") + (cut string-append <> "/bin/bash")) + "/bin/sh")) + (flags `(,(string-append "--prefix=" prefix) + ,@configure-flags)) + (abs-srcdir (getcwd)) + (srcdir (string-append "../" (basename abs-srcdir)))) + (format #t "source directory: ~s (relative from build: ~s)~%" + abs-srcdir srcdir) + (mkdir "../build") + (chdir "../build") + (format #t "build directory: ~s~%" (getcwd)) + (format #t "configure flags: ~s~%" flags) + (zero? (apply system* bash + (string-append srcdir "/configure") + flags)))))))) (synopsis "Automatically Tuned Linear Algebra Software") (description "ATLAS is an automatically tuned linear algebra software library |