maint: 'release' builds with '--fallback'.

* Makefile.am (guix-binary.%.tar.xz): Pass '--fallback' to 'guix pack'. (release): Pass '--fallback' to 'guix build' and 'guix system'.
maint: 'release' target no longer uses -K, to allow for offloading.
2026-07-10 21:34:06 +02:00 · 2020-04-09 16:32:38 +02:00 · 2020-04-09 13:18:13 +02:00 · 2020-04-09 11:52:23 +02:00
115 changed files with 1627 additions and 4094 deletions
@@ -39,8 +39,7 @@ do_subst = $(SED)					\
  -e 's,[@]GUILE[@],$(GUILE),g'				\
  -e 's,[@]guilemoduledir[@],$(guilemoduledir),g'	\
  -e 's,[@]guileobjectdir[@],$(guileobjectdir),g'	\
-  -e 's,[@]localedir[@],$(localedir),g' 		\
-  -e 's,[@]Libexecdir[@],$(libexecdir),g'
+  -e 's,[@]localedir[@],$(localedir),g'

 scripts/guix: scripts/guix.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
@@ -48,9 +47,6 @@ scripts/guix: scripts/guix.in Makefile
 	$(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t"
 	$(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@"

-guix/config.scm: guix/config.scm.in
-	$(AM_V_GEN)$(do_subst) < "$@.in" > "$@"
-
 nodist_noinst_SCRIPTS =				\
  pre-inst-env					\
  test-env
@@ -311,9 +307,7 @@ endif BUILD_DAEMON_OFFLOAD
 STORE_MODULES =					\
  guix/store/database.scm			\
  guix/store/deduplication.scm			\
-  guix/store/roots.scm				\
-  guix/store/environment.scm			\
-  guix/store/build-derivations.scm
+  guix/store/roots.scm

 MODULES += $(STORE_MODULES)

@@ -668,11 +662,16 @@ AM_DISTCHECK_CONFIGURE_FLAGS =			\
  --enable-daemon				\
  ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"

+# Name of the 'guix' package shipped in the binary tarball.
+GUIX_FOR_BINARY_TARBALL = guile3.0-guix
+
 # The self-contained tarball.
 guix-binary.%.tar.xz:
 	$(AM_V_GEN)GUIX_PACKAGE_PATH=					\
 	tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz	\
-	  -s "$*" --localstatedir --profile-name=current-guix guix` ;	\
+	  --fallback							\
+	  -s "$*" --localstatedir --profile-name=current-guix		\
+	  $(GUIX_FOR_BINARY_TARBALL)` ;					\
 	cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"


@@ -775,9 +774,9 @@ release: dist
 	   "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
 	git add $(top_srcdir)/gnu/packages/package-management.scm
 	git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
-	$(top_builddir)/pre-inst-env guix build guix	\
+	$(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL)	\
 	      $(call system_flags,$(SUPPORTED_SYSTEMS))	\
-	      -v1 --no-grafts -K
+	      -v1 --no-grafts --fallback
 	rm -f $(BINARY_TARBALLS)
 	$(MAKE) $(BINARY_TARBALLS)
 	for system in $(SUPPORTED_SYSTEMS) ; do					\
@@ -791,12 +790,12 @@ release: dist
 	git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
 	$(top_builddir)/pre-inst-env guix build guix			\
 	      $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS))	\
-	      -v1 --no-grafts -K
+	      -v1 --no-grafts --fallback
 	for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do				\
 	  image=`$(top_builddir)/pre-inst-env						\
 	    guix system disk-image							\
 	    --file-system-type=iso9660							\
-            --system=$$system								\
+            --system=$$system --fallback						\
 	    gnu/system/install.scm` ;							\
 	  if [ ! -f "$$image" ] ; then							\
 	    echo "failed to produced Guix installation image for $$system" >&2 ;	\
@@ -809,7 +808,7 @@ release: dist
 	for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do					\
 	  image=`$(top_builddir)/pre-inst-env						\
 	    guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS)				\
-	    --system=$$system								\
+	    --system=$$system --fallback						\
 	    gnu/system/examples/vm-image.tmpl` ;					\
 	  if [ ! -f "$$image" ] ; then							\
 	    echo "failed to produced Guix VM image for $$system" >&2 ;			\
@@ -61,17 +61,6 @@ AC_ARG_WITH([selinux-policy-dir],
  [selinux_policydir='${datadir}/selinux/'])
 AC_SUBST([selinux_policydir])

-AC_ARG_WITH(impersonate-linux-2.6-default,
-  AC_HELP_STRING([--with-impersonate-linux-2.6-default],
-    [Whether builds should should impersonate linux 2.6 by default]),
-  [if test "x$withval" = "xyes"; then
-    impersonate_linux26="#t";
-   else
-    impersonate_linux26="#f";
-  fi],
-  [impersonate_linux26="#f"])
-AC_SUBST(impersonate_linux26)
-
 dnl Better be verbose.
 AC_MSG_CHECKING([for the store directory])
 AC_MSG_RESULT([$storedir])
@@ -317,7 +306,7 @@ AC_CONFIG_FILES([Makefile
                 po/guix/Makefile.in
                 po/packages/Makefile.in
                 etc/guix-daemon.cil
-                 guix/config.scm.in])
+                 guix/config.scm])

 AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
 AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
@@ -220,11 +220,8 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                         (syntax-highlight scheme)
                         (syntax-highlight lexers)
                         (guix build utils)
-                         (srfi srfi-1)
-                         (srfi srfi-26)
                         (ice-9 match)
-                         (ice-9 threads)
-                         (ice-9 vlist))
+                         (ice-9 threads))

            (define (pair-open/close lst)
              ;; Pair 'open' and 'close' tags produced by 'highlights' and
@@ -258,11 +255,10 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                             level (reverse result)))
                   (values (reverse result) "" '())))))

-            (define (highlights->sxml* highlights anchors)
+            (define (highlights->sxml* highlights)
              ;; Like 'highlights->sxml', but handle nested 'paren tags.  This
              ;; allows for paren matching highlights via appropriate CSS
-              ;; "hover" properties.  When a symbol is encountered, look it up
-              ;; in ANCHORS, a vhash, and emit the corresponding href, if any.
+              ;; "hover" properties.
              (define (tag->class tag)
                (string-append "syntax-" (symbol->string tag)))

@@ -273,16 +269,8 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                                                       (number->string level))))
                             ,open
                             (span (@ (class "syntax-symbol"))
-                                   ,@(highlights->sxml* body anchors))
+                                   ,@(highlights->sxml* body))
                             ,close))
