[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'core-updates'
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'core-updates' |
|
Date: |
Sat, 12 Nov 2016 23:37:35 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b
Merge: 15abcab de7da4e
Author: Ludovic Courtès <address@hidden>
Date: Sun Nov 13 00:34:16 2016 +0100
Merge branch 'core-updates'
doc/guix.texi | 836 ++++++++++++++
gnu/local.mk | 41 +-
gnu/packages/acl.scm | 2 +-
gnu/packages/admin.scm | 6 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/apl.scm | 2 +-
gnu/packages/assembly.scm | 2 +
gnu/packages/attr.scm | 2 +-
gnu/packages/audio.scm | 14 +-
gnu/packages/backup.scm | 45 +-
gnu/packages/base.scm | 215 ++--
gnu/packages/bash.scm | 161 ++-
gnu/packages/cdrom.scm | 2 +-
gnu/packages/chez.scm | 2 +-
gnu/packages/cmake.scm | 18 +-
gnu/packages/commencement.scm | 212 +++-
gnu/packages/cross-base.scm | 247 ++++-
gnu/packages/crypto.scm | 2 +-
gnu/packages/cups.scm | 274 ++---
gnu/packages/curl.scm | 8 +-
gnu/packages/databases.scm | 35 +-
gnu/packages/dav.scm | 8 +
gnu/packages/dico.scm | 8 +-
gnu/packages/disk.scm | 6 +-
gnu/packages/django.scm | 6 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/education.scm | 2 +-
gnu/packages/embedded.scm | 11 +-
gnu/packages/engineering.scm | 5 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/fcitx.scm | 2 +-
gnu/packages/file.scm | 5 +-
gnu/packages/flex.scm | 1 +
gnu/packages/fonts.scm | 5 +-
gnu/packages/fontutils.scm | 14 +-
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/games.scm | 12 +-
gnu/packages/gawk.scm | 52 +-
gnu/packages/gcc.scm | 23 +-
gnu/packages/gettext.scm | 56 +-
gnu/packages/ghostscript.scm | 65 +-
gnu/packages/gkrellm.scm | 2 +-
gnu/packages/gl.scm | 171 +--
gnu/packages/glib.scm | 16 +-
gnu/packages/gnome.scm | 219 ++--
gnu/packages/gnupg.scm | 56 +-
gnu/packages/gnuzilla.scm | 17 +-
gnu/packages/golang.scm | 37 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/grub.scm | 2 +-
gnu/packages/gtk.scm | 36 +-
gnu/packages/guile.scm | 56 +-
gnu/packages/gv.scm | 3 +-
gnu/packages/gxmessage.scm | 10 +
gnu/packages/ibus.scm | 2 +-
gnu/packages/icu4c.scm | 8 +-
gnu/packages/image.scm | 19 +-
gnu/packages/irc.scm | 2 +-
gnu/packages/iso-codes.scm | 2 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kodi.scm | 2 +-
gnu/packages/libidn.scm | 21 +-
gnu/packages/lighting.scm | 2 +
gnu/packages/linux.scm | 118 +-
gnu/packages/lout.scm | 3 +-
gnu/packages/make-bootstrap.scm | 8 +-
gnu/packages/man.scm | 2 +-
gnu/packages/mate.scm | 67 +-
gnu/packages/maths.scm | 6 +-
gnu/packages/mit-krb5.scm | 20 +-
gnu/packages/mono.scm | 2 +-
gnu/packages/mp3.scm | 2 +-
gnu/packages/multiprecision.scm | 4 +-
gnu/packages/music.scm | 12 +-
gnu/packages/nano.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/ocaml.scm | 2 +-
gnu/packages/openldap.scm | 5 +-
gnu/packages/openstack.scm | 1 +
gnu/packages/package-management.scm | 7 +
.../patches/ath9k-htc-firmware-binutils.patch | 39 +-
gnu/packages/patches/binutils-mips-bash-bug.patch | 22 +
gnu/packages/patches/cmake-fix-tests.patch | 83 +-
.../expat-CVE-2012-6702-and-CVE-2016-5300.patch | 142 ---
.../patches/expat-CVE-2015-1283-refix.patch | 39 -
gnu/packages/patches/expat-CVE-2016-0718.patch | 761 -------------
gnu/packages/patches/flex-CVE-2016-6354.patch | 30 +
.../patches/fontconfig-CVE-2016-5384.patch | 170 ---
gnu/packages/patches/gawk-fts-test.patch | 51 -
gnu/packages/patches/gcc-arm-bug-71399.patch | 55 +
gnu/packages/patches/gnupg-fix-expired-test.patch | 78 --
gnu/packages/patches/guile-relocatable.patch | 14 +-
gnu/packages/patches/icecat-binutils.patch | 40 +
.../patches/isl-0.11.1-aarch64-support.patch | 40 +
gnu/packages/patches/libx11-CVE-2016-7942.patch | 76 --
gnu/packages/patches/libx11-CVE-2016-7943.patch | 113 --
gnu/packages/patches/libxfixes-CVE-2016-7944.patch | 62 --
.../libxi-CVE-2016-7945-CVE-2016-7946.patch | 420 -------
.../libxrandr-CVE-2016-7947-CVE-2016-7948.patch | 447 --------
.../patches/libxrender-CVE-2016-7949.patch | 66 --
.../patches/libxrender-CVE-2016-7950.patch | 73 --
.../libxtst-CVE-2016-7951-CVE-2016-7952.patch | 152 ---
gnu/packages/patches/libxv-CVE-2016-5407.patch | 162 ---
gnu/packages/patches/libxvmc-CVE-2016-7953.patch | 42 -
gnu/packages/patches/linux-pam-no-setfsuid.patch | 75 ++
.../mesa-wayland-egl-symbols-check-mips.patch | 15 +
gnu/packages/patches/ola-readdir-r.patch | 62 ++
gnu/packages/patches/openssl-CVE-2016-2177.patch | 286 -----
gnu/packages/patches/openssl-CVE-2016-2178.patch | 112 --
gnu/packages/patches/perl-CVE-2015-8607.patch | 68 --
gnu/packages/patches/perl-CVE-2016-2381.patch | 116 --
gnu/packages/patches/perl-no-build-time.patch | 26 -
.../patches/perl-reproducible-build-date.patch | 50 +
gnu/packages/patches/perl-source-date-epoch.patch | 19 -
.../patches/perl-www-curl-remove-symbol.patch | 39 +
gnu/packages/patches/procps-non-linux.patch | 40 -
gnu/packages/patches/python-3.4-fix-tests.patch | 12 +
gnu/packages/patches/python-3.5-fix-tests.patch | 46 +
gnu/packages/patches/python-disable-ssl-test.patch | 12 -
.../patches/python-file-double-encoding-bug.patch | 50 +
gnu/packages/patches/python-fix-tests.patch | 15 -
.../patches/python-parse-too-many-fields.patch | 52 +
.../patches/tcsh-do-not-define-BSDWAIT.patch | 33 +
gnu/packages/pdf.scm | 53 +-
gnu/packages/perl.scm | 76 +-
gnu/packages/plotutils.scm | 3 +-
gnu/packages/python.scm | 246 ++++-
gnu/packages/qemu.scm | 1 +
gnu/packages/readline.scm | 4 +-
gnu/packages/sawfish.scm | 2 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/shishi.scm | 3 +-
gnu/packages/skribilo.scm | 3 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/terminals.scm | 2 +-
gnu/packages/texinfo.scm | 16 +-
gnu/packages/tls.scm | 58 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 7 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/w3m.scm | 2 +-
gnu/packages/web.scm | 1 +
gnu/packages/webkit.scm | 2 +-
gnu/packages/wicd.scm | 2 +-
gnu/packages/wine.scm | 2 +-
gnu/packages/xdisorg.scm | 10 +-
gnu/packages/xml.scm | 21 +-
gnu/packages/xorg.scm | 162 +--
gnu/services/cups.scm | 1166 ++++++++++++++++++++
gnu/system.scm | 7 +-
guix/build/gnu-build-system.scm | 96 +-
guix/build/utils.scm | 134 ++-
guix/gnu-maintenance.scm | 11 +-
guix/packages.scm | 7 +-
guix/profiles.scm | 21 +-
m4/guix.m4 | 3 +
tests/build-utils.scm | 88 +-
tests/packages.scm | 4 +-
158 files changed, 4811 insertions(+), 5096 deletions(-)
diff --cc gnu/local.mk
index 17471b0,e1fd8ce..ce0fdeb
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -5,9 -5,9 +5,10 @@@
# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
# Copyright © 2016 Chris Marusich <address@hidden>
# Copyright © 2016 Kei Kebreau <address@hidden>
+ # Copyright © 2016 Rene Saavedra <address@hidden>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
# Copyright © 2016 Ricardo Wurmus <address@hidden>
+# Copyright © 2016 Ben Woodcroft <address@hidden>
#
# This file is part of GNU Guix.
#
@@@ -685,18 -680,8 +686,9 @@@ dist_patch_DATA =
%D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
%D%/packages/patches/libwmf-CVE-2015-4695.patch \
%D%/packages/patches/libwmf-CVE-2015-4696.patch \
- %D%/packages/patches/libx11-CVE-2016-7942.patch \
- %D%/packages/patches/libx11-CVE-2016-7943.patch \
- %D%/packages/patches/libxfixes-CVE-2016-7944.patch \
- %D%/packages/patches/libxi-CVE-2016-7945-CVE-2016-7946.patch \
- %D%/packages/patches/libxrandr-CVE-2016-7947-CVE-2016-7948.patch \
- %D%/packages/patches/libxrender-CVE-2016-7949.patch \
- %D%/packages/patches/libxrender-CVE-2016-7950.patch \
- %D%/packages/patches/libxtst-CVE-2016-7951-CVE-2016-7952.patch \
- %D%/packages/patches/libxv-CVE-2016-5407.patch \
- %D%/packages/patches/libxvmc-CVE-2016-7953.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
+ %D%/packages/patches/libxslt-CVE-2016-4738.patch \
+ %D%/packages/patches/linux-pam-no-setfsuid.patch \
%D%/packages/patches/lirc-localstatedir.patch \
%D%/packages/patches/llvm-for-extempore.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
diff --cc gnu/packages/gcc.scm
index 1fad9da,9eb3795..e190e50
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -353,9 -357,8 +357,9 @@@ Go. It also includes runtime support l
version "/gcc-" version ".tar.bz2"))
(sha256
(base32
- "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))
+ "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"))
- (patches (search-patches "gcc-5.0-libvtv-runpath.patch"))))))
+ (patches (search-patches "gcc-strmov-store-file-names.patch"
+ "gcc-5.0-libvtv-runpath.patch"))))))
(define-public gcc-6
(package
diff --cc gnu/packages/linux.scm
index 3b9f52b,01f5d6c..a3c6597
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -15,7 -15,7 +15,8 @@@
;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
+;;; Copyright © 2016 Marius Bakke <address@hidden>
+ ;;; Copyright © 2016 Rene Saavedra <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/nano.scm
index 0af1f52,01ef5dc..e1830d2
--- a/gnu/packages/nano.scm
+++ b/gnu/packages/nano.scm
@@@ -37,12 -37,12 +37,12 @@@
version ".tar.gz"))
(sha256
(base32
- "1hzazcrbwjqiw89jjvlj97q0wf385qqkzcm0870pdrixiv7yklax"))))
+ "06715a39hmp2dl0qz0979cyv8brpb91z5hn94q224ymbsc876m41"))))
(build-system gnu-build-system)
(inputs
- `(("gettext" ,gnu-gettext)
+ `(("gettext" ,gettext-minimal)
("ncurses" ,ncurses)))
- (home-page "http://www.nano-editor.org/";)
+ (home-page "https://www.nano-editor.org/";)
(synopsis "Small, user-friendly console text editor")
(description
"GNU Nano is a small and simple text editor. In addition to basic
diff --cc gnu/packages/python.scm
index d79d848,eb08a45..2393419
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -6584,8 -6614,22 +6627,22 @@@ responses, rather than doing any comput
(uri (pypi-uri "cryptography" version))
(sha256
(base32
- "1a85l548w5vvq3yhz0az7ajg2ijixzp6gagapw6wgrqvq28ghgs2"))))
+ "1raanvkdfw5ai56ymlij6ghc4k126fs7jx948ig7yn4vj6ndv0ng"))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'disable-failing-test
+ (lambda _
+ ;; This test is known to fail with OpenSSL >= 1.0.2i and older
+ ;; versions of python-cryptography:
+ ;; https://github.com/pyca/cryptography/issues/3196
+ ;; TODO: Try re-enabling the test when upgrading
+ ;; python-cryptography.
+ (substitute* "tests/hazmat/backends/test_openssl.py"
+ (("def test_numeric_string_x509_name_entry")
+ "@pytest.mark.xfail\n def
test_numeric_string_x509_name_entry"))
+ #t)))))
(inputs
`(("openssl" ,openssl)))
(propagated-inputs