[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Thu, 21 Jun 2018 09:52:54 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 4dfea1010af3f00d424fe85384957d6405c8786e
Merge: b7a46ed a34801c
Author: Marius Bakke <address@hidden>
Date: Thu Jun 21 15:52:26 2018 +0200
Merge branch 'master' into staging
NEWS | 26 ++-
gnu/local.mk | 4 +-
gnu/packages/admin.scm | 38 +---
gnu/packages/bioinformatics.scm | 16 +-
gnu/packages/cran.scm | 60 +++++-
gnu/packages/databases.scm | 4 +-
gnu/packages/emacs.scm | 231 ++++++++++-----------
gnu/packages/game-development.scm | 40 +++-
gnu/packages/games.scm | 111 ++++++++--
gnu/packages/gnome.scm | 16 +-
gnu/packages/golang.scm | 89 ++++++++
gnu/packages/java.scm | 2 +-
gnu/packages/maven.scm | 4 +-
gnu/packages/monitoring.scm | 26 +++
gnu/packages/networking.scm | 2 +-
gnu/packages/ocaml.scm | 3 +-
gnu/packages/patches/libyaml-CVE-2014-9130.patch | 30 ---
.../patches/mrrescue-support-love-11.patch | 213 +++++++++++++++++++
.../ocaml-enable-ocamldoc-reproducibility.patch | 149 +++++++++++++
gnu/packages/patches/x265-fix-ppc64le-build.patch | 25 +++
gnu/packages/sdl.scm | 12 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/syncthing.scm | 28 ---
gnu/packages/version-control.scm | 5 +-
gnu/packages/video.scm | 10 +-
gnu/packages/web.scm | 18 +-
gnu/packages/wm.scm | 17 +-
gnu/services.scm | 213 +++++++++++--------
gnu/services/cuirass.scm | 2 +-
gnu/services/pm.scm | 2 +-
gnu/services/shepherd.scm | 40 ++--
gnu/system.scm | 9 +-
gnu/tests/base.scm | 70 +++++++
guix/scripts/system.scm | 24 ++-
34 files changed, 1137 insertions(+), 406 deletions(-)
diff --cc gnu/local.mk
index 521c7f1,9057826..34c0003
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1209,8 -1212,6 +1212,7 @@@ dist_patch_DATA =
%D%/packages/patches/xinetd-fix-fd-leak.patch \
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch \
- %D%/packages/patches/libyaml-CVE-2014-9130.patch \
+ %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
%D%/packages/patches/zathura-plugindir-environment-variable.patch
MISC_DISTRO_FILES = \