[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Wed, 12 Dec 2018 16:05:01 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 12878d12acccf83ef3258a53a01f851088f0aa9e
Merge: 17c3e0d 7b046b1
Author: Marius Bakke <address@hidden>
Date: Wed Dec 12 22:00:52 2018 +0100
Merge branch 'master' into staging
Makefile.am | 1 +
build-aux/hydra/gnu-system.scm | 4 +-
doc/guix.texi | 33 ++++
gnu/local.mk | 4 +-
gnu/packages/audio.scm | 10 +-
gnu/packages/backup.scm | 5 +-
gnu/packages/bootloaders.scm | 2 +
gnu/packages/busybox.scm | 40 +++++
gnu/packages/check.scm | 24 +++
gnu/packages/easyrpg.scm | 121 +++++++++++++
gnu/packages/emacs.scm | 54 ++++--
gnu/packages/fonts.scm | 16 +-
gnu/packages/game-development.scm | 2 +
gnu/packages/games.scm | 6 +-
gnu/packages/gnuzilla.scm | 75 ++++++--
gnu/packages/ham-radio.scm | 35 +++-
gnu/packages/ipfs.scm | 27 +++
gnu/packages/java.scm | 2 +
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp.scm | 6 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/messaging.scm | 55 +++++-
gnu/packages/mtools.scm | 4 +-
gnu/packages/music.scm | 6 +-
...gro-fix-compilation-mesa-18.2.5-and-later.patch | 41 +++++
.../patches/borg-respect-storage-quota.patch | 32 ----
.../patches/openjdk-10-idlj-reproducibility.patch | 36 ++++
gnu/packages/patches/polkit-CVE-2018-19788.patch | 197 +++++++++++++++++++++
gnu/packages/pdf.scm | 14 +-
gnu/packages/polkit.scm | 1 +
gnu/packages/python.scm | 179 +++++++++++++++----
gnu/packages/rust.scm | 3 +
gnu/packages/security-token.scm | 34 ++++
gnu/packages/tls.scm | 6 +-
gnu/packages/tor.scm | 49 +----
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 24 ++-
gnu/services/base.scm | 10 +-
guix/channels.scm | 122 +++++++++++--
guix/scripts/refresh.scm | 16 +-
tests/channels.scm | 139 +++++++++++++++
42 files changed, 1249 insertions(+), 210 deletions(-)
diff --cc gnu/local.mk
index fe5224c,4f2437b..41c9423
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -606,8 -607,9 +607,7 @@@ dist_patch_DATA =
%D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/blender-newer-ffmpeg.patch \
%D%/packages/patches/boost-fix-icu-build.patch \
- %D%/packages/patches/borg-respect-storage-quota.patch \
%D%/packages/patches/byobu-writable-status.patch \
- %D%/packages/patches/cairo-CVE-2016-9082.patch \
- %D%/packages/patches/cairo-setjmp-wrapper.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-use-packaged-feedparser.patch \
%D%/packages/patches/casync-renameat2-declaration.patch \
@@@ -1051,9 -1063,10 +1052,10 @@@
%D%/packages/patches/plink-endian-detection.patch \
%D%/packages/patches/plotutils-libpng-jmpbuf.patch \
%D%/packages/patches/podofo-cmake-3.12.patch \
+ %D%/packages/patches/polkit-CVE-2018-19788.patch \
- %D%/packages/patches/poppler-CVE-2018-19149.patch \
%D%/packages/patches/portaudio-audacity-compat.patch \
%D%/packages/patches/portmidi-modular-build.patch \
+ %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
%D%/packages/patches/potrace-tests.patch \
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \
%D%/packages/patches/procmail-CVE-2014-3618.patch \