From f3b98f4fec43c951a9e28c67561395992bf190a7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:30:54 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) This patch contains the changes where removing setuptools from the inputs affected some code-lines beside. * gnu/packages/admin.scm (ansible): Remove all [inputs], [native-inputs] and [propagated-inputs] where python-setuptools or python2-setuptools are the sole entries. Remove python-setuptools and python2-setuptools listed on a line by its own from [inputs], [native-inputs] and [propagated-inputs]. * gnu/packages/backup.scm (duplicity): Likewise. * gnu/packages/bioinformatics.scm (bamm, python2-pybedtools, python2-bx-python, python2-dendropy, python-pysam, python2-pysam, clipper, crossmap, cutadapt, deeptools, grit, idr, python2-warpedlmm, pbtranscript-tofu, seqmagick): Likewise. * gnu/packages/docbook.scm (dblatex): Likewise. * gnu/packages/freedesktop.scm (python-pyxdg, python2-pyxdg): Likewise. * gnu/packages/lirc.scm (python2-lirc): Likewise. * gnu/packages/mp3.scm (eyed3): Likewise. * gnu/packages/nutrition.scm (gourmet): Likewise. * gnu/packages/openstack.scm (python-hacking, python2-hacking, python-os-testr, python2-os-testr, python-stevedore, python2-stevedore, python-tempest-lib, python2-tempest-lib, python-oslo.log, python2-oslo.log, python-keystoneclient, python2-keystoneclient): Likewise. * gnu/packages/password-utils.scm (assword): Likewise. * gnu/packages/python.scm (python-passlib, python2-passlib, python-babel, python2-babel, python-parse-type, python-pytest, python2-pytest, python-scripttest, python2-scripttest, python-testtools, python2-testtools, python-testscenarios, python2-testscenarios, python-subunit, python2-subunit, python-pbr-0.11, python-pbr, python2-pbr, python-testrepository, python2-testrepository, behave, python-wheel, python2-wheel, python-requests, python2-requests, python-jsonschema, python2-jsonschema, python-pyjwt, python2-pyjwt, python-virtualenv, python2-virtualenv, python-jinja2, python2-jinja2, python-joblib, python2-joblib, python-sphinx, python2-sphinx, python-feedgenerator, python2-feedgenerator, python-scikit-image, python2-scikit-image, python-redis, python2-redis, python2-fastlmm, python-numpydoc, python2-numpydoc, python-matplotlib, python2-matplotlib, python2-pysnptools, python-rpy2, python2-rpy2, python-pillow, python2-pillow, python-pycparser, python2-pycparser, python-cffi, python2-cffi, python-cairocffi, python2-cairocffi, python-drmaa, python2-drmaa, python-pathpy, python2-pathpy, python-simplegeneric, python2-simplegeneric, python-ipython, python2-ipython, python-apsw, python2-apsw, python-lxml, python2-lxml, python-networkx, python2-networkx, python-pyzmq, python2-pyzmq, python-mccabe, python2-mccabe, python-mccabe-0.2.1, python-flake8, python2-flake8, python-flake8-2.2.4, python-mistune, python2-mistune, python-ptyprocess, python2-ptyprocess, python-llfuse, python2-llfuse, python-webob, python2-webob, python-xlrd, python2-xlrd, python-tables, python2-tables, python-pip, python2-pip, python-libarchive-c, python2-libarchive-c, python-docopt, python2-docopt, python-pyrfc3339, python2-pyrfc3339, python-configobj, python2-configobj, python-clint, python2-clint, python-rply, python2-rply, python2-rpython, python-widgetsnbextension, python2-widgetsnbextension jupyter, python-jupyter-console, python2-jupyter-console, python-hy, python2-hy, python-urllib3, python2-urllib3, python-rsa, python2-rsa, python-tox, python2-tox, python2-hypothesis, python-paste, python2-paste, python-pastescript, python2-pastescript, python2-unicodecsv, python-pkgconfig, python2-pkgconfig, python2-rope, python-sqlparse, python2-sqlparse, python-gevent, python2-gevent, python-tabulate, python2-tabulate, python-arrow, python2-arrow, python-cleo, python2-cleo, python-fake-factory, python2-fake-factory, ptpython): Likewise. * gnu/packages/rdf.scm (python-rdflib, python2-rdflib): Likewise. * gnu/packages/terminals.scm (asciinema): Likewise. * gnu/packages/version-control.scm (git-annex-remote-hubic): Likewise. * gnu/packages/xdisorg.scm (arandr): Likewise. --- gnu/packages/docbook.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 3d18d459bd..8efe417054 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -185,8 +185,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs - `(("python-setuptools" ,python-setuptools) - ("texlive" ,texlive) + `(("texlive" ,texlive) ("imagemagick" ,imagemagick) ;for convert ("inkscape" ,inkscape) ;for svg conversion ("docbook" ,docbook-xml) -- cgit v1.2.3 From cf7daaf5dae5d0ac4bbc4eda39db041f22b67cf4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 27 Nov 2016 09:49:15 +0100 Subject: gnu: docbook-xsl: Update to 1.79.1. * gnu/packages/docbook.scm (docbook-xsl): Update to 1.79.1. --- gnu/packages/docbook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 3d18d459bd..fe183a18e0 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -132,14 +132,14 @@ by no means limited to these applications.) This package provides XML DTDs.") (define-public docbook-xsl (package (name "docbook-xsl") - (version "1.78.1") + (version "1.79.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" version "/docbook-xsl-" version ".tar.bz2")) (sha256 (base32 - "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9")))) + "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")))) (build-system trivial-build-system) (arguments `(#:builder (let ((name-version (string-append ,name "-" ,version))) -- cgit v1.2.3 From 3cc0342b45406f97d675266cc9ac7877be855122 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Dec 2016 23:30:49 +0100 Subject: gnu: dblatex: Do not use python setuptools for building. * gnu/packages/docbook.scm (dblatex)[arguments]: Set #:use-setuptools? to false. --- gnu/packages/docbook.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 8efe417054..d0895772f7 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -192,6 +192,11 @@ by no means limited to these applications.) This package provides XML DTDs.") ("libxslt" ,libxslt))) ;for xsltproc (arguments `(#:python ,python-2 ;'print' syntax + ;; XXX: Disable usage of setuptools, even though it is supported. + ;; This causes an invalid "package_base" in out/bin/.dblatex-real + ;; due to a missing leading '/'. 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 -- cgit v1.2.3 From 2028be238b64c6f52950ad5b61e30eda8e9acba1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 30 Nov 2016 16:29:11 +0100 Subject: gnu: dblatex: Update to 0.3.9. * gnu/packages/docbook.scm (dblatex): Update to 0.3.9. --- gnu/packages/docbook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index d0895772f7..f54e031873 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -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 -- cgit v1.2.3 From 447b9473cba5e65a9c46c2428b588a2110f01c5e Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 2 Dec 2016 15:20:00 +0100 Subject: gnu: dblatex: Update comment. * gnu/packages/docbook.scm (dblatex)[arguments]: Detail comment about why the use of setuptools needs to be disabled. --- gnu/packages/docbook.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/docbook.scm') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f54e031873..46041c24d3 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -192,9 +192,13 @@ by no means limited to these applications.) This package provides XML DTDs.") ("libxslt" ,libxslt))) ;for xsltproc (arguments `(#:python ,python-2 ;'print' syntax - ;; XXX: Disable usage of setuptools, even though it is supported. - ;; This causes an invalid "package_base" in out/bin/.dblatex-real - ;; due to a missing leading '/'. See this thread for details: + ;; 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 -- cgit v1.2.3