diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch | 26 |
3 files changed, 4 insertions, 33 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c627577e41..68a87b1255 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1228,7 +1228,6 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ %D%/packages/patches/wpa-supplicant-krack-followups.patch \ - %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \ %D%/packages/patches/x265-detect512-all-arches.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 808ab5345b..0d040bf296 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2763,18 +2763,16 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "18.02.0") + (version "18.10.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/andrejv/" name "/archive" - "/Version-" version ".tar.gz")) + (uri (string-append "https://github.com/wxMaxima-developers/" name + "/archive/Version-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03kr2rgfp4hcf3is8m8d8f9hj660c3xgrc50vrrfpixx4syh6wvj")) - (patches - (search-patches "wxmaxima-do-not-use-old-gnuplot-parameters.patch")))) + "0c2blq65r0am509p3rjqpwqk6vl5r2yg1p9nh2jczf80vhi3ldas")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) diff --git a/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch b/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch deleted file mode 100644 index 345101bd3a..0000000000 --- a/gnu/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch +++ /dev/null @@ -1,26 +0,0 @@ -This fixes the wxplot2d plotting issue found at -https://github.com/andrejv/wxmaxima/issues/973. - -From 5a0693c97ceaa4935b908f1e478126896952f399 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gunter=20K=C3=B6nigsmann?= <gunter@peterpall.de> -Date: Mon, 19 Feb 2018 05:37:35 +0100 -Subject: [PATCH] Seems I accidentally made wxMaxima to default to parameters - for old gnuplots. Resolves #973 - ---- - data/wxmathml.lisp.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/wxmathml.lisp.in b/data/wxmathml.lisp.in -index a32e3fc3..4e19acaf 100644 ---- a/data/wxmathml.lisp.in -+++ b/data/wxmathml.lisp.in -@@ -43,7 +43,7 @@ - (defvar $wxsubscripts t - "Recognize TeX-style subscripts") - (defvar $wxplot_pngcairo nil "Use gnuplot's pngcairo terminal for new plots?") --(defmvar $wxplot_old_gnuplot t) -+(defmvar $wxplot_old_gnuplot nil) - - (defun $wxstatusbar (status) - (format t "<statusbar>~a</statusbar>~%" status)) |