diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/plotutils.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
| download | guix-d88cee1d44a475b6ea276e87a4c98682255b881e.tar guix-d88cee1d44a475b6ea276e87a4c98682255b881e.tar.gz | |
Merge branch 'master' into staging.
With conflicts resolved in:
gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/plotutils.scm')
| -rw-r--r-- | gnu/packages/plotutils.scm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 678963575e..d98f7fce2f 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, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2016-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2016-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; @@ -30,10 +30,13 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) #:use-module (gnu packages cmake) #:use-module (gnu packages emacs) + #:use-module (gnu packages flex) #:use-module (gnu packages xorg) #:use-module (gnu packages image) #:use-module (gnu packages ghostscript) @@ -269,14 +272,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.83") + (version "2.84") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "18w8nf0p1b3h74sk1b7w96kq5gcaq09idi4771ini7p594gsfg7y")) + (base32 "1nycdmlhs3r1qj5miww19683qqjf4hihsjwzwjj1q4mq0hnp0rb7")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. @@ -289,11 +292,14 @@ colors, styles, options and details.") (native-inputs (list autoconf automake + bison boost cmake emacs-minimal + flex ghostscript ;for tests perl + pkg-config rapidjson texinfo ;for generating documentation (texlive-updmap.cfg @@ -317,7 +323,9 @@ colors, styles, options and details.") texlive-latex-parskip texlive-tex-texinfo)))) (inputs - (list fftw + (list bash-minimal + eigen + fftw freeglut glew glm @@ -393,7 +401,7 @@ colors, styles, options and details.") (lambda _ (setenv "HOME" "/tmp"))) (add-after 'install 'install-Emacs-data - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Install related Emacs libraries into an appropriate location. (let ((lisp-dir (string-append #$output "/share/emacs/site-lisp"))) @@ -407,7 +415,7 @@ colors, styles, options and details.") (wrap-program (string-append #$output "/share/asymptote/GUI/xasy.py") `("GUIX_PYTHONPATH" ":" prefix (,path))))))))) - (home-page "http://asymptote.sourceforge.net") + (home-page "https://asymptote.sourceforge.io") (synopsis "Script-based vector graphics language") (description "Asymptote is a powerful descriptive vector graphics language for |