01/02: Merge branch 'master' into core-updates

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit c6d02bcf1bcc06c70e440221e317274926c0fce3
Merge: 2a2a987 658505d
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Apr 11 17:00:30 2020 +0200

    Merge branch 'master' into core-updates

 gnu/local.mk                                      |  4 +-
 gnu/packages/finance.scm                          |  4 +-
 gnu/packages/games.scm                            | 69 ++++++++++++++++++++++-
 gnu/packages/lisp-xyz.scm                         | 41 +++++++-------
 gnu/packages/patches/dbacl-include-locale.h.patch | 36 ++++++++++++
 gnu/packages/python-web.scm                       |  8 +--
 gnu/packages/python-xyz.scm                       |  4 +-
 gnu/packages/qt.scm                               | 14 ++---
 gnu/packages/{ham-radio.scm => radio.scm}         | 34 ++++++++++-
 gnu/packages/sdr.scm                              | 57 -------------------
 gnu/packages/syncthing.scm                        |  7 ++-
 gnu/packages/textutils.scm                        | 20 +++----
 gnu/packages/tls.scm                              |  2 +-
 gnu/packages/version-control.scm                  |  8 +--
 gnu/packages/video.scm                            |  8 ++-
 gnu/packages/virtualization.scm                   |  4 +-
 gnu/packages/vpn.scm                              |  6 +-
 gnu/packages/xfce.scm                             |  4 +-
 18 files changed, 203 insertions(+), 127 deletions(-)

diff --cc gnu/local.mk
index 3f48c46,ac5fb0c..7347222
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -825,13 -819,11 +824,14 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/crda-optional-gcrypt.patch             \
    %D%/packages/patches/clucene-contribs-lib.patch               \
    %D%/packages/patches/cube-nocheck.patch                     \
 +  %D%/packages/patches/curl-use-ssl-cert-env.patch            \
    %D%/packages/patches/cursynth-wave-rand.patch                       \
    %D%/packages/patches/cvs-CVE-2017-12836.patch               \
 +  %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch                \
    %D%/packages/patches/date-output-pkg-config-files.patch     \
    %D%/packages/patches/darkice-workaround-fpermissive-error.patch     \
 +  %D%/packages/patches/datefudge-gettimeofday.patch           \
+   %D%/packages/patches/dbacl-include-locale.h.patch           \
    %D%/packages/patches/dbus-helper-search-path.patch          \
    %D%/packages/patches/dbus-c++-gcc-compat.patch              \
    %D%/packages/patches/dbus-c++-threading-mutex.patch         \
diff --cc gnu/packages/tls.scm
index a73b497,3eb32fc..eea3b12
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -251,10 -245,10 +251,10 @@@ required structures."
      (properties '((ftp-server . "ftp.gnutls.org")
                    (ftp-directory . "/gcrypt/gnutls")))))
  
- (define gnutls-3.6.13
+ (define-public gnutls-3.6.13
    (package
      (inherit gnutls)
 -    (version "3.6.A")
 +    (version "3.6.13")
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://gnupg/gnutls/v"