From 4906a0b29d720b288bf8bebcb774e3f03b4c8c56 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Apr 2019 23:34:58 +0200 Subject: gnu: asymptote: Update to 2.49. * gnu/packages/plotutils.scm (asymptote): Update to 2.49. [native-inputs]: Re-order inputs. [inputs]: Update to Python 3. Add glew and glm. [arguments]: Add a phase to fix build. Remove unnecessary fix for tests. --- gnu/packages/plotutils.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 22a62a0f5b..63b36830c8 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -171,21 +171,23 @@ (define-public ploticus (define-public asymptote (package (name "asymptote") - (version "2.47") + (version "2.49") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 (base32 - "0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971")))) + "1vljhq68gyc2503l9fj76rk1q4a4db9a1sp3fdfagqqmirnmybp5")))) (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 ;; currently useful. (native-inputs - `(("gs" ,ghostscript) ;For tests - ("texinfo" ,texinfo) ;For generating documentation + `(("emacs" ,emacs-minimal) + ("gs" ,ghostscript) ;For tests + ("perl" ,perl) + ("texinfo" ,texinfo) ;For generating documentation ;; For the manual and the tests. ("texlive" ,(texlive-union (list texlive-fonts-amsfonts texlive-latex-amsfonts @@ -193,15 +195,15 @@ (define-public asymptote texlive-latex-graphics texlive-latex-oberdiek ; for ifluatex texlive-latex-parskip - texlive-tex-texinfo))) - ("emacs" ,emacs-minimal) - ("perl" ,perl))) + texlive-tex-texinfo))))) (inputs `(("fftw" ,fftw) ("freeglut" ,freeglut) + ("glew" ,glew) + ("glm" ,glm) ("gsl" ,gsl) ("libgc" ,libgc) - ("python" ,python-2) + ("python" ,python) ("readline" ,readline) ("zlib" ,zlib))) (arguments @@ -221,6 +223,13 @@ (define-public asymptote "/share/texmf/tex/context/third")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build + ;; XXX: Build process complains about missing "config.h" + ;; and "primitives.h" files. + (lambda _ + (substitute* (find-files "." "\\.in$") + (("#include ") "#include \"primitives.h\"")) + (invoke "touch" "prc/config.h"))) (add-before 'build 'patch-pdf-viewer (lambda _ ;; Default to a free pdf viewer. @@ -233,12 +242,6 @@ (define-public asymptote ;; "failed to create directory /homeless-shelter/.asy" error. (lambda _ (setenv "HOME" "/tmp") - ;; The "gs" test fails, complaining about an incompatible - ;; Ghostscript version. Not sure what's going on... Is this - ;; because I've just replaced texlive with texlive-union? - (substitute* "tests/Makefile" - (("^(TESTDIRS =.*) gs(.*)" begin end) - (string-append begin " " end))) #t)) (add-after 'install 'install-Emacs-data (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 55a604db4ee55ae25166df6f83e222c3caf33273 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Apr 2019 19:49:38 +0200 Subject: gnu: asymptote: Fix info file location. * gnu/packages/plotutils.scm (asymptote): Fix info file location so it appears in the top-level directory. --- gnu/packages/plotutils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 63b36830c8..c2311958f3 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -230,6 +230,14 @@ (define-public asymptote (substitute* (find-files "." "\\.in$") (("#include ") "#include \"primitives.h\"")) (invoke "touch" "prc/config.h"))) + (add-after 'unpack 'move-info-location + ;; Build process install info file in the unusual + ;; "%out/share/info/asymptote/" location. Move it to + ;; "%out/share/info/" so it appears in the top-level directory. + (lambda _ + (substitute* "doc/png/Makefile.in" + (("(\\$\\(infodir\\))/asymptote" _ infodir) infodir)) + #t)) (add-before 'build 'patch-pdf-viewer (lambda _ ;; Default to a free pdf viewer. -- cgit v1.2.3 From d320f25e0c37dc1f1e63a3772852d1af80c7653b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Apr 2019 19:53:57 +0200 Subject: gnu: Update copyright line. * gnu/packages/plotutils.scm: Update copyright line. --- gnu/packages/plotutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index c2311958f3..96b1cc9bf1 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 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From 325a2e35dcccb37498fed1c211aa4120103056ba Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Apr 2019 20:16:40 +0200 Subject: gnu: asymptote: Fix direntry in info file. * gnu/packages/plotutils.scm (asymptote): Fix direntry in info file. --- gnu/packages/plotutils.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 96b1cc9bf1..35e632cf8c 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -237,6 +237,8 @@ (define-public asymptote (lambda _ (substitute* "doc/png/Makefile.in" (("(\\$\\(infodir\\))/asymptote" _ infodir) infodir)) + (substitute* "doc/asymptote.texi" + (("asymptote/asymptote") "asymptote")) #t)) (add-before 'build 'patch-pdf-viewer (lambda _ -- cgit v1.2.3 From ece7731eacc1e7578a638323544750a284a27055 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Apr 2019 14:30:34 +0200 Subject: gnu: guile-charting: Install .go files in the right place. * gnu/packages/plotutils.scm (guile-charting)[source](modules, snippet): New fields. --- gnu/packages/plotutils.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/plotutils.scm') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 35e632cf8c..b4ea20e387 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -93,7 +93,16 @@ (define-public guile-charting "guile-charting-" version ".tar.gz")) (sha256 (base32 - "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")))) + "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")) + (modules '((guix build utils))) + (snippet + '(begin + ;; By default, .go files would be installed to + ;; $libdir/…/ccache instead of $libdir/…/site-ccache. Fix + ;; that. + (substitute* (find-files "." "^Makefile\\.in$") + (("/ccache") "/site-ccache")) + #t)))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3