diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
| commit | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (patch) | |
| tree | 4df49b9f438e0e466efb3d589027a62b39d49761 /gnu/packages/maths.scm | |
| parent | 87eaa4207208e16e5e1b22b60ba4ff5c3d035023 (diff) | |
| parent | d0fff8f840afc17be40bdc49bff52ed08d5a1a7b (diff) | |
| download | guix-6985a1acb3e9cc4cad8b6f63d77154842d25c929.tar.gz guix-6985a1acb3e9cc4cad8b6f63d77154842d25c929.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b54cd6dff1..7866bcc6eb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2018, 2020 Kei Kebreau <kkebreau@posteo.net> @@ -3928,7 +3928,8 @@ Fresnel integrals, and similar related functions as well.") " -DCMAKE_C_FLAGS_RELEASE=\"$(CFLAGS) $(CPPFLAGS)\"" " -DCMAKE_CXX_FLAGS_RELEASE=\"$(CXXFLAGS) $(CPPFLAGS)\"" " -DCMAKE_SKIP_RPATH=TRUE" - " -DCMAKE_BUILD_TYPE=Release") + " -DCMAKE_BUILD_TYPE=Release" + " -DCMAKE_INSTALL_LIBDIR=lib") (string-append "INSTALL_LIB=" (assoc-ref %outputs "out") "/lib") (string-append "INSTALL_INCLUDE=" @@ -4558,7 +4559,7 @@ structured and unstructured grid problems."))) (define-public matio (package (name "matio") - (version "1.5.6") + (version "1.5.19") (source (origin (method url-fetch) @@ -4566,7 +4567,7 @@ structured and unstructured grid problems."))) "matio-" version ".tar.gz")) (sha256 (base32 - "0y2qymgxank8wdiwc68ap8bxdzrhvyw86i29yh3xgn4z1njfd9ir")))) + "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) |