[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into python-tests
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into python-tests |
|
Date: |
Mon, 27 Feb 2017 06:46:44 -0500 (EST) |
mbakke pushed a commit to branch python-tests
in repository guix.
commit 8779987bba029535d3dc00f1aacf59281fdd34f0
Merge: 1885bb0 a6d9f883
Author: Marius Bakke <address@hidden>
Date: Mon Feb 27 12:42:22 2017 +0100
Merge branch 'master' into python-tests
Makefile.am | 4 +-
build-aux/hydra/gnu-system.scm | 1 +
doc/guix.texi | 7 +
gnu/local.mk | 11 +-
gnu/packages/admin.scm | 3 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bash.scm | 4 +-
gnu/packages/benchmark.scm | 6 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/crypto.scm | 10 +-
gnu/packages/curl.scm | 8 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/dav.scm | 25 +-
gnu/packages/disk.scm | 14 +-
gnu/packages/emacs.scm | 54 +-
gnu/packages/game-development.scm | 24 +-
gnu/packages/games.scm | 51 +-
gnu/packages/ghostscript.scm | 3 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnunet.scm | 10 +-
gnu/packages/golang.scm | 19 +-
gnu/packages/gstreamer.scm | 34 +-
gnu/packages/guile.scm | 124 +-
gnu/packages/hurd.scm | 7 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/imagemagick.scm | 13 +-
gnu/packages/inkscape.scm | 4 +-
gnu/packages/java.scm | 18 +-
gnu/packages/jemalloc.scm | 10 +-
gnu/packages/ldc.scm | 14 +-
gnu/packages/lighting.scm | 4 +-
gnu/packages/linux-libre-4.10-i686.conf | 9159 ++++++++++++++++++++
gnu/packages/linux-libre-4.10-x86_64.conf | 9001 +++++++++++++++++++
gnu/packages/linux.scm | 57 +-
gnu/packages/lua.scm | 12 -
gnu/packages/machine-learning.scm | 25 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 23 +
gnu/packages/messaging.scm | 7 +-
gnu/packages/music.scm | 6 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 255 +
gnu/packages/package-management.scm | 11 +-
.../gst-plugins-base-fix-test-on-32bit.patch | 32 -
gnu/packages/patches/hubbub-sort-entities.patch | 13 +
.../patches/libssh-0.6.5-CVE-2016-0739.patch | 77 -
gnu/packages/patches/netsurf-about.patch | 26 -
.../patches/netsurf-longer-test-timeout.patch | 20 +
gnu/packages/patches/netsurf-system-utf8proc.patch | 64 +
gnu/packages/patches/netsurf-y2038-tests.patch | 25 +
gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 33 +-
gnu/packages/patches/shadow-CVE-2017-2616.patch | 72 +
.../patches/util-linux-CVE-2017-2616.patch | 65 +
.../vdirsyncer-test-suite-slow-machines.patch | 42 +
gnu/packages/patches/vim-CVE-2017-5953.patch | 32 +
gnu/packages/pciutils.scm | 4 +-
gnu/packages/perl.scm | 20 +
gnu/packages/python.scm | 89 +-
gnu/packages/qt.scm | 5 +-
gnu/packages/scheme.scm | 41 +-
gnu/packages/search.scm | 11 +-
gnu/packages/shells.scm | 67 +-
gnu/packages/spice.scm | 2 +-
gnu/packages/ssh.scm | 8 +-
gnu/packages/textutils.scm | 34 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 20 +-
gnu/packages/vim.scm | 1 +
gnu/packages/web.scm | 490 +-
gnu/packages/webkit.scm | 6 +-
gnu/packages/xdisorg.scm | 43 +-
gnu/packages/xml.scm | 21 +-
gnu/packages/xorg.scm | 26 -
gnu/services/base.scm | 18 +-
gnu/services/xorg.scm | 2 -
gnu/system/examples/lightweight-desktop.tmpl | 6 +-
guix/build/dub-build-system.scm | 4 +-
guix/download.scm | 5 +-
guix/import/stackage.scm | 10 +-
guix/scripts/import/stackage.scm | 19 +-
nix/libstore/build.cc | 7 +-
83 files changed, 19991 insertions(+), 549 deletions(-)
diff --cc gnu/packages/python.scm
index e26e442,c295c42..a8ba1b8
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -8656,10 -8382,10 +8686,10 @@@ processes across test runs."
(uri (pypi-uri "icalendar" version))
(sha256
(base32
- "17rcy6rb9kqjf4p707ivmx7phjq7ngcz3bf7zriwxrqgrjagj7ag"))))
+ "086jslw8cg2hni79j267p1dy6d27m7q5hi39ni2clh9waqbdf5v3"))))
(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
@@@ -9102,13 -8806,10 +9132,13 @@@ document."
(uri (pypi-uri "botocore" version))
(sha256
(base32
- "1zxczlwqy9bl27d9bc5x99mb5mcsxm350240lp5nx7014xb311lj"))))
+ "1hqvqwhgfcch4knm1l02ynx7qd1igxk3pj34c1x2b0r79jca524n"))))
(build-system python-build-system)
+ (arguments
+ ;; FIXME: Many tests are failing.
+ '(#:tests? #f))
(propagated-inputs
- `(("python-dateutil" ,python-dateutil-2)
+ `(("python-dateutil" ,python-dateutil)
("python-docutils" ,python-docutils)
("python-jmespath" ,python-jmespath)))
(native-inputs