[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into wip-python
|
From: |
Andreas Enge |
|
Subject: |
01/01: Merge branch 'master' into wip-python |
|
Date: |
Fri, 5 Aug 2016 18:00:19 +0000 (UTC) |
andreas pushed a commit to branch wip-python
in repository guix.
commit 995a5bddc6162444f6320d8bba669040ddd278fe
Merge: bd21159 e28e74a
Author: Andreas Enge <address@hidden>
Date: Fri Aug 5 19:59:29 2016 +0200
Merge branch 'master' into wip-python
.dir-locals.el | 3 +
.mailmap | 1 +
HACKING | 10 +-
Makefile.am | 25 +-
NEWS | 358 ++++++++++++
THANKS | 1 +
build-aux/build-self.scm | 59 +-
config-daemon.ac | 4 +-
configure.ac | 18 +-
doc/contributing.texi | 43 +-
doc/guix.texi | 501 ++++++++++++++---
doc/htmlxref.cnf | 8 +-
emacs/guix-devel.el | 2 +
emacs/guix-main.scm | 20 +-
etc/guix-daemon.service.in | 1 +
gnu/local.mk | 41 +-
gnu/packages.scm | 3 +-
gnu/packages/admin.scm | 67 +--
gnu/packages/algebra.scm | 6 +-
gnu/packages/audacity.scm | 5 +-
gnu/packages/audio.scm | 44 +-
gnu/packages/autotools.scm | 3 +-
gnu/packages/backup.scm | 35 +-
gnu/packages/base.scm | 244 +++++----
gnu/packages/bioinformatics.scm | 289 +++++++---
gnu/packages/bison.scm | 6 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/boost.scm | 84 +--
gnu/packages/bootstrap.scm | 2 +-
gnu/packages/c.scm | 2 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/certs.scm | 22 +-
gnu/packages/check.scm | 8 +-
gnu/packages/cmake.scm | 112 ++--
gnu/packages/code.scm | 31 +-
gnu/packages/commencement.scm | 46 +-
gnu/packages/compression.scm | 83 ++-
gnu/packages/conky.scm | 10 +-
gnu/packages/cook.scm | 4 +-
gnu/packages/cross-base.scm | 37 +-
gnu/packages/crypto.scm | 90 ++-
gnu/packages/cups.scm | 35 +-
gnu/packages/curl.scm | 14 +
gnu/packages/databases.scm | 89 ++-
gnu/packages/datastructures.scm | 22 +
gnu/packages/dav.scm | 9 +-
gnu/packages/dico.scm | 5 +-
gnu/packages/disk.scm | 46 +-
gnu/packages/djvu.scm | 4 +-
gnu/packages/docbook.scm | 7 +-
gnu/packages/documentation.scm | 8 +-
gnu/packages/ebook.scm | 20 +-
gnu/packages/ed.scm | 16 +-
gnu/packages/education.scm | 140 +++++
gnu/packages/elixir.scm | 99 ++++
gnu/packages/emacs.scm | 433 ++++++++++++++-
gnu/packages/engineering.scm | 26 +-
gnu/packages/enlightenment.scm | 17 +-
gnu/packages/finance.scm | 4 +-
gnu/packages/fish.scm | 65 ---
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/flex.scm | 6 +-
gnu/packages/fonts.scm | 11 +-
gnu/packages/fontutils.scm | 12 +-
gnu/packages/freedesktop.scm | 16 +-
gnu/packages/game-development.scm | 156 ++++++
gnu/packages/games.scm | 305 +++++++++--
gnu/packages/gcc.scm | 4 +-
gnu/packages/gd.scm | 8 +-
gnu/packages/geeqie.scm | 6 +-
gnu/packages/gettext.scm | 4 +-
gnu/packages/ghostscript.scm | 61 ++-
gnu/packages/gl.scm | 75 ++-
gnu/packages/gnome.scm | 36 +-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/gnunet.scm | 18 +-
gnu/packages/gnupg.scm | 73 ++-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/gnuzilla.scm | 35 +-
gnu/packages/golang.scm | 154 ++++++
gnu/packages/graphics.scm | 4 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/grub.scm | 25 +-
gnu/packages/gstreamer.scm | 24 +-
gnu/packages/gtk.scm | 7 +-
gnu/packages/guile.scm | 85 ++-
gnu/packages/gv.scm | 4 +-
gnu/packages/haskell.scm | 7 +-
gnu/packages/{djvu.scm => hexedit.scm} | 30 +-
gnu/packages/hurd.scm | 87 ++-
gnu/packages/image.scm | 58 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 500 +++++++++--------
gnu/packages/julia.scm | 3 +
gnu/packages/kde-frameworks.scm | 10 +-
gnu/packages/ld-wrapper.in | 6 +-
gnu/packages/libreoffice.scm | 23 +-
gnu/packages/libusb.scm | 4 +-
...bre-4.6-i686.conf => linux-libre-4.7-i686.conf} | 145 ++++-
...4.6-x86_64.conf => linux-libre-4.7-x86_64.conf} | 164 ++++--
gnu/packages/linux.scm | 179 ++++--
gnu/packages/lirc.scm | 4 +-
gnu/packages/lisp.scm | 86 +--
gnu/packages/llvm.scm | 90 ++-
gnu/packages/lout.scm | 5 +-
gnu/packages/lsh.scm | 159 ------
gnu/packages/lxde.scm | 14 +-
gnu/packages/mail.scm | 43 +-
gnu/packages/make-bootstrap.scm | 4 +-
gnu/packages/markdown.scm | 5 +-
gnu/packages/marst.scm | 9 +-
gnu/packages/maths.scm | 396 ++++++++------
gnu/packages/mcrypt.scm | 13 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/mit-krb5.scm | 22 +-
gnu/packages/mp3.scm | 6 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 21 +-
gnu/packages/multiprecision.scm | 4 +-
gnu/packages/music.scm | 114 ++--
gnu/packages/netpbm.scm | 117 ++--
gnu/packages/networking.scm | 53 +-
gnu/packages/ocaml.scm | 1 +
gnu/packages/ocr.scm | 34 +-
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/openldap.scm | 28 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/package-management.scm | 23 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 42 +-
.../patches/automake-test-gzip-warning.patch | 17 +
.../patches/beets-image-test-failure.patch | 46 --
gnu/packages/patches/calibre-drop-unrar.patch | 48 +-
.../patches/clang-3.8-libc-search-path.patch | 69 +++
gnu/packages/patches/dealii-p4est-interface.patch | 62 ---
gnu/packages/patches/dico-idxgcide-bug.patch | 21 +
.../patches/elixir-disable-failing-tests.patch | 261 +++++++++
.../patches/expat-CVE-2015-1283-refix.patch | 27 +-
gnu/packages/patches/expat-CVE-2015-1283.patch | 89 ---
gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 +
gnu/packages/patches/gd-fix-tests-on-i686.patch | 66 +++
gnu/packages/patches/glibc-CVE-2015-7547.patch | 559 -------------------
.../patches/glibc-hurd-extern-inline.patch | 35 --
.../patches/glibc-locale-incompatibility.patch | 23 -
gnu/packages/patches/glibc-locales.patch | 6 +-
.../patches/libarchive-CVE-2013-0211.patch | 21 -
.../patches/libarchive-CVE-2016-1541.patch | 67 ---
gnu/packages/patches/libarchive-bsdtar-test.patch | 74 ---
.../patches/libarchive-fix-lzo-test-case.patch | 83 ---
.../libarchive-mtree-filename-length-fix.patch | 18 -
.../patches/libpthread-glibc-preparation.patch | 146 -----
gnu/packages/patches/libxslt-CVE-2015-7995.patch | 29 -
gnu/packages/patches/libxslt-generated-ids.patch | 173 ++++++
gnu/packages/patches/mit-krb5-CVE-2015-8629.patch | 51 --
gnu/packages/patches/mit-krb5-CVE-2015-8630.patch | 81 ---
gnu/packages/patches/mit-krb5-CVE-2015-8631.patch | 576 --------------------
.../mit-krb5-init-context-null-spnego.patch | 49 --
gnu/packages/patches/mysql-fix-failing-test.patch | 57 ++
gnu/packages/patches/openssh-CVE-2015-8325.patch | 31 --
gnu/packages/patches/procps-non-linux.patch | 40 ++
.../patches/python-statsmodels-fix-tests.patch | 196 +++++++
gnu/packages/patches/rapicorn-isnan.patch | 87 +++
gnu/packages/patches/tar-d_ino_in_dirent-fix.patch | 33 --
gnu/packages/patches/tuxpaint-stamps-path.patch | 24 +
gnu/packages/pcre.scm | 19 +-
gnu/packages/pdf.scm | 58 +-
gnu/packages/perl.scm | 128 ++++-
gnu/packages/photo.scm | 12 +-
gnu/packages/plotutils.scm | 3 +-
gnu/packages/popt.scm | 3 +-
gnu/packages/protobuf.scm | 41 +-
gnu/packages/pulseaudio.scm | 18 +-
gnu/packages/python.scm | 279 ++++++----
gnu/packages/qemu.scm | 30 +-
gnu/packages/qt.scm | 125 +++--
gnu/packages/rc.scm | 72 ---
gnu/packages/rdesktop.scm | 4 +-
gnu/packages/readline.scm | 28 +
gnu/packages/ruby.scm | 56 +-
gnu/packages/samba.scm | 83 ++-
gnu/packages/scheme.scm | 305 +++++++++--
gnu/packages/screen.scm | 40 +-
gnu/packages/sdl.scm | 26 +-
gnu/packages/search.scm | 3 +-
gnu/packages/shells.scm | 271 +++++++++
gnu/packages/shellutils.scm | 42 +-
gnu/packages/skarnet.scm | 229 +++++++-
gnu/packages/skribilo.scm | 3 +-
gnu/packages/slim.scm | 2 +-
gnu/packages/spice.scm | 297 ++++++++++
gnu/packages/ssh.scm | 187 ++++++-
gnu/packages/stalonetray.scm | 7 +-
gnu/packages/statistics.scm | 10 +-
gnu/packages/swig.scm | 21 +-
gnu/packages/tcl.scm | 8 +-
gnu/packages/tcsh.scm | 86 ---
gnu/packages/telephony.scm | 34 ++
gnu/packages/terminals.scm | 38 ++
gnu/packages/tex.scm | 44 +-
gnu/packages/texinfo.scm | 20 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/tls.scm | 99 ++--
gnu/packages/version-control.scm | 252 +++++----
gnu/packages/video.scm | 92 +++-
gnu/packages/vim.scm | 2 +-
gnu/packages/w3m.scm | 5 +-
gnu/packages/web.scm | 52 +-
gnu/packages/wine.scm | 4 +-
gnu/packages/wm.scm | 3 +-
gnu/packages/wxwidgets.scm | 8 +-
gnu/packages/xdisorg.scm | 56 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xml.scm | 68 +--
gnu/packages/xorg.scm | 165 +++++-
gnu/packages/zsh.scm | 81 ---
gnu/services.scm | 102 ++--
gnu/services/avahi.scm | 3 +-
gnu/services/base.scm | 216 +++++---
gnu/services/databases.scm | 10 +-
gnu/services/dbus.scm | 48 +-
gnu/services/desktop.scm | 98 ++--
gnu/services/dict.scm | 1 +
gnu/services/lirc.scm | 7 +-
gnu/services/mail.scm | 1 +
gnu/services/networking.scm | 69 ++-
gnu/services/shepherd.scm | 45 +-
gnu/services/ssh.scm | 100 +++-
gnu/services/web.scm | 7 +-
gnu/services/xorg.scm | 44 +-
gnu/system.scm | 38 +-
gnu/system/file-systems.scm | 18 +
gnu/system/install.scm | 121 ++--
gnu/system/linux-container.scm | 49 +-
gnu/system/linux-initrd.scm | 170 +++---
gnu/system/locale.scm | 8 +-
gnu/system/mapped-devices.scm | 86 ++-
gnu/system/pam.scm | 61 +++
gnu/system/shadow.scm | 70 +--
gnu/system/vm.scm | 166 +++---
gnu/tests.scm | 122 ++---
gnu/tests/base.scm | 526 +++++++++---------
gnu/tests/install.scm | 241 +++++---
guix/build/download.scm | 3 +-
guix/build/gnu-build-system.scm | 2 +-
guix/build/pull.scm | 39 +-
guix/config.scm.in | 39 +-
guix/cvs-download.scm | 20 +-
guix/derivations.scm | 21 +-
guix/download.scm | 158 ++++--
guix/gexp.scm | 188 ++++---
guix/git-download.scm | 36 +-
guix/gnu-maintenance.scm | 35 ++
guix/hg-download.scm | 22 +-
guix/import/pypi.scm | 13 +-
guix/packages.scm | 224 ++++----
guix/profiles.scm | 476 ++++++++--------
guix/records.scm | 19 +-
guix/scripts.scm | 9 +-
guix/scripts/challenge.scm | 40 +-
guix/scripts/environment.scm | 5 +-
guix/scripts/gc.scm | 7 +-
guix/scripts/lint.scm | 48 +-
guix/scripts/package.scm | 3 +-
guix/scripts/publish.scm | 232 +++++++-
guix/scripts/refresh.scm | 6 +-
guix/scripts/size.scm | 11 +-
guix/scripts/substitute.scm | 3 +-
guix/scripts/system.scm | 16 +-
guix/store.scm | 2 +-
guix/svn-download.scm | 22 +-
guix/ui.scm | 19 -
guix/utils.scm | 6 +
guix/zlib.scm | 245 +++++++++
m4/guix.m4 | 24 +-
po/packages/POTFILES.in | 2 +-
tests/gexp.scm | 100 +++-
tests/grafts.scm | 16 +-
tests/guix-environment-container.sh | 11 +-
tests/guix-environment.sh | 4 +
tests/guix-register.sh | 18 +-
tests/guix-system.sh | 4 +-
tests/lint.scm | 64 ++-
tests/packages.scm | 19 +-
tests/profiles.scm | 10 +
tests/publish.scm | 132 ++++-
tests/pypi.scm | 16 +
tests/records.scm | 29 +-
tests/system.scm | 43 ++
tests/zlib.scm | 63 +++
289 files changed, 11821 insertions(+), 6901 deletions(-)
diff --cc gnu/packages/python.scm
index 93cf1b8,470bad8..90c0578
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -9751,77 -9776,35 +9774,111 @@@ characters, mouse support, and auto sug
`(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))))))
+(define-public python-imagesize
+ (package
+ (name "python-imagesize")
+ (version "0.7.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "imagesize" version))
+ (sha256
+ (base32
+ "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha"))))
+ (build-system python-build-system)
+ (synopsis "Calculate the size of an image")
+ (description "This Python module returns the size of an image. It
supports
+the PNG, JPEG, JPEG 2000, and GIF formats.")
+ (home-page "https://github.com/shibukawa/imagesize_py";)
+ (license license:expat)
+ (properties `((python2-variant . ,(delay python2-imagesize))))))
+
+(define-public python2-imagesize
+ (let ((base (package-with-python2 (strip-python2-variant
python-imagesize))))
+ (package
+ (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
+
+(define-public python-alabaster
+ (package
+ (name "python-alabaster")
+ (version "0.7.8")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "alabaster" version))
+ (sha256
+ (base32
+ "1zqz9hsvnmpjklmir6g7rxlv2fslrgsnwb91r9sgz4n1zja1pjx1"))))
+ (build-system python-build-system)
+ (synopsis "Default theme for the Sphinx documentation system")
+ (description "Alabaster is a responsive and configurable theme for the
+Sphinx documentation system. It is compatible with Python 2 and 3, and it is
+the default Sphinx theme.")
+ (home-page "https://github.com/bitprophet/alabaster";)
+ (license bsd-3)
+ (properties `((python2-variant . ,(delay python2-alabaster))))))
+
+(define-public python2-alabaster
+ (let ((base (package-with-python2 (strip-python2-variant
python-alabaster))))
+ (package
+ (inherit base)
+ (native-inputs
+ `(("python2-setuptools" ,python2-setuptools)
+ ,@(package-native-inputs base))))))
+
+(define-public python-snowballstemmer
+ (package
+ (name "python-snowballstemmer")
+ (version "1.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "snowballstemmer" version))
+ (sha256
+ (base32
+ "0a0idq4y5frv7qsg2x62jd7rd272749xk4x99misf5rcifk2d7wi"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ; no test suite
+ (synopsis "Snowball stemming library collection for Python")
+ (description "This package provides 16 stemmer algorithms generated from
+Snowball algorithms.")
+ (home-page "https://github.com/shibukawa/snowball_py";)
+ (license bsd-2)))
+
+(define-public python2-snowballstemmer
+ (package-with-python2 python-snowballstemmer))
++
+ (define-public ptpython
+ (package
+ (name "ptpython")
+ (version "0.34")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "ptpython" version))
+ (sha256
+ (base32
+ "1mmbiyzf0n8hm7z2a562x7w5cbl6jc0zsk6vp40q1z4cyblv1k13"))))
+ (build-system python-build-system)
+ (inputs
+ `(("python-docopt" ,python-docopt)
+ ("python-jedi" ,python-jedi)
+ ("python-prompt-toolkit" ,python-prompt-toolkit)
+ ("python-pygments" ,python-pygments)
+ ("python-setuptools" ,python-setuptools)))
+ (home-page "https://github.com/jonathanslenders/ptpython";)
+ (synopsis "Python Read-Eval-Print-Loop with nice IDE-like features")
+ (description
+ "ptpython is a Python read-eval-print loop with IDE-like features.
+ It supports syntax highlighting, multiline editing, autocompletion, mouse,
+ color schemes, bracketed paste, Vi and Emacs keybindings, Chinese characters
+ etc.")
+ (license bsd-3)
+ (properties `((python2-variant . ,(delay ptpython-2))))))
+
+ (define-public ptpython-2
+ (let ((base (package-with-python2 (strip-python2-variant ptpython))))
+ (package
+ (inherit base)
+ (name "ptpython2"))))
++