[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
02/02: Merge branch 'master' into core-updates |
|
Date: |
Sun, 6 Aug 2017 00:26:23 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit f167595ba1a4e0e419adc17de6af275bedf32822
Merge: e3df693 01a61d7
Author: Mark H Weaver <address@hidden>
Date: Sun Aug 6 00:23:20 2017 -0400
Merge branch 'master' into core-updates
Makefile.am | 10 +-
build-aux/build-self.scm | 17 +
configure.ac | 10 +-
doc/contributing.texi | 7 +-
doc/guix.texi | 47 +-
gnu/bootloader/grub.scm | 6 +
gnu/build/activation.scm | 1 +
gnu/build/file-systems.scm | 17 +-
gnu/local.mk | 7 +-
gnu/packages/admin.scm | 22 +-
gnu/packages/base.scm | 10 +
gnu/packages/bioinformatics.scm | 135 +++---
gnu/packages/bootloaders.scm | 33 ++
gnu/packages/compression.scm | 9 +-
gnu/packages/cran.scm | 106 +++++
gnu/packages/ebook.scm | 3 +
gnu/packages/emacs.scm | 10 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/gcc.scm | 7 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/graphics.scm | 6 +-
gnu/packages/image.scm | 44 +-
gnu/packages/javascript.scm | 191 +++++++-
gnu/packages/lego.scm | 61 ++-
gnu/packages/linux.scm | 42 +-
gnu/packages/machine-learning.scm | 1 +
gnu/packages/markup.scm | 4 +-
gnu/packages/maths.scm | 54 ++-
gnu/packages/mp3.scm | 13 +-
gnu/packages/package-management.scm | 9 +-
gnu/packages/patches/fabric-tests.patch | 15 -
gnu/packages/patches/gd-CVE-2017-7890.patch | 30 ++
gnu/packages/patches/glibc-CVE-2015-5180.patch | 311 +++++++++++++
gnu/packages/patches/glibc-CVE-2015-7547.patch | 590 +++++++++++++++++++++++++
gnu/packages/patches/glibc-CVE-2016-3075.patch | 43 ++
gnu/packages/patches/glibc-CVE-2016-3706.patch | 188 ++++++++
gnu/packages/patches/glibc-CVE-2016-4429.patch | 58 +++
gnu/packages/php.scm | 17 +-
gnu/packages/python.scm | 28 ++
gnu/packages/rdesktop.scm | 22 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/statistics.scm | 333 +++++++-------
gnu/packages/tls.scm | 6 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 39 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 10 +-
gnu/packages/vpn.scm | 6 +-
gnu/packages/web.scm | 156 ++++++-
gnu/system/vm.scm | 7 +
guix/build-system/minify.scm | 127 ++++++
guix/build/minify-build-system.scm | 73 +++
guix/scripts/pull.scm | 250 ++++++-----
nix/libstore/build.cc | 11 +-
54 files changed, 2692 insertions(+), 530 deletions(-)
diff --cc gnu/local.mk
index 3f27a5f,9482d4b..acdadd6
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -580,9 -582,10 +580,8 @@@ dist_patch_DATA =
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/erlang-man-path.patch \
%D%/packages/patches/eudev-rules-directory.patch \
- %D%/packages/patches/eudev-conflicting-declaration.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
- %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \
%D%/packages/patches/exim-CVE-2017-1000369.patch \
- %D%/packages/patches/fabric-tests.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
%D%/packages/patches/fastcap-mulSetup.patch \
%D%/packages/patches/fasthenry-spAllocate.patch \