[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 9 Mar 2017 11:00:58 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit e90e0fad1b3ba79d81f02424e143ee6f4f736e8b
Merge: 8ea0700 9ec2a4d
Author: Ludovic Courtès <address@hidden>
Date: Thu Mar 9 16:35:41 2017 +0100
Merge branch 'master' into core-updates
.gitignore | 5 -
Makefile.am | 25 +-
build-aux/hydra/gnu-system.scm | 7 +-
build-aux/pre-inst-env.in | 15 +-
doc/guix.texi | 188 ++-
etc/guix-daemon.conf.in | 2 +-
etc/guix-daemon.service.in | 2 +-
etc/guix-publish.conf.in | 2 +-
etc/guix-publish.service.in | 2 +-
gnu/build/file-systems.scm | 66 +-
gnu/local.mk | 24 +-
gnu/packages.scm | 28 +-
gnu/packages/admin.scm | 43 +-
gnu/packages/algebra.scm | 19 +-
gnu/packages/astronomy.scm | 46 +
gnu/packages/audio.scm | 14 +-
.../packages/aux-files/emacs}/guix-emacs.el | 21 +-
.../linux-libre/4.1-i686.conf} | 0
.../linux-libre/4.1-x86_64.conf} | 0
.../linux-libre/4.10-i686.conf} | 0
.../linux-libre/4.10-x86_64.conf} | 0
.../linux-libre/4.4-i686.conf} | 0
.../linux-libre/4.4-x86_64.conf} | 0
.../linux-libre/4.9-i686.conf} | 0
.../linux-libre/4.9-x86_64.conf} | 0
gnu/packages/backup.scm | 58 +-
gnu/packages/bash.scm | 5 +-
gnu/packages/benchmark.scm | 6 +-
gnu/packages/bioinformatics.scm | 47 +-
gnu/packages/bootstrap.scm | 1 +
gnu/packages/calendar.scm | 9 +-
gnu/packages/cdrom.scm | 25 +
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 44 +-
gnu/packages/compression.scm | 22 +-
gnu/packages/curl.scm | 4 +-
gnu/packages/databases.scm | 41 +-
gnu/packages/dav.scm | 6 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/django.scm | 13 +-
gnu/packages/education.scm | 38 -
gnu/packages/emacs.scm | 48 +-
gnu/packages/embedded.scm | 53 +
gnu/packages/engineering.scm | 24 +
gnu/packages/enlightenment.scm | 16 +-
gnu/packages/finance.scm | 1 -
gnu/packages/fontutils.scm | 4 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/ftp.scm | 77 +-
gnu/packages/game-development.scm | 24 +-
gnu/packages/games.scm | 65 +-
gnu/packages/ghostscript.scm | 3 +-
gnu/packages/gnome.scm | 12 +-
gnu/packages/gnunet.scm | 10 +-
gnu/packages/gnupg.scm | 37 +-
gnu/packages/gnuzilla.scm | 101 +-
gnu/packages/gstreamer.scm | 34 +-
gnu/packages/guile.scm | 93 +-
gnu/packages/image-viewers.scm | 28 +-
gnu/packages/image.scm | 4 +-
gnu/packages/imagemagick.scm | 13 +-
gnu/packages/java.scm | 1016 ++++++-------
gnu/packages/jemalloc.scm | 4 +-
gnu/packages/jrnl.scm | 2 +-
gnu/packages/kde-frameworks.scm | 1 +
gnu/packages/kde.scm | 14 +-
gnu/packages/ldc.scm | 14 +-
gnu/packages/libevent.scm | 82 +-
gnu/packages/lighting.scm | 4 +-
gnu/packages/linux.scm | 69 +-
gnu/packages/lisp.scm | 76 +-
gnu/packages/lua.scm | 12 -
gnu/packages/machine-learning.scm | 25 +-
gnu/packages/mail.scm | 62 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markdown.scm | 4 +-
gnu/packages/maths.scm | 66 +-
gnu/packages/messaging.scm | 7 +-
gnu/packages/mp3.scm | 9 +-
gnu/packages/music.scm | 2 +
gnu/packages/nano.scm | 13 +-
gnu/packages/networking.scm | 36 +-
gnu/packages/openstack.scm | 143 +-
gnu/packages/package-management.scm | 17 +-
gnu/packages/password-utils.scm | 9 +-
gnu/packages/patches/arb-ldconfig.patch | 22 -
.../patches/gnupg-2.1-fix-Y2038-test-failure.patch | 67 +
.../gst-plugins-base-fix-test-on-32bit.patch | 32 -
gnu/packages/patches/jacal-fix-texinfo.patch | 92 ++
gnu/packages/patches/kio-CVE-2017-6410.patch | 53 +
.../patches/libssh-0.6.5-CVE-2016-0739.patch | 77 -
gnu/packages/patches/matplotlib-setupext-tk.patch | 34 -
gnu/packages/patches/mupdf-CVE-2017-5896.patch | 63 +
gnu/packages/patches/mupdf-CVE-2017-5991.patch | 101 ++
gnu/packages/patches/nss-pkgconfig.patch | 4 +-
gnu/packages/patches/pcre2-CVE-2016-3191.patch | 179 ---
.../patches/python-dendropy-fix-tests.patch | 41 +
.../python-fake-factory-fix-build-32bit.patch | 36 +
.../patches/python-faker-fix-build-32bit.patch | 36 +
.../patches/python-pandas-skip-failing-tests.patch | 59 +
.../patches/python-pbr-fix-man-page-support.patch | 28 +
.../python-pygit2-disable-network-tests.patch | 64 +
.../python-pyopenssl-skip-network-test.patch | 50 +
.../patches/python-statsmodels-fix-tests.patch | 224 +--
.../python2-subprocess32-disable-input-test.patch | 18 +
gnu/packages/patches/screen-CVE-2017-5618.patch | 40 -
gnu/packages/patches/shadow-CVE-2017-2616.patch | 72 +
.../patches/texlive-texmf-CVE-2016-10243.patch | 18 +
.../patches/util-linux-CVE-2017-2616.patch | 65 +
.../vdirsyncer-test-suite-slow-machines.patch | 42 -
gnu/packages/patches/vim-CVE-2017-5953.patch | 18 +-
gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 18 +
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pcre.scm | 15 +-
gnu/packages/pdf.scm | 9 +-
gnu/packages/perl.scm | 317 +++-
gnu/packages/photo.scm | 37 +
gnu/packages/plotutils.scm | 4 +-
gnu/packages/python.scm | 1537 +++++++++++++++-----
gnu/packages/qemu.scm | 30 +-
gnu/packages/rdf.scm | 22 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 37 +-
gnu/packages/scheme.scm | 103 +-
gnu/packages/screen.scm | 6 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/spice.scm | 2 +-
gnu/packages/ssh.scm | 8 +-
gnu/packages/statistics.scm | 80 +-
gnu/packages/suckless.scm | 42 +-
gnu/packages/telephony.scm | 16 +-
gnu/packages/terminals.scm | 3 +
gnu/packages/tex.scm | 2 +
gnu/packages/tls.scm | 42 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 23 +-
gnu/packages/video.scm | 24 +-
gnu/packages/vim.scm | 337 ++++-
gnu/packages/vpn.scm | 8 +
gnu/packages/web.scm | 63 +-
gnu/packages/wine.scm | 2 +
gnu/packages/wm.scm | 27 +
gnu/packages/wxwidgets.scm | 5 +-
gnu/packages/xdisorg.scm | 142 +-
gnu/packages/xml.scm | 65 +-
gnu/packages/xorg.scm | 60 +-
gnu/services/base.scm | 240 ++-
gnu/services/messaging.scm | 15 +-
gnu/services/ssh.scm | 8 +-
gnu/system.scm | 9 +-
gnu/system/examples/lightweight-desktop.tmpl | 6 +-
gnu/system/grub.scm | 2 +-
gnu/system/vm.scm | 106 +-
guix/build-system/cargo.scm | 3 +-
guix/build/python-build-system.scm | 14 +-
guix/download.scm | 4 +-
guix/gexp.scm | 3 +
guix/scripts/archive.scm | 2 +-
guix/ui.scm | 33 +-
guix/utils.scm | 4 +-
nix/local.mk | 4 +-
nix/scripts/list-runtime-roots.in | 5 +-
tests/cran.scm | 3 +-
tests/hash.scm | 3 +-
tests/nar.scm | 3 +-
tests/ui.scm | 11 +-
166 files changed, 5822 insertions(+), 2471 deletions(-)
diff --cc gnu/local.mk
index e4114be,cbd61e0..3356c9e
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -481,9 -479,9 +481,8 @@@ dist_patch_DATA =
%D%/packages/patches/aegis-test-fixup-1.patch \
%D%/packages/patches/aegis-test-fixup-2.patch \
%D%/packages/patches/agg-am_c_prototype.patch \
- %D%/packages/patches/alsa-lib-mips-atomic-fix.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
- %D%/packages/patches/arb-ldconfig.patch \
%D%/packages/patches/artanis-fix-Makefile.in.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
@@@ -691,8 -691,7 +691,7 @@@
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \
%D%/packages/patches/libmad-frame-length.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \
- %D%/packages/patches/libssh-0.6.5-CVE-2016-0739.patch \
- %D%/packages/patches/libpng-CVE-2016-10087.patch \
+ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtiff-CVE-2016-10092.patch \
@@@ -811,7 -810,7 +811,6 @@@
%D%/packages/patches/patchelf-rework-for-arm.patch \
%D%/packages/patches/patchutils-xfail-gendiff-tests.patch \
%D%/packages/patches/patch-hurd-path-max.patch \
- %D%/packages/patches/pcre2-CVE-2016-3191.patch \
- %D%/packages/patches/pcre-CVE-2016-3191.patch \
%D%/packages/patches/perl-autosplit-default-time.patch \
%D%/packages/patches/perl-deterministic-ordering.patch \
%D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
@@@ -892,9 -898,9 +898,8 @@@
%D%/packages/patches/ruby-puma-ignore-broken-test.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
- %D%/packages/patches/sed-hurd-path-max.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-test-threading.patch \
- %D%/packages/patches/screen-CVE-2017-5618.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/seq24-rename-mutex.patch \
%D%/packages/patches/serf-comment-style-fix.patch \
@@@ -971,10 -979,8 +978,11 @@@
%D%/packages/patches/wordnet-CVE-2008-2149.patch \
%D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch
\
%D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch
\
+ %D%/packages/patches/xcb-proto-python3-print.patch \
+ %D%/packages/patches/xcb-proto-python3-whitespace.patch \
+ %D%/packages/patches/wxwidgets-fix-windowGTK.patch \
%D%/packages/patches/xdotool-fix-makefile.patch \
+ %D%/packages/patches/xf86-input-wacom-xorg-abi-25.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-ast-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
diff --cc gnu/packages/bootstrap.scm
index 61f1f1a,b484709..048fe26
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -169,7 -167,7 +169,8 @@@ successful, or false to signal an error
((string=? system "i586-gnu") "/lib/ld.so.1")
((string=? system "i686-gnu") "/lib/ld.so.1")
((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1")
+ ((string=? system "powerpc-linux") "/lib/ld.so.1")
+ ((string=? system "alpha-linux") "/lib/ld-linux.so.2")
;; XXX: This one is used bare-bones, without a libc, so add a case
;; here just so we can keep going.
diff --cc gnu/packages/curl.scm
index ec982ef,13e0686..22e1838
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -40,14 -40,15 +40,14 @@@
(define-public curl
(package
(name "curl")
- (version "7.52.1")
- (replacement curl-7.53.0)
- (version "7.50.3")
++ (version "7.53.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
version ".tar.lzma"))
(sha256
(base32
- "0r937wplchjxifxqqcjxd9rzp6l9rqqdfjn41x1y4djrh95nsa24"))))
- "1spmk0345hq0sgpwxs8d410268lmg3wf1x9v23hxff7wxki5fm4c"))))
++ "1k0i31xygb804c61llhin5wbpcscg4gfqmbxcfkpdr1alwh7igrq"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
diff --cc gnu/packages/databases.scm
index 877eac9,5199d0c..4b637f0
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -7,8 -7,8 +7,8 @@@
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2015 Leo Famulari <address@hidden>
-;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
- ;;; Copyright © 2016 ng0 <address@hidden>
+ ;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
diff --cc gnu/packages/ghostscript.scm
index 7b3182f,2c7b86c..a6403e6
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -59,8 -57,17 +59,9 @@@
focus on accuracy and performance. It uses the International Color
Consortium standard (ICC), approved as ISO 15076-1.")
(license license:x11)
- (home-page "http://www.littlecms.com/";)))
+ (home-page "http://www.littlecms.com/";)
+ (properties '((cpe-name . "little_cms_color_engine")))))
-(define lcms/fixed
- (package
- (inherit lcms)
- (source
- (origin
- (inherit (package-source lcms))
- (patches (search-patches "lcms-fix-out-of-bounds-read.patch"))))))
-
(define-public libpaper
(package
(name "libpaper")
diff --cc gnu/packages/linux.scm
index c1e4956,de0fd71..53b0f2a
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -5,10 -5,10 +5,10 @@@
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Federico Beffa <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
-;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <address@hidden>
- ;;; Copyright © 2016 Alex Kost <address@hidden>
+ ;;; Copyright © 2016, 2017 Alex Kost <address@hidden>
;;; Copyright © 2016 Raymond Nicholson <address@hidden>
;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
;;; Copyright © 2016 Nicolas Goaziou <address@hidden>
@@@ -107,15 -106,9 +107,16 @@@
((string-prefix? "mips" arch) "mips")
((string-prefix? "arm" arch) "arm")
((string-prefix? "aarch64" arch) "arm64")
+ ((string-prefix? "alpha" arch) "alpha")
(else arch))))
+(define-public (system->defconfig system)
+ "Some systems (notably powerpc-linux) require a special target for kernel
+defconfig. Return the appropiate make target if applicable, otherwise return
+\"defconfig\"."
+ (cond ((string-prefix? "powerpc-" system) "pmac32_defconfig")
+ (else "defconfig")))
+
(define (linux-libre-urls version)
"Return a list of URLs for Linux-Libre VERSION."
(list (string-append