[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 26 Oct 2016 23:27:28 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 02c73adcdf0f29dbecd9a1bb3c9be3626cd5dea9
Merge: a19da40 5d73e30
Author: Leo Famulari <address@hidden>
Date: Wed Oct 26 18:59:28 2016 -0400
Merge branch 'master' into core-updates
configure.ac | 9 +-
doc/guix.texi | 50 +-
gnu/build/svg.scm | 71 ++
gnu/local.mk | 12 +-
gnu/packages/bioinformatics.scm | 222 ++--
gnu/packages/elf.scm | 4 +-
gnu/packages/emacs.scm | 4 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/games.scm | 70 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/gnustep.scm | 4 +-
gnu/packages/gstreamer.scm | 3 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile.scm | 81 ++
gnu/packages/irc.scm | 6 +-
gnu/packages/linux.scm | 9 +-
gnu/packages/lolcode.scm | 58 +
gnu/packages/mail.scm | 36 +-
gnu/packages/maths.scm | 86 +-
gnu/packages/messaging.scm | 45 +-
gnu/packages/musl.scm | 1 +
gnu/packages/networking.scm | 39 +
gnu/packages/patches/coda-use-system-libs.patch | 46 +
gnu/packages/patches/hdf-eos2-build-shared.patch | 25 +
gnu/packages/patches/hdf-eos2-fortrantests.patch | 329 +++++
gnu/packages/patches/hdf-eos2-remove-gctp.patch | 55 +
.../patches/linux-libre-4.1-CVE-2016-5195.patch | 99 --
gnu/packages/patches/mupdf-CVE-2016-8674.patch | 165 +++
gnu/packages/patches/musl-CVE-2016-8859.patch | 81 ++
.../notmuch-emacs-25-compatibility-fix.patch | 46 -
gnu/packages/pdf.scm | 3 +-
gnu/packages/psyc.scm | 82 ++
gnu/packages/python.scm | 4 +-
gnu/packages/{yubico.scm => security-token.scm} | 8 +-
gnu/packages/ssh.scm | 26 +
gnu/packages/statistics.scm | 94 +-
gnu/packages/video.scm | 34 +
gnu/packages/web.scm | 8 +-
gnu/services/web.scm | 92 +-
gnu/system/grub.scm | 41 +-
guix/import/cran.scm | 4 +-
guix/scripts/package.scm | 18 +-
guix/ui.scm | 28 +
po/guix/fr.po | 1349 +++++++++++---------
44 files changed, 2427 insertions(+), 1030 deletions(-)
diff --cc gnu/local.mk
index 446c5e1,f306180..083067c
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -669,9 -675,17 +675,8 @@@ 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/linux-pam-no-setfsuid.patch \
- %D%/packages/patches/linux-libre-4.1-CVE-2016-5195.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/gnome.scm
index 10a77f0,1bd0cac..a4ae777
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -1613,8 -1597,8 +1613,8 @@@ Hints specification (EWMH)."
name "-" version ".tar.xz"))
(sha256
(base32
- "1rvadlgikklwb6rccqc3rlhqv3m9qx27rchm7znxr062fn7fgb68"))))
+ "1s3dxvdwzmppsp2dfg90rccilf4hknhwjdy7lazr9sys58zchyx0"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(arguments
`(;; The gnumeric developers don't worry much about failing tests.
;; See https://bugzilla.gnome.org/show_bug.cgi?id=732387