-                     (('symbol text)
-                      ;; Check whether we can emit a hyperlink for TEXT.
-                      (match (vhash-assoc text anchors)
-                        (#f
-                         `(span (@ (class ,(tag->class 'symbol))) ,text))
-                        ((_ . target)
-                         `(a (@ (class ,(tag->class 'symbol)) (href ,target))
-                             ,text))))
                     ((tag text)
                      `(span (@ (class ,(tag->class tag))) ,text)))
                   highlights))
@@ -313,109 +301,35 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                   (pk 'unsupported-code-snippet something)
                   (primitive-exit 1)))))

-            (define (syntax-highlight sxml anchors)
+            (define (syntax-highlight sxml)
              ;; Recurse over SXML and syntax-highlight code snippets.
-              (let loop ((sxml sxml))
-                (match sxml
-                  (('*TOP* decl body ...)
-                   `(*TOP* ,decl ,@(map loop body)))
-                  (('head things ...)
-                   `(head ,@things
-                          (link (@ (rel "stylesheet")
-                                   (type "text/css")
-                                   (href #$syntax-css-url)))))
-                  (('pre ('@ ('class "lisp")) code-snippet ...)
-                   `(pre (@ (class "lisp"))
-                         ,@(highlights->sxml*
-                            (pair-open/close
-                             (highlight lex-scheme
-                                        (concatenate-snippets code-snippet)))
-                            anchors)))
-                  ((tag ('@ attributes ...) body ...)
-                   `(,tag (@ ,@attributes) ,@(map loop body)))
-                  ((tag body ...)
-                   `(,tag ,@(map loop body)))
-                  ((? string? str)
-                   str))))
+              (match sxml
+                (('*TOP* decl body ...)
+                 `(*TOP* ,decl ,@(map syntax-highlight body)))
+                (('head things ...)
+                 `(head ,@things
+                        (link (@ (rel "stylesheet")
+                                 (type "text/css")
+                                 (href #$syntax-css-url)))))
+                (('pre ('@ ('class "lisp")) code-snippet ...)
+                 `(pre (@ (class "lisp"))
+                       ,@(highlights->sxml*
+                          (pair-open/close
+                           (highlight lex-scheme
+                                      (concatenate-snippets code-snippet))))))
+                ((tag ('@ attributes ...) body ...)
+                 `(,tag (@ ,@attributes) ,@(map syntax-highlight body)))
+                ((tag body ...)
+                 `(,tag ,@(map syntax-highlight body)))
+                ((? string? str)
+                 str)))

-            (define (underscore-decode str)
-              ;; Decode STR, an "underscore-encoded" string as produced by
-              ;; makeinfo for indexes, such as "_0025base_002dservices" for
-              ;; "%base-services".
-              (let loop ((str str)
-                         (result '()))
-                (match (string-index str #\_)
-                  (#f
-                   (string-concatenate-reverse (cons str result)))
-                  (index
-                   (let ((char (string->number
-                                (substring str (+ index 1) (+ index 5))
-                                16)))
-                     (loop (string-drop str (+ index 5))
-                           (append (list (string (integer->char char))
-                                         (string-take str index))
-                                   result)))))))
-
-            (define (anchor-id->key id)
-              ;; Convert ID, an anchor ID such as
-              ;; "index-pam_002dlimits_002dservice" to the corresponding key,
-              ;; "pam-limits-service" in this example.  Drop the suffix of
-              ;; duplicate anchor IDs like "operating_002dsystem-1".
-              (let ((id (if (any (cut string-suffix? <> id)
-                                 '("-1" "-2" "-3" "-4" "-5"))
-                            (string-drop-right id 2)
-                            id)))
-                (underscore-decode
-                 (string-drop id (string-length "index-")))))
-
-            (define* (collect-anchors file #:optional (vhash vlist-null))
-              ;; Collect the anchors that appear in FILE, a makeinfo-generated
-              ;; file.  Grab those from <dt> tags, which corresponds to
-              ;; Texinfo @deftp, @defvr, etc.  Return VHASH augmented with
-              ;; more name/reference pairs.
-              (define string-or-entity?
-                (match-lambda
-                  ((? string?) #t)
-                  (('*ENTITY* _ ...) #t)
-                  (_ #f)))
-
-              (define (worthy-entry? lst)
-                ;; Attempt to match:
-                ;;   Scheme Variable: <strong>x</strong>
-                ;; but not:
-                ;;   <code>cups-configuration</code> parameter: …
-                (let loop ((lst lst))
-                  (match lst
-                    (((? string-or-entity?) rest ...)
-                     (loop rest))
-                    ((('strong _ ...) _ ...)
-                     #t)
-                    (_ #f))))
-
-              (let ((shtml (call-with-input-file file html->shtml)))
-                (let loop ((shtml shtml)
-                           (vhash vhash))
-                  (match shtml
-                    (('dt ('@ ('id id)) rest ...)
-                     (if (and (string-prefix? "index-" id)
-                              (worthy-entry? rest))
-                         (vhash-cons (anchor-id->key id)
-                                     (string-append (basename file)
-                                                    "#" id)
-                                     vhash)
-                         vhash))
-                    ((tag ('@ _ ...) body ...)
-                     (fold loop vhash body))
-                    ((tag body ...)
-                     (fold loop vhash body))
-                    (_ vhash)))))
-
-            (define (process-html file anchors)
+            (define (process-html file)
              ;; Parse FILE and perform syntax highlighting for its Scheme
              ;; snippets.  Install the result to #$output.
              (format (current-error-port) "processing ~a...~%" file)
              (let* ((shtml        (call-with-input-file file html->shtml))
-                     (highlighted  (syntax-highlight shtml anchors))
+                     (highlighted  (syntax-highlight shtml))
                     (base         (string-drop file (string-length #$input)))
                     (target       (string-append #$output base)))
                (mkdir-p (dirname target))
@@ -438,43 +352,17 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                      (pk 'error-link file target (strerror errno))
                      (primitive-exit 3))))))

-            (define (html? file stat)
-              (string-suffix? ".html" file))
-
            ;; Install a UTF-8 locale so we can process UTF-8 files.
            (setenv "GUIX_LOCPATH"
                    #+(file-append glibc-utf8-locales "/lib/locale"))
            (setlocale LC_ALL "en_US.utf8")

-            ;; First process the mono-node 'guix.html' files.
            (n-par-for-each (parallel-job-count)
-                            (lambda (mono)
-                              (let ((anchors (collect-anchors mono)))
-                                (process-html mono anchors)))
-                            (find-files #$input "^guix(\\.[a-zA-Z_-]+)?\\.html$"))
-
-            ;; Next process the multi-node HTML files in two phases: (1)
-            ;; collect the list of anchors, and (2) perform
-            ;; syntax-highlighting.
-            (let* ((multi   (find-files #$input "^html_node$"
-                                        #:directories? #t))
-                   (anchors (n-par-map (parallel-job-count)
-                                       (lambda (multi)
-                                         (cons multi
-                                               (fold collect-anchors vlist-null
-                                                     (find-files multi html?))))
-                                       multi)))
-              (n-par-for-each (parallel-job-count)
-                              (lambda (file)
-                                (let ((anchors (assoc-ref anchors (dirname file))))
-                                  (process-html file anchors)))
-                              (append-map (lambda (multi)
-                                            (find-files multi html?))
-                                          multi)))
-
-            ;; Last, copy non-HTML files as is.
-            (for-each copy-as-is
-                      (find-files #$input (negate html?)))))))
+                            (lambda (file)
+                              (if (string-suffix? ".html" file)
+                                  (process-html file)
+                                  (copy-as-is file)))
+                            (find-files #$input))))))

  (computed-file name build))

@@ -99,14 +99,7 @@ for the process."

  ;; The container's file system is completely ephemeral, sans directories
  ;; bind-mounted from the host.
-  ;; Make this private in the container namespace so everything mounted under
-  ;; it is local to this namespace.
-  (mount "none" "/" "none" (logior MS_REC MS_PRIVATE))
-  (let ((current-perms (stat:perms (stat root))))
-    (mount "none" root "tmpfs" 0 (string-append "mode="
-                                                (number->string current-perms
-                                                                8))))
-
+  (mount "none" root "tmpfs")

  ;; A proc mount requires a new pid namespace.
  (when mount-/proc?
@@ -5,7 +5,6 @@
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
-;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -534,24 +533,6 @@ GRUB configuration and OS-DRV as the stuff in it."
                ;; Set all timestamps to 1.
                "-volume_date" "all_file_dates" "=1"

-                ;; ‘zisofs’ compression reduces the total image size by ~60%.
-                "-zisofs" "level=9:block_size=128k" ; highest compression
-                ;; It's transparent to our Linux-Libre kernel but not to GRUB.
-                ;; Don't compress the kernel, initrd, and other files read by
-                ;; grub.cfg, as well as common already-compressed file names.
-                "-find" "/" "-type" "f"
-                ;; XXX Even after "--" above, and despite documentation claiming
-                ;; otherwise, "-or" is stolen by grub-mkrescue which then chokes
-                ;; on it (as ‘-o …’) and dies.  Don't use "-or".
-                "-not" "-wholename" "/boot/*"
-                "-not" "-wholename" "/System/*"
-                "-not" "-name" "unicode.pf2"
-                "-not" "-name" "bzImage"
-                "-not" "-name" "*.gz"   ; initrd & all man pages
-                "-not" "-name" "*.png"  ; includes grub-image.png
-                "-exec" "set_filter" "--zisofs"
-                "--"
-
                "-volid" (string-upcase volume-id)
                (if volume-uuid
                    `("-volume_date" "uuid"
@@ -296,13 +296,8 @@ file, actually starting the installation process."
         encrypted
         not-encrypted))
    ((list-selection (title "Disk") (multiple-choices? #f)
-                     (items (,disks ...)))
-     ;; When running the installation from an ISO image, the CD/DVD drive
-     ;; shows up in the list.  Avoid it.
-     (find (lambda (disk)
-             (not (or (string-contains disk "DVD")
-                      (string-contains disk "CD-ROM"))))
-           disks))
+                     (items (,disk _ ...)))
+     disk)

    ;; The "Partition table" dialog pops up only if there's not already a
    ;; partition table.
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -93,8 +93,7 @@ COMMAND exited successfully, #f otherwise."
          (setenv "LC_ALL" locale)
          (setenv "LANGUAGE"
                  (string-take locale
-                               (or (string-index locale #\_)
-                                   (string-length locale)))))))
+                               (string-index locale #\_))))))

  (guard (c ((invoke-error? c)
             (newline)
@@ -256,6 +256,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/haskell-crypto.scm		\
  %D%/packages/haskell-web.scm			\
  %D%/packages/haskell-xyz.scm			\
+  %D%/packages/ham-radio.scm			\
  %D%/packages/hexedit.scm			\
  %D%/packages/hugs.scm				\
  %D%/packages/hurd.scm				\
@@ -434,7 +435,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/toys.scm				\
  %D%/packages/tryton.scm			\
  %D%/packages/qt.scm				\
-  %D%/packages/radio.scm			\
  %D%/packages/ragel.scm			\
  %D%/packages/rails.scm			\
  %D%/packages/ratpoison.scm			\
@@ -463,6 +463,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/scsi.scm				\
  %D%/packages/sdcc.scm				\
  %D%/packages/sdl.scm				\
+  %D%/packages/sdr.scm				\
  %D%/packages/search.scm			\
  %D%/packages/security-token.scm		\
  %D%/packages/selinux.scm			\
@@ -568,7 +569,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/getmail.scm				\
  %D%/services/guix.scm			\
  %D%/services/kerberos.scm			\
-  %D%/services/linux.scm			\
  %D%/services/lirc.scm				\
  %D%/services/virtualization.scm		\
  %D%/services/mail.scm				\
@@ -725,7 +725,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/aegisub-boost68.patch                    \
  %D%/packages/patches/agg-am_c_prototype.patch			\
  %D%/packages/patches/akonadi-paths.patch		\
-  %D%/packages/patches/akonadi-not-relocatable.patch		\
+  %D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \
  %D%/packages/patches/akonadi-timestamps.patch		\
  %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch	\
  %D%/packages/patches/amule-crypto-6.patch			\
@@ -775,8 +775,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/bidiv-update-fribidi.patch		\
  %D%/packages/patches/binutils-boot-2.20.1a.patch		\
  %D%/packages/patches/binutils-loongson-workaround.patch	\
-  %D%/packages/patches/binutils-mingw-w64-timestamp.patch	\
-  %D%/packages/patches/binutils-mingw-w64-deterministic.patch	\
+  %D%/packages/patches/binutils-mingw-w64-specify-timestamp.patch \
+  %D%/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch \
  %D%/packages/patches/blender-2.79-newer-ffmpeg.patch		\
  %D%/packages/patches/blender-2.79-python-3.7-fix.patch	\
  %D%/packages/patches/bluez-CVE-2020-0556.patch		\
@@ -823,7 +823,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
  %D%/packages/patches/date-output-pkg-config-files.patch	\
  %D%/packages/patches/darkice-workaround-fpermissive-error.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		\
@@ -1288,7 +1287,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/sdl-pango-api_additions.patch		\
  %D%/packages/patches/sdl-pango-blit_overflow.patch		\
  %D%/packages/patches/sdl-pango-fillrect_crash.patch		\
-  %D%/packages/patches/sdl-pango-header-guard.patch		\
+  %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch	\
  %D%/packages/patches/sdl-pango-matrix_declarations.patch	\
  %D%/packages/patches/sdl-pango-sans-serif.patch		\
  %D%/packages/patches/patchutils-test-perms.patch		\
@@ -29,7 +29,6 @@
 ;;; Copyright © 2019 Hartmt Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -100,7 +99,6 @@
  #:use-module (gnu packages telephony)
  #:use-module (gnu packages linphone)
  #:use-module (gnu packages tls)
-  #:use-module (gnu packages valgrind)
  #:use-module (gnu packages video)
  #:use-module (gnu packages vim) ;xxd
  #:use-module (gnu packages webkit)
@@ -4208,37 +4206,3 @@ minimum.")
     `(("librsvg" ,librsvg)
       ,@(package-inputs ztoolkit)))
    (synopsis "ZToolkit with SVG support")))
-
-(define-public codec2
-  (package
-    (name "codec2")
-    (version "0.9.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/drowe67/codec2.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     `(("bc" ,bc)
-       ("octave" ,octave)
-       ("valgrind" ,valgrind)))
-    (arguments
-     `(#:tests? #f ; TODO: Fix tests (paths, graphic toolkit, octave modules).
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'set-test-environment
-           (lambda _
-             (setenv "HOME" "/tmp")
-             #t)))))
-    (synopsis "Speech codec")
-    (description
-     "Codec 2 is a speech codec designed for communications quality speech
-between 700 and 3200 bit/s.  The main application is low bandwidth HF/VHF
-digital radio.")
-    (home-page "https://www.rowetel.com/?page_id=452")
-    (license license:lgpl2.1)))
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -979,25 +979,15 @@ precious backup space.
 (define-public burp
  (package
    (name "burp")
-    (version "2.3.24")
+    (version "2.3.20")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/burp/burp-" version
                                  "/burp-" version ".tar.bz2"))
              (sha256
               (base32
-                "0dmahqx8ldqdrx9b47r7ag3m801n7h3kclcqja1cc1jzhfhfq27w"))))
+                "0dm2y76z7pg17kfv6ahmh4mf2r3pg7mlwd69lvmjwssnd9vs1nn5"))))
    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'extend-test-time-outs
-           ;; The defaults are far too low for busy boxes & spinning storage.
-           (lambda _
-             (substitute* (find-files "utest" "\\.c$")
-               (("(tcase_set_timeout\\(tc_core,)[ 0-9]*(\\);.*)$" _ prefix suffix)
-                (string-append prefix " 3600" suffix "\n")))
-             #t)))))
    (inputs
     `(("librsync" ,librsync)
       ("openssl" ,openssl)
@@ -1,6 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -199,7 +198,7 @@ SAC is an interface for CSS parsers.")
 (define-public java-xmlgraphics-commons
  (package
    (name "java-xmlgraphics-commons")
-    (version "2.4")
+    (version "2.3")
    (source
      (origin
        (method url-fetch)
@@ -207,7 +206,8 @@ SAC is an interface for CSS parsers.")
              "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-"
              version "-src.tar.gz"))
        (sha256
-         (base32 "0zdkngb896cr35jq1v859j2kpqyn6a87k6a893h394hgvnz7yi3v"))
+         (base32
+          "0a432a4ca3vgnbada5cy9mlmfzmq6hi4i176drfxrp17q2d43w23"))
        (modules '((guix build utils)))
        (snippet
         `(begin
@@ -3501,8 +3501,8 @@ phenotype of interest.")
    (synopsis "Fast gene set enrichment analysis")
    (description
     "The package implements an algorithm for fast gene set enrichment
-analysis.  Using the fast algorithm makes more permutations and gets
-more fine grained p-values, which allows using accurate standard approaches
+analysis.  Using the fast algorithm allows to make more permutations and get
+more fine grained p-values, which allows to use accurate stantard approaches
 to multiple hypothesis correction.")
    (license license:expat)))

@@ -4271,7 +4271,7 @@ investigation using RNA-seq data.")
    (home-page "https://bioconductor.org/packages/AUCell/")
    (synopsis "Analysis of gene set activity in single-cell RNA-seq data")
    (description
-     "AUCell identifies cells with active gene sets (e.g. signatures,
+     "AUCell allows to identify cells with active gene sets (e.g. signatures,
 gene modules, etc) in single-cell RNA-seq data.  AUCell uses the @dfn{Area
 Under the Curve} (AUC) to calculate whether a critical subset of the input
 gene set is enriched within the expressed genes for each cell.  The
@@ -6426,7 +6426,7 @@ parametric mixture model.  The protein binding sites (clusters) are then
 resolved at high resolution and cluster statistics are estimated using a
 rigorous Bayesian framework.  Post-processing of the results, data export for
 UCSC genome browser visualization and motif search analysis are provided.  In
-addition, the package integrates RNA-Seq data to estimate the False
+addition, the package allows to integrate RNA-Seq data to estimate the False
 Discovery Rate of cluster detection.  Key functions support parallel multicore
 computing.  While wavClusteR was designed for PAR-CLIP data analysis, it can
 be applied to the analysis of other NGS data obtained from experimental
@@ -8401,7 +8401,7 @@ system.  It is used to analyze experimental crosses for identifying
 genes contributing to variation in quantitative traits (so-called
 quantitative trait loci, QTLs).

-Using a hidden Markov model, R/qtl estimates genetic maps, to
+Using a hidden Markov model, R/qtl allows to estimate genetic maps, to
 identify genotyping errors, and to perform single-QTL and two-QTL,
 two-dimensional genome scans.")
  (license license:gpl3)))
@@ -8532,7 +8532,7 @@ of other R packages who wish to make use of HTSlib.")
    (home-page "https://bioconductor.org/packages/bamsignals")
    (synopsis "Extract read count signals from bam files")
    (description
-     "This package efficiently obtains count vectors from indexed bam
+     "This package allows to efficiently obtain count vectors from indexed bam
 files.  It counts the number of nucleotide sequence reads in given genomic
 ranges and it computes reads profiles and coverage profiles.  It also handles
 paired-end data.")
@@ -13172,7 +13172,7 @@ version does count multisplits.")
                ((or (string-prefix? "armhf" system)
                     (string-prefix? "aarch64" system))
                 "arm_neon=1")
-                (else "sse2only=1"))))
+                (_ "sse2only=1"))))
       #:phases
       (modify-phases %standard-phases
         (delete 'configure)
@@ -4,7 +4,7 @@
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
 ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
-;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@ -103,8 +103,8 @@ generate such a compilation database.")
    (license license:gpl3+)))

 (define-public gn
-  (let ((commit "ec938ddaa276646eb8f1ab33e160c156011d8217")
-        (revision "1736"))            ;as returned by `git describe`, used below
+  (let ((commit "6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349")
+        (revision "1666"))          ;as returned by `git describe`, used below
    (package
      (name "gn")
      (version (git-version "0.0" revision commit))
@@ -114,7 +114,7 @@ generate such a compilation database.")
                (uri (git-reference (url home-page) (commit commit)))
                (sha256
                 (base32
-                  "0j1qjwp2biw12s6npzpx4z8nvih7pyn68q6cz2k4700bk9y0d574"))
+                  "157ax65sixjm0i1j89wvny48v1mbsl4pbvv5vqinjc6r0fryaf2r"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -135,10 +135,8 @@ generate such a compilation database.")
                        (call-with-output-file "out/last_commit_position.h"
                          (lambda (port)
                            (format port
-                                    (string-append
-                                     "#define LAST_COMMIT_POSITION_NUM ~a\n"
-                                     "#define LAST_COMMIT_POSITION \"~a (~a)\"\n")
-                                    ,revision ,revision ,(string-take commit 8))
+                                    "#define LAST_COMMIT_POSITION \"~a (~a)\"\n"
+                                    ,revision ,(string-take commit 8))
                            #t))))
                    (replace 'build
                      (lambda _
@@ -3,7 +3,7 @@
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 John Darrington <jmd@gnu.org>
@@ -66,7 +66,6 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages image)
  #:use-module (gnu packages photo)
-  #:use-module (gnu packages tcl)
  #:use-module (gnu packages video)
  #:use-module (gnu packages wget)
  #:use-module (gnu packages xiph))
@@ -157,7 +156,6 @@ libcdio.")
  (package
    (name "xorriso")
    (version "1.5.2")
-    (outputs '("out" "gui"))
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/xorriso/xorriso-"
@@ -174,26 +172,10 @@ libcdio.")
             (let* ((out (assoc-ref outputs "out"))
                    (out-bin (string-append out "/bin")))
               (install-file "frontend/grub-mkrescue-sed.sh" out-bin)
-               #t)))
-         (add-after 'install 'move-gui-to-separate-output
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (gui (assoc-ref outputs "gui")))
-               (for-each
-                 (lambda (file)
-                   (mkdir-p (string-append gui (dirname file)))
-                   (rename-file (string-append out file)
-                                (string-append gui file)))
-                 (list "/bin/xorriso-tcltk"
-                       "/share/info/xorriso-tcltk.info"
-                       "/share/man/man1/xorriso-tcltk.1"))
-               (wrap-program (string-append gui "/bin/xorriso-tcltk")
-                 `("PATH" ":" prefix (,(string-append out "/bin"))))
               #t))))))
    (inputs
     `(("acl" ,acl)
       ("readline" ,readline)
-       ("tk" ,tk)
       ("zlib" ,zlib)))
    (home-page "https://www.gnu.org/software/xorriso/")
    (synopsis "Create, manipulate, burn ISO-9660 file systems")
@@ -1894,8 +1894,8 @@ possible to write plugins to add your own checks.")
    (synopsis
     "Simple extension to have parametrized unit tests")
    (description
-     "This package creates parameterized unit-tests that work with the standard
-unittest package.  A parameterized test case is automatically converted to multiple test
+     "This package allows to create parametrized unit-tests that work with the standard
+unittest package.  A parametrized test case is automatically converted to multiple test
 cases.  Since they are TestCase subclasses, they work with other test suites that
 recognize TestCases.")
    (license license:bsd-2)))
@@ -135,11 +135,8 @@
    "third_party/dawn" ;ASL2.0
    "third_party/depot_tools/owners.py" ;BSD-3
    "third_party/devtools-frontend" ;BSD-3
-    "third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat
-    "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
    "third_party/devtools-frontend/src/third_party/axe-core" ;MPL2.0
    "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
-    "third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0
    "third_party/dom_distiller_js" ;BSD-3
    "third_party/emoji-segmenter" ;ASL2.0
    "third_party/flatbuffers" ;ASL2.0
@@ -199,6 +196,7 @@
    "third_party/qcms" ;Expat
    "third_party/rnnoise" ;BSD-3
    "third_party/s2cellid" ;ASL2.0
+    "third_party/sfntly" ;ASL2.0
    "third_party/skia" ;BSD-3
    "third_party/skia/include/third_party/skcms" ;BSD-3
    "third_party/skia/third_party/skcms" ;BSD-3
@@ -208,6 +206,7 @@
    "third_party/spirv-headers" ;ASL2.0
    "third_party/SPIRV-Tools" ;ASL2.0
    "third_party/sqlite" ;Public domain
+    "third_party/ungoogled" ;BSD-3
    "third_party/usb_ids" ;BSD-3
    "third_party/usrsctp" ;BSD-2
    "third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
@@ -248,9 +247,9 @@ from forcing GEXP-PROMISE."
                      #:system system
                      #:guile-for-build guile)))

-(define %chromium-version "81.0.4044.92")
-(define %ungoogled-revision "b484ad4c0bdb696c86d941798ae6b0e2bd0db35d")
-(define %debian-revision "debian/81.0.4044.92-1")
+(define %chromium-version "80.0.3987.163")
+(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95")
+(define %debian-revision "debian/80.0.3987.116-1")
 (define package-revision "0")
 (define %package-version (string-append %chromium-version "-"
                                        package-revision "."
@@ -264,7 +263,7 @@ from forcing GEXP-PROMISE."
                        %chromium-version ".tar.xz"))
    (sha256
     (base32
-      "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"))))
+      "0ikk4cgz3jgjhyncsvlqvlc03y7jywjpa6v34fwsjxs88flyzpdn"))))

 (define %ungoogled-origin
  (origin
@@ -275,7 +274,7 @@ from forcing GEXP-PROMISE."
                              (string-take %ungoogled-revision 7)))
    (sha256
     (base32
-      "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"))))
+      "0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q"))))

 (define %debian-origin
  (origin
@@ -289,7 +288,7 @@ from forcing GEXP-PROMISE."
                                (_ (string-take %debian-revision 7)))))
    (sha256
     (base32
-      "0srgbcqga3l75bfkv3bnmjk416189nazsximvzdx2k5n8v5k4p3m"))))
+      "1cc5sp566dd8f2grgr770xwbxgxf58dk1w7q3s8pmv4js5h3pwq8"))))

 ;; This is a "computed" origin that does the following:
 ;; *) Runs the Ungoogled scripts on a pristine Chromium tarball.
@@ -320,7 +319,8 @@ from forcing GEXP-PROMISE."
                  (list #+(canonical-package patch)
                        #+(canonical-package xz)
                        #+(canonical-package tar)
-                        #+python-wrapper))
+                        #+python-2
+                        #+python))

                 (copy-recursively #+ungoogled-source "/tmp/ungoogled")

@@ -338,11 +338,11 @@ from forcing GEXP-PROMISE."

                   (format #t "Ungooglifying...~%")
                   (force-output)
-                   (invoke "python" "utils/prune_binaries.py" chromium-dir
+                   (invoke "python3" "utils/prune_binaries.py" chromium-dir
                           "pruning.list")
-                   (invoke "python" "utils/patches.py" "apply"
+                   (invoke "python3" "utils/patches.py" "apply"
                           chromium-dir "patches")
-                   (invoke "python" "utils/domain_substitution.py" "apply" "-r"
+                   (invoke "python3" "utils/domain_substitution.py" "apply" "-r"
                           "domain_regex.list" "-f" "domain_substitution.list"
                           "-c" "/tmp/domainscache.tar.gz" chromium-dir)

@@ -390,13 +390,13 @@ from forcing GEXP-PROMISE."

                     (format #t "Pruning third party files...~%")
                     (force-output)
-                     (apply invoke (string-append #+python-2 "/bin/python")
+                     (apply invoke "python"
                            "build/linux/unbundle/remove_bundled_libraries.py"
                            "--do-remove" preserved-files)

                     (format #t "Replacing GN files...~%")
                     (force-output)
-                     (invoke "python" "build/linux/unbundle/replace_gn_files.py"
+                     (invoke "python3" "build/linux/unbundle/replace_gn_files.py"
                             "--system-libraries" "ffmpeg" "flac" "fontconfig"
                             "freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
                             "libjpeg" "libpng" "libvpx" "libwebp" "libxml"
@@ -462,6 +462,7 @@ from forcing GEXP-PROMISE."
       ;; directory for an exhaustive list of supported flags.
       ;; (Note: The 'configure' phase will do that for you.)
       (list "is_debug=false"
+             "is_cfi=false"
             "use_gold=false"
             "use_lld=false"
             "clang_use_chrome_plugins=false"
@@ -647,13 +648,8 @@ from forcing GEXP-PROMISE."
             (setenv "AR" "ar") (setenv "NM" "nm")
             (setenv "CC" "clang") (setenv "CXX" "clang++")

-             (setenv "CXXFLAGS"
-                     (string-join
-                      '(;; Do not optimize away null pointer safety checks.
-                        "-fno-delete-null-pointer-checks"
-                        ;; Disable warnings about unknown warnings that require
-                        ;; Clang plugins or newer versions.
-                        "-Wno-unknown-warning-option")))
+             ;; Do not optimize away null pointer safety checks.
+             (setenv "CXXFLAGS" "-fno-delete-null-pointer-checks")

             ;; TODO: pre-compile instead. Avoids a race condition.
             (setenv "PYTHONDONTWRITEBYTECODE" "1")
@@ -799,7 +795,7 @@ from forcing GEXP-PROMISE."
       ("glib" ,glib)
       ("gtk+" ,gtk+)
       ("harfbuzz" ,harfbuzz)
-       ("icu4c" ,icu4c-66.1)
+       ("icu4c" ,icu4c)
       ("jsoncpp" ,jsoncpp)
       ("lcms" ,lcms)
       ("libevent" ,libevent)
@@ -47,18 +47,18 @@
 (define-public libzen
  (package
    (name "libzen")
-    (version "0.4.38")
+    (version "0.4.37")
    (source (origin
              (method url-fetch)
              ;; Warning: This source has proved unreliable 1 time at least.
              ;; Consider an alternate source or report upstream if this
              ;; happens again.
              (uri (string-append "https://mediaarea.net/download/source/"
-                                  "libzen/" version "/"
-                                  "libzen_" version ".tar.bz2"))
+                                  name "/" version "/"
+                                  name "_" version ".tar.bz2"))
              (sha256
               (base32
-                "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"))))
+                "1dkqbgabzpa6bd7dkqrvd35sdxrhr6qxalb88f3dw0afk65xqb0k"))))
    (native-inputs
     `(("autoconf" ,autoconf)
       ("automake" ,automake)
@@ -66,7 +66,7 @@
    (build-system gnu-build-system)
    (arguments
     '(#:phases
-       ;; The build scripts are not at the root of the archive.
+       ;; build scripts not in root of archive
       (modify-phases %standard-phases
         (add-after 'unpack 'pre-configure
           (lambda _
@@ -1905,13 +1905,14 @@ multi-dimensional data.")
 (define-public r-powerlaw
  (package
    (name "r-powerlaw")
-    (version "0.70.4")
+    (version "0.70.2")
    (source
     (origin
       (method url-fetch)
       (uri (cran-uri "poweRlaw" version))
       (sha256
-        (base32 "19zah9mx93az5lh9vicn3c8q1xb12g0w46dh5p901fbyimc32vwk"))))
+        (base32
+         "1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"))))
    (properties `((upstream-name . "poweRlaw")))
    (build-system r-build-system)
    (propagated-inputs
@@ -11532,7 +11533,7 @@ JASA, 94:496-509.")
    (home-page "https://cran.r-project.org/web/packages/etm")
    (synopsis "Empirical transition matrix")
    (description
-     "The @dfn{empirical transition matrix} (etm) package estimates
+     "The @dfn{empirical transition matrix} (etm) package permits to estimate
 the matrix of transition probabilities for any time-inhomogeneous multistate
 model with finite state space using the Aalen-Johansen estimator.")
    (license license:expat)))
@@ -13880,7 +13881,7 @@ redirection on the fly, which appears to be very useful for teaching purposes,
 as the student can keep a copy of the produced output to keep all that they
 did during the course.  The package comes with a vignette describing how to
 write HTML reports for statistical analysis.  Finally, a driver for Sweave
-parses HTML flat files containing R code and to automatically write
+allows to parse HTML flat files containing R code and to automatically write
 the corresponding outputs (tables and graphs).")
    (license license:gpl2+)))

@@ -15863,7 +15864,7 @@ be used further by e.g. graphic devices.")
     "This package provides several layout algorithms to visualize networks
 which are not part of the igraph library.  Most are based on the concept of
 stress majorization by Gansner et al. (2004)
-<doi:10.1007/978-3-540-31843-9_25>.  Some more specific algorithms
+<doi:10.1007/978-3-540-31843-9_25>.  Some more specific algorithms allow to
 emphasize hidden group structures in networks or focus on specific nodes.")
    (license license:expat)))

@@ -98,8 +98,9 @@
                 ((target-mingw? target)
                  (package-with-extra-patches
                   binutils
-                   (search-patches "binutils-mingw-w64-timestamp.patch"
-                                   "binutils-mingw-w64-deterministic.patch")))
+                   (search-patches
+                    "binutils-mingw-w64-specify-timestamp.patch"
+                    "binutils-mingw-w64-reproducible-import-libraries.patch")))
                 (else binutils))
           target)))

@@ -225,22 +225,38 @@ standard Go idioms.")
 (define-public ephemeralpg
  (package
    (name "ephemeralpg")
-    (version "3.0")
+    (version "2.8")
    (source
     (origin
       (method url-fetch)
       (uri (string-append
-             "https://eradman.com/ephemeralpg/code/ephemeralpg-"
+             "http://eradman.com/ephemeralpg/code/ephemeralpg-"
             version ".tar.gz"))
       (sha256
-        (base32 "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"))))
+        (base32 "1dpfxsd8a52psx3zlfbqkw53m35w28qwyb87a8anz143x6gnkkr4"))))
    (build-system gnu-build-system)
    (arguments
     '(#:make-flags (list "CC=gcc"
                          (string-append "PREFIX=" %output))
       #:phases
       (modify-phases %standard-phases
-         (delete 'configure)            ; no configure script
+         (delete 'configure)
+         (replace 'check
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; The intention for one test is to test without PostgreSQL on
+             ;; the $PATH, so replace the test $PATH with just the util-linux
+             ;; bin, which contains getopt. It will hopefully be possible to
+             ;; remove this for releases after 2.8.
+             (substitute* "test.rb"
+               (("/bin:/usr/bin")
+                (string-append (assoc-ref inputs "util-linux")
+                               "/bin")))
+             ;; Set the LC_ALL=C as some tests use sort, and the locale
+             ;; affects the order. It will hopefully be possible to remove
+             ;; this for releases after 2.8.
+             (setenv "LC_ALL" "C")
+             (invoke "ruby" "test.rb")
+             #t))
         (add-after 'install 'wrap
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let ((out (assoc-ref outputs "out")))
@@ -250,18 +266,15 @@ standard Go idioms.")
                                    "/bin")
                    ,(string-append (assoc-ref inputs "postgresql")
                                    "/bin")
-                    ;; For getsocket.
+                    ;; For getsocket
                    ,(string-append out "/bin")))))
-             #t)))
-       #:test-target "test"))
+             #t)))))
    (inputs
     `(("postgresql" ,postgresql)
       ("util-linux" ,util-linux)))
    (native-inputs
-     ;; For tests.
-     `(("ruby" ,ruby)
-       ("which" ,which)))
-    (home-page "https://eradman.com/ephemeralpg/")
+     `(("ruby" ,ruby)))
+    (home-page "http://eradman.com/ephemeralpg/")
    (synopsis "Run temporary PostgreSQL databases")
    (description
     "@code{pg_tmp} creates temporary PostgreSQL databases, suitable for tasks
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;;
@@ -105,20 +105,17 @@ and time-efficient for good hash functions.")
 (define-public ssdeep
  (package
    (name "ssdeep")
-    (version "2.14.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/ssdeep-project/ssdeep/"
-                           "releases/download/release-" version "/"
-                           "ssdeep-" version ".tar.gz"))
-       (sha256
-        (base32 "04qkjc6kksxkv7xbnk32rwmf3a8czdv2vvrdzfs0kw06h73snbpz"))))
+    (version "2.13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/ssdeep/"
+                                  name "-" version "/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"))))
    (build-system gnu-build-system)
-    (arguments
-     `(#:configure-flags
-       (list "--disable-static")))
-    (home-page "https://ssdeep-project.github.io")
+    (home-page "http://ssdeep.sourceforge.net")
    (synopsis "Context-triggered piecewise hashing algorithm")
    (description "ssdeep computes and matches context triggered piecewise
 hashes (CTPH), also called fuzzy checksums.  It can identify similar files
@@ -129,14 +126,14 @@ in between these sequences may be different in both content and length.")
 (define-public liburcu
  (package
    (name "liburcu")
-    (version "0.12.0")
+    (version "0.11.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://www.lttng.org/files/urcu/"
                                  "userspace-rcu-" version ".tar.bz2"))
              (sha256
               (base32
-                "15wzk3nyy6gh6i7xhksxzs8fjar1g4ddz51iahk1v7lq0vjip6s0"))))
+                "0l1kxgzch4m8fxiz2hc8fwg56hrvzzspp7n0svnl7i7iycdrgfcj"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("perl" ,perl)))                 ; for tests
@@ -152,7 +149,7 @@ queues, stacks, and doubly-linked lists.")
 (define-public uthash
  (package
    (name "uthash")
-    (version "2.1.0")
+    (version "2.0.2")
    (source
     (origin
       (method git-fetch)
@@ -161,7 +158,8 @@ queues, stacks, and doubly-linked lists.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0k80bjbb6ss5wpmfmfji6xbyjm990hg9kcshwwnhdnh73vxkcd1m"))))
+        (base32
+         "0kslz8k6lssh7fl7ayzwlj62p0asxs3dq03357ls5ywjad238gqg"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("perl" ,perl)))
@@ -180,7 +178,7 @@ queues, stacks, and doubly-linked lists.")
           ;; There is no top-level Makefile to do this for us.
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version))
+                    (doc (string-append out "/share/doc/" ,name))
                    (include (string-append out "/include")))
               ;; Don't install HTML files: they're just the below .txt files
               ;; dolled up, can be stale, and regeneration requires asciidoc.
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -117,7 +117,7 @@ contains the archive keys used for that.")
 (define-public debootstrap
  (package
    (name "debootstrap")
-    (version "1.0.123")
+    (version "1.0.119")
    (source
      (origin
        (method git-fetch)
@@ -126,7 +126,8 @@ contains the archive keys used for that.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "0fr5ir8arzisx71jybbk4xz85waz50lf2y052nfimzh6vv9dx54c"))))
+         (base32
+          "0p0p8qmlsbvpfa0r7ifghr67zrrc96d83r9qwahzaxyxkvnhr4x4"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -68,7 +68,7 @@
  #:use-module (ice-9 match))

 (define-public diffoscope
-  (let ((version "139"))
+  (let ((version "138"))
    (package
      (name "diffoscope")
      (version version)
@@ -80,7 +80,7 @@
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1k4yjyvmn5nfdapkwgkr9gzpn18kr4c58n0f32pfkx4yakfqkk4i"))))
+                  "1lsxwyqaaxmin8h06l0352f0kh0l9brbqfn0zv8hmb64bp5r20nr"))))
      (build-system python-build-system)
      (arguments
       `(#:phases (modify-phases %standard-phases
@@ -17,7 +17,6 @@
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Pkill -9 <pkill9@runbox.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,12 +46,10 @@
  #:use-module (gnu packages docbook)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
-  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages graphics)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages linux)
@@ -73,7 +70,6 @@
  #:use-module (gnu packages w3m)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system go)
  #:use-module (guix build-system python)
@@ -622,7 +618,7 @@ passphrases.")
 (define-public ndctl
  (package
    (name "ndctl")
-    (version "68")
+    (version "67")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -631,7 +627,7 @@ passphrases.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8"))))
+                "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("asciidoc" ,asciidoc)
@@ -860,49 +856,3 @@ written in Go.  It is heavily inspired by ranger with some missing and
 extra features.  Some of the missing features are deliberately omitted
 since they are better handled by external tools.")
    (license license:expat)))
-
-(define-public xfe
-  (package
-    (name "xfe")
-    (version "1.43.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
-                       version
-                       "/xfe-" version ".tar.gz"))
-       (sha256
-        (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("fox" ,fox)
-       ("freetype" ,freetype)
-       ("x11" ,libx11)
-       ("xcb" ,libxcb)
-       ("xcb-util" ,xcb-util)
-       ("xft" ,libxft)
-       ("xrandr" ,libxrandr)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-xferc-path
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref outputs "out"))
-                    (xferc   (string-append out "/share/xfe/xferc")))
-               (substitute* "src/XFileExplorer.cpp"
-                 (("/usr/share/xfe/xferc") xferc))
-               #t))))
-       #:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list (string-append "BASH_COMPLETION_DIR=" out
-                              "/share/bash-completion/completions")))))
-    (synopsis "File Manager for X-Based Graphical Systems")
-    (description"XFE (X File Explorer) is a file manager for X.  It is based on
-the popular but discontinued, X Win Commander.  It aims to be the file manager
-of choice for all light thinking Unix addicts!")
-    (home-page "http://roland65.free.fr/xfe/")
-    (license license:gpl2+)))
@@ -5,7 +5,7 @@
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -199,7 +199,7 @@ display manager which supports different greeters.")
 (define-public lightdm-gtk-greeter
  (package
    (name "lightdm-gtk-greeter")
-    (version "2.0.7")
+    (version "2.0.2")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -208,7 +208,7 @@ display manager which supports different greeters.")
                    "/+download/lightdm-gtk-greeter-" version ".tar.gz"))
              (sha256
               (base32
-                "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"))))
+                "1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("exo" ,exo)
@@ -44,7 +44,7 @@
 (define-public boinc-client
  (package
    (name "boinc-client")
-    (version "7.16.6")
+    (version "7.16.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -55,7 +55,7 @@
              (file-name (git-file-name "boinc" version))
              (sha256
               (base32
-                "00xpzxxnki9hsf2vg9p67dk9ilw9ychpgm09fp3c41zyylb33ml5"))))
+                "107rpw9qd5x4pyxm9jd1lqxva5nxwb01dm5h61d6msv2vgiy0r8n"))))
    (build-system gnu-build-system)
    (arguments '(#:configure-flags '("--disable-server")))
    (inputs `(("openssl" ,openssl)
@@ -305,7 +305,7 @@ the two.")
    (synopsis "Asynchronous resolver library by the OpenBSD project")
    (description
     "libasr is a free, simple and portable asynchronous resolver library.
-It runs DNS queries and performs hostname resolution in a fully
+It allows to run DNS queries and perform hostname resolutions in a fully
 asynchronous fashion.")
    (license (list license:isc
                   license:bsd-2 ; last part of getrrsetbyname_async.c
@@ -1565,7 +1565,7 @@ configuration language. It features:
@itemize
@item Syntax highlighting
@item Multiline support for String
-@item Basic indentation, commenting
+@item Basic indendation, commenting
@item Automatic formatting on save using dhall-format.
@item Error highlighting.
@end itemize")
@@ -2019,7 +2019,7 @@ written in the Go programming language.")
    (build-system emacs-build-system)
    (home-page "https://github.com/jd/google-maps.el")
    (synopsis "Access Google Maps from Emacs")
-    (description "The @code{google-maps} package displays Google
+    (description "The @code{google-maps} package allows to display Google
 Maps directly inside Emacs.")
    (license license:gpl3+)))

@@ -5976,30 +5976,33 @@ windows.")
    (license license:gpl3+)))

 (define-public emacs-ace-window
-  (package
-    (name "emacs-ace-window")
-    (version "0.10.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/abo-abo/ace-window.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-avy" ,emacs-avy)))
-    (home-page "https://github.com/abo-abo/ace-window")
-    (synopsis "Quickly switch windows in Emacs")
-    (description
-     "@code{ace-window} is meant to replace @code{other-window}.
+  ;; last release version is from 2015
+  (let ((commit "a5344925e399e1f015721cda6cf5db03c90ab87a")
+        (revision "1"))
+    (package
+      (name "emacs-ace-window")
+      (version (git-version "0.9.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abo-abo/ace-window.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "18jm8gfgnf6ja9aarws5650lw2zfi3wdwc5j8r5ijn5fcqhfy7rc"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-avy" ,emacs-avy)))
+      (home-page "https://github.com/abo-abo/ace-window")
+      (synopsis "Quickly switch windows in Emacs")
+      (description
+       "@code{ace-window} is meant to replace @code{other-window}.
 In fact, when there are only two windows present, @code{other-window} is
 called.  If there are more, each window will have its first character
 highlighted.  Pressing that character will switch to that window.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define-public emacs-iedit
  ;; Last release version was in 2016.
@@ -6912,7 +6915,7 @@ maximizes flexibility (at the expense of conciseness).")
     `(("ert-runner" ,emacs-ert-runner)))
    (home-page "https://github.com/technomancy/find-file-in-project")
    (synopsis "File/directory finder for Emacs")
-    (description "@code{find-file-in-project} finds files or
+    (description "@code{find-file-in-project} allows to find files or
 directories quickly in the current project.  The project root is detected
 automatically when Git, Subversion or Mercurial are used.  It also provides
 functions to assist in reviewing changes on files.")
@@ -7896,29 +7899,17 @@ Lua programming language}.")
 (define-public emacs-ebuild-mode
  (package
    (name "emacs-ebuild-mode")
-    (version "1.50")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://dev.gentoo.org/~ulm/emacs/"
-             "ebuild-mode-" version ".tar.xz"))
-       (file-name (string-append name "-" version ".tar.xz"))
-       (sha256
-        (base32 "0bgi98vx6ahxijw69kfdiy3rkjdg7yi6k3bkjyasak5920m6fj1d"))))
+    (version "1.37")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://dev.gentoo.org/~ulm/emacs/ebuild-mode"
+                    "-" version ".tar.xz"))
+              (file-name (string-append name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "07dzrdjjczkxdfdgi60h4jjkvzi4p0k9rij2wpfp8s03ay3qldpp"))))
    (build-system emacs-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "make" "ebuild-mode.info")
-             (install-file "ebuild-mode.info"
-                           (string-append (assoc-ref outputs "out")
-                                          "/share/info"))
-             #t)))))
-    (native-inputs
-     `(("texinfo" ,texinfo)))
    (home-page "https://devmanual.gentoo.org")
    (synopsis "Major modes for Gentoo package files")
    (description
@@ -8415,23 +8406,24 @@ distribution, primarily targeting Clojure users")
 (define-public emacs-orgalist
  (package
    (name "emacs-orgalist")
-    (version "1.12")
+    (version "1.11")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://elpa.gnu.org/packages/"
                           "orgalist-" version ".el"))
       (sha256
-        (base32 "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd"))))
+        (base32
+         "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl"))))
    (build-system emacs-build-system)
    (home-page "https://elpa.gnu.org/packages/orgalist.html")
    (synopsis "Manage Org-like lists in non-Org buffers")
-    (description "Orgalist writes and manages Org mode's plain lists in
-non-Org buffers.  More specifically, it supports the syntax of Org mode for
-numbered, unnumbered, description items, checkboxes, and counter cookies.
+    (description "Write Org mode's plain lists in non-Org buffers.  More
+specifically, Orgalist supports the syntax of Org mode for numbered,
+unnumbered, description items, checkboxes, and counter cookies.

-The library also implements radio lists, i.e., lists written in Org syntax
-later translated into the host format, e.g., LaTeX or HTML.")
+The library also implements radio lists, i.e., lists written in Org
+syntax later translated into the host format, e.g., LaTeX or HTML.")
    (license license:gpl3+)))

 (define-public emacs-writegood-mode
@@ -8488,17 +8480,6 @@ passive voice.")
       (sha256
        (base32 "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d"))))
    (build-system emacs-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-documentation
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((share (string-append (assoc-ref outputs "out") "/share"))
-                    (info-dir (string-append share "/info"))
-                    (doc-dir (string-append share "/doc/" ,name "-" ,version)))
-               (install-file "org" info-dir)
-               (install-file "orgcard.pdf" doc-dir))
-             #t)))))
    (home-page "https://orgmode.org/")
    (synopsis "Outline-based notes management and organizer")
    (description "Org is an Emacs mode for keeping notes, maintaining TODO
@@ -9197,31 +9178,6 @@ above over the network.")
 in Org buffers and displays matching entries.")
    (license license:gpl3+)))

-(define-public emacs-dired-git-info
-  ;; Upstream has no proper release.  The base version is extracted from the
-  ;; "Version" keyword in the main file.
-  (let ((commit "91d57e3a4c5104c66a3abc18e281ee55e8979176")
-        (revision "0"))
-    (package
-      (name "emacs-dired-git-info")
-      (version (git-version "0.3.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url "https://github.com/clemera/dired-git-info")
-           (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1dr4iv95s4barxxj56znqkl9z0lg5jw731jmjr01s6vn8ar69gik"))))
-      (build-system emacs-build-system)
-      (home-page "https://github.com/clemera/dired-git-info/")
-      (synopsis "Show git info in Emacs Dired")
-      (description "This Emacs package provides a minor mode which shows git
-information inside the Dired buffer.")
-      (license license:gpl3+))))
-
 (define-public emacs-dired-toggle-sudo
  (package
    (name "emacs-dired-toggle-sudo")
@@ -9246,28 +9202,6 @@ information inside the Dired buffer.")
@code{sudo} privileges.")
    (license license:wtfpl2)))

-(define-public emacs-diredfl
-  (package
-    (name "emacs-diredfl")
-    (version "0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-         (url "https://github.com/purcell/diredfl")
-         (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/purcell/diredfl/")
-    (synopsis "Extra Emacs font lock rules for a more colourful Dired")
-    (description "This library enables additional font locking in Dired mode.
-This is adapted from the extra font lock rules provided by Drew Adams' Dired+
-package.")
-    (license license:gpl3+)))
-
 (define-public emacs-memoize
  (package
    (name "emacs-memoize")
@@ -12357,49 +12291,6 @@ keychains.  The keychain entries are displayed in a directory-like structure
 and can be consulted and modified.")
    (license license:gpl3+)))

-(define-public emacs-psc-ide
-  ;; There is no proper release.  The base version is extracted from the
-  ;; "Version" keyword in the main file.
-  (let ((commit "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe")
-        (revision "1"))
-    (package
-      (name "emacs-psc-ide")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url "https://github.com/purescript-emacs/psc-ide-emacs")
-           (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-company" ,emacs-company)
-         ("emacs-dash" ,emacs-dash)
-         ("emacs-flycheck" ,emacs-flycheck)
-         ("emacs-let-alist" ,emacs-let-alist)
-         ("emacs-s" ,emacs-s)
-         ("emacs-seq" ,emacs-seq)))
-      (home-page "https://github.com/purescript-emacs/psc-ide-emacs")
-      (synopsis "Emacs integration for PureScript's psc-ide tool")
-      (description
-       "This package provices Emacs integration for @code{psc-ide}, an IDE
-protocol for PureScript programming language.  It features:
-
-@itemize
-@item Completions
-@item Type at point
-@item Go to definition
-@item Automatic imports
-@item Case split
-@item Build system integration, and
-@item Flycheck support
-@end itemize")
-      (license license:gpl3+))))
-
 (define-public emacs-evil-anzu
  (package
    (name "emacs-evil-anzu")
@@ -12487,8 +12378,8 @@ match and total match information in the mode-line in various search modes.")
  (home-page "https://github.com/skeeto/elisp-finalize")
  (synopsis "Finalizers for Emacs Lisp")
  (description
-    "This package runs a callback (a finalizer)
-after its registered lisp object has been garbage collected.  This allows
+    "This package will allows to immediately run a callback (a finalizer)
+after its registered lisp object has been garbage collected.  This allows for
 extra resources, such as buffers and processes, to be cleaned up after the
 object has been freed.")
  (license license:unlicense)))
@@ -12594,7 +12485,7 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
      (home-page "https://github.com/emacscollective/closql")
      (synopsis "Store EIEIO objects using EmacSQL")
      (description
-       "This package stores uniform EIEIO objects in an EmacSQL
+       "This package allows to store uniform EIEIO objects in an EmacSQL
 database.  SQLite is used as backend.  This library imposes some restrictions
 on what kind of objects can be stored; it isn't intended to store arbitrary
 objects.  All objects have to share a common superclass and subclasses cannot
@@ -13403,7 +13294,7 @@ navigate and display hierarchy structures.")
    (home-page "https://github.com/ahungry/md4rd")
    (synopsis "Emacs Mode for Reddit")
    (description
-     "This package allows reading Reddit from within Emacs interactively.")
+     "This package allows to read Reddit from within Emacs interactively.")
    (license license:gpl3+)))

 (define-public emacs-pulseaudio-control
@@ -13437,7 +13328,7 @@ navigate and display hierarchy structures.")
      (home-page "https://github.com/flexibeast/pulseaudio-control")
      (synopsis "Control @code{pulseaudio} from Emacs")
      (description
-       "This package allows controlling @code{pulseaudio} from Emacs.")
+       "This package allows to control @code{pulseaudio} from Emacs.")
      (license license:gpl3+))))

 (define-public emacs-datetime
@@ -13960,7 +13851,7 @@ key again.")
      (build-system emacs-build-system)
      (home-page "https://github.com/dimitri/mbsync-el")
      (synopsis "Interface to mbsync for Emacs")
-      (description "This package calls @code{mbsync} from
+      (description "This package allows to call the @code{mbsync} from
 within Emacs.")
      (license license:gpl3+))))

@@ -14156,7 +14047,7 @@ throw a shell history.")
     `(("emacs-makey" ,emacs-makey)))
    (home-page "https://framagit.org/steckerhalter/discover-my-major/")
    (synopsis "Discover key bindings for the current Emacs major mode")
-    (description "This package discovers key bindings and
+    (description "This package provides allows to discover key bindings and
 their meaning for the current Emacs major-mode.")
    (license license:gpl3+)))

@@ -17563,7 +17454,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)")
    (home-page "https://github.com/jorgenschaefer/emacs-buttercup")
    (synopsis "Behavior driven emacs lisp testing framework")
    (description "Buttercup is a behavior-driven development framework for
-testing Emacs Lisp code.  It groups related tests so they can share
+testing Emacs Lisp code.  It allows to group related tests so they can share
 common set-up and tear-down code, and allows the programmer to \"spy\" on
 functions to ensure they are called with the right arguments during testing.")
    (license license:gpl3+)))
