Merge branch 'master' into core-updates

diff --cc etc/news.scm
index ab09a10,10e0153..35e9a87
--- 1/etc/news.scm
--- 2/etc/news.scm
+++ b/etc/news.scm
@@@ -11,75 -10,9 +11,76 @@@
  (channel-news
   (version 0)
  
 + (entry (commit "a33eac038a811603c8b9ed106ae405a5f80a0e9d")
 +        (title (en "GNU C Library upgraded")
 +               (de "GNU-C-Bibliothek aktualisiert")
 +               (es "Actualización de la biblioteca C de GNU")
 +               (fr "Mise à jour de la bibliothèque C de GNU")
 +               (nl "GNU C-bibliotheek bijgewerkt"))
 +        (body
 +         (en "The GNU C Library (glibc) has been upgraded to version 2.31.  To
 +run previously-installed programs linked against glibc 2.29, you need to
 +install locale data for version 2.29 in addition to locale data for 2.31:
 +
 +@example
 +guix install glibc-locales glibc-locales-2.29
 +@end example
 +
 +On Guix System, you can adjust the @code{locale-libcs} field of your
 +@code{operating-system} form.  Run @code{info \"(guix) Locales\"}, for more
 +info.")
 +         (de "Die GNU-C-Bibliothek (glibc) wurde auf Version 2.31
 +aktualisiert. Um zuvor installierte Programme, die an glibc 2.29 gebunden
 +worden sind, weiter benutzen zu können, müssen Sie Locale-Daten für Version
 +2.29 zusätzlich zu den Locale-Daten für 2.31 installieren:
 +
 +@example
 +guix install glibc-locales glibc-locales-2.29
 +@end example
 +
 +Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer
 +@code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de)
 +Locales\"} aus, um weitere Informationen dazu zu erhalten.")
 +         (es "Se ha actualizado la biblioteca de C de GNU (glibc) a la versión
 +2.31. Para ejecutar programas instalados previamente que se encuentren
 +enlazados con glibc 2.29, es necesario que instale los datos de localización
 +de la versión 2.29 junto a los datos de localización de la versión 2.31:
 +
 +@example
 +guix install glibc-locales glibc-locales-2.29
 +@end example
 +
 +En el sistema Guix, puede ajustar el campo @code{locale-libcs} de su
 +declaración @code{operating-system}. Ejecute @code{info \"(guix.es)
 +Localizaciones\"} para obtener más información.")
 +         (fr "La bibliothèque C de GNU (glibc) a été mise à jour en version
 +2.31.  Pour pouvoir lancer tes programmes déjà installés et liés à glibc 2.29,
 +tu dois installer les données pour la version 2.29 en plus des données de
 +régionalisation pour la version 2.31:
 +
 +@example
 +guix install glibc-locales glibc-locales-2.29
 +@end example
 +
 +Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme
 +@code{operating-system}.  Lance @code{info \"(guix.fr) Régionalisation\"} pour
 +plus de détails.")
 +         (nl "De GNU C-bibliotheek (glibc) werd bijgewerkt naar versie 2.31.
 +Om gebruik te maken van reeds geïnstalleerde programma's die aan glibc 2.29
 +gebonden zijn, moet u de regionale informatie van versie 2.29 naast die van
 +versie 2.31 installeren:
 +
 +@example
 +guix install glibc-locales glibc-locales-2.29
 +@end example
 +
 +Op Guix System kunt u het @code{locale-libcs}-veld van uw
 +@code{operating-system}-vorm aanpassen.   Voer @code{info \"(guix) Locales\"}
 +uit voor verdere uitleg.")))
 +
   (entry (commit "e1e6491226347d9fb93ff484d78cef98848a510a")
-         (title (en "Guix Cookbook now available as Info"))
+         (title (en "Guix Cookbook now available as Info")
+                (de "Guix-Kochbuch jetzt als Info-Dokument verfügbar"))
          ;; TRANSLATORS: Adjust the URL and the 'info' command to refer to the
          ;; translated manual if it's available.
          (body (en "The new Guix Cookbook is now fetched by @command{guix pull}
@@@ -95,17 -28,23 +96,32 @@@ The Cookbook is currently available in 
  it @uref{https://guix.gnu.org/cookbook/en/, on-line}.
  
  Your contributions are welcome: @uref{https://guix.gnu.org/contact/, get in
- touch with the developers} to share your recipes!")))
+ touch with the developers} to share your recipes!")
+               (de "Das neue Guix-Kochbuch wird nun von @command{guix pull}
+ geladen und steht dann im Info-Format zur Verfügung.  Darin sollen Anleitungen
+ und detaillierte Beispiele gezeigt werden, die eine breite Spanne an
+ Anwendungsfällen abdecken.  Um darauf zuzugreifen, geben Sie dies ein:
+ 
+ @example
+ info guix-cookbook.de
+ @end example
+ 
+ Das Kochbuch steht derzeit auf Deutsch und Englisch zur Verfügung.  Sie können
+ auch @uref{https://guix.gnu.org/cookbook/de/, online} darauf zugreifen.
+ 
+ Ihre Beiträge werden gerne gesehen.  Bitte
+ @uref{https://guix.gnu.org/contact/, kontaktieren Sie die Entwickler}, um Ihre
+ Rezepte mit uns zu teilen!")))
  
 + (entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887")
 +        (title (en "Further reduced binary seed bootstrap"))
 +        (body
 +         (en "The package graph on x86_64 and i686 is now rooted in a further
 +@dfn{reduced set of binary seeds}.  The initial set of binaries from which
 +packages are built now weighs in at approximately 60 MiB, a quarter of what it
 +used to be.  Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
 +the talk at @uref{https://fosdem.org/2020/schedule/event/gnumes/}.")))
 +
   (entry (commit "0468455e7d279c89ea3ad1b51935efb2b785ec47")
          (title (en "Rottlog service added to @code{%base-services}")
                 (de "Rottlog-Dienst ist nun Teil der @code{%base-services}"))

diff --cc gnu/local.mk
index 2780434,9f21243..b3d6054
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -740,8 -738,8 +740,7 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
    %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
    %D%/packages/patches/apr-skip-getservbyname-test.patch      \
-   %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch        \
    %D%/packages/patches/aspell-default-dict-dir.patch          \
 -  %D%/packages/patches/aspell-gcc-compat.patch                        \
    %D%/packages/patches/ath9k-htc-firmware-binutils.patch      \
    %D%/packages/patches/ath9k-htc-firmware-gcc.patch           \
    %D%/packages/patches/ath9k-htc-firmware-objcopy.patch               \

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

diff --cc gnu/packages/bootloaders.scm
index e7548c5,6665627..0f0d3b4
--- 1/gnu/packages/bootloaders.scm
--- 2/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@@ -11,8 -11,8 +11,9 @@@
  ;;; Copyright © 2019 nee <nee@cock.li>
  ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
  ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
+ ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/pulseaudio.scm
index 4ad32d6,a150039..b4a8d98
--- 1/gnu/packages/pulseaudio.scm
--- 2/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -31,8 -30,8 +31,9 @@@
    #:use-module (guix packages)
    #:use-module (guix download)
    #:use-module (guix git-download)
 +  #:use-module (guix utils)
    #:use-module ((guix licenses) #:prefix l:)
+   #:use-module (guix build-system glib-or-gtk)
    #:use-module (guix build-system gnu)
    #:use-module (guix build-system python)
    #:use-module (gnu packages)

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

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

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

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

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

diff --cc gnu/system/vm.scm
Simple merge