diff options
| author | Liliana Marie Prikler <[email protected]> | 2023-09-22 23:54:34 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <[email protected]> | 2023-09-22 23:54:34 +0200 |
| commit | cdbd81ce144f17644ceebd3d08723aa244696a05 (patch) | |
| tree | f2d4c484a5a8880fb32b81ac4330842c88a53e2a /gnu/packages/maths.scm | |
| parent | 10664c0f1c351eae24629127d97fe23f5e18a93c (diff) | |
| parent | ec130e1a1b7f3b87b1a6e626754f7e7a07f6b717 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38e71e18f8..6141c09886 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge <[email protected]> +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023 Andreas Enge <[email protected]> ;;; Copyright © 2013 Nikita Karetnikov <[email protected]> ;;; Copyright © 2014, 2016, 2017 John Darrington <[email protected]> ;;; Copyright © 2014-2022 Eric Bavier <[email protected]> @@ -1321,18 +1321,16 @@ computations.") (define-public hdf4 (package (name "hdf4") - (version "4.2.14") + (version "4.2.16-2") (source (origin (method url-fetch) (uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF" version "/src/hdf-" version ".tar.bz2")) (sha256 - (base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l")) - (patches (search-patches "hdf4-architectures.patch" - "hdf4-reproducibility.patch" - "hdf4-shared-fortran.patch" - "hdf4-tirpc.patch")))) + (base32 "0b395czhqr43mmbiifmg2mhb488wnd4zccj45vpql98ja15j7hy5")) + (patches (search-patches "hdf4-reproducibility.patch" + "hdf4-shared-fortran.patch")))) (build-system gnu-build-system) (native-inputs (list gfortran bison flex)) @@ -1345,9 +1343,7 @@ computations.") #:configure-flags (list "--enable-shared" "FCFLAGS=-fallow-argument-mismatch" "FFLAGS=-fallow-argument-mismatch" - (string-append "CPPFLAGS=-I" - (assoc-ref %build-inputs "libtirpc") - "/include/tirpc")) + "--enable-hdf4-xdr") #:phases (modify-phases %standard-phases ;; This is inspired by two of Debian's patches. @@ -1362,14 +1358,7 @@ computations.") (substitute* '("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in") (("/bin/rm") "rm") - (("/bin/mkdir") "mkdir")) - (substitute* (find-files "." "^Makefile\\.in$") - (("@HDF_BUILD_XDR_TRUE@XDR_ADD = \ --R\\$\\(abs_top_builddir\\)/mfhdf/xdr/\\.libs") "") - (("@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = \ --R\\$\\(abs_top_builddir\\)/mfhdf/libsrc/\\.libs \ --R\\$\\(abs_top_builddir\\)/hdf/src/\\.libs \\$\\(XDR_ADD\\)") "")) - #t)) + (("/bin/mkdir") "mkdir")))) (add-after 'configure 'patch-settings (lambda _ ;; libhdf4.settings contains the full path of the @@ -1389,8 +1378,7 @@ computations.") ;; files. Fix it manually to avoid having to propagate it. (substitute* (find-files (string-append out "/lib") "\\.la$") (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg"))) - #t)))))) + (string-append "-L" libjpeg "/lib -ljpeg"))))))))) (home-page "https://www.hdfgroup.org/products/hdf4/") (synopsis "Library and multi-object file format for storing and managing data") @@ -2791,7 +2779,7 @@ can solve two kinds of problems: (define-public octave-cli (package (name "octave-cli") - (version "8.2.0") + (version "8.3.0") (source (origin (method url-fetch) @@ -2799,7 +2787,7 @@ can solve two kinds of problems: version ".tar.xz")) (sha256 (base32 - "1pkh4vmq4hcrmyl2gybd54i3qamyvmcjmpgy1i2kkw2g03jxdfdp")))) + "1aav8i88y2yl11g5d44wpjngkpldvzk90ja7wghkb91cy2a9974i")))) (build-system gnu-build-system) (inputs (list alsa-lib |