Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
gnu: Add ptpython and ptpython2.
* gnu/packages/python.scm (ptpython, ptpython-2): New variables.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
gnu: Update URLs for sourceforge.net.
* gnu/packages/admin.scm: Update URLs pointing to sourceforge.net.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/boost.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/code.scm: Likewise.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/cups.scm: Likewise.
* gnu/packages/djvu.scm: Likewise.
* gnu/packages/docbook.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fonts.scm: Likewise.
* gnu/packages/fontutils.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/graphviz.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/onc-rpc.scm: Likewise.
* gnu/packages/password-utils.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/photo.scm: Likewise.
* gnu/packages/popt.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/rdesktop.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/swig.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
Merge branch 'master' into core-updates
gnu: python-pyquery: Update to 1.2.13.
* gnu/packages/python.scm (python-pyquery): Update to 1.2.13.
gnu: python-cssselect: Update to 0.9.2.
* gnu/packages/python.scm (python-cssselect): Update to 0.9.2.
[source]: Use 'pypi-uri' format.
gnu: python2-cssutils: Update to 1.0.1.
* gnu/packages/python.scm (python2-cssutils): Update to 1.0.1.
[source]: Use 'pypi-uri' format.
gnu: python-lxml: Update to 3.6.0.
* gnu/packages/python.scm (python-lxml): Update to 3.6.0.
gnu: python-simplejson: Update to 3.8.2.
* gnu/packages/python.scm (python-simplejson): Update to 3.8.2.
[source]: Use 'pypi-uri' format.
gnu: behave: Update to 1.2.5.
* gnu/packages/python.scm (behave): Update to 1.2.5.
[source]: Use 'pypi-uri' format.
gnu: python-coverage: Update to 4.1.
* gnu/packages/python.scm (python-coverage): Update to 4.1.
gnu: python-setuptools-scm: Update to 1.11.1.
* gnu/packages/python.scm (python-setuptools-scm): Update to 1.11.1.
Revert "gnu: Add python-alabaster."
This reverts commit 15c36240f0b9ab3e8dc0b57702bb6a5174e4ad58.
Revert "gnu: Add python-snowballstemmer."
This reverts commit b3283dbaf395e024b6d88e63dbb0ccff42209f28.
Revert "gnu: python-sphinx: Update to 1.4.4."
This reverts commit efb386ca5c07c5a4571de8561fd5dcd2a4d9cec7.
Revert "gnu: python-sphinx-rtd-theme: Update to 0.1.9."
This reverts commit e1257225e7bb211e3dd8d9373fb5a81fe83b6baf.
gnu: Add python-jedi.
* gnu/packages/python.scm (python-jedi, python2-jedi): New variables.
Signed-off-by: Leo Famulari <leo@famulari.name>
gnu: python-websocket-client: Update to 0.37.0.
* gnu/packages/python.scm (python-websocket-client): Update to 0.37.0.
[source]: Use pypi uri format.
gnu: python-psutil: Update to 4.3.0.
* gnu/packages/python.scm (python-psutil): Update to 4.3.0.
[home-page]: Update home-page.