[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Tue, 1 Oct 2019 07:57:58 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15
Merge: 8d564b8 717b6ba
Author: Ludovic Courtès <address@hidden>
Date: Tue Oct 1 11:49:17 2019 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 51 ++++---
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 7 +-
gnu/packages/algebra.scm | 10 +-
gnu/packages/bioinformatics.scm | 23 ++--
gnu/packages/cpp.scm | 4 +-
gnu/packages/cran.scm | 88 ++++++------
gnu/packages/emacs-xyz.scm | 147 ++++++++++++++++-----
gnu/packages/embedded.scm | 26 ++--
gnu/packages/emulators.scm | 8 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gnome.scm | 35 +++--
gnu/packages/gnupg.scm | 10 +-
gnu/packages/gpodder.scm | 8 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/guile-xyz.scm | 29 ++--
gnu/packages/guile.scm | 17 ++-
gnu/packages/java.scm | 66 ++++++++-
gnu/packages/linux.scm | 48 +++++++
gnu/packages/lisp.scm | 4 +-
gnu/packages/mail.scm | 5 +-
gnu/packages/markup.scm | 19 +--
gnu/packages/maths.scm | 26 ++--
gnu/packages/messaging.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/patches/abcl-fix-build-xml.patch | 50 +++++++
gnu/packages/patches/dealii-mpi-deprecations.patch | 28 ----
gnu/packages/patches/mame-rapidjson-fix.patch | 37 ------
gnu/packages/pdf.scm | 44 +++++-
gnu/packages/perl.scm | 5 +-
gnu/packages/ssh.scm | 7 +-
gnu/packages/statistics.scm | 35 ++---
gnu/packages/textutils.scm | 8 +-
gnu/packages/tls.scm | 5 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 7 +-
gnu/packages/xdisorg.scm | 42 ++++++
gnu/packages/xorg.scm | 5 +-
guix/build/compile.scm | 9 +-
guix/scripts/offload.scm | 3 +-
guix/scripts/pull.scm | 2 +-
guix/ui.scm | 40 ++++--
nix/libstore/build.cc | 2 +-
43 files changed, 642 insertions(+), 343 deletions(-)
diff --cc gnu/local.mk
index 18a25e6,d056a25..9f8ce84
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -674,8 -674,11 +674,9 @@@ dist_patch_DATA =
%D%/packages/patches/a2ps-CVE-2001-1593.patch \
%D%/packages/patches/a2ps-CVE-2014-0466.patch \
%D%/packages/patches/a2ps-CVE-2015-8107.patch \
+ %D%/packages/patches/abcl-fix-build-xml.patch \
%D%/packages/patches/abiword-explictly-cast-bools.patch \
%D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
- %D%/packages/patches/acl-fix-perl-regex.patch \
- %D%/packages/patches/acl-hurd-path-max.patch \
%D%/packages/patches/adb-add-libraries.patch \
%D%/packages/patches/aegis-constness-error.patch \
%D%/packages/patches/aegis-perl-tempdir1.patch \
@@@ -762,9 -764,7 +763,8 @@@
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
- %D%/packages/patches/dbus-CVE-2019-12749.patch \
+ %D%/packages/patches/dbus-c++-gcc-compat.patch \
+ %D%/packages/patches/dbus-c++-threading-mutex.patch \
- %D%/packages/patches/dealii-mpi-deprecations.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \