Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 1d3d6ff,caa73d4..25f017b
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -752,10 -754,9 +752,11 @@@ dist_patch_DATA =                                                
    %D%/packages/patches/azr3.patch                             \
    %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch        \
    %D%/packages/patches/bash-completion-directories.patch      \
 +  %D%/packages/patches/bash-linux-pgrp-pipe.patch             \
    %D%/packages/patches/bastet-change-source-of-unordered_set.patch    \
    %D%/packages/patches/bazaar-CVE-2017-14176.patch            \
 +  %D%/packages/patches/bc-fix-cross-compilation.patch         \
+   %D%/packages/patches/beets-werkzeug-compat.patch            \
    %D%/packages/patches/beignet-correct-file-names.patch               \
    %D%/packages/patches/benchmark-unbundle-googletest.patch    \
    %D%/packages/patches/biber-fix-encoding-write.patch         \
@@@ -1325,11 -1319,13 +1328,12 @@@
    %D%/packages/patches/python-3-deterministic-build-info.patch        \
    %D%/packages/patches/python-3-search-paths.patch            \
    %D%/packages/patches/python-3-fix-tests.patch                       \
 -  %D%/packages/patches/python-3.8-search-paths.patch          \
    %D%/packages/patches/python-3.8-fix-tests.patch             \
    %D%/packages/patches/python-CVE-2018-14647.patch            \
+   %D%/packages/patches/python-alembic-exceptions-cause.patch  \
    %D%/packages/patches/python-axolotl-AES-fix.patch           \
    %D%/packages/patches/python-cairocffi-dlopen-path.patch     \
 -  %D%/packages/patches/python-cffi-x87-stack-clean.patch      \
 +  %D%/packages/patches/python-cross-compile.patch             \
    %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
    %D%/packages/patches/python-configobj-setuptools.patch      \
    %D%/packages/patches/python-faker-fix-build-32bit.patch     \

diff --cc gnu/packages/admin.scm
Simple merge

diff --cc gnu/packages/algebra.scm
index a0f31d1,8682ecd..e2e26c8
--- 1/gnu/packages/algebra.scm
--- 2/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -5,10 -5,9 +5,10 @@@
  ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
- ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
  ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
  ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
 +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
  ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
  ;;;
  ;;; This file is part of GNU Guix.

diff --cc gnu/packages/audio.scm
Simple merge

diff --cc gnu/packages/bioinformatics.scm
Simple merge

diff --cc gnu/packages/check.scm
Simple merge

diff --cc gnu/packages/cran.scm
index ea7a390,565fef8..8426285
--- 1/gnu/packages/cran.scm
--- 2/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@@ -1350,8 -1350,8 +1350,8 @@@ applications.  That is, compute distanc
          (base32
           "1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"))))
      (build-system r-build-system)
 -    (inputs `(("libjpeg" ,libjpeg)))
 +    (inputs `(("libjpeg" ,libjpeg-turbo)))
