Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2016-12-04 17:41:36 +01:00
commit a351fc8369
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
67 changed files with 1911 additions and 3145 deletions

View file

@ -173,7 +173,7 @@ by no means limited to these applications.) This package provides XML DTDs.")
(define-public dblatex
(package
(name "dblatex")
(version "0.3.5")
(version "0.3.9")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/dblatex/dblatex/"
@ -181,7 +181,7 @@ by no means limited to these applications.) This package provides XML DTDs.")
version ".tar.bz2"))
(sha256
(base32
"0h3472n33pabrn8qwggsahkrjx8lybpwlc3zprby3w3w3x5i830f"))))
"0pdizc5rjywwzxa1qqhdmba5zr35pbmdwbysalsid7xw87w3kq06"))))
(build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
@ -192,6 +192,15 @@ by no means limited to these applications.) This package provides XML DTDs.")
("libxslt" ,libxslt))) ;for xsltproc
(arguments
`(#:python ,python-2 ;'print' syntax
;; Using setuptools causes an invalid "package_base" path in
;; out/bin/.dblatex-real due to a missing leading '/'. This is caused
;; by dblatex's setup.py stripping the root path when creating the
;; script. (dblatex's setup.py still uses distutils and thus has to
;; create the script by itself. The feature for creating scripts is one
;; of setuptools' features.)
;; See this thread for details:
;; https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00030.html
#:use-setuptools? #f
#:tests? #f ;no 'test' command
#:phases
(alist-cons-after