From 49181f84af46fa5ca6146bdf61aab5fabf652641 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 15 Jan 2020 22:10:31 +0100
Subject: gnu: asymptote: Update to 2.62.
* gnu/packages/plotutils.scm (asymptote): Update to 2.62.
---
gnu/packages/plotutils.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/plotutils.scm')
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index df9821b9d8..8a3afc9605 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@@ -180,14 +180,14 @@ colors, styles, options and details.")
(define-public asymptote
(package
(name "asymptote")
- (version "2.61")
+ (version "2.62")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz"))
(sha256
(base32
- "0gcd75yixn67lpiky70yhaa0ylr8g1cn65bpr9zx78h2vrpsmk7k"))))
+ "0510vnlpfyrvshsxr5lh3klwyhmn2cf4ba1ja476mbv5dcqqbc30"))))
(build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not
--
cgit 1.4.1
From 1b4c5af29c364969dbeb33681d641640283fbced Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 16 Jan 2020 17:00:53 +0100
Subject: gnu: asymptote: Fix GUI.
Fixes bug#39147.
* gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing inputs.
[arguments]: Wrap GUI executable "xasy".
---
gnu/packages/plotutils.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/plotutils.scm')
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 8a3afc9605..7d9b2d8748 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -37,7 +37,9 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
#:use-module (gnu packages compression)
@@ -196,7 +198,7 @@ colors, styles, options and details.")
`(("emacs" ,emacs-minimal)
("gs" ,ghostscript) ;For tests
("perl" ,perl)
- ("texinfo" ,texinfo) ;For generating documentation
+ ("texinfo" ,texinfo) ;For generating documentation
;; For the manual and the tests.
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-epsf
@@ -214,6 +216,8 @@ colors, styles, options and details.")
("gsl" ,gsl)
("libgc" ,libgc)
("python" ,python)
+ ("python-cson" ,python-cson)
+ ("python-pyqt" ,python-pyqt)
("readline" ,readline)
("zlib" ,zlib)))
(arguments
@@ -271,6 +275,14 @@ colors, styles, options and details.")
(for-each (cut install-file <> lisp-dir)
(find-files "." "\\.el$"))
(emacs-generate-autoloads ,name lisp-dir))
+ #t))
+ (add-after 'install-Emacs-data 'wrap-python-script
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Make sure 'xasy' runs with the correct PYTHONPATH.
+ (let* ((out (assoc-ref outputs "out"))
+ (path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/share/asymptote/GUI/xasy.py")
+ `("PYTHONPATH" ":" prefix (,path))))
#t)))))
(home-page "http://asymptote.sourceforge.net")
(synopsis "Script-based vector graphics language")
--
cgit 1.4.1
From 584e46b1e03c18755ee4527164d751ddb20d8d18 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 16 Jan 2020 22:39:23 +0100
Subject: gnu: asymptote: Add missing input.
* gnu/packages/plotutils.scm (asymptote)[inputs]: Add missing input for GUI.
---
gnu/packages/plotutils.scm | 1 +
1 file changed, 1 insertion(+)
(limited to 'gnu/packages/plotutils.scm')
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 7d9b2d8748..237baa932c 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -217,6 +217,7 @@ colors, styles, options and details.")
("libgc" ,libgc)
("python" ,python)
("python-cson" ,python-cson)
+ ("python-numpy" ,python-numpy)
("python-pyqt" ,python-pyqt)
("readline" ,readline)
("zlib" ,zlib)))
--
cgit 1.4.1