-     (home-page "http://www.rforge.net/jpeg/")
+     (home-page "https://www.rforge.net/jpeg/")
      (synopsis "Read and write JPEG images with R")
      (description "This package provides a way to read, write and display
  bitmap images stored in the JPEG format with R.  It can read and write both
@@@ -9696,9 -9696,9 +9696,9 @@@ redundant complex conjugate when the in
      (build-system r-build-system)
      (inputs
       `(("libtiff" ,libtiff)
 -       ("libjpeg" ,libjpeg)
 +       ("libjpeg" ,libjpeg-turbo)
         ("zlib" ,zlib)))
-     (home-page "http://www.rforge.net/tiff/")
+     (home-page "https://www.rforge.net/tiff/")
      (synopsis "Read and write TIFF images")
      (description
       "This package provides an easy and simple way to read, write and display

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/emacs-xyz.scm
Simple merge

diff --cc gnu/packages/engineering.scm
Simple merge

diff --cc gnu/packages/fribidi.scm
index 3eff6b1,345529b..e213192
--- 1/gnu/packages/fribidi.scm
--- 2/gnu/packages/fribidi.scm
+++ b/gnu/packages/fribidi.scm
@@@ -46,3 -47,62 +46,55 @@@ Algorithm.  This algorithm is used to p
  or right-to-left ordering as necessary.")
      (home-page "https://github.com/fribidi/fribidi")
      (license lgpl2.1+)))
 -(define fribidi/fixed
 -  (package
 -    (inherit fribidi)
 -    (source
 -      (origin (inherit (package-source fribidi))
 -              (patches (search-patches "fribidi-CVE-2019-18397.patch"))))))
 -
+ 
+ (define-public bidiv
+   (package
+     (name "bidiv")
+     (version "1.5")
+     (source
+       (origin
+         (method url-fetch)
+         (uri (string-append "mirror://debian/pool/main/b/bidiv/bidiv_"
+                             version ".orig.tar.gz"))
+         (sha256
+          (base32
+           "05p5m2ihxbmc1qsgs8rjlww08fy9859fhl7xf196p8g5qygqd7cv"))
+         (patches (search-patches "bidiv-update-fribidi.patch"))))
+     (build-system gnu-build-system)
+     (arguments
+      `(#:phases
+        (modify-phases %standard-phases
+          (delete 'configure) ; no configure
+          (add-after 'unpack 'misc-fixes
+            (lambda _
+              (substitute* "bidiv.c"
+                (("FriBidiCharType") "FriBidiParType")
+                (("&c") "(char *)&c"))
+              #t))
+          ;; We don't want to use the handwritten makefile
+          (replace 'build
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((fribidi (assoc-ref inputs "fribidi")))
+                (invoke "gcc" "-o" "bidiv" "bidiv.c"
+                        ;; pkg-config --cflags fribidi
+                        (string-append "-I" fribidi "/include/fribidi")
+                        ;; pkg-config --libs fribidi
+                        (string-append "-L" fribidi "/lib") "-lfribidi"))))
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (bin (string-append out "/bin"))
+                     (man (string-append out "/share/man/man1")))
+                (install-file "bidiv" bin)
+                (install-file "bidiv.1" man))
+              #t)))
+        #:tests? #f)) ; no tests
+     (inputs
+      `(("fribidi" ,fribidi)))
+     (home-page "https://tracker.debian.org/pkg/bidiv")
+     (synopsis "BiDi viewer - command-line tool displaying logical Hebrew/Arabic")
+     (description "bidiv is a simple utility for converting logical-Hebrew input
+ to visual-Hebrew output.  This is useful for reading Hebrew mail messages,
+ viewing Hebrew texts, etc.  It was written for Hebrew but Arabic (or other BiDi
+ languages) should work equally well.")
+     (license gpl2+)))

diff --cc gnu/packages/game-development.scm
Simple merge

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/gcc.scm
index 0b203d5,08afd80..09367d8
--- 1/gnu/packages/gcc.scm
--- 2/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -6,7 -6,8 +6,8 @@@
  ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 -;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 +;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
+ ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -557,9 -531,8 +558,9 @@@ It also includes runtime support librar
                                  version "/gcc-" version ".tar.xz"))
              (sha256
               (base32
-               "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"))
+               "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"))
              (patches (search-patches "gcc-9-strmov-store-file-names.patch"
 +                                     "gcc-9-libsanitizer-mode-size.patch"
                                       "gcc-9-asan-fix-limits-include.patch"
                                       "gcc-5.0-libvtv-runpath.patch"))))))
  

diff --cc gnu/packages/geo.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/gnunet.scm
index 775d1f5,8ad2576..1961e6b
--- 1/gnu/packages/gnunet.scm
--- 2/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@@ -269,6 -270,7 +270,7 @@@ supports HTTP, HTTPS and GnuTLS."
        ("libextractor" ,libextractor)
        ("libidn" ,libidn2)
        ("libgcrypt" ,libgcrypt)
 -      ("libjpeg" ,libjpeg)
++      ("libjpeg" ,libjpeg-turbo)
        ("libltdl" ,libltdl)
        ("libmicrohttpd" ,libmicrohttpd)
        ("libogg" ,libogg)

diff --cc gnu/packages/graphics.scm
Simple merge

diff --cc gnu/packages/gtk.scm
Simple merge

diff --cc gnu/packages/guile-xyz.scm
Simple merge

diff --cc gnu/packages/image.scm
index 3850e7f,ad288b8..46ad22d
--- 1/gnu/packages/image.scm
--- 2/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -1186,9 -1169,9 +1191,9 @@@ channels."
      (propagated-inputs
       ;; These are all in the 'Libs.private' field of libmng.pc.
       `(("lcms" ,lcms)
 -       ("libjpeg" ,libjpeg)
 +       ("libjpeg" ,libjpeg-turbo)
         ("zlib" ,zlib)))
-     (home-page "http://www.libmng.com/")
+     (home-page "https://www.libmng.com/")
      (synopsis "Library for handling MNG files")
      (description
       "Libmng is the MNG (Multiple-image Network Graphics) reference library.")

diff --cc gnu/packages/java.scm
Simple merge

diff --cc gnu/packages/libreoffice.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/machine-learning.scm
Simple merge

diff --cc gnu/packages/mail.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/music.scm
Simple merge

diff --cc gnu/packages/networking.scm
Simple merge

diff --cc gnu/packages/opencog.scm
Simple merge

diff --cc gnu/packages/photo.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
index 6a191f6,c6d3e2c..945b89f
--- 1/gnu/packages/python-xyz.scm
--- 2/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -67,9 -67,9 +67,10 @@@
  ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
  ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
  ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 +;;; Copyright © 2020 Riku Viitanen <riku.viitanen@protonmail.com>
  ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
  ;;; Copyright © 2020 sirgazil <sirgazil@zoho.com>
+ ;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/qt.scm
Simple merge

diff --cc gnu/packages/scheme.scm
Simple merge

diff --cc gnu/packages/sdl.scm
Simple merge

diff --cc gnu/packages/ssh.scm
Simple merge

diff --cc gnu/packages/statistics.scm
Simple merge

diff --cc gnu/packages/version-control.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/wxwidgets.scm
Simple merge

diff --cc gnu/packages/xml.scm
Simple merge

diff --cc gnu/system.scm
Simple merge

diff --cc guix/store.scm
Simple merge