[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sun, 20 Aug 2017 21:00:04 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2718a9cd096d0f5ae4b23cc0814a42aee5cf3c4d
Merge: 9c4ce3a e904de7
Author: Marius Bakke <address@hidden>
Date: Mon Aug 21 02:40:37 2017 +0200
Merge branch 'master' into core-updates
HACKING | 10 +
Makefile.am | 3 +-
doc/guix.texi | 95 ++-
gnu/bootloader/grub.scm | 16 +-
gnu/local.mk | 12 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/bioinformatics.scm | 195 ++++-
gnu/packages/ci.scm | 28 +-
gnu/packages/compression.scm | 13 +-
gnu/packages/connman.scm | 4 +-
gnu/packages/cran.scm | 782 ++++++++++++++++++++-
gnu/packages/crypto.scm | 4 +-
gnu/packages/databases.scm | 5 +-
gnu/packages/debug.scm | 27 +-
gnu/packages/ebook.scm | 82 +++
gnu/packages/emacs.scm | 32 +
gnu/packages/fonts.scm | 27 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/game-development.scm | 85 +++
gnu/packages/games.scm | 100 +++
gnu/packages/gnome.scm | 96 ++-
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gobby.scm | 85 ++-
gnu/packages/graphics.scm | 71 ++
gnu/packages/ham-radio.scm | 52 ++
gnu/packages/haskell.scm | 304 +++++++-
gnu/packages/image.scm | 71 ++
gnu/packages/imagemagick.scm | 6 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 42 +-
gnu/packages/kde-frameworks.scm | 311 ++++----
gnu/packages/kde.scm | 6 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 91 ++-
gnu/packages/maths.scm | 11 +-
gnu/packages/mpi.scm | 2 +
gnu/packages/music.scm | 59 +-
gnu/packages/networking.scm | 38 +-
gnu/packages/package-management.scm | 8 +-
.../patches/bcftools-regidx-unsigned-char.patch | 16 +
.../patches/graphicsmagick-CVE-2017-12935.patch | 28 +
.../patches/graphicsmagick-CVE-2017-12936.patch | 16 +
.../patches/graphicsmagick-CVE-2017-12937.patch | 28 +
gnu/packages/patches/lz4-fix-test-failures.patch | 136 ----
.../patches/newsbeuter-CVE-2017-12904.patch | 34 +
.../patches/python-cython-fix-tests-32bit.patch | 27 -
.../python-pygit2-disable-network-tests.patch | 79 +--
gnu/packages/patches/rpm-CVE-2014-8118.patch | 25 -
gnu/packages/patches/vinagre-revert-1.patch | 56 ++
gnu/packages/patches/vinagre-revert-2.patch | 448 ++++++++++++
.../xf86-video-siliconmotion-fix-ftbfs.patch | 171 +++++
gnu/packages/python.scm | 23 +-
gnu/packages/rdesktop.scm | 108 +--
gnu/packages/ruby.scm | 4 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/statistics.scm | 17 +-
gnu/packages/syndication.scm | 2 +
gnu/packages/tls.scm | 8 +-
gnu/packages/version-control.scm | 52 +-
gnu/packages/video.scm | 4 +-
gnu/packages/vim.scm | 40 +-
gnu/packages/web.scm | 85 ++-
gnu/packages/wm.scm | 4 +-
gnu/packages/xorg.scm | 3 +-
gnu/services/databases.scm | 17 +-
gnu/services/web.scm | 164 ++---
gnu/system/examples/bare-bones.tmpl | 4 +-
gnu/system/examples/desktop.tmpl | 7 +-
gnu/system/examples/lightweight-desktop.tmpl | 7 +-
gnu/tests/databases.scm | 10 +-
guix/scripts/download.scm | 5 +-
guix/scripts/pack.scm | 18 +-
nix/libstore/build.cc | 8 +-
nix/libutil/util.cc | 15 -
nix/libutil/util.hh | 6 -
tests/guix-download.sh | 5 +-
77 files changed, 3645 insertions(+), 834 deletions(-)
diff --cc gnu/local.mk
index 961c1d3,1c6158c..0c62546
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -527,8 -528,10 +528,9 @@@ dist_patch_DATA =
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-completion-directories.patch \
+ %D%/packages/patches/bcftools-regidx-unsigned-char.patch \
%D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
- %D%/packages/patches/binutils-mips-bash-bug.patch \
%D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \
@@@ -670,10 -679,11 +672,13 @@@
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
+ %D%/packages/patches/graphicsmagick-CVE-2017-12935.patch \
+ %D%/packages/patches/graphicsmagick-CVE-2017-12936.patch \
+ %D%/packages/patches/graphicsmagick-CVE-2017-12937.patch \
%D%/packages/patches/graphite2-ffloat-store.patch \
+ %D%/packages/patches/grep-gnulib-lock.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
+ %D%/packages/patches/groff-source-date-epoch.patch \
%D%/packages/patches/gsl-test-i686.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \