[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Mon, 17 Oct 2016 20:48:35 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit dcaf70897a0bad38a4638a2905aaa3c46b1f1402
Merge: bf62b8f 040b629
Author: Mark H Weaver <address@hidden>
Date: Mon Oct 17 16:47:12 2016 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 14 +
gnu/local.mk | 8 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioinformatics.scm | 92 ++++
gnu/packages/cdrom.scm | 13 +-
gnu/packages/emacs.scm | 71 ++-
gnu/packages/embedded.scm | 60 ++
gnu/packages/finance.scm | 54 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 50 +-
gnu/packages/gd.scm | 1 +
gnu/packages/glib.scm | 1 +
gnu/packages/gnome.scm | 28 +
gnu/packages/graphics.scm | 10 +-
gnu/packages/guile.scm | 7 +-
gnu/packages/image.scm | 21 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/mail.scm | 48 ++
gnu/packages/music.scm | 388 +++++++++++++
gnu/packages/networking.scm | 76 ++-
gnu/packages/node.scm | 34 +-
gnu/packages/patches/artanis-fix-Makefile.in.patch | 70 +++
gnu/packages/patches/freeimage-CVE-2016-5684.patch | 34 ++
.../patches/gcc-6-arm-none-eabi-multilib.patch | 206 +++++++
.../gcc-6-cross-environment-variables.patch | 65 +++
gnu/packages/patches/gd-CVE-2016-8670.patch | 38 ++
gnu/packages/patches/hdf4-architectures.patch | 579 ++++++++++++++++++++
gnu/packages/patches/irrlicht-mesa-10.patch | 46 --
gnu/packages/patches/node-9077.patch | 30 +
gnu/packages/pdf.scm | 54 ++
gnu/packages/photo.scm | 4 +-
gnu/packages/python.scm | 87 ++-
gnu/packages/qt.scm | 6 +-
gnu/packages/ruby.scm | 6 +-
gnu/packages/serialization.scm | 9 +-
gnu/packages/ssh.scm | 11 +-
gnu/packages/terminals.scm | 14 +-
gnu/packages/tls.scm | 18 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/webkit.scm | 4 +-
gnu/services/sddm.scm | 2 +-
guix/grafts.scm | 32 +-
guix/import/utils.scm | 1 -
guix/packages.scm | 6 +-
guix/scripts/graph.scm | 53 +-
tests/grafts.scm | 62 +++
tests/graph.scm | 22 +
tests/packages.scm | 106 +++-
48 files changed, 2324 insertions(+), 247 deletions(-)
diff --cc gnu/local.mk
index 59d424a,c80b213..1c91e79
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -5,7 -5,7 +5,8 @@@
# 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>
#
# This file is part of GNU Guix.
#
@@@ -525,10 -526,12 +527,11 @@@ dist_patch_DATA =
%D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/fltk-shared-lib-defines.patch \
%D%/packages/patches/fltk-xfont-on-demand.patch \
- %D%/packages/patches/fontconfig-CVE-2016-5384.patch \
%D%/packages/patches/fontforge-svg-modtime.patch \
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
+ %D%/packages/patches/freeimage-CVE-2016-5684.patch \
- %D%/packages/patches/gawk-fts-test.patch \
%D%/packages/patches/gawk-shell.patch \
+ %D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-libvtv-runpath.patch \
@@@ -597,8 -604,6 +603,7 @@@
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inkscape-drop-wait-for-targets.patch \
- %D%/packages/patches/irrlicht-mesa-10.patch \
+ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jansson-CVE-2016-4425.patch \
%D%/packages/patches/jasper-CVE-2007-2721.patch \
%D%/packages/patches/jasper-CVE-2008-3520.patch \
diff --cc gnu/packages/glib.scm
index 938cf3b,802c809..9a1459a
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -139,7 -139,7 +139,8 @@@ shared NFS home directories."
(source
(let ((version "1.10.12"))
(origin
+ (method url-fetch)
+ (inherit (package-source dbus))
(uri (string-append
"https://dbus.freedesktop.org/releases/dbus/dbus-";
version ".tar.gz"))
diff --cc gnu/packages/networking.scm
index 1cf6b05,4b77aad..cc843c9
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@@ -482,10 -485,10 +485,10 @@@ network frames."
version ".tgz"))
(sha256
(base32
- "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"))))
+ "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"))))
(build-system gnu-build-system)
(native-inputs
- `(("gettext" ,gnu-gettext)))
+ `(("gettext" ,gettext-minimal)))
(inputs
`(("fftw" ,fftw)
("ncurses" ,ncurses)
diff --cc gnu/packages/pdf.scm
index 6f779fe,461472a..8bfe2c1
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -5,9 -5,9 +5,10 @@@
;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Coypright © 2016 ng0 <address@hidden>
+;;; Coypright © 2016 Efraim Flashner <address@hidden>
;;; Coypright © 2016 Marius Bakke <address@hidden>
;;; Coypright © 2016 Ludovic Courtès <address@hidden>
+ ;;; Coypright © 2016 Julien Lepiller <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;