@@ -22368,7 +22259,7 @@ conversion program}, a Japanese input method on Emacs.")
    (home-page "https://github.com/clemera/objed")
    (synopsis "Navigate and edit text objects")
    (description
-      "@code{emacs-objed} allows navigating and editing text objects.  It
+      "@code{emacs-objed} allows to navigate and edit text objects.  It
 enables modal editing and composition of commands, too.  It combines ideas of
 other Editors like Vim or Kakoune and tries to align them with regular Emacs
 conventions.")
@@ -17,7 +17,6 @@
 ;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org>
 ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
-;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -390,11 +389,11 @@ This package provides the Emacs mode.")
    (synopsis "Free Elster client, for sending Germany VAT declarations")
    (description
     "Geierlein is a free Elster client, i.e. an application that
-sends VAT declarations to Germany's fiscal authorities.
+allows to send VAT declarations to Germany's fiscal authorities.

 Currently it is *not* possible to send returns that are due annually
 (especially the income tax return) since the fiscal authority doesn't
-allow doing that off the ERiC library (which is proprietary however).
+allow to do that off the ERiC library (which is proprietary however).
 It's not clear at the moment whether one day it will be possible to
 do so.")
    (license license:agpl3+)))
@@ -1049,13 +1048,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ")
 (define-public python-duniterpy
  (package
    (name "python-duniterpy")
-    (version "0.57.0")
+    (version "0.56.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "duniterpy" version))
       (sha256
-        (base32 "0rw2c7r9gcqhymp82gbk1ky45zqbypsi2q5x4vdwjc6g00kh7h6l"))))
+        (base32 "1h8d8cnr6k5sw4cqy8r82zy4ldzpvn4nlk2221lz2haqq7xm4s5z"))))
    (build-system python-build-system)
    (arguments
     ;; FIXME: Tests fail with: "ModuleNotFoundError: No module named
@@ -1402,44 +1401,6 @@ electronic cash system.  This package provides a command line client and
 a Qt GUI.")
    (license license:expat)))

-(define-public fulcrum
-  (package
-    (name "fulcrum")
-    (version "1.0.5b")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v"
-                           version "/fulcrum-v" version ".tar.gz"))
-       (sha256
-        (base32 "1c1hkik8avill8ha33g76rk4b03j5ac8wiml69q4jav7a63ywgfy"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; Call qmake instead of configure to create a Makefile.
-         (replace 'configure
-           (lambda _
-             (invoke
-              "qmake"
-              (string-append "PREFIX=" %output)
-              "features="))))))
-    (native-inputs
-     `(("qttools" ,qttools)))
-    (inputs
-     `(("python" ,python)
-       ("qtbase" ,qtbase)
-       ("rocksdb" ,rocksdb)
-       ("zlib" ,zlib)))
-    (home-page "https://gitlab.com/FloweeTheHub/fulcrum/")
-    (synopsis "Fast and nimble SPV server for Bitcoin Cash")
-    (description
-     "Flowee Fulcrum is a server that is the back-end for @acronym{SPV,
-Simplified Payment Verification} wallets, it provides the full API for those
-walets in a fast and small server.  The full data is stored in a full node,
-like Flowee the Hub, which Fulcrum connects to over RPC.")
-    (license license:gpl3+)))
-
 (define-public beancount
  (package
    (name "beancount")
@@ -1671,8 +1671,8 @@ encoding names are iconv-compatible.")
    (home-page "https://github.com/coldfix/udiskie")
    (synopsis "Automounter for removable media")
    (description
-     "The @command{udiskie} program is a udisks2 front-end that
-manages removable media such as CDs or flash drives from userspace.
+     "The @command{udiskie} program is a udisks2 front-end that allows to
+manage removable media such as CDs or flash drives from userspace.

 Its features include:

@@ -2971,14 +2971,20 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
  (package
    (name "openttd-engine")
-    (version "1.10.0")
+    (version "1.9.3")
    (source
     (origin (method url-fetch)
-             (uri (string-append "https://cdn.openttd.org/openttd-releases/"
+             (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
                                 version "/openttd-" version "-source.tar.xz"))
             (sha256
              (base32
-               "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv"))))
+               "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
+             (modules '((guix build utils)))
+             (snippet
+              ;; The DOS port contains proprietary software.
+              '(begin
+                 (delete-file-recursively "os/dos")
+                 #t))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f              ; no "check" target
@@ -3028,15 +3034,15 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
  (package
    (name "openttd-opengfx")
-    (version "0.6.0")
+    (version "0.5.5")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append "https://cdn.openttd.org/opengfx-releases/"
+       (uri (string-append "http://binaries.openttd.org/extra/opengfx/"
                           version "/opengfx-" version "-source.tar.xz"))
       (sha256
        (base32
-         "0qxc6gl2gxcrn1np88dnjgbaaakkkx96b13rcmy1spryc8c09hyr"))))
+         "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49"))))
    (build-system gnu-build-system)
    (arguments
     '(#:make-flags (list "CC=gcc"
@@ -3066,7 +3072,6 @@ engine.  When you start it you will be prompted to download a graphics set.")
                     ("gimp" ,gimp)
                     ("grfcodec" ,grfcodec)
                     ("nml" ,nml)
-                     ("which" ,which)
                     ("python" ,python-2)))
    (home-page "http://dev.openttdcoop.org/projects/opengfx")
    (synopsis "Base graphics set for OpenTTD")
@@ -3711,69 +3716,6 @@ fullscreen, use F5 or Alt+Enter.")
    ;; Code mainly BSD-2, some parts under Boost 1.0. All assets are WTFPL2.
    (license (list license:bsd-2 license:boost1.0 license:wtfpl2))))

