[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sun, 15 May 2016 06:42:36 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit eb74eb4199db3faac654114257996f244ec308f5
Merge: f10e7ef e9017c9
Author: Leo Famulari <address@hidden>
Date: Fri May 13 02:03:22 2016 -0400
Merge branch 'master' into core-updates
.mailmap | 5 +-
Makefile.am | 17 +-
build-aux/run-system-tests.scm | 71 +
build-aux/test-env.in | 14 +-
doc/emacs.texi | 5 +
doc/guix.texi | 18 +-
emacs/guix-about.el | 37 +
emacs/guix-config.el.in | 8 +-
emacs/guix-guile.el | 2 +-
emacs/guix-main.scm | 96 +-
emacs/guix-messages.el | 7 +
emacs/guix-ui-package.el | 33 +-
emacs/local.mk | 1 +
gnu/build/marionette.scm | 206 ++
gnu/local.mk | 63 +-
gnu/packages.scm | 1 +
gnu/packages/admin.scm | 23 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/asciidoc.scm | 52 -
gnu/packages/backup.scm | 9 +
gnu/packages/base.scm | 30 +-
gnu/packages/bash.scm | 43 +
gnu/packages/bioinformatics.scm | 10 +-
gnu/packages/bootstrap.scm | 3 +-
gnu/packages/calendar.scm | 17 +-
gnu/packages/cdrom.scm | 20 +-
gnu/packages/commencement.scm | 3 +
gnu/packages/connman.scm | 89 +
gnu/packages/cross-base.scm | 63 +-
gnu/packages/databases.scm | 59 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/documentation.scm | 117 +
gnu/packages/doxygen.scm | 59 -
gnu/packages/entr.scm | 66 +
gnu/packages/fcitx.scm | 2 +-
gnu/packages/fish.scm | 2 +-
gnu/packages/fontutils.scm | 29 +-
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/game-development.scm | 16 +-
gnu/packages/games.scm | 10 +-
gnu/packages/gcc.scm | 15 +-
gnu/packages/glib.scm | 138 +-
gnu/packages/gnome.scm | 433 ++--
gnu/packages/gnupg.scm | 52 +-
gnu/packages/gnustep.scm | 29 +
gnu/packages/gnuzilla.scm | 16 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/graphviz.scm | 18 +-
gnu/packages/gstreamer.scm | 3 +
gnu/packages/gtk.scm | 95 +-
gnu/packages/guile.scm | 31 +-
gnu/packages/image.scm | 7 +-
gnu/packages/imagemagick.scm | 5 +-
gnu/packages/inkscape.scm | 7 +-
gnu/packages/java.scm | 190 ++
gnu/packages/jemalloc.scm | 10 +-
gnu/packages/key-mon.scm | 13 -
gnu/packages/kodi.scm | 2 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/linux.scm | 97 +-
gnu/packages/mail.scm | 26 +-
gnu/packages/maths.scm | 298 ++-
gnu/packages/messaging.scm | 27 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/music.scm | 131 +-
gnu/packages/ntp.scm | 9 +-
gnu/packages/ocaml.scm | 3 +-
gnu/packages/patches/4store-fix-buildsystem.patch | 56 +
.../patches/doc++-include-directives.patch | 224 ++
gnu/packages/patches/doc++-segfault-fix.patch | 169 ++
.../patches/gcc-cross-environment-variables.patch | 51 +-
gnu/packages/patches/glib-tests-desktop.patch | 138 --
gnu/packages/patches/glib-tests-gapplication.patch | 28 -
gnu/packages/patches/glib-tests-homedir.patch | 59 -
gnu/packages/patches/glib-tests-prlimit.patch | 14 -
gnu/packages/patches/glib-tests-timer.patch | 11 -
...gnupg-simple-query-ignore-status-messages.patch | 142 --
gnu/packages/patches/gtk2-theme-paths.patch | 41 +
gnu/packages/patches/hdf5-config-date.patch | 21 +
gnu/packages/patches/hypre-doc-tables.patch | 25 +
gnu/packages/patches/hypre-ldflags.patch | 9 +
gnu/packages/patches/icecat-CVE-2016-2805.patch | 75 -
.../patches/icecat-CVE-2016-2807-pt1.patch | 35 -
.../patches/icecat-CVE-2016-2807-pt2.patch | 69 -
.../patches/icecat-CVE-2016-2807-pt3.patch | 33 -
.../patches/icecat-CVE-2016-2807-pt4.patch | 37 -
.../patches/icecat-CVE-2016-2807-pt5.patch | 35 -
gnu/packages/patches/icecat-CVE-2016-2808.patch | 389 ---
gnu/packages/patches/icecat-CVE-2016-2814.patch | 35 -
.../icecat-re-enable-DHE-cipher-suites.patch | 24 -
.../patches/icecat-update-bundled-graphite2.patch | 2488 --------------------
gnu/packages/patches/imagemagick-test-segv.patch | 20 -
gnu/packages/patches/imlib2-CVE-2016-4024.patch | 52 -
.../patches/inkscape-drop-wait-for-targets.patch | 68 +
.../patches/libarchive-CVE-2016-1541.patch | 67 +
gnu/packages/patches/netcdf-config-date.patch | 47 +
gnu/packages/patches/ocaml-CVE-2015-8869.patch | 72 +
gnu/packages/patches/poppler-CVE-2015-8868.patch | 30 -
gnu/packages/patches/portmidi-modular-build.patch | 325 +++
gnu/packages/patches/qemu-CVE-2015-8558.patch | 48 -
gnu/packages/patches/qemu-CVE-2015-8567.patch | 93 -
gnu/packages/patches/qemu-CVE-2015-8613.patch | 35 -
gnu/packages/patches/qemu-CVE-2015-8619.patch | 119 -
gnu/packages/patches/qemu-CVE-2015-8701.patch | 47 -
gnu/packages/patches/qemu-CVE-2015-8743.patch | 48 -
gnu/packages/patches/qemu-CVE-2016-1568.patch | 39 -
gnu/packages/patches/qemu-CVE-2016-1922.patch | 65 -
gnu/packages/patches/qemu-CVE-2016-1981.patch | 95 -
gnu/packages/patches/qemu-CVE-2016-2197.patch | 40 -
gnu/packages/patches/qemu-usb-ehci-oob-read.patch | 49 -
...virtio-9p-use-accessor-to-get-thread-pool.patch | 34 -
gnu/packages/patches/totem-debug-format-fix.patch | 11 +
gnu/packages/patches/tvtime-gcc41.patch | 58 -
gnu/packages/patches/tvtime-pngoutput.patch | 15 -
gnu/packages/patches/tvtime-videodev2.patch | 15 -
gnu/packages/patches/tvtime-xmltv.patch | 28 -
.../patches/wpa-supplicant-CVE-2016-4476.patch | 82 +
.../patches/wpa-supplicant-CVE-2016-4477-pt1.patch | 51 +
.../patches/wpa-supplicant-CVE-2016-4477-pt2.patch | 82 +
.../patches/wpa-supplicant-CVE-2016-4477-pt3.patch | 62 +
.../patches/wpa-supplicant-CVE-2016-4477-pt4.patch | 50 +
gnu/packages/pdf.scm | 24 +-
gnu/packages/qemu.scm | 23 +-
gnu/packages/qt.scm | 38 -
gnu/packages/rdf.scm | 2 +-
gnu/packages/serialization.scm | 2 +-
gnu/packages/statistics.scm | 75 +-
gnu/packages/suckless.scm | 39 +
gnu/packages/tls.scm | 27 +-
gnu/packages/tv.scm | 25 +-
gnu/packages/version-control.scm | 62 +-
gnu/packages/video.scm | 32 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web.scm | 6 +-
gnu/packages/wm.scm | 22 +-
gnu/packages/xdisorg.scm | 48 +-
gnu/packages/xiph.scm | 2 +-
gnu/services/herd.scm | 82 +-
gnu/services/networking.scm | 49 +-
gnu/system.scm | 18 +
gnu/system/shadow.scm | 5 +-
gnu/system/vm.scm | 3 +-
gnu/tests.scm | 130 +
gnu/tests/base.scm | 164 ++
guix/build-system/gnu.scm | 1 +
guix/build-system/python.scm | 1 +
guix/build/syscalls.scm | 92 +-
guix/combinators.scm | 116 +
guix/derivations.scm | 1 +
guix/gnu-maintenance.scm | 3 +-
guix/import/elpa.scm | 4 +-
guix/nar.scm | 4 +-
guix/profiles.scm | 143 +-
guix/scripts/archive.scm | 1 +
guix/scripts/build.scm | 1 +
guix/scripts/environment.scm | 10 +-
guix/scripts/graph.scm | 2 +-
guix/scripts/lint.scm | 1 +
guix/scripts/size.scm | 2 +-
guix/scripts/substitute.scm | 1 +
guix/scripts/system.scm | 142 +-
guix/serialization.scm | 4 +-
guix/store.scm | 1 +
guix/ui.scm | 1 +
guix/utils.scm | 192 +-
tests/combinators.scm | 85 +
tests/syscalls.scm | 90 +-
tests/utils.scm | 152 --
168 files changed, 5088 insertions(+), 5883 deletions(-)
diff --cc gnu/local.mk
index d223d39,acb9790..9d3bc1e
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -490,11 -498,8 +498,7 @@@ dist_patch_DATA =
gnu/packages/patches/ghostscript-CVE-2015-3228.patch \
gnu/packages/patches/ghostscript-runpath.patch \
gnu/packages/patches/glib-networking-ssl-cert-file.patch \
- gnu/packages/patches/glib-tests-desktop.patch \
- gnu/packages/patches/glib-tests-homedir.patch \
- gnu/packages/patches/glib-tests-prlimit.patch \
gnu/packages/patches/glib-tests-timer.patch \
- gnu/packages/patches/glib-tests-gapplication.patch \
- gnu/packages/patches/glibc-CVE-2015-7547.patch \
gnu/packages/patches/glibc-bootstrap-system.patch \
gnu/packages/patches/glibc-hurd-extern-inline.patch \
gnu/packages/patches/glibc-ldd-x86_64.patch \
@@@ -680,10 -679,9 +679,10 @@@
gnu/packages/patches/plink-1.07-unclobber-i.patch \
gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
gnu/packages/patches/polkit-drop-test.patch \
- gnu/packages/patches/poppler-CVE-2015-8868.patch \
gnu/packages/patches/portaudio-audacity-compat.patch \
+ gnu/packages/patches/portmidi-modular-build.patch \
gnu/packages/patches/procmail-ambiguous-getline-debian.patch \
+ gnu/packages/patches/procps-non-linux.patch \
gnu/packages/patches/pt-scotch-build-parallelism.patch \
gnu/packages/patches/pulseaudio-fix-mult-test.patch \
gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
diff --cc gnu/packages/commencement.scm
index 12cafb7,c52b6e8..5f3faad
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -901,9 -874,12 +901,12 @@@ and binaries, plus debugging symbols i
(gcc-toolchain gcc-4.8))
(define-public gcc-toolchain-4.9
- (gcc-toolchain gcc-final))
+ (gcc-toolchain gcc-4.9))
(define-public gcc-toolchain-5
- (gcc-toolchain gcc-5))
+ (gcc-toolchain gcc-final))
+ (define-public gcc-toolchain-6
+ (gcc-toolchain gcc-6))
+
;;; commencement.scm ends here
diff --cc gnu/packages/cross-base.scm
index 22dfa15,73ac76a..64d3e1e
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@@ -173,27 -174,31 +174,31 @@@ may be either a libc package or #f.)
(define (cross? x)
;; Return #t if X is a cross-libc or cross Linux.
(or (string-prefix? libc x)
- (string-prefix? linux x)))
+ (string-prefix? kernel x)))
-
- (setenv "CROSS_CPATH"
- (string-append libc "/include:"
- kernel "/include"))
+ (let ((cpath (string-append
+ libc "/include"
- ":" linux "/include")))
++ ":" kernel "/include")))
+ (for-each (cut setenv <> cpath)
+ '("CROSS_C_INCLUDE_PATH"
+ "CROSS_CPLUS_INCLUDE_PATH"
+ "CROSS_OBJC_INCLUDE_PATH"
+ "CROSS_OBJCPLUS_INCLUDE_PATH")))
(setenv "CROSS_LIBRARY_PATH"
(string-append libc "/lib"))
-
- (let ((cpath (search-path-as-string->list
- (getenv "C_INCLUDE_PATH")))
- (libpath (search-path-as-string->list
- (getenv "LIBRARY_PATH"))))
- (setenv "CPATH"
- (list->search-path-as-string
- (remove cross? cpath) ":"))
- (for-each unsetenv
- '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
- (setenv "LIBRARY_PATH"
- (list->search-path-as-string
- (remove cross? libpath) ":"))
- #t)))
+ (for-each
+ (lambda (var)
+ (and=> (getenv var)
+ (lambda (value)
+ (let* ((path (search-path-as-string->list
value))
+ (native-path
(list->search-path-as-string
+ (remove cross? path)
":")))
+ (setenv var native-path)))))
+ '("C_INCLUDE_PATH"
+ "CPLUS_INCLUDE_PATH"
+ "OBJC_INCLUDE_PATH"
+ "OBJCPLUS_INCLUDE_PATH"
+ "LIBRARY_PATH"))
+ #t))
,phases)
phases)))))))
@@@ -314,11 -329,15 +329,15 @@@ XBINUTILS and the cross tool chain.
,flags))
((#:phases phases)
`(alist-cons-before
- 'configure 'set-cross-linux-headers-path
+ 'configure 'set-cross-kernel-headers-path
(lambda* (#:key inputs #:allow-other-keys)
- (let ((kernel (assoc-ref inputs "kernel-headers")))
- (setenv "CROSS_CPATH"
- (string-append kernel "/include"))
- (let* ((linux (assoc-ref inputs "linux-headers"))
- (cpath (string-append linux "/include")))
++ (let* ((kernel (assoc-ref inputs "kernel-headers"))
++ (cpath (string-append kernel "/include")))
+ (for-each (cut setenv <> cpath)
+ '("CROSS_C_INCLUDE_PATH"
+ "CROSS_CPLUS_INCLUDE_PATH"
+ "CROSS_OBJC_INCLUDE_PATH"
+ "CROSS_OBJCPLUS_INCLUDE_PATH"))
#t))
,phases))))
diff --cc gnu/packages/databases.scm
index 6676950,a8998d8..1ccfb9e
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1,8 -1,8 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2012, 2014, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2013 Cyril Roelandt <address@hidden>
- ;;; Copyright © 2014 David Thompson <address@hidden>
+ ;;; Copyright © 2014, 2016 David Thompson <address@hidden>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
diff --cc gnu/packages/gcc.scm
index 04d3f93,740ed51..0ec8026
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -352,14 -352,24 +352,27 @@@ Go. It also includes runtime support l
(sha256
(base32
"1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq"))
- (patches (search-patches "gcc-5.0-libvtv-runpath.patch"))))))
+ (patches (search-patches "gcc-5.0-libvtv-runpath.patch"
+ "gcc-libiberty-printf-decl.patch"))))
+ ;; GCC 5 ships with .info files, so no need for Texinfo.
+ (native-inputs '())))
+ (define-public gcc-6
+ (package
+ (inherit gcc-5)
+ (version "6.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-"
+ version "/gcc-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "0ld3y4rgimyqgx1nwvzqyl5gr4wzc0ch4akkvsqp3fgbmdfcii09"))
+ (patches (search-patches "gcc-5.0-libvtv-runpath.patch"))))))
+
;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions accordingly.
-(define-public gcc gcc-4.9)
+(define-public gcc gcc-5)
(define-public (make-libstdc++ gcc)
"Return a libstdc++ package based on GCC. The primary use case is when