[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, 21 Oct 2018 12:10:49 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ffddb42d6c510456997ee6de1c1b8026c9ce6d14
Merge: e381ae3 3a69b59
Author: Marius Bakke <address@hidden>
Date: Sun Oct 21 18:06:02 2018 +0200
Merge branch 'master' into core-updates
.dir-locals.el | 1 +
doc/guix.texi | 61 +-
gnu/local.mk | 2 +-
gnu/packages/audio.scm | 29 +-
gnu/packages/aux-files/linux-libre/4.18-arm64.conf | 4 +-
gnu/packages/bioinformatics.scm | 318 ++--
gnu/packages/crypto.scm | 34 +
gnu/packages/databases.scm | 27 +-
gnu/packages/emacs.scm | 38 +-
gnu/packages/games.scm | 16 +-
gnu/packages/glib.scm | 4 +-
gnu/packages/gnome.scm | 83 +-
gnu/packages/java.scm | 79 +-
gnu/packages/kodi.scm | 5 +
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp.scm | 2005 +++++++++++++++++++-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 2 +-
.../patches/grub-check-error-efibootmgr.patch | 23 +-
gnu/packages/patches/libgxps-CVE-2017-11590.patch | 48 -
.../patches/libssh-hostname-parser-bug.patch | 22 +-
.../soundconverter-remove-gconf-dependency.patch | 83 +
gnu/packages/photo.scm | 4 +-
gnu/packages/python.scm | 4 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ssh.scm | 64 +-
gnu/packages/tex.scm | 245 +++
gnu/packages/tmux.scm | 4 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 4 +-
gnu/packages/vulkan.scm | 8 +-
gnu/packages/wm.scm | 41 +
gnu/services/desktop.scm | 4 +-
gnu/services/networking.scm | 18 +-
gnu/system/examples/bare-bones.tmpl | 2 +-
gnu/system/examples/beaglebone-black.tmpl | 2 +-
gnu/system/shadow.scm | 7 +-
gnu/tests/base.scm | 2 +-
gnu/tests/databases.scm | 4 +-
gnu/tests/dict.scm | 2 +-
gnu/tests/mail.scm | 6 +-
gnu/tests/messaging.scm | 4 +-
gnu/tests/monitoring.scm | 2 +-
gnu/tests/networking.scm | 4 +-
gnu/tests/nfs.scm | 2 +-
gnu/tests/rsync.scm | 2 +-
gnu/tests/ssh.scm | 2 +-
gnu/tests/version-control.scm | 6 +-
gnu/tests/virtualization.scm | 2 +-
gnu/tests/web.scm | 12 +-
guix/build-system/python.scm | 2 +-
guix/gexp.scm | 8 +
guix/import/pypi.scm | 2 +-
guix/scripts/pack.scm | 7 +-
guix/tests.scm | 37 +-
tests/guix-pack.sh | 30 +-
tests/guix-system.sh | 4 +-
tests/pack.scm | 75 +-
tests/pypi.scm | 2 +-
60 files changed, 3099 insertions(+), 441 deletions(-)
diff --cc gnu/local.mk
index 4b8c4c3,1c48fd3..befe3c4
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -886,7 -882,7 +886,6 @@@ dist_patch_DATA =
%D%/packages/patches/libgdata-glib-duplicate-tests.patch \
%D%/packages/patches/libgnome-encoding.patch \
%D%/packages/patches/libgnomeui-utf8.patch \
- %D%/packages/patches/libgxps-CVE-2017-11590.patch \
- %D%/packages/patches/libgpg-error-aarch64-logging-fix.patch \
%D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
%D%/packages/patches/libjxr-fix-function-signature.patch \
%D%/packages/patches/libjxr-fix-typos.patch \
@@@ -1148,8 -1148,8 +1147,9 @@@
%D%/packages/patches/slim-sigusr1.patch \
%D%/packages/patches/slim-reset.patch \
%D%/packages/patches/slim-login.patch \
+ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \
%D%/packages/patches/sooperlooper-build-with-wx-30.patch \
+ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \
%D%/packages/patches/soundtouch-CVE-2018-1000223.patch \
%D%/packages/patches/steghide-fixes.patch \