mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 03:15:09 -05:00
b6bee63bed
This patch changes three things:
1. package derivations are built using Guile 3.0;
2. 'gexp->derivation' defaults to Guile 3.0;
3. "guile3.0-" packages are deprecated aliases for the regular
package, which now depends on Guile 3.0; "guile2.2-" packages are
introduced; "guile-next" is renamed to "guile".
* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-3.0/fixed): New variable.
(package-for-guile-3.0): Remove.
(package-for-guile-2.2): New variable.
(define-deprecated-guile3.0-package): New macro.
(guile-3.0)[name]: Change to "guile".
(guile-json-3)[native-inputs, inputs]: New fields.
(guile2.2-json): New variable.
(guile3.0-json): Deprecate.
(guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0.
(guile2.2-gdbm-ffi): New variable.
(guile3.0-gdbm-ffi): Deprecate.
(guile-sqlite3): Switch to GUILE-3.0.
(guile2.2-sqlite3): New variable.
(guile3.0-sqlite3): Deprecate.
(guile-bytestructures): Switch to GUILE-3.0.
(guile2.2-bytestructures): New variable.
(guile3.0-bytestructures): Deprecate.
(guile-git): Switch to GUILE-3.0.
(guile2.2-git): New variable.
(guile3.0-git): Deprecate.
(guile-2.2/bug-fix):
* gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0.
* gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0.
* gnu/packages/gtk.scm (guile-cairo)[arguments]: New field.
Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-rsvg): Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-present): Switch to GUILE-3.0.
(guile2.2-present): New variable.
(guile3.0-present): Deprecate.
(guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB.
* gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags.
Switch to GUILE-3.0.
(guile2.2-fibers): New variable.
(guile3.0-fibers): Deprecate.
(guile-syntax-highlight): Switch to GUILE-3.0.
(guile2.2-syntax-highlight): New variable.
(guile3.0-syntax-highlight): Deprecate.
(guile-colorized): Switch to GUILE-3.0.
(guile2.2-colorized): New variable.
(guile3.0-colorized): Deprecate.
(guile-pfds): Switch to GUILE-3.0.
(guile2.2-pfds): New variable.
(guile3.0-pfds): Deprecate.
(guile-simple-zmq): Switch to GUILE-3.0.
(guile2.2-simple-zmq): New variable.
(guile3.0-simple-zmq): Deprecate.
(guile-newt): Switch to GUILE-3.0.
(guile2.2-newt): New variable.
(guile3.0-newt): Deprecate.
(guile-parted): Switch to GUILE-3.0.
(guile2.2-parted): New variable.
(guile3.0-parted): Deprecate.
(guile-config): Switch to GUILE-3.0.
(guile2.2-config): New variable.
(guile3.0-config): Deprecate.
(guile-hall): Switch to GUILE-3.0.
(guile2.2-hall): New variable.
(guile3.0-hall): Deprecate.
(guile-ics): Switch to GUILE-3.0.
(guile2.2-ics): New variable.
(guile3.0-ics): Deprecate.
(guile-wisp)[arguments]: Add 'support-guile-3.0' phase.
Switch to GUILE-3.0.
(guile2.2-wisp): New variable.
(guile3.0-wisp): Deprecate.
(guile-lib): Switch to GUILE-3.0.
(guile2.2-lib): New variable.
(guile3.0-lib): Deprecate.
(guile-minikanren): Switch to GUILE-3.0.
(guile2.2-minikanren): New variable.
(guile3.0-minikanren): Deprecate.
(guile-irregex): Switch to GUILE-3.0.
(guile2.2-irregex): New variable.
(guile3.0-irregex): Deprecate.
(haunt): Switch to GUILE-3.0, and remove GUILE-READER.
(guile2.2-haunt): New variable.
(guile3.0-haunt): Deprecate.
(guile-commonmark): Switch to GUILE-3.0.
(guile2.2-commonmark): New variable.
(guile3.0-commonmark): Deprecate.
(mcron): Switch to GUILE-3.0.
(guile2.0-mcron): New variable.
(guile3.0-mcron): Deprecate.
(guile-picture-language): Switch to GUILE-3.0.
(guile2.2-picture-language): New variable.
(guile3.0-picture-language): Deprecate.
(guile-gi): Switch to GUILE-3.0.
(guile2.2-gi): New variable.
(guile3.0-gi): Deprecate.
(guile-hashing): Switch to GUILE-3.0.
(guile2.2-hashing): New variable.
(guile3.0-hashing): Deprecate.
* gnu/packages/package-management.scm (guix): Switch to GUILE-3.0.
(guile2.2-guix): New variable.
(guile3.0-guix): Deprecate.
(gwl): Replace "guile3.0-" with "guile-".
(guix-jupyter)[source]: Adjust for Guile 3.0.
Switch to GUILE-3.0.
* gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0.
(guile2.2-ssh): New variable.
(guile3.0-ssh): Deprecate.
* gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0.
(guile2.2-shepherd): New variable.
(guile3.0-shepherd): Deprecate.
* gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0.
(guile2.2-mailutils): New variable.
(guile3.0-mailutils): Deprecate.
* gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0.
(guile2.2-charting): New variable.
(guile3.0-charting): Deprecate.
* gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0.
* gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0.
* gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0.
(hpcguix-web): Switch to GUILE-3.0.
* guix/self.scm (specification->package): Refer to the "guile-" variants
instead of "guile3.0-".
* guix/gexp.scm (default-guile): Change to GUILE-3.0.
* build-aux/build-self.scm (build): #:guile-version defaults to "3.0".
* gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED.
314 lines
13 KiB
Scheme
314 lines
13 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
|
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
|
;;; 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.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (gnu packages plotutils)
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
#: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 emacs)
|
|
#: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 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)
|
|
#:use-module (gnu packages))
|
|
|
|
(define-public plotutils
|
|
(package
|
|
(name "plotutils")
|
|
(version "2.6")
|
|
(source (origin
|
|
(method url-fetch)
|
|
(uri (string-append "mirror://gnu/plotutils/plotutils-"
|
|
version ".tar.gz"))
|
|
(sha256
|
|
(base32
|
|
"1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"))
|
|
(patches (search-patches "plotutils-libpng-jmpbuf.patch"))
|
|
(modules '((guix build utils)))
|
|
(snippet
|
|
;; Force the use of libXaw7 instead of libXaw. When not doing
|
|
;; that, libplot.la ends up containing just "-lXaw" (without
|
|
;; "-L/path/to/Xaw"), due to the fact that there is no
|
|
;; libXaw.la, which forces us to propagate libXaw.
|
|
'(begin
|
|
(substitute* "configure"
|
|
(("-lXaw")
|
|
"-lXaw7"))
|
|
#t))))
|
|
(build-system gnu-build-system)
|
|
(inputs `(("libpng" ,libpng)
|
|
("libx11" ,libx11)
|
|
("libxt" ,libxt)
|
|
("libxaw" ,libxaw)))
|
|
|
|
(home-page
|
|
"https://www.gnu.org/software/plotutils/")
|
|
(synopsis "Plotting utilities and library")
|
|
(description
|
|
"GNU Plotutils is a package for plotting and working with 2D graphics.
|
|
It includes a library, \"libplot\", for C and C++ for exporting 2D vector
|
|
graphics in many file formats. It also has support for 2D vector graphics
|
|
animations. The package also contains command-line programs for plotting
|
|
scientific data.")
|
|
(license license:gpl2+)))
|
|
|
|
(define-public guile-charting
|
|
(package
|
|
(name "guile-charting")
|
|
(version "0.2.0")
|
|
(source (origin
|
|
(method url-fetch)
|
|
(uri (string-append "http://wingolog.org/pub/guile-charting/"
|
|
"guile-charting-" version ".tar.gz"))
|
|
(sha256
|
|
(base32
|
|
"0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))
|
|
(modules '((guix build utils)))
|
|
(snippet
|
|
'(begin
|
|
;; Allow builds with Guile 3.0.
|
|
(substitute* "configure"
|
|
(("2\\.2 2\\.0")
|
|
"3.0 2.2 2.0"))
|
|
|
|
;; 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-3.0)))
|
|
(propagated-inputs `(("guile-cairo" ,guile-cairo)))
|
|
(home-page "http://wingolog.org/software/guile-charting/")
|
|
(synopsis "Create charts and graphs in Guile")
|
|
(description
|
|
"Guile-Charting is a Guile Scheme library to create bar charts and graphs
|
|
using the Cairo drawing library.")
|
|
(license license:lgpl2.1+)))
|
|
|
|
(define-public guile2.2-charting
|
|
(package
|
|
(inherit guile-charting)
|
|
(name "guile2.2-charting")
|
|
(inputs `(("guile" ,guile-2.2)))
|
|
(propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
|
|
|
|
(define-public guile3.0-charting
|
|
(deprecated-package "guile3.0-charting" guile-charting))
|
|
|
|
(define-public ploticus
|
|
(package
|
|
(name "ploticus")
|
|
(version "2.42")
|
|
(source (origin
|
|
(method url-fetch)
|
|
(uri (string-append "mirror://sourceforge/ploticus/ploticus/"
|
|
version "/ploticus242_src.tar.gz"))
|
|
(sha256
|
|
(base32
|
|
"1c70cvfvgjh83hj1x21130wb9qfr2rc0x47cxy9kl805yjwy8a9z"))
|
|
(modules '((guix build utils)))
|
|
(snippet
|
|
;; Install binaries in the right place.
|
|
'(begin
|
|
(substitute* "src/Makefile"
|
|
(("INSTALLBIN =.*$")
|
|
(string-append "INSTALLBIN = $(out)/bin")))
|
|
#t))))
|
|
(build-system gnu-build-system)
|
|
(arguments
|
|
'(#:tests? #f
|
|
#:phases
|
|
(modify-phases %standard-phases
|
|
(replace 'configure (lambda _ (chdir "src")))
|
|
(add-before 'install 'make-target-directories
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
(let ((out (assoc-ref outputs "out")))
|
|
(mkdir-p (string-append out "/bin"))
|
|
#t)))
|
|
(add-after 'install 'install-prefabs
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
(dir (string-append out
|
|
"/share/ploticus/prefabs"))
|
|
(bin (string-append out "/bin")))
|
|
(mkdir-p dir)
|
|
|
|
;; Install "prefabs".
|
|
(for-each (lambda (file)
|
|
(let ((target
|
|
(string-append dir "/"
|
|
(basename file))))
|
|
(copy-file file target)))
|
|
(find-files "../prefabs" "."))
|
|
|
|
;; Allow them to be found.
|
|
(wrap-program (string-append bin "/pl")
|
|
`("PLOTICUS_PREFABS" ":" = (,dir)))))))))
|
|
(inputs
|
|
`(("libpng" ,libpng)
|
|
("libx11" ,libx11)
|
|
("zlib" ,zlib)))
|
|
(home-page "http://ploticus.sourceforge.net/")
|
|
(synopsis "Command-line tool for producing plots and charts")
|
|
(description
|
|
"Ploticus is a non-interactive software package for producing plots,
|
|
charts, and graphics from data. Ploticus is good for automated or
|
|
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.64")
|
|
(source
|
|
(origin
|
|
(method url-fetch)
|
|
(uri (string-append "mirror://sourceforge/asymptote/"
|
|
version "/asymptote-" version ".src.tgz"))
|
|
(sha256
|
|
(base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0"))))
|
|
(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
|
|
`(("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-amsfonts
|
|
texlive-epsf
|
|
texlive-latex-base
|
|
texlive-latex-geometry
|
|
texlive-latex-graphics
|
|
texlive-latex-oberdiek ; for ifluatex
|
|
texlive-latex-parskip
|
|
texlive-tex-texinfo)))))
|
|
(inputs
|
|
`(("fftw" ,fftw)
|
|
("freeglut" ,freeglut)
|
|
("glew" ,glew)
|
|
("glm" ,glm)
|
|
("gsl" ,gsl)
|
|
("libgc" ,libgc)
|
|
("python" ,python)
|
|
("python-cson" ,python-cson)
|
|
("python-numpy" ,python-numpy)
|
|
("python-pyqt" ,python-pyqt)
|
|
("readline" ,readline)
|
|
("zlib" ,zlib)))
|
|
(arguments
|
|
`(#:modules ((guix build emacs-utils)
|
|
(guix build gnu-build-system)
|
|
(guix build utils)
|
|
(srfi srfi-26))
|
|
#:imported-modules (,@%gnu-build-system-modules
|
|
(guix build emacs-utils))
|
|
#: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-after 'unpack 'fix-build
|
|
;; XXX: Build process complains about missing "config.h"
|
|
;; and "primitives.h" files.
|
|
(lambda _
|
|
(substitute* (find-files "." "\\.in$")
|
|
(("#include <primitives.h>") "#include \"primitives.h\""))
|
|
(invoke "touch" "prc/config.h")))
|
|
(add-after 'unpack 'move-info-location
|
|
;; Build process installs 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))
|
|
(substitute* "doc/asymptote.texi"
|
|
(("asymptote/asymptote") "asymptote"))
|
|
#t))
|
|
(add-before 'build 'patch-pdf-viewer
|
|
(lambda _
|
|
;; Default to a free pdf viewer.
|
|
(substitute* "settings.cc"
|
|
(("defaultPDFViewer=\"acroread\"")
|
|
"defaultPDFViewer=\"gv\""))
|
|
#t))
|
|
(add-before 'check 'set-HOME
|
|
;; Some tests require write access to $HOME, otherwise leading to
|
|
;; "failed to create directory /homeless-shelter/.asy" error.
|
|
(lambda _
|
|
(setenv "HOME" "/tmp")
|
|
#t))
|
|
(add-after 'install 'install-Emacs-data
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
;; Install related Emacs libraries into an appropriate location.
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
(lisp-dir (string-append out "/share/emacs/site-lisp")))
|
|
(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")
|
|
(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+)))
|