diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1666d6e420..837d055c8e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8457,7 +8457,7 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "5.5.2") + (version "6.1.1") (source (origin (method url-fetch) @@ -8465,9 +8465,9 @@ (define-public scilab (string-append "https://www.scilab.org/download/" version "/scilab-" version "-src.tar.gz")) (sha256 - (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57")))) + (base32 "01s28d162znwl7na0qlclzmfg6h7kwgmly1hr5vc51fkidilf4z5")))) (build-system gnu-build-system) - (native-inputs (list pkg-config gfortran)) + (native-inputs (list pkg-config gfortran eigen)) (inputs (list libxml2 `(,pcre "bin") `(,pcre "out") @@ -8495,7 +8495,9 @@ (define-public scilab "--without-javasci" "--disable-build-help" "--with-external-scirenderer" - ;; Tcl and Tk library locations. + ;; Disable the Scicos modelica compiler, which requires ocamlc. + "--without-modelica" + ;; Header and library locations. (string-append "--with-tcl-include=" (string-drop-right (search-input-file %build-inputs "include/tcl.h") @@ -8512,6 +8514,10 @@ (define-public scilab (string-drop-right (search-input-directory %build-inputs "lib/tk8.6") (string-length "/tk8.6"))) + (string-append "--with-eigen-include=" + (string-drop-right + (search-input-file %build-inputs "include/eigen3/Eigen/Sparse") + (string-length "/Eigen/Sparse"))) ;; There are some 2018-fortran errors that are ignored ;; with this fortran compiler flag. "FFLAGS=-fallow-argument-mismatch") @@ -8538,6 +8544,9 @@ (define-public scilab (("(H5Rdereference\\(_iDatasetId, H5R_OBJECT, )&(.*)\\);$" all common ref) (string-append common ref))) + (substitute* "modules/string/includes/os_string.h" + (("#include ") + "#include ")) ;; fix multiple definitions (substitute* "modules/tclsci/src/c/TCL_Command.h" (("^__thread") @@ -8562,4 +8571,4 @@ (define-public scilab statistical analysis, image enhancement, fluid dynamics simulations, numerical optimization, and modeling, simulation of explicit and implicit dynamical systems and symbolic manipulations.") - (license license:cecill))) ;CeCILL v2.1 + (license license:gpl2+)))