-(define-public tennix
-  (package
-    (name "tennix")
-    (version "1.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://repo.or.cz/tennix.git")
-             (commit (string-append "tennix-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "02cj4lrdrisal5s9pnbf2smx7qz9czczjzndfkhfx0qy67b957sk"))
-       ;; Remove non-free images.
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (for-each delete-file
-                     '("data/loc_training_camp.png"
-                       "data/loc_austrian_open.png"
-                       "data/loc_olympic_green_tennis.png"))
-           #t))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f                      ;no test
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-include
-           (lambda _
-             (substitute* '("src/graphics.h" "src/sound.h")
-               (("#include \"(SDL_(image|ttf|mixer)\\.h)\"" _ header)
-                (string-append "#include \"SDL/" header "\"")))
-             (substitute* '("src/tennix.h" "src/network.h" "src/SDL_rotozoom.h")
-               (("#include <SDL.h>") "#include <SDL/SDL.h>")
-               (("#include <SDL_net.h>") "#include <SDL/SDL_net.h>"))
-             #t))
-         (add-after 'unpack 'locate-install
-           ;; Build process cannot expand "$(INSTALL)" in Makefile.
-           (lambda _
-             (substitute* "makefile"
-               (("^CONFIGURE_OUTPUT :=.*" all)
-                (string-append "INSTALL := install -c\n" all)))
-             #t))
-         (replace 'configure
-           ;; The "configure" script is picky about the arguments it
-           ;; gets.  Call it ourselves.
-           (lambda _
-             (invoke "./configure" "--prefix" (assoc-ref %outputs "out")))))))
-    (native-inputs
-     `(("which" ,which)))
-    (inputs
-     `(("python" ,python-wrapper)
-       ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf sdl-net)))))
-    (home-page "http://icculus.org/tennix/")
-    (synopsis "Play tennis against the computer or a friend")
-    (description "Tennix is a 2D tennis game.  You can play against the
-computer or against another player using the keyboard.  The game runs
-in-window at 640x480 resolution or fullscreen.")
-    ;; Project is licensed under GPL2+ terms.  It includes images
-    ;; released under Public Domain terms, and SDL_rotozoom, released
-    ;; under LGPL2.1 terms.
-    (license (list license:gpl2+ license:public-domain license:lgpl2.1))))
-
 (define-public warzone2100
  (package
    (name "warzone2100")
@@ -3830,7 +3772,7 @@ in-window at 640x480 resolution or fullscreen.")
 modes. An extensive tech tree with over 400 different technologies, combined
 with the unit design system, allows for a wide variety of possible units and
 tactics.")
-                                        ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL
+    ; Everything is GPLv2+ unless otherwise specified in COPYING.NONGPL
    (license (list license:bsd-3
                   license:cc0
                   license:cc-by-sa3.0
@@ -4076,7 +4018,7 @@ with the \"Stamp\" tool within Tux Paint.")
 (define-public supertux
  (package
   (name "supertux")
-   (version "0.6.1.1")
+   (version "0.6.1")
   (source (origin
            (method url-fetch)
            (uri (string-append "https://github.com/SuperTux/supertux/"
@@ -4085,7 +4027,7 @@ with the \"Stamp\" tool within Tux Paint.")
            (file-name (string-append name "-" version ".tar.gz"))
            (sha256
             (base32
-              "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f"))
+              "0lqch5gcq6ccnspy93z9r13bp8w2j1vrd8jhvk5kp4qhrd1f069s"))
            (patches
             (search-patches "supertux-unbundle-squirrel.patch"))))
   (arguments
@@ -6139,7 +6081,7 @@ affect gameplay).")
  (package
    (inherit chocolate-doom)
    (name "crispy-doom")
-    (version "5.7.2")
+    (version "5.7.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -6147,7 +6089,7 @@ affect gameplay).")
                    (commit (string-append "crispy-doom-" version))))
              (file-name (git-file-name name version))
              (sha256
-               (base32 "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq"))))
+               (base32 "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj"))))
    (native-inputs
     (append
      (package-native-inputs chocolate-doom)
@@ -1153,8 +1153,8 @@ persisted.
               (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar"))))))))
    (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer")
    (synopsis "OSM map integration in Java")
-    (description "JMapViewer is a Java component which easily
-integrates an OSM map view into your Java application.  It is maintained as
+    (description "JMapViewer is a Java component which allows to easily
+integrate an OSM map view into your Java application.  It is maintained as
 an independent project by the JOSM team.")
    (license license:gpl2)))

@@ -1292,7 +1292,7 @@ an independent project by the JOSM team.")
    (synopsis "OSM editor")
    (description "JOSM is an extensible editor for OpenStreetMap (OSM).  It
 supports loading GPX tracks, background imagery and OSM data from local
-sources as well as from online sources and allows editing the OSM data (nodes,
+sources as well as from online sources and allows to edit the OSM data (nodes,
 ways, and relations) and their metadata tags.")
    (license license:gpl2+)))

@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
@@ -183,7 +183,7 @@ buffers.")
       ("gexiv2" ,gexiv2)
       ("gtk+" ,gtk+-2)
       ("libmypaint" ,libmypaint)
-       ("mypaint-brushes" ,mypaint-brushes-1.3)
+       ("mypaint-brushes" ,mypaint-brushes)
       ("exif" ,libexif)                ; optional, EXIF + XMP support
       ("lcms" ,lcms)                   ; optional, color management
       ("librsvg" ,librsvg)             ; optional, SVG support
@@ -270,7 +270,7 @@ inverse fourier transform.")
 (define-public libmypaint
  (package
    (name "libmypaint")
-    (version "1.5.1")
+    (version "1.3.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/mypaint/libmypaint/"
@@ -278,7 +278,7 @@ inverse fourier transform.")
                                  version ".tar.xz"))
              (sha256
               (base32
-                "0aqcv4fyscpfhknxgfpq0v84aj2nzigqvpi4zgv2zkl41h51by5f"))))
+                "0wd6jk69vmhsq1mdw96v0fh7b28n3glkr5ca466zcq7agzaxj1va"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("intltool" ,intltool)
@@ -298,42 +298,34 @@ brushstrokes which is used by MyPaint and GIMP.")
 (define-public mypaint-brushes
  (package
    (name "mypaint-brushes")
-    (version "2.0.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/mypaint/mypaint-brushes.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9"))))
+    (version "1.3.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Jehan/mypaint-brushes.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"))))
    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'relax-dependency-version
