[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into python-tests
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into python-tests |
|
Date: |
Fri, 13 Jan 2017 15:22:43 +0000 (UTC) |
lfam pushed a commit to branch python-tests
in repository guix.
commit cc0725914e74c4c4dec369f3e7cdb6f201b3fecd
Merge: a25b688 ce195ba
Author: Leo Famulari <address@hidden>
Date: Fri Jan 13 10:21:17 2017 -0500
Merge branch 'master' into python-tests
.gitignore | 1 +
.mailmap | 23 +-
HACKING | 5 +
Makefile.am | 33 +-
NEWS | 478 +
build-aux/check-final-inputs-self-contained.scm | 7 +-
build-aux/hydra/demo-os.scm | 84 -
build-aux/hydra/gnu-system.scm | 15 +-
configure.ac | 22 +-
d3.v3.js | 9584 ++++++++++++++++++++
doc/contributing.texi | 28 +-
doc/emacs.texi | 881 --
doc/guix.texi | 799 +-
doc/htmlxref.cnf | 2 +
doc/images/bootstrap-packages.dot | 210 +-
doc/images/coreutils-bag-graph.dot | 424 +-
doc/images/coreutils-graph.dot | 44 +-
doc/images/shepherd-graph.dot | 86 +-
doc/local.mk | 3 +-
emacs/guix-about.el | 37 -
emacs/guix-backend.el | 393 -
emacs/guix-base.el | 377 -
emacs/guix-buffer.el | 624 --
emacs/guix-build-log.el | 381 -
emacs/guix-command.el | 830 --
emacs/guix-config.el.in | 44 -
emacs/guix-devel.el | 382 -
emacs/guix-entry.el | 59 -
emacs/guix-external.el | 88 -
emacs/guix-geiser.el | 126 -
emacs/guix-guile.el | 98 -
emacs/guix-help-vars.el | 108 -
emacs/guix-helper.scm.in | 65 -
emacs/guix-history.el | 92 -
emacs/guix-hydra-build.el | 362 -
emacs/guix-hydra-jobset.el | 162 -
emacs/guix-hydra.el | 367 -
emacs/guix-info.el | 482 -
emacs/guix-init.el | 3 -
emacs/guix-license.el | 65 -
emacs/guix-list.el | 585 --
emacs/guix-location.el | 79 -
emacs/guix-main.scm | 1163 ---
emacs/guix-messages.el | 247 -
emacs/guix-pcomplete.el | 370 -
emacs/guix-popup.el | 48 -
emacs/guix-prettify.el | 210 -
emacs/guix-profiles.el | 77 -
emacs/guix-read.el | 147 -
emacs/guix-ui-generation.el | 456 -
emacs/guix-ui-license.el | 150 -
emacs/guix-ui-location.el | 83 -
emacs/guix-ui-package.el | 1191 ---
emacs/guix-ui-system-generation.el | 105 -
emacs/guix-ui.el | 323 -
emacs/guix-utils.el | 609 --
emacs/local.mk | 77 -
etc/git/pre-push | 57 +
etc/indent-package.el.in | 53 +
gnu/build/file-systems.scm | 318 +-
gnu/local.mk | 46 +-
gnu/packages/abiword.scm | 9 +-
gnu/packages/admin.scm | 18 +-
gnu/packages/algebra.scm | 18 +-
gnu/packages/aspell.scm | 40 +-
gnu/packages/audio.scm | 15 +-
gnu/packages/backup.scm | 78 +-
gnu/packages/base.scm | 9 +-
gnu/packages/bioinformatics.scm | 278 +-
gnu/packages/bittorrent.scm | 9 +-
gnu/packages/boost.scm | 2 +-
gnu/packages/bootstrap.scm | 4 +-
gnu/packages/busybox.scm | 12 +-
gnu/packages/c.scm | 34 +-
gnu/packages/calendar.scm | 1 +
gnu/packages/cdrom.scm | 101 +
gnu/packages/check.scm | 4 +-
gnu/packages/ci.scm | 31 +-
gnu/packages/code.scm | 4 +-
gnu/packages/commencement.scm | 5 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/connman.scm | 49 +-
gnu/packages/cross-base.scm | 2 +-
gnu/packages/cups.scm | 16 +-
gnu/packages/curl.scm | 10 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/disk.scm | 36 +
gnu/packages/display-managers.scm | 2 +-
gnu/packages/dns.scm | 28 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/emacs.scm | 123 +-
gnu/packages/embedded.scm | 352 +-
gnu/packages/engineering.scm | 13 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/fonts.scm | 159 +-
gnu/packages/fpga.scm | 18 +-
gnu/packages/freedesktop.scm | 85 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 18 +-
gnu/packages/gcc.scm | 13 +-
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gimp.scm | 2 +
gnu/packages/gl.scm | 4 +
gnu/packages/gnome.scm | 54 +-
gnu/packages/gnucash.scm | 10 +-
gnu/packages/gnunet.scm | 35 +-
gnu/packages/gnupg.scm | 137 +-
gnu/packages/gnuzilla.scm | 69 +-
gnu/packages/graphviz.scm | 50 +-
gnu/packages/groff.scm | 41 +
gnu/packages/grub.scm | 61 +-
gnu/packages/gtk.scm | 52 +-
gnu/packages/guile.scm | 183 +-
gnu/packages/gv.scm | 23 +-
gnu/packages/haskell.scm | 243 +-
gnu/packages/hurd.scm | 19 +-
gnu/packages/idris.scm | 256 +
gnu/packages/image-viewers.scm | 5 +-
gnu/packages/image.scm | 106 +-
gnu/packages/imagemagick.scm | 7 +-
gnu/packages/inkscape.scm | 32 +-
gnu/packages/irc.scm | 20 +-
gnu/packages/java.scm | 44 +-
gnu/packages/kde-frameworks.scm | 40 +-
gnu/packages/kde.scm | 175 +-
gnu/packages/libreoffice.scm | 26 +-
gnu/packages/libupnp.scm | 3 +-
...bre-4.8-i686.conf => linux-libre-4.9-i686.conf} | 208 +-
...4.8-x86_64.conf => linux-libre-4.9-x86_64.conf} | 216 +-
gnu/packages/linux.scm | 272 +-
gnu/packages/lisp.scm | 42 +-
gnu/packages/llvm.scm | 6 +-
gnu/packages/lynx.scm | 4 +-
gnu/packages/mail.scm | 170 +-
gnu/packages/make-bootstrap.scm | 4 -
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 83 +-
gnu/packages/mc.scm | 14 +-
gnu/packages/messaging.scm | 129 +-
gnu/packages/monitoring.scm | 15 +-
gnu/packages/moreutils.scm | 60 +-
gnu/packages/mp3.scm | 6 +-
gnu/packages/mpd.scm | 15 +-
gnu/packages/mtools.scm | 3 +-
gnu/packages/music.scm | 70 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 50 +-
gnu/packages/nim.scm | 59 +
gnu/packages/ocaml.scm | 685 +-
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/package-management.scm | 49 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 34 +-
.../patches/awesome-reproducible-png.patch | 4 +-
.../chicken-CVE-2016-6830+CVE-2016-6831.patch | 81 +
.../patches/cracklib-fix-buffer-overflow.patch | 39 +
.../gnupg-test-segfault-on-32bit-arch.patch | 40 +
.../patches/inkscape-drop-wait-for-targets.patch | 68 -
.../patches/kdbusaddons-kinit-file-name.patch | 15 +
.../patches/khal-disable-failing-tests.patch | 33 +
gnu/packages/patches/libpng-CVE-2016-10087.patch | 37 +
gnu/packages/patches/libtiff-CVE-2016-10092.patch | 42 +
gnu/packages/patches/libtiff-CVE-2016-10093.patch | 53 +
gnu/packages/patches/libtiff-CVE-2016-10094.patch | 34 +
.../patches/libtiff-assertion-failure.patch | 60 +
.../patches/libtiff-divide-by-zero-ojpeg.patch | 63 +
.../patches/libtiff-divide-by-zero-tiffcp.patch | 104 +
.../patches/libtiff-divide-by-zero-tiffcrop.patch | 57 +
gnu/packages/patches/libtiff-divide-by-zero.patch | 67 +
.../libtiff-heap-overflow-pixarlog-luv.patch | 131 +
.../libtiff-heap-overflow-tif-dirread.patch | 132 +
.../patches/libtiff-heap-overflow-tiffcp.patch | 67 +
.../patches/libtiff-heap-overflow-tiffcrop.patch | 60 +
gnu/packages/patches/libtiff-invalid-read.patch | 64 +
.../patches/libtiff-null-dereference.patch | 42 +
.../patches/libtiff-tiffcp-underflow.patch | 41 +
gnu/packages/patches/libupnp-CVE-2016-8863.patch | 72 +
gnu/packages/patches/libxml2-CVE-2016-4658.patch | 257 +
gnu/packages/patches/libxml2-CVE-2016-5131.patch | 218 +
gnu/packages/patches/libxt-guix-search-paths.patch | 126 +
gnu/packages/patches/mcrypt-CVE-2012-4409.patch | 35 +-
gnu/packages/patches/mcrypt-CVE-2012-4527.patch | 198 +-
.../patches/multiqc-fix-git-subprocess-error.patch | 16 +
.../patches/ocaml-Add-a-.file-directive.patch | 96 +
...ml-bisect-fix-camlp4-in-another-directory.patch | 125 +
.../patches/ocaml-bitstring-fix-configure.patch | 53 +
.../patches/openssh-memory-exhaustion.patch | 39 -
.../python-dendropy-exclude-failing-tests.patch | 21 -
.../patches/python-pycrypto-CVE-2013-7459.patch | 97 +
.../python-pygpgme-fix-pinentry-tests.patch | 69 +
gnu/packages/patches/qemu-CVE-2016-8576.patch | 62 -
gnu/packages/patches/qemu-CVE-2016-8577.patch | 36 -
gnu/packages/patches/qemu-CVE-2016-8578.patch | 27 -
.../ruby-yard-fix-skip-of-markdown-tests.patch | 17 -
gnu/packages/patches/slock-CVE-2016-6866.patch | 51 -
gnu/packages/patches/unrtf-CVE-2016-10091.patch | 189 +
gnu/packages/pdf.scm | 9 +-
gnu/packages/perl.scm | 46 +-
gnu/packages/python.scm | 737 +-
gnu/packages/qemu.scm | 18 +-
gnu/packages/qt.scm | 352 +-
gnu/packages/ruby.scm | 84 +-
gnu/packages/rust.scm | 332 +
gnu/packages/samba.scm | 4 +-
gnu/packages/scanner.scm | 64 +-
gnu/packages/scheme.scm | 31 +-
gnu/packages/sdl.scm | 15 +-
gnu/packages/search.scm | 4 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/shells.scm | 13 +-
gnu/packages/shellutils.scm | 6 +-
gnu/packages/speech.scm | 34 +
gnu/packages/ssh.scm | 5 +-
gnu/packages/statistics.scm | 403 +-
gnu/packages/suckless.scm | 30 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/telephony.scm | 4 +-
gnu/packages/terminals.scm | 42 +-
gnu/packages/tls.scm | 24 +-
gnu/packages/tor.scm | 14 +-
gnu/packages/unrtf.scm | 2 +
gnu/packages/upnp.scm | 11 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 30 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 10 +-
gnu/packages/web.scm | 50 +-
gnu/packages/wm.scm | 12 +-
gnu/packages/xdisorg.scm | 14 +-
gnu/packages/xfig.scm | 155 +-
gnu/packages/xml.scm | 10 +
gnu/packages/xorg.scm | 160 +-
gnu/packages/zile.scm | 82 +-
gnu/packages/zip.scm | 4 +-
gnu/services/admin.scm | 7 +-
gnu/services/avahi.scm | 2 +-
gnu/services/base.scm | 46 +-
gnu/services/configuration.scm | 3 +
gnu/services/cuirass.scm | 60 +-
gnu/services/databases.scm | 116 +-
gnu/services/desktop.scm | 5 +
gnu/services/messaging.scm | 726 ++
gnu/services/networking.scm | 9 +-
gnu/services/sddm.scm | 2 +-
gnu/services/shepherd.scm | 2 +-
gnu/services/web.scm | 96 +-
gnu/system/grub.scm | 17 +-
gnu/system/install.scm | 8 +-
gnu/system/linux-initrd.scm | 15 +
gnu/tests/install.scm | 77 +-
gnu/tests/nfs.scm | 131 +
graph.js | 129 +
guix/build-system/cargo.scm | 149 +
guix/build-system/ocaml.scm | 181 +
guix/build/cargo-build-system.scm | 110 +
guix/build/download.scm | 9 +-
guix/build/make-bootstrap.scm | 5 +-
guix/build/ocaml-build-system.scm | 119 +
guix/build/syscalls.scm | 6 +-
guix/derivations.scm | 58 +-
guix/docker.scm | 127 +
guix/gexp.scm | 53 +-
guix/git-download.scm | 33 +-
guix/gnu-maintenance.scm | 8 +-
guix/grafts.scm | 90 +-
guix/graph.scm | 79 +-
guix/http-client.scm | 7 +-
guix/import/cran.scm | 215 +-
guix/import/crate.scm | 165 +
guix/import/elpa.scm | 10 +-
guix/import/github.scm | 15 +-
guix/import/pypi.scm | 3 +-
guix/import/utils.scm | 36 +
guix/profiles.scm | 24 +-
guix/scripts/archive.scm | 36 +-
guix/scripts/build.scm | 6 +-
guix/scripts/challenge.scm | 2 +-
guix/scripts/copy.scm | 207 +
guix/scripts/environment.scm | 37 +-
guix/scripts/graph.scm | 57 +-
guix/scripts/hash.scm | 5 +-
guix/scripts/import.scm | 21 +-
guix/scripts/import/cran.scm | 26 +-
guix/scripts/import/{cran.scm => crate.scm} | 30 +-
guix/scripts/offload.scm | 154 +-
guix/scripts/package.scm | 10 +-
guix/scripts/perform-download.scm | 37 +-
guix/scripts/refresh.scm | 3 +-
guix/ssh.scm | 226 +
guix/ui.scm | 10 +-
guix/upstream.scm | 8 +-
guix/utils.scm | 10 +-
nix/libstore/build.cc | 28 +-
nix/libstore/builtins.cc | 10 +-
nix/libstore/builtins.hh | 5 +-
nix/local.mk | 24 +-
po/guix/POTFILES.in | 1 +
po/guix/da.po | 1023 ++-
po/guix/fr.po | 920 +-
po/guix/pt_BR.po | 929 +-
po/packages/da.po | 6316 ++++++++-----
tests/cpan.scm | 73 +-
tests/crate.scm | 103 +
tests/derivations.scm | 27 +-
tests/gem.scm | 10 +-
tests/gexp.scm | 23 +-
tests/graph.scm | 17 +-
tests/guix-environment.sh | 17 +-
tests/guix-package.sh | 10 +-
tests/packages.scm | 3 +-
tests/profiles.scm | 18 +-
tests/pypi.scm | 159 +-
tests/scripts-build.scm | 13 +
315 files changed, 30283 insertions(+), 19060 deletions(-)
diff --cc gnu/local.mk
index 89d1e83,21580a3..2f852b5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -815,11 -845,9 +845,10 @@@ dist_patch_DATA =
%D%/packages/patches/python-configobj-setuptools.patch \
%D%/packages/patches/python-paste-remove-website-test.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \
+ %D%/packages/patches/python-pyopenssl-skip-network-test.patch \
+ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
- %D%/packages/patches/qemu-CVE-2016-8576.patch \
- %D%/packages/patches/qemu-CVE-2016-8577.patch \
- %D%/packages/patches/qemu-CVE-2016-8578.patch \
+ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/quickswitch-fix-dmenu-check.patch \
%D%/packages/patches/rapicorn-isnan.patch \
diff --cc gnu/packages/python.scm
index 9388534,727e1bf..bfd003b
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -2805,11 -2891,8 +2928,11 @@@ reStructuredText."
(uri (pypi-uri "Pygments" version))
(sha256
(base32
- "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"))))
+ "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48"))))
(build-system python-build-system)
+ (arguments
+ ;; FIXME: Tests require sphinx, which depends on this.
+ '(#:tests? #f))
(home-page "http://pygments.org/";)
(synopsis "Syntax highlighting")
(description
@@@ -8174,10 -8230,10 +8421,10 @@@ processes across test runs."
(uri (pypi-uri "icalendar" version))
(sha256
(base32
- "01v2f3swd5s72x65cdihw83dx1z799b4i49a6ncg7vqmcm20wapd"))))
+ "1bvi7rzh7scl4nmgj2n2cy7k0v3p29y15cqy2hcdnfq9mnhdr63y"))))
(build-system python-build-system)
(propagated-inputs
- `(("python-dateutil-2" ,python-dateutil-2)
+ `(("python-dateutil" ,python-dateutil)
("python-pytz" ,python-pytz)))
(synopsis "Python library for parsing iCalendar files")
(description "The icalendar package is a parser/generator of iCalendar