Merge branch 'master' into core-updates

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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

diff --cc gnu/packages/guile.scm
index a77cacf,c41c274..f3eb2dc
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -2244,6 -2273,60 +2230,60 @@@ using S-expressions."
  tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
      (license license:gpl3+)))
  
 -       `(("guile" ,guile-2.2.4)))
+ (define-public guile-email
+   (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
+         (revision "1"))
+     (package
+       (name "guile-email")
+       (version (git-version "0.1.0" revision commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://git.systemreboot.net/guile-email")
+                (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32
+            "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
+       (build-system gnu-build-system)
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+          ("autoconf" ,autoconf)
+          ("automake" ,automake)))
+       (inputs
 -       `(("guile" ,guile-2.2.4)
++       `(("guile" ,guile-2.2)))
+       (home-page "https://git.systemreboot.net/guile-email")
+       (synopsis "Guile email parser")
+       (description "This package provides an email parser written in pure
+ Guile.")
+       (license license:agpl3+))))
+ 
+ (define-public guile-debbugs-next
+   (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
+         (revision "1"))
+     (package (inherit guile-debbugs)
+       (name "guile-debbugs")
+       (version (git-version "0.0.3" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://git.savannah.gnu.org/git/guile-debbugs.git")
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
+       (build-system gnu-build-system)
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+          ("autoconf" ,autoconf)
+          ("automake" ,automake)
+          ("texinfo" ,texinfo)))
+       (inputs
++       `(("guile" ,guile-2.2)
+          ("guile-email" ,guile-email))))))
+ 
  ;; There has not been any release yet.
  (define-public guile-newt
    (let ((commit "4eaa3cf84b9b426cc0ff7bec48b76cca6ca3ec83")

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

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

diff --cc gnu/packages/mail.scm
index 35b7d27,fa545da..74b1d48
--- 1/gnu/packages/mail.scm
--- 2/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@@ -2640,3 -2643,50 +2643,50 @@@ replacement for the @code{urlview} prog
       "TNEF is a tar-like program that unpacks MIME attachments of type
  @code{application/ms-tnef}.")
      (license gpl2+)))
 -         ("guile" ,guile-2.2.4)))
+ 
+ (define-public mumi
+   (let ((commit "bfd96ce76b4600ae232e6548b26c9365095fd174")
+         (revision "2"))
+     (package
+       (name "mumi")
+       (version (git-version "0.0.0" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://git.elephly.net/software/mumi.git")
+                       (commit commit)))
+                 (file-name (git-file-name name version))
+                 (sha256
+                  (base32
+                   "05miwfi1bh0v9x2gvn15bwkb3gn4xy53z506ysjzns2y497zkc5h"))))
+       (build-system gnu-build-system)
+       (arguments
+        `(#:phases
+          (modify-phases %standard-phases
+            (add-after 'install 'wrap-executable
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let* ((out (assoc-ref outputs "out"))
+                       (bin (string-append out "/bin"))
+                       (scm (string-append out "/share/guile/site/2.2"))
+                       (go  (string-append out "/lib/guile/2.2/site-ccache")))
+                  (wrap-program (string-append bin "/mumi")
+                    `("GUILE_LOAD_PATH" ":" prefix
+                      (,scm ,(getenv "GUILE_LOAD_PATH")))
+                    `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+                      (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))
+                  #t))))))
+       (inputs
+        `(("guile-debbugs" ,guile-debbugs-next)
+          ("guile-email" ,guile-email)
+          ("guile-fibers" ,guile-fibers)
+          ("guile-json" ,guile-json)
+          ("guile-syntax-highlight" ,guile-syntax-highlight)
++         ("guile" ,guile-2.2)))
+       (native-inputs
+        `(("autoconf" ,autoconf)
+          ("automake" ,automake)
+          ("pkg-config" ,pkg-config)))
+       (home-page "https://git.elephly.net/software/mumi.git")
+       (synopsis "Debbugs web interface")
+       (description "Mumi is a Debbugs web interface.")
+       (license agpl3+))))

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

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/pdf.scm
index 062ef02,9ffc5cb..28737c3
--- 1/gnu/packages/pdf.scm
--- 2/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -82,7 -82,8 +82,8 @@@
  (define-public poppler
    (package
     (name "poppler")
 -   (version "0.63.0")
+    (replacement poppler/fixed)
 +   (version "0.68.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://poppler.freedesktop.org/poppler-"

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

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

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

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

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

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

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

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

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

diff --cc guix/gexp.scm
Simple merge

diff --cc tests/gexp.scm
Simple merge