+           (lambda _
+             (substitute* "autogen.sh"
+               (("automake-1.13") "automake")
+               (("aclocal-1.13") "aclocal"))
+             #t)))))
    (native-inputs
     `(("autoconf" ,autoconf)
       ("automake" ,automake)))
    (synopsis "Default brushes for MyPaint")
    (description "This package provides the default set of brushes for
 MyPaint.")
-    (home-page "https://github.com/mypaint/mypaint-brushes/")
-    ;; Scripts are distributed under GPL2+ terms, brushes are provided as
-    ;; public domain or under CC0 terms.
-    (license (list license:gpl2+ license:cc0 license:public-domain))))
-
-(define-public mypaint-brushes-1.3
-  (package
-    (inherit mypaint-brushes)
-    (name "mypaint-brushes")
-    (version "1.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/mypaint/mypaint-brushes.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j"))))))
+    (home-page "https://github.com/Jehan/mypaint-brushes")
+    (license license:cc0)))

 (define-public gimp-resynthesizer
  ;; GIMP does not respect any plugin search path environment variable, so after
@@ -345,14 +337,13 @@ MyPaint.")
    (version "2.0.3")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/bootchk/resynthesizer")
-              (commit (string-append "v" version))))
+       (method url-fetch)
+       (uri (string-append "https://github.com/bootchk/resynthesizer/archive/v"
+			   version ".tar.gz"))
       (sha256
        (base32
-         "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j"))
-       (file-name (git-file-name name version))))
+         "0l3404w6rqny7h3djskxf149gzx6x4qhndgbh3403c9lbh4pi1kr"))
+       (file-name (string-append name "-" version ".tar.gz"))))
    (build-system gnu-build-system)
    (arguments
     `( ;; Turn off tests to avoid:
@@ -360,11 +351,11 @@ MyPaint.")
       #:tests? #f
       #:phases
       (modify-phases %standard-phases
-         (add-after 'unpack 'set-env
-           (lambda _
-             (setenv "CONFIG_SHELL" (which "sh"))
-             #t))
-         (add-after 'configure 'set-prefix
+	 (add-after 'unpack 'set-env
+	   (lambda _
+	     (setenv "CONFIG_SHELL" (which "sh"))
+	     #t))
+	 (add-after 'configure 'set-prefix
           ;; Install plugin under $prefix, not under GIMP's libdir.
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((target (string-append (assoc-ref outputs "out")
@@ -373,8 +364,8 @@ MyPaint.")
                                            (package-version gimp))
                                          ".0")))
               (substitute* (list "src/resynthesizer/Makefile"
-                                  "src/resynthesizer-gui/Makefile")
-                 (("GIMP_LIBDIR = .*")
+				  "src/resynthesizer-gui/Makefile")
+		 (("GIMP_LIBDIR = .*")
                  (string-append "GIMP_LIBDIR = " target "\n")))
               (mkdir-p target)
               #t))))))
@@ -359,7 +359,7 @@ control.")
      (propagated-inputs
       `(("glib" ,glib)))
      (synopsis "Hide app icon from GNOME's panel")
-      (description "This extension hides the icon and/or title of the
+      (description "This extension allows to hide the icon and/or title of the
 currently focused application in the top panel of the GNOME shell.")
      (home-page
       "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/")
@@ -9200,7 +9200,7 @@ configurable file renaming. ")
 (define-public workrave
  (package
    (name "workrave")
-    (version "1.10.42")
+    (version "1.10.37")
    (source
     (origin
       (method git-fetch)
@@ -9211,7 +9211,7 @@ configurable file renaming. ")
                                         version)))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03i9kk8r1wgrfkkbwikx8wxaw4r4kn62vismr2zdq5g34fkkjh95"))))
+        (base32 "01cxy7606hx9wgxl550l4p2xa9hsy0rk7swsp58hyi842z2z0y13"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     ;; The only tests are maintainer tests (in po/), which fail.
@@ -9678,7 +9678,7 @@ repository and commit your work.")
    (description
     "Gamin is a file and directory monitoring system defined to be a subset
 of the FAM (File Alteration Monitor) system.  This is a service provided by a
-library which detects when a file or a directory has been modified.")
+library which allows to detect when a file or a directory has been modified.")
    (license license:gpl2+)))

 (define-public gnome-mahjongg
@@ -3281,7 +3281,7 @@ are semantically equal in Go (for writing tests).")
      (synopsis "Synchronization, error propagation, and Context cancellation
 for groups of goroutines working on subtasks of a common task.")
      (description "This package provides synchronization, error propagation,
-and Context cancellation for groups of goroutines working on subtasks of a
+and Context cancelation for groups of goroutines working on subtasks of a
 common task.")
      (home-page "https://godoc.org/golang.org/x/sync/errgroup")
      (license license:bsd-3))))
@@ -20,7 +20,6 @@
 ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -88,61 +87,6 @@
  #:use-module (guix packages)
  #:use-module (guix utils))

-(define-public fox
-  (package
-    (name "fox")
-    (version "1.6.57")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://fox-toolkit.org/ftp/fox-" version ".tar.gz"))
-       (sha256
-        (base32 "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "configure"
-               (("-I/usr/include/freetype2")
-                (string-append "-I"
-                               (string-append
-                                (assoc-ref %build-inputs "freetype")
-                                "/include/freetype2"))))
-             #t)))))
-    (native-inputs
-     `(("doxygen" ,doxygen)))
-    (inputs
-     `(("bzip2" ,lbzip2)
-       ("freetype" ,freetype)
-       ("gl" ,mesa)
-       ("glu" ,glu)
-       ("jpeg" ,libjpeg)
-       ("png" ,libpng)
-       ("tiff" ,libtiff)
-       ("x11" ,libx11)
-       ("xcursor" ,libxcursor)
-       ("xext" ,libxext)
-       ("xfixes" ,libxfixes)
-       ("xft" ,libxft)
-       ("xinput" ,libxi)
-       ("xrandr" ,libxrandr)
-       ("xrender" ,libxrender)
-       ("xshm" ,libxshmfence)
-       ("zlib" ,zlib)))
-    (synopsis "Widget Toolkit for building GUI")
-    (description"FOX (Free Objects for X) is a C++ based Toolkit for developing
-Graphical User Interfaces easily and effectively.   It offers a wide, and
-growing, collection of Controls, and provides state of the art facilities such
-as drag and drop, selection, as well as OpenGL widgets for 3D graphical
-manipulation.  FOX also implements icons, images, and user-convenience features
-such as status line help, and tooltips.  Tooltips may even be used for 3D
-objects!")
-    (home-page "http://www.fox-toolkit.org")
-    (license license:lgpl2.1+)))
-
 (define-public blender
  (package
    (name "blender")
@@ -5,14 +5,14 @@
 ;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
-;;; Copyright © 2016, 2019, 2020 Eraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019 Eraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 ;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
 ;;; Copyright © 2016, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2017 David Thompson <davet@gnu.org>
-;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -1123,7 +1123,7 @@ microblogging service.")
 (define-public guile-parted
  (package
    (name "guile-parted")
-    (version "0.0.3")
+    (version "0.0.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1132,8 +1132,20 @@ microblogging service.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc"))
-              (modules '((guix build utils)))))
+                "01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure.ac"
+                    (("^GUILE_PKG.*")
+                     "GUILE_PKG([3.0 2.2 2.0])\n"))
+
+                  ;; Remove "guile.m4" since it contains an obsolete version
+                  ;; of 'GUILE_PKG' that doesn't work with development
+                  ;; versions such as 2.9.
+                  (delete-file "m4/guile.m4")
+                  #t))))
    (build-system gnu-build-system)
    (arguments
     '(#:make-flags
@@ -2130,14 +2142,14 @@ is no support for parsing block and inline level HTML.")
 (define-public mcron
  (package
    (name "mcron")
-    (version "1.1.4")
+    (version "1.1.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/mcron/mcron-"
                                  version ".tar.gz"))
              (sha256
               (base32
-                "1521w3h33bhdlg6qc66sq4dwv3qsx8r8x6srq4ca6kaahy6dszw8"))))
+                "00kv7fgllzjpis0g1m9csycp4f6l11774m09dqy255cvmim2g743"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (modify-phases %standard-phases
@@ -0,0 +1,178 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages ham-radio)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages sdr)
+  #:use-module (gnu packages xml)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python))
+
+(define-public rtl-sdr
+  (package
+    (name "rtl-sdr")
+    (version "0.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "git://git.osmocom.org/rtl-sdr.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("libusb" ,libusb)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON")
+       #:tests? #f)) ; No tests
+    (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr")
+    (synopsis "Software defined radio driver for Realtek RTL2832U")
+    (description "DVB-T dongles based on the Realtek RTL2832U can be used as a
+cheap software defined radio, since the chip allows transferring the raw I/Q
+samples to the host.  @code{rtl-sdr} provides drivers for this purpose.")
+    (license license:gpl2+)))
+
+(define-public chirp
+  (package
+    (name "chirp")
+    (version "20181205")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-"
+                           version "/chirp-daily-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python2-libxml2" ,python2-libxml2)
+       ("python2-pygtk" ,python2-pygtk)
+       ("python2-pyserial" ,python2-pyserial)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://chirp.danplanet.com")
+    (synopsis "Cross-radio programming tool")
+    (description "Chirp is a cross-radio programming tool.  It supports a
+growing list of radios across several manufacturers and allows transferring of
+memory contents between them.")
+    (license (list license:gpl3+
+                   license:lgpl3+)))) ; chirp/elib_intl.py
+
+(define-public aptdec
+  (package
+    (name "aptdec")
+    (version "1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/csete/aptdec")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libpng" ,libpng)
+       ("libsndfile" ,libsndfile)))
+    (arguments
+     `(#:make-flags (list "CC=gcc")
+       #:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (install-file "atpdec" (string-append out "/bin")))
+             #t)))))
+    (home-page "https://github.com/csete/aptdec")
+    (synopsis "NOAA Automatic Picture Transmission (APT) decoder")
+    (description "Aptdec decodes Automatic Picture Transmission (APT) images.
+These are medium resolution images of the Earth transmitted by, among other
+satellites, the POES NOAA weather satellite series.  These transmissions are
+on a frequency of 137 MHz.  They can be received using an inexpensive antenna
+and a dedicated receiver.")
+    (license license:gpl2+)))
+
+(define-public redsea
+  (package
+    (name "redsea")
+    (version "0.18")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/windytan/redsea")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; The configure.ac file does not explicitly link against libiconv
+         ;; except on Mac OS, causing the build to fail. This phase comments
+         ;; out the original AC_SUBST macro (located inside a conditional) and
+         ;; adds an explicit use of it underneath, so that libiconv is always
+         ;; linked against.
+         (add-after 'unpack 'patch-libiconv
+           (lambda _
+             (substitute* "configure.ac"
+               (("^ +AC_SUBST")
+                "# AC_SUBST")
+               (("esac")
+                "esac\nAC_SUBST([ICONV], [\"-liconv\"])"))
+             #t)))))
+    (inputs
+     `(("libiconv" ,libiconv)
+       ("libsndfile" ,libsndfile)
+       ("liquid-dsp" ,liquid-dsp)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (home-page "https://github.com/windytan/redsea")
+    (synopsis "Lightweight RDS to JSON decoder")
+    (description "redsea is a lightweight command-line @dfn{FM Radio Data
+System} (FM-RDS) decoder.  Redsea can be used with any RTL-SDR USB radio stick
+with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via
+csdr, for example.  It can also decode raw ASCII bitstream, the hex format
+used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
+    (license license:expat)))
@@ -746,7 +746,7 @@ too slow and you'll get wound up in the scroll and crushed.")
       ("ghc-diff" ,ghc-diff)
       ("ghc-quickcheck" ,ghc-quickcheck)
       ("ghc-regex-tdfa" ,ghc-regex-tdfa)))
-    (home-page "https://www.shellcheck.net/")
+    (home-page "https://github.com/koalaman/shellcheck")
    (synopsis "Static analysis for shell scripts")
    (description "@code{shellcheck} provides static analysis for
@command{bash} and @command{sh} shell scripts.
@@ -9745,7 +9745,7 @@ Haskell library @code{regex-base}.")
    (build-system haskell-build-system)
    (inputs
     `(("ghc-regex-base" ,ghc-regex-base)))
-    (home-page "https://github.com/haskell-hvr/regex-tdfa")
+    (home-page "https://github.com/ChrisKuklewicz/regex-tdfa")
    (synopsis "POSIX extended regular expressions in Haskell.")
    (description
     "Regex-tdfa is a pure Haskell regular expression library implementing POSIX
@@ -10780,7 +10780,7 @@ provided.  Skylighting is intended to be the successor to highlighting-kate.")
    (home-page
     "https://github.com/feuerbach/smallcheck")
    (synopsis "Property-based testing library")
-    (description "SmallCheck is a testing library that verifies
+    (description "SmallCheck is a testing library that allows to verify
 properties for all test cases up to some depth.  The test cases are generated
 automatically by SmallCheck.")
    (license license:bsd-3)))
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -117,24 +117,6 @@ C/C++ part.")
                         (search-patches
                           "icu4c-CVE-2020-10531.patch")))))))

-(define-public icu4c-66.1
-  (package
-    (inherit icu4c)
-    (version "66.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/unicode-org/icu/releases/download/release-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-                    "/icu4c-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                    "-src.tgz"))
-              (patch-flags '("-p2"))
-              (patches (search-patches "icu4c-CVE-2020-10531.patch"))
-              (sha256
-               (base32
-                "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))))
-
 (define-public java-icu4j
  (package
    (name "java-icu4j")
@@ -14,7 +14,6 @@
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
 ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
-;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +35,6 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix packages)
-  #:use-module (guix utils)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system meson)
@@ -422,95 +420,44 @@ imaging.  It supports several HDR and LDR image formats, and it can:
    (license license:gpl2+)))

 ;; CBR and RAR are currently unsupported, due to non-free dependencies.
+;; For optional PDF support, you can install the mupdf package.
 (define-public mcomix
-  ;; Official mcomix hasn't been updated since 2016, it's broken with
-  ;; python-pillow 6+ and only supports Python 2.  We use fork instead.
-  (let ((commit "fea55a7a9369569eefed72209eed830409c4af98"))
-    (package
-      (name "mcomix")
-      (version (git-version "1.2.1" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/multiSnow/mcomix3")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "05zl0dkjwbdcm2zlk4nz9w33amlqj8pbf32a8ymshc2356fqhhi5"))))
-      (build-system python-build-system)
-      (inputs
-       `(("p7zip" ,p7zip)
-         ("python-pillow" ,python-pillow)
-         ("python-pygobject" ,python-pygobject)
-         ("python-pycairo" ,python-pycairo)))
-      (arguments
-       `(#:tests? #f                    ; FIXME: How do we run tests?
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'configure
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let ((p7zip (assoc-ref inputs "p7zip")))
-                 ;; insert absolute path to 7z executable
-                 (substitute* "mcomix/mcomix/archive/sevenzip_external.py"
-                   (("_7z_executable = -1")
-                    (string-append "_7z_executable = u'" p7zip "/bin/7z'"))))
-               #t))
-           (replace 'build
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (pyver ,(version-major+minor (package-version python)))
-                      (lib (string-append out "/lib/python" pyver)))
-                 (invoke (which "python") "installer.py" "--srcdir=mcomix"
-                         (string-append "--target=" lib))
-                 (rename-file (string-append lib "/mcomix")
-                              (string-append lib "/site-packages"))
-                 #t)))
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (share (string-append out "/share"))
-                      (bin (string-append out "/bin"))
-                      (pyver ,(version-major+minor (package-version python)))
-                      (lib (string-append out "/lib/python" pyver "/site-packages")))
-                 (mkdir-p bin)
-                 (rename-file (string-append lib "/mcomixstarter.py")
-                              (string-append bin "/mcomix"))
-                 (rename-file (string-append lib "/comicthumb.py")
-                              (string-append bin "/comicthumb"))
-                 (install-file "mime/mcomix.desktop"
-                               (string-append share "/applications"))
-                 (install-file "mime/mcomix.appdata.xml"
-                               (string-append share "/metainfo"))
-                 (install-file "mime/mcomix.xml"
-                               (string-append share "/mime/packages"))
-                 (install-file "mime/comicthumb.thumbnailer"
-                               (string-append share "/thumbnailers"))
-                 (install-file "man/mcomix.1" (string-append share "/man/man1"))
-                 (install-file "man/comicthumb.1" (string-append share "/man/man1"))
-                 (for-each
-                  (lambda (size)
-                    (install-file
-                     (format #f "mcomix/mcomix/images/~sx~s/mcomix.png" size size)
-                     (format #f "~a/icons/hicolor/~sx~s/apps/" share size size))
-                    (for-each
-                     (lambda (ext)
-                       (install-file
-                        (format #f "mime/icons/~sx~s/application-x-~a.png" size size ext)
-                        (format #f "~a/icons/hicolor/~sx~s/mimetypes/"
-                                share size size)))
-                     '("cb7" "cbr" "cbt" "cbz")))
-                  '(16 22 24 32 48))
-                 #t))))))
-      (home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
-      (synopsis "Image viewer for comics")
-      (description "MComix is a customizable image viewer that specializes as
+  (package
+    (name "mcomix")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/mcomix/MComix-" version
+                           "/mcomix-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy"))))
+    (build-system python-build-system)
+    (inputs
+     `(("p7zip" ,p7zip)
+       ("python2-pillow" ,python2-pillow)
+       ("python2-pygtk" ,python2-pygtk)))
+    (arguments
+     ;; Python 2.5 or newer (Python 3 and up is not supported)
+     `(#:python ,python-2
+       #:tests? #f ; there are no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'configure
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((p7zip (assoc-ref inputs "p7zip")))
+               ;; insert absolute path to 7z executable
+               (substitute* "mcomix/archive/sevenzip_external.py"
+                 (("_7z_executable = -1")
+                  (string-append "_7z_executable = u'" p7zip "/bin/7z'"))))
+             #t)))))
+    (home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
+    (synopsis "Image viewer for comics")
+    (description "MComix is a customizable image viewer that specializes as
 a comic and manga reader.  It supports a variety of container formats
-including CBZ, CB7, CBT, LHA.
-
-For PDF support, install the @emph{mupdf} package.")
-      (license license:gpl2+))))
+including CBZ, CB7, CBT, LHA.")
+    (license license:gpl2+)))

 (define-public qview
  (package
@@ -170,14 +170,14 @@ SILC and ICB protocols via plugins.")
 (define-public weechat
  (package
    (name "weechat")
-    (version "2.8")
+    (version "2.7.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://weechat.org/files/src/weechat-"
                                  version ".tar.xz"))
              (sha256
               (base32
-                "1301lrb3xnm9dcw3av82rkqjzqxxwwhrq0p6i37h6fxdxnas4gjm"))))
+                "0haw0c35mf4r47j24issc9caq0da3fy7gjfq3454fm3ap3n2yxcx"))))
    (build-system cmake-build-system)
    (native-inputs
     `(("gettext" ,gettext-minimal)
@@ -193,7 +193,7 @@ SILC and ICB protocols via plugins.")
       ("zlib" ,zlib)

       ;; Scripting language plug-ins.
-       ("guile" ,guile-3.0)
+       ("guile" ,guile-2.2)
       ("lua" ,lua-5.1)
       ("perl" ,perl)
       ("python" ,python)
@@ -4416,7 +4416,7 @@ on the XPP3 API (XML Pull Parser).")))
    (description "ASM is an all purpose Java bytecode manipulation and
 analysis framework.  It can be used to modify existing classes or dynamically
 generate classes, directly in binary form.  The provided common
-transformations and analysis algorithms allow easily assembling custom
+transformations and analysis algorithms allow to easily assemble custom
 complex transformations and code analysis tools.")
    (license license:bsd-3)))

@@ -7420,7 +7420,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
    (home-page "https://github.com/barteo/microemu")
    (synopsis "J2ME CLDC emulator")
    (description "Microemulator is a Java 2 Micro Edition (J2ME) CLDC/MIDP
-Emulator.  It demonstrates MIDlet based applications in web browser
+Emulator.  It allows to demonstrate MIDlet based applications in web browser
 applet and can be run as a standalone java application.")
    (license (list license:asl2.0
                   ;; or altenatively:
@@ -8815,7 +8815,7 @@ make data-binding work.")
       ("hamcrest" ,java-hamcrest-core)))
    (home-page "https://hdrhistogram.github.io/HdrHistogram")
    (synopsis "High dynamic range histogram")
-    (description "Hdrhistogram creates histograms that support
+    (description "Hdrhistogram allows to create histograms that support
 recording and analyzing sampled data value counts across a configurable integer
 value range with configurable value precision within the range.  Value precision
 is expressed as the number of significant digits in the value recording, and
@@ -11644,7 +11644,7 @@ the application using Java to Lisp integration APIs.")
    (description "JSON Processing (JSON-P) is a Java API to process (e.g.
 parse, generate, transform and query) JSON messages.  It produces and
 consumes JSON text in a streaming fashion (similar to StAX API for XML)
-and allows building a Java object model for JSON text using API classes
+and allows to build a Java object model for JSON text using API classes
 (similar to DOM API for XML).")
    ;; either gpl2 only with classpath exception, or epl2.0.
    (license (list license:gpl2
@@ -409,7 +409,7 @@
       ("openlibm" ,openlibm)
       ("mbedtls" ,mbedtls-apache)
       ("curl" ,curl)
-       ("libgit2" ,libgit2-0.28)
+       ("libgit2" ,libgit2)
       ("libssh2" ,libssh2)
       ("fortran" ,gfortran)
       ("libuv" ,libuv-julia)
@@ -452,7 +452,7 @@ a full-featured client for BitTorrent.")
     `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
    (home-page "https://cgit.kde.org/libgravatar.git")
    (synopsis "Online avatar lookup library")
-    (description "This library retrieves avatar images based on a
+    (description "This library allows to retrieve avatar images based on a
 hash from a person's email address, as well as local caching to avoid
 unnecessary network operations.")
    (license ;; GPL for programs, LGPL for libraries
@@ -191,7 +191,7 @@ This package is part of the KDE multimedia module.")
    (home-page "https://kde.org/applications/multimedia/org.kde.elisa")
    (synopsis "Powerful music player for Plasma 5")
    (description "Elisa is a simple music player aiming to provide a nice
-experience for its users.  Elisa browses music by album, artist or
+experience for its users.  Elisa allows to browse music by album, artist or
 all tracks.  The music is indexed using either a private indexer or an indexer
 using Baloo.  The private one can be configured to scan music on chosen paths.
 The Baloo one is much faster because Baloo is providing all needed data from
@@ -53,7 +53,7 @@
       (patches (search-patches
                 "akonadi-paths.patch"
                 "akonadi-timestamps.patch"
-                 "akonadi-not-relocatable.patch"))))
+                 "akonadi-Revert-Make-installation-properly-relo.patch"))))
    (build-system qt-build-system)
    (native-inputs
     `(("extra-cmake-modules" ,extra-cmake-modules)
@@ -623,7 +623,7 @@ functions for accessing calendar data using the kcalcore API.")
       ("qtxmlpatterns" ,qtxmlpatterns)))
    (home-page "https://cgit.kde.org/kdav.git")
    (synopsis "DAV protocol implementation with KJobs")
-    (description "This is a DAV protocol implementation with KJobs.  Calendars
+    (description "This is a DAV protocol implemention with KJobs.  Calendars
 and todos are supported, using either GroupDAV or CalDAV, and contacts are
 supported using GroupDAV or CardDAV.")
    (license ;; GPL for programs, LGPL for libraries
@@ -670,7 +670,7 @@ supported using GroupDAV or CardDAV.")
       ("qtbase" ,qtbase)))
    (home-page "https://cgit.kde.org/kdepim-apps-libs.git")
    (synopsis "KDE PIM mail related libraries and data files")
-    (description "This package provides mail related libraries and data files
+    (description "This packages provides mail related libraries and data files
 for KDE PIM.")
    (license ;; GPL for programs, LGPL for libraries
     (list license:gpl2+ license:lgpl2.0+))))
@@ -1095,7 +1095,7 @@ and retrieving certificates from LDAP servers.")
    (description "KMail supports multiple accounts, mail filtering and email
 encryption.  The program let you configure your workflow and it has good
 integration into KDE (Plasma Desktop) but is also useable with other Desktop
-Environments.
+Envionments.

 KMail is the email component of Kontact, the integrated personal information
 manager from KDE.")
@@ -1346,7 +1346,7 @@ using a Qt/KMime C++ API.")
     `(#:tests? #f)) ;; TODO many test fail for quite different reasons
    (home-page "https://cgit.kde.org/messagelib.git")
    (synopsis "KDE PIM messaging libraries")
-    (description "This package provides several libraries for messages,
+    (description "This packages provides several libraries for messages,
 e.g. a message list, a mime tree parse, a template parser and the
 kwebengineviewer.")
    (license ;; GPL for programs, LGPL for libraries
@@ -83,7 +83,7 @@
    (description "Dolphin is a file manager for KDE focusing on usability.
 The main features of Dolphin are:
@itemize
-@item Navigation bar for URLs, which navigates quickly
+@item Navigation bar for URLs, which allows to navigate quickly
      through the file hierarchy.
@item View properties are remembered for each folder.
@item Split of views is supported.
@@ -99,7 +99,7 @@ framework for writing, administering, and running unit tests in C.")
       ("mbedtls" ,mbedtls-apache)))
    (synopsis "Belledonne Communications Tool Box")
    (description "BcToolBox is an utilities library used by Belledonne
-Communications software like belle-sip, mediastreamer2 and linphone.")
+Communications softwares like belle-sip, mediastreamer2 and linphone.")
    (home-page "https://gitlab.linphone.org/BC/public/bctoolbox")
    (license license:gpl2+)))

@@ -1505,16 +1505,16 @@ slabtop, and skill.")
 (define-public e2fsprogs
  (package
    (name "e2fsprogs")
-    (version "1.45.6")
+    (version "1.45.5")
    (source (origin
             (method url-fetch)
             (uri (string-append
                   "mirror://kernel.org/linux/kernel/people/tytso/"
-                   "e2fsprogs/v" version "/"
-                   "e2fsprogs-" version ".tar.xz"))
+                   name "/v" version "/"
+                   name "-" version ".tar.xz"))
             (sha256
              (base32
-               "0mj2yizwygs7xww8jfy5mxjn8ww4pvc0b1hg1p2vsnirailsx9zz"))))
+               "1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr"))))
    (build-system gnu-build-system)
    (inputs `(("util-linux" ,util-linux)))
    (native-inputs `(("pkg-config" ,pkg-config)
@@ -4325,7 +4325,7 @@ and copy/paste text in the console and in xterm.")
 (define-public btrfs-progs
  (package
    (name "btrfs-progs")
-    (version "5.6")
+    (version "5.4.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -4333,7 +4333,7 @@ and copy/paste text in the console and in xterm.")
                                  "btrfs-progs-v" version ".tar.xz"))
              (sha256
               (base32
-                "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1"))))
+                "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "static"))      ; static versions of the binaries in "out"
@@ -98,7 +98,7 @@
     "LIRC allows computers to send and receive IR signals of many commonly
 used remote controls.  The most important part of LIRC is the @code{lircd}
 daemon that decodes IR signals received by the device drivers.  The second
-daemon program @code{lircmd} translates IR signals to mouse movements.
+daemon program @code{lircmd} allows to translate IR signals to mouse movements.
 The user space applications allow you to control your computer with a remote
 control: you can send X events to applications, start programs and much more
 on just one button press.")
@@ -10,7 +10,7 @@
 ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2018, 2020 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
@@ -53,7 +53,6 @@
  #:use-module (gnu packages c)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages databases)
-  #:use-module (gnu packages enchant)
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages imagemagick)
@@ -2786,8 +2785,8 @@ advantage of the library is the ability to concisely define command line
 options once and then use this definition for parsing and extraction of
 command line arguments, as well as printing description of command line
 options (you get --help for free).  This way you don't need to repeat
-yourself.  Also, @command{unix-opts} doesn't depend on anything and
-precisely controls the behavior of the parser via Common Lisp restarts.")
+yourself.  Also, @command{unix-opts} doesn't depend on anything and allows to
+precisely control behavior of the parser via Common Lisp restarts.")
    (license license:expat)))

 (define-public cl-unix-opts
@@ -3047,10 +3046,10 @@ is a library for creating graphical user interfaces.")
  (sbcl-package->cl-source-package sbcl-cl-cffi-gtk))

 (define-public sbcl-cl-webkit
-  (let ((commit "d97115ca601838dfa60ea7afbb88641d7a526dba"))
+  (let ((commit "4832c99c31e0eb1fcce3779d119343ae8a423952"))
    (package
      (name "sbcl-cl-webkit")
-      (version (git-version "2.4" "2" commit))
+      (version (git-version "2.4" "1" commit))
      (source
       (origin
         (method git-fetch)
@@ -3060,7 +3059,7 @@ is a library for creating graphical user interfaces.")
         (file-name (git-file-name "cl-webkit" version))
         (sha256
          (base32
-           "0sdb2l2h5xv5c1m2mfq31i9yl6zjf512fvwwzlvk9nvisyhc4xi3"))))
+           "0sn7m181wfg1q49q45dlsry8c38x7pziqcs0frnymk6yvgndybxd"))))
      (build-system asdf-build-system/sbcl)
      (inputs
       `(("cffi" ,sbcl-cffi)
@@ -5077,8 +5076,8 @@ high-level way.  This library provides such operators.")
  (sbcl-package->ecl-package sbcl-cl-quickcheck))

 (define-public sbcl-burgled-batteries3
-  (let ((commit "f65f454d13bb6c40e17e9ec62e41eb5069e09760")
-        (revision "2"))
+  (let ((commit "9c0f6667e1a71ddf77e21793a0bea524710fef6e")
+        (revision "1"))
    (package
      (name "sbcl-burgled-batteries3")
      (version (git-version "0.0.0" revision commit))
@@ -5091,33 +5090,33 @@ high-level way.  This library provides such operators.")
         (file-name (git-file-name name version))
         (sha256
          (base32
-           "1nzn7jawrfajyzwfnzrg2cmn9xxadcqh4szbpg0jggkhdkdzz4wa"))))
+           "0b726kz2xxcg5l930gz035rsdvhxrzmp05iwfwympnb4z4ammicb"))))
      (build-system asdf-build-system/sbcl)
      (arguments
-       `(#:tests? #f
-         #:modules (((guix build python-build-system) #:select (python-version))
-                    ,@%asdf-build-system-modules)
-         #:imported-modules ((guix build python-build-system)
-                             ,@%asdf-build-system-modules)
+       '(#:tests? #f
         #:phases
-         (modify-phases (@ (guix build asdf-build-system) %standard-phases)
+         (modify-phases %standard-phases
           (add-after 'unpack 'set-*cpython-include-dir*-var
             (lambda* (#:key inputs #:allow-other-keys)
-               (let ((python (assoc-ref inputs "python")))
-                 (setenv "BB_PYTHON3_INCLUDE_DIR"
-                         (string-append python "/include/python"
-                                        (python-version python)
-                                        "m"))
-                 (setenv "BB_PYTHON3_DYLIB"
-                         (string-append python "/lib/libpython3.so"))
-                 #t))))))
+               (substitute* "grovel-include-dir.lisp"
+                 (("\\(defparameter \\*cpython-include-dir\\* \\(detect-python\\)\\)")
+                  (string-append
+                   "(defparameter *cpython-include-dir* \""
+                   (assoc-ref inputs "python")
+                   "/include/python3.7m"
+                   "\")")))
+               (substitute* "ffi-interface.lisp"
+                 (("\\*cpython-lib\\*")
+                  (format #f "'(\"~a/lib/libpython3.so\")"
+                          (assoc-ref inputs "python"))))
+               #t)))))
      (native-inputs
-       `(("sbcl-cl-fad" ,sbcl-cl-fad)
+       `(("python" ,python)
+         ("sbcl-cl-fad" ,sbcl-cl-fad)
         ("sbcl-lift" ,sbcl-lift)
         ("sbcl-cl-quickcheck" ,sbcl-cl-quickcheck)))
      (inputs
-       `(("python" ,python)
-         ("sbcl-cffi" ,sbcl-cffi)
+       `(("sbcl-cffi" ,sbcl-cffi)
         ("sbcl-cffi-grovel" ,sbcl-cffi-grovel)
         ("sbcl-alexandria" , sbcl-alexandria)
         ("sbcl-parse-declarations-1.0" ,sbcl-parse-declarations)
@@ -5127,6 +5126,7 @@ high-level way.  This library provides such operators.")
       "This package provides a shim between Python3 (specifically, the
 CPython implementation of Python) and Common Lisp.")
      (home-page "https://github.com/snmsts/burgled-batteries3")
+      ;; MIT
      (license license:expat))))

 (define-public cl-burgled-batteries3
@@ -5503,7 +5503,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
      (native-inputs
       `(("fiveam" ,sbcl-fiveam)))
      (synopsis "IEEE 754 binary representation for floats in Common Lisp")
-      (description "This is a Common Lisp library that converts
+      (description "This is a Common Lisp library that allows to convert
 floating point values to IEEE 754 binary representation.")
      (license license:bsd-3))))

@@ -6417,7 +6417,7 @@ power of CXML is available when necessary.")
         ("cl-xmlspam" ,sbcl-cl-xmlspam)
         ("ironclad" ,sbcl-ironclad)))
      (synopsis "D-Bus client library for Common Lisp")
-      (description "This is a Common Lisp library that publishes D-Bus
+      (description "This is a Common Lisp library that allows to publish D-Bus
 objects as well as send and notify other objects connected to a bus.")
      (license license:bsd-2))))

@@ -11313,42 +11313,3 @@ in DEFPACKAGE.")

 (define-public cl-trivial-package-local-nicknames
  (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames))
-
-(define-public sbcl-enchant
-  (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa"))
-    (package
-      (name "sbcl-enchant")
-      (version (git-version "0.0.0" "1" commit))
-      (home-page "https://github.com/tlikonen/cl-enchant")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url home-page)
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "19yh5ihirzi1d8xqy1cjqipzd6ly3245cfxa5s9xx496rryz0s01"))))
-      (build-system asdf-build-system/sbcl)
-      (inputs
-       `(("enchant" ,enchant)
-         ("cffi" ,sbcl-cffi)))
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'fix-paths
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "load-enchant.lisp"
-                 (("libenchant")
-                  (string-append
-                   (assoc-ref inputs "enchant") "/lib/libenchant-2"))))))))
-      (synopsis "Common Lisp interface for the Enchant spell-checker library")
-      (description
-       "Enchant is a Common Lisp interface for the Enchant spell-checker
-library.  The Enchant library is a generic spell-checker library which uses
-other spell-checkers transparently as back-end.  The library supports the
-multiple checkers, including Aspell and Hunspell.")
-      (license license:public-domain))))
-
-(define-public cl-enchant
-  (sbcl-package->cl-source-package sbcl-enchant))
@@ -816,7 +816,7 @@ SOURCE-FILES found in SOURCE-PACKAGE."
                  (string-append clang "/bin/clang-format"))))
             #t)))))
    (synopsis "Format code using clang-format")
-    (description "This package filters code through @code{clang-format}
+    (description "This package allows to filter code through @code{clang-format}
 to fix its formatting.  @code{clang-format} is a tool that formats
 C/C++/Obj-C code according to a set of style options, see
@url{https://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")))
@@ -570,8 +570,8 @@ optimizing, and searching weighted finite-state transducers (FSTs).")
    (synopsis "Machine learning toolbox")
    (description
     "The Shogun Machine learning toolbox provides a wide range of unified and
-efficient Machine Learning (ML) methods.  The toolbox seamlessly
-combines multiple data representations, algorithm classes, and general purpose
+efficient Machine Learning (ML) methods.  The toolbox seamlessly allows to
+combine multiple data representations, algorithm classes, and general purpose
 tools.  This enables both rapid prototyping of data pipelines and extensibility
 in terms of new algorithms.")
    (license license:gpl3+)))
@@ -4985,7 +4985,7 @@ cubes.")
       ("pkg-config" ,pkg-config)))
    (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php")
    (synopsis "Distributed and Unified Numerics Environment")
-    (description "The dune-subgrid module marks elements of
+    (description "The dune-subgrid module allows to mark elements of
 another hierarchical dune grid.  The set of marked elements can then be
 accessed as a hierarchical dune grid in its own right.  Dune-Subgrid
 provides the full grid interface including adaptive mesh refinement.")
@@ -5452,7 +5452,7 @@ researchers and developers alike to get started on SAT.")
 It provides basic and advanced functionality.  Features include customizable
 functions, unit calculations, and conversions, physical constants, symbolic
 calculations (including integrals and equations), arbitrary precision,
-uncertainty propagation, interval arithmetic, plotting and a user-friendly
+uncertainity propagation, interval arithmetic, plotting and a user-friendly
 cli.")
    (license license:gpl2+)))

@@ -20,7 +20,6 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages check)
  #:use-module (gnu packages databases)
-  #:use-module (gnu packages monitoring)
  #:use-module (gnu packages python-crypto)
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
-;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
@@ -728,52 +728,68 @@ on Axolotl and PEP.")
    (license license:gpl3+)))

 (define-public dino
-  (package
-    (name "dino")
-    (version "0.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/dino/dino/releases/download/v"
-                           version "/dino-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0dcq2jhpywgxrp9x1qqmrl2z50hazspqj547b9zz70apy3y4418h"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:tests? #f
-       #:parallel-build? #f ; not supported
-       #:modules ((guix build cmake-build-system)
-                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
-                  (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
-                           (guix build cmake-build-system)
-                           (guix build glib-or-gtk-build-system))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'glib-or-gtk-wrap
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
-    (inputs
-     `(("libgee" ,libgee)
-       ("libsignal-protocol-c" ,libsignal-protocol-c)
-       ("libgcrypt" ,libgcrypt)
-       ("libsoup" ,libsoup)
-       ("qrencode" ,qrencode)
-       ("sqlite" ,sqlite-with-column-metadata)
-       ("gpgme" ,gpgme)
-       ("gtk+" ,gtk+)
-       ("glib-networking" ,glib-networking)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("glib" ,glib "bin")
-       ("vala" ,vala)
-       ("gettext" ,gettext-minimal)))
-    (home-page "https://dino.im")
-    (synopsis "Graphical Jabber (XMPP) client")
-    (description "Dino is a Jabber (XMPP) client which aims to fit well into
+  ;; The only release tarball is for version 0.0, but it is very old and fails
+  ;; to build.
+  (let ((commit "8e14ac6d714b7f88e16de31a6c795e811dc27417")
+        (revision "4"))
+    (package
+      (name "dino")
+      (version (git-version "0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/dino/dino.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0xfmwnc2f8lsvmp7m8ggikzqjaw5z6wmxrv6j5ljha5ckffrdd9m"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:tests? #f ; there are no tests
+         #:parallel-build? #f ; not supported
+         ; Use our libsignal-protocol-c instead of the git submodule.
+         #:configure-flags '("-DSHARED_SIGNAL_PROTOCOL=yes")
+         #:modules ((guix build cmake-build-system)
+                    ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                    (guix build utils))
+         #:imported-modules (,@%gnu-build-system-modules
+                             (guix build cmake-build-system)
+                             (guix build glib-or-gtk-build-system))
+         #:phases
+         (modify-phases %standard-phases
+           ;; The signal-protocol plugin accesses internal headers of
+           ;; libsignal-protocol-c, so we need to put the sources there.
+           (add-after 'unpack 'unpack-sources
+             (lambda* (#:key inputs #:allow-other-keys)
+               (with-directory-excursion "plugins/signal-protocol/libsignal-protocol-c"
+                 (invoke "tar" "xvf"
+                         (assoc-ref inputs "libsignal-protocol-c-source")
+                         "--strip-components=1"))))
+           (add-after 'install 'glib-or-gtk-wrap
+             (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+      (inputs
+       `(("libgee" ,libgee)
+         ("libsignal-protocol-c" ,libsignal-protocol-c)
+         ("libgcrypt" ,libgcrypt)
+         ("libsoup" ,libsoup)
+         ("qrencode" ,qrencode)
+         ("sqlite" ,sqlite-with-column-metadata)
+         ("gpgme" ,gpgme)
+         ("gtk+" ,gtk+)
+         ("glib-networking" ,glib-networking)
+         ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c))
+         ("glib" ,glib "bin")
+         ("vala" ,vala)
+         ("gettext" ,gettext-minimal)))
+      (home-page "https://dino.im")
+      (synopsis "Graphical Jabber (XMPP) client")
+      (description "Dino is a Jabber (XMPP) client which aims to fit well into
 a graphical desktop environment like GNOME.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define-public prosody
  (package
@@ -5,7 +5,6 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -372,13 +371,14 @@ demand.")
 (define-public python-prometheus-client
  (package
    (name "python-prometheus-client")
-    (version "0.7.1")
+    (version "0.5.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "prometheus_client" version))
       (sha256
-        (base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi"))))
+        (base32
+         "0g7rpv1pq2lab1nfqdx98z9d3bqwc400alg1j4ynrpjkrbsizhg8"))))
    (build-system python-build-system)
    (arguments
     '(;; No included tests.
@@ -26,7 +26,6 @@
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2672,7 +2671,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
 (define-public pianobar
  (package
    (name "pianobar")
-    (version "2020.04.05")
+    (version "2019.02.14")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2681,7 +2680,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1gq8kpks6nychqz4gf0rpy7mrhz5vjw48a60x56j6y9flmazmypw"))))
+                "1bfabkj3m9kmhxl64w4azmi0xf7w52fmqfbw2ag28hbb5yy01k1m"))))
    (build-system gnu-build-system)
    (arguments
     `(#:tests? #f                      ; no tests
@@ -30,13 +30,13 @@
 (define-public nano
  (package
    (name "nano")
-    (version "4.9.2")
+    (version "4.9")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
      (sha256
-       (base32 "1xifbn1xaklrrf7knxvqif0hy0wgnas7w0wfggay5kifjkm5x8nq"))))
+       (base32 "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f"))))
    (build-system gnu-build-system)
    (inputs
     `(("gettext" ,gettext-minimal)
@@ -1179,7 +1179,7 @@ GNU CC attributes.  It provides also a C pretty printer as an example of use.")
    (home-page "https://github.com/c-cube/qcheck")
    (synopsis "QuickCheck inspired property-based testing for OCaml")
    (description "QuickCheck inspired property-based testing for OCaml. This
-module checks invariants (properties of some types) over randomly
+module allows to check invariants (properties of some types) over randomly
 generated instances of the type. It provides combinators for generating
 instances and printing them.")
    (license license:lgpl3+)))
@@ -1534,7 +1534,7 @@ manipulate such data.")
         (delete 'configure))))
    (home-page "http://erratique.ch/software/mtime")
    (synopsis "Monotonic wall-clock time for OCaml")
-    (description "Access monotonic wall-clock time.  It measures time
+    (description "Access monotonic wall-clock time.  It allows to measure time
 spans without being subject to operating system calendar time adjustments.")
    (license license:isc)))

@@ -2266,7 +2266,7 @@ radix-64 representation.  It is specified in RFC 4648.")
     `(("ocamlbuild" ,ocamlbuild)))
    (home-page "https://forge.ocamlcore.org/projects/ocamlify")
    (synopsis "Include files in OCaml code")
-    (description "OCamlify creates OCaml source code by including
+    (description "OCamlify allows to create OCaml source code by including
 whole files into OCaml string or string list.  The code generated can be
 compiled as a standard OCaml file.  It allows embedding external resources as
 OCaml code.")
@@ -12,7 +12,7 @@
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
@@ -119,7 +119,7 @@ human.")
 (define-public keepassxc
  (package
    (name "keepassxc")
-    (version "2.5.4")
+    (version "2.5.3")
    (source
     (origin
       (method url-fetch)
@@ -127,7 +127,7 @@ human.")
                           "/releases/download/" version "/keepassxc-"
                           version "-src.tar.xz"))
       (sha256
-        (base32 "0jndssyvpl8bc5i2q3d6kq1ppynchxx9nvp1qhd2pc0qqc0hhpm5"))))
+        (base32 "1sx647mp1xikig50p9bb6vxv18ymdfj3wkxj6qfdr1zfcv7gn005"))))
    (build-system cmake-build-system)
    (arguments
     '(#:configure-flags '("-DWITH_XC_ALL=YES"
@@ -846,8 +846,8 @@ winner of the 2015 Password Hashing Competition.")
       ("python-pytest-mock" ,python-pytest-mock)))
    (home-page "https://github.com/languitar/pass-git-helper")
    (synopsis "Git credential helper interfacing with pass")
-    (description "pass-git-helper is a git credential helper which
-uses pass, the standard unix password manager, as the credential backend for
+    (description "pass-git-helper is a git credential helper which allows to
+use pass, the standard unix password manager, as the credential backend for
 your git repositories.  This is achieved by explicitly defining mappings
 between hosts and entries in the password store.")
    (license license:lgpl3+)))
@@ -1,36 +0,0 @@
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Sat, 11 Apr 2020 03:02:04 +0200
-Subject: [PATCH] gnu: dbacl: Include <locale.h> in dbacl.h.
-
-Copied verbatim[0] from Debian.
-
-[0]: https://sources.debian.org/data/main/d/dbacl/1.14.1-2/debian/patches/05-locale-h.patch
-
-Description: Add missing <locale.h> include in dbacl.h
-Author: Fabian Wolff <fabi.wolff@arcor.de>
-Bug-Debian: https://bugs.debian.org/916182
-Last-Update: 2019-08-25
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/dbacl.h
-+++ b/src/dbacl.h
-@@ -21,6 +21,8 @@
- #ifndef DBACL_H
- #define DBACL_H
- 
-+#include <locale.h>
-+
- #ifdef HAVE_CONFIG_H
- #undef HAVE_CONFIG_H
- #include "config.h"
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,7 @@
- # stuff_SOURCES = stuff.c stuff.h fram.c stuff-lexer.l stuff-parser.y stuff-parser.h probs.c util.c util.h $(PUBDOM)
- # stuff_LDADD = @LEXLIB@
- 
-AM_CFLAGS = -funsigned-char -std=c99 -Wall -pedantic $(CFLAGSIEEE) -O3
-+AM_CFLAGS = -funsigned-char -std=c99 -D_XOPEN_SOURCE=700 -Wall -pedantic $(CFLAGSIEEE) -O3
- AM_YFLAGS = -d
- 
- CLEANFILES = mailcross mailtoe mailfoot 
@@ -135,7 +135,7 @@ where Flyer Composer steps in, creating a PDF which holds your flyer four
 times.  If you have a second page, Flyer Composer can arrange it the same way
 - even if the second page is in a separate PDF file.

-This package contains both the command line tool and the gui too.")
+This package contains both the commnd line tool and the gui too.")
    (license license:agpl3+)))

 (define-public flyer-composer-cli
@@ -162,7 +162,7 @@ where Flyer Composer steps in, creating a PDF which holds your flyer four
 times.  If you have a second page, Flyer Composer can arrange it the same way
 - even if the second page is in a separate PDF file.

-This package contains only the command line tool.  If you like to use the gui,
+This package contains only the commnd line tool.  If you like to use the gui,
 please install the @code{flyer-composer-gui} package.")))

 (define-public poppler
@@ -885,7 +885,7 @@ Xournal++ features:
@item Fill shape functionality
@item PDF Export (with and without paper style)
@item PNG Export (with and without transparent background)
-@item Map different tools / colors etc. to stylus buttons /
+@item Allow to map different tools / colors etc. to stylus buttons /
 mouse buttons
@item Sidebar with Page Previews with advanced page sorting, PDF
 Bookmarks and Layers (can be individually hidden, editing layer can be
@@ -352,7 +352,7 @@ sometimes even without using a single syscall.")
    (build-system perl-build-system)
    (home-page "https://metacpan.org/pod/Attribute::Util")
    (synopsis "Assorted general utility attributes")
-    (description "This package provides various utility functions.  When used
+    (description "This packages provides various utility functions.  When used
 without argument, this module provides four universally accessible attributes
 of general interest as follows:
@itemize
@@ -195,6 +195,9 @@ routines such as routines for numerical integration and optimization.")
     "Scikit-image is a collection of algorithms for image processing.")
    (license license:bsd-3)))

+(define-public python2-scikit-image
+  (package-with-python2 python-scikit-image))
+
 (define-public python-pandas
  (package
    (name "python-pandas")
@@ -1774,13 +1774,13 @@ minimum of WSGI.")
 (define-public python-flask
  (package
    (name "python-flask")
-    (version "1.1.2")
+    (version "1.1.1")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "Flask" version))
              (sha256
               (base32
-                "0q3h295izcil7lswkzfnyg3k5gq4hpmqmpl6i7s5m1n9szi1myjf"))))
+                "0ljdjgyjn7vh8ic1n1dc2l1cl421i6pr3kx5sz2w5irhyfbg3y8k"))))
    (build-system python-build-system)
    (arguments
     '(#:phases
@@ -2672,7 +2672,7 @@ for Flask programs that are using @code{python-alembic}.")
 (define-public python-genshi
  (package
    (name "python-genshi")
-    (version "0.7.3")
+    (version "0.7.2")
    (source
     (origin
       (method git-fetch)
@@ -2681,7 +2681,7 @@ for Flask programs that are using @code{python-alembic}.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04bw7nd4wyn8ixnhik57hny2xpjjpn80k5hp6691inix5gc6rxaf"))))
+        (base32 "06rch30x10l105k5b6rahd839lkhmgrzn6691wbci0cb2fzps32w"))))
    (build-system python-build-system)
    (home-page "https://genshi.edgewall.org/")
    (synopsis "Toolkit for generation of output for the web")
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
 ;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015, 2016, 2020 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
@@ -981,17 +981,8 @@ to rebuild the original object tree.

 Because only safe literals are encoded, it is safe to send serpent data to
 other machines, such as over the network.")
-    (properties `((python2-variant . ,(delay python2-serpent))))
    (license license:expat)))

-(define-public python2-serpent
-  (let ((base (package-with-python2 (strip-python2-variant python-serpent))))
-    (package
-      (inherit base)
-      (propagated-inputs
-       `(("python-enum34" ,python2-enum34)
-         ,@(package-propagated-inputs base))))))
-
 (define-public python-setuptools
  (package
    (name "python-setuptools")
@@ -2822,7 +2813,8 @@ environments and back.")
     "PyYAML is a YAML parser and emitter for Python.  PyYAML features a
 complete YAML 1.1 parser, Unicode support, pickle support, capable extension
 API, and sensible error messages.  PyYAML supports standard YAML tags and
-provides Python-specific tags that represent an arbitrary Python object.")
+provides Python-specific tags that allow to represent an arbitrary Python
+object.")
    (license license:expat)))

 (define-public python2-pyyaml
@@ -3551,7 +3543,7 @@ receive files via the SCP1 protocol, as implemented by the OpenSSH
    ;; Note: As of version 1.7 the documentation is not worth building.
    (home-page "https://github.com/jaraco/rst.linker")
    (synopsis "Sphinx plugin to add links and timestamps")
-    (description "rst.linker automatically replaces text by a
+    (description "rst.linker allows to automatically replace text by a
 reStructuredText external reference or timestamps.  It's primary purpose is to
 augment the changelog, but it can be used for other documents, too.")
    (license license:expat)))
@@ -6781,14 +6773,14 @@ of the structure, dynamics, and functions of complex networks.")
 (define-public python-datrie
  (package
    (name "python-datrie")
-    (version "0.8.2")
+    (version "0.8")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "datrie" version))
       (sha256
        (base32
-         "0pbn32flkrpjiwfcknmj6398qa81ba783kbcvwan3kym73v0hnsj"))))
+         "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx"))))
    (build-system python-build-system)
    (native-inputs
     `(("python-cython" ,python-cython)
@@ -11673,14 +11665,14 @@ until the object is actually required, and caches the result of said call.")
 (define-public python-dnspython
  (package
  (name "python-dnspython")
-  (version "1.16.0")
+  (version "1.15.0")
  (source (origin
            (method url-fetch)
            (uri (string-append "http://www.dnspython.org/kits/"
                                version "/dnspython-" version ".tar.gz"))
            (sha256
             (base32
-              "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+              "0jr4v2pd90i6l1xxbss2m05psbjaxvyvvvpq44wycijpfgjqln8i"))))
  (build-system python-build-system)
  (arguments '(#:tests? #f)) ; XXX: requires internet access
  (home-page "http://www.dnspython.org")
@@ -12657,7 +12649,7 @@ by system tools such as ps and top).

 Changing the title is mostly useful in multi-process systems, for
 example when a master process is forked: changing the children's title
-allows identifying the task each process is busy with.  The technique
+allows to identify the task each process is busy with.  The technique
 is used by PostgreSQL and the OpenSSH Server for example.")
  (license license:bsd-3)
  (properties `((python2-variant . ,(delay python2-setproctitle))))))
@@ -17121,35 +17113,26 @@ pure-Python.")
 (define-public python-cloudpickle
  (package
    (name "python-cloudpickle")
-    (version "1.3.0")
+    (version "0.6.1")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "cloudpickle" version))
       (sha256
        (base32
-         "0lx7gy9clp427qwcm7b23zdsldpr03gy3vxxhyi8fpbhwz859brq"))))
+         "1wdw89mlm7fqa3fm3ymskx05jrys66n8m1z1a8s0mss0799ahsgi"))))
    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'do-not-override-PYTHONPATH
-                    (lambda _
-                      ;; Append to PYTHONPATH instead of overriding it so
-                      ;; that dependencies from Guix can be found.
-                      (substitute* "tests/testutils.py"
-                        (("env\\['PYTHONPATH'\\] = pythonpath")
-                         "env['PYTHONPATH'] += os.pathsep + pythonpath"))
-                      #t))
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (if tests?
-                          (invoke "pytest" "-s" "-vv")
-                          (format #t "test suite not run~%"))
-                      #t)))))
+    ;; FIXME: there are 5 errors in 122 tests:
+    ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.CloudPickleTest)
+    ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.CloudPickleTest)
+    ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.Protocol2CloudPickleTest)
+    ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.Protocol2CloudPickleTest)
+    ;; ERROR: test_temp_file (tests.cloudpickle_file_test.CloudPickleFileTests)
+    ;; TypeError: cannot serialize '_io.BufferedRandom' object
+    (arguments '(#:tests? #f))
    (native-inputs
-     `(;; For tests.
-       ("python-psutil" ,python-psutil)
-       ("python-pytest" ,python-pytest)
+     `(("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)
       ("python-tornado" ,python-tornado)))
    (home-page "https://github.com/cloudpipe/cloudpickle")
    (synopsis "Extended pickling support for Python objects")
@@ -17159,19 +17142,10 @@ supported by the default pickle module from the Python standard library.  It
 is especially useful for cluster computing where Python expressions are
 shipped over the network to execute on remote hosts, possibly close to the
 data.")
-    (properties `((python2-variant . ,(delay python2-cloudpickle))))
    (license license:bsd-3)))

 (define-public python2-cloudpickle
-  (let ((base (package-with-python2 (strip-python2-variant python-cloudpickle))))
-    (package
-      (inherit base)
-      (native-inputs
-       `(("python-mock" ,python2-mock)
-         ,@(package-native-inputs base)))
-      (propagated-inputs
-       `(("python-futures" ,python2-futures)
-         ,@(package-propagated-inputs base))))))
+  (package-with-python2 python-cloudpickle))

 (define-public python-locket
  (package
@@ -17282,13 +17256,13 @@ decisions with any given backend.")
 (define-public python-dask
  (package
    (name "python-dask")
-    (version "2.14.0")
+    (version "2.9.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "dask" version))
       (sha256
-        (base32 "031j0j26s0675v0isyps2dphm03330n7dy8ifdy70jgvf78d119q"))))
+        (base32 "1w1hqr8vyx6ygwflj2737dcy0mmgvrc0s602gnny8pzlcbs9m76b"))))
    (build-system python-build-system)
    (arguments
     `(#:phases
@@ -18753,29 +18727,6 @@ dedicated platform.  The tool proposes a unified interface for any format and
 an upload option to send your work back to the platform.")
    (license license:gpl3+)))

-(define-public python-titlecase
-  (package
-    (name "python-titlecase")
-    (version "0.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "titlecase" version))
-       (sha256
-        (base32
-         "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4"))))
-    (build-system python-build-system)
-    (native-inputs
-     `(("python-nose" ,python-nose)))
-    (home-page "https://github.com/ppannuto/python-titlecase")
-    (synopsis "Capitalize strings similar to book titles")
-    (description
-     "Python-Titlecase is a Python port of John Gruber's titlecase.pl.
-It capitalizes (predominantly English) strings in a way that is similar to
-book titles, using the New York Times Manual of Style to leave certain words
-lowercase.")
-    (license license:expat)))
-
 (define-public python-pypng
  (package
    (name "python-pypng")
@@ -19027,7 +18978,7 @@ logging in Python.  It also provides some custom formatters and handlers.")
    (home-page "https://github.com/jd/pifpaf")
    (synopsis "Tools and fixtures to manage daemons for testing in Python")
    (description "Pifpaf is a suite of fixtures and a command-line tool that
-starts and stops daemons for a quick throw-away usage.  This is typically
+allows to start and stop daemons for a quick throw-away usage.  This is typically
 useful when needing these daemons to run integration testing.  It originally
 evolved from its precursor @code{overtest}.")
    (license license:asl2.0)))
@@ -19235,6 +19186,28 @@ simple and fast to verify, and decouple authorization policy from the
 enforcement of that policy.")
    (license license:expat)))

+(define-public python-prometheus-client
+  (package
+    (name "python-prometheus-client")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "prometheus_client" version))
+       (sha256
+        (base32 "1ni2yv4ixwz32nz39ckia76lvggi7m19y5f702w5qczbnfi29kbi"))))
+    (build-system python-build-system)
+    (arguments
+     ;; TODO: No tests in the PyPI distribution.
+     `(#:tests? #f))
+    (propagated-inputs
+     `(("python-twisted" ,python-twisted)))
+    (home-page "https://github.com/prometheus/client_python")
+    (synopsis "Prometheus instrumentation library")
+    (description
+     "This is the official Python client for the Prometheus monitoring server.")
+    (license license:asl2.0)))
+
 (define-public python-ldap3
  (package
    (name "python-ldap3")
@@ -19477,24 +19450,3 @@ an identity provider.  The distribution contains examples of both.
 This package was originally written to work in a WSGI environment, but
 there are extensions that allow you to use it with other frameworks.")
    (license license:asl2.0)))
-
-(define-public python-click-plugins
-  (package
-    (name "python-click-plugins")
-    (version "1.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "click-plugins" version))
-       (sha256
-        (base32 "0jr6bxj67vg988vkm6nz8jj98v9lg46bn49lkhak3n598jbrkas6"))))
-    (build-system python-build-system)
-    (native-inputs
-     `(("python-pytest" ,python-pytest)))
-    (propagated-inputs
-     `(("python-click" ,python-click)))
-    (synopsis "Extension for Click to register external CLI commands")
-    (description "This package provides n extension module for Click to
-register external CLI commands via setuptools entry-points.")
-    (home-page "https://github.com/click-contrib/click-plugins")
-    (license license:bsd-3)))
@@ -2040,10 +2040,7 @@ contain over 620 classes.")
       ("qtwebengine" ,qtwebengine)))
    (arguments
     `(#:modules ((srfi srfi-1)
-                  ((guix build python-build-system) #:select (python-version))
                  ,@%gnu-build-system-modules)
-       #:imported-modules ((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
       #:phases
       (modify-phases %standard-phases
         (replace 'configure
@@ -2053,8 +2050,13 @@ contain over 620 classes.")
                    (pyqt-sipdir (string-append
                                  (assoc-ref inputs "python-pyqt") "/share/sip"))
                    (python (assoc-ref inputs "python"))
+                    (python-version
+                     (last (string-split python #\-)))
+                    (python-major+minor
+                     (string-join
+                      (take (string-split python-version #\.) 2) "."))
                    (lib (string-append out "/lib/python"
-                                        (python-version python)
+                                        python-major+minor
                                        "/site-packages/PyQt5"))
                    (stubs (string-append lib "/PyQt5")))

@@ -2073,9 +2075,7 @@ contain over 620 classes.")
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((__init__.py (string-append
                                  (assoc-ref outputs "out")
-                                  "/lib/python"
-                                  (python-version (assoc-ref inputs "python"))
-                                  "/site-packages/PyQt5/__init__.py")))
+                                  "/lib/python3.7/site-packages/PyQt5/__init__.py")))
               (with-output-to-file __init__.py
                 (lambda _ (display "
 from pkgutil import extend_path
@@ -1,514 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2019 Christopher Howard <christopher@librehacker.com>
-;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
-;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages radio)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (gnu packages algebra)
-  #:use-module (gnu packages audio)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages ghostscript)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gstreamer)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages libusb)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages logging)
-  #:use-module (gnu packages maths)
-  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-science)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt)
-  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages swig)
-  #:use-module (gnu packages tex)
-  #:use-module (gnu packages version-control)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system glib-or-gtk)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt))
-
-(define-public liquid-dsp
-  (package
-    (name "liquid-dsp")
-    (version "1.3.2")
-    (source
-     (origin (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/jgaeddert/liquid-dsp.git")
-                   (commit (string-append "v" version))))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)))
-    (inputs
-     `(("fftw" ,fftw)
-       ("fftwf" ,fftwf)))
-    (home-page "https://liquidsdr.org")
-    (synopsis "Signal processing library for software-defined radios")
-    (description
-     "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed
-specifically for software-defined radios on embedded platforms.  The aim is to
-provide a lightweight DSP library that does not rely on a myriad of external
-dependencies or proprietary and otherwise cumbersome frameworks.  All signal
-processing elements are designed to be flexible, scalable, and dynamic,
-including filters, filter design, oscillators, modems, synchronizers, complex
-mathematical operations, and much more.")
-    (license license:expat)))
-
-(define-public rtl-sdr
-  (package
-    (name "rtl-sdr")
-    (version "0.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "git://git.osmocom.org/rtl-sdr.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"))))
-    (build-system cmake-build-system)
-    (inputs
-     `(("libusb" ,libusb)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (arguments
-     `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON")
-       #:tests? #f)) ; No tests
-    (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr")
-    (synopsis "Software defined radio driver for Realtek RTL2832U")
-    (description "DVB-T dongles based on the Realtek RTL2832U can be used as a
-cheap software defined radio, since the chip allows transferring the raw I/Q
-samples to the host.  @code{rtl-sdr} provides drivers for this purpose.")
-    (license license:gpl2+)))
-
-(define-public chirp
-  (package
-    (name "chirp")
-    (version "20181205")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://trac.chirp.danplanet.com/chirp_daily/daily-"
-                           version "/chirp-daily-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1cp280b95j39xaxs50zn55jigg7pyfpm9n098hmsyxrplqn8z43c"))))
-    (build-system python-build-system)
-    (inputs
-     `(("python2-libxml2" ,python2-libxml2)
-       ("python2-pygtk" ,python2-pygtk)
-       ("python2-pyserial" ,python2-pyserial)))
-    (arguments
-     `(#:python ,python-2))
-    (home-page "https://chirp.danplanet.com")
-    (synopsis "Cross-radio programming tool")
-    (description "Chirp is a cross-radio programming tool.  It supports a
-growing list of radios across several manufacturers and allows transferring of
-memory contents between them.")
-    (license (list license:gpl3+
-                   license:lgpl3+)))) ; chirp/elib_intl.py
-
-(define-public aptdec
-  (package
-    (name "aptdec")
-    (version "1.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/csete/aptdec")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1hf0zb51qc6fyhdjxyij1n3vgwnw3cwksc3r11szbhkml14qjnzk"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("libpng" ,libpng)
-       ("libsndfile" ,libsndfile)))
-    (arguments
-     `(#:make-flags (list "CC=gcc")
-       #:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (install-file "atpdec" (string-append out "/bin")))
-             #t)))))
-    (home-page "https://github.com/csete/aptdec")
-    (synopsis "NOAA Automatic Picture Transmission (APT) decoder")
-    (description "Aptdec decodes Automatic Picture Transmission (APT) images.
-These are medium resolution images of the Earth transmitted by, among other
-satellites, the POES NOAA weather satellite series.  These transmissions are
-on a frequency of 137 MHz.  They can be received using an inexpensive antenna
-and a dedicated receiver.")
-    (license license:gpl2+)))
-
-(define-public redsea
-  (package
-    (name "redsea")
-    (version "0.18")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/windytan/redsea")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; The configure.ac file does not explicitly link against libiconv
-         ;; except on Mac OS, causing the build to fail. This phase comments
-         ;; out the original AC_SUBST macro (located inside a conditional) and
-         ;; adds an explicit use of it underneath, so that libiconv is always
-         ;; linked against.
-         (add-after 'unpack 'patch-libiconv
-           (lambda _
-             (substitute* "configure.ac"
-               (("^ +AC_SUBST")
-                "# AC_SUBST")
-               (("esac")
-                "esac\nAC_SUBST([ICONV], [\"-liconv\"])"))
-             #t)))))
-    (inputs
-     `(("libiconv" ,libiconv)
-       ("libsndfile" ,libsndfile)
-       ("liquid-dsp" ,liquid-dsp)))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)))
-    (home-page "https://github.com/windytan/redsea")
-    (synopsis "Lightweight RDS to JSON decoder")
-    (description "redsea is a lightweight command-line @dfn{FM Radio Data
-System} (FM-RDS) decoder.  Redsea can be used with any RTL-SDR USB radio stick
-with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via
-csdr, for example.  It can also decode raw ASCII bitstream, the hex format
-used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
-    (license license:expat)))
-
-(define-public gnuradio
-  (package
-    (name "gnuradio")
-    (version "3.8.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
-                           "gnuradio-" version ".tar.xz"))
-       (sha256
-        (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     `(("doxygen" ,doxygen)
-       ("git" ,git-minimal)
-       ("ghostscript" ,ghostscript)
-       ("orc" ,orc)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python)
-       ("python-cheetah" ,python-cheetah)
-       ("python-mako" ,python-mako)
-       ("python-pyzmq" ,python-pyzmq)
-       ("python-scipy" ,python-scipy)
-       ("python-sphinx" ,python-sphinx)
-       ("swig" ,swig)
-       ("texlive" ,(texlive-union (list texlive-amsfonts
-                                        texlive-latex-amsmath
-                                        ;; TODO: Add newunicodechar.
-                                        texlive-latex-graphics)))
-       ("xorg-server" ,xorg-server-for-tests)))
-    (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("boost" ,boost)
-       ("cairo" ,cairo)
-       ("codec2" ,codec2)
-       ("cppzmq" ,cppzmq)
-       ("fftwf" ,fftwf)
-       ("gmp" ,gmp)
-       ("gsl" ,gsl)
-       ("gsm" ,gsm)
-       ("gtk+" ,gtk+)
-       ("jack" ,jack-1)
-       ("log4cpp" ,log4cpp)
-       ("pango" ,pango)
-       ("portaudio" ,portaudio)
-       ("python-click" ,python-click)
-       ("python-click-plugins" ,python-click-plugins)
-       ("python-lxml" ,python-lxml)
-       ("python-numpy" ,python-numpy)
-       ("python-pycairo" ,python-pycairo)
-       ("python-pygobject" ,python-pygobject)
-       ("python-pyqt" ,python-pyqt)
-       ("python-pyyaml" ,python-pyyaml)
-       ("qtbase" ,qtbase)
-       ("qwt" ,qwt)
-       ("zeromq" ,zeromq)))
-    (arguments
-     `(#:modules ((guix build cmake-build-system)
-                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
-                  ((guix build python-build-system) #:prefix python:)
-                  (guix build utils)
-                  (ice-9 match))
-       #:imported-modules (,@%cmake-build-system-modules
-                           (guix build glib-or-gtk-build-system)
-                           (guix build python-build-system))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((qwt (assoc-ref inputs "qwt")))
-               (substitute* "cmake/Modules/FindQwt.cmake"
-                 (("/usr/include")
-                  (string-append qwt "/include"))
-                 (("/usr/lib")
-                  (string-append qwt "/lib"))
-                 (("qwt6-\\$\\{QWT_QT_VERSION\\}")
-                  "qwt")))
-             (substitute* "cmake/Modules/GrPython.cmake"
-               (("dist-packages")
-                "site-packages"))
-             (substitute* '("gr-vocoder/swig/vocoder_swig.i"
-                            "gr-vocoder/include/gnuradio/vocoder/codec2.h"
-                            "gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
-               (("<codec2/")
-                "<"))
-             #t))
-         (add-before 'check 'set-test-environment
-           (lambda* (#:key inputs #:allow-other-keys)
-             (setenv "HOME" "/tmp")
-             (system (string-append (assoc-ref inputs "xorg-server")
-                                    "/bin/Xvfb :1 &"))
-             (setenv "DISPLAY" ":1")
-             #t))
-         (add-after 'install 'wrap-python
-           (assoc-ref python:%standard-phases 'wrap))
-         (add-after 'wrap-python 'wrap-glib-or-gtk
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-         (add-after 'wrap-glib-or-gtk 'wrap-with-GI_TYPELIB_PATH
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (paths (map (match-lambda
-                                 ((output . directory)
-                                  (let ((girepodir (string-append
-                                                    directory
-                                                    "/lib/girepository-1.0")))
-                                    (if (file-exists? girepodir)
-                                        girepodir
-                                        #f))))
-                               inputs)))
-               (wrap-program (string-append out "/bin/gnuradio-companion")
-                 `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))
-             #t)))))
-    (synopsis "Toolkit for software-defined radios")
-    (description
-     "GNU Radio is a development toolkit that provides signal processing blocks
-to implement software radios.  It can be used with external RF hardware to
-create software-defined radios, or without hardware in a simulation-like
-environment.")
-    (home-page "https://www.gnuradio.org")
-    (license license:gpl3+)))
-
-(define-public gnuradio-osmosdr
-  (package
-    (name "gnuradio-osmosdr")
-    (version "0.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.osmocom.org/gr-osmosdr")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1rdx7fa0xiq0qmgrrbby7z1bblmqhl9qh9jqpsznzxkx91f17ypd"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     `(("doxygen" ,doxygen)
-       ("git" ,git-minimal)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python)
-       ("python-mako" ,python-mako)
-       ("python-six" ,python-six)
-       ("swig" ,swig)))
-    (inputs
-     `(("boost" ,boost)
-       ("fftwf" ,fftwf)
-       ("gmp" ,gmp)
-       ("gnuradio" ,gnuradio)
-       ("log4cpp" ,log4cpp)
-       ;; TODO: Add more drivers.
-       ("rtl-sdr" ,rtl-sdr)))
-    (synopsis "GNU Radio block for interfacing with various radio hardware")
-    (description "This is a block for GNU Radio allowing to use a common API
-to access different radio hardware.")
-    (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR")
-    (license license:gpl3+)))
-
-(define-public libosmo-dsp
-  (package
-    (name "libosmo-dsp")
-    (version "0.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.osmocom.org/libosmo-dsp")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00plihnpym1gkfpflah8il9463qxzm9kx2f07jyvbkszpj8viq5g"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("bash-minimal" ,bash-minimal)
-       ("doxygen" ,doxygen)
-       ("git" ,git-minimal)
-       ("libtool" ,libtool)
-       ("pkg-config" ,pkg-config)
-       ("texlive" ,(texlive-union (list texlive-amsfonts
-                                        texlive-latex-amsmath
-                                        ;; TODO: Add newunicodechar.
-                                        texlive-latex-graphics)))))
-    (inputs
-     `(("fftwf" ,fftwf)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "git-version-gen"
-               (("/bin/sh")
-                (string-append (assoc-ref inputs "bash")
-                               "/bin/bash")))
-             #t)))))
-    (synopsis "DSP primitives for SDR")
-    (description
-     "This a C-language library for common DSP (Digital Signal Processing)
-primitives for SDR (Software Defined Radio).")
-    (home-page "https://osmocom.org/projects/libosmo-dsp")
-    (license license:gpl2+)))
-
-(define-public gnuradio-iqbalance
-  (package
-    (name "gnuradio-iqbalance")
-    (version "0.38.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.osmocom.org/gr-iqbal")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ksagwz05p3b0702q7ljq7013xmp0ijp30my9z6s3p7ja8dj42s3"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     `(("doxygen" ,doxygen)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python)
-       ("python-numpy" ,python-numpy)
-       ("python-six" ,python-six)
-       ("swig" ,swig)))
-    (inputs
-     `(("boost" ,boost)
-       ("fftwf" ,fftwf)
-       ("gmp" ,gmp)
-       ("gnuradio" ,gnuradio)
-       ("libosmo-dsp" ,libosmo-dsp)
-       ("log4cpp" ,log4cpp)))
-    (synopsis "GNU Radio block to correct IQ imbalance")
-    (description
-     "This is a GNU Radio block to correct IQ imbalance in quadrature
-receivers.  It's composed of two main block:
-@itemize
-@item Fix: Given a phase and amplitude error, it will correct a complex signal.
-@item Optimize: Attempts to auto-detect the phase and amplitude error to feed
-to the fix block above.
-@end itemize")
-    (home-page "https://git.osmocom.org/gr-iqbal/")
-    (license license:gpl3+)))
-
-(define-public gqrx
-  (package
-    (name "gqrx")
-    (version "2.12.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/csete/gqrx.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00alf3q6y313xpx6p7v43vqsphd2x4am4q362lw21bcy9wc4jidw"))))
-    (build-system qt-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("boost" ,boost)
-       ("fftwf" ,fftwf)
-       ("gmp" ,gmp)
-       ("gnuradio" ,gnuradio)
-       ("gnuradio-iqbalance" ,gnuradio-iqbalance)
-       ("gnuradio-osmosdr" ,gnuradio-osmosdr)
-       ("jack" ,jack-1)
-       ("log4cpp" ,log4cpp)
-       ("portaudio" ,portaudio)
-       ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
-       ("qtsvg" ,qtsvg)))
-    (arguments
-     `(#:tests? #f)) ; No tests
-    (synopsis "Software defined radio receiver")
-    (description "Gqrx is a software defined radio (SDR) receiver implemented
-using GNU Radio and the Qt GUI toolkit.")
-    (home-page "https://gqrx.dk/")
-    (license license:gpl3+)))
@@ -1771,8 +1771,8 @@ the output produced by running shell commands.")
       ("ruby-nenv" ,ruby-nenv)))
    (native-inputs
     `(("bundler" ,bundler)))
-    (synopsis "Wrapper library for notification libraries")
-    (description "Notiffany is a Ruby wrapper library for notification
+    (synopsis "Wrapper libray for notification libraries")
+    (description "Notiffany is a Ruby wrapper libray for notification
 libraries such as Libnotify.")
    (home-page "https://github.com/guard/notiffany")
    (license license:expat)))
@@ -331,7 +331,7 @@ coefficients of which are modular integers.")
 (define-public brial
  (package
    (name "brial")
-    (version "1.2.8")
+    (version "1.2.7")
    (source
    (origin
      (method git-fetch)
@@ -340,7 +340,7 @@ coefficients of which are modular integers.")
             (commit version)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y"))))
+       (base32 "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("autoconf" ,autoconf)
@@ -345,12 +345,14 @@ SDL.")
             "SDL_Pango-" version  ".tar.gz"))
       (sha256
        (base32 "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"))
-       (patches (search-patches "sdl-pango-api_additions.patch"
-                                "sdl-pango-blit_overflow.patch"
-                                "sdl-pango-fillrect_crash.patch"
-                                "sdl-pango-header-guard.patch"
-                                "sdl-pango-matrix_declarations.patch"
-                                "sdl-pango-sans-serif.patch"))))
+       (patches
+        (search-patches
+         "sdl-pango-api_additions.patch"
+         "sdl-pango-blit_overflow.patch"
+         "sdl-pango-fillrect_crash.patch"
+         "sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch"
+         "sdl-pango-matrix_declarations.patch"
+         "sdl-pango-sans-serif.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags (list "--disable-static")
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Christopher Howard <christopher@librehacker.com>
+;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages sdr)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools))
+
+(define-public liquid-dsp
+  (package
+    (name "liquid-dsp")
+    (version "1.3.2")
+    (source
+     (origin (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/jgaeddert/liquid-dsp.git")
+                   (commit (string-append "v" version))))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32 "1n6dbg13q8ga5qhg1yiszwly4jj0rxqr6f1xwm9waaly5z493xsd"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)))
+    (inputs
+     `(("fftw" ,fftw)
+       ("fftwf" ,fftwf)))
+    (home-page "https://liquidsdr.org")
+    (synopsis "Signal processing library for software-defined radios")
+    (description
+     "Liquid DSP is a @dfn{digital signal processing} (DSP) library designed
+specifically for software-defined radios on embedded platforms.  The aim is to
+provide a lightweight DSP library that does not rely on a myriad of external
+dependencies or proprietary and otherwise cumbersome frameworks.  All signal
+processing elements are designed to be flexible, scalable, and dynamic,
+including filters, filter design, oscillators, modems, synchronizers, complex
+mathematical operations, and much more.")
+    (license license:expat)))
@@ -72,7 +72,7 @@
 (define-public libssh
  (package
    (name "libssh")
-    (version "0.9.4")
+    (version "0.9.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -80,7 +80,7 @@
                     (commit (string-append "libssh-" version))))
              (sha256
               (base32
-                "0qr4vi3k1wv69c95d9j26fiv78pzyksaq8ccd76b8nxar5z1fbj6"))
+                "175i3xybg69d5lb078334v6dd3njm743kww8f67ix9w33969rmzf"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (outputs '("out" "debug"))
@@ -1505,7 +1505,7 @@ understand the language at a deeper level.")
    (home-page "https://github.com/hadley/memoise")
    (synopsis "Memoise functions for R")
    (description
-     "This R package caches the results of a function so that when
+     "This R package allows to cache the results of a function so that when
 you call it again with the same arguments it returns the pre-computed value.")
    (license license:expat)))

@@ -4781,7 +4781,7 @@ can be efficiently implemented directly in the R language.")
    (home-page "http://robustbase.r-forge.r-project.org/")
    (synopsis "Basic robust statistics")
    (description
-     "This package analyzes data with robust methods such as
+     "This package allows to analyze data with robust methods such as
 regression methodology including model selections and multivariate statistics.")
    (license license:gpl2+)))

@@ -5257,7 +5257,7 @@ to Applied regression, Second Edition, Sage, 2011.")
    (home-page "https://github.com/kforner/rcpp_progress")
    (synopsis "Interruptible progress bar for C++ in R packages")
    (description
-     "This package displays a progress bar in the R console for long running
+     "This package allows to display a progress bar in the R console for long running
 computations taking place in C++ code, and support for interrupting those computations
 even in multithreaded code, typically using OpenMP.")
    (license license:gpl3+)))
@@ -1,8 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Petter <petter@mykolab.ch>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,7 +30,7 @@
 (define-public syncthing
  (package
    (name "syncthing")
-    (version "1.4.2")
+    (version "1.4.1")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/syncthing/syncthing"
@@ -40,7 +38,7 @@
                                  "/syncthing-source-v" version ".tar.gz"))
              (sha256
               (base32
-                "16dqpbn4saxmmmqd5ya8zdkwvxzz4nim1p4w954zkkdz3cyg86h6"))
+                "0p1855n29rin2y8bjvmr7gkm18xd2j7js15l8nqcmyd33d60568z"))
              (modules '((guix build utils)))
              ;; Delete bundled ("vendored") free software source code.
              (snippet '(begin
@@ -99,7 +97,7 @@
       ("go-github-com-lucas-clemente-quic-go" ,go-github-com-lucas-clemente-quic-go)
       ("go-github-com-willf-bloom" ,go-github-com-willf-bloom)

-       ;; For tests.
+       ;; For tests
       ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff)))

    (arguments
@@ -1023,27 +1021,29 @@ quoting, commenting, and escaping.")
      (license asl2.0))))

 (define-public go-github-com-audriusbutkevicius-pfilter
-  (package
-    (name "go-github-com-audriusbutkevicius-pfilter")
-    (version "0.0.5")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/AudriusButkevicius/pfilter.git")
-               (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32
-          "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/AudriusButkevicius/pfilter"))
-    (synopsis "Filter packets into multiple virtual connections")
-    (description "Pfilter is a Go package for filtering packets into multiple
+  (let ((commit "c55ef6137fc6f075801eac099cc2687ede0f101d")
+        (revision "3"))
+    (package
+      (name "go-github-com-audriusbutkevicius-pfilter")
+      (version (git-version "0.0.0" revision commit))
+      (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                 (url "https://github.com/AudriusButkevicius/pfilter.git")
+                 (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32
+            "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/AudriusButkevicius/pfilter"))
+      (synopsis "Filter packets into multiple virtual connections")
+      (description "Pfilter is a Go package for filtering packets into multiple
 virtual connections from a single physical connection.")
-    (home-page "https://github.com/AudriusButkevicius/pfilter")
-    (license expat)))
+      (home-page "https://github.com/AudriusButkevicius/pfilter")
+      (license expat))))

 (define-public go-github-com-ccding-go-stun
  (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6")
@@ -9,7 +9,6 @@
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,14 +30,12 @@
  #:use-module (guix download)
  #:use-module (guix git-download)
  #:use-module (guix utils)
-  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system python)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages)
-  #:use-module (gnu packages aspell)
  #:use-module (gnu packages assembly)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages boost)
@@ -52,7 +49,6 @@
  #:use-module (gnu packages haskell-xyz)
  #:use-module (gnu packages libbsd)
  #:use-module (gnu packages libreoffice)
-  #:use-module (gnu packages llvm)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages pcre)
@@ -65,7 +61,6 @@
  #:use-module (gnu packages ruby)
  #:use-module (gnu packages terminals)
  #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages version-control)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg))

@@ -192,97 +187,6 @@ interface similar to many user-friendly editors.  JOE has some of the key
 bindings and many of the powerful features of GNU Emacs.")
    (license license:gpl3+)))

-(define-public jucipp
-  (package
-    (name "jucipp")
-    (version "1.5.1")
-    (home-page "https://gitlab.com/cppit/jucipp")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference (url home-page)
-                                  (commit (string-append "v" version))
-                                  ;; Two submodules are required which are
-                                  ;; developed alongside JuCi++ and difficult
-                                  ;; to package separately.
-                                  (recursive? #t)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:configure-flags '("-DBUILD_TESTING=ON"
-
-                           ;; These arguments are here to facilitate an "in-source"
-                           ;; build using "./build" instead of the default "../build".
-                           ;; The test suite expects that to be the case.
-                           "..")
-       #:out-of-source? #f
-       #:phases (modify-phases %standard-phases
-                  (add-before 'configure 'enter-build-directory
-                    (lambda _
-                      (mkdir "build")
-                      (chdir "build")
-                      #t))
-
-                  ;; This phase is necessary to fix a test failure, see
-                  ;; <https://gitlab.com/cppit/jucipp/-/issues/423>.
-                  (add-after 'unpack 'add-reference-to-clang-internal-header
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "src/compile_commands.cc"
-                        ((".*-I/usr/lib/clang.*" all)
-                         (string-append "arguments.emplace_back(\"-I"
-                                        (assoc-ref inputs "libclang")
-                                        "/lib/clang/"
-                                        ,@(list (package-version clang))
-                                        "/include\");\n"
-                                        all)))
-                      #t))
-                  (add-after 'unpack 'patch-tiny-process-library
-                    (lambda _
-                      (with-directory-excursion "lib/tiny-process-library"
-                        (substitute* '("process_unix.cpp"
-                                       "tests/io_test.cpp")
-                          (("/bin/sh") (which "sh"))))
-                      #t))
-                  (add-after 'unpack 'disable-git-test
-                    (lambda _
-                      (substitute* "tests/CMakeLists.txt"
-                        ;; Disable the git test, as it requires the full checkout.
-                        (("add_test\\(git_test.*\\)") ""))
-                      #t))
-                  (add-before 'check 'pre-check
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      ;; Tests do not expect HOME to be empty.
-                      (setenv "HOME" "/etc")
-
-                      ;; Most tests require an X server.
-                      (let ((xorg-server (assoc-ref inputs "xorg-server"))
-                            (display ":1"))
-                        (setenv "DISPLAY" display)
-                        (system (string-append xorg-server "/bin/Xvfb "
-                                               display " &")))
-                      #t)))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("xorg-server" ,xorg-server-for-tests)))
-    (inputs
-     `(("aspell" ,aspell)
-       ("boost" ,boost)
-       ("gtkmm" ,gtkmm)
-       ("gtksourceviewmm" ,gtksourceviewmm)
-       ("libclang" ,clang)
-       ("libgit2" ,libgit2)))
-    (synopsis "Lightweight C++ IDE")
-    (description
-     "juCi++ is a small @dfn{IDE} (Integrated Development Environment)
-designed especially towards libclang with speed, stability, and ease of use
-in mind.
-
-It supports autocompletion, on-the-fly warnings and errors, syntax
-highlighting, and integrates with Git as well as the CMake and Meson build
-systems.")
-    (license license:expat)))
-
 (define-public leafpad
  (package
    (name "leafpad")
@@ -908,7 +812,7 @@ The basic features of Geany are:
     `(("ncurses" ,ncurses)))
    (home-page "http://www.moria.de/~michael/fe/")
    (synopsis "Small folding editor")
-    (description "Fe is a small folding editor.  It folds
+    (description "Fe is a small folding editor.  It allows to fold
 arbitrary text regions; it is not bound to syntactic units.

 Fe has no configuration or extension language and requires no setup.
@@ -13,7 +13,7 @@
 ;;; Copyright © 2017,2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
 ;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
@@ -612,15 +612,15 @@ in a portable way.")
 (define-public dbacl
  (package
    (name "dbacl")
-    (version "1.14.1")
+    (version "1.14")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/dbacl/dbacl/" version "/"
+       (uri (string-append "http://www.lbreyer.com/gpl/"
                           "dbacl-" version ".tar.gz"))
       (sha256
-        (base32 "1gas0112wqjvwn9qg3hxnawk7h3prr0w9b2h68f3p1ifd1kzn3gz"))
-       (patches (search-patches "dbacl-include-locale.h.patch"))))
+        (base32
+         "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags
@@ -648,6 +648,10 @@ in a portable way.")
           (lambda _
             (delete-file "src/tests/dbacl-jap.shin")
             #t))
+         (add-after 'delete-sample6-and-japanese 'autoreconf
+           (lambda _
+             (invoke "autoreconf" "-vif")
+             #t))
         (add-after 'unpack 'fix-test-files
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
@@ -657,11 +661,7 @@ in a portable way.")
                  "#PATH=/bin:/usr/bin")
                 (("diff") (string-append (which "diff")))
                 (("tr") (string-append (which "tr"))))
-               #t)))
-         (replace 'bootstrap
-           (lambda _
-             (invoke "autoreconf" "-vif")
-             #t)))))
+               #t))))))
    (inputs
     `(("ncurses" ,ncurses)
       ("perl" ,perl)
@@ -245,7 +245,7 @@ required structures.")
    (properties '((ftp-server . "ftp.gnutls.org")
                  (ftp-directory . "/gcrypt/gnutls")))))

-(define-public gnutls-3.6.13
+(define gnutls-3.6.13
  (package
    (inherit gnutls)
    (version "3.6.A")
@@ -653,24 +653,6 @@ write native speed custom Git applications in any language with bindings.")
    ;; GPLv2 with linking exception
    (license license:gpl2)))

-(define-public libgit2-0.28
-  (package
-    (inherit libgit2)
-    (version "0.28.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/libgit2/libgit2/releases/"
-                            "download/v" version
-                            "/libgit2-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0hjgpqjjmkciw1i8jqkx9q2vhdc4fc99qajhrj2bq8ziwsp6hyrb"))
-        (patches (search-patches "libgit2-mtime-0.patch"))
-        (modules '((guix build utils)))
-        (snippet '(begin
-                    (delete-file-recursively "deps") #t))))))
-
 (define-public git-crypt
  (package
    (name "git-crypt")
@@ -1952,7 +1934,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).")
 (define-public tig
  (package
    (name "tig")
-    (version "2.5.1")
+    (version "2.5.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1960,7 +1942,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).")
                    version "/tig-" version ".tar.gz"))
              (sha256
               (base32
-                "0r4y9hyvpkplaxrzslws3asz652d83qh3bjwvmp8assga8s5s3ah"))))
+                "1x5famvvs93ih7sr11x7m33dksb1k7zs1s3c4zkyf0cjmxkpqlzz"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("asciidoc" ,asciidoc)
@@ -1974,8 +1956,8 @@ from Subversion to any supported Distributed Version Control System (DVCS).")
         (add-after 'install 'install-doc
           (lambda _
             (invoke "make" "install-doc"))))
-       #:test-target "test"
-       #:tests? #f))                    ; tests require access to /dev/tty
+       #:tests? #f)) ; tests require access to /dev/tty
+    ;; #:test-target "test"))
    (home-page "https://jonas.github.io/tig/")
    (synopsis "Ncurses-based text user interface for Git")
    (description
@@ -214,14 +214,14 @@ old-fashioned output methods with powerful ascii-art renderer.")
 (define-public celluloid
  (package
    (name "celluloid")
-    (version "0.19")
+    (version "0.18")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/celluloid-player/celluloid/releases"
                           "/download/v" version "/celluloid-" version ".tar.xz"))
       (sha256
-        (base32 "1s3qkism96gi44incvsb6rqg255qcvjvw61ya7nw30md0sapj4sl"))))
+        (base32 "0gmscx9zb8ppfjlnmgbcmhknhawa05sdhxi7dv5wjapjq0glq481"))))
    (build-system glib-or-gtk-build-system)
    (native-inputs
     `(("intltool" ,intltool)
@@ -758,7 +758,7 @@ canvas operations.")
 (define-public libdca
  (package
    (name "libdca")
-    (version "0.0.7")
+    (version "0.0.6")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -766,12 +766,8 @@ canvas operations.")
                    version "/libdca-" version ".tar.bz2"))
              (sha256
               (base32
-                "0sjz0s0nrv7jcpvh1i432x3jza0y5yycmzw84cfncb2qby0i62rs"))))
+                "0h0zvcn97i9kyljdpifzi8in9xnw31fx3b3ggj96p8h0l2d8mycq"))))
    (build-system gnu-build-system)
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)))
    (home-page "https://www.videolan.org/developers/libdca.html")
    (synopsis "DTS Coherent Acoustics decoder")
    (description "libdca is a library for decoding DTS Coherent Acoustics
@@ -1083,7 +1083,7 @@ virtual machines.")
 (define-public bubblewrap
  (package
    (name "bubblewrap")
-    (version "0.4.1")
+    (version "0.4.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/containers/bubblewrap/"
@@ -1091,7 +1091,7 @@ virtual machines.")
                                  version ".tar.xz"))
              (sha256
               (base32
-                "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"))))
+                "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -243,17 +243,17 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
 (define-public openconnect
  (package
   (name "openconnect")
-   (version "8.08")
+   (version "8.05")
   (source (origin
            (method url-fetch)
            (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
                                "openconnect-" version ".tar.gz"))
            (sha256
-             (base32 "1s3rjdazx1n5izpcgz05p1sirm7kf4z3gh26dq2h2j5xmgmk0jxp"))))
+             (base32 "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k"))))
   (build-system gnu-build-system)
   (propagated-inputs
    `(("libxml2" ,libxml2)
-      ("gnutls" ,gnutls-3.6.13)
+      ("gnutls" ,gnutls)
      ("zlib" ,zlib)))
   (inputs
    `(("vpnc-scripts" ,vpnc-scripts)))
@@ -1269,7 +1269,7 @@ Browsers and other web clients can use it to avoid privacy-leaking
 highlighting parts of the domain in a user interface, and sorting domain lists
 by site.

-Libpsl has built-in PSL data for fast access, allowing to load PSL data from
+Libpsl has built-in PSL data for fast access, allows to load PSL data from
 files, checks if a given domain is a public suffix, provides immediate cookie
 domain verification, finds the longest public part of a given domain, finds
 the shortest private part of a given domain, works with international
@@ -5811,7 +5811,7 @@ into your tests.  It automatically starts up a HTTP server in a separate thread
 (define-public http-parser
  (package
    (name "http-parser")
-    (version "2.9.4")
+    (version "2.9.3")
    (home-page "https://github.com/nodejs/http-parser")
    (source (origin
              (method git-fetch)
@@ -5834,7 +5834,7 @@ into your tests.  It automatically starts up a HTTP server in a separate thread
                    "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))
              (sha256
               (base32
-                "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"))))
+                "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"))))
    (build-system gnu-build-system)
    (arguments
     `(#:test-target "test"
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -328,7 +328,7 @@ integrate Windows applications into your desktop.")
 (define-public wine-staging-patchset-data
  (package
    (name "wine-staging-patchset-data")
-    (version "5.6")
+    (version "5.3")
    (source
     (origin
       (method git-fetch)
@@ -337,7 +337,7 @@ integrate Windows applications into your desktop.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d"))))
+        (base32 "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6"))))
    (build-system trivial-build-system)
    (native-inputs
     `(("bash" ,bash)
@@ -387,7 +387,7 @@ integrate Windows applications into your desktop.")
               "/wine-" version ".tar.xz")))
       (file-name (string-append name "-" version ".tar.xz"))
       (sha256
-        (base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah"))))
+        (base32 "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv"))))
    (inputs `(("autoconf" ,autoconf)    ; for autoreconf
              ("ffmpeg" ,ffmpeg)
              ("gtk+" ,gtk+)
@@ -602,7 +602,7 @@ System style license, and has no special dependencies.")
    (home-page "http://tomas.styblo.name/wmctrl/")
    (synopsis "Command-line tool to control X window managers")
    (description
-     "Wmctrl interacts with an X window manager that is compatible
+     "Wmctrl allows to interact with an X window manager that is compatible
 with the EWMH/NetWM specification.  It can query the window manager for
 information, and request for certain window management actions (resize and
 move windows, switch between desktops, etc.).")
@@ -635,7 +635,7 @@ move windows, switch between desktops, etc.).")
    (home-page "https://github.com/resurrecting-open-source-projects/scrot")
    (synopsis "Command-line screen capture utility for X Window System")
    (description
-     "Scrot saves a screenshot of a full screen, a window or a part
+     "Scrot allows to save a screenshot of a full screen, a window or a part
 of the screen selected by mouse.")
    ;; This license removes a clause about X Consortium from the original
    ;; X11 license.
@@ -1055,7 +1055,7 @@ within a single process.")
    (home-page "https://github.com/alols/xcape")
    (synopsis "Use a modifier key in X.org as another key")
    (description
-     "This utility for X.org uses a modifier key as another key when
+     "This utility for X.org allows to use modifier key as another key when
 pressed and released on its own.  The default behaviour is to generate the
 Escape key when Left Control is pressed and released on its own.")
    (license license:gpl3+)))
@@ -1731,7 +1731,7 @@ commandline).")
       `(#:tests? #f))
      (synopsis "Use external screen locker on events")
      (description "@code{xss-lock} listens to X signals to fire up a
-user-defined screensaver.  In effect this automatically locks the
+user-defined screensaver.  In effect this allows to automatically lock the
 screen when closing a laptop lid or after a period of user inactivity (as set
 with @code{xset s TIMEOUT}).  The notifier command, if specified, is executed
 first.  Additionally, xss-lock uses the inhibition logic to lock the screen
@@ -204,7 +204,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
 (define-public exo
  (package
    (name "exo")
-    (version "0.12.11")
+    (version "0.12.10")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -212,7 +212,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
                                  "exo-" version ".tar.bz2"))
              (sha256
               (base32
-                "1dp5s64g6572h9zvx9js7qc72s728qsd9y7hl7hg6rwaq0cjb2gc"))))
+                "1b3w4pf9gkcp13h63nf93k95hkw0ij7v5y7wjklqd1qifm8xd3w4"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)
@@ -222,7 +222,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
     `(("gtk+-3" ,gtk+)
       ("libxfce4util" ,libxfce4util)))
    (inputs
-     `(;; FIXME Referred to in exo-1.pc but conflict with gtk+-3.
+     `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3
       ("gtk+-2" ,gtk+-2)
       ("libxfce4ui" ,libxfce4ui)
       ("perl-uri" ,perl-uri)))
@@ -238,7 +238,7 @@ development.")
 (define-public garcon
  (package
    (name "garcon")
-    (version "0.7.0")
+    (version "0.6.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -246,17 +246,17 @@ development.")
                                  "garcon-" version ".tar.bz2"))
              (sha256
               (base32
-                "08r4dfvdvl178cjajm7ww16lwb7jsfqh3yz614mn84c0a0dvdhw2"))))
+                "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("intltool" ,intltool)
       ("glib:bin" ,glib "bin")))
    (inputs
-     `(("gtk+-2" ,gtk+-2)))             ; required by garcon-gtk2-1.pc
+     `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc
    (propagated-inputs
     `(("gtk+-3" ,gtk+)                 ; required by garcon-gtk3-1.pc
-       ("libxfce4ui" ,libxfce4ui)))     ; required by garcon-gtk3-1.pc
+       ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc
    (home-page "https://www.xfce.org/")
    (synopsis "Implementation of the freedesktop.org menu specification")
    (description
@@ -387,7 +387,7 @@ applications menu, workspace switcher and more.")
 (define-public xfce4-clipman-plugin
  (package
    (name "xfce4-clipman-plugin")
-    (version "1.6.1")
+    (version "1.4.4")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -395,7 +395,7 @@ applications menu, workspace switcher and more.")
                                  "xfce4-clipman-plugin-" version ".tar.bz2"))
              (sha256
               (base32
-                "1d6fxdzy9b511hqcyj7825fx67q6zqk6cln4g3x9d498jrvk3s5k"))))
+                "1819kjn7gs30zhhj2ppfw4zjpcgj9amw1vvppjsavsff1xflrq88"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("intltool" ,intltool)
@@ -418,20 +418,19 @@ matching them against regular expressions.")
 (define-public xfce4-pulseaudio-plugin
  (package
    (name "xfce4-pulseaudio-plugin")
-    (version "0.4.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-pulseaudio-plugin/"
-                           (version-major+minor version) "/"
-                           "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
-       (sha256
-        (base32 "0nv1lbkshfzar87f6xq1ib120pjja24r7135rbc42wqkw8vq4las"))))
+    (version "0.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
-       ;; For dbus/dbus-glib.h in pulseaudio-config.h.
+       ;; For dbus/dbus-glib.h in pulseaudio-config.h
       (modify-phases %standard-phases
         (add-after 'set-paths 'augment-cflags
           (lambda* (#:key inputs #:allow-other-keys)
@@ -465,7 +464,7 @@ keys for controlling the audio volume.")
 (define-public xfce4-whiskermenu-plugin
  (package
    (name "xfce4-whiskermenu-plugin")
-    (version "2.4.3")
+    (version "2.3.4")
    (source
     (origin
       (method url-fetch)
@@ -473,7 +472,7 @@ keys for controlling the audio volume.")
                           "xfce4-whiskermenu-plugin/" (version-major+minor version) "/"
                           "xfce4-whiskermenu-plugin-" version ".tar.bz2"))
       (sha256
-        (base32 "1w2zvqr0g6miliv3nb0shljfawwc1brdn2fyz4kvfg7b3klyxyir"))))
+        (base32 "03jpcbdpkgg825g7mr630wxynachymsrnyhz32mkl0jsd4sxxlw4"))))
    (build-system cmake-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)
@@ -564,15 +563,15 @@ your system in categories, so you can quickly find and launch them.")
 (define-public xfce4-session
  (package
    (name "xfce4-session")
-    (version "4.14.2")
+    (version "4.14.0")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-session/" (version-major+minor version) "/"
-                                  "xfce4-session-" version ".tar.bz2"))
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
              (sha256
               (base32
-                "1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv"))
+                "0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -603,7 +602,7 @@ your system in categories, so you can quickly find and launch them.")
    (synopsis "Xfce session manager")
    (description
     "Session manager for Xfce, it will restore your session on startup and
-allows you to shut down the computer from Xfce.")
+allows you to shutdown the computer from Xfce.")
    (license gpl2+)))

 (define-public xfce4-settings
@@ -648,7 +647,7 @@ like appearance, display, keyboard and mouse settings.")
 (define-public thunar
  (package
    (name "thunar")
-    (version "1.8.14")
+    (version "1.8.12")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -656,7 +655,7 @@ like appearance, display, keyboard and mouse settings.")
                                  "thunar-" version ".tar.bz2"))
              (sha256
               (base32
-                "17r1z8cyp709lz38w7b5vqi1zbgm2i3sqvdvicsbvma2b0gppica"))))
+                "1y1548jrx93c9v8ks60mkd9sx5xl69fmwh1pbr9gsnqz1gp5na99"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)
@@ -855,7 +854,7 @@ on your desktop.")
       ("shared-mime-info"     ,shared-mime-info)
       ("thunar"               ,thunar)
       ("thunar-volman"        ,thunar-volman)
-       ("tumbler"              ,tumbler)
+       ("tumlber"              ,tumbler)
       ("xfce4-appfinder"      ,xfce4-appfinder)
       ("xfce4-panel"          ,xfce4-panel)
       ("xfce4-power-manager"  ,xfce4-power-manager)
@@ -869,7 +868,7 @@ on your desktop.")
       ("xfce4-battery-plugin"    ,xfce4-battery-plugin)
       ("xfce4-clipman-plugin"    ,xfce4-clipman-plugin)
       ("xfce4-pulseaudio-plugin" ,xfce4-pulseaudio-plugin)
-       ("xfce4-xkb-plugin"        ,xfce4-xkb-plugin)))
+       ("xfce4-xkb-plugin" ,xfce4-xkb-plugin)))
    (native-search-paths
     ;; For finding panel plugins.
     (package-native-search-paths xfce4-panel))
@@ -1161,7 +1160,7 @@ A plugin for the Xfce panel is also available.")
 (define-public xfce4-screensaver
  (package
    (name "xfce4-screensaver")
-    (version "0.1.10")
+    (version "0.1.9")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://archive.xfce.org/src/apps/"
@@ -1171,7 +1170,7 @@ A plugin for the Xfce panel is also available.")
                                  version ".tar.bz2"))
              (sha256
               (base32
-                "0mqxbyq9np6jzky8y35dlxxmk78q2w0jvwg9kh7a4ib7vmw1qvsq"))))
+                "11p48yyjgy6crwfbyvm16yg0rkzn90ssd2wygzmwvwrx3wkzyhsp"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -74,7 +74,7 @@
    '(#:configure-flags '("--disable-static")))
   (synopsis "Library for manipulating the ogg multimedia format")
   (description
-    "The libogg library manipulates the ogg multimedia container
+    "The libogg library allows to manipulate the ogg multimedia container
 format, which encapsulates raw compressed data and allows the interleaving of
 audio and video data.  In addition to encapsulation and interleaving of
 multiple data streams, ogg provides packet framing, error detection, and
@@ -10,7 +10,6 @@
 ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
-;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -893,7 +892,7 @@ rules.")
 (define-record-type* <gnome-desktop-configuration> gnome-desktop-configuration
  make-gnome-desktop-configuration
  gnome-desktop-configuration?
-  (gnome gnome-package (default gnome)))
+  (gnome-package gnome-package (default gnome)))

 (define (gnome-polkit-settings config)
  "Return the list of GNOME dependencies that provide polkit actions and
@@ -285,7 +285,7 @@ and max_workers parameter.")
    (string "3:remote 4:event")
    "Logging filters.

-A filter allows selecting a different logging level for a given category
+A filter allows to select a different logging level for a given category
 of logs
 The format for a filter is one of:
@itemize
@@ -283,8 +283,7 @@ substitutable."
                        bootloader
                        (register-closures? (has-guix-service-type? os))
                        (inputs '())
-                        (grub-mkrescue-environment '())
-                        (substitutable? #t))
+                        (grub-mkrescue-environment '()))
  "Return a bootable, stand-alone iso9660 image.

 INPUTS is a list of inputs (as for packages)."
@@ -355,7 +354,6 @@ INPUTS is a list of inputs (as for packages)."
   #:make-disk-image? #f
   #:single-file-output? #t
   #:references-graphs inputs
-   #:substitutable? substitutable?

   ;; Xorriso seems to be quite memory-hungry, so increase the VM's RAM size.
   #:memory-size 512))
@@ -737,8 +735,7 @@ substitutable."
                       #:inputs `(("system" ,os)
                                  ("bootcfg" ,bootcfg))
                       #:grub-mkrescue-environment
-                       '(("MKRESCUE_SED_MODE" . "mbr_hfs"))
-                       #:substitutable? substitutable?)
+                       '(("MKRESCUE_SED_MODE" . "mbr_hfs")))
        (qemu-image #:name name
                    #:os os
                    #:bootcfg-drv bootcfg
@@ -941,7 +938,6 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
            '())

     "-no-reboot"
-     "-nic" "user,model=virtio-net-pci"
     "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
     "-device" "virtio-rng-pci,rng=guixsd-vm-rng"

@@ -1125,8 +1125,6 @@ build (current-guix) and then store a couple of full system images.")
                               #:os installation-os-for-gui-tests
                               #:install-size install-size
                               #:target-size target-size
-                               #:installation-disk-image-file-system-type
-                               "iso9660"
                               #:gui-test
                               (lambda (marionette)
                                 (gui-test-program
--- a/Show More
+++ b/Show More