diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-09-24 10:11:38 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-24 10:11:38 +0200 |
commit | 11da634a6e64afa2904542e2174aa2a185f9ac3a (patch) | |
tree | 5aeb8e6bd01761813650067af492b1c336886e34 /gnu/packages/maths.scm | |
parent | e5efdbce21a0afcbb3e73cc7b59111ccf62cb532 (diff) | |
parent | 7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd (diff) | |
download | guix-11da634a6e64afa2904542e2174aa2a185f9ac3a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r-- | gnu/packages/maths.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e44ec66cb5..811a25f380 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1553,7 +1553,7 @@ script files.") ,@(package-inputs octave-cli))) (native-inputs `(("qttools" , qttools) ;for lrelease - ("texlive" ,texlive) ;for texi2dvi + ("texlive" ,(texlive-union (list texlive-epsf))) ; for texi2dvi ,@(package-native-inputs octave-cli))) (arguments (substitute-keyword-arguments (package-arguments octave-cli) @@ -2982,7 +2982,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "19.08.0") + (version "19.09.0") (source (origin (method git-fetch) @@ -2991,8 +2991,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "028g4g2081vsgslbdliskfy5q2wknvknw89lk3zp89py6wranxas")))) + (base32 "195j6j8z0jd6xg3a63ywbrbsc6dany795m3fb95nbx1vq0bqqvvn")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) |