* [PATCH 0/2] Asymptote patches @ 2015-12-26 2:40 Eric Bavier 2015-12-26 2:40 ` [PATCH 1/2] gnu: libgc: Enable C++ support Eric Bavier 2015-12-26 2:40 ` [PATCH 2/2] gnu: Add Asymptote Eric Bavier 0 siblings, 2 replies; 9+ messages in thread From: Eric Bavier @ 2015-12-26 2:40 UTC (permalink / raw To: guix-devel; +Cc: Eric Bavier These patches add the Asymptote plotting package. They would need to be applied to core-updates because they change the libgc configure flags. Eric Bavier (2): gnu: libgc: Enable C++ support. gnu: Add Asymptote. gnu-system.am | 1 + gnu/packages/bdw-gc.scm | 6 ++- gnu/packages/patches/asymptote-gsl2.patch | 33 ++++++++++++++++ gnu/packages/plotutils.scm | 66 +++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/asymptote-gsl2.patch -- 2.6.3 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] gnu: libgc: Enable C++ support. 2015-12-26 2:40 [PATCH 0/2] Asymptote patches Eric Bavier @ 2015-12-26 2:40 ` Eric Bavier 2015-12-27 15:54 ` Mark H Weaver 2015-12-30 16:08 ` Ludovic Courtès 2015-12-26 2:40 ` [PATCH 2/2] gnu: Add Asymptote Eric Bavier 1 sibling, 2 replies; 9+ messages in thread From: Eric Bavier @ 2015-12-26 2:40 UTC (permalink / raw To: guix-devel; +Cc: Eric Bavier * gnu/packages/bdw-gc.scm (libgc-7.2, libgc)[arguments]: Add --enable-cplusplus to #:configure-flags. --- gnu/packages/bdw-gc.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 6615891..0a483ef 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -39,7 +39,9 @@ (arguments ;; Make it so that we don't rely on /proc. This is especially useful in ;; an initrd run before /proc is mounted. - '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"))) + '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES" + ;; Install gc_cpp.h et al. + "--enable-cplusplus"))) (outputs '("out" "debug")) (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") @@ -103,4 +105,4 @@ lock-free code, experiment with thread programming paradigms, etc.") (inputs `(("libatomic-ops" ,libatomic-ops))) ;; 'USE_LIBC_PRIVATES' is now the default. - (arguments '()))) + (arguments '(#:configure-flags '("--enable-cplusplus"))))) -- 2.6.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: libgc: Enable C++ support. 2015-12-26 2:40 ` [PATCH 1/2] gnu: libgc: Enable C++ support Eric Bavier @ 2015-12-27 15:54 ` Mark H Weaver 2015-12-27 11:38 ` Eric Bavier 2015-12-30 16:08 ` Ludovic Courtès 1 sibling, 1 reply; 9+ messages in thread From: Mark H Weaver @ 2015-12-27 15:54 UTC (permalink / raw To: Eric Bavier; +Cc: guix-devel Hi Eric, Eric Bavier <bavier@member.fsf.org> writes: > * gnu/packages/bdw-gc.scm (libgc-7.2, libgc)[arguments]: Add > --enable-cplusplus to #:configure-flags. This will need to be done in 'core-updates', because it will require a full rebuild. If you want 'asymptote' before the next core-updates cycle, we could temporarily add a 'libgc-for-c++' package. Thoughts? Mark ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: libgc: Enable C++ support. 2015-12-27 15:54 ` Mark H Weaver @ 2015-12-27 11:38 ` Eric Bavier 0 siblings, 0 replies; 9+ messages in thread From: Eric Bavier @ 2015-12-27 11:38 UTC (permalink / raw To: Mark H Weaver; +Cc: guix-devel On Sun, 27 Dec 2015 10:54:28 -0500 Mark H Weaver <mhw@netris.org> wrote: > Hi Eric, > > Eric Bavier <bavier@member.fsf.org> writes: > > * gnu/packages/bdw-gc.scm (libgc-7.2, libgc)[arguments]: Add > > --enable-cplusplus to #:configure-flags. > > This will need to be done in 'core-updates', because it will require a > full rebuild. If you want 'asymptote' before the next core-updates > cycle, we could temporarily add a 'libgc-for-c++' package. > > Thoughts? I don't need it really soon, so I would be fine putting both patches in core-updates, but the 'libgc-for-c++' would be nice for others who might like to use it. I'll send an updated patch. `~Eric ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: libgc: Enable C++ support. 2015-12-26 2:40 ` [PATCH 1/2] gnu: libgc: Enable C++ support Eric Bavier 2015-12-27 15:54 ` Mark H Weaver @ 2015-12-30 16:08 ` Ludovic Courtès 1 sibling, 0 replies; 9+ messages in thread From: Ludovic Courtès @ 2015-12-30 16:08 UTC (permalink / raw To: Eric Bavier; +Cc: guix-devel Eric Bavier <bavier@member.fsf.org> skribis: > * gnu/packages/bdw-gc.scm (libgc-7.2, libgc)[arguments]: Add > --enable-cplusplus to #:configure-flags. OK for ‘core-updates’, as Mark noted. (You can also add libgc-for-c++ in ‘master’ if you want.) Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] gnu: Add Asymptote. 2015-12-26 2:40 [PATCH 0/2] Asymptote patches Eric Bavier 2015-12-26 2:40 ` [PATCH 1/2] gnu: libgc: Enable C++ support Eric Bavier @ 2015-12-26 2:40 ` Eric Bavier 2015-12-30 16:11 ` Ludovic Courtès 1 sibling, 1 reply; 9+ messages in thread From: Eric Bavier @ 2015-12-26 2:40 UTC (permalink / raw To: guix-devel; +Cc: Eric Bavier * gnu/packages/plotutils.scm (asymptote): New variable. * gnu/packages/patches/asymptote-gsl2.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/patches/asymptote-gsl2.patch | 33 ++++++++++++++++ gnu/packages/plotutils.scm | 66 +++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 gnu/packages/patches/asymptote-gsl2.patch diff --git a/gnu-system.am b/gnu-system.am index 3c8f402..17196c3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -406,6 +406,7 @@ dist_patch_DATA = \ gnu/packages/patches/agg-am_c_prototype.patch \ gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \ gnu/packages/patches/apr-skip-getservbyname-test.patch \ + gnu/packages/patches/asymptote-gsl2.patch \ gnu/packages/patches/ath9k-htc-firmware-binutils.patch \ gnu/packages/patches/ath9k-htc-firmware-gcc.patch \ gnu/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/patches/asymptote-gsl2.patch b/gnu/packages/patches/asymptote-gsl2.patch new file mode 100644 index 0000000..4f73d16 --- /dev/null +++ b/gnu/packages/patches/asymptote-gsl2.patch @@ -0,0 +1,33 @@ +From 71ff9e769ba5d9995b367201f0d41b7a8dedab9d Mon Sep 17 00:00:00 2001 +From: John Bowman <bowman@ualberta.ca> +Date: Sat, 14 Nov 2015 01:25:56 -0700 +Subject: [PATCH] Support GSL 2.0. + +--- + gsl.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gsl.cc b/gsl.cc +index b500557..0f81dc6 100644 +--- a/gsl.cc ++++ b/gsl.cc +@@ -27,6 +27,7 @@ + #include <gsl/gsl_rng.h> + #include <gsl/gsl_randist.h> + #include <gsl/gsl_cdf.h> ++#include <gsl/gsl_version.h> + + #include "opsymbols.h" + +@@ -1088,7 +1089,11 @@ void gen_rungsl_venv(venv &ve) + addGSLDOUBLE2Func<gsl_sf_ellint_F>(SYM(F)); + addGSLDOUBLE2Func<gsl_sf_ellint_E>(SYM(E)); + addGSLDOUBLE3Func<gsl_sf_ellint_P>(SYM(P),SYM(phi),SYM(k),SYM(n)); ++#if GSL_MAJOR_VERSION >= 2 ++ addGSLDOUBLE2Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k)); ++#else + addGSLDOUBLE3Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k),SYM(n)); ++#endif + addGSLDOUBLE2Func<gsl_sf_ellint_RC>(SYM(RC),SYM(x),SYM(y)); + addGSLDOUBLE3Func<gsl_sf_ellint_RD>(SYM(RD),SYM(x),SYM(y),SYM(z)); + addGSLDOUBLE3Func<gsl_sf_ellint_RF>(SYM(RF),SYM(x),SYM(y),SYM(z)); diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 6166226..5642a0b 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,21 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages xorg) #:use-module (gnu packages image) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages guile) + #:use-module (gnu packages gl) #:use-module (gnu packages gtk) + #:use-module (gnu packages maths) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages readline) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages texlive) #:use-module (gnu packages compression) #:use-module (gnu packages)) @@ -156,3 +167,58 @@ just-in-time graph generation, handles date and time data nicely, and has basic statistical capabilities. It allows significant user control over colors, styles, options and details.") (license license:gpl2+))) + +(define-public asymptote + (package + (name "asymptote") + (version "2.35") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asymptote/" + version "/asymptote-" version ".src.tgz")) + (sha256 + (base32 + "11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z")) + (patches (list (search-patch "asymptote-gsl2.patch"))))) + (build-system gnu-build-system) + (native-inputs + `(("gs" ,ghostscript) ;For tests + ("texinfo" ,texinfo) ;For generating documentation + ("texlive" ,texlive) ;For tests and documentation + ("perl" ,perl))) + (inputs + `(("fftw" ,fftw) + ("freeglut" ,freeglut) + ("gsl" ,gsl) + ("libgc" ,libgc) + ("python" ,python-2) + ("readline" ,readline) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags + (list (string-append "--enable-gc=" (assoc-ref %build-inputs "libgc")) + (string-append "--with-latex=" + (assoc-ref %outputs "out") + "/share/texmf/tex/latex") + (string-append "--with-context=" + (assoc-ref %outputs "out") + "/share/texmf/tex/context/third")) + #:phases (modify-phases %standard-phases + (add-before 'build 'patch-pdf-viewer + (lambda _ + ;; Default to a free pdf viewer + (substitute* "settings.cc" + (("defaultPDFViewer=\"acroread\"") + "defaultPDFViewer=\"gv\""))))))) + (home-page "http://asymptote.sourceforge.net") + (synopsis "Script-based vector graphics language") + (description + "Asymptote is a powerful descriptive vector graphics language for +technical drawing, inspired by MetaPost but with an improved C++-like syntax. +Asymptote provides for figures the same high-quality level of typesetting that +LaTeX does for scientific text.") + ;; Most source files do not contain license statements, but the README + ;; contains: "All source files in the Asymptote project, unless explicitly + ;; noted otherwise, are released under version 3 (or later) of the GNU + ;; Lesser General Public License" + (license license:lgpl3+))) -- 2.6.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] gnu: Add Asymptote. 2015-12-26 2:40 ` [PATCH 2/2] gnu: Add Asymptote Eric Bavier @ 2015-12-30 16:11 ` Ludovic Courtès 2015-12-31 20:30 ` Eric Bavier 0 siblings, 1 reply; 9+ messages in thread From: Ludovic Courtès @ 2015-12-30 16:11 UTC (permalink / raw To: Eric Bavier; +Cc: guix-devel Eric Bavier <bavier@member.fsf.org> skribis: > * gnu/packages/plotutils.scm (asymptote): New variable. > * gnu/packages/patches/asymptote-gsl2.patch: New file. > * gnu-system.am (dist_patch_DATA): Add it. [...] > + (native-inputs > + `(("gs" ,ghostscript) ;For tests > + ("texinfo" ,texinfo) ;For generating documentation > + ("texlive" ,texlive) ;For tests and documentation Would it be enough to depend on texlive-bin? Alternately, could documentation be made a separate package? Otherwise LGTM, thanks! Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] gnu: Add Asymptote. 2015-12-30 16:11 ` Ludovic Courtès @ 2015-12-31 20:30 ` Eric Bavier 2016-01-01 18:10 ` Ludovic Courtès 0 siblings, 1 reply; 9+ messages in thread From: Eric Bavier @ 2015-12-31 20:30 UTC (permalink / raw To: Ludovic Courtès; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 1262 bytes --] On Wed, 30 Dec 2015 17:11:08 +0100 ludo@gnu.org (Ludovic Courtès) wrote: > Eric Bavier <bavier@member.fsf.org> skribis: > > > * gnu/packages/plotutils.scm (asymptote): New variable. > > * gnu/packages/patches/asymptote-gsl2.patch: New file. > > * gnu-system.am (dist_patch_DATA): Add it. > > [...] > > > + (native-inputs > > + `(("gs" ,ghostscript) ;For tests > > + ("texinfo" ,texinfo) ;For generating documentation > > + ("texlive" ,texlive) ;For tests and documentation > > Would it be enough to depend on texlive-bin? Both tests and documentation creation depend on various .fmt and .sty files from the texlive package, so texlive-bin would not be enough it seems. > Alternately, could documentation be made a separate package? Do you mean "package" rather than "output"? I had tried doing a separate output originally. The issue is that the 'asy' binary in "out" ends up with a reference to the "doc" output for the 'help' command in its interactive mode. > Otherwise LGTM, thanks! Attached is an updated patch suitable for master that adds a libgc-for-c++ since it's a semi-private package. Is this alright, or should it be two patches? `~Eric [-- Attachment #2: 0002-gnu-Add-Asymptote.patch --] [-- Type: text/plain, Size: 7298 bytes --] From 2faf8a6c093739c4b8980b337a6a0ed659e84ebf Mon Sep 17 00:00:00 2001 From: Eric Bavier <bavier@member.fsf.org> Date: Sun, 20 Dec 2015 16:24:24 -0600 Subject: [PATCH 2/2] gnu: Add Asymptote. * gnu/packages/bdw-gc.scm (libgc-for-c++): New variable. * gnu/packages/plotutils.scm (asymptote): New variable. * gnu/packages/patches/asymptote-gsl2.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + gnu/packages/bdw-gc.scm | 6 +++ gnu/packages/patches/asymptote-gsl2.patch | 33 ++++++++++++++++ gnu/packages/plotutils.scm | 66 +++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 gnu/packages/patches/asymptote-gsl2.patch diff --git a/gnu-system.am b/gnu-system.am index 3c8f402..17196c3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -406,6 +406,7 @@ dist_patch_DATA = \ gnu/packages/patches/agg-am_c_prototype.patch \ gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \ gnu/packages/patches/apr-skip-getservbyname-test.patch \ + gnu/packages/patches/asymptote-gsl2.patch \ gnu/packages/patches/ath9k-htc-firmware-binutils.patch \ gnu/packages/patches/ath9k-htc-firmware-gcc.patch \ gnu/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 0a483ef..9079a08 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -106,3 +106,9 @@ lock-free code, experiment with thread programming paradigms, etc.") ;; 'USE_LIBC_PRIVATES' is now the default. (arguments '(#:configure-flags '("--enable-cplusplus"))))) + +;;; TODO: Remove this package once libgc is updated from core-updates. +(define-public libgc-for-c++ + (package (inherit libgc) + (arguments + '(#:configure-flags '("--enable-cplusplus"))))) ;install gc_cpp.h et al. diff --git a/gnu/packages/patches/asymptote-gsl2.patch b/gnu/packages/patches/asymptote-gsl2.patch new file mode 100644 index 0000000..4f73d16 --- /dev/null +++ b/gnu/packages/patches/asymptote-gsl2.patch @@ -0,0 +1,33 @@ +From 71ff9e769ba5d9995b367201f0d41b7a8dedab9d Mon Sep 17 00:00:00 2001 +From: John Bowman <bowman@ualberta.ca> +Date: Sat, 14 Nov 2015 01:25:56 -0700 +Subject: [PATCH] Support GSL 2.0. + +--- + gsl.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gsl.cc b/gsl.cc +index b500557..0f81dc6 100644 +--- a/gsl.cc ++++ b/gsl.cc +@@ -27,6 +27,7 @@ + #include <gsl/gsl_rng.h> + #include <gsl/gsl_randist.h> + #include <gsl/gsl_cdf.h> ++#include <gsl/gsl_version.h> + + #include "opsymbols.h" + +@@ -1088,7 +1089,11 @@ void gen_rungsl_venv(venv &ve) + addGSLDOUBLE2Func<gsl_sf_ellint_F>(SYM(F)); + addGSLDOUBLE2Func<gsl_sf_ellint_E>(SYM(E)); + addGSLDOUBLE3Func<gsl_sf_ellint_P>(SYM(P),SYM(phi),SYM(k),SYM(n)); ++#if GSL_MAJOR_VERSION >= 2 ++ addGSLDOUBLE2Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k)); ++#else + addGSLDOUBLE3Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k),SYM(n)); ++#endif + addGSLDOUBLE2Func<gsl_sf_ellint_RC>(SYM(RC),SYM(x),SYM(y)); + addGSLDOUBLE3Func<gsl_sf_ellint_RD>(SYM(RD),SYM(x),SYM(y),SYM(z)); + addGSLDOUBLE3Func<gsl_sf_ellint_RF>(SYM(RF),SYM(x),SYM(y),SYM(z)); diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 6166226..8ea4a73 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,21 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages xorg) #:use-module (gnu packages image) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages guile) + #:use-module (gnu packages gl) #:use-module (gnu packages gtk) + #:use-module (gnu packages maths) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages readline) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages texlive) #:use-module (gnu packages compression) #:use-module (gnu packages)) @@ -156,3 +167,58 @@ just-in-time graph generation, handles date and time data nicely, and has basic statistical capabilities. It allows significant user control over colors, styles, options and details.") (license license:gpl2+))) + +(define-public asymptote + (package + (name "asymptote") + (version "2.35") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asymptote/" + version "/asymptote-" version ".src.tgz")) + (sha256 + (base32 + "11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z")) + (patches (list (search-patch "asymptote-gsl2.patch"))))) + (build-system gnu-build-system) + (native-inputs + `(("gs" ,ghostscript) ;For tests + ("texinfo" ,texinfo) ;For generating documentation + ("texlive" ,texlive) ;For tests and documentation + ("perl" ,perl))) + (inputs + `(("fftw" ,fftw) + ("freeglut" ,freeglut) + ("gsl" ,gsl) + ("libgc" ,libgc-for-c++) + ("python" ,python-2) + ("readline" ,readline) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags + (list (string-append "--enable-gc=" (assoc-ref %build-inputs "libgc")) + (string-append "--with-latex=" + (assoc-ref %outputs "out") + "/share/texmf/tex/latex") + (string-append "--with-context=" + (assoc-ref %outputs "out") + "/share/texmf/tex/context/third")) + #:phases (modify-phases %standard-phases + (add-before 'build 'patch-pdf-viewer + (lambda _ + ;; Default to a free pdf viewer + (substitute* "settings.cc" + (("defaultPDFViewer=\"acroread\"") + "defaultPDFViewer=\"gv\""))))))) + (home-page "http://asymptote.sourceforge.net") + (synopsis "Script-based vector graphics language") + (description + "Asymptote is a powerful descriptive vector graphics language for +technical drawing, inspired by MetaPost but with an improved C++-like syntax. +Asymptote provides for figures the same high-quality level of typesetting that +LaTeX does for scientific text.") + ;; Most source files do not contain license statements, but the README + ;; contains: "All source files in the Asymptote project, unless explicitly + ;; noted otherwise, are released under version 3 (or later) of the GNU + ;; Lesser General Public License" + (license license:lgpl3+))) -- 2.6.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] gnu: Add Asymptote. 2015-12-31 20:30 ` Eric Bavier @ 2016-01-01 18:10 ` Ludovic Courtès 0 siblings, 0 replies; 9+ messages in thread From: Ludovic Courtès @ 2016-01-01 18:10 UTC (permalink / raw To: Eric Bavier; +Cc: guix-devel Eric Bavier <bavier@member.fsf.org> skribis: > On Wed, 30 Dec 2015 17:11:08 +0100 > ludo@gnu.org (Ludovic Courtès) wrote: > >> Eric Bavier <bavier@member.fsf.org> skribis: >> >> > * gnu/packages/plotutils.scm (asymptote): New variable. >> > * gnu/packages/patches/asymptote-gsl2.patch: New file. >> > * gnu-system.am (dist_patch_DATA): Add it. >> >> [...] >> >> > + (native-inputs >> > + `(("gs" ,ghostscript) ;For tests >> > + ("texinfo" ,texinfo) ;For generating documentation >> > + ("texlive" ,texlive) ;For tests and documentation >> >> Would it be enough to depend on texlive-bin? > > Both tests and documentation creation depend on various .fmt and .sty > files from the texlive package, so texlive-bin would not be enough it > seems. OK. >> Alternately, could documentation be made a separate package? > > Do you mean "package" rather than "output"? I was thinking of a separate package (as done for NumPy IIRC), but maybe that’s impractical. > I had tried doing a separate output originally. The issue is that the > 'asy' binary in "out" ends up with a reference to the "doc" output for > the 'help' command in its interactive mode. OK. Perhaps you could leave that as a comment to future readers who will want to do the same. :-) The same problem arises with TeX Live itself, where ‘texdoc’ keeps a reference to the documentation directory, preventing the addition of a separate output. Similarly with Perl and ‘perldoc’. Annoying! >> Otherwise LGTM, thanks! > > Attached is an updated patch suitable for master that adds a > libgc-for-c++ since it's a semi-private package. Is this alright, or > should it be two patches? That’s OK. > From 2faf8a6c093739c4b8980b337a6a0ed659e84ebf Mon Sep 17 00:00:00 2001 > From: Eric Bavier <bavier@member.fsf.org> > Date: Sun, 20 Dec 2015 16:24:24 -0600 > Subject: [PATCH 2/2] gnu: Add Asymptote. > > * gnu/packages/bdw-gc.scm (libgc-for-c++): New variable. > * gnu/packages/plotutils.scm (asymptote): New variable. > * gnu/packages/patches/asymptote-gsl2.patch: New file. > * gnu-system.am (dist_patch_DATA): Add it. [...] > +;;; TODO: Remove this package once libgc is updated from core-updates. > +(define-public libgc-for-c++ > + (package (inherit libgc) Please change the ‘name’ field to, say, “libgc-cxx”, so that UIs don’t show two different “libgc” packages. Otherwise LGTM, thanks! Ludo’. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-01-01 18:10 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-26 2:40 [PATCH 0/2] Asymptote patches Eric Bavier 2015-12-26 2:40 ` [PATCH 1/2] gnu: libgc: Enable C++ support Eric Bavier 2015-12-27 15:54 ` Mark H Weaver 2015-12-27 11:38 ` Eric Bavier 2015-12-30 16:08 ` Ludovic Courtès 2015-12-26 2:40 ` [PATCH 2/2] gnu: Add Asymptote Eric Bavier 2015-12-30 16:11 ` Ludovic Courtès 2015-12-31 20:30 ` Eric Bavier 2016-01-01 18:10 ` Ludovic Courtès
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.