Merge branch 'master' into staging

139 files changed, 13655 insertions, 8005 deletions

diff --git a/Makefile.am b/Makefile.am
index c331da7267..8d523262cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,6 +120,7 @@ MODULES =					\
   guix/build-system/gnu.scm			\
   guix/build-system/guile.scm			\
   guix/build-system/haskell.scm			\
+  guix/build-system/linux-module.scm		\
   guix/build-system/perl.scm			\
   guix/build-system/python.scm			\
   guix/build-system/ocaml.scm			\
@@ -138,6 +139,7 @@ MODULES =					\
   guix/store.scm				\
   guix/cvs-download.scm				\
   guix/svn-download.scm				\
+  guix/colors.scm				\
   guix/i18n.scm					\
   guix/ui.scm					\
   guix/status.scm				\
@@ -172,6 +174,7 @@ MODULES =					\
   guix/build/texlive-build-system.scm		\
   guix/build/waf-build-system.scm		\
   guix/build/haskell-build-system.scm		\
+  guix/build/linux-module-build-system.scm	\
   guix/build/store-copy.scm			\
   guix/build/utils.scm				\
   guix/build/union.scm				\
@@ -276,7 +279,8 @@ endif BUILD_DAEMON_OFFLOAD
 # Scheme implementation of the build daemon and related functionality.
 STORE_MODULES =					\
   guix/store/database.scm			\
-  guix/store/deduplication.scm
+  guix/store/deduplication.scm			\
+  guix/store/roots.scm
 
 MODULES += $(STORE_MODULES)
 
@@ -407,7 +411,8 @@ SCM_TESTS =					\
   tests/pypi.scm				\
   tests/import-utils.scm			\
   tests/store-database.scm			\
-  tests/store-deduplication.scm
+  tests/store-deduplication.scm			\
+  tests/store-roots.scm
 
 SH_TESTS =					\
   tests/guix-build.sh				\
diff --git a/doc/guix.texi b/doc/guix.texi
index 2f9fcbe3bf..f8e7436cf1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1795,25 +1795,14 @@ available.
 @node Limitations
 @section Limitations
 
-As of version @value{VERSION}, Guix System is
-not production-ready.  It may contain bugs and lack important
-features.  Thus, if you are looking for a stable production system that
-respects your freedom as a computer user, a good solution at this point
-is to consider @url{http://www.gnu.org/distros/free-distros.html, one of
-the more established GNU/Linux distributions}.  We hope you can soon switch
-to the Guix System without fear, of course.  In the meantime, you can
-also keep using your distribution and try out the package manager on top
-of it (@pxref{Installation}).
-
-Before you proceed with the installation, be aware of the following
-noteworthy limitations applicable to version @value{VERSION}:
+We consider Guix System to be ready for a wide range of ``desktop'' and server
+use cases.  The reliability guarantees it provides---transactional upgrades
+and rollbacks, reproducibility---make it a solid foundation.
 
-@itemize
-@item
-The installation process does not include a graphical user interface and
-requires familiarity with GNU/Linux (see the following subsections to
-get a feel of what that means.)
+Nevertheless, before you proceed with the installation, be aware of the
+following noteworthy limitations applicable to version @value{VERSION}:
 
+@itemize
 @item
 Support for the Logical Volume Manager (LVM) is missing.
 
@@ -1822,18 +1811,14 @@ More and more system services are provided (@pxref{Services}), but some
 may be missing.
 
 @item
-More than 8,500 packages are available, but you might
-occasionally find that a useful package is missing.
-
-@item
 GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}),
-as well as a number of X11 window managers.  However, some graphical
-applications may be missing, as well as KDE.
+as well as a number of X11 window managers.  However, KDE is currently
+missing.
 @end itemize
 
-You have been warned!  But more than a disclaimer, this is an invitation
-to report issues (and success stories!), and to join us in improving it.
-@xref{Contributing}, for more info.
+More than a disclaimer, this is an invitation to report issues (and success
+stories!), and to join us in improving it.  @xref{Contributing}, for more
+info.
 
 
 @node Hardware Considerations
@@ -1856,7 +1841,7 @@ devices.  WiFi devices known to work include those using Atheros chips
 driver, and those using Broadcom/AirForce chips (BCM43xx with
 Wireless-Core Revision 5), which corresponds to the @code{b43-open}
 Linux-libre driver.  Free firmware exists for both and is available
-out-of-the-box on Guix System, as part of @var{%base-firmware}
+out-of-the-box on Guix System, as part of @code{%base-firmware}
 (@pxref{operating-system Reference, @code{firmware}}).
 
 @cindex RYF, Respects Your Freedom
@@ -3385,7 +3370,7 @@ deleted.  The set of garbage collector roots (``GC roots'' for short)
 includes default user profiles; by default, the symlinks under
 @file{/var/guix/gcroots} represent these GC roots.  New GC roots can be
 added with @command{guix build --root}, for example (@pxref{Invoking
-guix build}).
+guix build}).  The @command{guix gc --list-roots} command lists them.
 
 Prior to running @code{guix gc --collect-garbage} to make space, it is
 often useful to remove old generations from user profiles; that way, old
@@ -3438,8 +3423,22 @@ as @code{500MiB}, as described above.
 When @var{free} or more is already available in @file{/gnu/store}, do
 nothing and exit immediately.
 
+@item --delete-generations[=@var{duration}]
+@itemx -d [@var{duration}]
+Before starting the garbage collection process, delete all the generations
+older than @var{duration}, for all the user profiles; when run as root, this
+applies to all the profiles @emph{of all the users}.
+
+For example, this command deletes all the generations of all your profiles
+that are older than 2 months (except generations that are current), and then
+proceeds to free space until at least 10 GiB are available:
+
+@example
+guix gc -d 2m -F 10G
+@end example
+
 @item --delete
-@itemx -d
+@itemx -D
 Attempt to delete all the store files and directories specified as
 arguments.  This fails if some of the files are not in the store, or if
 they are still live.
@@ -3451,6 +3450,10 @@ This prints nothing unless the daemon was started with
 @option{--cache-failures} (@pxref{Invoking guix-daemon,
 @option{--cache-failures}}).
 
+@item --list-roots
+List the GC roots owned by the user; when run as root, list @emph{all} the GC
+roots.
+
 @item --clear-failures
 Remove the specified store items from the failed-build cache.
 
@@ -5406,6 +5409,27 @@ automatically corrected.
 @end table
 @end deftp
 
+@deffn {Scheme Syntax} this-package
+When used in the @emph{lexical scope} of a package field definition, this
+identifier resolves to the package being defined.
+
+The example below shows how to add a package as a native input of itself when
+cross-compiling:
+
+@example
+(package
+  (name "guile")
+  ;; ...
+
+  ;; When cross-compiled, Guile, for example, depends on
+  ;; a native version of itself.  Add it here.
+  (native-inputs (if (%current-target-system)
+                     `(("self" ,this-package))
+                     '())))
+@end example
+
+It is an error to refer to @code{this-package} outside a package definition.
+@end deffn
 
 @node origin Reference
 @subsection @code{origin} Reference
@@ -6192,6 +6216,33 @@ is not enabled by default.  It can be enabled with @code{#:glib-or-gtk?}.
 @end table
 @end defvr
 
+@defvr {Scheme Variable} linux-module-build-system
+@var{linux-module-build-system} allows building Linux kernel modules.
+
+@cindex build phases
+This build system is an extension of @var{gnu-build-system}, but with the
+following phases changed:
+
+@table @code
+
+@item configure
+This phase configures the environment so that the Linux kernel's Makefile
+can be used to build the external kernel module.
+
+@item build
+This phase uses the Linux kernel's Makefile in order to build the external
+kernel module.
+
+@item install
+This phase uses the Linux kernel's Makefile in order to install the external
+kernel module.
+@end table
+
+It is possible and useful to specify the Linux kernel to use for building
+the module (in the "arguments" form of a package using the
+linux-module-build-system, use the key #:linux to specify it).
+@end defvr
+
 Lastly, for packages that do not need anything as sophisticated, a
 ``trivial'' build system is provided.  It is trivial in the sense that
 it provides basically no support: it does not pull any implicit inputs,
@@ -10406,6 +10457,10 @@ the command-line of the kernel---e.g., @code{("console=ttyS0")}.
 @item @code{bootloader}
 The system bootloader configuration object.  @xref{Bootloader Configuration}.
 
+@item @code{label}
+This is the label (a string) as it appears in the bootloader's menu entry.
+The default label includes the kernel name and version.
+
 @item @code{keyboard-layout} (default: @code{#f})
 This field specifies the keyboard layout to use in the console.  It can be
 either @code{#f}, in which case the default keyboard layout is used (usually
@@ -10558,6 +10613,27 @@ is that only @code{root} and members of the @code{wheel} group may use
 @code{sudo}.
 
 @end table
+
+@deffn {Scheme Syntax} this-operating-system
+When used in the @emph{lexical scope} of an operating system field definition,
+this identifier resolves to the operating system being defined.
+
+The example below shows how to refer to the operating system being defined in
+the definition of the @code{label} field:
+
+@example
+(use-modules (gnu) (guix))
+
+(operating-system
+  ;; ...
+  (label (package-full-name
+          (operating-system-kernel this-operating-system))))
+@end example
+
+It is an error to refer to @code{this-operating-system} outside an operating
+system definition.
+@end deffn
+
 @end deftp
 
 @node File Systems
@@ -23122,7 +23198,7 @@ The port to bind the server to.
 @cindex fingerprint
 @subsubheading Fingerprint Service
 
-The @code{(gnu services fingerprint)} module provides a DBus service to
+The @code{(gnu services authentication)} module provides a DBus service to
 read and identify fingerprints via a fingerprint sensor.
 
 @defvr {Scheme Variable} fprintd-service-type
@@ -23983,7 +24059,7 @@ must @emph{not} be an OS device name such as @file{/dev/sda1}.
 @end deftp
 
 @c FIXME: Write documentation once it's stable.
-Fow now only GRUB has theme support. GRUB themes are created using
+For now only GRUB has theme support. GRUB themes are created using
 the @code{grub-theme} form, which is not documented yet.
 
 @defvr {Scheme Variable} %default-theme
@@ -24669,23 +24745,23 @@ exception is the @dfn{boot service type}, which is the ultimate service.
 Optionally, a default value for instances of this type.
 @end enumerate
 
-In this example, @var{guix-service-type} extends three services:
+In this example, @code{guix-service-type} extends three services:
 
-@table @var
+@table @code
 @item shepherd-root-service-type
-The @var{guix-shepherd-service} procedure defines how the Shepherd
+The @code{guix-shepherd-service} procedure defines how the Shepherd
 service is extended.  Namely, it returns a @code{<shepherd-service>}
 object that defines how @command{guix-daemon} is started and stopped
 (@pxref{Shepherd Services}).
 
 @item account-service-type
-This extension for this service is computed by @var{guix-accounts},
+This extension for this service is computed by @code{guix-accounts},
 which returns a list of @code{user-group} and @code{user-account}
 objects representing the build user accounts (@pxref{Invoking
 guix-daemon}).
 
 @item activation-service-type
-Here @var{guix-activation} is a procedure that returns a gexp, which is
+Here @code{guix-activation} is a procedure that returns a gexp, which is
 a code snippet to run at ``activation time''---e.g., when the service is
 booted.
 @end table
@@ -24710,7 +24786,7 @@ value is omitted, the default value specified by
 (service guix-service-type)
 @end example
 
-@var{guix-service-type} is quite simple because it extends other
+@code{guix-service-type} is quite simple because it extends other
 services but is not extensible itself.
 
 @c @subsubsubsection Extensible Service Types
@@ -24736,7 +24812,7 @@ The service type for an @emph{extensible} service looks like this:
 This is the service type for the
 @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device
 management daemon}.  Compared to the previous example, in addition to an
-extension of @var{shepherd-root-service-type}, we see two new fields:
+extension of @code{shepherd-root-service-type}, we see two new fields:
 
 @table @code
 @item compose
@@ -24763,7 +24839,7 @@ them (@pxref{Invoking guix system}).
 @end table
 
 There can be only one instance of an extensible service type such as
-@var{udev-service-type}.  If there were more, the
+@code{udev-service-type}.  If there were more, the
 @code{service-extension} specifications would be ambiguous.
 
 Still here?  The next section provides a reference of the programming
@@ -24837,7 +24913,7 @@ Here is an example of how a service is created and manipulated:
 
 The @code{modify-services} form provides a handy way to change the
 parameters of some of the services of a list such as
-@var{%base-services} (@pxref{Base Services, @code{%base-services}}).  It
+@code{%base-services} (@pxref{Base Services, @code{%base-services}}).  It
 evaluates to a list of services.  Of course, you could always use
 standard list combinators such as @code{map} and @code{fold} to do that
 (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual});
@@ -25018,8 +25094,8 @@ You can actually generate such a graph for any operating system
 definition using the @command{guix system shepherd-graph} command
 (@pxref{system-shepherd-graph, @command{guix system shepherd-graph}}).
 
-The @var{%shepherd-root-service} is a service object representing
-PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended
+The @code{%shepherd-root-service} is a service object representing
+PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended
 by passing it lists of @code{<shepherd-service>} objects.
 
 @deftp {Data Type} shepherd-service
@@ -25067,10 +25143,10 @@ A documentation string, as shown when running:
 herd doc @var{service-name}
 @end example
 
-where @var{service-name} is one of the symbols in @var{provision}
+where @var{service-name} is one of the symbols in @code{provision}
 (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}).
 
-@item @code{modules} (default: @var{%default-modules})
+@item @code{modules} (default: @code{%default-modules})
 This is the list of modules that must be in scope when @code{start} and
 @code{stop} are evaluated.
 
@@ -25317,7 +25393,7 @@ order of magnitudes lower than a full rebuild of the dependency chain.
 @cindex replacements of packages, for grafts
 For instance, suppose a security update needs to be applied to Bash.
 Guix developers will provide a package definition for the ``fixed''
-Bash, say @var{bash-fixed}, in the usual way (@pxref{Defining
+Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining
 Packages}).  Then, the original package definition is augmented with a
 @code{replacement} field pointing to the package containing the bug fix:
 
@@ -25332,14 +25408,14 @@ Packages}).  Then, the original package definition is augmented with a
 From there on, any package depending directly or indirectly on Bash---as
 reported by @command{guix gc --requisites} (@pxref{Invoking guix
 gc})---that is installed is automatically ``rewritten'' to refer to
-@var{bash-fixed} instead of @var{bash}.  This grafting process takes
+@code{bash-fixed} instead of @code{bash}.  This grafting process takes
 time proportional to the size of the package, usually less than a
 minute for an ``average'' package on a recent machine.  Grafting is
 recursive: when an indirect dependency requires grafting, then grafting
 ``propagates'' up to the package that the user is installing.
 
 Currently, the length of the name and version of the graft and that of
-the package it replaces (@var{bash-fixed} and @var{bash} in the example
+the package it replaces (@code{bash-fixed} and @code{bash} in the example
 above) must be equal.  This restriction mostly comes from the fact that
 grafting works by patching files, including binary files, directly.
 Other restrictions may apply: for instance, when adding a graft to a
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 6d6a0c4cb4..e15ca4d5fb 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -471,11 +471,6 @@ GRUB configuration and OS-DRV as the stuff in it."
                 "mnt=/tmp/root/mnt"
                 "-path-list" "-"
                 "--"
-
-                ;; XXX: Add padding to avoid I/O errors on i686:
-                ;; <https://bugs.gnu.org/33639>.
-                "-padding" "10m"
-
                 "-volid" (string-upcase volume-id)
                 (if volume-uuid
                     `("-volume_date" "uuid"
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 50e2e7d85e..6a7a556271 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -91,9 +91,17 @@ version of this file."
 
 (define apply-locale
   ;; Install the specified locale.
-  #~(lambda (locale-name)
-      (false-if-exception
-       (setlocale LC_ALL locale-name))))
+  (with-imported-modules (source-module-closure '((gnu services herd)))
+    #~(lambda (locale)
+        (false-if-exception
+         (setlocale LC_ALL locale))
+
+        ;; Restart the documentation viewer so it displays the manual in
+        ;; language that corresponds to LOCALE.
+        (with-error-to-port (%make-void-port "w")
+          (lambda ()
+            (stop-service 'term-tty2)
+            (start-service 'term-tty2 (list locale)))))))
 
 (define* (compute-locale-step #:key
                               locales-name
@@ -323,6 +331,7 @@ selected keymap."
                          (gnu installer newt)
                          ((gnu installer newt keymap)
                           #:select (keyboard-layout->configuration))
+                         (gnu services herd)
                          (guix i18n)
                          (guix build utils)
                          (ice-9 match))
diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm
index 10c19115ca..2a221790d2 100644
--- a/gnu/installer/newt/services.scm
+++ b/gnu/installer/newt/services.scm
@@ -45,19 +45,14 @@ choose the one to use on the log-in screen.")
       (condition
        (&installer-step-abort))))))
 
-(define (run-networking-cbt-page network-management?)
-  "Run a page allowing the user to select networking services.  When
-NETWORK-MANAGEMENT? is true, include network management services like
-NetworkManager."
+(define (run-networking-cbt-page)
+  "Run a page allowing the user to select networking services."
   (run-checkbox-tree-page
    #:info-text (G_ "You can now select networking services to run on your \
 system.")
    #:title (G_ "Network service")
-   #:items (filter (let ((types (if network-management?
-                                    '(network-management networking)
-                                    '(networking))))
-                     (lambda (service)
-                       (memq (system-service-type service) types)))
+   #:items (filter (lambda (service)
+                     (eq? 'networking (system-service-type service)))
                    %system-services)
    #:item->text (compose G_ system-service-name)
    #:checkbox-tree-height 5
@@ -67,9 +62,35 @@ system.")
       (condition
        (&installer-step-abort))))))
 
+(define (run-network-management-page)
+  "Run a page to select among several network management methods."
+  (let ((title (G_ "Network management")))
+    (run-listbox-selection-page
+     #:title title
+     #:info-text (G_ "Choose the method to manage network connections.
+
+We recommend NetworkManager or Connman for a WiFi-capable laptop; the DHCP \
+client may be enough for a server.")
+     #:info-textbox-width 70
+     #:listbox-items (filter (lambda (service)
+                               (eq? 'network-management
+                                    (system-service-type service)))
+                             %system-services)
+     #:listbox-item->text (compose G_ system-service-name)
+     #:sort-listbox-items? #f
+     #:button-text (G_ "Exit")
+     #:button-callback-procedure
+     (lambda _
+       (raise
+        (condition
+         (&installer-step-abort)))))))
+
 (define (run-services-page)
   (let ((desktop (run-desktop-environments-cbt-page)))
     ;; When the user did not select any desktop services, and thus didn't get
     ;; '%desktop-services', offer network management services.
     (append desktop
-            (run-networking-cbt-page (null? desktop)))))
+            (run-networking-cbt-page)
+            (if (null? desktop)
+                (list (run-network-management-page))
+                '()))))
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index 0e98392bfb..4dbfe74bf9 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -20,6 +20,7 @@
 (define-module (gnu installer services)
   #:use-module (guix records)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
   #:export (system-service?
             system-service-name
             system-service-type
@@ -75,15 +76,17 @@
      (system-service
       (name (G_ "NetworkManager network connection manager"))
       (type 'network-management)
-      (snippet '(service network-manager-service-type)))
+      (snippet '((service network-manager-service-type)
+                 (service wpa-supplicant-service-type))))
      (system-service
       (name (G_ "Connman network connection manager"))
       (type 'network-management)
-      (snippet '(service connman-service-type)))
+      (snippet '((service connman-service-type)
+                 (service wpa-supplicant-service-type))))
      (system-service
       (name (G_ "DHCP client (dynamic IP address assignment)"))
       (type 'network-management)
-      (snippet '(service dhcp-client-service))))))
+      (snippet '(service dhcp-client-service-type))))))
 
 (define (desktop-system-service? service)
   "Return true if SERVICE is a desktop environment service."
@@ -95,7 +98,13 @@
 
 (define (system-services->configuration services)
   "Return the configuration field for SERVICES."
-  (let* ((snippets (map system-service-snippet services))
+  (let* ((snippets (append-map (lambda (service)
+                                 (match (system-service-snippet service)
+                                   ((and lst (('service _ ...) ...))
+                                    lst)
+                                   (sexp
+                                    (list sexp))))
+                               services))
          (desktop? (find desktop-system-service? services))
          (base     (if desktop?
                        '%desktop-services
diff --git a/gnu/local.mk b/gnu/local.mk
index 68cd2cbd50..a3cfee9649 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -374,6 +374,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/php.scm				\
   %D%/packages/pkg-config.scm			\
   %D%/packages/plotutils.scm			\
+  %D%/packages/poedit.scm				\
   %D%/packages/polkit.scm			\
   %D%/packages/popt.scm				\
   %D%/packages/printers.scm			\
@@ -622,7 +623,7 @@ INSTALLER_MODULES =                             \
 # ENABLE_INSTALLER is true.
 if ENABLE_INSTALLER
 GNU_SYSTEM_MODULES += $(INSTALLER_MODULES)
-elif !ENABLE_INSTALLER
+else !ENABLE_INSTALLER
 MODULES_NOT_COMPILED += $(INSTALLER_MODULES)
 endif
 
@@ -916,6 +917,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
+  %D%/packages/patches/idris-test-no-node.patch			\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
   %D%/packages/patches/inkscape-poppler-compat3.patch		\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
@@ -945,7 +947,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/kio-search-smbd-on-PATH.patch		\
   %D%/packages/patches/kmod-module-directory.patch		\
   %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
-  %D%/packages/patches/knot-include-system-lmdb-header.patch	\
   %D%/packages/patches/kpackage-allow-external-paths.patch	\
   %D%/packages/patches/kobodeluxe-paths.patch			\
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
@@ -953,6 +954,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch	\
   %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch	\
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch	\
+  %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch		\
   %D%/packages/patches/kodi-skip-test-449.patch		\
   %D%/packages/patches/laby-make-install.patch			\
   %D%/packages/patches/lcms-CVE-2018-16435.patch		\
@@ -1102,6 +1104,10 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-CVE-2015-8869.patch		\
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch	\
   %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch	\
+  %D%/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch	\
+  %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch	\
+  %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch	\
+  %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch	\
   %D%/packages/patches/omake-fix-non-determinism.patch	\
   %D%/packages/patches/ola-readdir-r.patch			\
   %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch	\
@@ -1213,9 +1219,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
-  %D%/packages/patches/quilt-test-fix-regex.patch		\
-  %D%/packages/patches/quilt-getopt-nondigit-param.patch	\
-  %D%/packages/patches/quilt-getopt-second-separator.patch	\
   %D%/packages/patches/qtwebkit-pbutils-include.patch		\
   %D%/packages/patches/randomjungle-disable-static-build.patch	\
   %D%/packages/patches/rapicorn-isnan.patch			\
@@ -1273,7 +1276,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/swig-guile-gc.patch			\
   %D%/packages/patches/swish-e-search.patch			\
   %D%/packages/patches/swish-e-format-security.patch		\
-  %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch 	\
   %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch	\
   %D%/packages/patches/t1lib-CVE-2010-2642.patch		\
   %D%/packages/patches/t1lib-CVE-2011-0764.patch		\
@@ -1338,6 +1340,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/wavpack-CVE-2018-6767.patch		\
   %D%/packages/patches/wavpack-CVE-2018-7253.patch		\
   %D%/packages/patches/wavpack-CVE-2018-7254.patch		\
+  %D%/packages/patches/webkitgtk-sse2.patch			\
   %D%/packages/patches/weechat-python.patch			\
   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
   %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d901110e53..3a250eeaa8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1287,7 +1287,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
 (define-public acpica
   (package
     (name "acpica")
-    (version "20190215")
+    (version "20190405")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1295,7 +1295,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
                     version ".tar.gz"))
               (sha256
                (base32
-                "1iy2zwi8aicq0b5a0phfacvk1f9z1d89cx43adcf0qh82gb9m4wg"))))
+                "0hv6r65l8vk3f6i3by7i47vc1917qm47838bpq80lfn22784y53y"))))
     (build-system gnu-build-system)
     (native-inputs `(("flex" ,flex)
                      ("bison" ,bison)))
@@ -1599,13 +1599,13 @@ of supported upstream metrics systems simultaneously.")
 (define-public ansible
   (package
     (name "ansible")
-    (version "2.7.9")
+    (version "2.7.10")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "ansible" version))
        (sha256
-        (base32 "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"))))
+        (base32 "15721d0bxymghxnlnknq43lszlxg3ybbcp2p5v424hhw6wg2v944"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-bcrypt" ,python-bcrypt)
@@ -1736,18 +1736,18 @@ limits.")
 (define-public autojump
   (package
     (name "autojump")
-    (version "22.5.1")
+    (version "22.5.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/wting/autojump/archive/"
-                           "release-v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wting/autojump.git")
+             (commit (string-append "release-v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"))))
+        (base32 "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"))))
     (build-system gnu-build-system)
-    (native-inputs                      ;for tests
+    (native-inputs                      ; for tests
      `(("python-mock" ,python-mock)
        ("python-pytest" ,python-pytest)))
     (inputs
@@ -1755,6 +1755,11 @@ limits.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           ;; ‘install.py’ modifies files before installing them.
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (delete 'configure)
          (delete 'build)
          (replace 'check
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 9b4c7b8e27..ba1c12daed 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
 ;;;
@@ -499,7 +499,7 @@ matrices, and polynomials over the integers and over finite fields.")
 (define-public singular
   (package
    (name "singular")
-   (version "4.1.1p3")
+   (version "4.1.2p1")
    (source
     (origin
       (method url-fetch)
@@ -513,7 +513,7 @@ matrices, and polynomials over the integers and over finite fields.")
                         #\.) "-")
                       "/singular-" version ".tar.gz"))
              (sha256 (base32
-                      "1qqj9bm9pkzm0iyycpvm8x6s79wws3nq60lz25h8x1q61h3426sm"))))
+                      "0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("doxygen" ,doxygen)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 74a80ab046..b46382c035 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -41,18 +41,20 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages video))
 
+;; ETL, synfig, and Synfig Studio are updated in tandem.
+(define synfig-version "1.2.2")
+
 (define-public etl
   (package
     (name "etl")
-    (version "0.04.22")
+    (version synfig-version)
     (source (origin
               (method url-fetch)
-              ;; Keep this synchronized with the synfig release version.
               (uri (string-append "mirror://sourceforge/synfig/releases/"
-                                  "1.2.0/source/ETL-" version ".tar.gz"))
+                                  version "/source/ETL-" version ".tar.gz"))
               (sha256
                (base32
-                "0ii73nsd3xzkhz6w1rnxwphl637j9w82xiy6apa9vin2isdynnmc"))))
+                "12sd8pz8l5xcxcmapkvih3brihdhdb6xmxisr9a415lydid9rh8d"))))
     (build-system gnu-build-system)
     (home-page "https://www.synfig.org")
     (synopsis "Extended C++ template library")
@@ -65,7 +67,7 @@ C++ @dfn{Standard Template Library} (STL).")
 (define-public synfig
   (package
     (name "synfig")
-    (version "1.2.0")
+    (version synfig-version)
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/synfig/releases/"
@@ -73,7 +75,7 @@ C++ @dfn{Standard Template Library} (STL).")
                                   ".tar.gz"))
               (sha256
                (base32
-                "1gqx4gn4c73rqwhsgzx0a460gr9hadmi28csp75rx30qavqsj7k1"))))
+                "1vy27kl68sbg41sfasa58k3p2nc1xfalvzk3k9gich9h90rpnpsz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -131,7 +133,8 @@ C++ @dfn{Standard Template Library} (STL).")
        ("openexr" ,openexr)
        ("pango" ,pango)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
     (home-page "https://www.synfig.org")
     (synopsis "Vector-based 2D animation renderer")
     (description
@@ -143,7 +146,7 @@ for tweening, preventing the need to hand-draw each frame.")
 (define-public synfigstudio
   (package
     (name "synfigstudio")
-    (version "1.2.0")
+    (version synfig-version)
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/synfig/releases/"
@@ -151,16 +154,14 @@ for tweening, preventing the need to hand-draw each frame.")
                                   ".tar.gz"))
               (sha256
                (base32
-                "0fbckfbw8dzf0m2wv7vlmw492k1dqa3zf510z019d0as3zpnp6qm"))
+                "1ql92kh9z8w2j9yi3pr7hn7wh2r2j35xynwv9xlwyd7niackgykn"))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   (substitute* "src/synfigapp/pluginmanager.cpp"
                     (("xmlpp::Node\\* n =")    "const xmlpp::Node* n =")
                     (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
-                  #t))
-              (patches
-               (search-patches "synfigstudio-fix-ui-with-gtk3.patch"))))
+                  #t))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm
index 840b5410a6..5127ba1741 100644
--- a/gnu/packages/antivirus.scm
+++ b/gnu/packages/antivirus.scm
@@ -44,14 +44,14 @@
 (define-public clamav
   (package
     (name "clamav")
-    (version "0.101.1")
+    (version "0.101.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.clamav.net/downloads/production/"
                                   "clamav-" version ".tar.gz"))
               (sha256
                (base32
-                "01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps"))
+                "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 00ed00e1c1..c53eee2ac9 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -129,14 +129,14 @@ to the clients.")
 (define-public fasm
   (package
     (name "fasm")
-    (version "1.73.09")
+    (version "1.73.10")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://flatassembler.net/fasm-"
                            version ".tgz"))
        (sha256
-        (base32 "197bcj9aa5wpkvrlaafc1smxjss0fwdspq5fwhwgyy9cc7z5g0ym"))))
+        (base32 "1lk8vlr0vg7h8lhiav99paa5a1mi0r2m8agxjmczhhavqhx44c32"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests exist
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4d2e260e7c..8160ba5487 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1307,7 +1307,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
 (define-public guitarix
   (package
     (name "guitarix")
-    (version "0.38.0")
+    (version "0.38.1")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1315,7 +1315,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
                    version ".tar.xz"))
              (sha256
               (base32
-               "0nv5vm2q86lzsz42kl78jxm6w20al8r7qcnr5f057ria7f8fq2f7"))))
+               "0bw7xnrx062nwb1bfj9x660h7069ncmz77szcs8icpqxrvhs7z80"))))
     (build-system waf-build-system)
     (arguments
      `(#:tests? #f ; no "check" target
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 682cfe57bc..9b26ead91e 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -73,7 +73,7 @@
 (define-public duplicity
   (package
     (name "duplicity")
-    (version "0.7.18.1")
+    (version "0.7.18.2")
     (source
      (origin
       (method url-fetch)
@@ -82,8 +82,7 @@
                           "-series/" version "/+download/duplicity-"
                           version ".tar.gz"))
       (sha256
-       (base32
-        "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"))))
+       (base32 "0j37dgyji36hvb5dbzlmh5rj83jwhni02yq16g6rd3hj8f7qhdn2"))))
     (build-system python-build-system)
     (native-inputs
      `(("util-linux" ,util-linux)       ; setsid command, for the tests
@@ -996,14 +995,14 @@ precious backup space.
 (define-public burp
   (package
     (name "burp")
-    (version "2.3.2")
+    (version "2.3.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/burp/burp-" version
                                   "/burp-" version ".tar.bz2"))
               (sha256
                (base32
-                "1nkkn0nfydn39cl5rxd1wbmzizird6z05j9h2xr7xczdlhhjnaai"))))
+                "0r82mmfjm57yr4f34za3x3rkgc5z2c7nwbnsjjki16qfc9kjyai3"))))
     (build-system gnu-build-system)
     (inputs
      `(("librsync" ,librsync)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4cd032abd4..dc5d84653c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7916,13 +7916,13 @@ as well as query and modify the browser state, such as the current viewport.")
 (define-public r-genomicfeatures
   (package
     (name "r-genomicfeatures")
-    (version "1.34.7")
+    (version "1.34.8")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicFeatures" version))
               (sha256
                (base32
-                "100y8cx9xfglbn36k25y09y0qfwm0qpb4b01qhk367832rqz5dhz"))))
+                "1sxp86hdsg32l2c85jgic65gy92d8kxsm01264hrx6yikdhicjax"))))
     (properties
      `((upstream-name . "GenomicFeatures")))
     (build-system r-build-system)
@@ -14555,3 +14555,192 @@ overlapping paired-ended reads into (longer) consensus sequences.
 Additionally, the AdapterRemoval may be used to recover a consensus adapter
 sequence for paired-ended data, for which this information is not available.")
     (license license:gpl3+)))
+
+(define-public pplacer
+  (let ((commit "807f6f3"))
+    (package
+      (name "pplacer")
+      ;; The commit should be updated with each version change.
+      (version "1.1.alpha19")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/matsen/pplacer.git")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "11ppbbbx20p2g9wj3ff64dhnarb12q79v7qh4rk0gj6lkbz4n7cn"))))
+      (build-system ocaml-build-system)
+      (arguments
+       `(#:modules ((guix build ocaml-build-system)
+                    (guix build utils)
+                    (ice-9 ftw))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)
+           (add-after 'unpack 'fix-build-with-latest-ocaml
+             (lambda _
+               (substitute* "myocamlbuild.ml"
+                 (("dep \\[\"c_pam\"\\]" m)
+                  (string-append "flag [\"ocaml\"; \"compile\"] (A \"-unsafe-string\");\n"
+                                 m))
+                 (("let run_and_read" m)
+                  (string-append "
+let split s ch =
+  let x = ref [] in
+  let rec go s =
+    let pos = String.index s ch in
+    x := (String.before s pos)::!x;
+    go (String.after s (pos + 1))
+  in
+  try go s
+  with Not_found -> !x
+let split_nl s = split s '\\n'
+let before_space s =
+  try String.before s (String.index s ' ')
+  with Not_found -> s
+
+" m))
+                 (("run_and_read \"ocamlfind list \\| cut -d' ' -f1\"" m)
+                  (string-append "List.map before_space (split_nl & " m ")"))
+                 (("    blank_sep_strings &") "")
+                 (("      Lexing.from_string &") ""))
+               #t))
+           (add-after 'unpack 'replace-bundled-cddlib
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((cddlib-src (assoc-ref inputs "cddlib-src"))
+                      (local-dir "cddlib_guix"))
+                 (mkdir local-dir)
+                 (with-directory-excursion local-dir
+                   (invoke "tar" "xvf" cddlib-src))
+                 (let ((cddlib-src-folder
+                        (string-append local-dir "/"
+                                       (list-ref (scandir local-dir) 2)
+                                       "/lib-src")))
+                   (for-each make-file-writable (find-files "cdd_src" ".*"))
+                   (for-each
+                    (lambda (file)
+                      (copy-file file
+                                 (string-append "cdd_src/" (basename file))))
+                    (find-files cddlib-src-folder ".*[ch]$")))
+                 #t)))
+           (add-after 'unpack 'fix-makefile
+             (lambda _
+               ;; Remove system calls to 'git'.
+               (substitute* "Makefile"
+                 (("^DESCRIPT:=pplacer-.*")
+                  (string-append
+                   "DESCRIPT:=pplacer-$(shell uname)-v" ,version "\n")))
+               (substitute* "myocamlbuild.ml"
+                 (("git describe --tags --long .*\\\" with")
+                  (string-append
+                   "echo -n v" ,version "-" ,commit "\" with")))
+               #t))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin")))
+                 (copy-recursively "bin" bin))
+               #t)))))
+      (inputs
+       `(("zlib" ,zlib "static")
+         ("gsl" ,gsl)
+         ("ocaml-ounit" ,ocaml-ounit)
+         ("ocaml-batteries" ,ocaml-batteries)
+         ("ocaml-camlzip" ,camlzip)
+         ("ocaml-csv" ,ocaml-csv)
+         ("ocaml-sqlite3" ,ocaml-sqlite3)
+         ("ocaml-xmlm" ,ocaml-xmlm)
+         ("ocaml-mcl" ,ocaml-mcl)
+         ("ocaml-gsl" ,ocaml-gsl-1)))
+      (native-inputs
+       `(("cddlib-src" ,(package-source cddlib))
+         ("ocamlbuild" ,ocamlbuild)
+         ("pkg-config" ,pkg-config)))
+      (propagated-inputs
+       `(("pplacer-scripts" ,pplacer-scripts)))
+      (synopsis "Phylogenetic placement of biological sequences")
+      (description
+       "Pplacer places query sequences on a fixed reference phylogenetic tree
+to maximize phylogenetic likelihood or posterior probability according to a
+reference alignment.  Pplacer is designed to be fast, to give useful
+information about uncertainty, and to offer advanced visualization and
+downstream analysis.")
+      (home-page "http://matsen.fhcrc.org/pplacer")
+      (license license:gpl3))))
+
+;; This package is installed alongside 'pplacer'.  It is a separate package so
+;; that it can use the python-build-system for the scripts that are
+;; distributed alongside the main OCaml binaries.
+(define pplacer-scripts
+  (package
+    (inherit pplacer)
+    (name "pplacer-scripts")
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'enter-scripts-dir
+           (lambda _ (chdir "scripts") #t))
+         (replace 'check
+           (lambda _ (invoke "python" "-m" "unittest" "discover" "-v") #t))
+         (add-after 'install 'wrap-executables
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               (let ((path (string-append
+                            (assoc-ref inputs "hmmer") "/bin:"
+                            (assoc-ref inputs "infernal") "/bin")))
+                 (display path)
+                 (wrap-program (string-append bin "/refpkg_align.py")
+                   `("PATH" ":" prefix (,path))))
+               (let ((path (string-append
+                            (assoc-ref inputs "hmmer") "/bin")))
+                 (wrap-program (string-append bin "/hrefpkg_query.py")
+                   `("PATH" ":" prefix (,path)))))
+             #t)))))
+    (inputs
+     `(("infernal" ,infernal)
+       ("hmmer" ,hmmer)))
+    (propagated-inputs
+     `(("python-biopython" ,python2-biopython)
+       ("taxtastic" ,taxtastic)))
+    (synopsis "Pplacer Python scripts")))
+
+(define-public python2-checkm-genome
+  (package
+    (name "python2-checkm-genome")
+    (version "1.0.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "checkm-genome" version))
+       (sha256
+        (base32
+         "0bm8gpxjmzxsxxl8lzwqhgx8g1dlnmp6znz7wv3hgb0gdjbf9dzz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:tests? #f)) ; some tests are interactive
+    (propagated-inputs
+     `(("python-dendropy" ,python2-dendropy)
+       ("python-matplotlib" ,python2-matplotlib)
+       ("python-numpy" ,python2-numpy)
+       ("python-pysam" ,python2-pysam)
+       ("python-scipy" ,python2-scipy)))
+    (home-page "http://pypi.python.org/pypi/checkm/")
+    (synopsis "Assess the quality of putative genome bins")
+    (description
+     "CheckM provides a set of tools for assessing the quality of genomes
+recovered from isolates, single cells, or metagenomes.  It provides robust
+estimates of genome completeness and contamination by using collocated sets of
+genes that are ubiquitous and single-copy within a phylogenetic lineage.
+Assessment of genome quality can also be examined using plots depicting key
+genomic characteristics (e.g., GC, coding density) which highlight sequences
+outside the expected distributions of a typical genome.  CheckM also provides
+tools for identifying genome bins that are likely candidates for merging based
+on marker set compatibility, similarity in genomic characteristics, and
+proximity within a reference genome.")
+    (license license:gpl3+)))
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 90f23452f7..2969228ee9 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -96,13 +96,13 @@ data units.")
 (define-public khal
   (package
     (name "khal")
-    (version "0.10.0")
+    (version "0.10.1")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "khal" version))
              (sha256
               (base32
-               "1p49f3g25x900vk32spjbr2aipj12kcbhayny2vwhdpkjlv6k396"))))
+               "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
@@ -146,7 +146,7 @@ data units.")
     (synopsis "Console calendar program")
     (description "Khal is a standards based console calendar program,
 able to synchronize with CalDAV servers through vdirsyncer.")
-    (home-page "http://lostpackets.de/khal/")
+    (home-page "https://lostpackets.de/khal/")
     (license license:expat)))
 
 (define-public remind
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index f16f4ca4f8..2193a94f86 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -863,3 +863,108 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
 blanking CD-RW media, creating ISO-9660 file system images, extracting audio
 CD data, and more.  It's mostly compatible with @code{cdrtools}.")
     (license gpl2+)))
+
+(define-public libmirage
+  (package
+    (name "libmirage")
+    (version "3.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://downloads.sourceforge.net/cdemu/libmirage-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1ydph33sfxplp4872dp8ghp574jk5d4qr8hqz61qnznq1b11cnbr"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("glib" ,glib)))
+    (arguments
+     ;; No tests.
+     '(#:tests? #f))
+    (home-page "https://cdemu.sourceforge.io/")
+    (synopsis "CD-ROM image access library")
+    (description "libMirage is a CD-ROM image access library.  It supports the
+following formats: B6T, C2D, CCD, CDI, CIF, CUE, ISO, MDS, MDX, NRG, TOC.  It
+is written in C and based on GLib.  Its aim is to provide uniform access to
+the data stored in various image formats.")
+    (license gpl2+)))
+
+(define-public cdemu-daemon
+  (package
+    (name "cdemu-daemon")
+    (version "3.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://downloads.sourceforge.net/cdemu/cdemu-daemon/cdemu-daemon-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "171qqcziqgf6dd9n8xs9hc71krhjiyx9qr767s8znidyjj88hbc4"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("libmirage" ,libmirage)
+       ("glib" ,glib)
+       ("ao" ,ao)))
+    (arguments
+     ;; No tests.
+     '(#:tests? #f))
+    (home-page "https://cdemu.sourceforge.io/")
+    (synopsis "CD/DVD-ROM device emulator")
+    (description "CDemu is a software suite designed to emulate an optical
+drive and disc (including CD-ROMs and DVD-ROMs).")
+    (license gpl2+)))
+
+(define-public cdemu-client
+  (package
+    (name "cdemu-client")
+    (version "3.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://downloads.sourceforge.net/cdemu/cdemu-client-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1zwz987pb2pakfk9kz8a6xa9hq1ip48cn4ryl9z85dik8k2sizm9"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)))
+    (inputs
+     `(("python" ,python)
+       ("python-pygobject" ,python-pygobject)
+       ("cdemu-daemon" ,cdemu-daemon)))
+    (arguments
+     ;; No tests.
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'patch-shebang
+           (lambda* (#:key outputs #:allow-other-keys)
+             (patch-shebang (string-append (assoc-ref outputs "out")
+                                           "/bin/cdemu"))
+             #t))
+         (add-after 'patch-shebang 'wrap-program
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((prog (string-append (assoc-ref outputs "out")
+                                        "/bin/cdemu")))
+               (wrap-program prog
+                 `("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
+               #t))))))
+    (home-page "https://cdemu.sourceforge.io/")
+    (synopsis "Command-line client for controlling cdemu-daemon")
+    (description "CDEmu client is a simple command-line client for controlling
+CDEmu daemon.
+
+It provides a way to perform the key tasks related to controlling the CDEmu
+daemon, such as loading and unloading devices, displaying devices' status and
+retrieving/setting devices' debug masks.")
+    (license gpl2+)))
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm
index c3b72ea063..2b32bf8791 100644
--- a/gnu/packages/conky.scm
+++ b/gnu/packages/conky.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
-;;; Copyright © 2018 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.
@@ -37,16 +37,16 @@
   (package
     (name "conky")
     (home-page "https://github.com/brndnmtthws/conky")
-    (version "1.11.2")
+    (version "1.11.3")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url home-page)
              (commit (string-append "v" version))))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"))))
+        (base32 "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; there are no tests
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 1290dd010d..39262b87da 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,15 +44,14 @@
 (define-public connman
   (package
     (name "connman")
-    (version "1.36")
+    (version "1.37")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kernel.org/linux/network/connman/"
-                            name "-" version ".tar.xz"))
+                            "connman-" version ".tar.xz"))
     (sha256
-     (base32
-      "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7"))))
+     (base32 "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -63,8 +62,6 @@
              "--enable-vpnc"
              "--enable-pptp"
              "--enable-l2tp"
-             ;; location for daemon state files and internal configuration
-             ;; needs to be writeable
              "--localstatedir=/var"
              (string-append
               "--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 94d2c1aca0..47cd1d7217 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -242,14 +242,14 @@ single step.")
 (define-public r-rvest
   (package
     (name "r-rvest")
-    (version "0.3.2")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rvest" version))
        (sha256
         (base32
-         "04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"))))
+         "0vsm38w83zf0djcrc5ymb1ysg88hmgq2w937ql7pqgvk5px8f2mi"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-httr" ,r-httr)
@@ -2515,14 +2515,14 @@ Delaunay triangulation and convex hull computation.")
 (define-public r-ddalpha
   (package
     (name "r-ddalpha")
-    (version "1.3.8")
+    (version "1.3.9")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ddalpha" version))
        (sha256
         (base32
-         "0gi0hl14ghgf65zxsvgzh9z6xx1nyi49cpx192lmwrwqn3dy7ba0"))))
+         "1vzs0cvl6xw3h9i00rg3hs02xwgxcnh8326y10kxmhs3qq4m7nb2"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bh" ,r-bh)
@@ -2674,14 +2674,14 @@ by base R methods related to model fitting.")
 (define-public r-broom
   (package
     (name "r-broom")
-    (version "0.5.1")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "broom" version))
        (sha256
         (base32
-         "0bmf38yvwalqf5j5yrr48nsk5k3n75s0gwcw621hp5lgrgvnp7ns"))))
+         "0qmclih5dm5sqzy4hplcfy677kr12pm9pnpv3r319g14dd27pbqn"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-backports" ,r-backports)
@@ -3701,14 +3701,14 @@ terminals.")
 (define-public r-tinytex
   (package
     (name "r-tinytex")
-    (version "0.11")
+    (version "0.12")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tinytex" version))
        (sha256
         (base32
-         "017g0niwmx8qafsn9b01gp60j5fgwxch0dnkmjgpxxr1k4h1r64x"))))
+         "03ggxbd4y1ipcmjw5ixa6g6wg4ydargnln7g08bdrdi96zyyq1fh"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-xfun" ,r-xfun)))
@@ -5181,14 +5181,14 @@ obtain a better initial configuration in non-metric MDS.")
 (define-public r-reticulate
   (package
     (name "r-reticulate")
-    (version "1.11.1")
+    (version "1.12")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "reticulate" version))
        (sha256
         (base32
-         "1cyb92dvv9iibsk28i0gm5hm2xqbsn0y6d67id74c8rhai9y8i9v"))))
+         "0pqr1rcs8yg9nlh729mvlws93cqhpmv49j9bcgarh7vxzkwyv0kb"))))
     (build-system r-build-system)
     (inputs `(("python" ,python)))
     (propagated-inputs
@@ -7979,14 +7979,14 @@ terminals that do not support Unicode.")
 (define-public r-usethis
   (package
     (name "r-usethis")
-    (version "1.4.0")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "usethis" version))
        (sha256
         (base32
-         "1gadckx3sxz9gxvpkprj9x7zcgg2nz5m4q0vi76ya9li1v03rwwn"))))
+         "0pn6ka3726psaqlx573g6nxi90apf0rn5m4k2lz1jr66xdc19sag"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-clipr" ,r-clipr)
@@ -7998,10 +7998,13 @@ terminals that do not support Unicode.")
        ("r-gh" ,r-gh)
        ("r-git2r" ,r-git2r)
        ("r-glue" ,r-glue)
+       ("r-purrr" ,r-purrr)
        ("r-rlang" ,r-rlang)
        ("r-rprojroot" ,r-rprojroot)
        ("r-rstudioapi" ,r-rstudioapi)
-       ("r-whisker" ,r-whisker)))
+       ("r-whisker" ,r-whisker)
+       ("r-withr" ,r-withr)
+       ("r-yaml" ,r-yaml)))
     (home-page "https://github.com/r-lib/usethis")
     (synopsis "Automate R package and project setup")
     (description
@@ -8037,14 +8040,14 @@ more information about packages, and where they were installed from.")
 (define-public r-remotes
   (package
     (name "r-remotes")
-    (version "2.0.2")
+    (version "2.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "remotes" version))
        (sha256
         (base32
-         "0rsjxmhwpr51ilsdjfqn06mj8yr2d7nckcn3arv1ljn23qfkpcxa"))))
+         "1jbn4kjimcr82zv5lnqxqa2487a96vn6jxf7wc6gnpxr6k06d61p"))))
     (build-system r-build-system)
     (home-page "https://github.com/r-lib/remotes#readme")
     (synopsis "R package installation from remote repositories")
@@ -8161,14 +8164,14 @@ ways.")
 (define-public r-summarytools
   (package
     (name "r-summarytools")
-    (version "0.9.2")
+    (version "0.9.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "summarytools" version))
        (sha256
         (base32
-         "1q83kii6prqf9z5v8cxj1q2944kx9x7dcxyqix3m883a94dmgivy"))))
+         "1wfbkgvicaic37zgpr6zcm4a58yx43p59h0sqggdj44ncqs7147f"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-checkmate" ,r-checkmate)
@@ -8181,6 +8184,7 @@ ways.")
        ("r-pryr" ,r-pryr)
        ("r-rapportools" ,r-rapportools)
        ("r-rcurl" ,r-rcurl)
+       ("r-tibble" ,r-tibble)
        ("r-tidyr" ,r-tidyr)))
     (home-page "https://github.com/dcomtois/summarytools")
     (synopsis "Tools to quickly and neatly summarize data")
@@ -10618,14 +10622,14 @@ regression coefficients can be conducted via jackknifing.")
 (define-public r-huge
   (package
     (name "r-huge")
-    (version "1.3.1")
+    (version "1.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "huge" version))
        (sha256
         (base32
-         "06s22i2cdn6g2r8kq5csyspinayh8dxxg9gkwcf4sa1lmrgb0bf9"))))
+         "1j93gvi1jyq3ld9jhdqhrpm2is54rk3ilmf3yw7fx6gva0y6hjqd"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-igraph" ,r-igraph)
@@ -11806,14 +11810,14 @@ al. (2010).")
 (define-public r-reinforcelearn
   (package
     (name "r-reinforcelearn")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "reinforcelearn" version))
        (sha256
         (base32
-         "0naakmyb14d2cf7cy5ir52qh3bp51gvs6hyhfi3f72yl2jfnnpzg"))))
+         "176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-checkmate" ,r-checkmate)
@@ -12721,14 +12725,14 @@ that accept short and long options.")
 (define-public r-wgcna
   (package
     (name "r-wgcna")
-    (version "1.66")
+    (version "1.67")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "WGCNA" version))
        (sha256
         (base32
-         "0rhnyhzfn93yp24jz9v6dzrmyizwzdw070a7idm0k33w1cm8sjqv"))))
+         "09387w85lxvwr8ax2i2h602b4dgfv4wbvsl9aj1q0b1vfs4rkk69"))))
     (properties `((upstream-name . "WGCNA")))
     (build-system r-build-system)
     (propagated-inputs
@@ -13860,3 +13864,27 @@ making it possible to download files over HTTPS across platforms.  The
 @code{RCurl} package provides this functionality (and much more) but has
 external dependencies.  This package has is implemented purely in R.")
     (license license:gpl2)))
+
+(define-public r-rex
+  (package
+    (name "r-rex")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "rex" version))
+       (sha256
+        (base32
+         "0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-lazyeval" ,r-lazyeval)
+       ("r-magrittr" ,r-magrittr)))
+    (home-page "https://github.com/kevinushey/rex")
+    (synopsis "Friendly regular expressions")
+    (description
+     "This package provides a friendly interface for the construction of
+regular expressions.  Regular expressions are a very powerful feature, however
+they are often difficult to interpret.  Rex allows you to build complex
+regular expressions from human readable expressions")
+    (license license:expat)))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 11ca214f7c..ed46f897b0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -82,6 +82,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages perl-web)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages python)
@@ -984,6 +985,92 @@ for example from a shell script.")
     ;; others (like sparql-query.c) contain a GPLv2+ license header.
     (license (list license:gpl3+))))
 
+(define-public sqitch
+  (package
+    (name "sqitch")
+    (version "0.9999")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1cvj8grs3bzc4g7dw1zc26g4biv1frav18sq0fkvi2kk0q1aigzm"))))
+    (build-system perl-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'set-check-environment
+           (lambda _
+             (setenv "TZ" "UTC")
+             (setenv "HOME" "/tmp")
+             #t))
+         (add-after 'install 'wrap-program
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (path (getenv "PERL5LIB")))
+               (wrap-program (string-append out "/bin/sqitch")
+                 `("PERL5LIB" ":" prefix
+                   (,(string-append out "/lib/perl5/site_perl"
+                                    ":"
+                                    path)))))
+             #t)))))
+    (native-inputs
+     `(("perl-capture-tiny" ,perl-capture-tiny)
+       ("perl-io-pager" ,perl-io-pager)
+       ("perl-module-build" ,perl-module-build)
+       ("perl-module-runtime" ,perl-module-runtime)
+       ("perl-path-class" ,perl-path-class)
+       ("perl-test-deep" ,perl-test-deep)
+       ("perl-test-dir" ,perl-test-dir)
+       ("perl-test-exception" ,perl-test-exception)
+       ("perl-test-file" ,perl-test-file)
+       ("perl-test-file-contents" ,perl-test-file-contents)
+       ("perl-test-mockmodule" ,perl-test-mockmodule)
+       ("perl-test-nowarnings" ,perl-test-nowarnings)
+       ("perl-test-warn" ,perl-test-warn)))
+    (inputs
+     `(("perl-class-xsaccessor" ,perl-class-xsaccessor)
+       ("perl-clone" ,perl-clone)
+       ("perl-config-gitlike" ,perl-config-gitlike)
+       ("perl-datetime" ,perl-datetime)
+       ("perl-datetime-timezone" ,perl-datetime-timezone)
+       ("perl-dbd-pg" ,perl-dbd-pg)
+       ("perl-dbi" ,perl-dbi)
+       ("perl-devel-stacktrace" ,perl-devel-stacktrace)
+       ("perl-encode-locale" ,perl-encode-locale)
+       ("perl-file-homedir" ,perl-file-homedir)
+       ("perl-hash-merge" ,perl-hash-merge)
+       ("perl-ipc-run3" ,perl-ipc-run3)
+       ("perl-ipc-system-simple" ,perl-ipc-system-simple)
+       ("perl-libintl-perl" ,perl-libintl-perl)
+       ("perl-list-moreutils" ,perl-list-moreutils)
+       ("perl-moo" ,perl-moo)
+       ("perl-mysql-config" ,perl-mysql-config)
+       ("perl-namespace-autoclean" ,perl-namespace-autoclean)
+       ("perl-path-class" ,perl-path-class)
+       ("perl-perlio-utf8_strict" ,perl-perlio-utf8_strict)
+       ("perl-string-formatter" ,perl-string-formatter)
+       ("perl-string-shellquote" ,perl-string-shellquote)
+       ("perl-sub-exporter" ,perl-sub-exporter)
+       ("perl-template-tiny" ,perl-template-tiny)
+       ("perl-template-toolkit" ,perl-template-toolkit)
+       ("perl-throwable" ,perl-throwable)
+       ("perl-try-tiny" ,perl-try-tiny)
+       ("perl-type-tiny" ,perl-type-tiny)
+       ("perl-type-tiny-xs" ,perl-type-tiny-xs)
+       ("perl-uri" ,perl-uri)
+       ("perl-uri-db" ,perl-uri-db)))
+    (home-page "https://sqitch.org/")
+    (synopsis "Database change management tool")
+    (description
+     "Sqitch is a standalone change management system for database schemas,
+which uses SQL to describe changes.")
+    (license license:x11)))
+
 (define-public sqlcrush
   ;; Unfortunately, there is no proper upstream release and may never be.
   (let ((commit "b5f6868f189566a26eecc78d0f0659813c1aa98a")
@@ -1319,6 +1406,29 @@ module, and nothing else.")
     (license license:perl-license)
     (home-page "https://metacpan.org/release/DBD-SQLite")))
 
+(define-public perl-mysql-config
+  (package
+    (name "perl-mysql-config")
+    (version "1.04")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DA/DARREN/MySQL-Config-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1svn7ccw2gc4cazvc58j84rxhnc9vs01zpird0l8460598j475qr"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/MySQL-Config")
+    (synopsis "Parse and utilize MySQL's /etc/my.cnf and ~/.my.cnf files")
+    (description
+     "@code{MySQL::Config} emulates the @code{load_defaults} function from
+libmysqlclient.  It will fill an aray with long options, ready to be parsed by
+@code{Getopt::Long}.")
+    (license license:perl-license)))
+
 (define-public perl-sql-abstract
   (package
     (name "perl-sql-abstract")
diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm
index 29d5e451d2..2ef118339f 100644
--- a/gnu/packages/dc.scm
+++ b/gnu/packages/dc.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,14 +33,14 @@
 (define-public ncdc
   (package
     (name "ncdc")
-    (version "1.20")
+    (version "1.21")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "http://dev.yorhel.nl/download/ncdc-" version
                            ".tar.gz"))
        (sha256 (base32
-                "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"))))
+                "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"))))
     (build-system gnu-build-system)
     (inputs
      `(("bzip2" ,bzip2)
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 49e40ee9cd..b035951e26 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
@@ -92,11 +92,10 @@ program to exhibit a bug.")
     ;; home-page pointing to a bsd-2 license.
     (license bsd-3)))
 
-;; Newer versions depend on LLVM and Clang >= 4, which have yet to be packaged.
 (define-public c-reduce
   (package
     (name "c-reduce")
-    (version "2.6.0")
+    (version "2.8.0")
     (source
      (origin
       (method url-fetch)
@@ -105,12 +104,12 @@ program to exhibit a bug.")
                            "creduce-" version ".tar.gz")))
       (sha256
        (base32
-        "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"))))
+        "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp"))))
     (build-system gnu-build-system)
     (inputs
      `(("astyle"          ,astyle)
-       ("llvm"            ,llvm-3.9.1)
-       ("clang"           ,clang-3.9.1)
+       ("llvm"            ,llvm-6)
+       ("clang"           ,clang-6)
        ("flex"            ,flex)
        ("indent"          ,indent)
        ("perl"            ,perl)
@@ -118,11 +117,16 @@ program to exhibit a bug.")
        ("file-which"      ,perl-file-which)
        ("getopt-tabular"  ,perl-getopt-tabular)
        ("regex-common"    ,perl-regexp-common)
-       ("sys-cpu"         ,perl-sys-cpu)
        ("term-readkey"    ,perl-term-readkey)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (with-directory-excursion "tests"
+               ;; Running all tests can take a looong time, and tests 4 and 5
+               ;; require frama-c or kcc.  So run just one for sanity.
+               (invoke "./run_tests" "1"))))
          (add-after 'install 'set-load-paths
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Tell creduce where to find the perl modules it needs.
@@ -137,7 +141,7 @@ program to exhibit a bug.")
                                           ,(package-version perl)))
                          '("term-readkey"    "exporter-lite"
                            "file-which"      "getopt-tabular"
-                           "regex-common"    "sys-cpu")))))
+                           "regex-common")))))
              #t)))))
     (home-page "https://embed.cs.utah.edu/creduce")
     (synopsis "Reducer for interesting code")
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index c164ed849a..3b0c799dc3 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015, 2018 Pjotr Prins <pjotr.guix@thebird.nl>
 ;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,15 +81,15 @@ and freshness without requiring additional information from the user.")
     (package
       (name "ldc")
       (version "0.17.4")
-      (source (origin
-                (method url-fetch)
-                (uri (string-append
-                      "https://github.com/ldc-developers/ldc/archive/v"
-                      version ".tar.gz"))
-                (file-name (string-append name "-" version ".tar.gz"))
-                (sha256
-                 (base32
-                  "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ldc-developers/ldc.git")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0nnrjavfmpfp7bib04isqlxvyzh6mlvsdan0gxysdz96hlg4hcq8"))))
       (build-system cmake-build-system)
       (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"))
       (properties
@@ -101,11 +101,15 @@ and freshness without requiring additional information from the user.")
          (modify-phases %standard-phases
            (add-after 'unpack 'unpack-submodule-sources
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((unpack (lambda (source target)
-                               (with-directory-excursion target
-                                 (invoke "tar" "xvf"
-                                         (assoc-ref inputs source)
-                                         "--strip-components=1")))))
+               (let ((unpack (lambda (input target)
+                               (let ((source (assoc-ref inputs input)))
+                                 ;; Git checkouts are directories as long as
+                                 ;; there are no patches; tarballs otherwise.
+                                 (if (file-is-directory? source)
+                                     (copy-recursively source target)
+                                     (with-directory-excursion target
+                                       (invoke "tar" "xvf" source
+                                               "--strip-components=1")))))))
                  (unpack "phobos-src" "runtime/phobos")
                  (unpack "druntime-src" "runtime/druntime")
                  (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
@@ -147,32 +151,32 @@ and freshness without requiring additional information from the user.")
          ("unzip" ,unzip)
          ("phobos-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/phobos/archive/ldc-v"
-                   version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/phobos.git")
+                   (commit (string-append "ldc-v" version))))
+             (file-name (git-file-name "phobos" version))
              (sha256
-              (base32
-               "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz"))
+              (base32 "0i7gh99w4mi0hdv16261jcdiqyv1nkjdcwy9prw32s0lvplx8fdy"))
              (patches (search-patches "ldc-bootstrap-disable-tests.patch"))))
          ("druntime-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/druntime/archive/ldc-v"
-                   version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/druntime.git")
+                   (commit (string-append "ldc-v" version))))
+             (file-name (git-file-name "druntime" version))
              (sha256
-              (base32
-               "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx"))))
+              (base32 "0alabm3bbvs94msvxz5psiwk4f51cw9h82z1p5hhsnf8ja6d0am7"))))
          ("dmd-testsuite-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
-                   version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/dmd-testsuite.git")
+                   (commit (string-append "ldc-v" version))))
+             (file-name (git-file-name "dmd-testsuite" version))
              (sha256
-              (base32
-               "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4"))))))
+              (base32 "05qr4cgb4scfqzbw1l5pk72kil074mvj9d55b165ljyr51sgwgbl"))))))
       (home-page "http://wiki.dlang.org/LDC")
       (synopsis "LLVM-based compiler for the D programming language")
       (description
@@ -195,28 +199,33 @@ bootstrapping more recent compilers written in D.")
       (inherit ldc-bootstrap)
       (name "ldc")
       (version "1.10.0")
-      (source (origin
-                (method url-fetch)
-                (uri (string-append
-                      "https://github.com/ldc-developers/ldc/archive/v"
-                      version ".tar.gz"))
-                (file-name (string-append name "-" version ".tar.gz"))
-                (sha256
-                 (base32
-                  "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ldc-developers/ldc.git")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0qcb2rn01wql7y8qp31blbv3hwmnh3zjgzi2n7k168cxr6rrdhlp"))))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'unpack-submodule-sources
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((unpack (lambda (source target)
-                               (with-directory-excursion target
-                                 (invoke "tar" "xvf"
-                                         (assoc-ref inputs source)
-                                         "--strip-components=1")))))
+               (let ((unpack (lambda (input target)
+                               (let ((source (assoc-ref inputs input)))
+                                 ;; Git checkouts are directories as long as
+                                 ;; there are no patches; tarballs otherwise.
+                                 (if (file-is-directory? source)
+                                     (copy-recursively source target)
+                                     (with-directory-excursion target
+                                       (invoke "tar" "xvf" source
+                                               "--strip-components=1")))))))
                  (unpack "phobos-src" "runtime/phobos")
                  (unpack "druntime-src" "runtime/druntime")
-                 (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))
+                 (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite")
+                 #t)))
            (add-after 'unpack-submodule-sources 'patch-phobos
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* '("runtime/phobos/std/process.d"
@@ -224,7 +233,7 @@ bootstrapping more recent compilers written in D.")
                  (("/bin/sh") (which "sh"))
                  (("echo") (which "echo")))
                (substitute* "tests/d2/dmd-testsuite/Makefile"
-                            (("/bin/bash") (which "bash")))
+                 (("/bin/bash") (which "bash")))
                ;; disable unittests in the following files. We are discussing with
                ;; upstream
                (substitute* '("runtime/phobos/std/net/curl.d"
@@ -241,14 +250,14 @@ bootstrapping more recent compilers written in D.")
                (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d")
                ;; the following tests requires AVX instruction set in the CPU.
                (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d"
-                (("^// DISABLED: ") "^// DISABLED: linux64 "))
+                 (("^// DISABLED: ") "^// DISABLED: linux64 "))
                #t))
            (replace 'check
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      ;; some tests call into gdb binary which needs SHELL and CC set
-                      (setenv "SHELL" (which "sh"))
-                      (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
-                      (invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               ;; some tests call into gdb binary which needs SHELL and CC set
+               (setenv "SHELL" (which "sh"))
+               (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
+               (invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
       (native-inputs
        `(("llvm" ,llvm-6)
          ("clang" ,clang-6)
@@ -259,13 +268,13 @@ bootstrapping more recent compilers written in D.")
          ("gdb" ,gdb)
          ("phobos-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/phobos/archive/ldc-v"
-                   older-version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/phobos.git")
+                   (commit (string-append "ldc-v" older-version))))
+             (file-name (git-file-name "phobos" older-version))
              (sha256
-              (base32
-               "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s"))
+              (base32 "1gmlwnjdcf6s5aahadxsif9l5nyaj0rrn379g6fmhcvdk64kf509"))
              ;; This patch deactivates some tests that depend on network access
              ;; to pass.  It also deactivates some tests that have some reliance
              ;; on timezone.
@@ -278,36 +287,37 @@ bootstrapping more recent compilers written in D.")
              (patches (search-patches "ldc-disable-phobos-tests.patch"))))
          ("druntime-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/druntime/archive/ldc-v"
-                   older-version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/druntime.git")
+                   (commit (string-append "ldc-v" older-version))))
+             (file-name (git-file-name "druntime" older-version))
              (sha256
-              (base32
-               "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222"))))
+              (base32 "0a3yyjcnpvm5fbdczf76fx08kl154w17w06hlxf0j3p1p4jc85aj"))))
          ("dmd-testsuite-src"
           ,(origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v"
-                   older-version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/ldc-developers/dmd-testsuite.git")
+                   (commit (string-append "ldc-v" older-version))))
+             (file-name (git-file-name "dmd-testsuite" older-version))
              (sha256
-              (base32
-               "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99")))))))))
+              (base32 "0mm3rliki1nqiqfaha7ssvm156aa398vpvf4v6895m7nn1mz7rss")))))))))
 
 (define-public dub
   (package
     (name "dub")
     (version "1.7.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/dlang/dub/archive/"
-                                  "v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q"))))
-   (build-system gnu-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dlang/dub.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9"))))
+    (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc)
        #:phases
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 461d9f8c0c..9cffe3b822 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -569,23 +569,21 @@ Extensions} (DNSSEC).")
 (define-public knot
   (package
     (name "knot")
-    (version "2.8.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://secure.nic.cz/files/knot-dns/"
-                                  "knot-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1vw7xx7bm440jwrpvdd04vrp6ccz2b11swcn9msvs62hf0kdjjj9"))
-              (patches
-               (search-patches "knot-include-system-lmdb-header.patch"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; Delete bundled libraries.
-                  (with-directory-excursion "src/contrib"
-                    (delete-file-recursively "lmdb"))
-                  #t))))
+    (version "2.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://secure.nic.cz/files/knot-dns/"
+                           "knot-" version ".tar.xz"))
+       (sha256
+        (base32 "1im2wb8hl394mzni1wavmvfqd7il8s28kcz8w3s4v05nbhzg06xj"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete bundled libraries.
+           (with-directory-excursion "src/contrib"
+             (delete-file-recursively "lmdb"))
+           #t))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index a11ce266d2..39e7e8108b 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -43,7 +43,7 @@
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages virtualization))
 
-(define %docker-version "18.09.3")
+(define %docker-version "18.09.5")
 
 (define-public python-docker-py
   (package
@@ -241,7 +241,7 @@ network attachments.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx"))
+       (base32 "0cirpd9l2qazp2jyanwzvrkx2m98nksjdvn43ff38p89w6133ipb"))
       (patches
        (search-patches "docker-engine-test-noinstall.patch"
                        "docker-fix-tests.patch"
@@ -487,7 +487,7 @@ provisioning etc.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "09j1i668p330gjz5vw5pss8ghxh1mz7rl2q9ykp02q9p112zhy4j"))))
+       (base32 "0mxxjzkwdny8p2dmyjich7x1gn7hdlfppzjy2skk2k5bwv7nxpmi"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/docker/cli"
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c9cbbaa154..7aec695205 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2018, 2019 Brett Gilio <brettg@posteo.net>
 ;;; Copyright © 2019 Dimakakos Dimos <bendersteed@teknik.io>
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2019 mikadoZero <mikadozero@yandex.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -722,6 +723,29 @@ can take association lists, hash tables, and in some cases vectors (where the
 index is considered the key).")
     (license license:gpl3+)))
 
+(define-public emacs-ace-jump-mode
+  (package
+    (name "emacs-ace-jump-mode")
+    (version "2.0")
+    (home-page "https://github.com/winterTTr/ace-jump-mode")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb"))
+              (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (synopsis "Cursor location minor mode for fast navigation")
+    (description "Ace-jump-mode is a fast/direct cursor location minor
+mode.  It creates an N-Branch search tree internally and marks all
+the possible position with predefined keys in within the whole Emacs
+view.  This allows you to move to the character, word, or line almost
+directly.")
+    (license license:gpl3+)))
+
 (define-public emacs-anaphora
   (package
     (name "emacs-anaphora")
@@ -1117,6 +1141,34 @@ within a specified width.  It is useful for displaying long track titles.")
 ;;; Miscellaneous.
 ;;;
 
+(define-public emacs-ace-link
+  (package
+    (name "emacs-ace-link")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/abo-abo/ace-link.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "147dz79vg4ym5wg3d544bw2khdb2j3hr73rw4qfm64wf0q2dj0vk"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-avy" ,emacs-avy)))
+    (home-page "https://github.com/abo-abo/ace-link")
+    (synopsis "Quickly follow links in Emacs")
+    (description
+     "Currently, to jump to a link in a @code{Info-mode}, @code{help-mode},
+@code{woman-mode}, @code{org-mode}, @code{eww-mode}, @code{compilation-mode},
+@code{goto-address-mode} buffer, you can tab through the links to select the
+one you want.  This is an O(N) operation, where the N is the amount of links.
+This package turns this into an O(1) operation.  It does so by assigning a
+letter to each link using avy.")
+    (license license:gpl3+)))
+
 (define-public emacs-bbdb
   (package
     (name "emacs-bbdb")
@@ -1393,7 +1445,7 @@ Emacs buffer.")
 (define-public emacs-direnv
   (package
     (name "emacs-direnv")
-    (version "1.2.0")
+    (version "1.5.0")
     (source
      (origin
        (method git-fetch)
@@ -1403,7 +1455,7 @@ Emacs buffer.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh"))))
+         "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("dash" ,emacs-dash)
@@ -1538,7 +1590,7 @@ Maps directly inside Emacs.")
                 (uri (git-reference
                       (url "https://github.com/ppareit/graphviz-dot-mode.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0j1r2rspaakw37b0mx7pwpvdsvixq9sw3xjbww5piihzpdxz58z1"))))
@@ -1729,7 +1781,7 @@ and stored in memory.")
               (uri (git-reference
                     (url "https://notabug.org/alezost/emacs-bui.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0sszdl4kvqbihdh8d7mybpp0d8yw2p3gyiipjcxz9xhvvmw3ww4x"))))
@@ -1828,7 +1880,7 @@ management tasks from Emacs.  To begin with, run @code{M-x guix-about} or
               (uri (git-reference
                     (url "https://notabug.org/alezost/emacs-build-farm.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0i0bwbav5861j2y15j9nd5m9rdqg9q97zgcbld8pivr9nyxy63lz"))))
@@ -1849,15 +1901,15 @@ evaluations.  The entry point is @code{M-x build-farm} command.")
   (package
     (name "emacs-d-mode")
     (version "2.0.9")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/"
-                    "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "127aa77ix3p7w4g339bx026df9y649dahlr3v359z0hs40zjz3kd"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fzplvi1sm8k2sabfdvrd7j2xypwqh0g9v1mxa75dajdmcd85zpj"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-undercover" ,emacs-undercover)))
@@ -1915,7 +1967,7 @@ in the center.")
               (uri (git-reference
                     (url "http://dr-qubit.org/git/undo-tree.git")
                     (commit (string-append "release/" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1hnh2mnmw179gr094r561w6cw1haid0lpvpqvkc24wpj82vphzpa"))))
@@ -1931,19 +1983,19 @@ allows easily move between them.")
   (package
     (name "emacs-s")
     (version "1.12.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/magnars/s.el/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0xbl75863pcm806zg0x1lw7qznzjq2c8320k8js7apyag8q4srvh"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/magnars/s.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-       #:emacs ,emacs ; FIXME: tests fail with emacs-minimal
+       #:emacs ,emacs                   ; FIXME: tests fail with emacs-minimal
        #:test-command '("./run-tests.sh")))
     (home-page "https://github.com/magnars/s.el")
     (synopsis "Emacs string manipulation library")
@@ -1957,13 +2009,13 @@ strings.")
     (version "20160630")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/zk-phi/symon/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zk-phi/symon.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0h4jcgdnq98wc9rj72nwyazq8498yg55jfljiij5qwbn1xf1g5zz"))))
+        (base32 "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/zk-phi/symon")
     (synopsis "Tiny graphical system monitor")
@@ -2025,15 +2077,15 @@ files and directories.")
   (package
     (name "emacs-git-gutter")
     (version "0.90")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "https://github.com/syohex/" name "/archive/"
-                   version ".tar.gz"))
-             (file-name (string-append name "-" version ".tar.gz"))
-             (sha256
-              (base32
-               "1nmhvhpq1l56mj2yq3ag23rw3x4xgnsy8szp30s26l0yjnkhc4qg"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-git-gutter.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/syohex/emacs-git-gutter")
     (synopsis "See and manage hunks of text in a version control system")
@@ -2106,13 +2158,13 @@ This package also includes relevant snippets for yasnippet.")
     (version "1.25.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/rejeep/el-mock.el/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rejeep/el-mock.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "16xw94n58xxn3zvgyj72bmzs0k5lkvswjmzs79ws9n7rzdivb38b"))))
+        (base32 "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/rejeep/el-mock.el")
     (synopsis "Tiny mock and stub framework in Emacs Lisp")
@@ -2128,13 +2180,13 @@ Expectations, but it can be used in other contexts.")
     (version "0.3.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/ecukes/espuds/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ecukes/espuds.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0xv551376pbmh735a3zjwc9z4qdx6ngj1vpq3xqjpn0a1rwjyn4k"))))
+        (base32 "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-s" ,emacs-s)
@@ -2175,15 +2227,15 @@ port of @code{cl-spark} to Emacs Lisp.")
   (package
     (name "emacs-es-mode")
     (version "4.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/dakrone/es-mode/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0y86qdcb3g7fkcb4pzsjh3syzql6w3314hg1wqxq4a8bbk3y0cgr"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dakrone/es-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"))))
     (build-system emacs-build-system)
     (propagated-inputs
      ;; The version of org in Emacs 24.5 is not sufficient, and causes tables
@@ -2207,13 +2259,13 @@ mode, which displays information about Elasticsearch clusters.")
     (version "0.11.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/magnars/expand-region.el"
-                           "/archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/magnars/expand-region.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "08dy1f411sh9wwww53rjw80idcf3vpki6ba2arl4hl5jcw9651g0"))))
+        (base32 "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/magnars/expand-region.el")
     (synopsis "Increase selected region by semantic units")
@@ -2229,13 +2281,13 @@ keep pressing the key until it selects what you want.  There's also
     (version "1.89")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/alpaker/Fill-Column-Indicator"
-                           "/archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/alpaker/Fill-Column-Indicator.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "09ab01np14bdcsr38xf95kpnvxzqr46mdjmphg3pigwnx39a3jvg"))))
+        (base32 "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"))))
     (build-system emacs-build-system)
     (home-page "https://www.emacswiki.org/emacs/FillColumnIndicator")
     (synopsis "Graphically indicate the fill column")
@@ -2248,15 +2300,15 @@ column by drawing a thin line down the length of the editing window.")
   (package
     (name "emacs-grep-a-lot")
     (version "1.0.7")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/ZungBang/emacs-grep-a-lot.git")
-                    (commit "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad")))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ZungBang/emacs-grep-a-lot.git")
+             (commit "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/ZungBang/emacs-grep-a-lot")
     (synopsis "Enables multiple grep buffers in Emacs")
@@ -2270,13 +2322,13 @@ column by drawing a thin line down the length of the editing window.")
     (version "2.5.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/nonsequitur/inf-ruby/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nonsequitur/inf-ruby.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0m7323k649ckxql1grsdnf71bjhys7l4qb8wbpphb1mr1q8i4066"))))
+        (base32 "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/nonsequitur/inf-ruby")
     (synopsis "Provides a REPL buffer connected to a Ruby subprocess in Emacs")
@@ -2313,13 +2365,13 @@ IRC bouncer with ERC.")
     (version "0.3.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cask/shut-up/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cask/shut-up.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "09kzrjdkb569iviyg7ydwq44yh84m3f9hkl7jizfrlk0w4gz67d1"))))
+        (base32 "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/cask/shut-up")
     (synopsis "Silence Emacs")
@@ -2333,13 +2385,13 @@ Emacs shell script.")
     (version "0.6.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/sviridov/undercover.el/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sviridov/undercover.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0f48fi0xnbsqs382rgh85m9mq1wdnr0yib7as9xhwzvq0hsr5m0a"))))
+        (base32 "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -2357,13 +2409,13 @@ Lisp.")
     (version "1.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/tarsius/paren-face/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tarsius/paren-face.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0y4qrhxa9332vsvr999jg7qj1ymnfgwpf591yi4a4jgg90pm7qnn"))))
+        (base32 "0f128gqn170s6hl62n44i9asais75ns1mpvb4l8vzy1sc0v16c0k"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tarsius/paren-face")
     (synopsis "Face for parentheses in lisp modes")
@@ -2382,13 +2434,13 @@ subconsciously blend out the parentheses.")
     (version "0.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/purcell/page-break-lines/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/purcell/page-break-lines.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1zzhziq5kbrm9rxk30kx2glz455fp1blqxg8cpcf6l8xl3w8z4pg"))))
+        (base32 "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/purcell/page-break-lines")
     (synopsis "Display page breaks as tidy horizontal lines")
@@ -2403,13 +2455,13 @@ as horizontal rules.")
     (version "1.4.6")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/skeeto/emacs-web-server/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skeeto/emacs-web-server.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "01r7h3imnj4qx1m53a2wjafvbylcyz5f9r2rg2cs7ky3chlg220r"))))
+        (base32 "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/skeeto/emacs-http-server")
     (synopsis "HTTP server in pure Emacs Lisp")
@@ -2424,13 +2476,13 @@ serve files and directory listings.")
     (version "1.6.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/skeeto/skewer-mode/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skeeto/skewer-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "07jpz374j0j964szy3zznrkyja2kpdl3xa87wh7349mzxivqxdx0"))))
+        (base32 "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-simple-httpd" ,emacs-simple-httpd)
@@ -2454,7 +2506,7 @@ in Lisp modes.")
               (uri (git-reference
                     (url "https://github.com/akicho8/string-inflection")
                     (commit "a150e7bdda60b7824d3a936750ce23f73b0e4edd")))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k"))))
@@ -2485,13 +2537,13 @@ naming style of a symbol.  It supports different naming conventions such as:
     (version "0.2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/sabof/stripe-buffer/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sabof/stripe-buffer.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1p515dq7raly5hw94kiwm3vzsfih0d8af622q4ipvvljsm98aiik"))))
+        (base32 "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/sabof/stripe-buffer/")
     (synopsis "Add stripes to list buffers")
@@ -2506,13 +2558,13 @@ tables.")
     (version "1.0.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Malabarba/rich-minority/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Malabarba/rich-minority.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1l0cb0q7kyi88nwfqd542psnkgwnjklpzc5rx32gzd3lkwkrbr8v"))))
+        (base32 "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Malabarba/rich-minority")
     (synopsis "Clean-up and beautify the list of minor modes")
@@ -2527,13 +2579,13 @@ mode-line.")
     (version "0.8.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/dgutov/robe/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dgutov/robe.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1vp45y99fwj88z04ah4yppz4z568qcib646az6m9az5ar0f203br"))))
+        (base32 "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq"))))
     (build-system emacs-build-system)
     (arguments
      '(#:include (cons "^lib\\/" %default-include)))
@@ -2554,13 +2606,13 @@ method and constant name completion.")
     (version "1.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/pezra/rspec-mode/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pezra/rspec-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1j0a7ms5516nlg60qfyn730pfxys6acm0rgyxh5xfkpi6jafgpvw"))))
+        (base32 "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/pezra/rspec-mode")
     (synopsis "Provides a rspec mode for working with RSpec")
@@ -2579,13 +2631,13 @@ snippets for yasnippet.")
     (version "2.12.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Malabarba/smart-mode-line/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Malabarba/smart-mode-line.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1hn8s6laijmg7w1bgwdfrki6h9vxkbgr8rmmssvd5yqyad5w2sba"))))
+        (base32 "1gs4ay9hdg8gmia4ir74qawk80pqwv99hp4yhy108kpfry5mrq6z"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-rich-minority" ,emacs-rich-minority)))
@@ -2628,13 +2680,13 @@ the speedbar window.")
     (version "1.0.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/DamienCassou/shell-switcher"
-                           "/archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DamienCassou/shell-switcher.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1c23mfkdqz2g9rixd9smm323vzlvhzz3ng34ambcqjfq309qb2nz"))))
+        (base32 "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/DamienCassou/shell-switcher")
     (synopsis "Provide fast switching between shell buffers")
@@ -2651,7 +2703,7 @@ the speedbar window.")
               (uri (git-reference
                     (commit "880706469338ab59b5bb7dbe8460016f89755364")
                     (url "https://github.com/gregsexton/ob-ipython.git")))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1scf25snbds9ymagpny30ijbsg479r3nm0ih01dy4m9d0g7qryb7"))))
@@ -2722,10 +2774,10 @@ framework for Emacs Lisp to be used with @code{ert}.")
               (uri (git-reference
                     (url home-page)
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"))
-              (file-name (string-append name "-" version))))
+                "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
@@ -2765,10 +2817,10 @@ for asynchronous tasks.")
               (uri (git-reference
                     (url home-page)
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj"))
-              (file-name (string-append name "-" version))))
+                "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-deferred" ,emacs-deferred)))
@@ -2787,13 +2839,13 @@ build jobs.")
     (version "0.9.7")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/company-mode/company-mode/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/company-mode/company-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "19flv38f2qhxda8lbk2ckywvibd72vbzmn4hchqz6d8acsknh4sb"))))
+        (base32 "1gpapjxs4l6fmmj22q0q1pyhj1yd9j5iqfqnjf1abskkj69lqkpj"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
@@ -2828,10 +2880,10 @@ These are distributed in separate files and can be used individually.")
               (uri (git-reference
                     (url (string-append home-page ".git"))
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+                "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"))))
     (build-system emacs-build-system)
     (inputs `(("server" ,emacs-irony-mode-server)))
     (arguments `(#:phases
@@ -2900,9 +2952,9 @@ with irony-mode using clang-tooling.")
               (uri (git-reference
                     (url "https://github.com/Sarcasm/flycheck-irony.git")
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
-               (base32 "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996"))
-              (file-name (string-append name "-" version))))
+               (base32 "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996"))))
     (build-system emacs-build-system)
     (inputs
      `(("irony-mode" ,emacs-irony-mode)
@@ -2924,8 +2976,9 @@ irony-mode do the syntax checking.")
        (uri (git-reference
              (url "https://github.com/ikirill/irony-eldoc.git")
              (commit "0df5831eaae264a25422b061eb2792aadde8b3f2")))
-       (sha256 (base32 "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"))
-       (file-name (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"))))
     (build-system emacs-build-system)
     (inputs
      `(("irony-mode" ,emacs-irony-mode)))
@@ -2941,14 +2994,13 @@ for the current function or variable in the minibuffer.")
     (version "2.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/expez/company-quickhelp/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/expez/company-quickhelp.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0xrn2z1dgk5gmkmp2jkn9g83ckk39lqp5pyyv8rl7f6gqvib3qh0"))))
+        (base32 "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-pos-tip" ,emacs-pos-tip)
@@ -2965,13 +3017,13 @@ completion candidate when using the Company text completion framework.")
     (version "1.4.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/magnars/multiple-cursors.el/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/magnars/multiple-cursors.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0hihihlvcvzayg5fnqzcg45fhvlmq6xlq58syy00rjwbry9w389k"))))
+        (base32 "1ijgvzv5r44xqvz751fd5drbvrspapw6xwv47582w255j363r6ss"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/magnars/multiple-cursors.el")
     (synopsis "Multiple cursors for Emacs")
@@ -2990,10 +3042,10 @@ simultaneous cursors.")
               (uri (git-reference
                     (url home-page)
                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2"))
-              (file-name (string-append name "-" version))))
+                "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2"))))
     (build-system emacs-build-system)
     (synopsis "Minor mode for typographic editing")
     (description
@@ -3039,11 +3091,11 @@ characters and asynchronous fetching of completion candidates.")
       (version (string-append "20151223." (string-take commit 8)))
       (source
        (origin
-         (file-name (string-append name "-" version))
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ashinn/scheme-complete.git")
                (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "141wn9l0m33w0g3dqmx8nxbfdny1r5xbr6ak61rsz21bk0qafs7x"))
@@ -3072,7 +3124,7 @@ to a key in your preferred mode.")
          (uri (git-reference
                (url "https://github.com/supercollider/scel.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0jvmzs1lsjyndqshhii2y4mnr3wghai26i3p75453zrpxpg0zvvw"))))
@@ -3186,13 +3238,13 @@ identifiers in the MIT-Scheme documentation.")
     (home-page "https://staff.fnwi.uva.nl/c.dominik/Tools/constants")
     (source
      (origin
-       (file-name (string-append name "-" version ".tar.gz"))
-       (method url-fetch)
-       (uri (string-append "https://github.com/fedeinthemix/emacs-constants"
-                           "/archive/v" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fedeinthemix/emacs-constants.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0pnrpmmxq8mh5h2hbrp5vcym0j0fh6dv3s7c5ccn18wllhzg9g7n"))))
+        (base32 "0f5sh6b45a8p9kancjp9jk44ws8ww6x50a0i6zgyyvr7dbvii1a0"))))
     (build-system emacs-build-system)
     (synopsis "Enter definition of constants into an Emacs buffer")
     (description
@@ -3206,13 +3258,13 @@ constants and units into an Emacs buffer.")
     (version "1.4.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/magnars/tagedit/"
-                           "archive/" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/magnars/tagedit.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1apfnann4qklfdsmdi7icjsj18x7gwx8d83iqr4z25clszz95xfq"))))
+        (base32 "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-s" ,emacs-s)
@@ -3230,14 +3282,13 @@ in @code{html-mode}.")
     (version "2.23")
     (source
      (origin
-       (file-name (string-append name "-" version ".tar.gz"))
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/slime/slime/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/slime/slime.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "01gkrqfpifcx1vipwrbhns2r4s8izp3z1w4p41azc943s1a2d5nc"))))
+        (base32 "0i637n0ragpbj39hqx65nx5k99xf0464c4w6w1qpzykm6z42grky"))))
     (build-system emacs-build-system)
     (native-inputs
      `(("texinfo" ,texinfo)))
@@ -3247,6 +3298,10 @@ in @code{html-mode}.")
                    "^contrib/Makefile$" "^contrib/README.md$")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (add-before 'install 'configure
            (lambda* _
              (emacs-substitute-variables "slime.el"
@@ -3290,15 +3345,15 @@ for compilation, debugging, documentation lookup, and so on.")
   (package
     (name "emacs-popup")
     (version "0.5.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/auto-complete/popup-el/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1yrgfj8y69xmcb6kwgplhq68ndm9410qwh7sd2knnd1gchpphdc0"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/auto-complete/popup-el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/auto-complete/popup-el")
     (synopsis "Visual Popup User Interface for Emacs")
@@ -3312,15 +3367,15 @@ and popup menus.")
   (package
     (name "emacs-python-environment")
     (version "0.0.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tkf/emacs-python-environment/")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tkf/emacs-python-environment/")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-deferred" ,emacs-deferred)))
@@ -3420,7 +3475,7 @@ linting of manifests and integration with Puppet Debugger.")
          (uri (git-reference
                (url "https://github.com/chrisdone/god-mode.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix"))))
@@ -3440,13 +3495,13 @@ insertion mode.  When enabled all keys are implicitly prefixed with
     (version "0.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/paradoxxxzero/jinja2-mode/"
-                           "archive/v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/paradoxxxzero/jinja2-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0cgxjab1kla2zc2fj7bzib6i7snp08zshandmp9kqcm85l262xpn"))))
+        (base32 "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/paradoxxxzero/jinja2-mode")
     (synopsis "Major mode for jinja2")
@@ -3535,13 +3590,13 @@ number.")
     (version "0.2.4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/sabof/org-bullets/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sabof/org-bullets.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1dyxvpb73vj80v8br2q9rf255hfphrgaw91fbvwdcd735np9pcnh"))))
+        (base32 "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/sabof/org-bullets")
     (synopsis "Show bullets in org-mode as UTF-8 characters")
@@ -3556,14 +3611,13 @@ number.")
     (version "2.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/lolownia/org-pomodoro/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/lolownia/org-pomodoro.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1jalsggw3q5kvj353f84x4nl04a5vmq07h75ggppy1627lb31zm4"))))
+        (base32 "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-alert" ,emacs-alert)))
@@ -3583,15 +3637,15 @@ started with 20 minutes.  All values are customizable.")
   (package
     (name "emacs-org-trello")
     (version "0.8.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/org-trello/org-trello/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0549mnf5cgwn8b8jbl38fljbaxmh1605sv9j8f3lsa95jhs1zpa0"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/org-trello/org-trello.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -3657,15 +3711,15 @@ organizer.")
   (package
     (name "emacs-zenburn-theme")
     (version "2.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/bbatsov/zenburn-emacs/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0qc9d1rwq55yzh8shbppyd6izy1grpyr8kqh5zdgm7c5jccngpr4"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bbatsov/zenburn-emacs.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1n87r5hs7h5r8dgfid66skpzcypl9hssr9m3npp916g6jfsi782f"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/bbatsov/zenburn-emacs")
     (synopsis "Low contrast color theme for Emacs")
@@ -3787,15 +3841,15 @@ library.")
   (package
     (name "emacs-smartparens")
     (version "1.11.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/Fuco1/smartparens/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0q5as813xs8y29i3v2rm97phd6m7xsmmw6hwbvx57gwmi8i1c409"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Fuco1/smartparens.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zij2f2rjjym98w68jkp10n1ckpfprlkk217c3fg16hz5nq4vnm6"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -3818,15 +3872,15 @@ well as completely new features.")
   (package
     (name "emacs-highlight-symbol")
     (version "1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/nschum/highlight-symbol.el/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1n7k1qns0fn0jsyc0hrjac5nzk21xw48yc30vyrhwvc51h0b9g90"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nschum/highlight-symbol.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6"))))
     (build-system emacs-build-system)
     (home-page "https://nschum.de/src/emacs/highlight-symbol")
     (synopsis "Automatic and manual symbol highlighting for Emacs")
@@ -4031,7 +4085,7 @@ parallel.")
               (uri (git-reference
                     (url "https://github.com/tkf/emacs-request.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"))))
@@ -4107,7 +4161,7 @@ automatically.")
        (uri (git-reference
              (url "https://github.com/abo-abo/swiper.git")
              (commit version)))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "009n8zjycs62cv4i1k9adbb284wz2w3r13xki2740sj34k683v13"))))
@@ -4174,13 +4228,13 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled
     (version "0.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Yevgnen/ivy-rich/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Yevgnen/ivy-rich.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "14r3mx5rkd4wz0ls5pv5w6c7la3z9iy93d3jfind3xyg4kywy95c"))))
+        (base32 "0ayf3dwfhafcbqnckm65zy8nc1rv9ji939qfn53wbhxkrgqdicgz"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-ivy" ,emacs-ivy)))
@@ -4199,13 +4253,13 @@ show icons as well.")
     (version "0.4.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/abo-abo/avy/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/abo-abo/avy.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1wdrq512h25ymzjbf2kbsdymvd2ryfwzb6bh5bc3yv7q203im796"))))
+        (base32 "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/abo-abo/avy")
     (synopsis "Tree-based completion for Emacs")
@@ -4228,13 +4282,13 @@ windows.")
     (version "0.9.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/abo-abo/ace-window/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (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
-         "1p2sgfl5dml4zbd6ldql6lm2m9vmd236ah996ni32x254s48j5pn"))))
+        (base32 "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-avy" ,emacs-avy)))
@@ -4253,13 +4307,13 @@ highlighted.  Pressing that character will switch to that window.")
     (version "0.9.9.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/victorhge/iedit/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/victorhge/iedit.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1hv8q6pr85ss9g3158l1fqv3m62vsq8rslsi86jicr2dcxyascr0"))))
+        (base32 "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"))))
     (build-system emacs-build-system)
     (home-page "http://www.emacswiki.org/emacs/Iedit")
     (synopsis "Edit multiple regions in the same way simultaneously")
@@ -4358,15 +4412,15 @@ state and will work even without lispy being enabled.")
   (package
     (name "emacs-clojure-mode")
     (version "5.6.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/clojure-emacs/clojure-mode/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1f4k1hncy5ygh4izn7mqfp744nnisrp9ywn2njknbjxx34ai1q88"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/clojure-emacs/clojure-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y"))))
     (build-system emacs-build-system)
     (native-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -4387,15 +4441,15 @@ It is recommended to use @code{clojure-mode} with paredit or smartparens.")
   (package
     (name "emacs-epl")
     (version "0.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/cask/epl/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1511n3a3f5gvaf2b4nh018by61ciyzi3y3603fzqma7p9hrckarc"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cask/epl.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/cask/epl")
     (synopsis "Emacs Package Library")
@@ -4456,15 +4510,15 @@ be removed from the front.  This type of data structure is sometimes called an
   (package
     (name "emacs-pkg-info")
     (version "0.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/lunaryorn/pkg-info.el/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gy1jks5mmm02gg1c8gcyr4f8a9s5ggzhk56gv33b9mzjqzi5rd5"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/lunaryorn/pkg-info.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-epl" ,emacs-epl)))
     (home-page "https://github.com/lunaryorn/pkg-info.el")
@@ -4496,14 +4550,15 @@ ongoing operations.")
   (package
     (name "emacs-sparql-mode")
     (version "2.0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ljos/sparql-mode/archive/"
-                                  "v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1s93mkllxnhy7fw616cnnc2danacdlarys0g3cn89drh0llh53cv"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ljos/sparql-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/ljos/sparql-mode")
     (synopsis "SPARQL mode for Emacs")
@@ -4596,7 +4651,7 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.")
          (uri (git-reference
                (url "https://github.com/JuliaEditorSupport/julia-emacs.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0"))))
@@ -4637,14 +4692,15 @@ to all the other commands, too.")
   (package
     (name "emacs-js2-mode")
     (version "20190219")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mooz/js2-mode/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gv1vinp2avnnn6an8ffcx79vmsdjhhikz7s6cmphligb26qp2vi"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mooz/js2-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0766bbr4piia9vfr4ivd2gwi8dxah654adv6h28ylz4q8xmfzm1b"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/mooz/js2-mode/")
     (synopsis "Improved JavaScript editing mode for Emacs")
@@ -4821,14 +4877,15 @@ If you want to mark a folder manually as a project just create an empty
   (package
     (name "emacs-elfeed")
     (version "3.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/skeeto/elfeed/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1wkdrxr6zzqb48czqqv34l87bx8aqjk1739ddqg933aqh241kfvn"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skeeto/elfeed.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
@@ -4849,7 +4906,7 @@ and RSS, with a user interface inspired by notmuch.")
               (uri (git-reference
                     (url "https://github.com/sigma/el-x.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5"))))
@@ -4882,7 +4939,7 @@ provide the historic behavior of @code{flet}, as well as
               (uri (git-reference
                     (url "https://github.com/sigma/mocker.el.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2"))))
@@ -4910,7 +4967,7 @@ maximizes flexibility (at the expense of conciseness).")
               (uri (git-reference
                     (url "https://github.com/technomancy/find-file-in-project.git")
                     (commit version)))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"))))
@@ -4943,7 +5000,7 @@ functions to assist in reviewing changes on files.")
               (uri (git-reference
                     (url "https://github.com/jorgenschaefer/pyvenv.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh"))))
@@ -4974,7 +5031,7 @@ environments (virtualenv) inside Emacs.")
               (uri (git-reference
                     (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git")
                     (commit (string-append "v" version))))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"))))
@@ -4998,7 +5055,7 @@ indentation (space indentation only).
               (uri (git-reference
                     (url "https://github.com/jorgenschaefer/elpy.git")
                     (commit version)))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis"))))
@@ -5154,15 +5211,15 @@ window edge.")
   (package
     (name "emacs-writeroom")
     (version "3.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/joostkremers/writeroom-mode/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0yqgp5h3kvvpgva4azakb2wnjl7gsyh45glf75crspv3xyq57f2r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/joostkremers/writeroom-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-visual-fill-column" ,emacs-visual-fill-column)))
@@ -5293,15 +5350,15 @@ ack, ag, helm and pt.")
   (package
     (name "emacs-helm")
     (version "3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/" name "/helm/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ymykcsbcgq2kskqc0ddigg0kfznxx3j02mkd5r3c3n8gn3kgz84"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emacs-helm/helm.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1x3nv8zvp8vvl30bm2d83hd7zxb0ca64pc8kwb81ml9al6r3mm01"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
@@ -5322,16 +5379,15 @@ not tied in the trap of backward compatibility.")
   (package
     (name "emacs-helm-swoop")
     (version "1.7.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/ShingoFukuyama/helm-swoop/archive/"
-                    version
-                    ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1ssivsjzlnkg049cg993l8fp09l5nhpz6asj7w5c91zp5kpc6fh7"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ShingoFukuyama/helm-swoop.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-helm" ,emacs-helm)))
@@ -5346,16 +5402,15 @@ for search-based navigation of buffers.")
   (package
     (name "emacs-helm-projectile")
     (version "0.14.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/bbatsov/helm-projectile/archive/v"
-                    version
-                    ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19cfmilqh8kbab3b2hmx6lyrj73q6vfmn3p730x95g23iz16mnd5"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bbatsov/helm-projectile.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -5379,7 +5434,7 @@ for search-based navigation of buffers.")
          (uri (git-reference
                (url "https://github.com/abo-abo/helm-make.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1y2v77mmd1bfkkz51cnk1l0dg3lvvxc39wlamnm7wjns66dbvlam"))))
@@ -5535,7 +5590,7 @@ news items, openrc and runscripts.")
        (uri (git-reference
              (url "https://github.com/emacs-evil/evil")
              (commit version)))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q"))))
@@ -5562,7 +5617,7 @@ extensions.")
                 (uri (git-reference
                       (url "https://github.com/emacs-evil/evil-collection")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "09v97nk7qawphfijzqxzi2y63ydmfq7hsgpljjxwkykrc5h0kdlj"))))
@@ -5600,24 +5655,279 @@ go to the second most recent edit, etc.  Negative argument, @kbd{C-u -}, is
 used for reverse direction.")
     (license license:gpl2+)))
 
+(define-public emacs-janpath-evil-numbers
+  (let ((commit "d988041c1fe6e941dc8d591390750b237f71f524")
+        (version "0.5")
+        (revision "1"))
+    (package
+      (name "emacs-janpath-evil-numbers")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/janpath/evil-numbers")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "16zixhxxcb83m82f2cfiardfn99j3w41v6vh1qk6j9pplrlfw70v"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/janpath/evil-numbers")
+      (synopsis "Increment and decrement numeric literals")
+      (description
+       "This package provides functionality to search for a number up to the
+end of a line and increment or decrement it.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-exchange
+  (let ((commit "47691537815150715e64e6f6ec79be7746c96120")
+        (version "0.41")
+        (revision "1"))
+    (package
+      (name "emacs-evil-exchange")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Dewdrops/evil-exchange")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/Dewdrops/evil-exchange")
+      (synopsis "Exchange text easily within Evil")
+      (description
+       "This package, a port of @code{vim-exchange}, provides an Evil operator
+for exchanging text.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-replace-with-register
+  (let ((commit "91cc7bf21a94703c441cc9212214075b226b7f67")
+        (version "0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-replace-with-register")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Dewdrops/evil-ReplaceWithRegister")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/Dewdrops/evil-ReplaceWithRegister")
+      (synopsis "Quickly replace text with the contents of a register")
+      (description
+       "This package provides an Evil operator for replacing text with the
+contents of a register.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-indent-plus
+  (let ((commit "0c7501e6efed661242c3a20e0a6c79a6455c2c40")
+        (version "1.0.0")
+        (revision "1"))
+    (package
+      (name "emacs-evil-indent-plus")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/TheBB/evil-indent-plus")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/TheBB/evil-indent-plus")
+      (synopsis "Text objects based on indentation")
+      (description
+       "This package adds new text objects for @code{evil-mode} based on
+blocks having the same or higher indentation, including or excluding
+surrounding lines.")
+      (license license:gpl2+))))
+
+(define-public emacs-evil-text-object-python
+  (let ((commit "9a064fe6475429145cbcc3b270fcc963b67adb15")
+        (version "1.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-text-object-python")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/wbolster/evil-text-object-python")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "074zpm6mmr1wfl6d5xdf8jk1fs4ccpbzf4ahhkwga9g71xiplszv"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/wbolster/evil-text-object-python")
+      (synopsis "Text objects for Python")
+      (description
+       "This package provides @code{evil-mode} text objects for Python.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-lion
+  (let ((commit "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab")
+        (version "0.0.2")
+        (revision "1"))
+    (package
+      (name "emacs-evil-lion")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/edkolev/evil-lion")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1a162hynp0jcsn50c1w5a02mrw9w3q05c7lkqzqd25px3d0p772q"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/edkolev/evil-lion")
+      (synopsis "Align operator for @code{evil-mode}")
+      (description
+       "This package, a port of @code{vim-lion}, provides an operator for
+aligning text objects based on separators.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-expat
+  (let ((commit "4c344ea19b789002d759a202ffbf594730d2c59a")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-evil-expat")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/edkolev/evil-expat")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/edkolev/evil-expat")
+      (synopsis "Extra @code{ex} commands for @code{evil-mode}")
+      (description
+       "This package provides additional commands for the @code{ex} command
+line, including functions for version control with Git and for copying and
+pasting into and from @code{tmux} paste buffers.")
+      (license license:gpl3+))))
+
+(define-public emacs-evil-nerd-commenter
+  (package
+    (name "emacs-evil-nerd-commenter")
+    (version "3.3.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/redguardtoo/evil-nerd-commenter")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0074i9lvfs5hkbf63g1xh3n7dbmkax30bppkx2cd394c7zlsvzzk"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/redguardtoo/evil-nerd-commenter")
+    (synopsis "Comment and uncomment lines efficiently")
+    (description
+     "This package provides text objects and operators for comments within
+@code{evil-mode}.")
+    (license license:gpl3+)))
+
+(define-public emacs-evil-visual-replace
+  (package
+    (name "emacs-evil-visual-replace")
+    (version "0.0.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/troyp/evil-visual-replace")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/troyp/evil-visual-replace")
+    (synopsis "Replacement commands for @code{evil-mode} visual blocks")
+    (description
+     "This package provides versions of @code{query-replace} and
+@code{replace-regexp} that work for @code{evil-mode} visual blocks.")
+    (license license:gpl2+)))
+
+(define-public emacs-evil-visualstar
+  (let ((commit "06c053d8f7381f91c53311b1234872ca96ced752")
+        (version "0.0.2")
+        (revision "1"))
+    (package
+      (name "emacs-evil-visualstar")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/bling/evil-visualstar")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0mkbzw12fav945icibc2293m5haxqr3hzkyli2cf4ssk6yvn0x4c"))))
+      (build-system emacs-build-system)
+      (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/bling/evil-visualstar")
+      (synopsis "Instantly search using the visual selection")
+      (description
+       "This package provides @code{evil-mode} functions for using selected text
+to search.")
+      (license license:gpl3+))))
+
 (define-public emacs-monroe
   (package
     (name "emacs-monroe")
     (version "0.3.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/sanel/monroe/archive/"
-                            version ".tar.gz"))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "0icdx8shkd951phlnmcq1vqaxp1l667q5rjscskc5r22aylakh4w"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sanel/monroe.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/sanel/monroe")
     (synopsis "Clojure nREPL client for Emacs")
     (description
-      "Monroe is a nREPL client for Emacs, focused on simplicity and easy
+     "Monroe is a nREPL client for Emacs, focused on simplicity and easy
 distribution, primarily targeting Clojure users")
     (license license:gpl3+)))
 
@@ -5812,7 +6122,7 @@ known loosely as deftheme.  Many mode-specific customizations are included.")
          (uri (git-reference
                (url home-page)
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0s6rbsb0y8i8m5b9xm4gw1p1cxsxdqnqxqqb638pygz9f76mbir1"))))
@@ -5840,7 +6150,7 @@ known loosely as deftheme.  Many mode-specific customizations are included.")
          (uri (git-reference
                (url "https://github.com/djcb/dream-theme")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0za18nfkq4xqm35k6006vsixcbmvmxqgma4iw5sw37h8vmcsdylk"))))
@@ -5884,14 +6194,13 @@ extensibility.")
     (version "1.1.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/ajc/nginx-mode/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ajc/nginx-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0bzyrj6zz1hm67bkhw23bam7qc869s3zg7m1rb1c3aa4n0aw90cq"))))
+        (base32 "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/ajc/nginx-mode")
     (synopsis "Emacs major mode for editing nginx config files")
@@ -5947,14 +6256,13 @@ procedures for emacs-lisp-mode.")
     (version "2.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/Wilfred/ht.el/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Wilfred/ht.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0fsi27gdrh2dgwdbq43vnw5sz25war6shlxaclr60fl7krpxjkzf"))))
+        (base32 "1p3qa7g0wa0wbviv2f8bda39cjys3naayk5xjm3nxxmqsyy8papx"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-dash" ,emacs-dash)))
     (home-page "https://github.com/Wilfred/ht.el")
@@ -5970,14 +6278,13 @@ provides functions to convert hash tables from and to alists and plists.")
     (version "0.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/aki2o/log4e/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aki2o/log4e.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0nbdpbw353snda3v19l9hsm6gimppwnpxj18amm350bm81lyim2g"))))
+        (base32 "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
@@ -6001,14 +6308,13 @@ you to deal with multiple log levels.")
     (version "0.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/tekai/gntp.el/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tekai/gntp.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "16c1dfkia9yhl206bdhjr3b8kfvqcqr38jl5lq8qsyrrzsnmghny"))))
+        (base32 "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tekai/gntp.el")
     (synopsis "Growl Notification Protocol for Emacs")
@@ -6025,14 +6331,13 @@ notifications.")
     (version "1.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/jwiegley/alert/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jwiegley/alert.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1693kck3k2iz5zhpmxwqyafxm68hr6gzs60lkxd3j1wlp2c9fwyr"))))
+        (base32 "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-gntp" ,emacs-gntp)
@@ -6080,14 +6385,13 @@ is, in effect, a (typically) noncontiguous set of text.")
     (version "1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/iqbalansari/mu4e-alert/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/iqbalansari/mu4e-alert.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "07qc834qnxn8xi4bw5nawj8g91bmkzw0r0vahkgysp7r9xrf57gj"))))
+        (base32 "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-alert" ,emacs-alert)
@@ -6166,7 +6470,7 @@ abbreviation and automatically expand it into function templates.")
          (uri (git-reference
                (url "https://github.com/AndreaCrotti/yasnippet-snippets")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1m935zgglw0iakzrixld5rcjz3wnj84f8wy2mvc3pggjri9l0qr9"))))
@@ -6212,7 +6516,7 @@ To make YASnippet aware of these snippets, add the above directory to
                 (uri (git-reference
                       (url "https://github.com/emacs-jp/helm-c-yasnippet")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"))))
@@ -6274,14 +6578,13 @@ above over the network.")
     (version "1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/skeeto/emacs-memoize/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/skeeto/emacs-memoize.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "05ijgwi4ymxx31vpjm2pn356j85cykknajn14lrzz8pn5sh0vrg4"))))
+        (base32 "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
@@ -6300,14 +6603,13 @@ memoizing functions.")
     (version "0.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/coldnew/linum-relative/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/coldnew/linum-relative.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0s4frvr27866lw1rn3jal9wj5rkz9fx4yiszqv7w06azsdgsqksv"))))
+        (base32 "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/coldnew/linum-relative")
     (synopsis "Relative line numbering for Emacs")
@@ -6321,14 +6623,13 @@ number on the left margin in Emacs.")
     (version "1.1.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/nonsequitur/idle-highlight-mode/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nonsequitur/idle-highlight-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0kdv10hrgqpskjh0zvpnzwlkn5bccnqxas62gkws6njln57bf8nl"))))
+        (base32 "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv"))))
     (build-system emacs-build-system)
     (home-page "https://www.emacswiki.org/emacs/IdleHighlight")
     (synopsis "Highlights all occurrences of the word the point is on")
@@ -6344,14 +6645,13 @@ number on the left margin in Emacs.")
     (version "1.1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/marsmining/ox-twbs/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/marsmining/ox-twbs.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1zaq8dczq5wijjk36114k2x3hfrqig3lyx6djril6wyk67vczyqs"))))
+        (base32 "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/marsmining/ox-twbs")
     (synopsis "Export org-mode docs as HTML compatible with Twitter Bootstrap")
@@ -6368,14 +6668,13 @@ jQuery and Bootstrap resources included via osscdn.")
     (version "1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/daimrod/highlight-sexp/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/daimrod/highlight-sexp.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0jwx87qkln1rg9wmv4qkgkml935fh2pkgrg5x4ca6n5dgb4q6rj1"))))
+        (base32 "12cyk2q5g6p4ac2hykw1cag7dp1prjjnck5f7nalwwaklmy62y79"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/daimrod/highlight-sexp")
     (synopsis "Minor mode that highlights the s-exp at the current position")
@@ -6395,7 +6694,7 @@ jQuery and Bootstrap resources included via osscdn.")
          (uri (git-reference
                (url "https://github.com/zk-phi/highlight-stages.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0"))
@@ -6542,14 +6841,13 @@ the hunks and revert them selectively.")
     (version "0.45")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/myrjola/diminish.el/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/myrjola/diminish.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0i3629sv5cfrrb00hcnmaqzgs8mk36yasc1ax3ry1ga09nr6rkj9"))))
+        (base32 "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/myrjola/diminish.el")
     (synopsis "Diminish minor modes with no modeline display")
@@ -6598,7 +6896,7 @@ performance-oriented and tidy.")
                 (uri (git-reference
                       (url "https://github.com/pkmoore/strace-mode")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1lbk2kzdznf2bkfazizfbimaxxzfzv00lrz1ran9dc2zqbc0bj9f"))))
@@ -6642,14 +6940,13 @@ source file, @file{jl-encrypt.el}.")
     (version "1.53")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/hniksic/emacs-htmlize/archive/release/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hniksic/emacs-htmlize.git")
+             (commit (string-append "release/" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1lzaf9m1qr9dhw4nn53g6wszk2vqw95gpsbrc3y85bams4cn24ga"))))
+        (base32 "0dr235c0z8is3pi5xdgqyqljg6px0b2aya6qb79zkyi477bmz4ip"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/hniksic/emacs-htmlize")
     (synopsis "Convert buffer text and decorations to HTML")
@@ -6664,14 +6961,13 @@ fonts is supported.")
     (version "0.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/philjackson/xmlgen/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/philjackson/xmlgen.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0zay490vjby3f7455r0vydmjg7q1gwc78hilpfb0rg4gwz224z8r"))))
+        (base32 "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
@@ -6691,14 +6987,13 @@ conversion for Emacs Lisp.")
     (version "4.7")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/cdominik/cdlatex/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cdominik/cdlatex.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0pivapphmykc6vhvpx7hdyl55ls37vc4jcrxpvs4yk7jzcmwa9xp"))))
+        (base32 "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-auctex" ,emacs-auctex)))
@@ -6716,15 +7011,15 @@ constructs.")
   (package
     (name "emacs-cnfonts")
     (version "0.9.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/tumashu/cnfonts/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1l6cgcvc6md1zq97ccczankpyi0k4vjx6apflny6kjq3p33lyhf4"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumashu/cnfonts.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tumashu/cnfonts")
     (synopsis "Emacs Chinese fonts setup tool")
@@ -6759,15 +7054,15 @@ browser.")
   (package
     (name "emacs-pos-tip")
     (version "0.4.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/pitkali/pos-tip/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "12jqfy26vjk7lq0aa8yn8zqj8c85fkvx7y9prj0pcn4wqiz2ad2r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pitkali/pos-tip.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33"))))
     (build-system emacs-build-system)
     ;; The following functions and variables needed by emacs-pos-tip are
     ;; not included in emacs-minimal:
@@ -6785,15 +7080,15 @@ function to be used by other frontend programs.")
   (package
     (name "emacs-pyim-basedict")
     (version "0.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/tumashu/pyim-basedict/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0nfgxviavkgrpyfsw60xsws4fk51fcmgl8fp6zf4ibqjjbp53n3n"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumashu/pyim-basedict.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tumashu/pyim-basedict")
     (synopsis "Input method dictionary of pyim")
@@ -6853,15 +7148,15 @@ posframe is a child frame displayed within its root window's buffer.
   (package
     (name "emacs-el2org")
     (version "0.6.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/tumashu/el2org/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0gd3km1swwvg2w0kdi7370f54wgrflxn63gjgssfjc1iyc9sbqwq"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumashu/el2org.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tumashu/el2org")
     (synopsis "Convert Emacs-lisp file to org file")
@@ -6873,15 +7168,15 @@ to org file, you can use this tool to write orgify commentary.")
   (package
     (name "emacs-mustache")
     (version "0.23")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/Wilfred/mustache.el/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0k9lcgil7kykkv1ylrgwy1g13ldjjmgi2cwmysgyb2vlj3jbwpdj"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Wilfred/mustache.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -6900,15 +7195,15 @@ and lambdas.")
   (package
     (name "emacs-org2web")
     (version "0.9.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/tumashu/org2web/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1c0ixcphlhp4c4qdiwq40bc3yp1gp1llp8pxrk4s7ny9n68s52zp"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumashu/org2web.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -7125,14 +7420,13 @@ on mouse-control.")
     (version "0.7.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/bruceravel/gnuplot-mode/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bruceravel/gnuplot-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0glzymrn138lwig7p4cj17x4if5jisr6l4g6wcbxisqkqgc1h01i"))))
+        (base32 "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn"))))
     (build-system gnu-build-system)
     (native-inputs `(("emacs" ,emacs-minimal)))
     (arguments
@@ -7207,14 +7501,13 @@ pressed simultaneously or a single key quickly pressed twice.")
     (version "1.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/timcharper/evil-surround/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/timcharper/evil-surround.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0p572jgic3q1ia1nz37kclir729ay6i2f4sa7wnaapyxly2lwb3r"))))
+        (base32 "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
@@ -7230,14 +7523,13 @@ addition of surrounding pairs, such as parantheses and quotes, in evil mode.")
     (version "2.1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/linktohack/evil-commentary/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/linktohack/evil-commentary.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1jdya0i921nwskwrzdsj0vrr3m7gm49dy6f6pk9p5nxaarfxk230"))))
+        (base32 "0zjs9zyqfygnpxapvf0ymmiid40i06cxbhjzd81zw33nafgkf6r4"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
@@ -7256,13 +7548,13 @@ lines, and @code{gc} to comment out the target of a motion.")
     (version "0.4.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/rejeep/ansi.el/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rejeep/ansi.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "13jj4vbi98j3p17hs99bmy7g21jd5h4v3wpxk4pkvhylm3bfwjw8"))))
+        (base32 "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -7283,13 +7575,13 @@ as bold, underscore or italic.")
     (version "0.7.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/rejeep/commander.el/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rejeep/commander.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "196s2i15z7gwxa97l1wkxvjnfmj5n38wwm6d3g4zz15l2vqggc2y"))))
+        (base32 "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -7366,14 +7658,13 @@ running tests easier.")
     (version "0.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/purcell/disable-mouse/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/purcell/disable-mouse.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0haqpq23r1wx04lsqrrg3p5visg9hx5i36dg55ab003wfsrlrzbc"))))
+        (base32 "1v1y5hf6k6ng7xsvgb27nh740d14m6l4krr0paccda8zgm4mw357"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/purcell/disable-mouse")
     (synopsis "Disable mouse commands globally")
@@ -7389,13 +7680,13 @@ running a customisable handler command (@code{ignore} by default). ")
     (version "0.0.6")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/gongo/json-reformat/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gongo/json-reformat.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "11fbq4scrgr7m0iwnzcrn2g7xvqwm2gf82sa7zy1l0nil7265p28"))
+        (base32 "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs"))
        (patches (search-patches "emacs-json-reformat-fix-tests.patch"))))
     (build-system emacs-build-system)
     (propagated-inputs
@@ -7409,6 +7700,10 @@ running a customisable handler command (@code{ignore} by default). ")
        #:test-command '("ert-runner")
        #:phases
        (modify-phases %standard-phases
+         (add-before 'check 'make-tests-writable
+           (lambda _
+             (for-each make-file-writable (find-files "test"))
+             #t))
          (add-before 'check 'delete-json-objects-order-test
            (lambda _
              (emacs-batch-edit-file "test/json-reformat-test.el"
@@ -7431,13 +7726,13 @@ running a customisable handler command (@code{ignore} by default). ")
     (version "1.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Sterlingg/json-snatcher/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Sterlingg/json-snatcher.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1nfiwsifpdiz0lbrqa77nl0crnfrv5h85ans9b0g5rggnmyshcfb"))))
+        (base32 "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/sterlingg/json-snatcher")
     (synopsis "Grabs the path to JSON values in a JSON file")
@@ -7451,13 +7746,13 @@ a @url{http://json.org/, JSON} file.")
     (version "1.7.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/joshwnj/json-mode/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/joshwnj/json-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "06h45p4cn767pk9sqi2zb1c65wy5gyyijqxzpglp80zwxhvajdz5"))))
+        (base32 "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-json-reformat" ,emacs-json-reformat)
@@ -7547,7 +7842,7 @@ the actual transformations.")
                 (uri (git-reference
                       (url "https://github.com/Fuco1/dired-hacks.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1g7mky41cahpryzj6frdgzdymknpqq7pidzfjj9304887kijmhj3"))))
@@ -7606,14 +7901,13 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.")
     (version "3.3.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/justbur/emacs-which-key/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/justbur/emacs-which-key.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1g8k0js21bc8mlw6hvmg93zgfjhil77c30cv1hf85y4qb9ldvika"))
-       (file-name (string-append name "-" version ".tar.gz"))))
+        (base32 "1dh6kr00wmql46whjkvnl953zngiv5j99ypvr1b3cb2174623afb"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
@@ -7640,7 +7934,7 @@ settings).")
               (uri (git-reference
                     (url "https://github.com/lewang/ws-butler.git")
                     (commit "323b651dd70ee40a25accc940b8f80c3a3185205")))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"))))
@@ -7663,14 +7957,13 @@ characters from end of lines.")
     (version "0.8.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/et2010/org-edit-latex/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/et2010/org-edit-latex.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1y4h6wrs8286h9pbsv4d8fr67a885vz8b2k80qgv5qddipi2i78p"))))
+        (base32 "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-auctex" ,emacs-auctex)
@@ -7688,15 +7981,15 @@ src block.")
   (package
     (name "emacs-emamux")
     (version "0.14")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/syohex/emacs-emamux/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0wlqg4icy037bj70b0qmhvwvmiwhagpnx6pnxhq6gzy1hvwlilkx"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-emamux.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19y69qw79miim9cz5ji54gwspjkcp9g2c1xr5s7jj2fiabnxax6b"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/syohex/emacs-emamux")
     (synopsis "Manipulate Tmux from Emacs")
@@ -7734,14 +8027,13 @@ editing RPM spec files.")
     (version "0.18")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/syohex/emacs-git-messenger/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-git-messenger.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "17mqki6g0wx46fn7dcbcc2pjxik7vvrcb1j9jzxim8b9psbsbnp9"))))
+        (base32 "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-popup" ,emacs-popup)))
@@ -7763,13 +8055,13 @@ internally.")
     (version "0.5.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/tumashu/gitpatch/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tumashu/gitpatch.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1yj6pmic541lcnscjin300k380qp9xdfprs55xg1q57jrkq6f6k7"))))
+        (base32 "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/tumashu/gitpatch")
     (synopsis "Mail git patch from Emacs")
@@ -7811,13 +8103,13 @@ the nick color and the background color
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/hrs/engine-mode/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hrs/engine-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1vm4p7pcp1vnwwxvps1bhm7i7hkabqqxl898knxf2hqvxys76684"))))
+        (base32 "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml"))))
     (build-system emacs-build-system)
     (synopsis "Minor mode for defining and querying search engines")
     (description "@code{engine-mode} is a global minor mode for Emacs.  It
@@ -7889,14 +8181,13 @@ Idris.")
     (version "0.10.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/rmuslimov/browse-at-remote/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rmuslimov/browse-at-remote.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0ymslsp6i1naw25zckv25bf4aaq6qwkbkn95qyzlwg869l802686"))))
+        (base32 "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-f" ,emacs-f)
@@ -7979,7 +8270,7 @@ well as Github-style emojis like @code{:smile:}.  It provides a minor mode
        (uri (git-reference
              (url "https://github.com/ahyatt/emacs-websocket.git")
              (commit version)))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"))))
@@ -8110,25 +8401,28 @@ messaging service.")
    (version "2.1.0")
    (source
     (origin
-      (method url-fetch)
-      (uri (string-append
-            "https://github.com/szermatt/emacs-bash-completion/archive/v"
-            version ".tar.gz"))
-      (file-name (string-append name "-" version ".tar.gz"))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/szermatt/emacs-bash-completion.git")
+            (commit version)))
+      (file-name (git-file-name name version))
       (sha256
-       (base32
-        "1z0qck3v3ra6ivacn8n04w1v33a4xn01xx860761q31qzsv3sksq"))))
+       (base32 "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"))))
    (inputs `(("bash" ,bash)))
    (build-system emacs-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'install 'configure
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((bash (assoc-ref inputs "bash")))
-               (emacs-substitute-variables "bash-completion.el"
-                 ("bash-completion-prog" (string-append bash "/bin/bash"))))
-             #t)))))
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'make-git-checkout-writable
+          (λ _
+            (for-each make-file-writable (find-files "."))
+            #t))
+        (add-before 'install 'configure
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((bash (assoc-ref inputs "bash")))
+              (emacs-substitute-variables "bash-completion.el"
+                ("bash-completion-prog" (string-append bash "/bin/bash"))))
+            #t)))))
    (home-page "https://github.com/szermatt/emacs-bash-completion")
    (synopsis "Bash completion for the shell buffer")
    (description
@@ -8181,15 +8475,15 @@ in a generalized CSV (character-separated values) format.")
   (package
     (name "emacs-transmission")
     (version "0.12.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/holomorph/transmission/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1rrlgn96gi1ljfwbwvlyyxbq75xzamlbdhq1bpyadxxmxcvlmk3n"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/holomorph/transmission.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/holomorph/transmission")
     (synopsis "Emacs interface to a Transmission session")
@@ -8272,31 +8566,25 @@ for external literate programming tools for exporting, weaving and tangling.")
   (package
     (name "eless")
     (version "0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/kaushalmodi/eless/archive/"
-                    "v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0gjnnhgw5xs1w3qfnkvwa2nv44gnxr8pkhx3c7qig45p8nh1461h"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kaushalmodi/eless.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jr7vhh4vw69llhi0fh9ljscljkszkj0acdxl04da5hvqv6pnqbb"))))
     (build-system trivial-build-system)
     (inputs
      `(("bash" ,bash)))
-    (native-inputs
-     `(("tar" ,tar)
-       ("gzip" ,gzip)))
     (arguments
      `(#:modules ((guix build utils))
        #:builder
        (begin
          (use-modules (guix build utils))
-         (setenv "PATH" (string-append
-                         (assoc-ref %build-inputs "tar") "/bin" ":"
-                         (assoc-ref %build-inputs "gzip") "/bin"))
-         (invoke "tar" "xvf" (assoc-ref %build-inputs "source"))
-         (chdir (string-append "eless" "-" ,version))
+         (copy-recursively (assoc-ref %build-inputs "source") "source")
+         (chdir "source")
          (substitute* "eless" (("/usr/bin/env bash")
                                (string-append (assoc-ref %build-inputs "bash")
                                               "/bin/bash")))
@@ -8332,14 +8620,13 @@ Feautures:
     (version "2.2.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/redguardtoo/evil-matchit/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/redguardtoo/evil-matchit.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1i5a7szl0m3xnqyjq6zhg5j68x9fgf9ffxghj918c4brj4436sjb"))))
+        (base32 "12if45pxfndy3d7r4gd3zx4d3jk4d64fdmwkhc3y5zhqq9h9iy4c"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
@@ -8356,14 +8643,13 @@ evil mode using @kbd{%}.  It is a port of @code{matchit} for Vim.")
     (version "0.4.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/expez/evil-smartparens/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/expez/evil-smartparens.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1bwzdd3054d407d5j4m3njsbvmc9r8zzp33m32pj3b3irxrl68q0"))))
+        (base32 "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)
@@ -8381,13 +8667,13 @@ emulates Vim features and provides Vim-like key bindings.")
     (version "0.1.4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/blorbx/evil-quickscope/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/blorbx/evil-quickscope.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1r26a412mmar7vbf89zcifswiwpdg30mjzj32xdyqss57aqi83ma"))))
+        (base32 "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
@@ -8410,14 +8696,13 @@ features and provides Vim-like key bindings.")
     (version "1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/dbrock/bongo/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dbrock/bongo.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1pcsyyrvj7djjjwpaswd1i782hvqvlvs39cy9ns0k795si6xd64d"))))
+        (base32 "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/dbrock/bongo")
     (synopsis "Media player for Emacs")
@@ -8525,7 +8810,7 @@ formatting rules for that language.")
        (uri (git-reference
              (url "https://github.com/nicferrier/emacs-kv.git")
              (commit "721148475bce38a70e0b678ba8aa923652e8900e")))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m"))))
@@ -8641,40 +8926,34 @@ Features:
     (version "0.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cute-jumper/epipe/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cute-jumper/epipe.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "05a036852g4j63k1mhvyfrcsgkl9lczayi7x61570ysw3cli5wp5"))))
+        (base32 "0lkisi1s7sn12nx8zh58qmsxwnk1rjwryj18wcbr148xqz3swg57"))))
     (build-system trivial-build-system)
     (inputs
      `(("bash" ,bash)
        ("perl" ,perl)))
-    (native-inputs
-     `(("tar" ,tar)
-       ("gzip" ,gzip)))
     (arguments
      `(#:modules
        ((guix build utils))
        #:builder
        (begin
          (use-modules (guix build utils))
-         ;; Extract source
-         (setenv "PATH" (string-append
-                         (assoc-ref %build-inputs "tar") "/bin" ":"
-                         (assoc-ref %build-inputs "gzip") "/bin"))
-         (invoke "tar" "xvf" (assoc-ref %build-inputs "source"))
-         (chdir (string-append ,name "-" ,version))
-         ;; Patch shebangs
+         ;; Extract source.
+         (copy-recursively (assoc-ref %build-inputs "source") "source")
+         (chdir "source")
+         ;; Patch shebangs.
          (substitute* "epipe"
            (("/usr/bin/env bash")
             (string-append (assoc-ref %build-inputs "bash") "/bin/bash")))
          (patch-shebang "epipe.pl"
                         (list (string-append (assoc-ref %build-inputs "perl")
                                              "/bin")))
-         ;; Installation
+         ;; Install.
          (for-each (lambda (file)
                      (install-file file (string-append %output "/bin")))
                    '("epipe" "epipe.pl"))
@@ -8691,14 +8970,13 @@ the pipeline, featuring the support for running @code{emacsclient}.")
     (version "0.03")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/syohex/emacs-hcl-mode/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-hcl-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0pvw74qpwh0znqzp6syp4wxjqs7dp1hbn5h7xfk97mff9l5d8k6x"))))
+        (base32 "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/syohex/emacs-hcl-mode")
     (synopsis "Major mode for the Hashicorp Configuration Language")
@@ -8714,14 +8992,13 @@ highlighting and indentation support.")
     (version "0.06")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/syohex/emacs-terraform-mode/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-terraform-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0h9267ifdjmcin4sj8slxydbacx4bqicbvg8pa1qq2l72h9m5381"))))
+        (base32 "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-hcl-mode" ,emacs-hcl-mode)))
@@ -8784,13 +9061,13 @@ directories of plain text notes, inspired by Notational Velocity.")
     (version "0.62")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/syohex/emacs-anzu/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-anzu.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "16cg3897x5znbmgk7sdy0qyd0fbic9dmmz0dchq2vz5z29yhg4cz"))))
+        (base32 "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/syohex/emacs-anzu")
     (synopsis "Show number of matches in mode-line while searching")
@@ -8886,15 +9163,15 @@ standard Unix password manager\").")
   (package
     (name "emacs-pass")
     (version "1.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/NicolasPetton/pass/archive/"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "0aiz90gklk0cb8n4v1s3l0mx6pp2b7f4k2c0fjpihwmga13yklwn"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/NicolasPetton/pass.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-password-store" ,emacs-password-store)
@@ -8975,13 +9252,13 @@ match and total match information in the mode-line in various search modes.")
   (version "2.0.0")
   (source
     (origin
-      (method url-fetch)
-      (uri (string-append "https://github.com/skeeto/elisp-finalize/archive/"
-                          version ".tar.gz"))
-      (file-name (string-append name "-" version ".tar.gz"))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/skeeto/elisp-finalize.git")
+            (commit version)))
+      (file-name (git-file-name name version))
       (sha256
-        (base32
-         "077fycy3i5f0kjw5z3rhf4kld5lbk2idz690nkwhkz04vppk4q4x"))))
+        (base32 "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"))))
   (build-system emacs-build-system)
   (propagated-inputs
     `(("emacs-cl-generic" ,emacs-cl-generic)))
@@ -9150,13 +9427,13 @@ Emacs.")
     (version "0.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/purcell/elisp-slime-nav/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/purcell/elisp-slime-nav.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1vq7ym1q47p97gxrv45c9gm96d23xbp237vkmakikj6grngxjfb2"))))
+        (base32 "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/purcell/elisp-slime-nav")
     (synopsis "Make @code{M-.} and @code{M-,} work for elisp like they do in SLIME")
@@ -9170,16 +9447,15 @@ in @code{emacs-lisp-mode}, together with an elisp equivalent of
   (package
     (name "emacs-dedicated")
     (version "1.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/emacsorphanage/dedicated/archive/"
-                    version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "0nhbkp278cvcznb5rp3jp9ii3mjgb79zx8iwfrw7zfk3yg8688ni"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emacsorphanage/dedicated.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/emacsorphanage/dedicated")
     (synopsis "Emacs minor mode for toggling a windows's \"dedicated\" flag")
@@ -9204,7 +9480,7 @@ the source file.")
                 (uri (git-reference
                       (url "https://github.com/paul-issartel/nnreddit.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0j4h3bnga640250jdq8bwyja49r41ssrsjd6lba4gzzllqk02nbn"))))
@@ -9221,13 +9497,13 @@ newsreader.")
     (version "0.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mickeynp/makey/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mickeynp/makey.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0kzl4q1wf2zhkx9nrymxa67n99iq0bj7zqhpaz4byksna1hsxfmv"))))
+        (base32 "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/mickeynp/makey")
     (synopsis "Emacs interactive command-line mode")
@@ -9292,13 +9568,13 @@ outline-mode), so there is no such thing like an outshine mode, only
     (version "2.3.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/joostkremers/parsebib/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/joostkremers/parsebib.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0cxagnmc5ab6idmb26axpizhr4sqglkncc59768yavn3p04jyq63"))))
+        (base32 "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/joostkremers/parsebib")
     (synopsis "Library for parsing bib files")
@@ -9312,13 +9588,13 @@ outline-mode), so there is no such thing like an outshine mode, only
     (version "0.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cpitclaudel/biblio.el/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cpitclaudel/biblio.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0vwrljmab8m1z83048gxx5mryml9f5pb3h0jpwkvqcl0ra152lzx"))))
+        (base32 "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-seq" ,emacs-seq)
@@ -9347,7 +9623,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.")
          (uri (git-reference
                (url "https://github.com/tmalsburg/helm-bibtex.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"))))
@@ -9444,15 +9720,15 @@ and @code{erc-send-modify-hook} to download and show images.")
   (package
     (name "emacs-helm-gtags")
     (version "1.5.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/syohex/emacs-helm-gtags/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1a10snhg6nnnan6w9a7mcziy26vxbsr3c35i0gcarnkdp2yqng36"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-helm-gtags.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-helm" ,emacs-helm)))
@@ -9468,13 +9744,13 @@ and @code{erc-send-modify-hook} to download and show images.")
     (version "0.4.4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/rolandwalker/list-utils/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rolandwalker/list-utils.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1xc1xh8c82h5gdjbgpdsdclgwxkxbb7h3x3a2bscpm41g8pnan4p"))))
+        (base32 "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/rolandwalker/list-utils")
     (synopsis "List-manipulation utility functions")
@@ -9487,13 +9763,13 @@ and @code{erc-send-modify-hook} to download and show images.")
     (version "2.0.8")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/emacsfodder/move-text/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emacsfodder/move-text.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1sjfja9r25692pgcldgnjzkapzy970m14jh9l4pajysiqcdk72g0"))))
+        (base32 "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/emacsfodder/move-text")
     (synopsis "Move current line or region with M-up or M-down")
@@ -9550,14 +9826,13 @@ orient yourself in the code, and tell which statements are at a given level.")
     (version "0.7.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/DamienCassou/hierarchy/archive/"
-             "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DamienCassou/hierarchy.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1a463v5zk6zis2p8cs4mads3iyxh266yahi6j6y0paggfl2yhkc8"))))
+        (base32 "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/DamienCassou/hierarchy")
     (synopsis "Library to create and display hierarchy structures")
@@ -9578,7 +9853,7 @@ navigate and display hierarchy structures.")
          (uri (git-reference
                (url "https://github.com/emacsorphanage/tree-mode.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix"))))
@@ -9601,7 +9876,7 @@ navigate and display hierarchy structures.")
                 (uri (git-reference
                       (url "https://github.com/ahungry/md4rd.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0mvv1mvsrpkrmikcpfqf2zbawnzgq33j6zjdrlv48mcw57xb2ak9"))))
@@ -9656,15 +9931,15 @@ navigate and display hierarchy structures.")
   (package
     (name "emacs-datetime")
     (version "0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/doublep/datetime/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "12wqpj67rjij2ki7nmw38rz3k2bsq68pk6zswknlcn9qhp1zd9w9"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/doublep/datetime.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/doublep/datetime/")
     (synopsis "Library to work with dates in Emacs")
@@ -9685,7 +9960,7 @@ timestamps and date-time format strings library for Emacs.")
          (uri (git-reference
                (url "https://github.com/theodorewiles/org-mind-map.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0jgkkgq7g64zckrmjib0hvz0qy3ynz5vz13qbmlpf096l3bb65wn"))))
@@ -9704,13 +9979,13 @@ timestamps and date-time format strings library for Emacs.")
     (version "0.6.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mojochao/npm-mode/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mojochao/npm-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1kq1ww22dwf8c2i2b4z2ldbbmnihj65kb7n5vzvwkch9h4hxpqh5"))))
+        (base32 "1mh6nbffciw4yhv049kdhh796ysj1x21ndm3fwymhskb3dy0w1ss"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/mojochao/npm-mode")
     (synopsis "Minor mode for working with @code{npm} projects")
@@ -9749,7 +10024,7 @@ functions provided by @file{subr.el}.")
          (uri (git-reference
                (url "https://github.com/re5et/itail.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "044nzxh1hq41faxw3lix0wy78vfz304pjcaa5a11dqfz7q3gx5cv"))))
@@ -9768,13 +10043,13 @@ tramp.")
     (version "1.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Wilfred/loop.el/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Wilfred/loop.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1z3rhh3zyjabz36410yz0lp4a0qwwj0387as662wvx3z9y54jia9"))))
+        (base32 "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Wilfred/loop.el")
     (synopsis "Imperative loop structures for Emacs")
@@ -9789,13 +10064,13 @@ continue.")
     (version "1.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Wilfred/elisp-refs/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Wilfred/elisp-refs.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "02nzcn3v14n7mp7q32j5r4wdlpsw3zixzh6cf0cdyarfir6dly3p"))))
+        (base32 "0w7k91xf69zc0zkjrw8h8sjdjf9xq9qs5zhvajhd718lzf93564b"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -9824,7 +10099,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.")
          (uri (git-reference
                (url "https://github.com/bbatsov/crux.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"))))
@@ -9841,13 +10116,13 @@ confused by comments or @code{foo-bar} matching @code{foo}.")
     (version "1.13")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/stsquad/emacs_chrome/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stsquad/emacs_chrome.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1r92kqggslqasza718z4ka883mqfbnibdm43f0j9gaipk0msm2wf"))))
+        (base32 "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
@@ -9923,7 +10198,7 @@ macro takes a first argument (whose value must be an alist) and a body.")
          (uri (git-reference
                (url "https://github.com/jschaf/esup.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"))))
@@ -9941,13 +10216,13 @@ your Emacs.")
     (version "0.03")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/syohex/emacs-sourcemap/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/syohex/emacs-sourcemap.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0bmd5l3cx2iyl7vxn84xdhs80b07kpdpfwki28lh5d0kmm5qs6m6"))))
+        (base32 "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/syohex/emacs-sourcemap")
     (synopsis "Sourcemap parser")
@@ -9964,7 +10239,7 @@ your Emacs.")
                 (uri (git-reference
                       (url "https://github.com/joddie/macrostep.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1fm40mxdn289cyzgw992223dgrjmwxn4q8svyyxfaxjrpb38jhjz"))))
@@ -10010,13 +10285,13 @@ until the top-level form is no longer a macro call.")
     (version "2.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Fanael/parent-mode/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Fanael/parent-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0gxbl5s1w96v6v55b7aaansgw4sxhzfx9nrsvpk3pfhsibs6yqjd"))))
+        (base32 "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Fanael/parent-mode")
     (synopsis "Get major mode's parent modes")
@@ -10098,13 +10373,13 @@ until the top-level form is no longer a macro call.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/DamienCassou/beginend/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DamienCassou/beginend.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0z4rbwffh9vxfvcrlvym4p73z7gf72q0b5iv33llbpcpbijknnrq"))))
+        (base32 "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"))))
     ;; TODO: Run tests.
     (build-system emacs-build-system)
     (inputs
@@ -10130,7 +10405,7 @@ key again.")
          (uri (git-reference
                (url "https://github.com/dimitri/mbsync-el.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0yj93y2mpxlir8x73znlg1slxlv4blm1vjv5h2w3j8lxg8bxvmn6"))))
@@ -10154,7 +10429,7 @@ within Emacs.")
          (uri (git-reference
                (url "https://github.com/purcell/ibuffer-projectile.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1nd26cwwdpnwj0g4w393rd59klpyr6wqrnyr6scmwb5d06bsm44n"))))
@@ -10204,13 +10479,13 @@ documentation.")
     (version "1.0.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/hylang/hy-mode/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hylang/hy-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0b4pvbr2hf77bq2vsyfsv653q0dab7qzq85wc7kdziw7687jdf2z"))))
+        (base32 "1jxximiznz7fw9ys5k6plw85zrbzvxidql7py1fdi425fdp4058z"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
@@ -10226,13 +10501,13 @@ documentation.")
     (version "0.3.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/yasuyk/web-beautify/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/yasuyk/web-beautify.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1j57hwid74id4swkx2g0iljfawx0k9c7qjrwqc0mv657x9p78hcs"))))
+        (base32 "0vms7zz3ym53wf1zdrkbf2ky2xjr1v134ngsd0jr8azyi8siw84d"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/yasuyk/web-beautify")
     (synopsis "Format HTML, CSS and JavaScript, JSON")
@@ -10311,7 +10586,7 @@ their meaning for the current Emacs major-mode.")
          (uri (git-reference
                (url "https://github.com/jkitchin/org-ref.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1rxz0bjdsayk0slv23i07d9xhj2m7s4hsc81wc2d1cs52dkr5zmz"))))
@@ -10389,15 +10664,15 @@ files.")
   (package
     (name "emacs-add-hooks")
     (version "3.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/nickmccurdy/add-hooks/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "03a28gb3298g7pc2qji9hi44p4d99ljp5mpi9cmg42ldv8fl6549"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nickmccurdy/add-hooks.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/nickmccurdy/add-hooks/")
     (synopsis "Emacs function for setting multiple hooks")
@@ -10411,13 +10686,13 @@ duplicate hook and function names further into a single declarative call.")
     (version "0.9.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Malabarba/fancy-narrow/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Malabarba/fancy-narrow.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0rf2rnzg82pdqch041yyx3f9ddixffkk9s2ydzg8hwy66sg3385n"))))
+        (base32 "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Malabarba/fancy-narrow/releases")
     (synopsis "Imitate @code{narrow-to-region} with more eye candy")
@@ -10436,14 +10711,13 @@ buffer.")
     (version "0.5.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/for-GET/know-your-http-well/archive/"
-             "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/for-GET/know-your-http-well.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1y3kwz88awcgwaivlswq0q4g2i02762r23lpwg61bfqy5lrjjqnj"))))
+        (base32 "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -10503,7 +10777,7 @@ buffer.")
          (uri (git-reference
                (url "https://github.com/zk-phi/download-region.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0v52djg39b6k2snizd9x0qc009ws5y0ywqsfwhqgcbs5ymzh7dsc"))))
@@ -10518,15 +10792,15 @@ downloading manager for Emacs.")
   (package
     (name "emacs-helpful")
     (version "0.15")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/Wilfred/helpful/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1xmvhphzb4hbg647dz4lafy6hd19b7bk3lxni6irqrzdsrclhzn6"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Wilfred/helpful.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1rqnx7672175288yqaslw0d9vw04j6psw7mys8j9zcp2i72hlvkn"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-elisp-refs" ,emacs-elisp-refs)))
@@ -10557,15 +10831,15 @@ and doesn't require memorisation of commands.
   (package
     (name "emacs-logview")
     (version "0.9")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/doublep/logview/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1vd11ppm46ldqsiwhqgw91p34gbjh1y82r9mxcn9r2gj65nvhxcp"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/doublep/logview.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"))))
     (propagated-inputs
      `(("emacs-datetime" ,emacs-datetime)))
     (build-system emacs-build-system)
@@ -10607,15 +10881,15 @@ functions.")
   (package
     (name "emacs-benchmark-init")
     (version "1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/dholm/benchmark-init-el/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0szyqr4nncwz4vd5gww1vz31kf9r2lx25p4d0d09pm35974x53kz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dholm/benchmark-init-el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/dholm/benchmark-init-el")
     (synopsis "Benchmark Emacs @code{require} and @code{load} calls")
@@ -10687,13 +10961,13 @@ buffer with each of your todos.")
     (version "0.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cosmicexplorer/f3/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cosmicexplorer/f3.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "06b8i1jvklm5k3k90n65f197l1miq1xlxqkqpbppw4h3rhl4y98h"))))
+        (base32 "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-helm" ,emacs-helm)))
@@ -10739,7 +11013,7 @@ buffer with each of your todos.")
          (uri (git-reference
                (url "https://github.com/nashamri/academic-phrases.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r"))))
@@ -10772,7 +11046,7 @@ browse the phrases by the paper section and fill-in the blanks if required.")
                 (uri (git-reference
                       (url "https://github.com/abo-abo/auto-yasnippet.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk"))))
@@ -10803,14 +11077,13 @@ yasnippet fields and mirrors to be.")
     (version "0.2.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/Fanael/highlight-numbers/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Fanael/highlight-numbers.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "030v5p11d4n0581ncv499l1fqrmfziy756q6378x2bv22ixghqqp"))))
+        (base32 "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-parent-mode" ,emacs-parent-mode)))
@@ -10883,7 +11156,7 @@ interactive behavior should be different.")
                 (uri (git-reference
                       (url "https://github.com/purcell/default-text-scale")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h"))))
@@ -10900,13 +11173,13 @@ decreasing the default font size in all GUI Emacs frames.")
     (version "1.1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/benma/visual-regexp.el/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/benma/visual-regexp.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1czmhvcivlcdyz7rfm0vd4a3xsgmy4qbvbl6yjxc217wrxqflr92"))))
+        (base32 "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/benma/visual-regexp.el/")
     (synopsis "Regexp command with interactive visual feedback")
@@ -10927,7 +11200,7 @@ interactive visual feedback.")
          (uri (git-reference
                (url "https://github.com/Lindydancer/faceup.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx"))))
@@ -10952,7 +11225,7 @@ perform regression test for packages that provide font-lock rules.")
          (uri (git-reference
                (url "https://github.com/greghendershott/racket-mode")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7"))))
@@ -10984,7 +11257,7 @@ perform regression test for packages that provide font-lock rules.")
          (uri (git-reference
                (url "https://github.com/mkcms/grep-context.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1nqfa6kjzjshww4hnwg1c0vcr90bdjihy3kmixq3c3jkvxg99b62"))))
@@ -11012,7 +11285,7 @@ compilation/grep buffers.  Works with @code{wgrep}, @code{ack}, @code{ag},
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-firefox.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"))))
@@ -11070,14 +11343,13 @@ decrease the number at point.")
     (version "0.1.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/Fanael/highlight-defined/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Fanael/highlight-defined.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1ryd66989b5byqdw8jmjrjf0c78iiz72wibld750skcnj5h5h506"))))
+        (base32 "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Fanael/highlight-defined")
     (synopsis "Syntax highlighting of known Elisp symbols")
@@ -11092,13 +11364,13 @@ macros, faces and variables.  To enable call @code{highlight-defined-mode}. ")
     (version "0.4.10")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/DogLooksGood/parinfer-mode/archive/"
-                           "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DogLooksGood/parinfer-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "06ba9qi59sm9ih9m38fbr8kj4qkvrm58n0c0ngfjz60gnr9x9pcv"))))
+        (base32 "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk"))))
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)
        ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
@@ -11120,7 +11392,7 @@ keep Parens and Indentation inline with one another.")
               (uri (git-reference
                     (url "https://github.com/emacs-helm/helm-eww.git")
                     (commit version)))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0hpq1h0p69c9k6hkd2mjpprx213sc5475q7pr2zpmwrjdzgcv70z"))))
@@ -11145,7 +11417,7 @@ bookmarks and history.")
                 (uri (git-reference
                       (url "https://github.com/stumpwm/stumpwm-contrib.git")
                       (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "1dfwsvz1c8w6j4jp0kzaz78ml3f5dp0a5pvf090kwpbpg176r7iq"))))
@@ -11187,14 +11459,13 @@ bookmarks and history.")
     (version "0.1.6")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/creichert/ido-vertical-mode.el/archive/"
-             "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/creichert/ido-vertical-mode.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0dprdxq8wvqd45dinwj92k0kixr07c8xvspa6i613mjcpxgwjg53"))))
+        (base32 "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/creichert/ido-vertical-mode.el")
     (synopsis "Makes ido-mode display vertically")
@@ -11207,13 +11478,13 @@ bookmarks and history.")
     (version "0.1.4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Fanael/wordgen.el/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Fanael/wordgen.el.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1h2iyixdm49h53pwj9ics9gb9h3g6wa4hainpnjg6mfarf49jkmg"))))
+        (base32 "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Fanael/wordgen.el")
     (synopsis "Random word generator")
@@ -11257,7 +11528,7 @@ the previously visible buffer part after each scroll.")
          (uri (git-reference
                (url "https://github.com/dgutov/highlight-escape-sequences.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is"))))
@@ -11274,14 +11545,13 @@ Emacs minor mode to escape sequences in code.")
     (version "1.2.4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/rakanalh/emacs-dashboard/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rakanalh/emacs-dashboard.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1738lmbgq6gk24hcwic0qjyajr21l5xzhya4pv58dw1bhd6vxv9g"))))
+        (base32 "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-page-break-lines" ,emacs-page-break-lines)))
@@ -11298,13 +11568,13 @@ sections for bookmarks, projectil projects, org-agenda and more. ")
     (version "1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/anwyn/slime-company/archive/"
-                           "v" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/anwyn/slime-company.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1myl79pxj501xfr5qc5a24qddsn2l5iaamg7rf7fpny7mr9v70ar"))
-       (file-name (string-append name "-" version ".tar.gz"))))
+        (base32 "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-slime" ,emacs-slime)
@@ -11351,7 +11621,7 @@ interactive loop.")
          (uri (git-reference
                (url "https://github.com/xiongtx/eros.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"))))
@@ -11373,7 +11643,7 @@ interactive loop.")
          (uri (git-reference
                (url "https://github.com/tuhdo/semantic-stickyfunc-enhance.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g"))))
@@ -11393,14 +11663,13 @@ scroll up to read the function name and then scroll down to original position.")
     (version "4.4.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/ryuslash/git-auto-commit-mode/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ryuslash/git-auto-commit-mode.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "04avxmalsl3b7zi2vipfw9rb4wrwysnipsbch96skviql9axk870"))))
+        (base32 "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/ryuslash/git-auto-commit-mode")
     (synopsis "Emacs Minor mode to automatically commit and push")
@@ -11417,14 +11686,13 @@ the current upstream.")
     (version "0.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/iquiw/company-restclient/archive/"
-             "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/iquiw/company-restclient.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1kr3f0wgqlk7r171bvb2kinv7fanwj2md01wdpx04qkgwcr1as00"))))
+        (base32 "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-company" ,emacs-company)
@@ -11453,7 +11721,7 @@ It provides auto-completion for HTTP methods and headers in
          (uri (git-reference
                (url "https://github.com/nicferrier/emacs-noflet")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf"))))
@@ -11483,14 +11751,13 @@ through the symbol: @command{this-fn}.")
     (version "0.5.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/jacktasia/dumb-jump/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jacktasia/dumb-jump.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "07n0xjgpxjpf3vp9gxchkjpydyj0zm166930as0kwiwkhjlsirsf"))))
+        (base32 "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #f ; FIXME: Tests freeze when run.
@@ -11533,7 +11800,7 @@ Dumb Jump performs best with The Silver Searcher @command{ag} or ripgrep
          (uri (git-reference
                (url "https://github.com/bgamari/dts-mode.git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"))))
@@ -11555,7 +11822,7 @@ device tree files.")
        (uri (git-reference
              (url "https://github.com/cbowdon/daemons.el")
              (commit version)))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "00bkzfaw3bqykcks610vk9wlpa2z360xn32bpsrycacwfv29j7g4"))))
@@ -11648,7 +11915,7 @@ matching regexps.")
        (uri (git-reference
              (url "https://github.com/dieggsy/esh-autosuggest")
              (commit version)))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw"))))
@@ -11678,7 +11945,7 @@ autosuggestions with:
          (uri (git-reference
                (url "https://gitlab.petton.fr/DamienCassou/desktop-environment")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0x73x5hy7w55jrzy3xvqhk90rrsznmxjqvsvwhh21qznv5w269xz"))))
@@ -11723,14 +11990,12 @@ This code is still alpha.")
     (version "20180518")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/egh/zotxt-emacs/archive/"
-             "23a4a9f74a658222027d53a9a83cd4bcc583ca8b"
-             ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/egh/zotxt-emacs.git")
+             (commit "23a4a9f74a658222027d53a9a83cd4bcc583ca8b")))
        (sha256
-        (base32
-         "1qlibaciqgsva6fc7vv9krssjq00bi880396jk7llbi3c52q9n1y"))))
+        (base32 "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-deferred" ,emacs-deferred)
@@ -11757,7 +12022,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
          (uri (git-reference
                (url "https://github.com/emacs-evil/evil-magit")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "134v7s03jvbhm70mavwab85r09i68g2a5bvriirh0chz1av2y16v"))))
@@ -11789,7 +12054,7 @@ describing the key binding changes.")
        (uri (git-reference
              (url "https://github.com/hlissner/evil-multiedit")
              (commit (string-append "v" version))))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "19h3kqylqzbjv4297wkzzxdmn9yxbg6z4ga4ssrqri90xs7m3rw3"))))
@@ -11818,7 +12083,7 @@ defaults.")
          (uri (git-reference
                (url "https://github.com/Somelauw/evil-org-mode")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl"))))
@@ -12022,7 +12287,7 @@ on-line service.")
          (uri (git-reference
                (url "https://github.com/Sodel-the-Vociferous/helm-company")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k"))))
@@ -12048,7 +12313,7 @@ framework.")
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-descbinds")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1n89p56qwa243w1c85i5awnaf7piwjsvfi7nmnsrwm33hix5dknk"))))
@@ -12076,7 +12341,7 @@ you searched for and execute it, or view its documentation.")
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-emms")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh"))))
@@ -12098,14 +12363,12 @@ from @code{emms-source-file-default-directory}.")
       (version (git-version "20180703" "2" commit))
       (source
        (origin
-         (method url-fetch)
-         (uri (string-append
-               "https://github.com/emacs-helm/helm-exwm/archive/"
-               commit
-               ".tar.gz"))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-exwm.git")
+               (commit commit)))
          (sha256
-          (base32
-           "0n7hdiajw5vxl8ha2r9r4cl4i7crza25348825wb6acwhhzijxcj"))))
+          (base32 "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-helm" ,emacs-helm)
@@ -12131,7 +12394,7 @@ See @code{helm-exwm-switch-browser} for an example.")
          (uri (git-reference
                (url "https://github.com/yasuyk/helm-flycheck")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1a2yfxhz04klwhcandqvfzysxp6b7bxyxx1xk1x3kds5hif5fkl4"))))
@@ -12157,7 +12420,7 @@ See @code{helm-exwm-switch-browser} for an example.")
          (uri (git-reference
                (url "https://github.com/emacs-helm/helm-ls-git")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0vsq1n3xl3ghy5zik2scm7jrs501n4kybdqd6yw6j0cv4jxdqbr0"))))
@@ -12190,14 +12453,12 @@ projects unrelated to current-buffer.
       (version (git-version  "20180513" "1" commit))
       (source
        (origin
-         (method url-fetch)
-         (uri (string-append
-               "https://github.com/emacs-helm/helm-mu/archive/"
-               commit
-               ".tar.gz"))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-mu.git")
+               (commit commit)))
          (sha256
-          (base32
-           "0qm4xi3i957scm50nar398pv4x8y03si10l77jb9ckjaviyq2hj9"))))
+          (base32 "1lh0ahxdc5b2z18m9p30gwg8sbg33sjwkjr38p7h5xsm5fm7i0fz"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-helm" ,emacs-helm)
@@ -12255,7 +12516,7 @@ provided by other Emacs packages dealing with pass:
          (uri (git-reference
                (url "https://github.com/mhayashi1120/Emacs-imagex")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd"))))
@@ -12294,7 +12555,7 @@ image, rotate it, save modified images, and more.")
          (uri (git-reference
                (url "https://github.com/purcell/package-lint")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1hfricsgmy3x9snnd2p4xq6vnnv94qdsxxnxp07b3hqc9bhw31rq"))))
@@ -12362,7 +12623,7 @@ file.")
                "https://gitlab.com/Ambrevar/mu4e-conversation/"
                "repository/archive.tar.gz?ref="
                commit))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "0b52hf9rm2afba9pvgink9bwqm705sk0y5qikp0ff5sk53wqvy29"))))
@@ -12721,7 +12982,7 @@ few (like NOTE).")
          (uri (git-reference
                (url "https://github.com/jwiegley/git-annex-el")
                (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
            "1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh"))))
@@ -13546,13 +13807,13 @@ to open SQLite databases.")
     (version "1.2.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/NixOS/nix-mode/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/NixOS/nix-mode.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z"))))
+        (base32 "1vz3s2jx14nzy53f04d821n4f2s22ys5h9s7af6cnpynkwawyhhq"))))
     (build-system emacs-build-system)
     (inputs
      `(("emacs-company" ,emacs-company)
@@ -13599,7 +13860,7 @@ front end to mpc, a client for the @dfn{Music Player Daemon} (MPD).")
        (uri (git-reference
              (url "https://github.com/mkmcc/gnuplot-mode")
              (commit "601f6392986f0cba332c87678d31ae0d0a496ce7")))
-       (file-name (string-append name "-" version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32
          "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb"))))
@@ -14085,6 +14346,813 @@ command\", but because it always involves at least two commands (a prefix and
 a suffix) we prefer to call it just a \"transient\".")
       (license license:gpl3+))))
 
+(define-public emacs-undo-propose-el
+  (let ((commit "5f1fa99a04369a959aad01b476fe4f34229f28cd")
+        (version "1.0.0")
+        (revision "1"))
+    (package
+      (name "emacs-undo-propose-el")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jackkamm/undo-propose-el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/jackkamm/undo-propose-el")
+      (synopsis "Simple and safe navigation of @code{undo} history")
+      (description "This package permits navigation of @code{undo} history in a
+temporary buffer, which is read-only save for @code{undo} commands, and
+subsequent committal of a chain of @code{undo} commands as a single edit in
+the @code{undo} history.")
+      (license license:gpl3+))))
+
+(define-public emacs-elisp-docstring-mode
+  (let ((commit "f512e509dd690f65133e55563ebbfd2dede5034f")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-elisp-docstring-mode")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Fuco1/elisp-docstring-mode")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/Fuco1/elisp-docstring-mode")
+      (synopsis "Major mode for editing Emacs Lisp docstrings")
+      (description "This package provides font lock and automatic escaping and
+unescaping of quotes.")
+      (license license:gpl3+))))
+
+(define-public emacs-vimrc-mode
+  (let ((commit "13bc150a870d5d4a95f1111e4740e2b22813c30e")
+        (version "0.3.1")
+        (revision "1"))
+    (package
+      (name "emacs-vimrc-mode")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mcandre/vimrc-mode")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0026dqs3hwygk2k2xfra90w5sfnxrfj7l69jz7sq5glavbf340pk"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/mcandre/vimrc-mode")
+      (synopsis "Major mode for Vimscript")
+      (description "This package provides font lock and @code{beginning-} and
+@code{end-of-defun} functions for Vimscript files.")
+      (license license:gpl3+))))
+
+(define-public emacs-flycheck-haskell
+  (let ((commit "32ddff87165a7d3a35e7318bee997b5b4bd41278")
+        (version "0.8")
+        (revision "79"))
+    (package
+      (name "emacs-flycheck-haskell")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/flycheck/flycheck-haskell")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "10pgsbagq6qj4mshq5sypv0q0khck92b30sc793b4g1pfpsxvgjn"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-seq" ,emacs-seq)
+         ("emacs-flycheck" ,emacs-flycheck)
+         ("emacs-haskell-mode" ,emacs-haskell-mode)
+         ("emacs-let-alist" ,emacs-let-alist)))
+      (home-page "https://github.com/flycheck/flycheck-haskell")
+      (synopsis "Flycheck for Haskell")
+      (description "This package configures syntax-checking for Haskell
+buffers.")
+      (license license:gpl3+))))
+
+(define-public emacs-js2-refactor-el
+  (let ((commit "79124b3274c43ad1f9ec6205fa362576552db02f")
+        (version "0.9.0")
+        (revision "27"))
+    (package
+      (name "emacs-js2-refactor-el")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/magnars/js2-refactor.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1wswhlpbd3airrhyncb9vblqigwnqg9n96z0iis8jnz37q2whica"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-s" ,emacs-s)
+         ("emacs-js2-mode" ,emacs-js2-mode)
+         ("emacs-yasnippet" ,emacs-yasnippet)
+         ("emacs-multiple-cursors" ,emacs-multiple-cursors)))
+      (native-inputs
+       `(("emacs-buttercup" ,emacs-buttercup)
+         ("emacs-espuds" ,emacs-espuds)))
+      (home-page "https://github.com/magnars/js2-refactor.el")
+      (synopsis "JavaScript refactoring in Emacs")
+      (description "This package provides various refactoring functions for
+JavaScript.")
+      (license license:gpl3+))))
+
+(define-public emacs-prettier
+  (let ((commit "e9b73e81d3e1642aec682195f127a42dfb0b5774")
+        (version "0.1.0")
+        (revision "1"))
+    (package
+      (name "emacs-prettier")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/prettier/prettier-emacs")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0hj4fv3fgc60i6jrsx4a81s5c9fsxxafhhs3q2q1dypsscjci9ph"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/prettier/prettier-emacs")
+      (synopsis "Automatic formatting of JavaScript code")
+      (description "This package integrates Prettier with Emacs, and
+provides a minor mode that autoformats the buffer upon saving.")
+      (license license:expat))))
+
+(define-public emacs-fish-mode
+  (package
+    (name "emacs-fish-mode")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wwwjfy/emacs-fish")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/wwwjfy/emacs-fish")
+    (synopsis "Major mode for Fish shell scripts")
+    (description "This package provides syntax highlighting and indentation
+functions for Fish shell scripts.")
+    (license license:gpl3+)))
+
+(define-public emacs-eshell-up
+  (let ((commit "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
+        (version "0.0.3")
+        (revision "12"))
+    (package
+      (name "emacs-eshell-up")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/peterwvj/eshell-up")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/peterwvj/eshell-up")
+      (synopsis "Quickly go to a parent directory in @code{Eshell}")
+      (description "This package provides quick navigation to a specific
+parent directory using @code{Eshell}.")
+      (license license:gpl3+))))
+
+(define-public emacs-tco-el
+  (let ((commit "482db5313f090b17ed22ccd856f0e141dc75afe6")
+        (version "0.3")
+        (revision "1"))
+    (package
+      (name "emacs-tco-el")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Wilfred/tco.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1z7xkbrqznk6ni687qqknp8labcyhl8y6576hjfri89fn21385y9"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)))
+      (home-page "https://github.com/Wilfred/tco.el")
+      (synopsis "Tail-call optimization for Emacs Lisp")
+      (description "This package provides tail-call optimization for Emacs
+Lisp functions that call themselves in tail position.")
+      (license license:gpl3+))))
+
+(define-public emacs-equake
+  (let ((commit "ed15fd55cd4f2276161a6f712ed0b83cd10a8cdc")
+        (version "0.85")
+        (revision "1"))
+    (package
+      (name "emacs-equake")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/emacsomancer/equake/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "04kj88rlnn22gwmmv2gly2ibi6jka6l2cd4979pi6lhlvqqgjdnj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-tco-el" ,emacs-tco-el)))
+      (home-page "https://gitlab.com/emacsomancer/equake/")
+      (synopsis "Drop-down console for @code{Eshell} and terminal emulators")
+      (description "This package provides a Quake-style drop-down console
+compatible with Emacs' shell modes.")
+      (license license:gpl3+))))
+
+(define-public emacs-vdiff
+  (let ((commit "09e15fc932bfd2febe1d4a65780a532394562b07")
+        (version "0.2.3")
+        (revision "1"))
+    (package
+      (name "emacs-vdiff")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/justbur/emacs-vdiff/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1gvqi5l4zs872nn4pmj603aza09d81qad2rgijzv268lif8z34db"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-hydra" ,emacs-hydra)))
+      (home-page "https://github.com/justbur/emacs-vdiff/")
+      (synopsis "Frontend for diffing based on vimdiff")
+      (description "This package permits comparisons of two or three buffers
+based on diff output.")
+      (license license:gpl3+))))
+
+(define-public emacs-vdiff-magit
+  ;; Need to use a more recent commit than the latest release version because
+  ;; of Magit and Transient
+  (let ((commit "b100d126c69e5c26a61ae05aa1778bcc4302b597")
+        (version "0.3.2")
+        (revision "8"))
+    (package
+      (name "emacs-vdiff-magit")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/justbur/emacs-vdiff-magit/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "16cjmrzflf2i1w01973sl944xrfanakba8sb4dpwi79d92xp03xy"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-vdiff" ,emacs-vdiff)
+         ("emacs-magit" ,emacs-magit)
+         ("emacs-transient" ,emacs-transient)))
+      (home-page "https://github.com/justbur/emacs-vdiff-magit/")
+      (synopsis "Frontend for diffing based on vimdiff")
+      (description "This package permits comparisons of two or three buffers
+based on diff output.")
+      (license license:gpl3+))))
+
+(define-public emacs-all-the-icons-dired
+  (let ((commit "980b7747d6c4a7992a1ec56afad908956db0a519")
+        (version "1.0")
+        (revision "1"))
+    (package
+      (name "emacs-all-the-icons-dired")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jtbm37/all-the-icons-dired/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-all-the-icons" ,emacs-all-the-icons)))
+      (home-page "https://github.com/jtbm37/all-the-icons-dired/")
+      (synopsis "Show icons for each file in @code{dired-mode}")
+      (description "This package allows icons from @file{all-the-icons.el} to
+be used in @code{dired-mode}.")
+      (license license:gpl3+))))
+
+(define-public emacs-exwm-edit
+  (let ((commit "961c0f3ea45766b888c73d7353da13d329538034")
+        (version "0.0.1")
+        (revision "1"))
+    (package
+      (name "emacs-exwm-edit")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/agzam/exwm-edit/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "087pk5ckx753qrn6xpka9khhlp7iqlz76w7861x90av2f5cgy6fw"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-exwm" ,emacs-exwm)))
+      (home-page "https://github.com/agzam/exwm-edit/")
+      (synopsis "Open temp buffers for editing text from EXWM buffers")
+      (description "This package facilitates editing text from EXWM buffers by
+generating a temp buffer in which any useful Emacs utilities and modes can be
+invoked.")
+      (license license:gpl3+))))
+
+(define-public emacs-ert-async
+  (package
+    (name "emacs-ert-async")
+    (version "0.1.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rejeep/ert-async.el")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/rejeep/ert-async.el")
+    (synopsis "Async support for ERT")
+    (description "This package allows ERT to work with asynchronous tests.")
+    (license license:gpl3+)))
+
+(define-public emacs-prodigy-el
+  (let ((commit "701dccaa56de9e6a330c05bde33bce4f3b3d6a97")
+        (version "0.7.0")
+        (revision "28"))
+    (package
+      (name "emacs-prodigy-el")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/rejeep/prodigy.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1vyvxawlayp2nra0q83146q2nzv8qwn5a4nj0sx1jc90a0a83vgj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-s" ,emacs-s)
+         ("emacs-f" ,emacs-f)))
+      (native-inputs
+       `(("emacs-el-mock" ,emacs-el-mock)
+         ("emacs-ert-async" ,emacs-ert-async)))
+      (home-page "https://github.com/rejeep/prodigy.el")
+      (synopsis "Manage external services from within Emacs")
+      (description "This package provides a GUI for defining and monitoring services.")
+      (license license:gpl3+))))
+
+(define-public emacs-web-server
+  (let ((commit "cafa5b7582c57252a0884b2c33da9b18fb678713")
+        (version "0.1.1")
+        (revision "1"))
+    (package
+      (name "emacs-web-server")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/eschulte/emacs-web-server/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/eschulte/emacs-web-server/")
+      (synopsis "Web server with handlers in Emacs Lisp")
+      (description "This package supports HTTP GET and POST requests with
+url-encoded parameters, as well as web sockets.")
+      (license license:gpl3+))))
+
+(define-public emacs-markdown-preview-mode
+  (package
+    (name "emacs-markdown-preview-mode")
+    (version "0.9.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ancane/markdown-preview-mode")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1d1id99gagymvzdfa1mwqh8y3szm8ii47rpijkfi1qnifjg5jaq9"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-markdown-mode" ,emacs-markdown-mode)
+       ("emacs-websocket" ,emacs-websocket)
+       ("emacs-web-server" ,emacs-web-server)))
+    (arguments '(#:include '("\\.el$" "\\.html$")))
+    (home-page "https://github.com/ancane/markdown-preview-mode")
+    (synopsis "Live web development in Emacs")
+    (description "This package provides a minor mode for preview of Markdown
+files, and sends rendered Markdown to a web browser.")
+    (license license:gpl3+)))
+
+(define-public emacs-dotenv-mode
+  (package
+    (name "emacs-dotenv-mode")
+    (version "0.2.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/preetpalS/emacs-dotenv-mode")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/preetpalS/emacs-dotenv-mode")
+    (synopsis "Major mode for @file{.env} files")
+    (description "This package provides syntax highlighting for @file{.env}
+files.")
+    (license license:gpl3+)))
+
+(define-public emacs-add-node-modules-path
+  (let ((commit "f31e69ccb681f882aebb806ce6e9478e3ac39708")
+        (version "1.2.0")
+        (revision "10"))
+    (package
+      (name "emacs-add-node-modules-path")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/codesuki/add-node-modules-path")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0p106bqmvdr8by5iv02bshm339qbrjcch2d15mrm4h3nav03v306"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/codesuki/add-node-modules-path")
+      (synopsis "Add @file{node_modules} to the buffer-local @file{exec-path}")
+      (description "This package searches the parent directories of the
+current file for the project's @file{node_modules/.bin/} directory, allowing
+Emacs to find project-specific installations of packages.")
+      (license license:expat))))
+
+(define-public emacs-flow-minor-mode
+  (let ((commit "d1b32a7dd0d33c6a00a106da5f4b2323602cbd3e")
+        (version "0.3")
+        (revision "4"))
+    (package
+      (name "emacs-flow-minor-mode")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/an-sh/flow-minor-mode")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "169r4ib9qg9q6fm3p0p23qs1qx4pa9pg1qvyq4ysr85i7kwygppl"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/an-sh/flow-minor-mode")
+      (synopsis "Minor mode for JavaScript Flow files")
+      (description "This package integrates Flow with Emacs, allowing for
+definition-jumping and type-checking on demand.")
+      (license license:bsd-3))))
+
+(define-public emacs-rjsx-mode
+  (let ((commit "03dd8d1683501e81b58674d64c3032b7b718402c")
+        (version "0.4.0")
+        (revision "35"))
+    (package
+      (name "emacs-rjsx-mode")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/felipeochoa/rjsx-mode")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1kc44g9f38klpjklmz9n50a28nqv7prz6ck6ghdr6bnj1s98pb8a"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-js2-mode" ,emacs-js2-mode)))
+      (home-page "https://github.com/felipeochoa/rjsx-mode")
+      (synopsis "Major mode for JSX files")
+      (description "This package extends the parser of @code{js2-mode} to
+support JSX syntax.")
+      (license license:expat))))
+
+(define-public emacs-origami-el
+  (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366")
+        (version "1.0")
+        (revision "1"))
+    (package
+      (name "emacs-origami-el")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gregsexton/origami.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)
+         ("emacs-s" ,emacs-s)))
+      (home-page "https://github.com/gregsexton/origami.el")
+      (synopsis "Flexible text-folding")
+      (description "This package provides a minor mode for collapsing and
+expanding regions of text without modifying the actual contents.")
+      (license license:expat))))
+
+(define-public emacs-peep-dired
+  (let ((commit "c88a9a3050197840edfe145f11e0bb9488de32f4")
+        (version "0")
+        (revision "1"))
+    (package
+      (name "emacs-peep-dired")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/asok/peep-dired")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1wy5qpnfri1gha2cnl6q20qar8dbl2mimpb43bnhmm2g3wgjyad6"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/asok/peep-dired")
+      (synopsis "Preview files in another window")
+      (description "This package provides a minor mode that allows files to be
+previewed by scrolling up and down within a @code{dired} buffer.")
+      (license license:gpl3+))))
+
+(define-public emacs-counsel-etags
+  (package
+    (name "emacs-counsel-etags")
+    (version "1.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/redguardtoo/counsel-etags")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1d8nlrbsyza6q7yqm9248bxxsf49qf6hchg3zwv0l11acn3w8np5"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-ivy" ,emacs-ivy)))
+    (home-page "https://github.com/redguardtoo/counsel-etags")
+    (synopsis "Fast @code{Ctags}/@code{Etags} solution with @code{ivy-mode}")
+    (description "This package uses @code{ivy-mode} to facilitate navigating
+and searching through @code{Ctags} files.")
+    (license license:gpl3+)))
+
+(define-public emacs-helm-dash
+  (let ((commit "192b862185df661439a06de644791171e899348a")
+        (version "1.3.0")
+        (revision "18"))
+    (package
+      (name "emacs-helm-dash")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/areina/helm-dash")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "06am5vnr4hsxkvh2b8q8kb80y5x1h3qyv7gwggswwhfa7w2vba3w"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)))
+      (home-page "https://github.com/areina/helm-dash")
+      (synopsis "Offline documentation browser for APIs using Dash docsets")
+      (description "This package uses Helm to install and navigate through
+Dash docsets.")
+      (license license:gpl3+))))
+
+(define-public emacs-counsel-dash
+  (let ((commit "07fa74a94ff4da5b6c8c4810f5e143e701b480d2")
+        (version "0.1.3")
+        (revision "3"))
+    (package
+      (name "emacs-counsel-dash")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/nathankot/counsel-dash")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm-dash" ,emacs-helm-dash)
+         ("emacs-dash" ,emacs-dash)
+         ("emacs-ivy" ,emacs-ivy)))
+      (home-page "https://github.com/nathankot/counsel-dash")
+      (synopsis "Offline documentation browser for APIs using Dash docsets")
+      (description "This package uses @code{ivy-mode} to install and navigate
+through Dash docsets.")
+      (license license:expat))))
+
+(define-public emacs-el-patch
+  (package
+    (name "emacs-el-patch")
+    (version "2.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/raxod502/el-patch")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/raxod502/el-patch")
+    (synopsis "Future-proof your Emacs customizations")
+    (description "This package allows for an alternate definition of an Elisp
+function to be specified and for any differences from the original definition
+to be examined using Ediff.")
+    (license license:expat)))
+
+(define-public emacs-info-plus
+  (let ((commit "b837d710f7d58db586116cf6f75e75a9a074bc4b")
+        (version "5101")
+        (revision "55"))
+    (package
+      (name "emacs-info-plus")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacsmirror/info-plus")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1knyjkdm4rcs3qrc51jllw46ph7ycq5zxnvl70ydchzfwava43h6"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/emacsmirror/info-plus")
+      (synopsis "Extensions to @file{info.el}")
+      (description "This package extends Emacs' @file{info.el} by allowing
+outline-enabled table of contents, additional metadata association for Info
+nodes, and more.")
+      (license license:gpl2+))))
+
+(define-public emacs-eval-sexp-fu-el
+  (package
+    (name "emacs-eval-sexp-fu-el")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hchbaw/eval-sexp-fu.el")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/hchbaw/eval-sexp-fu.el")
+    (synopsis "Enhancements for evaluating s-expressions")
+    (description "This package provides provides variants of
+@code{eval-last-sexp} that work on the containing list or s-expression, as
+well as an option for visually flashing evaluated s-expressions.")
+    (license license:gpl3+)))
+
+(define-public emacs-counsel-tramp
+  (package
+    (name "emacs-counsel-tramp")
+    (version "0.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/masasam/emacs-counsel-tramp")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-ivy" ,emacs-ivy)))
+    (home-page "https://github.com/masasam/emacs-counsel-tramp")
+    (synopsis "Ivy interface for TRAMP")
+    (description "This package allows @code{ivy-mode} to display and filter
+SSH servers.")
+    (license license:gpl3+)))
+
+(define-public emacs-eacl
+  (package
+    (name "emacs-eacl")
+    (version "2.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/redguardtoo/eacl")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ksn11sm3g1ja5lpjz3hrzzw8b480mfcb3q589m52qjgvvn5iyfv"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-ivy" ,emacs-ivy)))
+    (home-page "https://github.com/redguardtoo/eacl")
+    (synopsis "Auto-complete lines by using @code{grep} on a project")
+    (description "This package provides auto-completion cammands for single
+and multiple lines of code in a project.")
+    (license license:gpl3+)))
+
 (define-public emacs-semantic-refactor
   ;; The last release, 0.5, was made on 2015-07-26 and there have been 47
   ;; commits since then.
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e00931c504..7c60cc6021 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
@@ -68,14 +68,14 @@
 (define-public emacs
   (package
     (name "emacs")
-    (version "26.1")
+    (version "26.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/emacs/emacs-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"))
+               "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"))
              (patches (search-patches "emacs-exec-path.patch"
                                       "emacs-fix-scheme-indent-function.patch"
                                       "emacs-source-date-epoch.patch"))
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 5ea2b17197..a65998c369 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1013,6 +1013,8 @@ SPI, I2C, JTAG.")
                             "uptools/atcmd/atinterf.c")
                (("/opt/freecalypso/loadtools")
                 (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
+               (("\\$\\{INSTALL_PREFIX\\}/loadtools")
+                (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
                (("/opt/freecalypso")
                 (assoc-ref outputs "out")))
              #t)))))
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 902e766438..f9358c7225 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -466,13 +466,13 @@ and Game Boy Color games.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-core/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-core.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0dg2hksm5qni2hcha93k7n4fqr92888p946f7phb0ndschzfh9kk"))))
+        (base32 "116fndl6652zrp1r6ag4xv3dzp1x52mlvadj8xwflq07fd5rhri1"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -514,13 +514,13 @@ core library.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-audio-sdl/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-audio-sdl.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0ss6w92n2rpfnazhg9lbq0nvs3fqx93nliz3k3wjxdlx4dpi7h3a"))))
+        (base32 "0z19amfg9vr2pqjjri1ipc7hs681fzjcnb0f9y7bjhp5n8d7p6bb"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -560,13 +560,13 @@ SDL audio plugin.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-input-sdl/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-input-sdl.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "11sj5dbalp2nrlmki34vy7wy28vc175pnnkdk65p8599hnyq37ri"))))
+        (base32 "1dyazfbdjycdfslq8jixqiqhziw0rlkvach2r9dz91229jmkyc9c"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("which" ,which)))
@@ -605,13 +605,13 @@ SDL input plugin.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-rsp-hle/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-rsp-hle.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "15h7mgz6xd2zjzm6l3f96sbs8kwr3xvbwzgikhnka79m6c69hsxv"))))
+        (base32 "0pi31qzjjp7aypdvvnz6ms18g09c4gqzxi6328zj8sji94b75gf0"))))
     (build-system gnu-build-system)
     (inputs
      `(("mupen64plus-core" ,mupen64plus-core)))
@@ -647,13 +647,13 @@ high-level emulation (HLE) RSP processor plugin.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-rsp-z64/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-rsp-z64.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "10jz1w2dhx5slhyk4m8mdqlpsd6cshchslr1fckb2ayzb1ls3ghi"))))
+        (base32 "0nfyjns9k8xbg3aqs7593nfaxvlj72h3l8h467442xlk8ajfcylx"))))
     (build-system gnu-build-system)
     (inputs
      `(("mupen64plus-core" ,mupen64plus-core)))
@@ -689,13 +689,13 @@ Z64 RSP processor plugin.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-video-arachnoid/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-video-arachnoid.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0jjwf144rihznm4lnqbhgigxw664v3v32wy94adaa6imk8z6gslh"))))
+        (base32 "1v9fqwpb6pawr8z5cm2ki7bqkks4iyr5c4jy4v5khj6h8zcv55gc"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -735,13 +735,13 @@ Arachnoid video plugin.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-video-glide64/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-video-glide64.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1rm55dbf6xgsq1blbzs6swa2ajv0qkn38acbljj346abnk6s3dla"))))
+        (base32 "0qn5za7g7796kh2ag3xpmhbqg0yf71g9liz6ks0rha8pz73lgs01"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -789,13 +789,13 @@ Glide64 video plugin.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-video-glide64mk2/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-video-glide64mk2.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1ihl4q293d6svba26b4mhapjcdg12p90gibz79b4mx423jlcxxj9"))))
+        (base32 "08pm28a36dpr0cvr8pzw0n5ksdazp7jqvlmqfy2lwb4dm0cwhkqd"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -839,13 +839,13 @@ Glide64MK2 video plugin.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-video-rice/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-video-rice.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0rd2scjmh285w61aj3mgx71whg5rqrjbry3cdgicczrnyvf8wdvk"))))
+        (base32 "0rpmbcq67gsj5h5jjis146378qc1mskskvx20y1ikx59yhbamh13"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -887,13 +887,13 @@ Rice Video plugin.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-video-z64/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-video-z64.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1x7wsjs5gx2iwx20p4cjcbf696zsjlh31qxmghwv0ifrq8x58s1b"))
+        (base32 "04qa2fdd6dakpk2v0d4l80xh9b4h8gm71g80c0wyyxdhmhwk1r9c"))
        (patches (search-patches "mupen64plus-video-z64-glew-correct-path.patch"))))
     (build-system gnu-build-system)
     (native-inputs
@@ -942,13 +942,13 @@ Z64 video plugin.")
     (version "2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/mupen64plus/mupen64plus-ui-console/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mupen64plus/mupen64plus-ui-console.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "04qkpd8ic7xsgnqz7spl00wxdygf79m7d1k8rabbygjk5lg6p8z2"))
+        (base32 "0vrf98qa6a0y3647kslsv644fag233dxh5dcr1yncjiiwickcr5a"))
        (patches (search-patches "mupen64plus-ui-console-notice.patch"))))
     (build-system gnu-build-system)
     (native-inputs
@@ -1005,21 +1005,21 @@ towards a working Mupen64Plus for casual users.")
   (package
     (name "nestopia-ue")
     (version "1.48")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/rdanbrook/nestopia/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "184y05z4k4a4m4022niy625kan0rklh8gcxyynxli1fss2sjjrpv"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; We don't need libretro for the GNU/Linux build.
-                  (delete-file-recursively "libretro")
-                  #t))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rdanbrook/nestopia.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19c8vx5yxbysl0sszk5blfngwacshdgwbf44g1qaxvq8ywiyxmb4"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; We don't need libretro for the GNU/Linux build.
+           (delete-file-recursively "libretro")
+           #t))))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a90ceab0d2..cf308e03f6 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2018, 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
-;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2019 Tim Stahel <swedneck@swedneck.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -2008,3 +2008,57 @@ editors.")
 slicing software to x3g files for standalone 3D printing on common 3D
 printers.")
     (license license:gpl2+)))
+
+(define-public gnucap
+  (package
+    (name "gnucap")
+    (version "20171003")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "16m09xa685qhj5fqq3bcgakrwnb74xhf5f7rpqkkf9fg8plzbb1g"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("readline" ,readline)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               ;; Set correct rpath so that gnucap finds libgnucap.so.
+               (substitute* (list "apps/configure" "lib/configure"
+                                  "main/configure" "modelgen/configure")
+                 (("LDFLAGS =")
+                  (string-append "LDFLAGS = -Wl,-rpath=" out "/lib")))
+               ;; gnucap uses a hand-written configure script that expects the
+               ;; --prefix argument to be the first argument passed to it.
+               (invoke "./configure" (string-append "--prefix=" out)))))
+         (replace 'check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (libpath "../lib/O:../apps/O"))
+               (with-directory-excursion "tests"
+                 ;; Make test return non-zero exit code when a test fails.
+                 (substitute* "test"
+                   (("/bin/sh") "/bin/sh -e")
+                   (("\\|\\| echo \"\\*\\*\\*\\* \\$ii fails \\*\\*\\*\\*\"") ""))
+                 ;; Fix expected plugin search path for test c_attach.1.gc
+                 (substitute* "==out/c_attach.1.gc.out"
+                   (("/usr/local/lib/gnucap")
+                    (string-append libpath ":" out "/lib/gnucap")))
+                 ;; Set library path so that gnucap can find libgnucap.so
+                 ;; while running the tests.
+                 (setenv "LD_LIBRARY_PATH" libpath)
+                 (invoke "./test" "../main/O/gnucap" "" "test-output" "==out"))))))))
+    (home-page "https://www.gnu.org/software/gnucap/")
+    (synopsis "Mixed analog and digital circuit simulator")
+    (description "GNUcap is a circuit analysis package.  It offers a general
+purpose circuit simulator and can perform DC and transient analyses, fourier
+analysis and AC analysis.  The engine is designed to do true mixed-mode
+simulation.")
+    (license license:gpl3+)))
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index c778ebd21e..3a7e3284a9 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -322,7 +322,7 @@ network.  LIBNFS offers three different APIs, for different use :
        `(("bzip2" ,bzip2)
          ("fuse" ,fuse)
          ("zlib" ,zlib)))
-      (synopsis "Read-only FUSE driver for the APFS filesystem")
+      (synopsis "Read-only FUSE driver for the APFS file system")
       (description "APFS-FUSE is a read-only FUSE driver for the @dfn{Apple File
 System} (APFS).  It is currently in an experimental state — it may not be able
 to read all files, and it does not support all the compression methods in
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 575569d3aa..bd30d466f4 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -390,7 +390,7 @@ other machines/servers.  Electrum does not download the Bitcoin blockchain.")
   (package
     (inherit electrum)
     (name "electron-cash")
-    (version "3.3.6")
+    (version "4.0.1")
     (source
      (origin
        (method url-fetch)
@@ -401,7 +401,7 @@ other machines/servers.  Electrum does not download the Bitcoin blockchain.")
                            ".tar.gz"))
        (sha256
         (base32
-         "110apc376wm4yd9ghpffiipwdn8rzyr3z7ncpp2516wbz4mmyhxc"))
+         "16fi03f23yb5r9s64x1a9wrxnvivlbawvrbq4d486yclzl1r7y48"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -627,7 +627,7 @@ Monero GUI client.")
 (define-public python-trezor-agent
   (package
     (name "python-trezor-agent")
-    (version "0.13.0")
+    (version "0.13.1")
     (source
      (origin
        (method git-fetch)
@@ -636,7 +636,7 @@ Monero GUI client.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0i4igkxi8fwdlbhg6nx27lhnc9v9nmrw4j5fvpnc202n6yjlc7x7"))))
+        (base32 "0q99vbfd3h85s8rnjipnmldixabqmmlk5w9karv6f0rhyi54f4zv"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -733,14 +733,14 @@ Ledger Blue/Nano S.")
 (define-public python-trezor
   (package
     (name "python-trezor")
-    (version "0.11.1")
+    (version "0.11.2")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "trezor" version))
         (sha256
           (base32
-            "064yds8f4px0c6grkkanpdjx022g4q87ihzhkmdv9qanv0hz6hv0"))))
+            "1f0zfki12mnhidkfxpx2lpq1xim8f35i2d64bx9lf4m26xxv9x56"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -779,14 +779,14 @@ TREZOR Hardware Wallet.")
 (define-public python-keepkey
   (package
     (name "python-keepkey")
-    (version "6.0.2")
+    (version "6.0.3")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "keepkey" version))
         (sha256
           (base32
-            "16j8hnxj9r4b2w6kfncmny09pb1al8ppmn59qxzl3qmh1xhpy45g"))))
+            "0z3d0m6364v9dv0njs4cd5m5ai6j6v35xaaxfxl90m9vmyxy81vd"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 0f3e1009ac..4df4b22843 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -377,7 +377,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
 (define* (make-arm-trusted-firmware platform #:optional (arch "aarch64"))
   (package
     (name (string-append "arm-trusted-firmware-" platform))
-    (version "1.5")
+    (version "2.1")
     (source
       (origin
         (method git-fetch)
@@ -388,7 +388,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
         (file-name (git-file-name "arm-trusted-firmware" version))
        (sha256
         (base32
-         "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"))))
+         "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -448,25 +448,10 @@ such as:
                    license:bsd-2)))) ; libfdt
 
 (define-public arm-trusted-firmware-sun50i-a64
-  (let ((base (make-arm-trusted-firmware "sun50i_a64"))
-        ;; Use unreleased version which enables additional features needed for
-        ;; LCD support
-        (commit "98aab97484b27e40aa74a93e5d1c1ac037a7e0b8")
-        (revision "2"))
+  (let ((base (make-arm-trusted-firmware "sun50i_a64")))
     (package
       (inherit base)
-      (name "arm-trusted-firmware-sun50i-a64")
-      (version (git-version "2.0" revision commit))
-      (source
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                 (url "https://github.com/ARM-software/arm-trusted-firmware.git")
-                 (commit commit)))
-          (file-name (git-file-name name version))
-          (sha256
-           (base32
-            "0z5si034vcn4m68zaixc5v8fs1c7vxbh7n4hggxs55p0jg01dan5")))))))
+      (name "arm-trusted-firmware-sun50i-a64"))))
 
 (define-public arm-trusted-firmware-puma-rk3399
   (let ((base (make-arm-trusted-firmware "rk3399"))
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index d9c663d7f4..f0547a1a8a 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -127,15 +127,14 @@ brick your device.")
 (define-public avrdude
   (package
     (name "avrdude")
-    (version "6.1")
+    (version "6.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://savannah/avrdude/avrdude-"
                           version ".tar.gz"))
       (sha256
-       (base32
-        "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y"))))
+       (base32 "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"))))
     (build-system gnu-build-system)
     (inputs
      `(("libelf" ,libelf)
@@ -148,8 +147,8 @@ brick your device.")
     (synopsis "AVR downloader and uploader")
     (description
      "AVRDUDE is a utility to download/upload/manipulate the ROM and
-EEPROM contents of AVR microcontrollers using the in-system programming
-technique (ISP).")
+EEPROM contents of AVR microcontrollers using the @acronym{ISP, in-system
+programming} technique.")
     (license license:gpl2+)))
 
 (define-public dfu-programmer
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 25d93fd28d..a84cb3b97a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -54,12 +54,14 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)                ;intltool
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages libusb)
@@ -74,6 +76,7 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
@@ -628,7 +631,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
 (define-public weston
   (package
     (name "weston")
-    (version "5.0.0")
+    (version "6.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -636,30 +639,40 @@ applications, X servers (rootless or fullscreen) or other display servers.")
                     "weston-" version ".tar.xz"))
               (sha256
                (base32
-                "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm"))))
-    (build-system gnu-build-system)
+                "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"))))
+    (build-system meson-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("xorg-server" ,xorg-server)))
     (inputs
      `(("cairo" ,cairo-xcb)
+       ("colord" ,colord)
        ("dbus" ,dbus)
        ("elogind" ,elogind)
+       ("lcms" ,lcms)
+       ("libevdev" ,libevdev)
        ("libinput" ,libinput-minimal)
+       ("libjpeg" ,libjpeg)
        ("libunwind" ,libunwind)
+       ("libva" ,libva)
+       ("libwebp" ,libwebp)
        ("libxcursor" ,libxcursor)
        ("libxkbcommon" ,libxkbcommon)
+       ("libxml2" ,libxml2)
        ("mesa" ,mesa)
        ("mtdev" ,mtdev)
        ("linux-pam" ,linux-pam)
+       ("pango" ,pango)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
     (arguments
      `(#:configure-flags
-       (list "--disable-setuid-install"
-             "--enable-systemd-login"
-             (string-append "--with-xserver-path="
+       (list "-Dbackend-rdp=false" ; TODO: Enable.
+             "-Dremoting=false" ; TODO: Enable.
+             "-Dsimple-dmabuf-drm=auto"
+             "-Dsystemd=false"
+             (string-append "-Dxwayland-path="
                             (assoc-ref %build-inputs "xorg-server-xwayland")
                             "/bin/Xwayland"))
        #:parallel-tests? #f ; Parallel tests cause failures.
@@ -668,8 +681,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
          (add-before 'configure 'use-elogind
            (lambda _
              ;; Use elogind instead of systemd
-             (substitute* "configure"
-               (("libsystemd-login >= 198") "libelogind"))
+             (substitute* "libweston/meson.build"
+               (("libsystemd-login") "libelogind"))
              (substitute* '("libweston/launcher-logind.c"
                             "libweston/weston-launch.c")
                (("#include <systemd/sd-login.h>")
@@ -677,7 +690,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
              #t))
          (add-after 'configure 'patch-confdefs.h
            (lambda _
-             (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")))
+             (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")
+             #t))
          (add-before 'check 'setup
            (lambda _
              (setenv "HOME" (getcwd))
@@ -906,7 +920,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
 (define-public libmbim
   (package
     (name "libmbim")
-    (version "1.18.0")
+    (version "1.18.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -914,7 +928,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"))))
+                "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-mkenums
@@ -937,7 +951,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.")
 (define-public libqmi
   (package
     (name "libqmi")
-    (version "1.22.2")
+    (version "1.22.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -945,7 +959,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.")
                     "libqmi-" version ".tar.xz"))
               (sha256
                (base32
-                "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"))))
+                "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc"))))
     (build-system gnu-build-system)
     (inputs
      `(("libgudev" ,libgudev)))
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5ff28532fb..79b87856d5 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
-;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2017, 2018 Julian Graham <joolean@gmail.com>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
@@ -1404,3 +1404,33 @@ Fenix.")
     (description "This package contains a collection of modules for the Bennu
 Game Developement programming language, from CD handling through SDL to
 joystick support.")))
+
+(define-public plib
+  (package
+    (name "plib")
+    (version "1.8.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://plib.sourceforge.net/dist/"
+                                  "plib-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("libxi" ,libxi)
+       ("libxmu" ,libxmu)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://plib.sourceforge.net/")
+    (synopsis "Suite of portable game libraries")
+    (description "PLIB is a set of libraries that will permit programmers to
+write games and other realtime interactive applications that are 100% portable
+across a wide range of hardware and operating systems.  PLIB includes sound
+effects, music, a complete 3D engine, font rendering, a simple Windowing
+library, a game scripting language, a GUI, networking, 3D math library and a
+collection of handy utility functions.  All are 100% portable across nearly
+all modern computing platforms.  Each library component is fairly independent
+of the others")
+    (license license:lgpl2.0+)))
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2afe5b58ba..0b93409c76 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3542,12 +3542,19 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.")
     (inputs
      `(("lablgtk" ,lablgtk)
        ("ocaml" ,ocaml)
-       ("ocaml-findlib" ,ocaml-findlib)))
+       ("ocaml-findlib" ,ocaml-findlib)
+       ("ocamlbuild" ,ocamlbuild)))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (delete 'configure)
-         (add-before 'build 'setenv
+         (add-before 'build 'allow-unsafe-strings
+           ;; Fix a build failure with ocaml >=4.06.0.
+           ;; See <https://github.com/sgimenez/laby/issues/53>.
+           (lambda _
+             (setenv "OCAMLPARAM" "safe-string=0,_")
+             #t))
+         (add-before 'build 'set-library-path
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((lablgtk (assoc-ref inputs "lablgtk")))
                (setenv "LD_LIBRARY_PATH"
@@ -6765,3 +6772,198 @@ a procedurally generated world, the player can explore thousands of rooms in
 search of powerful artifacts, tools to help them, and to eventually free the
 Orcus Dome from evil.")
     (license license:gpl3+)))
+
+(define-public marble-marcher
+  (let ((commit "e580460a0c3826f9b28ab404607942a8ecb625d7")
+        (revision "1"))
+    (package
+      (name "marble-marcher")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/HackerPoet/MarbleMarcher.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0jjv832hl1v170n6gryp2sr3lgqndi9ab841qvgqk68bks8701mx"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:tests? #f  ; there are none
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'embed-asset-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((assets (string-append (assoc-ref outputs "out")
+                                            "/share/marble-marcher/assets/")))
+                 ;; Some of the files we're patching are
+                 ;; ISO-8859-1-encoded, so choose it as the default
+                 ;; encoding so the byte encoding is preserved.
+                 (with-fluids ((%default-port-encoding #f))
+                   (substitute* "src/Resource.rc"
+                     (("../assets/icon.ico")
+                      (string-append assets "icon.ico")))
+                   (substitute* "src/Res.h"
+                     (("assets/") assets))))
+               #t))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (assets (string-append out "/share/marble-marcher/assets"))
+                      (bin (string-append out "/bin/")))
+                 (mkdir-p bin)
+                 (mkdir-p assets)
+                 (copy-recursively "../source/assets" assets)
+                 (install-file "MarbleMarcher" bin))
+               #t)))))
+      (inputs
+       `(("eigen" ,eigen)
+         ("mesa" ,mesa)
+         ("sfml" ,sfml)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (home-page "https://codeparade.itch.io/marblemarcher")
+      (synopsis "Guide a marble across fractal landscapes")
+      (description "Marble Marcher is a video game that uses a fractal physics
+engine and fully procedural rendering to produce beautiful and unique
+gameplay.  The game is played on the surface of evolving fractals.  The goal
+of the game is to get your marble to the flag as quickly as possible.  But be
+careful not to fall off the level or get crushed by the fractal!  There are 24
+levels to unlock.")
+      ;; Code is under GPLv2+, assets are under CC-BY-SA 3.0 and OFL 1.1.
+      (license (list license:gpl2+
+                     license:silofl1.1
+                     license:cc-by-sa3.0)))))
+
+;; This must be updated together with flightgear.
+(define simgear
+  (package
+    (name "simgear")
+    (version "2018.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/flightgear/release-"
+                                  (version-major+minor version) "/"
+                                  "simgear-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1941ay8rngz4vwsx37bbpxr48hpcvcbj3xw1hy264lq4qnl99c68"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             ;; Skip tests that require internet access.
+             (invoke "ctest" "-E" "(http|dns)"))))))
+    (inputs
+     `(("boost" ,boost-for-mysql) ; fails with 1.69
+       ("curl" ,curl)
+       ("expat" ,expat)
+       ("mesa" ,mesa)
+       ("openal" ,openal)
+       ("openscenegraph" ,openscenegraph-3.4)
+       ("zlib" ,zlib)))
+    (home-page "https://home.flightgear.org/")
+    (synopsis "Libraries for 3D simulations and games")
+    (description "SimGear is a set of libraries designed to be used as
+building blocks for quickly assembling 3D simulations, games, and
+visualization applications.  SimGear is developed by the FlightGear project
+and also provides the base for the FlightGear Flight Simulator.")
+    (license license:lgpl2.0+)))
+
+(define-public flightgear
+  (package
+    (name "flightgear")
+    (version (package-version simgear))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/flightgear/release-"
+                                  (version-major+minor version) "/"
+                                  "flightgear-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0lzy524cjzs8vldcjcc750bgg5c4mq9fkymxxxzqf68ilc4d1jss"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; There are some bundled libraries.
+                  (for-each delete-file-recursively
+                            '("3rdparty/sqlite3/"))
+                  #t))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "-DSYSTEM_SQLITE=ON"
+             (string-append "-DFG_DATA_DIR="
+                            (assoc-ref %outputs "out")
+                            "/share/flightgear"))
+       ;; TODO: test cannot be run because the "run_test_suite" executable
+       ;; does not seem to be built.
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fgfs")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtdeclarative" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtdeclarative" "qtsvg"))))
+               #t)))
+         (add-after 'install 'install-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((share (string-append (assoc-ref outputs "out") "/share/flightgear")))
+               (mkdir-p share)
+               (with-directory-excursion share
+                 (invoke "tar" "xf" (assoc-ref inputs "flightgear-data")
+                         "--strip-components=1")))
+             #t)))))
+    (inputs
+     `(("boost" ,boost-for-mysql)       ; same as simgear
+       ("dbus" ,dbus)
+       ("eudev" ,eudev)
+       ("freeglut" ,freeglut)
+       ("freetype" ,freetype)
+       ("glew" ,glew)
+       ("libpng" ,libpng)
+       ("openal" ,openal)
+       ("openscenegraph" ,openscenegraph-3.4)
+       ("plib" ,plib)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)
+       ("simgear" ,simgear)
+       ("speexdsp" ,speexdsp)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("cppunit" ,cppunit)
+       ("pkg-config" ,pkg-config)
+       ("qttools" ,qttools)
+       ("flightgear-data"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "mirror://sourceforge/flightgear/release-"
+                               (version-major+minor version) "/"
+                               "FlightGear-" version "-data.tar.bz2"))
+           (sha256
+            (base32
+             "0h4npa7gqpf5fw6pv2bpw0wbwr7fa2vhia21cjbigfgd75x82zi7"))))))
+    (home-page "https://home.flightgear.org/")
+    (synopsis "Flight simulator")
+    (description "The goal of the FlightGear project is to create a
+sophisticated flight simulator framework for use in research or academic
+environments, pilot training, as an industry engineering tool, for DIY-ers to
+pursue their favorite interesting flight simulation idea, and last but
+certainly not least as a fun, realistic, and challenging desktop flight
+simulator.")
+    (license license:gpl2+)))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 4761a277ae..0b95fbe613 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -746,14 +746,14 @@ to create databases that are optimized for rendering/tile/map-services.")
     (name "libosmium")
     (version "2.14.2")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/osmcode/libosmium/archive/v"
-                version ".tar.gz"))
-    (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0d9b46qiw7zkw1h9lygjdwqxnbhm3c7v8kydzw9f9f778cyagc94"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/osmcode/libosmium.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250"))))
     (build-system cmake-build-system)
     (propagated-inputs
      `(("boost" ,boost)
@@ -776,20 +776,21 @@ OpenStreetMap data.")
   (package
     (name "osm2pgsql")
     (version "0.96.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/openstreetmap/osm2pgsql/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "08y7776r4l9v9177a4q6cfdri0lpirky96m6g699hwl7v1vhw0mn"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (delete-file-recursively "contrib/protozero")
-                  (delete-file-recursively "contrib/libosmium")
-                  #t))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openstreetmap/osm2pgsql.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (delete-file-recursively "contrib/protozero")
+           (delete-file-recursively "contrib/libosmium")
+           #t))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f; tests fail because we need to setup a database
@@ -823,14 +824,15 @@ map, geocoding with Nominatim, or general analysis.")
   (package
     (name "tippecanoe")
     (version "1.31.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mapbox/tippecanoe/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1057na1dkgjaryr7jr15lqkxpam111d3l5zdpdkqzzzpxmdjxqcf"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mapbox/tippecanoe.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1m0x931a945sr7axyhcvpwh798m58hx1zxh6ikgf9gsgqhdhmszz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 575666fdeb..3ead5b32a3 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -118,7 +118,7 @@ buffers.")
 (define-public gimp
   (package
     (name "gimp")
-    (version "2.10.8")
+    (version "2.10.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.gimp.org/pub/gimp/v"
@@ -126,7 +126,7 @@ buffers.")
                                   "/gimp-" version ".tar.bz2"))
               (sha256
                (base32
-                "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"))))
+                "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                            ; 9 MiB of gtk-doc HTML
@@ -368,5 +368,5 @@ MyPaint.")
      "This package provides resynthesizer plugins for GIMP, which encompasses
 tools for healing selections (content-aware fill), enlarging the canvas and
 healing the border, increasing the resolution while adding detail, and
-transfering the style of an image.")
+transferring the style of an image.")
     (license license:gpl3+)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ff8e8ad2e0..5583af576b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2666,7 +2666,7 @@ libxml to ease remote use of the RESTful API.")
 (define-public libsoup
   (package
     (name "libsoup")
-    (version "2.66.0")
+    (version "2.66.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
@@ -2674,7 +2674,7 @@ libxml to ease remote use of the RESTful API.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai"))))
+                "1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
@@ -4309,15 +4309,15 @@ work and the interface is well tested.")
 (define-public eolie
   (package
     (name "eolie")
-    (version "0.9.52")
+    (version "0.9.60")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gitlab.gnome.org/World/eolie/"
-                                  "uploads/d95bf72958276c80dfaca8cce0e4e92c/"
+                                  "uploads/3b2ceb7eb15860587db6886bfdd8a91e/"
                                   "eolie-" version ".tar.xz"))
               (sha256
                (base32
-                "1s3b0rkm8sxmhzzi624snzqvz61i1rja5wxyzw6jg2kcdjcylwln"))))
+                "1s9gkzxa6457v6bh0q8n1ijq1chd2jwgvhk5kppsnya7kxvsx8qh"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -4378,9 +4378,9 @@ a secret password store, an adblocker, and a modern UI.")
     (version "3.28.3.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/epiphany/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "epiphany-" version ".tar.xz"))
               (sha256
                (base32
                 "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9"))))
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 25c9e0b476..f9baf49fe9 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
@@ -538,6 +538,32 @@ virtual reality, scientific visualization and modeling.")
     ;; LGPL 2.1, but with 4 exceptions. This version is called OSGPL.
     (license license:lgpl2.1)))
 
+;; We need this for simgear
+(define-public openscenegraph-3.4
+  (package (inherit openscenegraph)
+    (name "openscenegraph")
+    (version "3.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openscenegraph/OpenSceneGraph")
+             (commit (string-append "OpenSceneGraph-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1fbzg1ihjpxk6smlq80p3h3ggllbr16ihd2fxpfwzam8yr8yxip9"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments openscenegraph)
+       ((#:configure-flags flags)
+        `(cons
+          ;; The jpeg plugin requires conversion between integers and booleans
+          "-DCMAKE_CXX_FLAGS=-fpermissive"
+          ,flags))))
+    (inputs
+     `(("libjpeg" ,libjpeg)
+       ,@(package-inputs openscenegraph)))))
+
 (define-public povray
   (package
     (name "povray")
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d4f019c814..e7f9e8fe93 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
@@ -898,33 +898,30 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
     (license license:gpl3+)))
 
 (define-public guile-email
-  (let ((commit "fa52eac55e5946db89621a6c583d2aa357864dee")
-        (revision "1"))
-    (package
-      (name "guile-email")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.systemreboot.net/guile-email")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1037mbz7qd9bzaqp8ysyhnl9ipd97fmj3b9jr8qfzx9179vvsj63"))))
-      (build-system gnu-build-system)
-      (native-inputs
-       `(("pkg-config" ,pkg-config)
-         ("autoconf" ,autoconf)
-         ("automake" ,automake)))
-      (inputs
-       `(("guile" ,guile-2.2)))
-      (home-page "https://git.systemreboot.net/guile-email")
-      (synopsis "Guile email parser")
-      (description "This package provides an email parser written in pure
+  (package
+    (name "guile-email")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://git.systemreboot.net/guile-email/snapshot/guile-email-"
+             version ".tar.xz"))
+       (sha256
+        (base32
+         "0p2v8q2kkz8m6vf2rsjvz3dj1mvnx7dxakjf72dwkndbgk3rp79f"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs
+     `(("guile" ,guile-2.2)))
+    (home-page "https://git.systemreboot.net/guile-email")
+    (synopsis "Guile email parser")
+    (description "This package provides an email parser written in pure
 Guile.")
-      (license license:agpl3+))))
+    (license license:agpl3+)))
 
 (define-public guile-debbugs-next
   (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index a23dfe9ae6..3d269cea83 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
-;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
@@ -833,6 +833,28 @@ code pages on Windows.  On all other operating systems, the library does
 nothing.")
   (license license:bsd-3)))
 
+(define-public ghc-libffi
+  (package
+    (name "ghc-libffi")
+    (version "0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://hackage.haskell.org/package/"
+                           "libffi/libffi-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28"))))
+    (build-system haskell-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("libffi" ,libffi)))
+    (home-page "http://hackage.haskell.org/package/libffi")
+    (synopsis "Haskell binding to libffi")
+    (description
+     "A binding to libffi, allowing C functions of types only known at runtime
+to be called from Haskell.")
+    (license license:bsd-3)))
+
 (define-public ghc-newtype-generics
   (package
     (name "ghc-newtype-generics")
diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index f80d6b3894..ec3eb15d63 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
+;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,11 +20,14 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages idris)
+  #:use-module (gnu packages)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system haskell)
   #:use-module (guix download)
@@ -34,7 +38,7 @@
 (define-public idris
   (package
     (name "idris")
-    (version "1.3.0")
+    (version "1.3.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -42,8 +46,14 @@
                     "idris-" version "/idris-" version ".tar.gz"))
               (sha256
                (base32
-                "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48"))))
+                "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi"))
+              (patches (search-patches "idris-test-no-node.patch"))))
     (build-system haskell-build-system)
+    (native-inputs                      ;For tests
+     `(("perl" ,perl)
+       ("ghc-tasty" ,ghc-tasty)
+       ("ghc-tasty-golden" ,ghc-tasty-golden)
+       ("ghc-tasty-rerun" ,ghc-tasty-rerun)))
     (inputs
      `(("gmp" ,gmp)
        ("ncurses" ,ncurses)
@@ -60,6 +70,7 @@
        ("ghc-fingertree" ,ghc-fingertree)
        ("ghc-fsnotify" ,ghc-fsnotify)
        ("ghc-ieee754" ,ghc-ieee754)
+       ("ghc-libffi" ,ghc-libffi)
        ("ghc-megaparsec" ,ghc-megaparsec)
        ("ghc-network" ,ghc-network)
        ("ghc-optparse-applicative" ,ghc-optparse-applicative)
@@ -75,21 +86,16 @@
        ("ghc-vector-binary-instances" ,ghc-vector-binary-instances)
        ("ghc-zip-archive" ,ghc-zip-archive)))
     (arguments
-     `(#:tests? #f ; FIXME: Test suite doesn't run in a sandbox.
-       #:configure-flags
+     `(#:configure-flags
        (list (string-append "--datasubdir="
-                            (assoc-ref %outputs "out") "/lib/idris"))
+                            (assoc-ref %outputs "out") "/lib/idris")
+             "-fFFI" "-fGMP")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'set-cc-command
            (lambda _
              (setenv "CC" "gcc")
              #t))
-         (add-before 'configure 'update-constraints
-           (lambda _
-             (substitute* "idris.cabal"
-               (("aeson >= 0\\.6 && < 1\\.3")
-                "aeson >= 0.6 && < 1.4"))))
          (add-after 'install 'fix-libs-install-location
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -99,7 +105,15 @@
                 (lambda (module)
                   (symlink (string-append modules "/" module)
                            (string-append lib "/" module)))
-                '("prelude" "base" "contrib" "effects" "pruviloj"))))))))
+                '("prelude" "base" "contrib" "effects" "pruviloj")))))
+         (delete 'check)                ;Run check later
+         (add-after 'install 'check
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (let ((out (assoc-ref outputs "out")))
+               (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
+               (setenv "IDRIS_CC" "gcc") ;Needed for creating executables
+               (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))
+               (apply (assoc-ref %standard-phases 'check) args)))))))
     (native-search-paths
      (list (search-path-specification
             (variable "IDRIS_LIBRARY_PATH")
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 51c21b68cc..a47a1a008c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4027,16 +4027,18 @@ complex transformations and code analysis tools.")
   (package
     (name "java-cglib")
     (version "3.2.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/cglib/cglib/archive/RELEASE_"
-                    (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version)
-                    ".tar.gz"))
-              (file-name (string-append "cglib-" version ".tar.gz"))
-              (sha256
-               (base32
-                "162dvd4fln76ai8prfharf66pn6r56p3sxx683j5vdyccrd5hi1q"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cglib/cglib.git")
+             (commit (string-append
+                      "RELEASE_"
+                      (string-map (lambda (c) (if (char=? c #\.) #\_ c))
+                                  version)))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "186451jms2zfp47yd8kxd77az2cqal1my2br7klgyp8fpl4qfg8v"))))
     (build-system ant-build-system)
     (arguments
      `(;; FIXME: tests fail because junit runs
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 3929909d10..58073b6170 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -281,7 +281,8 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
               (sha256
                (base32
                 "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"))
-              (patches (search-patches "kodi-skip-test-449.patch"))
+              (patches (search-patches "kodi-skip-test-449.patch"
+                                       "kodi-set-libcurl-ssl-parameters.patch"))
               (snippet
                '(begin
                   (use-modules (guix build utils))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6d289b7a0f..b429cda354 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -118,6 +118,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system linux-module)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -264,9 +265,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
     (search-auxiliary-file file)))
 
 (define %default-extra-linux-options
-  `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
-    ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
-    ;; Modules required for initrd:
+  `(;; Modules required for initrd:
     ("CONFIG_NET_9P" . m)
     ("CONFIG_NET_9P_VIRTIO" . m)
     ("CONFIG_VIRTIO_BLK" . m)
@@ -401,7 +400,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
                     (kmod   (assoc-ref (or native-inputs inputs) "kmod")))
                ;; Install kernel image, kernel configuration and link map.
                (for-each (lambda (file) (install-file file out))
-                         (find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map)$"))
+                         (find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map|Module\\.symvers)$"))
                ;; Install device tree files
                (unless (null? (find-files "." "\\.dtb$"))
                  (mkdir-p dtbdir)
@@ -438,6 +437,28 @@ It has been modified to remove all non-free binary blobs.")
                     #:patches %linux-libre-5.0-patches
                     #:configuration-file kernel-config))
 
+(define-public vhba-module
+  (package
+    (name "vhba-module")
+    (version "20170610")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://downloads.sourceforge.net/cdemu/vhba-module-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"))))
+    (build-system linux-module-build-system)
+    (arguments
+     ;; TODO: No tests?
+     `(#:tests? #f))
+    (home-page "https://cdemu.sourceforge.io/")
+    (synopsis "Kernel module that emulates SCSI devices")
+    (description "VHBA module provides a Virtual (SCSI) HBA, which is the link
+between the CDemu userspace daemon and linux kernel.")
+    (license license:gpl2+)))
+
 (define %linux-libre-4.19-version "4.19.34")
 (define %linux-libre-4.19-hash "0rmpyj2qb651p2k2srpjndjxry87hr5vq0jkk4rvxjhm5y3sb65l")
 
@@ -471,7 +492,13 @@ It has been modified to remove all non-free binary blobs.")
   (make-linux-libre "4.4.178"
                     "1lgsd760md6b32qb5ng3anfq1n754a9d0c4xnf2mjxkimncb1jpp"
                     '("x86_64-linux" "i686-linux")
-                    #:configuration-file kernel-config))
+                    #:configuration-file kernel-config
+                    #:extra-options
+                    (append
+                     `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
+                       ;; This option was removed upstream in version 4.7.
+                       ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t))
+                     %default-extra-linux-options)))
 
 (define-public linux-libre-arm-generic
   (make-linux-libre %linux-libre-version
@@ -1452,14 +1479,14 @@ Linux-based operating systems.")
 (define-public bridge-utils
   (package
     (name "bridge-utils")
-    (version "1.5")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/bridge/bridge/"
-                                 "bridge-utils-" version ".tar.gz"))
-             (sha256
-              (base32
-               "12367cwqmi0yqphi6j8rkx97q8hw52yq2fx4k0xfclkcizxybya2"))))
+    (version "1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.kernel.org/pub/linux/utils/net/"
+                           "bridge-utils/bridge-utils-" version ".tar.xz"))
+       (sha256
+        (base32 "1j16kr44csyr4yqxly26l1yw2bh4nkiasgwvask2i2gvsnsyyryc"))))
     (build-system gnu-build-system)
 
     ;; The tarball lacks all the generated files.
@@ -2467,18 +2494,18 @@ country-specific regulations for the wireless spectrum.")
 (define-public lm-sensors
   (package
     (name "lm-sensors")
-    (version "3.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append
-                           "https://github.com/groeck/lm-sensors/archive/V"
-                           (string-join (string-split version #\.) "-")
-                           ".tar.gz")))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0knb09s9lvx0wzfsaizx3xq58q6kllqf7nkbwvir0wkgn31c2d73"))
-              (patches (search-patches "lm-sensors-hwmon-attrs.patch"))))
+    (version "3.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/groeck/lm-sensors.git")
+             (commit (string-append "V" (string-join
+                                         (string-split version #\.) "-")))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj"))
+       (patches (search-patches "lm-sensors-hwmon-attrs.patch"))))
     (build-system gnu-build-system)
     (inputs `(("rrdtool" ,rrdtool)
               ("perl" ,perl)
@@ -2535,7 +2562,7 @@ country-specific regulations for the wireless spectrum.")
                 (string-append (assoc-ref inputs "coreutils")
                                "/bin/readlink -f")))
              #t)))))
-    (home-page "http://jdelvare.nerim.net/devel.html#lmsensors")
+    (home-page "https://hwmon.wiki.kernel.org/lm_sensors")
     (synopsis "Utilities to read temperature/voltage/fan sensors")
     (description
      "Lm-sensors is a hardware health monitoring package for Linux.  It allows
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 5a30e7c1dd..08592bb770 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -691,13 +692,13 @@ portable between implementations.")
     (version "1.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/sionescu/fiveam/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sionescu/fiveam.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "fiveam" version))
        (sha256
-        (base32 "0f48pcbhqs3wwwzjl5nk57d4hcbib4l9xblxc66b8c2fhvhmhxnv"))
-       (file-name (string-append "fiveam-" version ".tar.gz"))))
+        (base32 "1yx9716mk8pq9076q6cjx4c9lyax3amiccy37sh0913k2x8gsm4l"))))
     (inputs `(("alexandria" ,sbcl-alexandria)))
     (build-system asdf-build-system/sbcl)
     (synopsis "Common Lisp testing framework")
@@ -714,18 +715,18 @@ interactive development model in mind.")
   (sbcl-package->ecl-package sbcl-fiveam))
 
 (define-public sbcl-bordeaux-threads
-  (let ((commit "354abb0ae9f1d9324001e1a8abab3128d7420e0e")
+  (let ((commit "5dce49fbc829f4d136a734f5ef4f5d599660984f")
         (revision "1"))
     (package
       (name "sbcl-bordeaux-threads")
-      (version (git-version "0.8.5" revision commit))
+      (version (git-version "0.8.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "https://github.com/sionescu/bordeaux-threads.git")
                       (commit commit)))
                 (sha256
-                 (base32 "1hcfp21l6av1xj6z7r77sp6h4mwf9vvx4s745803sysq2qy2mwnq"))
+                 (base32 "1gkh9rz7zw57n3110ikcf4835950wr4hgp8l79id5ai6nd86x7wv"))
                 (file-name
                  (git-file-name "bordeaux-threads" version))))
       (inputs `(("alexandria" ,sbcl-alexandria)))
@@ -818,14 +819,21 @@ logical continuation of Stefil.  It focuses on interactive debugging.")
     (version "1.0.16")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/edicl/flexi-streams/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/edicl/flexi-streams.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "flexi-streams" version))
        (sha256
-        (base32 "1fb0jrwxr5c3i2lhy7kn30m1n0vggfzwjm1dacx6y5wf9wfsbamw"))
-       (file-name (string-append "flexi-streams-" version ".tar.gz"))))
+        (base32 "0gvykjlmja060zqq6nn6aqxlshh6r6ijahmmgf20q0d839rwpgxc"))))
     (build-system asdf-build-system/sbcl)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t)))))
     (inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
     (synopsis "Implementation of virtual bivalent streams for Common Lisp")
     (description "Flexi-streams is an implementation of \"virtual\" bivalent
@@ -848,13 +856,13 @@ streams which are similar to string streams.")
     (version "2.0.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/edicl/cl-ppcre/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/edicl/cl-ppcre.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "cl-ppcre" version))
        (sha256
-        (base32 "1i7daxf0wnydb0pgwiym7qh2wy70n14lxd6dyv28sy0naa8p31gd"))
-       (file-name (string-append "cl-ppcre-" version ".tar.gz"))))
+        (base32 "0q3iany07vgqm144lw6pj0af2d3vsikpbkwcxr30fci3kzsq4f49"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs `(("flexi-streams" ,sbcl-flexi-streams)))
     (synopsis "Portable regular expression library for Common Lisp")
@@ -973,18 +981,19 @@ from other CLXes around the net.")
   (package
     (name "stumpwm")
     (version "18.11")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/stumpwm/stumpwm/archive/"
-                    version ".tar.gz"))
-              (sha256
-               (base32 "177gxfk4c127i9crghx6fmkipznhgylvzgnjb2pna38g21gg6s39"))
-              (file-name (string-append "stumpwm-" version ".tar.gz"))
-              (patches
-               ;; This patch is included in the post-18.11 git master tree
-               ;; and can be removed when we move to the next release.
-               (search-patches "stumpwm-fix-broken-read-one-line.patch"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stumpwm/stumpwm.git")
+             (commit version)))
+       (file-name (git-file-name "stumpwm" version))
+       (sha256
+        (base32 "003g1fmh7446ws49866kzny4lrk1wf034dq5fa4m9mq1nzc7cwv7"))
+       (patches
+        ;; This patch is included in the post-18.11 git master tree
+        ;; and can be removed when we move to the next release.
+        (search-patches "stumpwm-fix-broken-read-one-line.patch"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs `(("fiasco" ,sbcl-fiasco)
                      ("texinfo" ,texinfo)))
@@ -1604,13 +1613,13 @@ utilities that make it even easier to manipulate text in Common Lisp.  It has
     (version "0.8")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/trivial-features/trivial-features/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/trivial-features/trivial-features.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "trivial-features" version))
        (sha256
-        (base32 "0db1awn6jyhcfhyfvpjvfziprmq85cigf19mwbvaprhblydsag3c"))
-       (file-name (string-append "trivial-features-" version ".tar.gz"))))
+        (base32 "0ccv7dqyrk55xga78i5vzlic7mdwp28in3g1a8fqhlk6626scsq9"))))
     (build-system asdf-build-system/sbcl)
     (arguments '(#:tests? #f))
     (home-page "http://cliki.net/trivial-features")
@@ -1691,13 +1700,13 @@ with a focus on interactive development.")
     (version "0.5.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/cl-babel/babel/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cl-babel/babel.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "babel" version))
        (sha256
-        (base32 "189kgbmslh36xx0d2i1g6a7mcvjryvjzkdlnhilqy5xs7hkyqirq"))
-       (file-name (string-append name "-" version ".tar.gz"))))
+        (base32 "139a8rn2gnhj082n8jg01gc8fyr63hkj57hgrnmb3d1r327yc77f"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs
      `(("tests:cl-hu.dwim.stefil" ,sbcl-hu.dwim.stefil)))
@@ -2971,12 +2980,13 @@ non-consing thread safe queues and fibonacci priority queues.")
     (version "0.19.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cffi/cffi/archive/v"
-                           version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cffi/cffi.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "cffi-bootstrap" version))
        (sha256
-        (base32 "07bc3c1fbfx17wgrvx6bh9byilfzfwv5n597cfdllm0vzwvbmiyk"))
-       (file-name (string-append name "-" version ".tar.gz"))))
+        (base32 "09sfgc6r7ihmbkwfpvkq5fxc7h45cabpvgbvs47i5cvnmv3k72xy"))))
     (build-system asdf-build-system/sbcl)
     (inputs
      `(("libffi" ,libffi)
@@ -3235,13 +3245,13 @@ precisely control behavior of the parser via Common Lisp restarts.")
     (version "0.21")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/trivial-garbage/trivial-garbage/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/trivial-garbage/trivial-garbage.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "trivial-garbage" version))
        (sha256
-        (base32 "0b244nlszkrqawsnp568clnx32xmvjmbbagbz7625w9n0yq7396y"))
-       (file-name (string-append "trivial-garbage-" version ".tar.gz"))))
+        (base32 "0122jicfg7pca1wxw8zak1n92h5friqy60988ns0ysksj3fphw9n"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs
      `(("rt" ,sbcl-rt)))
@@ -4169,12 +4179,13 @@ sockets, SSL, continuable uploads, file uploads, cookies, and more.")
     (version "1.2.38")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/edicl/hunchentoot/archive/v"
-             version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/edicl/hunchentoot.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "hunchentoot" version))
        (sha256
-        (base32 "17z8rpd6b5w93jwrdwfwxjha617xnjqw8aq1hw2z76zp1fn8yrmh"))))
+        (base32 "1anpcad7w045m4rsjs1f3xdhjwx5cppq1h0vlb3q7dz81fi3i6yq"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs
      `(("sbcl-cl-who" ,sbcl-cl-who)
@@ -5238,3 +5249,36 @@ Python's WSGI and Ruby's Rack.")
 
 (define-public cl-clack
   (sbcl-package->cl-source-package sbcl-clack))
+
+(define-public sbcl-log4cl
+  (let ((commit "611e094458504b938d49de904eab141285328c7c")
+        (revision "1"))
+    (package
+      (name "sbcl-log4cl")
+      (build-system asdf-build-system/sbcl)
+      (version "1.1.2")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/sharplispers/log4cl")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "08jly0s0g26b56hhpfizxsb4j0yvbh946sd205gr42dkzv8l7dsc"))))
+      ;; FIXME: tests require stefil, sbcl-hu.dwim.stefil wont work
+      (arguments
+       `(#:tests? #f))
+      (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
+      (synopsis "Common Lisp logging framework, modeled after Log4J")
+      (home-page "https://github.com/7max/log4cl")
+      (description "This is a Common Lisp logging framework that can log at
+various levels and mix text with expressions.")
+      (license license:asl2.0))))
+
+(define-public cl-log4cl
+  (sbcl-package->cl-source-package sbcl-log4cl))
+
+(define-public ecl-log4cl
+  (sbcl-package->ecl-package sbcl-log4cl))
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 3d46b02338..53884daf9b 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -40,7 +40,9 @@
   #:use-module (gnu packages bootstrap)           ;glibc-dynamic-linker
   #:use-module (gnu packages compression)
   #:use-module (gnu packages libffi)
+  #:use-module (gnu packages mpi)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages xml))
 
@@ -282,6 +284,43 @@ code analysis tools.")
 use with Clang, targeting C++11, C++14 and above.")
     (license license:expat)))
 
+(define-public libomp
+  (package
+    (name "libomp")
+    (version (package-version llvm))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://releases.llvm.org/"
+                                  version  "/openmp-" version
+                                  ".src.tar.xz"))
+              (sha256
+               (base32
+                "030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz"))
+              (file-name (string-append "libomp-" version ".tar.xz"))))
+    (build-system cmake-build-system)
+    ;; XXX: Note this gets built with GCC because building with Clang itself
+    ;; fails (missing <atomic>, even when libcxx is added as an input.)
+    (arguments
+     '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON"
+                           "-DOPENMP_TEST_C_COMPILER=clang"
+                           "-DOPENMP_TEST_CXX_COMPILER=clang++")
+       #:test-target "check-libomptarget"))
+    (native-inputs
+     `(("clang" ,clang)
+       ("llvm" ,llvm)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("hwloc" ,hwloc "lib")))
+    (home-page "https://openmp.llvm.org")
+    (synopsis "OpenMP run-time support library")
+    (description
+     "This package provides the run-time support library developed by the LLVM
+project for the OpenMP multi-theaded programming extension.  This package
+notably provides @file{libgomp.so}, which is has a binary interface compatible
+with that of libgomp, the GNU Offloading and Multi Processing Library.")
+    (license license:expat)))
+
 (define-public clang-runtime
   (clang-runtime-from-llvm
    llvm
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 10aff22206..00662fb26d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cran)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
@@ -65,7 +66,9 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages statistics)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
@@ -305,28 +308,46 @@ networks) based on simulation of (stochastic) flow in graphs.")
     (version "12-068oasis4")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/fhcrc/mcl/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fhcrc/mcl.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "1l5jbhwjpsj38x8b9698hfpkv75h8hn3kj0gihjhn8ym2cwwv110"))))
+         "0009dc3h2jp3qg5val452wngpqnbfyhbcxylghq0mrjqxx0jdq5p"))))
     (build-system ocaml-build-system)
     (arguments
-     `(#:ocaml ,ocaml-4.02
-       #:findlib ,ocaml4.02-findlib
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'patch-paths
            (lambda _
              (substitute* "configure"
-               (("SHELL = /bin/sh") (string-append "SHELL = "(which "sh"))))
+               (("/bin/sh") (which "sh")))
              (substitute* "setup.ml"
                (("LDFLAGS=-fPIC")
-                (string-append "LDFLAGS=-fPIC\"; \"SHELL=" (which "sh"))))
+                (string-append "LDFLAGS=-fPIC\"; \"SHELL=" (which "sh")))
+               (("-std=c89") "-std=gnu99")
+
+               ;; This is a mutable string, which is no longer supported.  Use
+               ;; a byte buffer instead.
+               (("String.make \\(String.length s\\)")
+                "Bytes.make (String.length s)")
+
+               ;; These two belong together.
+               (("OASISString.replace_chars")
+                "Bytes.to_string (OASISString.replace_chars")
+               ((" s;")
+                " s);"))
+             (substitute* "myocamlbuild.ml"
+               (("std=c89") "std=gnu99"))
+             ;; Since we build with a more recent OCaml, we have to use C99 or
+             ;; later.  This causes problems with the old C code.
+             (substitute* "src/impala/matrix.c"
+               (("restrict") "restrict_"))
              #t)))))
+    (native-inputs
+     `(("ocamlbuild" ,ocamlbuild)))
     (home-page "https://github.com/fhcrc/mcl")
     (synopsis "OCaml wrappers around MCL")
     (description
@@ -1285,3 +1306,451 @@ for load balancing, tracing, health checking and authentication.  It is also
 applicable in last mile of distributed computing to connect devices, mobile
 applications and browsers to backend services.")
     (license license:asl2.0)))
+
+;; Note that Tensorflow includes a "third_party" directory, which seems to not
+;; only contain modified subsets of upstream library source code, but also
+;; adapter headers provided by Google (such as the fft.h header, which is not
+;; part of the upstream project code).  The Tensorflow code includes headers
+;; from the "third_party" directory.  It does not look like we can replace
+;; these headers with unmodified upstream files, so we keep them.
+(define-public tensorflow
+  (package
+    (name "tensorflow")
+    (version "1.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tensorflow/tensorflow.git")
+             (commit (string-append "v" version))))
+       (file-name (string-append "tensorflow-" version "-checkout"))
+       (sha256
+        (base32
+         "0a9kwha395g3wgxfwln5j8vn9nkspmd75xldrlqdq540w996g8xa"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ; no "check" target
+       #:build-type "Release"
+       #:configure-flags
+       (let ((protobuf (assoc-ref %build-inputs "protobuf"))
+             (protobuf:native (assoc-ref %build-inputs "protobuf:native"))
+             (jsoncpp (assoc-ref %build-inputs "jsoncpp"))
+             (snappy (assoc-ref %build-inputs "snappy"))
+             (sqlite (assoc-ref %build-inputs "sqlite")))
+         (list
+          ;; Use protobuf from Guix
+          (string-append "-Dprotobuf_STATIC_LIBRARIES="
+                         protobuf "/lib/libprotobuf.so")
+          (string-append "-DPROTOBUF_PROTOC_EXECUTABLE="
+                         protobuf:native "/bin/protoc")
+
+          ;; Use snappy from Guix
+          (string-append "-Dsnappy_STATIC_LIBRARIES="
+                         snappy "/lib/libsnappy.so")
+          ;; Yes, this is not actually the include directory but a prefix...
+          (string-append "-Dsnappy_INCLUDE_DIR=" snappy)
+
+          ;; Use jsoncpp from Guix
+          (string-append "-Djsoncpp_STATIC_LIBRARIES="
+                         jsoncpp "/lib/libjsoncpp.so")
+          ;; Yes, this is not actually the include directory but a prefix...
+          (string-append "-Djsoncpp_INCLUDE_DIR=" jsoncpp)
+
+          ;; Use sqlite from Guix
+          (string-append "-Dsqlite_STATIC_LIBRARIES="
+                         sqlite "/lib/libsqlite.a")
+
+          ;; Use system libraries wherever possible.  Currently, this
+          ;; only affects zlib.
+          "-Dsystemlib_ALL=ON"
+          "-Dtensorflow_ENABLE_POSITION_INDEPENDENT_CODE=ON"
+          "-Dtensorflow_BUILD_SHARED_LIB=ON"
+          "-Dtensorflow_OPTIMIZE_FOR_NATIVE_ARCH=OFF"
+          "-Dtensorflow_ENABLE_SSL_SUPPORT=OFF"
+          "-Dtensorflow_BUILD_CONTRIB_KERNELS=OFF"))
+       #:make-flags
+       (list "CC=gcc")
+       #:modules ((ice-9 ftw)
+                  (guix build utils)
+                  (guix build cmake-build-system))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-source-file-times-to-1980
+           ;; At the end of the tf_python_build_pip_package target, a ZIP
+           ;; archive should be generated via bdist_wheel, but it fails with
+           ;; "ZIP does not support timestamps before 1980".  Luckily,
+           ;; SOURCE_DATE_EPOCH is respected, which we set to some time in
+           ;; 1980.
+           (lambda _ (setenv "SOURCE_DATE_EPOCH" "315532800") #t))
+         ;; See https://github.com/tensorflow/tensorflow/issues/20517#issuecomment-406373913
+         (add-after 'unpack 'python3.7-compatibility
+           (lambda _
+             (substitute* '("tensorflow/python/eager/pywrap_tfe_src.cc"
+                            "tensorflow/python/lib/core/ndarray_tensor.cc"
+                            "tensorflow/python/lib/core/py_func.cc")
+               (("PyUnicode_AsUTF8") "(char *)PyUnicode_AsUTF8"))
+             (substitute* "tensorflow/c/eager/c_api.h"
+               (("unsigned char async")
+                "unsigned char is_async"))
+
+             ;; Remove dependency on tensorboard, a complicated but probably
+             ;; optional package.
+             (substitute* "tensorflow/tools/pip_package/setup.py"
+               ((".*'tensorboard >.*") ""))
+             #t))
+         (add-after 'python3.7-compatibility 'chdir
+           (lambda _ (chdir "tensorflow/contrib/cmake") #t))
+         (add-after 'chdir 'disable-downloads
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "external" "\\.cmake$")
+               (("GIT_REPOSITORY.*") "")
+               (("GIT_TAG.*") "")
+               (("PREFIX ")
+                "DOWNLOAD_COMMAND \"\"\nPREFIX "))
+
+             ;; Use packages from Guix
+             (let ((grpc (assoc-ref inputs "grpc")))
+               (substitute* "CMakeLists.txt"
+                 ;; Sqlite
+                 (("include\\(sqlite\\)") "")
+                 (("\\$\\{sqlite_STATIC_LIBRARIES\\}")
+                  (string-append (assoc-ref inputs "sqlite")
+                                 "/lib/libsqlite3.so"))
+                 (("sqlite_copy_headers_to_destination") "")
+
+                 ;; PNG
+                 (("include\\(png\\)") "")
+                 (("\\$\\{png_STATIC_LIBRARIES\\}")
+                  (string-append (assoc-ref inputs "libpng")
+                                 "/lib/libpng16.so"))
+                 (("png_copy_headers_to_destination") "")
+
+                 ;; JPEG
+                 (("include\\(jpeg\\)") "")
+                 (("\\$\\{jpeg_STATIC_LIBRARIES\\}")
+                  (string-append (assoc-ref inputs "libjpeg")
+                                 "/lib/libjpeg.so"))
+                 (("jpeg_copy_headers_to_destination") "")
+
+                 ;; GIF
+                 (("include\\(gif\\)") "")
+                 (("\\$\\{gif_STATIC_LIBRARIES\\}")
+                  (string-append (assoc-ref inputs "giflib")
+                                 "/lib/libgif.so"))
+                 (("gif_copy_headers_to_destination") "")
+
+                 ;; lmdb
+                 (("include\\(lmdb\\)") "")
+                 (("\\$\\{lmdb_STATIC_LIBRARIES\\}")
+                  (string-append (assoc-ref inputs "lmdb")
+                                 "/lib/liblmdb.so"))
+                 (("lmdb_copy_headers_to_destination") "")
+
+                 ;; Protobuf
+                 (("include\\(protobuf\\)") "")
+                 (("protobuf_copy_headers_to_destination") "")
+                 (("^ +protobuf") "")
+
+                 ;; gRPC
+                 (("include\\(grpc\\)")
+                  "find_package(grpc REQUIRED NAMES gRPC)")
+                 (("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES grpc\\)") "")
+
+                 ;; Eigen
+                 (("include\\(eigen\\)")
+                  (string-append "find_package(eigen REQUIRED NAMES Eigen3)
+set(eigen_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive "
+                                 (assoc-ref inputs "eigen") "/include/eigen3)"))
+                 (("^ +eigen") "")
+
+                 ;; snappy
+                 (("include\\(snappy\\)")
+                  "add_definitions(-DTF_USE_SNAPPY)")
+                 (("list\\(APPEND tensorflow_EXTERNAL_DEPENDENCIES snappy\\)") "")
+
+                 ;; jsoncpp
+                 (("include\\(jsoncpp\\)") "")
+                 (("^ +jsoncpp") ""))
+
+               (substitute* "tf_core_framework.cmake"
+                 ((" grpc") "")
+                 (("\\$\\{GRPC_BUILD\\}/grpc_cpp_plugin")
+                  (which "grpc_cpp_plugin"))
+                 ;; Link with gRPC libraries
+                 (("add_library\\(tf_protos_cc.*" m)
+                  (string-append m
+                                 (format #f "\ntarget_link_libraries(tf_protos_cc PRIVATE \
+~a/lib/libgrpc++_unsecure.a \
+~a/lib/libgrpc_unsecure.a \
+~a/lib/libaddress_sorting.a \
+~a/lib/libgpr.a \
+~a//lib/libcares.so
+)\n"
+                                         grpc grpc grpc grpc
+                                         (assoc-ref inputs "c-ares"))))))
+             (substitute* "tf_tools.cmake"
+               (("add_dependencies\\(\\$\\{proto_text.*") ""))
+             ;; Remove dependency on bundled grpc
+             (substitute* "tf_core_distributed_runtime.cmake"
+               (("tf_core_cpu grpc") "tf_core_cpu"))
+
+             ;; This directory is a dependency of many targets.
+             (mkdir-p "protobuf")
+             #t))
+         (add-after 'configure 'unpack-third-party-sources
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; This is needed to configure bundled packages properly.
+             (setenv "CONFIG_SHELL" (which "bash"))
+             (for-each
+              (lambda (name)
+                (let* ((what  (assoc-ref inputs (string-append name "-src")))
+                       (name* (string-map (lambda (c)
+                                            (if (char=? c #\-)
+                                                #\_ c)) name))
+                       (where (string-append "../build/" name* "/src/" name*)))
+                  (cond
+                   ((string-suffix? ".zip" what)
+                    (mkdir-p where)
+                    (with-directory-excursion where
+                      (invoke "unzip" what)))
+                   ((string-suffix? ".tar.gz" what)
+                    (mkdir-p where)
+                    (invoke "tar" "xf" what
+                            "-C" where "--strip-components=1"))
+                   (else
+                    (let ((parent (dirname where)))
+                      (mkdir-p parent)
+                      (with-directory-excursion parent
+                        (when (file-exists? name*)
+                          (delete-file-recursively name*))
+                        (copy-recursively what name*)
+                        (map make-file-writable
+                             (find-files name* ".*"))))))))
+              (list "boringssl"
+                    "cub"
+                    "double-conversion"
+                    "farmhash"
+                    "fft2d"
+                    "highwayhash"
+                    "nsync"
+                    "re2"))
+
+             (rename-file "../build/cub/src/cub/cub-1.8.0/"
+                          "../build/cub/src/cub/cub/")
+             #t))
+         (add-after 'unpack 'fix-python-build
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (mkdir-p "protobuf-src")
+             (invoke "tar" "xf" (assoc-ref inputs "protobuf:src")
+                     "-C" "protobuf-src" "--strip-components=1")
+             (mkdir-p "eigen-src")
+             (invoke "tar" "xf" (assoc-ref inputs "eigen:src")
+                     "-C" "eigen-src" "--strip-components=1")
+
+             (substitute* "tensorflow/contrib/cmake/tf_python.cmake"
+               ;; Ensure that all Python dependencies can be found at build time.
+               (("PYTHONPATH=\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/tf_python" m)
+                (string-append m ":" (getenv "PYTHONPATH")))
+               ;; Take protobuf source files from our source package.
+               (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/protobuf/src/protobuf/src/google")
+                (string-append (getcwd) "/protobuf-src/src/google")))
+
+             (substitute* '("tensorflow/contrib/cmake/tf_shared_lib.cmake"
+                            "tensorflow/contrib/cmake/tf_python.cmake")
+               ;; Take Eigen source files from our source package.
+               (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/eigen/src/eigen/")
+                (string-append (getcwd) "/eigen-src/"))
+               ;; Take Eigen headers from our own package.
+               (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive")
+                (string-append (assoc-ref inputs "eigen") "/include/eigen3")))
+
+             ;; Correct the RUNPATH of ops libraries generated for Python.
+             ;; TODO: this doesn't work :(
+             ;; /gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
+             ;; warning: RUNPATH contains bogus entries: ("/tmp/guix-build-tensorflow-1.9.0.drv-0/source/tensorflow/contrib/build")
+             ;; /gnu/store/...-tensorflow-1.9.0/lib/python3.7/site-packages/tensorflow/contrib/seq2seq/python/ops/lib_beam_search_ops.so:
+             ;; error: depends on 'libpywrap_tensorflow_internal.so', which
+             ;; cannot be found in RUNPATH ...
+             (substitute* "tensorflow/contrib/cmake/tf_cc_ops.cmake"
+               (("set_target_properties.*")
+                (string-append "set_target_properties(${_AT_TARGET} PROPERTIES \
+COMPILE_FLAGS ${target_compile_flags} \
+INSTALL_RPATH_USE_LINK_PATH TRUE \
+INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
+             #t))
+         (add-after 'build 'build-pip-package
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "LDFLAGS"
+                     (string-append "-Wl,-rpath="
+                                    (assoc-ref outputs "out") "/lib"))
+             (invoke "make" "tf_python_build_pip_package")
+             #t))
+         (add-after 'build-pip-package 'install-python
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (wheel (car (find-files "../build/tf_python/dist/" "\\.whl$"))))
+               (invoke "python" "-m" "pip" "install" wheel
+                       (string-append "--prefix=" out))
+
+               ;; XXX: broken RUNPATH, see fix-python-build phase.
+               (delete-file
+                (string-append
+                 out "/lib/python3.7/site-packages/tensorflow/contrib/"
+                 "seq2seq/python/ops/lib_beam_search_ops.so"))
+               #t))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("protobuf:native" ,protobuf-next) ; protoc
+       ("protobuf:src" ,(package-source protobuf-next))
+       ("eigen:src" ,(package-source eigen-for-tensorflow))
+       ;; The commit hashes and URLs for third-party source code are taken
+       ;; from "tensorflow/workspace.bzl".
+       ("boringssl-src"
+        ,(let ((commit "ee7aa02")
+               (revision "1"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://boringssl.googlesource.com/boringssl")
+                   (commit commit)))
+             (file-name (string-append "boringssl-0-" revision
+                                       (string-take commit 7)
+                                       "-checkout"))
+             (sha256
+              (base32
+               "1jf693q0nw0adsic6cgmbdx6g7wr4rj4vxa8j1hpn792fqhd8wgw")))))
+       ("cub-src"
+        ,(let ((version "1.8.0"))
+           (origin
+             (method url-fetch)
+             (uri (string-append "https://mirror.bazel.build/github.com/NVlabs/"
+                                 "cub/archive/" version ".zip"))
+             (file-name (string-append "cub-" version ".zip"))
+             (sha256
+              (base32
+               "1hsqikqridb90dkxkjr2918dcry6pfh46ccnwrzawl56aamhdykb")))))
+       ("double-conversion-src"
+        ,(let ((commit "5664746")
+               (revision "1"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/google/double-conversion.git")
+                   (commit commit)))
+             (file-name
+              (git-file-name "double-conversion"
+                             (string-append "0-" revision "."
+                                            (string-take commit 7))))
+             (sha256
+              (base32
+               "1h5lppqqxcvdg5jq42i5msgwx20ryij3apvmndflngrgdpc04gn1")))))
+       ("farmhash-src"
+        ,(let ((commit "816a4ae622e964763ca0862d9dbd19324a1eaf45"))
+           (origin
+             (method url-fetch)
+             (uri (string-append
+                   "https://mirror.bazel.build/github.com/google/farmhash/archive/"
+                   commit ".tar.gz"))
+             (file-name (string-append "farmhash-0-" (string-take commit 7)
+                                       ".tar.gz"))
+             (sha256
+              (base32
+               "185b2xdxl4d4cnsnv6abg8s22gxvx8673jq2yaq85bz4cdy58q35")))))
+       ;; The license notice on the home page at
+       ;; http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html says:
+       ;;   Copyright Takuya OOURA, 1996-2001
+       ;;
+       ;;   You may use, copy, modify and distribute this code for any purpose
+       ;;   (include commercial use) and without fee. Please refer to this
+       ;;   package when you modify this code.
+       ;;
+       ;; We take the identical tarball from the Bazel mirror, because the URL
+       ;; at the home page is not versioned and might change.
+       ("fft2d-src"
+        ,(origin
+           (method url-fetch)
+           (uri "https://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz")
+           (file-name "fft2d.tar.gz")
+           (sha256
+            (base32
+             "15jjkfvhqvl2c0753d2di8hz0pyzn598g74wqy79awdrf1y67fsj"))))
+       ("highwayhash-src"
+        ,(let ((commit "be5edafc2e1a455768e260ccd68ae7317b6690ee")
+               (revision "1"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/google/highwayhash.git")
+                   (commit commit)))
+             (file-name (string-append "highwayhash-0-" revision
+                                       (string-take commit 7)
+                                       "-checkout"))
+             (sha256
+              (base32
+               "154jwf98cyy54hldr94pgjn85zynly3abpnc1avmb8a18lzwjyb6")))))
+       ("nsync-src"
+        ,(let ((version "0559ce013feac8db639ee1bf776aca0325d28777")
+               (revision "1"))
+           (origin
+             (method url-fetch)
+             (uri (string-append "https://mirror.bazel.build/"
+                                 "github.com/google/nsync/archive/"
+                                 version ".tar.gz"))
+             (file-name (string-append "nsync-0." revision
+                                       "-" (string-take version 7)
+                                       ".tar.gz"))
+             (sha256
+              (base32
+               "0qdkyqym34x739mmzv97ah5r7ph462v5xkxqxvidmcfqbi64b132")))))
+       ("re2-src"
+        ,(let ((commit "e7efc48")
+               (revision "1"))
+           (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/google/re2")
+                   (commit commit)))
+             (file-name (string-append "re2-0-" revision
+                                       (string-take commit 7)
+                                       "-checkout"))
+             (sha256
+              (base32
+               "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign")))))
+       ("googletest" ,googletest)
+       ("swig" ,swig)
+       ("unzip" ,unzip)))
+    (propagated-inputs
+     `(("python-absl-py" ,python-absl-py)
+       ("python-astor" ,python-astor)
+       ("python-gast" ,python-gast)
+       ("python-grpcio" ,python-grpcio)
+       ("python-numpy" ,python-numpy)
+       ("python-protobuf" ,python-protobuf-next)
+       ("python-six" ,python-six)
+       ("python-termcolo" ,python-termcolor)
+       ("python-wheel" ,python-wheel)))
+    (inputs
+     `(("c-ares" ,c-ares-next)
+       ("eigen" ,eigen-for-tensorflow)
+       ("gemmlowp" ,gemmlowp-for-tensorflow)
+       ("lmdb" ,lmdb)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("giflib" ,giflib)
+       ("grpc" ,grpc)
+       ("jsoncpp" ,jsoncpp-for-tensorflow)
+       ("snappy" ,snappy)
+       ("sqlite" ,sqlite)
+       ("protobuf" ,protobuf-next)
+       ("python" ,python-wrapper)
+       ("zlib" ,zlib)))
+    (home-page "https://tensorflow.org")
+    (synopsis "Machine learning framework")
+    (description
+     "TensorFlow is a flexible platform for building and training machine
+learning models.  It provides a library for high performance numerical
+computation and includes high level Python APIs, including both a sequential
+API for beginners that allows users to build models quickly by plugging
+together building blocks and a subclassing API with an imperative style for
+advanced research.")
+    (license license:asl2.0)))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d78efbf09c..2ae3fda9a7 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -95,6 +95,7 @@
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages perl-web)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
@@ -110,6 +111,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages webkit)
@@ -1389,7 +1391,7 @@ How it works:
 @item This password digest is used as a symmetric secret to decrypt a libsodium secretbox.
 @item Inside the secretbox is stored a Curve25519 private key.
 @item The Curve25519 private key is used to decrypt each individual message,
-using lidsodium sealed boxes.
+using libsodium sealed boxes.
 @item New mail is encrypted as it arrives using the Curve25519 public key.
 @end enumerate\n")
     (license agpl3)))
@@ -1504,6 +1506,28 @@ locates email addresses in strings and returns a list of Email::Address
 objects found.  Alternatively you may construct objects manually.")
     (license perl-license)))
 
+(define-public perl-email-address-xs
+  (package
+    (name "perl-email-address-xs")
+    (version "1.04")
+    (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "mirror://cpan/authors/id/P/PA/PALI/"
+                          "Email-Address-XS-" version ".tar.gz"))
+      (sha256
+       (base32
+        "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Email-Address-XS")
+    (synopsis "Parse and format RFC 5322 email addresses and groups")
+    (description
+     "Email::Address::XS implements RFC 5322 parser and formatter of email
+addresses and groups.  Unlike Email::Address, this module does not use regular
+expressions for parsing but instead is implemented in XS and uses shared code
+from Dovecot IMAP server.")
+    (license perl-license)))
+
 (define-public perl-email-date-format
   (package
     (name "perl-email-date-format")
@@ -2866,3 +2890,79 @@ replacement for the @code{urlview} program.")
     (description "This package provides a TNEF stream reader library and
 related tools to process winmail.dat files.")
     (license gpl2+)))
+
+(define-public public-inbox
+  (let ((commit "3cf66514aea9e958999973b9f104473b6d800fbe")
+        (revision "0"))
+    (package
+     (name "public-inbox")
+     (version (git-version "1.0.0" revision commit))
+     (source
+      (origin (method git-fetch)
+              (uri (git-reference
+                    (url "https://public-inbox.org")
+                    (commit commit)))
+              (sha256
+               (base32
+                "1sxycwlm2n6p544gn9f0vf3xs6gz8vdswdhs2ha6fka8mgabvmdh"))
+              (file-name (git-file-name name version))))
+     (build-system perl-build-system)
+     (arguments
+      '(#:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'qualify-paths
+            (lambda _
+              ;; Use absolute paths for 'xapian-compact'.
+              (let ((xapian-compact (which "xapian-compact")))
+                (substitute* "script/public-inbox-compact"
+                  (("xapian-compact") xapian-compact)))
+              #t))
+          (add-before 'check 'pre-check
+            (lambda _
+              (substitute* "t/spawn.t"
+                (("\\['env'\\]") (string-append "['" (which "env") "']")))
+              #t))
+          (add-after 'install 'wrap-programs
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (for-each
+                 (lambda (prog)
+                   (wrap-program prog
+                     ;; Let those scripts find their perl modules.
+                     `("PERL5LIB" ":" prefix
+                       (,(string-append out "/lib/perl5/site_perl")
+                        ,(getenv "PERL5LIB")))
+                     ;; 'git' is invoked in various files of the PublicInbox
+                     ;; perl module.
+                     `("PATH" ":" prefix
+                       (,(string-append (assoc-ref inputs "git") "/bin")))))
+                 (find-files (string-append out "/bin"))))
+              #t)))))
+     (native-inputs
+      `(("git" ,git)
+        ("xapian" ,xapian)))
+     (inputs
+      `(("perl-danga-socket" ,perl-danga-socket)
+        ("perl-dbd-sqlite" ,perl-dbd-sqlite)
+        ("perl-dbi" ,perl-dbi)
+        ("perl-email-address-xs" ,perl-email-address-xs)
+        ("perl-email-mime-contenttype" ,perl-email-mime-contenttype)
+        ("perl-email-mime" ,perl-email-mime)
+        ("perl-email-simple" ,perl-email-simple)
+        ("perl-filesys-notify-simple" ,perl-filesys-notify-simple)
+        ("perl-plack-middleware-deflater" ,perl-plack-middleware-deflater)
+        ("perl-plack-middleware-reverseproxy" ,perl-plack-middleware-reverseproxy)
+        ("perl-plack" ,perl-plack)
+        ("perl-search-xapian" ,perl-search-xapian)
+        ("perl-timedate" ,perl-timedate)
+        ("perl-uri-escape" ,perl-uri-escape)
+        ;; For testing.
+        ("perl-ipc-run" ,perl-ipc-run)
+        ("perl-xml-feed" ,perl-xml-feed)))
+     (home-page "https://public-inbox.org/README.html")
+     (synopsis "Archive mailing lists in git repositories")
+     (description
+      "public-inbox implements the sharing of an email inbox via git to
+complement or replace traditional mailing lists.  Readers may read via NNTP,
+Atom feeds or HTML archives.")
+     (license agpl3+))))
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 6d157e6ec3..0b668b4224 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -92,6 +93,46 @@
 MATE applications.")
     (license license:gpl3+)))
 
+(define-public mate-power-manager
+  (package
+    (name "mate-power-manager")
+    (version "1.22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pub.mate-desktop.org/releases/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "03c09h41qfz83wmjfvwzkq4xqc54aswmki4h034qcxbgfnyfmk1i"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)
+       ("yelp-tools" ,yelp-tools)
+       ("glib" ,glib "bin") ; glib-gettextize
+       ("libtool" ,libtool)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("glib" ,glib)
+       ("dbus-glib" ,dbus-glib)
+       ("libgnome-keyring" ,libgnome-keyring)
+       ("cairo" ,cairo)
+       ("dbus" ,dbus)
+       ("libnotify" ,libnotify)
+       ("mate-panel" ,mate-panel)
+       ("libxrandr" ,libxrandr)
+       ("libcanberra" ,libcanberra)
+       ("upower" ,upower)))
+    (home-page "https://mate-desktop.org/")
+    (synopsis "A Power Manager for MATE")
+    (description
+     "MATE Power Manager is a MATE session daemon that acts as a policy agent on
+top of UPower. It listens to system events and responds with user-configurable
+actions.")
+    (license license:gpl3+)))
+
 (define-public mate-icon-theme
   (package
     (name "mate-icon-theme")
@@ -1565,6 +1606,7 @@ used to bring up authentication dialogs.")
        ("mate-terminal"             ,mate-terminal)
        ("mate-themes"               ,mate-themes)
        ("mate-icon-theme"           ,mate-icon-theme)
+       ("mate-power-manager"        ,mate-power-manager)
        ("mate-menu"                 ,mate-menus)
        ("mate-panel"                ,mate-panel)
        ("mate-control-center"       ,mate-control-center)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6746013fad..9bf5f03390 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -650,13 +650,13 @@ plotting engine by third-party applications like Octave.")
     (version "2.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/OkoSanto/GCTP/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/OkoSanto/GCTP.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0l9aqnqynh9laicn5dxf3rsb1n14xiks79wbyqccirzmjqd1c1x4"))))
+        (base32 "11wqmd443b4nksdbzp1msdws3av948nmwq1xz80w6hka3ss2aigd"))))
     (native-inputs
      `(("fortran" ,gfortran)))
     (build-system gnu-build-system)
@@ -1555,15 +1555,14 @@ script files.")
     (version "0.17.2")
     (source
       (origin
-        (method url-fetch)
-        (uri (string-append
-               "https://github.com/tpaviot/oce/archive/OCE-"
-               version
-               ".tar.gz"))
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/tpaviot/oce.git")
+              (commit (string-append "OCE-" version))))
+        (file-name (git-file-name name version))
         (patches (search-patches "opencascade-oce-glibc-2.26.patch"))
         (sha256
-          (base32
-            "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"))))
+          (base32 "0rg5wzkvfmzfl6v2amyryb8dnjad0nn9kyr607wy2gch6rciah69"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
@@ -2228,12 +2227,12 @@ programming problems.")
 (define-public r-pracma
   (package
     (name "r-pracma")
-    (version "2.2.2")
+    (version "2.2.5")
     (source (origin
       (method url-fetch)
       (uri (cran-uri "pracma" version))
       (sha256
-        (base32 "18zhni05gwnxbphl6bmjjxmsgg5wwnnkwlb4g971cqyw3dsd83ki"))))
+        (base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/pracma/")
     (synopsis "Practical numerical math functions")
@@ -2952,13 +2951,13 @@ associated functions (eg. contiguous and non-contiguous submatrix views).")
       (version (string-append upstream-version "-" revision))
       (source
        (origin
-         (method url-fetch)
-         (uri (string-append "https://github.com/beltoforion/muparser/archive/v"
-                             upstream-version ".tar.gz"))
-         (file-name (string-append name "-" version ".tar.gz"))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/beltoforion/muparser.git")
+               (commit (string-append "v" upstream-version))))
+         (file-name (git-file-name name version))
          (sha256
-          (base32
-           "0277qsi5l23jsck1vhn383bmvc2n9l4a1dl5r9bf7hvjv9ayyrh6"))))
+          (base32 "0f0g4995xngf1pp3zr4p6ai2f8v6f8bxwa0k8ayjjiv1l8h44m24"))))
       (build-system gnu-build-system)
       (arguments
        `(#:configure-flags '("--enable-samples=no")
@@ -3146,13 +3145,13 @@ access to BLIS implementations via traditional BLAS routine calls.")
     (version "0.6.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/JuliaLang/openlibm/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/JuliaLang/openlibm.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"))))
+        (base32 "08wfchmmr5200fvmn1kwq9byc1fhsq46hn0y5k8scdl74771c7gh"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
@@ -3185,13 +3184,13 @@ environments.")
     (version "0.5.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/JuliaLang/openspecfun/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/JuliaLang/openspecfun.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"))))
+        (base32 "0pfw6l3ch7isz403llx7inxlvavqh01jh1hb9dpidi86sjjx9kfh"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no "check" target
@@ -3682,31 +3681,32 @@ set.")
 (define-public hypre
   (package
     (name "hypre")
-    (version "2.14.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/LLNL/hypre/archive/"
-                                  "v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0v515i73bvaz378h5465b1dy9v2gf924zy2q94cpq4qqarawvkqh"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; Remove use of __DATE__ and __TIME__ for reproducibility;
-                  ;; substitute the tarball creation time.
-                  (substitute* "src/utilities/HYPRE_utilities.h"
-                    (("Date Compiled: .*$")
-                     "Date Compiled: Apr 11 2018 16:24:59 +0000\"\n"))
-                  #t))))
+    (version "2.15.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/LLNL/hypre.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1lvh4ybqkriyqfg2zmic6mrg1981qv1i9vry1fdgsabn81hb71g4"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Remove use of __DATE__ and __TIME__ for reproducibility;
+           ;; substitute the release date.
+           (substitute* "src/utilities/HYPRE_utilities.h"
+             (("Date Compiled: .*$")
+              "Date Compiled: Oct 19 2018 15:23:00 +0000\"\n"))
+           #t))))
     (build-system gnu-build-system)
-    (outputs '("out"                    ;6.1 MiB of headers and libraries
-               "doc"))                  ;4.8 MiB of documentation
+    (outputs '("out"                    ; 6.1 MiB of headers and libraries
+               "doc"))                  ; 4.8 MiB of documentation
     (native-inputs
      `(("doc++" ,doc++)
        ("netpbm" ,netpbm)
-       ("perl" ,perl)                   ;needed to run 'ppmquant' during tests
+       ("perl" ,perl)                   ; needed to run 'ppmquant' during tests
        ("texlive" ,(texlive-union (list texlive-generic-xypic
                                         texlive-fonts-xypic
                                         texlive-latex-hyperref
@@ -3770,7 +3770,7 @@ set.")
                (with-directory-excursion "docs"
                  (for-each (lambda (base)
                              (install-file (string-append base ".pdf") docdir)
-                             (copy-recursively base docdir)) ;html docs
+                             (copy-recursively base docdir)) ; html docs
                            '("HYPRE_usr_manual"
                              "HYPRE_ref_manual")))
                #t))))))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 32868d1a1f..7305ab9b29 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1693,18 +1693,19 @@ building the IRC clients and bots.")
 (define-public toxic
   (package
     (name "toxic")
-    (version "0.8.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/JFreegman/toxic/archive/v"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1dx6z7k0zpsd7dpysdy23f0hnm49qlikb0mq8fg0y01dsz9vxgak"))
-              (file-name (git-file-name name version))))
+    (version "0.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/JFreegman/toxic.git")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"))
+       (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f ; no tests
+     `(#:tests? #f                      ; no tests
        #:make-flags
        (list
         "CC=gcc"
@@ -1721,7 +1722,7 @@ building the IRC clients and bots.")
      `(("c-toxcore" ,c-toxcore)
        ("curl" ,curl)
        ("freealut" ,freealut)
-       ("gdk-pixbuf" ,gdk-pixbuf) ; for libnotify.pc
+       ("gdk-pixbuf" ,gdk-pixbuf)       ; for libnotify.pc
        ("libconfig" ,libconfig)
        ("libnotify" ,libnotify)
        ("libpng" ,libpng)
@@ -1819,13 +1820,13 @@ QMatrixClient project.")
 (define-public hangups
   (package
     (name "hangups")
-    (version "0.4.6")
+    (version "0.4.9")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "hangups" version))
        (sha256
-        (base32 "0mvpfd5dc3zgcvwfidcd2qyn59xl5biv728mxifw0ls5rzkc9chs"))))
+        (base32 "1jw4i58cd4j1ymsnhv9224xsi26w8y0qrj6z4nw50dnbl45b6aaa"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1847,6 +1848,9 @@ QMatrixClient project.")
        ("python-reparser" ,python-reparser)
        ("python-requests" ,python-requests)
        ("python-urwid" ,python-urwid)))
+    (native-inputs
+     `(("python-httpretty" ,python-httpretty)
+       ("python-pytest" ,python-pytest)))
     (home-page "https://hangups.readthedocs.io/")
     (synopsis "Instant messaging client for Google Hangouts")
     (description
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index d7bc459ed4..a34e002a8c 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -427,16 +427,16 @@ written in Go with pluggable metric collectors.")
 (define-public fswatch
   (package
     (name "fswatch")
-    (version "1.13.0")
+    (version "1.14.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                       (url "https://github.com/emcrisostomo/fswatch.git")
                       (commit version)))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0r9m3rysqa1kdgghv2i6sv4zrd0v8idsbrp627ys642dl39svir3"))))
+                "1ihn7wp3y7ml2lm8drz2hc6fmgj8kygbygnw8mz7gjax88f9dbx7"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index d408701814..99ca4f9007 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -471,16 +471,16 @@ compression format (.mpc files).")
 (define-public eyed3
   (package
     (name "eyed3")
-    (version "0.8.8")
-    (source (origin
-             (method url-fetch)
-             (uri (pypi-uri "eyeD3" version))
-             (sha256
-              (base32
-               "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq"))))
+    (version "0.8.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "eyeD3" version))
+       (sha256
+        (base32 "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f)) ; the required test data contains copyrighted material.
+     `(#:tests? #f))    ; the required test data contains copyrighted material
     (propagated-inputs
      `(("python-grako" ,python-grako)
        ("python-magic" ,python-magic)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 0147ce7756..a8f9916bb3 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016, 2018, 2019 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -195,7 +195,7 @@ player daemon.")
 (define-public ncmpc
   (package
     (name "ncmpc")
-    (version "0.33")
+    (version "0.34")
     (source (origin
               (method url-fetch)
               (uri
@@ -204,7 +204,7 @@ player daemon.")
                               "/ncmpc-" version ".tar.xz"))
               (sha256
                (base32
-                "19fp7xkpai4lq3vmpbppgh3ism7lg2sibv237c0sl5a0hls4mq4l"))))
+                "0mz8r6vc4zn5sa3hlq4ii74qcrkh01nbg784zcwahgz8g3fb3i8l"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 952edca66e..461296f66b 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -161,7 +161,7 @@ bind processes, and much more.")
 (define-public openmpi
   (package
     (name "openmpi")
-    (version "4.0.0")
+    (version "4.0.1")
     (source
      (origin
       (method url-fetch)
@@ -169,8 +169,7 @@ bind processes, and much more.")
                           (version-major+minor version)
                           "/downloads/openmpi-" version ".tar.bz2"))
       (sha256
-       (base32
-        "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"))))
+       (base32 "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"))))
     (build-system gnu-build-system)
     (inputs
      `(("hwloc" ,hwloc "lib")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1707dfa944..10a23c919f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2222,14 +2222,14 @@ computer's keyboard.")
 (define-public aj-snapshot
   (package
     (name "aj-snapshot")
-    (version "0.9.8")
+    (version "0.9.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/aj-snapshot/"
                                   "aj-snapshot-" version ".tar.bz2"))
               (sha256
                (base32
-                "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p"))))
+                "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"))))
     (build-system gnu-build-system)
     (inputs
      `(("minixml" ,minixml)
diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm
index 8592db1373..1356b8d14d 100644
--- a/gnu/packages/musl.scm
+++ b/gnu/packages/musl.scm
@@ -28,14 +28,14 @@
 (define-public musl
   (package
     (name "musl")
-    (version "1.1.21")
+    (version "1.1.22")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.musl-libc.org/releases/"
                                   "musl-" version ".tar.gz"))
               (sha256
                (base32
-                "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7"))))
+                "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; musl has no tests
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 9af3d97d95..56369abc41 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -161,7 +161,7 @@ residing in IPv4-only networks, even when they are behind a NAT device.")
 (define-public socat
   (package
     (name "socat")
-    (version "1.7.3.2")
+    (version "1.7.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -169,7 +169,7 @@ residing in IPv4-only networks, even when they are behind a NAT device.")
                     version ".tar.bz2"))
               (sha256
                (base32
-                "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"))))
+                "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"))))
     (build-system gnu-build-system)
     (arguments '(#:tests? #f))                    ;no 'check' phase
     (inputs `(("openssl" ,openssl)))
@@ -590,15 +590,14 @@ of the same name.")
 (define-public wireshark
   (package
     (name "wireshark")
-    (version "3.0.0")
+    (version "3.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
                            version ".tar.xz"))
        (sha256
-        (base32
-         "17h0ixq7yr6scscjkidaj3dh5x6dfd3f97ggdxlklkz9nbsk0kxw"))))
+        (base32 "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
@@ -894,6 +893,30 @@ attacking, testing, and cracking.  All tools are command-line driven, which
 allows for heavy scripting.")
     (license (list license:gpl2+ license:bsd-3))))
 
+(define-public perl-danga-socket
+  (package
+    (name "perl-danga-socket")
+    (version "1.61")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/B/BR/BRADFITZ/"
+                           "Danga-Socket-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0nciapvxnc922ms304af0vavz1kgyr45ard8wc659k9srqar4hwf"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-sys-syscall" ,perl-sys-syscall)))
+    (home-page "https://metacpan.org/release/Danga-Socket")
+    (synopsis "Event loop and event-driven async socket base class")
+    (description
+     "Danga::Socket is an abstract base class for objects backed by a socket
+which provides the basic framework for event-driven asynchronous IO, designed
+to be fast.  Danga::Socket is both a base class for objects, and an event
+loop.")
+    (license license:perl-license)))
+
 (define-public perl-data-validate-ip
   (package
     (name "perl-data-validate-ip")
@@ -924,7 +947,7 @@ private (reserved).")
 (define-public perl-net-dns
  (package
   (name "perl-net-dns")
-  (version "1.19")
+  (version "1.20")
   (source
     (origin
       (method url-fetch)
@@ -935,7 +958,7 @@ private (reserved).")
         (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-"
                        version ".tar.gz")))
       (sha256
-       (base32 "1myc23vz0m42yyg8iw7bf1pdrmx9ql6fhl2vwk1vwf55v6yphqi0"))))
+       (base32 "06z09igd42s0kg2ps5k7vpypg77zswfryqzbyalbllvjd0mnknbz"))))
   (build-system perl-build-system)
   (inputs
     `(("perl-digest-hmac" ,perl-digest-hmac)))
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7bebf3921b..6bb15dc5e9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016-2018 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Peter Kreye <kreyepr@gmail.com>
 ;;; Copyright © 2018, 2019 Gabriel Hondet <gabrielhondet@gmail.com>
 ;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
@@ -57,6 +57,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages protobuf)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tex)
@@ -264,14 +265,15 @@ functional, imperative and object-oriented styles of programming.")
   (package
     (name "ocamlbuild")
     (version "0.13.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/ocamlbuild/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1320cfkixs1xlng5av04pa5qjb3ynvi2kl3k1ngqzg5fpi29b0vr"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/ocamlbuild.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0v37vjvdqw35yvj8ipmlzmwf1jhip0hbsmcbdcn9cnj12p3mr6k7"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -302,33 +304,200 @@ functional, imperative and object-oriented styles of programming.")
 for building OCaml library and programs.")
     (license license:lgpl2.1+)))
 
+(define-public ocaml-extlib
+  (package
+    (name "ocaml-extlib")
+    (version "1.7.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://ygrek.org.ua/p/release/ocaml-extlib/"
+                                  "extlib-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (native-inputs
+      `(("ocaml-cppo" ,ocaml-cppo)))
+    (home-page "https://github.com/ygrek/ocaml-extlib")
+    (synopsis "Complete and small extension for OCaml standard library")
+    (description "This library adds new functions to OCaml standard library
+modules, modifies some functions in order to get better performances or
+safety (tail-recursive) and also provides new modules which should be useful
+for day to day programming.")
+    ;; With static-linking exception
+    (license license:lgpl2.1+)))
+
+(define-public ocaml-cudf
+  (package
+    (name "ocaml-cudf")
+    (version "0.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz")
+        (sha256
+          (base32
+            "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"))))
+    (build-system ocaml-build-system)
+    (propagated-inputs `(("ocaml-extlib" ,ocaml-extlib)))
+    (native-inputs
+      `(("perl" ,perl)
+        ("ocamlbuild" ,ocamlbuild)
+        ("ocaml-ounit" ,ocaml-ounit)))
+    (arguments
+     `(#:make-flags
+       (list
+         "all" "opt"
+         (string-append "BINDIR=" (assoc-ref %outputs "out")
+                        "/bin"))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (home-page "http://www.mancoosi.org/cudf/")
+    (synopsis "CUDF library (part of the Mancoosi tools)")
+    (description "CUDF (for Common Upgradeability Description Format) is a
+format for describing upgrade scenarios in package-based Free and Open Source
+Software distribution.")
+    ;; With static-linking exception
+    (license license:lgpl2.1+)))
+
+(define-public ocaml-mccs
+  (package
+    (name "ocaml-mccs")
+    (version "1.1+9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/AltGr/ocaml-mccs")
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1i0hhkrqi7rqlainlg5pc4hibbx6b5dp3x99gmav8c3sbfvlk9mc"))))
+    (build-system dune-build-system)
+    (propagated-inputs `(("ocaml-cudf" ,ocaml-cudf)))
+    (home-page "http://www.i3s.unice.fr/~cpjm/misc/")
+    (synopsis "Upgrade path problem solver")
+    (description "Mccs (Multi Criteria CUDF Solver) is a CUDF problem solver.
+Mccs take as input a CUDF problem and computes the best solution according to
+a set of criteria.  It relies on a Integer Programming solver or a
+Pseudo Boolean solver to achieve its task.  Mccs can use a wide set of
+underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.")
+    (license (list
+               license:bsd-3
+               license:gpl3+
+               ;; With static-linking exception
+               license:lgpl2.1+))))
+
+(define-public ocaml-dose3
+  (package
+    (name "ocaml-dose3")
+    (version "5.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz")
+              (sha256
+               (base32
+                "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"))
+              (patches
+               (search-patches
+                "ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch"
+                "ocaml-dose3-Fix-for-ocaml-4.06.patch"
+                "ocaml-dose3-dont-make-printconf.patch"
+                "ocaml-dose3-Install-mli-cmx-etc.patch"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "SHELL="
+                            (assoc-ref %build-inputs "bash")
+                            "/bin/sh"))
+       #:make-flags
+       (list (string-append "LIBDIR="
+                            (assoc-ref %outputs "out")
+                            "/lib/ocaml/site-lib"))))
+    (propagated-inputs
+      `(("ocaml-graph" ,ocaml-graph)
+        ("ocaml-cudf" ,ocaml-cudf)
+        ("ocaml-extlib" ,ocaml-extlib)
+        ("ocaml-re" ,ocaml-re)))
+    (native-inputs
+      `(("perl" ,perl)
+        ("python" ,python-2) ; for a test script
+        ("python2-pyyaml" ,python2-pyyaml) ; for a test script
+        ("ocaml-extlib" ,ocaml-extlib)
+        ("ocamlbuild" ,ocamlbuild)
+        ("ocaml-cppo" ,ocaml-cppo)))
+    (home-page "http://www.mancoosi.org/software/")
+    (synopsis "Package distribution management framework")
+    (description "Dose3 is a framework made of several OCaml libraries for
+managing distribution packages and their dependencies.  Though not tied to
+any particular distribution, dose3 constitutes a pool of libraries which
+enable analyzing packages coming from various distributions.  Besides basic
+functionalities for querying and setting package properties, dose3 also
+implements algorithms for solving more complex problems such as monitoring
+package evolutions, correct and complete dependency resolution and
+repository-wide uninstallability checks.")
+    ;; with static-linking exception
+    (license license:lgpl2.1+)))
+
+(define-public ocaml-opam-file-format
+  (package
+    (name "ocaml-opam-file-format")
+    (version "2.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/ocaml/opam-file-format")
+                     (commit version)))
+              (sha256
+               (base32
+                "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv"))))
+    (build-system ocaml-build-system)
+    (arguments
+     `(#:tests? #f; No tests
+       #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out")
+                                         "/lib/ocaml/site-lib"))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))))
+    (home-page "https://opam.ocaml.org")
+    (synopsis "Parser and printer for the opam file syntax")
+    (description "This package contains a parser and a pretty-printer for
+the opam file fomat.")
+    ;; With static-linking exception
+    (license license:lgpl2.1+)))
+
 (define-public opam
   (package
     (name "opam")
-    (version "2.0.3")
+    (version "2.0.4")
     (source (origin
-              (method url-fetch)
-              ;; Use the '-full' version, which includes all the dependencies.
-              (uri (string-append
-                    "https://github.com/ocaml/opam/releases/download/"
-                    version "/opam-full-" version ".tar.gz")
-               ;; (string-append "https://github.com/ocaml/opam/archive/"
-               ;;                    version ".tar.gz")
-               )
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/ocaml/opam")
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1qphm1grxx5j8li7f9qfpih4ylrnjl08b4ym8ma4ln44l56xm285"))))
-    (build-system gnu-build-system)
+                "1yx5k8v5vnnc20fmz5zx8kqd242j48qcknlk6vmkr7rkq886ipq2"))))
+    (build-system ocaml-build-system)
     (arguments
-     '(;; Sometimes, 'make -jX' would fail right after ./configure with
-       ;; "Fatal error: exception End_of_file".
-       #:parallel-build? #f
+     `(#:configure-flags
+       (list (string-append "SHELL="
+                            (assoc-ref %build-inputs "bash")
+                            "/bin/sh"))
 
        ;; For some reason, 'ocp-build' needs $TERM to be set.
-       #:make-flags `("TERM=screen"
-                      ,(string-append "SHELL="
-                                      (assoc-ref %build-inputs "bash")
-                                      "/bin/sh"))
+       #:make-flags
+       (list "TERM=screen"
+             (string-append "SHELL="
+                            (assoc-ref %build-inputs "bash")
+                            "/bin/sh"))
+
        #:test-target "tests"
 
        ;; FIXME: There's an obscure test failure:
@@ -354,12 +523,10 @@ for building OCaml library and programs.")
                          ;; isolated environment when building with opam.
                          ;; This is necessary for packages to find external
                          ;; dependencies, such as a C compiler, make, etc...
-                         (("^add_mounts ro /usr")
-                          "add_mounts ro /gnu /run/current-system /usr"))
+                         (("^add_sys_mounts /usr")
+                          "add_sys_mounts /gnu /run/current-system /usr"))
                        (substitute* "src/client/opamInitDefaults.ml"
                          (("\"bwrap\"") (string-append "\"" bwrap "\"")))
-                       ;; Build dependencies
-                       (apply invoke "make" "lib-ext" make-flags)
                        #t)))
                  (add-before 'check 'pre-check
                    (lambda _
@@ -368,7 +535,9 @@ for building OCaml library and programs.")
                      (invoke "git" "config" "--global" "user.name" "Guix")
                      #t)))))
     (native-inputs
-     `(("git" ,git)                               ;for the tests
+     `(("dune" ,dune)
+       ("git" ,git)                               ;for the tests
+       ("ocaml-cppo" ,ocaml-cppo)
        ("python" ,python)                         ;for the tests
        ("camlp4" ,camlp4)))
     (inputs
@@ -376,6 +545,12 @@ for building OCaml library and programs.")
        ("ncurses" ,ncurses)
        ("curl" ,curl)
        ("bubblewrap" ,bubblewrap)))
+    (propagated-inputs
+     `(("ocaml-cmdliner" ,ocaml-cmdliner)
+       ("ocaml-dose3" ,ocaml-dose3)
+       ("ocaml-mccs" ,ocaml-mccs)
+       ("ocaml-opam-file-format" ,ocaml-opam-file-format)
+       ("ocaml-re" ,ocaml-re)))
     (home-page "http://opam.ocamlpro.com/")
     (synopsis "Package manager for OCaml")
     (description
@@ -390,14 +565,15 @@ Git-friendly development workflow.")
   (package
     (name "camlp4")
     (version "4.02+6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/camlp4/archive/"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0icdfzhsbgf89925gc8gl3fm8z2xzszzlib0v9dj5wyzkyv3a342"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/camlp4.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"))))
     (build-system gnu-build-system)
     (native-inputs `(("ocaml" ,ocaml-4.02)
                      ("which" ,which)))
@@ -447,14 +623,15 @@ syntax of OCaml.")
     (inherit camlp4-4.02)
     (name "camlp4")
     (version "4.07+1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/camlp4/archive/"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "143hhxv1i6aq413z0i1pynrjcfl2g5gnh5r3863v6h9z0riqknzc"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/camlp4.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"))))
     (properties
      `((ocaml4.02-variant . ,(delay camlp4-4.02))))
     (native-inputs
@@ -470,14 +647,15 @@ syntax of OCaml.")
   (package
     (name "camlp5")
     (version "7.07")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/camlp5/camlp5/archive/rel"
-                                  (string-delete #\. version) ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "148r6p93xlxi6v7kbsqv8i70r6av04cyn0109pwss5xj6fw97i52"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/camlp5/camlp5.git")
+             (commit (string-append "rel" (string-delete #\. version)))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"))))
     (build-system gnu-build-system)
     (inputs
      `(("ocaml" ,ocaml)))
@@ -556,14 +734,15 @@ written in Objective Caml.")
   (package
     (name "ocaml-num")
     (version "1.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/num/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1xlkd0svc0mgq5s7nrm2rjrsvg15i9wxqkc1kvwjp6sv8vv8bb04"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/num.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases
@@ -600,20 +779,25 @@ the OCaml core distribution.")
   (package
     (name "emacs-tuareg")
     (version "2.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/tuareg/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1ynpfc170f9jqx49biji9npfkvfpflbm29xf24wc7fnxxayr49ig"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/tuareg.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6"))))
     (build-system gnu-build-system)
     (native-inputs `(("emacs" ,emacs-minimal)
                      ("opam" ,opam)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (delete 'configure)
          (add-before 'install 'fix-install-path
            (lambda* (#:key outputs #:allow-other-keys)
@@ -1094,14 +1278,15 @@ GNU CC attributes.  It provides also a C pretty printer as an example of use.")
   (package
     (name "ocaml-qcheck")
     (version "0.5.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/c-cube/qcheck/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1zs1pg5cb1iry554v3cdmmiglsrwmsqa9x8zxmzb118fnk5d3ha6"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/c-cube/qcheck.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vl2asr7md99pv558nbszxvjj36b4l6rj05hyczfy524vihhl0gf"))))
     (build-system ocaml-build-system)
     (native-inputs
      `(("ounit" ,ocaml-ounit)
@@ -1185,17 +1370,18 @@ full_split, cut, rcut, etc..")
   (package
     (name "ocaml-bisect")
     (version "1.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/gasche/bisect/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0p67fppk5ifb63b00kxwrb1xg75hrqhknng3bsdyw3gxxqyjlpmx"))
-              (patches
-               (search-patches
-                "ocaml-bisect-fix-camlp4-in-another-directory.patch"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gasche/bisect.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hm5za61qydda6ri3887b4zqqbqilh42x712xnclm1rr7ggga2nh"))
+       (patches
+        (search-patches
+         "ocaml-bisect-fix-camlp4-in-another-directory.patch"))))
     (build-system ocaml-build-system)
     (native-inputs
      `(("camlp4" ,camlp4)
@@ -1613,32 +1799,28 @@ spans without being subject to operating system calendar time adjustments.")
 (define-public ocaml-cmdliner
   (package
     (name "ocaml-cmdliner")
-    (version "1.0.2")
+    (version "1.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
                                   "cmdliner-" version ".tbz"))
               (sha256
                (base32
-                "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"))))
+                "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna"))))
     (build-system ocaml-build-system)
     (inputs
      `(("ocaml-result" ,ocaml-result)))
     (native-inputs
-     `(("ocamlbuild" ,ocamlbuild)
-       ("opam" ,opam)))
+     `(("ocamlbuild" ,ocamlbuild)))
     (arguments
      `(#:tests? #f
-       #:build-flags '("native=true" "native-dynlink=true")
+       #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out")
+                                         "/lib/ocaml/site-lib/cmdliner"))
        #:phases
        (modify-phases %standard-phases
-         (replace 'install
-           ;; The makefile says 'adjust on cli invocation'
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (invoke "make" "install" (string-append "PREFIX=" out))
-               #t)))
          (delete 'configure))))
+    (properties
+     `((ocaml4.02-variant . ,(delay ocaml4.02-cmdliner))))
     (home-page "http://erratique.ch/software/cmdliner")
     (synopsis "Declarative definition of command line interfaces for OCaml")
     (description "Cmdliner is a module for the declarative definition of command
@@ -1650,7 +1832,17 @@ most of the POSIX and GNU conventions.")
     (license license:bsd-3)))
 
 (define-public ocaml4.02-cmdliner
-  (package-with-ocaml4.02 ocaml-cmdliner))
+  (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant ocaml-cmdliner))))
+    (package
+      (inherit base)
+      (version "1.0.2")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "http://erratique.ch/software/cmdliner/releases/"
+                                    "cmdliner-" version ".tbz"))
+                (sha256
+                 (base32
+                  "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1")))))))
 
 (define-public ocaml-fmt
   (package
@@ -1764,18 +1956,19 @@ simple (yet expressive) query language to select the tests to run.")
     (name "ocaml-ppx-tools")
     (version "5.1+4.06.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/"
-                            version ".tar.gz"))
-        (sha256 (base32
-                  "0mncpy9v2mcjgnj7s2vqpp2b1ixv54djicfx66ic9wny9d202gj1"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/alainfrisch/ppx_tools.git")
+             (commit version)))
+       (sha256 (base32
+                "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases (delete 'configure))
        #:tests? #f))
     (properties
-      `((ocaml4.02-variant . ,(delay ocaml4.02-ppx-tools))))
+     `((ocaml4.02-variant . ,(delay ocaml4.02-ppx-tools))))
     (home-page "https://github.com/alainfrisch/ppx_tools")
     (synopsis "Tools for authors of ppx rewriters and other syntactic tools")
     (description "Tools for authors of ppx rewriters and other syntactic tools.")
@@ -1787,12 +1980,13 @@ simple (yet expressive) query language to select the tests to run.")
       (inherit base)
       (version "5.0+4.02.0")
       (source
-        (origin
-          (method url-fetch)
-          (uri (string-append "https://github.com/alainfrisch/ppx_tools/archive/"
-                              version ".tar.gz"))
-          (sha256 (base32
-                    "0rjg4rngi8k9873z4zq95zn9hj8qyw1vcrf11y15aqasfpqq16rc")))))))
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/alainfrisch/ppx_tools.git")
+               (commit version)))
+         (sha256
+          (base32 "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8")))))))
 
 (define-public ocaml-react
   (package
@@ -2088,14 +2282,15 @@ representation of the data.")
   (package
     (name "ocaml-ulex")
     (version "1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/whitequark/ulex/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-                (base32
-                  "16gnbhqs6y2v89vw4igzvxdf2g8ybh5643636824aldcv8sscac0"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/whitequark/ulex.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08yf2x9a52l2y4savjqfjd2xy4pjd1rpla2ylrr9qrz1drpfw4ic"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases (delete 'configure))
@@ -2761,13 +2956,14 @@ programs.  It allows the definition of simple macros and file inclusion.  Cpp oi
     (name "ocaml4.02-ppx-deriving")
     (version "4.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/whitequark/ppx_deriving//archive/v"
-                            version ".tar.gz"))
-        (sha256 (base32
-                  "1fr16g121j6zinwcprzlhx2py4271n9jzs2m9hq2f3qli2b1p0vl"))
-        (file-name (string-append name "-" version ".tar.gz"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/whitequark/ppx_deriving.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"))))
     (build-system ocaml-build-system)
     (native-inputs
      `(("js-build-tools" ,ocaml4.02-js-build-tools)
@@ -2782,13 +2978,17 @@ programs.  It allows the definition of simple macros and file inclusion.  Cpp oi
        #:findlib ,ocaml4.02-findlib
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (delete 'configure)
-           (add-before 'install 'fix-environment
-             (lambda* (#:key outputs #:allow-other-keys)
-               ;; the installation procedures looks for the installed module
-               (setenv "OCAMLPATH"
-                       (string-append (getenv "OCAMLPATH") ":"
-                                      (getenv "OCAMLFIND_DESTDIR"))))))))
+         (add-before 'install 'fix-environment
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; the installation procedures looks for the installed module
+             (setenv "OCAMLPATH"
+                     (string-append (getenv "OCAMLPATH") ":"
+                                    (getenv "OCAMLFIND_DESTDIR"))))))))
     (home-page "https://github.com/whitequark/ppx_deriving/")
     (synopsis "Type-driven code generation for OCaml >=4.02")
     (description "Ppx_deriving provides common infrastructure for generating
@@ -3316,14 +3516,15 @@ new record values.")
   (package
     (name "ocaml-seq")
     (version "0.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/c-cube/seq/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/c-cube/seq.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:tests? #f
@@ -3342,9 +3543,9 @@ new record values.")
 version=\"[distributed with ocaml]\"
 description=\"dummy package for compatibility\"
 requires=\"\"")))
-             #t))))))
+               #t))))))
     (properties
-      `((ocaml4.02-variant . ,(delay ocaml4.02-seq))))
+     `((ocaml4.02-variant . ,(delay ocaml4.02-seq))))
     (home-page "https://github.com/c-cube/seq")
     (synopsis "OCaml's standard iterator type")
     (description "This package is a compatibility package for OCaml's
@@ -3365,14 +3566,15 @@ standard iterator type starting from 4.07.")
   (package
     (name "ocaml-re")
     (version "1.8.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml/ocaml-re//archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1pdb0mr6z5ax6szblr3f5lbdnqq9grm97cmsfjmdma60yrx2rqhd"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/ocaml-re.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"))))
     (build-system dune-build-system)
     (arguments
      `(#:tests? #f
@@ -3751,14 +3953,15 @@ writing to these structures, and they are accessed via the Bigarray module.")
   (package
     (name "ocaml4.02-ezjsonm")
     (version "0.4.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mirage/ezjsonm/archive/"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1kag0z2xlk4rw73a240dmkxh9rj6psxxcxkm7d7z0rrj6hzjajgq"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mirage/ezjsonm.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"))))
     (build-system ocaml-build-system)
     (native-inputs
      `(("alcotest" ,ocaml4.02-alcotest)))
@@ -3783,14 +3986,15 @@ JSON.")
   (package
     (name "ocaml4.02-uri")
     (version "1.9.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mirage/ocaml-uri/archive/v"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "02bzrag79prx261rxf9mlak749pwf4flpfl8p012x1xznv9m0clc"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mirage/ocaml-uri.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:ocaml ,ocaml-4.02
@@ -3838,14 +4042,15 @@ Format module of the OCaml standard library.")
   (package
     (name "optcomp")
     (version "1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/diml/optcomp/archive/"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/diml/optcomp.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bm4f3fs9g1yiz48hdxvcjwnrgymwisqilxhmm87ndz81wp47zfy"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:ocaml ,ocaml-4.02
@@ -3867,14 +4072,15 @@ cpp-like directives.")
   (package
     (name "ocaml-piqilib")
     (version "0.6.14")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/alavrik/piqi/archive/v"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/alavrik/piqi.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0lyqllmfsxmwlg7qidy92kvxi9n39lvachmydcyi81f8p07ykd2d"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases
@@ -4135,15 +4341,15 @@ library is currently designed for Unicode Standard 3.2.")
   (package
     (name "ocaml-jbuilder")
     (version "1.0+beta16")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/janestreet/jbuilder/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1cy07pwvbrlysszs938yd74yyvvbgkffpb82qrjph77zf0h2gdi7"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/janestreet/jbuilder.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y3fgf570w3vrnhianrg26jy5j749zczq3f78s2dy5ylbp1hrx71"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:ocaml ,ocaml-4.02
@@ -4171,14 +4377,15 @@ is provide a description of your project and Jbuilder will do the rest.")
   (package
     (name "ocaml-zed")
     (version "1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/diml/zed/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19m5vrj60vg1b63qfsv0aabdlzgn40cqmx65s3wafqi4fs9xp6jn"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/diml/zed.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases
@@ -4212,12 +4419,13 @@ connect an engine to your inputs and rendering functions to get an editor.")
     (version "1.13")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/diml/lambda-term/archive/"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/diml/lambda-term.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l"))))
+        (base32 "0wwib20b2ir3h2g9zwhzn04cv160psb805skp8v23wqgyn5cnbh8"))))
     (build-system dune-build-system)
     (arguments
      `(#:build-flags (list "--profile" "release")
@@ -4243,14 +4451,15 @@ instead of bindings to a C library.")
   (package
     (name "ocaml-utop")
     (version "2.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/ocaml-community/utop/archive/"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml-community/utop.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02hjkc0rdzfq3bqy9mqm5wmw312r3187v9cl66ynb6hxkj6s3glb"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -4824,6 +5033,26 @@ Atom.")
 the OCaml language.")
     (license license:gpl3+)))
 
+(define-public ocaml-gsl-1
+  (package
+    (inherit ocaml-gsl)
+    (version "1.19.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/mmottl/gsl-ocaml"
+                                  "/releases/download/v"
+                                  version "/gsl-ocaml-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh"))))
+    (build-system ocaml-build-system)
+    (inputs
+     `(("gsl" ,gsl)))
+    (native-inputs
+     `(("ocamlbuild" ,ocamlbuild)))
+    (arguments '())
+    (propagated-inputs '())))
+
 (define-public cubicle
   (package
     (name "cubicle")
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 167d03b954..ceedae2e61 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -136,7 +136,7 @@ and they are executed on lists of files, hosts, users or other items.")
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags
-      (list "--enable-pam"
+      (list "--enable-pam" "--sysconfdir=/etc/slurm"
             (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi"))
             (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc"))
             (string-append "--with-json=" (assoc-ref %build-inputs "json-c"))
diff --git a/gnu/packages/patches/docker-use-fewer-modprobes.patch b/gnu/packages/patches/docker-use-fewer-modprobes.patch
index 2779e1be5d..4e4a45b6ce 100644
--- a/gnu/packages/patches/docker-use-fewer-modprobes.patch
+++ b/gnu/packages/patches/docker-use-fewer-modprobes.patch
@@ -103,17 +103,35 @@ See <https://github.com/moby/moby/pull/38930>.
  
 --- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go.orig	2019-03-19 11:23:20.738316699 +0100
 +++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_linux.go	2019-03-19 11:27:57.149753073 +0100
-@@ -100,12 +100,7 @@
+@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle {
+ func getSupportedNlFamilies() []int {
+ 	fams := []int{syscall.NETLINK_ROUTE}
+ 	// NETLINK_XFRM test
+-	if err := loadXfrmModules(); err != nil {
+-		if checkXfrmSocket() != nil {
+-			logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
+-		} else {
+-			fams = append(fams, syscall.NETLINK_XFRM)
+-		}
++	if err := checkXfrmSocket(); err != nil {
++		logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", err)
+ 	} else {
+ 		fams = append(fams, syscall.NETLINK_XFRM)
+ 	}
+@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int {
+ 	return fams
  }
  
- func loadXfrmModules() error {
+-func loadXfrmModules() error {
 -	if out, err := exec.Command("modprobe", "-va", "xfrm_user").CombinedOutput(); err != nil {
 -		return fmt.Errorf("Running modprobe xfrm_user failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
 -	}
 -	if out, err := exec.Command("modprobe", "-va", "xfrm_algo").CombinedOutput(); err != nil {
 -		return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%s`, error: %v", strings.TrimSpace(string(out)), err)
 -	}
-+	// Those are automatically loaded when someone opens the socket anyway.
- 	return nil
- }
- 
+-	return nil
+-}
+-
+ // API check on required xfrm modules (xfrm_user, xfrm_algo)
+ func checkXfrmSocket() error {
+ 	fd, err := syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, syscall.NETLINK_XFRM)
diff --git a/gnu/packages/patches/idris-test-no-node.patch b/gnu/packages/patches/idris-test-no-node.patch
new file mode 100644
index 0000000000..c04ad41a8e
--- /dev/null
+++ b/gnu/packages/patches/idris-test-no-node.patch
@@ -0,0 +1,61 @@
+From 6c52e1b902b869c25e2fe39cff6364143a04da61 Mon Sep 17 00:00:00 2001
+From: Niklas Larsson <niklas@mm.st>
+Date: Tue, 11 Dec 2018 19:56:22 +0100
+Subject: [PATCH] Only check for Node when required
+
+---
+ test/TestRun.hs | 34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/test/TestRun.hs b/test/TestRun.hs
+index c7db9fdcd..4809911f3 100644
+--- a/test/TestRun.hs
++++ b/test/TestRun.hs
+@@ -11,6 +11,7 @@ import Data.Proxy
+ import Data.Typeable
+ import Options.Applicative
+ import System.Directory
++import System.Environment
+ import System.Exit
+ import System.FilePath ((</>))
+ import System.Info
+@@ -103,20 +104,25 @@ runTest path flags = do
+       normalise (x : xs) = x : normalise xs
+       normalise [] = []
+ 
++checkNode :: IO  ()
++checkNode = do
++    nodePath   <- findExecutable "node"
++    nodejsPath <- findExecutable "nodejs"
++    let node = nodePath <|> nodejsPath
++    case node of
++      Nothing -> do
++        putStrLn "For running the test suite against Node, node must be installed."
++        exitFailure
++      Just _  -> return ()
++
+ main :: IO ()
+ main = do
+-  nodePath   <- findExecutable "node"
+-  nodejsPath <- findExecutable "nodejs"
+-  let node = nodePath <|> nodejsPath
+-  case node of
+-    Nothing -> do
+-      putStrLn "For running the test suite against Node, node must be installed."
+-      exitFailure
+-    Just _  -> do
+-      defaultMainWithIngredients ingredients $
++    args <- getArgs
++    when ("--node" `elem` args) checkNode
++    defaultMainWithIngredients ingredients $
+         askOption $ \(NodeOpt node) ->
+-          let (codegen, flags) = if node then (JS, ["--codegen", "node"])
+-                                         else (C , [])
+-           in
+-            mkGoldenTests (testFamiliesForCodegen codegen)
+-                        (flags ++ idrisFlags)
++            let (codegen, flags) = if node then (JS, ["--codegen", "node"])
++                                           else (C , [])
++            in
++                mkGoldenTests (testFamiliesForCodegen codegen) (flags ++ idrisFlags)
++
diff --git a/gnu/packages/patches/knot-include-system-lmdb-header.patch b/gnu/packages/patches/knot-include-system-lmdb-header.patch
deleted file mode 100644
index 5c5c0beabc..0000000000
--- a/gnu/packages/patches/knot-include-system-lmdb-header.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Tobias Geerinckx-Rice <me@tobias.gr>
-Date: Wed, 20 Mar 2019 00:08:00 +0100
-Subject: [PATCH] gnu: knot: Include system <lmdb.h>.
-
-Copied verbatim from Knot master[0].
-
-[0]: https://gitlab.labs.nic.cz/knot/knot-dns/commit/b557430cffbb1c6b30617a394b02acc514e7e536
-
-From b557430cffbb1c6b30617a394b02acc514e7e536 Mon Sep 17 00:00:00 2001
-From: Daniel Salzman <daniel.salzman@nic.cz>
-Date: Wed, 6 Mar 2019 17:35:44 +0100
-Subject: [PATCH] journal: include proper header <lmdb.h>
-
-fixes #638
----
- src/knot/journal/knot_lmdb.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/knot/journal/knot_lmdb.h b/src/knot/journal/knot_lmdb.h
-index 35a88845c..b1d09cbb4 100644
---- a/src/knot/journal/knot_lmdb.h
-+++ b/src/knot/journal/knot_lmdb.h
-@@ -16,7 +16,7 @@
- 
- #pragma once
- 
--#include "contrib/lmdb/lmdb.h"
-+#include <lmdb.h>
- 
- #include <stdbool.h>
- #include <stdlib.h>
--- 
-2.18.1
-
diff --git a/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch
new file mode 100644
index 0000000000..f977c6dd98
--- /dev/null
+++ b/gnu/packages/patches/kodi-set-libcurl-ssl-parameters.patch
@@ -0,0 +1,16 @@
+Kodi doesn't set the CAPATH and CAINFO parameters for libcurl. To make HTTPS
+connections work we can set them based on SSL_CERT_DIR and SSL_CERT_FILE.
+
+--- a/xbmc/filesystem/CurlFile.cpp
++++ b/xbmc/filesystem/CurlFile.cpp
+@@ -626,5 +626,9 @@
+   // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use.
+   if (!m_cipherlist.empty())
+     g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str());
++
++  // Load certificate data from environment paths
++  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAPATH, getenv("SSL_CERT_DIR"));
++  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_CAINFO, getenv("SSL_CERT_FILE"));
+ }
+ 
+ void CCurlFile::SetRequestHeaders(CReadState* state)
\ No newline at end of file
diff --git a/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch b/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch
new file mode 100644
index 0000000000..d2cc44c784
--- /dev/null
+++ b/gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch
@@ -0,0 +1,25 @@
+From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001
+From: Louis Gesbert <louis.gesbert@ocamlpro.com>
+Date: Tue, 6 Feb 2018 10:15:45 +0100
+Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in
+
+---
+ META.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/META.in b/META.in
+index aa2cd8d..0f9d337 100644
+--- a/META.in
++++ b/META.in
+@@ -8,7 +8,7 @@ package "common" (
+ version = "@PACKAGE_VERSION@"
+ archive(byte) = "common.cma"
+ archive(native) = "common.cmxa"
+-requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
++requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
+ )
+ 
+ package "algo" (
+-- 
+2.11.0
+
diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
new file mode 100644
index 0000000000..2c344af821
--- /dev/null
+++ b/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch
@@ -0,0 +1,52 @@
+From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001
+From: Louis Gesbert <louis.gesbert@ocamlpro.com>
+Date: Sat, 2 Dec 2017 12:51:01 +0100
+Subject: [PATCH] Fix for ocaml 4.06
+
+---
+ common/criteria_lexer.mll | 8 ++++----
+ common/util.ml            | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll
+index 71f9178..fc4eae3 100644
+--- a/common/criteria_lexer.mll
++++ b/common/criteria_lexer.mll
+@@ -18,7 +18,7 @@
+     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
+     (* find the terminating delimiter *)
+     let endpos =
+-      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
++      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+       |Invalid_argument _ ->
+           raise (Format822.Syntax_error (
+             Format822.error lexbuf "String too short"))
+@@ -27,9 +27,9 @@
+             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
+     in
+     let len = endpos - (lexbuf.lex_start_pos + 3) in
+-    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+-    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
+-    s
++    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
++    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
++    Bytes.to_string s
+ 
+ }
+ 
+diff --git a/common/util.ml b/common/util.ml
+index 598f266..36ca3d1 100644
+--- a/common/util.ml
++++ b/common/util.ml
+@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = struct
+   let clean label =
+     try 
+       let s = Filename.chop_extension (Filename.basename label) in
+-      String.capitalize s
++      String.capitalize_ascii s
+     with Invalid_argument _ -> label
+ 
+   let create ?(enabled=false) label =
+-- 
+2.11.0
+
diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
new file mode 100644
index 0000000000..41494e7b3c
--- /dev/null
+++ b/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch
@@ -0,0 +1,133 @@
+From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
+From: Louis Gesbert <louis.gesbert@ocamlpro.com>
+Date: Thu, 2 Mar 2017 12:19:56 +0100
+Subject: [PATCH] Install mli, cmx, etc.
+
+---
+ Makefile | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 09464ff..5044d7f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
+ 	@for i in _build/cudf/cudf.*; do \
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
++	  rm -f $(DOSELIBS)/*.mlpack ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
+ 	  if [ -e $$i ]; then \
+ 	  cp $$i $(DOSELIBS) ; \
+ 		rm $$i ;\
+-	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
++	  rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
+ 	  fi ; \
+ 	done
+ 
+@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
+ 	  if [ -e $$i ]; then \
+ 			cp $$i $(DOSELIBS) ;\
+ 			rm $$i ;\
+-			rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
++			rm -f $(DOSELIBS)/*.mlpack ;\
+ 	  fi ; \
+ 	done
+ 
+@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
+ INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
+ INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
+ INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
+-#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
++INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
+ INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
+ 
+ exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
+-- 
+2.11.0
+
diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
new file mode 100644
index 0000000000..84b6a3b81b
--- /dev/null
+++ b/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch
@@ -0,0 +1,9 @@
+--- a/configure
++++ b/configure
+@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
+-make printconf
diff --git a/gnu/packages/patches/quilt-getopt-nondigit-param.patch b/gnu/packages/patches/quilt-getopt-nondigit-param.patch
deleted file mode 100644
index 6bbec67e75..0000000000
--- a/gnu/packages/patches/quilt-getopt-nondigit-param.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Jean Delvare <jdelvare@suse.de>
-Subject: compat/getopt: Allow non-digit parameter embedded in short option
-
-The compatibility getopt script allows only digit parameters to be
-embedded in short options. Util-linux's getopt implementation does
-not have such a restriction and allows any parameter to be embedded
-in short options. As a consequence, using the compatibility getopt
-script would choke for example on "-pab", which is a legal option
-of the "quilt refresh" command.
-
-Remove the limitation on digits so that the compatibility getopt
-script allows what util-linux allows. This fixes the second half
-of bug #54772:
-https://savannah.nongnu.org/bugs/index.php?54772
-
-As a side note, this feature of the compatibility script was broken
-anyway, as it would output the digits in reverse order.
-
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- compat/getopt.in |   13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
---- quilt.orig/compat/getopt.in	2018-10-03 16:05:56.818667040 +0200
-+++ quilt/compat/getopt.in	2018-10-03 16:12:17.624841732 +0200
-@@ -108,15 +108,10 @@ foreach my $word (@words) {
- 				if (scalar(@letters) == 0) {
- 					$need_param = $letter;
- 				} else {
--					# short options can have numerical args
--					# embedded in the short option list: -UO
--					die "unexpected character after option $letter"
--						if ($letters[$#letters] !~ /[0-9]/);
--					my @digits;
--					while (scalar(@letters) && ($letters[$#letters] =~ /[0-9]/)) {
--						push @digits, pop @letters;
--					}
--					push @options, quote_word(join('', reverse @digits));
-+					# short options can have args
-+					# embedded in the short option list
-+					push @options, quote_word(join('', reverse @letters));
-+					@letters = ();
- 				}
- 			}
- 		}
diff --git a/gnu/packages/patches/quilt-getopt-second-separator.patch b/gnu/packages/patches/quilt-getopt-second-separator.patch
deleted file mode 100644
index cde2c8d41c..0000000000
--- a/gnu/packages/patches/quilt-getopt-second-separator.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Jean Delvare <jdelvare@suse.de>
-Subject: compat/getopt: Handle a second separator
-
-getopt can be passed 2 '--' separators. The first one tells that
-getopt options are over and target program options start. The second
-one tells that the target program's options are over and following
-arguments should be treated as non-options even if they look like
-options.
-
-This second separator was not handled, causing the compatibility
-getopt script to treat the following arguments as options, eventually
-failing one way or another.
-
-Properly detect and handle the second separator. This fixes the first
-half of bug #54772:
-https://savannah.nongnu.org/bugs/index.php?54772
-
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- compat/getopt.in |   13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
---- quilt.orig/compat/getopt.in	2018-10-03 15:23:21.147620172 +0200
-+++ quilt/compat/getopt.in	2018-10-03 16:05:56.818667040 +0200
-@@ -8,12 +8,12 @@
- 
- use strict;
- 
--my $opts;
-+my $opts = '';
- my @words;
- my $found_sep = 0;
- 
- foreach my $arg (@ARGV) {
--  if ($arg eq '--') {
-+  if (!$found_sep && $arg eq '--') {
-     $found_sep = 1;
-   }
-   else {
-@@ -62,10 +62,17 @@ sub quote_word
- 	return "'$word'";
- }
- 
-+# there can be a second separator, to inhibit processing following arguments
-+# as options
-+$found_sep = 0;
- foreach my $word (@words) {
-+	if ($word eq '--') {
-+		$found_sep = 1;
-+		next;
-+	}
- 
- 	# allow '-' to be an option value
--	if (!$need_param && $word !~ /^-./) {
-+	if ($found_sep || (!$need_param && $word !~ /^-./)) {
- 		push @barewords, quote_word($word);
- 		next;
- 	}
diff --git a/gnu/packages/patches/quilt-test-fix-regex.patch b/gnu/packages/patches/quilt-test-fix-regex.patch
deleted file mode 100644
index 2e249ac55b..0000000000
--- a/gnu/packages/patches/quilt-test-fix-regex.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5193b137b5a9034ce79946edd40760df2f63a82a Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Tue, 25 Apr 2017 15:17:53 +0200
-Subject: test: Escape curly braces in regex
-
-Curly braces in perl regex are supposed to be escaped, recent
-versions of perl complain when they aren't:
-
-Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE (\w+)}/ at ./run line 114.
-Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE \?}/ at ./run line 290.
-
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- test/run | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/run b/test/run
-index 942014e..03afc7a 100755
---- a/test/run
-+++ b/test/run
-@@ -112,7 +112,7 @@ sub flush_output()
- sub substitute_vars($)
- {
- 	my ($line) = @_;
--	$line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
-+	$line =~ s[%\{(\w+)\}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
- 	return $line;
- }
- 
-@@ -288,7 +288,7 @@ while (defined(my $line = <SOURCE>)) {
- 	# Parse the next command
- 	if ($line =~ s/^\s*\$ ?//) {
- 		# Substitute %{?} with the last command's status
--		$line =~ s[%{\?}][$last_status]eg;
-+		$line =~ s[%\{\?\}][$last_status]eg;
- 
- 		chomp($prog = substitute_vars($line));
- 		$prog_line = $lineno;
--- 
-cgit v1.0-41-gc330
-
diff --git a/gnu/packages/patches/synfigstudio-fix-ui-with-gtk3.patch b/gnu/packages/patches/synfigstudio-fix-ui-with-gtk3.patch
deleted file mode 100644
index d7b3e92507..0000000000
--- a/gnu/packages/patches/synfigstudio-fix-ui-with-gtk3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Downloaded from
-https://github.com/synfig/synfig/commit/b9c3b73ee35b83c4d9183c800809040cef98b2f2.patch
-
-Without this patch the UI of Synfig Studio (when built with the latest version
-of GTK) displays very large buttons in the header of every frame.
-
-This patch can be removed with the next release.
-
-
-From b9c3b73ee35b83c4d9183c800809040cef98b2f2 Mon Sep 17 00:00:00 2001
-From: caryoscelus <caryoscelus@gmx.com>
-Date: Wed, 25 Jan 2017 18:34:39 +0300
-Subject: [PATCH] Fix dock drop area size
-
-Fixes #227
-
-By using Frame instead of Button we avoid intrusive Gtk themes
-from forcing huge drop area size.
----
- synfig-studio/src/gui/docks/dockdroparea.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/docks/dockdroparea.cpp b/synfig-studio/src/gui/docks/dockdroparea.cpp
-index 0f8936fdb..e012282f0 100644
---- a/src/gui/docks/dockdroparea.cpp
-+++ b/src/gui/docks/dockdroparea.cpp
-@@ -35,7 +35,7 @@
- #include "app.h"
- #include "docks/dockdroparea.h"
- #include "docks/dockmanager.h"
--#include <gtkmm/button.h>
-+#include <gtkmm/frame.h>
- 
- #endif
- 
-@@ -61,10 +61,15 @@ DockDropArea::DockDropArea(Gtk::Widget *target):
- 	std::vector<Gtk::TargetEntry> listTargets;
- 	listTargets.push_back( Gtk::TargetEntry("SYNFIG_DOCK") );
- 
--	Gtk::Button *button_left   = manage(new Gtk::Button());
--	Gtk::Button *button_right  = manage(new Gtk::Button());
--	Gtk::Button *button_top    = manage(new Gtk::Button());
--	Gtk::Button *button_bottom = manage(new Gtk::Button());
-+	Gtk::Frame *button_left   = manage(new Gtk::Frame());
-+	Gtk::Frame *button_right  = manage(new Gtk::Frame());
-+	Gtk::Frame *button_top    = manage(new Gtk::Frame());
-+	Gtk::Frame *button_bottom = manage(new Gtk::Frame());
-+
-+	button_left->set_size_request(20, 10);
-+	button_right->set_size_request(20, 10);
-+	button_top->set_size_request(20, 10);
-+	button_bottom->set_size_request(20, 10);
- 
- 	button_left->drag_dest_set(listTargets);
- 	button_right->drag_dest_set(listTargets);
diff --git a/gnu/packages/patches/webkitgtk-sse2.patch b/gnu/packages/patches/webkitgtk-sse2.patch
new file mode 100644
index 0000000000..df70e38919
--- /dev/null
+++ b/gnu/packages/patches/webkitgtk-sse2.patch
@@ -0,0 +1,202 @@
+Fix build on i686.
+
+This patch is taken from upstream, with ChangeLog entries omitted.
+
+From 5048338c5f21605441c6833907d1136ac9640b35 Mon Sep 17 00:00:00 2001
+From: "mcatanzaro@igalia.com"
+ <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Wed, 10 Apr 2019 18:27:25 +0000
+Subject: [PATCH] Unreviewed, rolling out r243989.
+
+Broke i686 builds
+
+Reverted changeset:
+
+"[CMake] Detect SSE2 at compile time"
+https://bugs.webkit.org/show_bug.cgi?id=196488
+https://trac.webkit.org/changeset/243989
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@244138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ CMakeLists.txt                                | 10 ---
+ ChangeLog                                     | 12 ++++
+ Source/JavaScriptCore/ChangeLog               | 12 ++++
+ .../assembler/MacroAssemblerX86Common.cpp     |  7 ++
+ .../assembler/MacroAssemblerX86Common.h       | 30 +++++++++
+ Source/cmake/FindSSE2.cmake                   | 65 -------------------
+ 6 files changed, 61 insertions(+), 75 deletions(-)
+ delete mode 100644 Source/cmake/FindSSE2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index acd77f4b623..d3e8a23f9ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,16 +114,6 @@ else ()
+     set(WTF_CPU_UNKNOWN 1)
+ endif ()
+ 
+-#---------------------------
+-# Make sure SSE2 is present.
+-#---------------------------
+-if (WTF_CPU_X86)
+-    include(FindSSE2)
+-    if (NOT SSE2_SUPPORT_FOUND)
+-        message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+-    endif ()
+-endif ()
+-
+ # -----------------------------------------------------------------------------
+ # Determine the operating system
+ # -----------------------------------------------------------------------------
+diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
+index 8c752c0d030..31753589df7 100644
+--- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
++++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
+@@ -168,6 +168,11 @@ static_assert(PROBE_OFFSETOF_REG(cpu.fprs, X86Registers::xmm15) == PROBE_CPU_XMM
+ static_assert(sizeof(Probe::State) == PROBE_SIZE, "Probe::State::size's matches ctiMasmProbeTrampoline");
+ static_assert((PROBE_EXECUTOR_OFFSET + PTR_SIZE) <= (PROBE_SIZE + OUT_SIZE), "Must have room after ProbeContext to stash the probe handler");
+ 
++#if CPU(X86)
++// SSE2 is a hard requirement on x86.
++static_assert(isSSE2Present(), "SSE2 support is required in JavaScriptCore");
++#endif
++
+ #undef PROBE_OFFSETOF
+ 
+ #if CPU(X86)
+@@ -787,6 +792,7 @@ void MacroAssemblerX86Common::collectCPUFeatures()
+     std::call_once(onceKey, [] {
+         {
+             CPUID cpuid = getCPUID(0x1);
++            s_sse2CheckState = (cpuid[3] & (1 << 26)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+             s_sse4_1CheckState = (cpuid[2] & (1 << 19)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+             s_sse4_2CheckState = (cpuid[2] & (1 << 20)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+             s_popcntCheckState = (cpuid[2] & (1 << 23)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+@@ -803,6 +809,7 @@ void MacroAssemblerX86Common::collectCPUFeatures()
+     });
+ }
+ 
++MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse2CheckState = CPUIDCheckState::NotChecked;
+ MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState = CPUIDCheckState::NotChecked;
+ MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_2CheckState = CPUIDCheckState::NotChecked;
+ MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_avxCheckState = CPUIDCheckState::NotChecked;
+diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
+index ff097290ef3..097bcb0bb86 100644
+--- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
++++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
+@@ -4197,11 +4197,41 @@ private:
+     }
+ #endif
+ 
++#if CPU(X86)
++#if OS(MAC_OS_X)
++
++    // All X86 Macs are guaranteed to support at least SSE2,
++    static bool isSSE2Present()
++    {
++        return true;
++    }
++
++#else // OS(MAC_OS_X)
++    static bool isSSE2Present()
++    {
++        if (s_sse2CheckState == CPUIDCheckState::NotChecked)
++            collectCPUFeatures();
++        return s_sse2CheckState == CPUIDCheckState::Set;
++    }
++
++#endif // OS(MAC_OS_X)
++#elif !defined(NDEBUG) // CPU(X86)
++
++    // On x86-64 we should never be checking for SSE2 in a non-debug build,
++    // but non debug add this method to keep the asserts above happy.
++    static bool isSSE2Present()
++    {
++        return true;
++    }
++
++#endif
++
+     using CPUID = std::array<unsigned, 4>;
+     static CPUID getCPUID(unsigned level);
+     static CPUID getCPUIDEx(unsigned level, unsigned count);
+     JS_EXPORT_PRIVATE static void collectCPUFeatures();
+ 
++    JS_EXPORT_PRIVATE static CPUIDCheckState s_sse2CheckState;
+     JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
+     JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_2CheckState;
+     JS_EXPORT_PRIVATE static CPUIDCheckState s_avxCheckState;
+diff --git a/Source/cmake/FindSSE2.cmake b/Source/cmake/FindSSE2.cmake
+deleted file mode 100644
+index 7a947feadd4..00000000000
+--- a/Source/cmake/FindSSE2.cmake
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#################################
+-# Check for the presence of SSE2.
+-#
+-# Once done, this will define:
+-# - SSE2_SUPPORT_FOUND - the system supports (at least) SSE2.
+-#
+-# Copyright (c) 2014, Pablo Fernandez Alcantarilla, Jesus Nuevo
+-# Copyright (c) 2019, Igalia S.L.
+-#
+-# Redistribution and use in source and binary forms, with or without modification,
+-# are permitted provided that the following conditions are met:
+-#
+-#   * Redistributions of source code must retain the above copyright notice,
+-#     this list of conditions and the following disclaimer.
+-#
+-#   * Redistributions in binary form must reproduce the above copyright notice,
+-#     this list of conditions and the following disclaimer in the documentation
+-#     and/or other materials provided with the distribution.
+-#
+-#   * Neither the name of the copyright holders nor the names of its contributors
+-#     may be used to endorse or promote products derived from this software without
+-#     specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+-# SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+-# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-set(SSE2_SUPPORT_FOUND FALSE)
+-
+-macro(CHECK_FOR_SSE2)
+-    include(CheckCXXSourceRuns)
+-
+-    check_cxx_source_runs("
+-        #include <emmintrin.h>
+-        int main ()
+-        {
+-            __m128d a, b;
+-            double vals[2] = {0};
+-            a = _mm_loadu_pd (vals);
+-            b = _mm_add_pd (a,a);
+-            _mm_storeu_pd (vals,b);
+-            return(0);
+-        }"
+-        HAVE_SSE2_EXTENSIONS)
+-
+-    if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+-        if (HAVE_SSE2_EXTENSIONS)
+-            set(SSE2_SUPPORT_FOUND TRUE)
+-        endif ()
+-    elseif (MSVC AND NOT CMAKE_CL_64)
+-        if (HAVE_SSE2_EXTENSIONS)
+-            set(SSE2_SUPPORT_FOUND TRUE)
+-            message(STATUS "Found SSE2 extensions.")
+-        endif (HAVE_SSE2_EXTENSIONS)
+-    endif ()
+-
+-endmacro(CHECK_FOR_SSE2)
+-
+-CHECK_FOR_SSE2()
+-- 
+2.21.0
+
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index ec669e2e23..f6197b98ee 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -98,18 +98,14 @@ listing the files modified by a patch.")
 (define-public quilt
   (package
     (name "quilt")
-    (version "0.65")
+    (version "0.66")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "mirror://savannah/quilt/"
-                          name "-" version ".tar.gz"))
-      (sha256
-       (base32
-        "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"))
-      (patches (search-patches "quilt-test-fix-regex.patch"
-                               "quilt-getopt-second-separator.patch"
-                               "quilt-getopt-nondigit-param.patch"))))
+       (method url-fetch)
+       (uri (string-append "mirror://savannah/quilt/"
+                           "quilt-" version ".tar.gz"))
+       (sha256
+        (base32 "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gettext" ,gnu-gettext)))
@@ -248,7 +244,7 @@ GiB).")
 (define-public meld
   (package
     (name "meld")
-    (version "3.20.0")
+    (version "3.20.1")
     (source
      (origin
        (method url-fetch)
@@ -256,8 +252,7 @@ GiB).")
                            (version-major+minor version)
                            "/meld-" version ".tar.xz"))
        (sha256
-        (base32
-         "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b"))))
+        (base32 "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"))))
     (build-system python-build-system)
     (native-inputs
      `(("intltool" ,intltool)
diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index a25c43cc32..47e25083cd 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -142,6 +142,30 @@ framework base class.  It concentrates on offering reusable data driven
 patterns, so that you can write tests with a minimum of code.")
     (license perl-license)))
 
+(define-public perl-test-checkdeps
+  (package
+    (name "perl-test-checkdeps")
+    (version "0.010")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-cpan-meta-check" ,perl-cpan-meta-check)))
+    (home-page "https://metacpan.org/release/Test-CheckDeps")
+    (synopsis "Check for presence of dependencies")
+    (description
+     "This module provides a test that checks all dependencies have been
+installed properly.")
+    (license perl-license)))
+
 (define-public perl-test-class
   (package
     (name "perl-test-class")
@@ -361,6 +385,30 @@ functions.")
     ;; license, any version, ..."
     (license gpl3+)))
 
+(define-public perl-test-dir
+  (package
+    (name "perl-test-dir")
+    (version "1.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/M/MT/MTHURN/"
+                           "Test-Dir-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1hpafgr93jjl6s8spskhdxhgich4cccmaiq99mla5diyj4iv6ckk"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-pod-coverage" ,perl-pod-coverage)
+       ("perl-test-pod" ,perl-test-pod)
+       ("perl-test-pod-coverage" ,perl-test-pod-coverage)))
+    (home-page "https://metacpan.org/release/Test-Dir")
+    (synopsis "Utilities for testing directory attributes")
+    (description
+     "This modules provides a collection of test utilities for directory
+attributes.")
+    (license perl-license)))
+
 (define-public perl-test-directory
   (package
     (name "perl-test-directory")
@@ -500,6 +548,58 @@ Test::Exception.  It does much less, but should allow greater flexibility in
 testing exception-throwing code with about the same amount of typing.")
     (license perl-license)))
 
+(define-public perl-test-file
+  (package
+    (name "perl-test-file")
+    (version "1.443")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1mdwb3x8d4l24wsymamsnq2c73a637v4q5kmb5xqqz31iymsdd31"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-test-utf8" ,perl-test-utf8)))
+    (home-page "https://metacpan.org/release/Test-File")
+    (synopsis "Utilities for testing file attributes")
+    (description
+     "@code{Test::File} provides a collection of test utilities for file
+attributes.")
+    (license perl-license)))
+
+(define-public perl-test-file-contents
+  (package
+    (name "perl-test-file-contents")
+    (version "0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0g8zgfyw84181snw7ghahnl9r4lrmlfj7zwi76sv8d0bj7xssvyd"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
+    (propagated-inputs
+     `(("perl-test-pod" ,perl-test-pod)
+       ("perl-test-pod-coverage" ,perl-test-pod-coverage)
+       ("perl-text-diff" ,perl-text-diff)))
+    (home-page "https://metacpan.org/release/Test-File-Contents")
+    (synopsis "Test routines for examining the contents of files")
+    (description
+     "@{Test::File::Contents} provides functions for testing the contents of
+files.")
+    (license perl-license)))
+
 (define-public perl-test-file-sharedir-dist
   (package
     (name "perl-test-file-sharedir-dist")
@@ -1275,6 +1375,32 @@ check if a string is valid and not corrupt, whereas the characteristics tests
 will check that string has a given set of characteristics.")
     (license perl-license)))
 
+(define-public perl-test-version
+  (package
+    (name "perl-test-version")
+    (version "2.09")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1q1qradaf7r2rb3jhpv01wl8z3bxymkfqrl9gwdhxwx5jwldvqcw"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-test-exception" ,perl-test-exception)))
+    (propagated-inputs
+     `(("perl-file-find-rule-perl" ,perl-file-find-rule-perl)))
+    (home-page "https://metacpan.org/release/Test-Version")
+    (synopsis "Check versions in modules")
+    (description
+     "@code{Test::Version} checks to ensure that all modules have a version
+defined, and that the version is valid.")
+    (license artistic2.0)))
+
 (define-public perl-test-warn
   (package
     (name "perl-test-warn")
diff --git a/gnu/packages/perl-web.scm b/gnu/packages/perl-web.scm
index 6ced2d160e..77a66f71d0 100644
--- a/gnu/packages/perl-web.scm
+++ b/gnu/packages/perl-web.scm
@@ -21,9 +21,11 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (guix packages)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (guix download)
-  #:use-module (guix build-system perl))
+  #:use-module (guix build-system perl)
+  #:use-module (gnu packages web))
 
 (define-public perl-mojolicious
   (package
@@ -48,6 +50,33 @@ used are outdated now, the idea behind it is not.  Mojolicious is a new
 endeavor to implement this idea using modern technologies.")
     (license license:artistic2.0)))
 
+(define-public perl-uri-db
+  (package
+    (name "perl-uri-db")
+    (version "0.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0n56xxlw7c39pfar0dxckr9mbmp6yrzk53ic0cb24raiykm9v6f4"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
+    (propagated-inputs
+     `(("perl-uri" ,perl-uri)
+       ("perl-uri-nested" ,perl-uri-nested)))
+    (home-page "https://metacpan.org/release/URI-db")
+    (synopsis "Handle database URIs")
+    (description
+     "This module defines a format for database URIs, and provides a @{URI}
+class to handle these.")
+    (license license:perl-license)))
+
 (define-public perl-uri-escape
   (package
     (name "perl-uri-escape")
@@ -70,3 +99,29 @@ percent-decode URI strings as defined by RFC 3986.  Percent-encoding URI's is
 informally called URI escaping.  This is the terminology used by this module,
 which predates the formalization of the terms by the RFC by several years.")
     (license license:perl-license)))
+
+(define-public perl-uri-nested
+  (package
+    (name "perl-uri-nested")
+    (version "0.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1bzg6f11m8wfnmycflvp858rs99xknsx8hkip0xcdfjzlqwi75z1"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
+    (propagated-inputs
+     `(("perl-uri" ,perl-uri)))
+    (home-page "https://metacpan.org/release/URI-Nested")
+    (synopsis "Nested URIs")
+    (description
+     "@code{URI::Nested} provides support for nested URIs, where the scheme is
+a prefix, and the remainder of the URI is another URI.")
+    (license license:perl-license)))
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index ff387354e7..86d07c3ccc 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages less)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages perl-compression)
   #:use-module (gnu packages perl-web)
@@ -1435,6 +1436,33 @@ some enhancements such as here-documents, C-style comments, and multiline
 options.")
     (license (package-license perl))))
 
+(define-public perl-config-gitlike
+  (package
+    (name "perl-config-gitlike")
+    (version "1.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0kp57na9mk6yni693h2fwap6l1ndbcj97l4860r9vkzx2jw0fjk7"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-test-exception" ,perl-test-exception)))
+    (propagated-inputs
+     `(("perl-moo" ,perl-moo)
+       ("perl-moox-types-mooselike" ,perl-moox-types-mooselike)))
+    (home-page "https://metacpan.org/release/Config-GitLike")
+    (synopsis "Parse Git style configuration files")
+    (description
+     "This module handles parsing, modifying and creating configuration files
+of the style used by the Git version control system.")
+    (license perl-license)))
+
 (define-public perl-config-ini
   (package
     (name "perl-config-ini")
@@ -1530,6 +1558,28 @@ data.")
 @file{Changes} files that conform to a common specification.")
     (license perl-license)))
 
+(define-public perl-cpan-distnameinfo
+  (package
+    (name "perl-cpan-distnameinfo")
+    (version "0.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/CPAN-DistnameInfo")
+    (synopsis "Extract the name and version from a distribution filename")
+    (description
+     "@code{CPAN::DistnameInfo} uses heuristics to extract the distribution
+name and version from filenames.")
+    (license perl-license)))
+
 (define-public perl-cpan-meta-check
   (package
     (name "perl-cpan-meta-check")
@@ -2738,6 +2788,26 @@ equivalent of \"$@{^GLOBAL_PHASE@} eq 'DESTRUCT'\" for older perls.")
 files/modules are installed or not).")
     (license (package-license perl))))
 
+(define-public perl-devel-leak
+  (package
+    (name "perl-devel-leak")
+    (version "0.03")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/N/NI/NI-S/"
+                           "Devel-Leak-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0lkj2xwc3lhxv7scl43r8kfmls4am0b98sqf5vmf7d72257w6hkg"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Devel-Leak")
+    (synopsis "Utility for looking for perl objects that are not reclaimed")
+    (description
+     "This module provides a basic way to discover if a piece of perl code is
+allocating perl data and not releasing them again.")
+    (license perl-license)))
+
 (define-public perl-devel-lexalias
   (package
     (name "perl-devel-lexalias")
@@ -3803,6 +3873,31 @@ functionality; it returns a list of file names that match the given pattern.
 For instance, it supports the @code{**/*.pm} form.")
     (license (package-license perl))))
 
+(define-public perl-filesys-notify-simple
+  (package
+    (name "perl-filesys-notify-simple")
+    (version "0.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/"
+                           "Filesys-Notify-Simple-" version ".tar.gz"))
+       (sha256
+        (base32
+         "18jv96k1pf8wqf4vn2ahs7dv44lc9cyqj0bja9z17qici3dx7qxd"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-test-sharedfork" ,perl-test-sharedfork)))
+    (home-page "https://metacpan.org/release/Filesys-Notify-Simple")
+    (synopsis "Simple and dumb file system watcher")
+    (description
+     "Filesys::Notify::Simple is a simple but unified interface to get
+notifications of changes to a given filesystem path.  It utilizes inotify2 on
+Linux, fsevents on OS X, kqueue on FreeBSD and FindFirstChangeNotification on
+Windows if they're installed, with a fallback to the full directory scan if
+they're not available.")
+    (license perl-license)))
+
 (define-public perl-getopt-long
   (package
     (name "perl-getopt-long")
@@ -4212,6 +4307,41 @@ easier to develop interactive applications: is_interactive(), interactive(),
 and busy().")
     (license (package-license perl))))
 
+(define-public perl-io-pager
+  (package
+    (name "perl-io-pager")
+    (version "0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-"
+             version
+             "0.tgz"))
+       (sha256
+        (base32
+         "1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"))))
+    (build-system perl-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-less
+           (lambda _
+             (substitute* "lib/IO/Pager.pm"
+               (("/usr/local/bin/less', '/usr/bin/less")
+                (which "less")))
+             #t)))))
+    (propagated-inputs
+     `(("perl-file-which" ,perl-file-which)))
+    (inputs
+     `(("less" ,less)))
+    (home-page "https://metacpan.org/release/IO-Pager")
+    (synopsis "Select a pager and pipe text to it")
+    (description
+     "@code{IO::Pager} can be used to locate an available pager and use it to
+display output if a TTY is in use.")
+    (license (package-license perl))))
+
 (define-public perl-io-string
   (package
     (name "perl-io-string")
@@ -7539,6 +7669,32 @@ expanding standard C/Unix-style backslash escapes like \n and \t, wrapping and
 removing double-quotes, and truncating to fit within a desired length.")
     (license (package-license perl))))
 
+(define-public perl-string-formatter
+  (package
+    (name "perl-string-formatter")
+    (version "0.102084")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-params-util" ,perl-params-util)
+       ("perl-sub-exporter" ,perl-sub-exporter)))
+    (home-page "https://metacpan.org/release/String-Formatter")
+    (synopsis "Build your own sprintf-like functions")
+    (description
+     "@code{String::Formatter} is a tool for building sprintf-like formatting
+routines.  It supports named or positional formatting, custom conversions,
+fixed string interpolation, and simple width-matching.")
+    (license gpl2)))
+
 (define-public perl-string-rewriteprefix
   (package
     (name "perl-string-rewriteprefix")
@@ -7560,6 +7716,28 @@ removing double-quotes, and truncating to fit within a desired length.")
 known prefixes.")
     (license (package-license perl))))
 
+(define-public perl-string-shellquote
+  (package
+    (name "perl-string-shellquote")
+    (version "1.04")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/String-ShellQuote")
+    (synopsis "Quote strings for passing through a shell")
+    (description
+     "@code{shell-quote} lets you pass arbitrary strings through the shell so
+that they won't be changed.")
+    (license (package-license perl))))
+
 (define-public perl-string-print
   (package
     (name "perl-string-print")
@@ -7893,6 +8071,28 @@ determining their type and clock speed.")
 of a system.")
     (license (package-license perl))))
 
+(define-public perl-sys-syscall
+  (package
+    (name "perl-sys-syscall")
+    (version "0.25")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/B/BR/BRADFITZ/"
+                           "Sys-Syscall-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1r8k4q04dhs191zgdfgiagvbra770hx0bm6x24jsykxn0c6ghi8y"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Sys-Syscall")
+    (synopsis
+     "Access system calls that Perl doesn't normally provide access to")
+    (description
+     "Sys::Syscall allows one to use epoll and sendfile system calls from
+Perl.  Support is mostly Linux-only for now, but other syscalls/OSes are
+planned for the future.")
+    (license perl-license)))
+
 (define-public perl-task-weaken
   (package
     (name "perl-task-weaken")
@@ -7932,7 +8132,7 @@ error encouraging the user to seek support.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/A/AB/ABW/"
+       (uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/"
                            "Template-Toolkit-" version ".tar.gz"))
        (sha256
         (base32
@@ -7971,6 +8171,32 @@ documents: HTML, XML, POD, PostScript, LaTeX, and so on.")
 processing in Perl code.")
     (license (list gpl3 artistic2.0))))
 
+(define-public perl-template-tiny
+  (package
+    (name "perl-template-tiny")
+    (version "1.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0jhadxbc8rzbk2v8qvjrbhnvfp0m56iqar6d4nvxyl8bccn0cgh7"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Template-Tiny")
+    (synopsis "Template Toolkit reimplemented in as little code as possible")
+    (description
+     "@code{Template::Tiny} is a reimplementation of a subset of the
+functionality from Template Toolkit in as few lines of code as possible.
+
+It is intended for use in light-usage, low-memory, or low-cpu templating
+situations, where you may need to upgrade to the full feature set in the
+future, or if you want the retain the familiarity of TT-style templates.")
+    (license perl-license)))
+
 (define-public perl-term-encoding
   (package
     (name "perl-term-encoding")
@@ -8538,6 +8764,28 @@ can also be set to any arbitrary supplied order.  The familiar perl array
 operations can also be performed on the IxHash.")
   (license (package-license perl))))
 
+(define-public perl-tie-handle-offset
+  (package
+    (name "perl-tie-handle-offset")
+    (version "0.004")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "17m8s8314wi4g0wasdxk15rf12vzsgzmcbr598jam5f6bl2kk7zf"))))
+    (build-system perl-build-system)
+    (home-page "https://metacpan.org/release/Tie-Handle-Offset")
+    (synopsis "Special file handle that hides the beginning of a file")
+    (description
+     "This modules provides a file handle that hides the beginning of a file,
+by modifying the @code{seek()} and @code{tell()} calls.")
+    (license asl2.0)))
+
 (define-public perl-tie-toobject
   (package
     (name "perl-tie-toobject")
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 69ec69548b..e62d13fe91 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -360,7 +360,7 @@ photographic equipment.")
 (define-public darktable
   (package
     (name "darktable")
-    (version "2.6.1")
+    (version "2.6.2")
     (source
      (origin
        (method url-fetch)
@@ -368,7 +368,7 @@ photographic equipment.")
              "https://github.com/darktable-org/darktable/releases/"
              "download/release-" version "/darktable-" version ".tar.xz"))
        (sha256
-        (base32 "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3"))))
+        (base32 "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; there are no tests
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 35e632cf8c..b4ea20e387 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -93,7 +93,16 @@ scientific data.")
                                   "guile-charting-" version ".tar.gz"))
               (sha256
                (base32
-                "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))))
+                "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; By default, .go files would be installed to
+                  ;; $libdir/…/ccache instead of $libdir/…/site-ccache.  Fix
+                  ;; that.
+                  (substitute* (find-files "." "^Makefile\\.in$")
+                    (("/ccache") "/site-ccache"))
+                  #t))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("guile" ,guile-2.2)))
diff --git a/gnu/packages/poedit.scm b/gnu/packages/poedit.scm
new file mode 100644
index 0000000000..0b21a9eea7
--- /dev/null
+++ b/gnu/packages/poedit.scm
@@ -0,0 +1,80 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
+;;;
+;;; 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 poedit)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages enchant)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages rdf)
+  #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xml))
+
+(define-public poedit
+  (package
+    (name "poedit")
+    (version "2.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/vslavik/poedit")
+                     (commit (string-append "v" version "-oss"))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1fxzmry4b23l90j03jdyvd4jprdpy4xcnhw7xrmmfnlbh2abf9x7"))
+             (modules '((guix build utils)))
+             (snippet
+              '(begin
+                 (delete-file-recursively "deps")
+                 #t))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-boost-libdir="
+                            (assoc-ref %build-inputs "boost")
+                            "/lib"))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext-minimal" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("boost" ,boost)
+       ("enchant" ,enchant)
+       ("gtk+" ,gtk+)
+       ("gtkspell3" ,gtkspell3)
+       ("icu4c" ,icu4c)
+       ("lucene++" ,lucene++)
+       ("pugixml" ,pugixml)
+       ("wxwidgets" ,wxwidgets)))
+    (home-page "https://poedit.net/")
+    (synopsis "Gettext catalog editing tool")
+    (description "Poedit is a GUI frontend to the GNU gettext utilities and
+a catalog editor/source code parser.  It helps with translating applications
+into other languages.")
+    (license license:expat)))
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 346d3660d5..405ad08ba4 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -241,14 +241,14 @@ seen in a terminal.")
 (define-public highlight
   (package
     (name "highlight")
-    (version "3.49")
+    (version "3.50")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "http://www.andre-simon.de/zip/highlight-"
                            version ".tar.bz2"))
        (sha256
-        (base32 "1zlhmlq5fnsxxmm04qfchhl4w2iw5fa6sn81c34q6k2m1m77g6aj"))))
+        (base32 "0frcq12zy3dqfhwwzylm10ydp7zp51w9jlijm23zvx09daslg1bl"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0379095dab..5484c325ec 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3349,24 +3349,16 @@ color scales, and color space conversion easy.  It has support for:
 (define-public python-pygit2
   (package
     (name "python-pygit2")
-    (version "0.27.4")
+    (version "0.28.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pygit2" version))
        (sha256
-        (base32
-         "15c1mhwwjc7nr8hn5gm21hcfhw61jmwb0vngpjhlm3y5565wg2pz"))))
+        (base32 "0lngsaz029d4fjcwhl17pr59nh9gwl6hwfin36nph60fgsmfdg3d"))))
     (build-system python-build-system)
     (arguments
-     '(#:tests? #f; tests don't run correctly in our environment
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-dependency-versioning
-           (lambda _
-             (substitute* "setup.py"
-               (("<") "<="))
-             #t)))))
+     '(#:tests? #f))            ; tests don't run correctly in our environment
     (propagated-inputs
      `(("python-six" ,python-six)
        ("python-cffi" ,python-cffi)
@@ -4453,13 +4445,13 @@ memoizing PEG/Packrat parser in Python.")
     (version "0.13.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/pygridtools/gridmap/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pygridtools/gridmap.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1gzjg2k6f14i1msm2b0ax8d9ds1hvk6qd5nlaivg8m4cxqp4cp1x"))))
+        (base32 "1478lbwsr1w24cii2x01m2910fvh8r43ghnb78nc972a96hqiknm"))))
     (build-system python-build-system)
     (arguments
      '(#:tests? #f)) ; FIXME: Requires python-cherrypy.
@@ -4484,13 +4476,13 @@ cluster without needing to write any wrapper code yourself.")
     (version "1.0.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/nickstenning/honcho/archive/v"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/nickstenning/honcho.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0zizn61n5z5hq421hkypk9pw8s6fpxw30f4hsg7k4ivwzy3gjw9j"))))
+        (base32 "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)
@@ -6747,14 +6739,15 @@ Python Package Index (PyPI).")
     (name "python-tlsh")
     (version "3.4.5")
     (home-page "https://github.com/trendmicro/tlsh")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/trendmicro/tlsh/archive/v"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1x1vahd4zg5kpyr9h9hs3fvh460p25rjy4cclwdnbbw8x3vc30q3"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/trendmicro/tlsh.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"))))
     (build-system cmake-build-system)
     (arguments
      '(#:out-of-source? #f
@@ -10235,20 +10228,21 @@ discovery, monitoring and configuration.")
     (name "python-schematics")
     (version "1.1.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "https://github.com/schematics/schematics/archive/v" version ".tar.gz"))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "19v1i69bf3bzarfxmbv0v6ivpcn758x3shvbiy9l2hy0lvqwnp6l"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/schematics/schematics.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xdqskycznqc7mfp60bhw1zq8wx7yx1dvmbq3brnm1dx3xnqa0zd"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-six" ,python-six)))
     (arguments
-     `(#:tests? #f)) ; requires a bunch of not very nice packages with fixed
-                     ; version requirements (eg python-coveralls)
+     ;; The tests require a bunch of not very nice packages with fixed
+     ;; version requirements (e.g. python-coveralls).
+     `(#:tests? #f))
     (home-page "https://github.com/schematics/schematics")
     (synopsis "Python Data Structures for Humans")
     (description "Python Data Structures for Humans.")
@@ -12585,13 +12579,13 @@ Swagger 2.0).")
     (version "0.6.3")
     (source
       (origin
-        (method url-fetch)
-        (uri (string-append "https://github.com/rochacbruno/flasgger/archive/"
-                            version ".tar.gz"))
-        (file-name (string-append name "-" version ".tar.gz"))
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/rochacbruno/flasgger.git")
+              (commit version)))
+        (file-name (git-file-name name version))
         (sha256
-          (base32
-            "1gqzlm0rb55fdpsy5ipkganlx9cnpi454fqyycr03jm22zql14ay"))))
+          (base32 "0yydxsyjnc0clbrjqb1n7587l6cdqvwdagwxk5hkx01qwdfbkvpn"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -13097,13 +13091,13 @@ executed more than a given number of times during a given period.")
     (version "0.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/kovidgoyal/dukpy/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kovidgoyal/dukpy.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0pj39rfwlzivqm5hkrsza7gssg6ggpxlq5ivc8f3h7x5pfgc6y6c"))))
+        (base32 "13h21nqzasv4zj32xs61brmc106pr2cx243672crcmwxxnjgaxls"))))
     (build-system python-build-system)
     (home-page "https://github.com/kovidgoyal/dukpy")
     (synopsis "Run JavaScript in python")
@@ -14170,16 +14164,15 @@ manager compatible with @code{asyncio}.")
   (package
     (name "python-glob2")
     (version "0.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/miracle2k/python-glob2/archive/"
-                    version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "0ja168f0dz4kbz4m06dm0rd3acaypk6hjx2km541pw22y9s40mag"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/miracle2k/python-glob2.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1lm1xz3k3l0k1c5bcp9hlzmi3gp5j8dl1k3xhpiq5mnm0xq6n163"))))
     (build-system python-build-system)
     (home-page "https://github.com/miracle2k/python-glob2/")
     (synopsis "Extended Version of the python buildin glob module")
@@ -14863,14 +14856,14 @@ append on old values.  Partd excels at shuffling operations.")
 (define-public python-dask
   (package
     (name "python-dask")
-    (version "1.1.4")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "dask" version))
        (sha256
         (base32
-         "1hrnfz4pzawikz9b622vjz2500n7hs25nz9msy1k8l4g7l2kr6ky"))))
+         "1y0dqcp72ixwblgway0jpvfirlxfcmwrjiivdq96firj1hw127sd"))))
     (build-system python-build-system)
     ;; A single test out of 5000+ fails.  This test is marked as xfail when
     ;; pytest-xdist is used.
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 4a3efd8d3f..3e2db7acdf 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,7 +21,7 @@
 
 (define-module (gnu packages rdf)
   #:use-module ((guix licenses)
-                #:select (non-copyleft isc gpl2 lgpl2.1 lgpl2.1+))
+                #:select (non-copyleft asl2.0 isc gpl2 lgpl2.1 lgpl2.1+ lgpl3+))
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix download)
@@ -119,6 +120,37 @@ full-featured indexing and searching API.  It is a port of the very popular
 Java Lucene text search engine API to C++.")
     (license lgpl2.1)))
 
+(define-public lucene++
+  (package
+    (name "lucene++")
+    (version "3.0.7")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/luceneplusplus/LucenePlusPlus")
+                     (commit (string-append "rel_" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "06b37fly6l27zc6kbm93f6khfsv61w792j8xihfagpcm9cfz2zi1"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags
+       ;; CXX_FLAGS suggested in a closed issue on github:
+       ;; https://github.com/luceneplusplus/LucenePlusPlus/issues/100
+       (list "-Wno-dev" "-DCMAKE_CXX_FLAGS=-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT"
+             ;; Install in lib64 break rpath
+             "-DCMAKE_INSTALL_LIBDIR:PATH=lib")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("boost" ,boost)))
+    (home-page "https://github.com/luceneplusplus/LucenePlusPlus")
+    (synopsis "Text search engine")
+    (description "Lucene++ is an up to date C++ port of the popular Java
+Lucene library, a high-performance, full-featured text search engine.")
+    (license (list asl2.0 lgpl3+)))); either asl or lgpl.
+
 (define-public lrdf
   (package
     (name "lrdf")
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 9a899b6bb4..8bde577229 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -2986,12 +2986,13 @@ with processes on remote servers, via SSH2.")
     (version "1.2.2.rc2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/net-ssh/net-scp/archive/v"
-                           version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/net-ssh/net-scp.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0xyf17mhgvyz54xjj9ria4wnq3x62bhmkfgzqv8jwiip2bplv1nk"))))
+        (base32 "1nyn17sy71fn7zs3y6wbgcn35318c10flqgc0582409095x4h0sx"))))
     (build-system ruby-build-system)
     (native-inputs
      `(("bundler" ,bundler)
@@ -7679,14 +7680,15 @@ strings or files.")
   (package
     (name "ruby-sass-spec")
     (version "3.5.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/sass/sass-spec/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0nx8lp7c9qa58w489crgqa3c489xsyarn1a8h4np9mwwfqm1h3rr"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sass/sass-spec.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zsw66830w0xlc7kxz6fm4b5nyb44vdsdgm9mgy06s5aixx83pwr"))))
     (build-system ruby-build-system)
     (propagated-inputs
      `(("ruby-command-line-reporter-3" ,ruby-command-line-reporter-3)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 7b76858a9f..61fc0d46ac 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -726,6 +726,16 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
           `(modify-phases ,phases
              ;; binaryen was replaced with LLD project from LLVM
              (delete 'dont-build-native)
+             (replace 'check
+               (lambda* _
+                 ;; Enable parallel execution.
+                 (let ((parallel-job-spec
+                        (string-append "-j" (number->string
+                                             (min 4
+                                                  (parallel-job-count))))))
+                   (invoke "./x.py" parallel-job-spec "test" "-vv")
+                   (invoke "./x.py" parallel-job-spec "test"
+                           "src/tools/cargo"))))
              (replace 'remove-unsupported-tests
                (lambda* _
                  ;; Our ld-wrapper cannot process non-UTF8 bytes in LIBRARY_PATH.
@@ -930,7 +940,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
                    (("```rust") "```rust,no_run"))
                  #t)))))))))
 
-(define-public rust
+(define-public rust-1.32
   (let ((base-rust
          (rust-bootstrapped-package rust-1.31 "1.32.0"
           "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"
@@ -982,3 +992,44 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
              ;; Remove no longer relevant steps
              (delete 'remove-flaky-test)
              (delete 'patch-aarch64-test))))))))
+
+(define-public rust-1.33
+  (let ((base-rust
+         (rust-bootstrapped-package rust-1.32 "1.33.0"
+                                    "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"
+                                    #:patches '())))
+    (package
+      (inherit base-rust)
+      (inputs
+       ;; Upgrade to jemalloc@5.1.0
+       (alist-replace "jemalloc" (list jemalloc)
+                      (package-inputs base-rust)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base-rust)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (delete 'ignore-cargo-package-tests)
+             (add-after 'configure 'configure-test-threads
+               ;; Several rustc and cargo tests will fail if run on one core
+               ;; https://github.com/rust-lang/rust/issues/59122
+               ;; https://github.com/rust-lang/cargo/issues/6746
+               ;; https://github.com/rust-lang/rust/issues/58907
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (setenv "RUST_TEST_THREADS" "2")
+                 #t)))))))))
+
+(define-public rust
+  (let ((base-rust
+         (rust-bootstrapped-package rust-1.33 "1.34.0"
+                                    "0n8z1wngkxab1rvixqg6w8b727hzpnm9wp9h8iy3mpbrzp7mmj3s"
+                                    #:patches '())))
+    (package
+      (inherit base-rust)
+      (source
+        (origin
+          (inherit (package-source base-rust))
+          (snippet '(begin
+                      (delete-file-recursively "src/llvm-emscripten")
+                      (delete-file-recursively "src/llvm-project")
+                      (delete-file-recursively "vendor/jemalloc-sys/jemalloc")
+                      #t)))))))
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 3d64eaf11a..8a117799ef 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
 ;;;
@@ -56,14 +56,14 @@
 (define-public cifs-utils
   (package
     (name "cifs-utils")
-    (version "6.8")
+    (version "6.9")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.samba.org/pub/linux-cifs/"
-                           name "/" name "-" version ".tar.bz2"))
+                           "cifs-utils/cifs-utils-" version ".tar.bz2"))
        (sha256 (base32
-                "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"))))
+                "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
@@ -80,7 +80,8 @@
      `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'set-root-sbin
-           (lambda _ ; Don't try to install in "/sbin".
+           (lambda _
+             ;; Don't try to install into "/sbin".
              (setenv "ROOTSBINDIR"
                      (string-append (assoc-ref %outputs "out") "/sbin"))
              #t)))))
@@ -152,14 +153,14 @@ anywhere.")
 (define-public samba
   (package
     (name "samba")
-    (version "4.10.1")
+    (version "4.10.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.samba.org/pub/samba/stable/"
                                  "samba-" version ".tar.gz"))
              (sha256
               (base32
-               "0kf5v65xgz7z18ggj1k46yy5g5dy76k7ni04s79kalzqqs25scd7"))))
+               "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index a127d5ca34..fe51900179 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -23,11 +23,12 @@
 
 (define-module (gnu packages search)
   #:use-module ((guix licenses)
-                #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 x11))
+                #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ bsd-3 x11 perl-license))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
@@ -110,6 +111,31 @@ rich set of boolean query operators.")
     (synopsis "Python bindings for the Xapian search engine library")
     (license gpl2+)))
 
+(define-public perl-search-xapian
+  (package
+    (name "perl-search-xapian")
+    (version "1.2.25.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/O/OL/OLLY/"
+                           "Search-Xapian-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-devel-leak" ,perl-devel-leak)))
+    (inputs
+     `(("xapian" ,xapian)))
+    (home-page "https://metacpan.org/release/Search-Xapian")
+    (synopsis "Perl XS frontend to the Xapian C++ search library")
+    (description
+     "Search::Xapian wraps most methods of most Xapian classes.  The missing
+classes and methods should be added in the future.  It also provides a
+simplified, more 'perlish' interface to some common operations.")
+    (license perl-license)))
+
 (define-public libtocc
   (package
     (name "libtocc")
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 29d691dd31..c88a1c6b2a 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -312,7 +312,7 @@ and other operations.  It includes a library and a command-line tool.")
 (define-public yubikey-personalization
   (package
     (name "yubikey-personalization")
-    (version "1.19.0")
+    (version "1.19.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -320,7 +320,7 @@ and other operations.  It includes a library and a command-line tool.")
                     "/Releases/ykpers-" version ".tar.gz"))
               (sha256
                (base32
-                "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"))))
+                "0jhvnavjrpwzmmjcw486df5s48j53njqgyz36yz3dskbaz3kwlfr"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags (list (string-append "--with-udevrulesdir="
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index e9e9042bd1..52e4f4f7f6 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -117,7 +117,7 @@ which allows users to view a desktop computing environment.")
 (define-public spice-gtk
   (package
     (name "spice-gtk")
-    (version "0.35")
+    (version "0.36")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -125,7 +125,7 @@ which allows users to view a desktop computing environment.")
                 "spice-gtk-" version ".tar.bz2"))
               (sha256
                (base32
-                "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"))))
+                "1kfpixfdmxs9wn3id48gc9bvfrgxz935y3wpykf40bgi9mcc69ki"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("gstreamer" ,gstreamer)
@@ -134,20 +134,23 @@ which allows users to view a desktop computing environment.")
         ("gst-plugins-good" ,gst-plugins-good)
         ("gst-plugins-bad" ,gst-plugins-bad)
         ("gst-plugins-ugly" ,gst-plugins-ugly)
-        ("spice-protocol" ,spice-protocol)))
+        ("spice-protocol" ,spice-protocol)
+
+        ;; These are required by the pkg-config files.
+        ("gtk+" ,gtk+)
+        ("pixman" ,pixman)
+        ("openssl" ,openssl)))
     (inputs
       `(("glib-networking" ,glib-networking)
         ("gobject-introspection" ,gobject-introspection)
-        ("gtk+" ,gtk+)
+        ("json-glib" ,json-glib)
         ("libepoxy" ,libepoxy)
         ("libjpeg" ,libjpeg)
         ("libxcb" ,libxcb)
         ("lz4" ,lz4)
         ("mesa" ,mesa)
-        ("pixman" ,pixman)
         ("pulseaudio" ,pulseaudio)
         ("python" ,python)
-        ("openssl" ,openssl)
         ("opus" ,opus)
         ("usbredir" ,usbredir)))
     (native-inputs
@@ -162,6 +165,13 @@ which allows users to view a desktop computing environment.")
           "--enable-introspection")
         #:phases
          (modify-phases %standard-phases
+           (add-before 'check 'disable-session-test
+             (lambda _
+               ;; XXX: Disable session tests, because they require USB support,
+               ;; which is not available in the build container.
+               (substitute* "tests/Makefile"
+                 (("test-session\\$\\(EXEEXT\\) ") ""))
+               #t))
            (add-after
             'install 'wrap-spicy
             (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -291,7 +301,6 @@ resolution scaling on graphical console window resize.")
       `(("gtk+" ,gtk+)
         ("libcap" ,libcap)
         ("libxml2" ,libxml2)
-        ("openssl" ,openssl)
         ("spice-gtk" ,spice-gtk)))
     (native-inputs
       `(("glib:bin" ,glib "bin")
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1c834c3166..26e5f62666 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -570,14 +570,14 @@ and operations on them using LAPACK and SuiteSparse.")
 (define-public r-nlme
   (package
     (name "r-nlme")
-    (version "3.1-137")
+    (version "3.1-139")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "nlme" version))
        (sha256
         (base32
-         "11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"))))
+         "0fap121c18nbznyzvnqvsdiszg2nbmkas6zhgrz1f8jiv1lzqq04"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-lattice" ,r-lattice)))
@@ -636,14 +636,14 @@ single hidden layer, and for multinomial log-linear models.")
 (define-public r-rpart
   (package
     (name "r-rpart")
-    (version "4.1-13")
+    (version "4.1-15")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rpart" version))
        (sha256
         (base32
-         "0k29qx3k3pj5sgrpg0p47yd8i811rmdakaw57bigpq1449asc4cf"))))
+         "0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/rpart")
     (synopsis "Recursive partitioning and regression trees")
@@ -1120,13 +1120,13 @@ legends.")
 (define-public r-ggplot2
   (package
     (name "r-ggplot2")
-    (version "3.1.0")
+    (version "3.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggplot2" version))
        (sha256
-        (base32 "1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9"))))
+        (base32 "0y8cks9r9hvjlx0isnvbgs3p0al167hlr3q7c3syfcj77dzjkpmz"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-digest" ,r-digest)
@@ -1635,13 +1635,13 @@ defined in different packages.")
 (define-public r-rlang
   (package
     (name "r-rlang")
-    (version "0.3.3")
+    (version "0.3.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "rlang" version))
               (sha256
                (base32
-                "1pdlafnijpd2vzy8jxcxwakfi66n4qzrqxvcxi1ja389m066cvbb"))))
+                "1pks7d2xavzgaxqrnk3f79qsmv4wqv93f8991jv93pnb1mxpyijf"))))
     (build-system r-build-system)
     (home-page "http://rlang.tidyverse.org")
     (synopsis "Functions for base types, core R and Tidyverse features")
@@ -1827,13 +1827,13 @@ times.")
 (define-public r-data-table
   (package
     (name "r-data-table")
-    (version "1.12.0")
+    (version "1.12.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "data.table" version))
               (sha256
                (base32
-                "1xz388khklqqc39r1cmjvqm65azambgzqw0743aypm6v4chi26v1"))))
+                "1x929lwhai6nkppm4zvicyw5qh5va5sizp86r30qnfkh1n7w2mfv"))))
     (build-system r-build-system)
     (home-page "https://github.com/Rdatatable/data.table/wiki")
     (synopsis "Enhanced version of data.frame R object")
@@ -2056,13 +2056,13 @@ jackknifed confidence intervals are available for most estimates.")
 (define-public r-rversions
   (package
     (name "r-rversions")
-    (version "1.0.3")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "rversions" version))
               (sha256
                (base32
-                "0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"))))
+                "0g4wvq6m9inhy6ww18lvkhkgarb1m9dp2kdxkkyk5qvldgqa598l"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)
@@ -2096,14 +2096,14 @@ limited to R.")
 (define-public r-backports
   (package
     (name "r-backports")
-    (version "1.1.3")
+    (version "1.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "backports" version))
        (sha256
         (base32
-         "1hac46xaawnqajlsfb5k7pfkc2ya9h76s5qv9ycj3jafh93d26z4"))))
+         "00zz969vc2gfi5p9q65pzghq2bxm3p9zqgwqswkyz9rgybz5wjzf"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/backports")
     (synopsis "Reimplementations of functions introduced since R 3.0.0")
@@ -2421,13 +2421,13 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "2.0.1")
+    (version "2.0.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "1nyspqicn9zd1rgq3k07b3179i8w5ys6jbd65g9q8qczrb7z3x8f"))))
+                "028pppj39ng7q17k27531s8k00lmw982vz5krn74n9b8f2azm8lr"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-callr" ,r-callr)
@@ -2521,13 +2521,13 @@ disk (or a connection).")
 (define-public r-plotrix
   (package
     (name "r-plotrix")
-    (version "3.7-4")
+    (version "3.7-5")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "plotrix" version))
               (sha256
                (base32
-                "1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"))))
+                "0k6ivryac1k81z2dijjds376a9jxwk8rf5g48snj67cnjffkybxj"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/plotrix")
     (synopsis "Various plotting functions")
@@ -3805,13 +3805,13 @@ features present in other programming languages.")
 (define-public r-plotly
   (package
     (name "r-plotly")
-    (version "4.8.0")
+    (version "4.9.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "plotly" version))
               (sha256
                (base32
-                "19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq"))))
+                "1kz2hm7vnkn4clxr6yyxxnmdmkz9zwjq6bzysw7j27r3721i8qgp"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-base64enc" ,r-base64enc)
@@ -4427,13 +4427,13 @@ data at that region, and avoids over-plotting.")
 (define-public r-ggthemes
   (package
     (name "r-ggthemes")
-    (version "4.1.0")
+    (version "4.1.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "ggthemes" version))
               (sha256
                (base32
-                "1a6r384v72hb91qkg9rz2m7s3qskbl9haxynf2vzz6v1ak9xd4c5"))))
+                "092hks6bxi6al8nclgswnzfmx5wp6n3qf63aqiajca7dx8w8n0m2"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ggplot2" ,r-ggplot2)
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 92d5358c5e..427bc44598 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -496,15 +496,14 @@ cups server to be installed.")
 (define-public noice
   (package
     (name "noice")
-    (version "0.7")
+    (version "0.8")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://dl.2f30.org/releases/"
-                           name "-" version ".tar.gz"))
+                           "noice-" version ".tar.gz"))
        (sha256
-        (base32
-         "03b0kzngzacfpz4n8lgbvia2s765i5bkw55v482hh4m49dm41gpc"))))
+        (base32 "0g01iwzscdv27c1idv93gd74kjzy3n9kazgm6qz08rygp96qx4xw"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 2d46585865..d0531b0c14 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -249,10 +249,14 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
                   "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"))
                 (patches
                  (search-patches "kmscon-runtime-keymap-switch.patch"))
-                (modules '((guix build utils)))))
+                (modules '((guix build utils)))
+                (file-name (git-file-name name version))))
       (build-system gnu-build-system)
       (arguments
-       `(#:phases (modify-phases %standard-phases
+       `(;; The closure of MESA is huge so we'd rather avoid it.
+         #:disallowed-references (,mesa)
+
+         #:phases (modify-phases %standard-phases
                     (replace 'bootstrap
                       (lambda _
                         (setenv "NOCONFIGURE" "indeed")
@@ -285,7 +289,10 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
          ("libtsm" ,libtsm)
          ("libxkbcommon" ,libxkbcommon)
          ("logind" ,elogind)
-         ("mesa" ,mesa)
+         ;; MESA can be used for accelerated video output via OpenGLESv2, but
+         ;; it's a bit dependency that we'd rather avoid in the installation
+         ;; image.
+         ;; ("mesa" ,mesa)
          ("pango" ,pango)
          ("udev" ,eudev)))
       (synopsis "Linux KMS-based terminal emulator")
@@ -377,7 +384,7 @@ to all types of devices that provide serial consoles.")
 (define-public beep
   (package
     (name "beep")
-    (version "1.4.3")
+    (version "1.4.4")
     (source
      (origin
        (method git-fetch)
@@ -390,7 +397,7 @@ to all types of devices that provide serial consoles.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1gramwa2zm59kqjhv96fi8vg7l6lyffv02h0310vb90naschi99g"))))
+        (base32 "1bk7g63qpiclbq20iz2x238by8s1b2iafdim7i6dq1i5n01s7lgx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 314d88f2fc..c3ce80c8f5 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6022,7 +6022,7 @@ typearea (which are the main parts of the bundle).")
            (copy-recursively (assoc-ref %build-inputs "source") target)
            #t))))
     (home-page "https://www.ctan.org/pkg/listofitems")
-    (synopsis "Grab items in lists using user-specified seperation character")
+    (synopsis "Grab items in lists using user-specified separation character")
     (description
      "This package allows one to capture all the items of a list, for which
 the parsing character has been selected by the user, and to access any of
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1ab909d53e..11bb64ce8b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -529,13 +529,13 @@ netcat implementation that supports TLS.")
   (package
     (name "python-acme")
     ;; Remember to update the hash of certbot when updating python-acme.
-    (version "0.33.0")
+    (version "0.33.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "acme" version))
               (sha256
                (base32
-                "0gmnbjanv8dl8035n2b30wisqn4w9rr6fxzxrbrbnhhd40pnlplx"))))
+                "10ks4wp55qxzkf8ms3xcfs5njg2zz7w499wh24gzw7h7s1qxp35k"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -586,7 +586,7 @@ netcat implementation that supports TLS.")
               (uri (pypi-uri name version))
               (sha256
                (base32
-                "0iiqr306zy56y8wpxsvzw1izs184pzps72kxhssmznqlgz5ngni5"))))
+                "1nf3bb6j3nmdd5bcp3k7d6jqilmwvpzllzpr5niwaghgqlr3y86m"))))
     (build-system python-build-system)
     (arguments
      `(,@(substitute-keyword-arguments (package-arguments python-acme)
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 5411ca249b..3f3d80f576 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -32,14 +32,14 @@
 (define-public miniupnpc
   (package
     (name "miniupnpc")
-    (version "2.1.20190403")
+    (version "2.1.20190408")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://miniupnp.tuxfamily.org/files/"
                            name "-" version ".tar.gz"))
        (sha256
-        (base32 "0qgwcinj8h312v2995qc2z1lbpmw916glkc8j9fa16xr4l2skxfy"))))
+        (base32 "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("python" ,python-2)))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 50284182c9..22771a129c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -522,13 +522,14 @@ everything from small to very large projects with speed and efficiency.")
     (name "libgit2")
     (version "0.28.1")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/libgit2/libgit2/"
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/libgit2/libgit2.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0swk2dyq5a4p1jn5wvbcsrxckhh808vifxz5y8w663avg541188c"))
+                "0j5p0hhz2wizvgkf0nbpd8g32mb5bg1vp8ckpbhb0pq38ja4h43r"))
               (patches (search-patches "libgit2-avoid-python.patch"
                                        "libgit2-mtime-0.patch"))
 
@@ -551,6 +552,10 @@ everything from small to very large projects with speed and efficiency.")
                (("/bin/cp") (which "cp"))
                (("/bin/rm") (which "rm")))
              #t))
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          ;; Run checks more verbosely.
          (replace 'check
            (lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
@@ -577,14 +582,15 @@ write native speed custom Git applications in any language with bindings.")
   (package
     (name "git-crypt")
     (version "0.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/AGWA/git-crypt"
-                                  "/archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0454fdmgm5f3razkn8n03lfqm5zyzvr4r2528zmlxiwba9518l2i"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/AGWA/git-crypt.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1x9209n3k49k998saadr2d0lmvs01smjinx7gzzyjdwj9l904sii"))))
     (build-system gnu-build-system)
     (inputs
      `(("git" ,git)
@@ -771,14 +777,13 @@ a built-in cache to decrease server I/O pressure.")
     (version "0.5.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/davisp/ghp-import/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/davisp/ghp-import.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0x887v690xsac2hzjkpbvp3a6crh3m08mqbk3nb4xwc9dnk869q7"))))
+        (base32 "12pmw3zz3i57ljnm0rxdyjqdyhisbvy18mjwkb3bzp5pgzs2f45c"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
@@ -1026,14 +1031,15 @@ manipulate them in various ways.")
   (package
     (name "vcsh")
     (version "1.20151229")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/RichiH/vcsh/archive/v"
-                                  version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1ym3swkh738c3vciffvlr96vqzhwmzkb8ajqzap8f0j9n039a1mf"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/RichiH/vcsh.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1grpj45nbpv4j60vd2kg4rj53zrm0bc0h9l4pfd3c2mwbvywm6ab"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("which" ,which)))
@@ -1100,15 +1106,15 @@ also walk each side of a merge and test those changes individually.")
   (package
     (name "gitolite")
     (version "3.6.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/sitaramc/gitolite/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1idxipg0df80bhjcxgwxs3lllqnkvhwpinmfv1xvg1l98fxiapgp"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sitaramc/gitolite.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no tests
@@ -1762,14 +1768,15 @@ output of the @code{git} command.")
   (package
     (name "findnewest")
     (version "0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/0-wiz-0/findnewest/archive/findnewest-"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1ydis4y0amkgfr4y60sn076f1l41ya2kn89kfd9fqf44f9ccgb5r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/0-wiz-0/findnewest.git")
+             (commit (string-append "findnewest-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1x1cbn2b27h5r0ah5xc06fkalfdci2ngrgd4wibxjw0h88h0nvgq"))))
     (build-system gnu-build-system)
     (native-inputs `(("autoconf" ,autoconf)
                      ("automake" ,automake)))
@@ -1833,15 +1840,15 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.")
   (package
     (name "git-annex-remote-hubic")
     (version "0.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/Schnouki/" name "/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "196g3jkaybjx11nbr51n0cjps3wjzb145ab76y717diqvvxp5v4r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Schnouki/git-annex-remote-hubic.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16y9sk67hfi17h9n2kkffyabfccksh5rab40hhk69v6cxmbpn2sx"))))
     (build-system python-build-system)
     (arguments `(#:python ,python-2))
     (native-inputs
@@ -2096,18 +2103,18 @@ how information about the merge is displayed.")
   (package
     (name "git-imerge")
     (version "1.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/mhagger/git-imerge/archive/v"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0a6ay8fpgz3yd84jc40w41x0rcfpan6bcq4wd1hxiiqwb51jysb2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mhagger/git-imerge.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f  ; The are only manual test scripts.
+     `(#:tests? #f                      ; only manual test scripts
        #:make-flags (list (string-append "DESTDIR=" %output)
                           "PREFIX=")
        #:phases
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2993e7dea3..9bc3073ab0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1446,7 +1446,7 @@ access to mpv's powerful playback capabilities.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2019.03.18")
+    (version "2019.04.07")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rg3/youtube-dl/releases/"
@@ -1454,7 +1454,7 @@ access to mpv's powerful playback capabilities.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0r31q7j3gg2zfw3b45jancxl7mmr2gin8dyfx5dgyyp92ss8hih7"))))
+                "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 56deb12c3d..dadffa3ab1 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -756,7 +756,7 @@ are detected, the user is notified.")))
              #t))
          (add-after 'unpack 'set-lua-paths
            (lambda* (#:key inputs #:allow-other-keys)
-             (let* ((lua-version "5.2")
+             (let* ((lua-version "5.1")
                     (lua-cpath-spec
                      (lambda (prefix)
                        (let ((path (string-append prefix "/lib/lua/" lua-version)))
@@ -783,10 +783,10 @@ are detected, the user is notified.")))
        ("unibilium" ,unibilium)
        ("jemalloc" ,jemalloc)
        ("libiconv" ,libiconv)
-       ("lua" ,lua-5.2)
-       ("lua-lpeg" ,lua5.2-lpeg)
-       ("lua-bitop" ,lua5.2-bitop)
-       ("lua-libmpack" ,lua5.2-libmpack)))
+       ("lua" ,lua-5.1)
+       ("lua-lpeg" ,lua5.1-lpeg)
+       ("lua-bitop" ,lua5.1-bitop)
+       ("lua-libmpack" ,lua5.1-libmpack)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gettext" ,gettext-minimal)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index b6af572778..bb0b5e1b4e 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -93,14 +93,14 @@ older or slower computers and embedded systems.")
 (define-public links
   (package
     (name "links")
-    (version "2.18")
+    (version "2.19")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://links.twibright.com/download/"
-                                  name "-" version ".tar.bz2"))
+                                  "links-" version ".tar.bz2"))
                 (sha256
                (base32
-                "0mwhh61klicn2vwk39nc7y4cw4mygzdi2nljn4r0gjbw6jmw3337"))))
+                "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e84b42358c..fd6bfbab22 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -198,14 +199,14 @@ Interface} specification.")
     ;; ’stable’ and recommends that “in general you deploy the NGINX mainline
     ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
     ;; Consider updating the nginx-documentation package together with this one.
-    (version "1.15.9")
+    (version "1.15.12")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nginx.org/download/nginx-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"))))
+                "1giavdph0jqhywdkj4650s5qhz6qfd6nrv74k9q005yy2ym90nrx"))))
     (build-system gnu-build-system)
     (inputs `(("openssl" ,openssl)
               ("pcre" ,pcre)
@@ -3009,6 +3010,33 @@ simple requests without the overhead of a large framework like LWP::UserAgent.
 It supports proxies and redirection.  It also correctly resumes after EINTR.")
     (license l:perl-license)))
 
+(define-public perl-http-tinyish
+  (package
+    (name "perl-http-tinyish")
+    (version "0.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "199sa722amvwhq0czjfb7psj3hbqmvni5vxkrm579r5943pg0rax"))))
+    (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-file-which" ,perl-file-which)
+       ("perl-ipc-run3" ,perl-ipc-run3)))
+    (home-page "https://metacpan.org/release/HTTP-Tinyish")
+    (synopsis "@code{HTTP::Tiny} compatible HTTP client wrappers")
+    (description
+     "@code{HTTP::Tinyish} is a wrapper module for @acronym{LWP,libwww-perl},
+@code{HTTP::Tiny}, curl and wget.
+
+It provides an API compatible to HTTP::Tiny.")
+    (license l:perl-license)))
+
 (define-public perl-io-html
   (package
     (name "perl-io-html")
@@ -3374,6 +3402,35 @@ application frameworks.  Plack is like Ruby's Rack or Python's Paste for
 WSGI.")
     (license l:perl-license)))
 
+(define-public perl-plack-middleware-deflater
+  (package
+    (name "perl-plack-middleware-deflater")
+    (version "0.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://cpan/authors/id/K/KA/KAZEBURO/"
+             "Plack-Middleware-Deflater-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-install" ,perl-module-install)
+       ("perl-test-requires" ,perl-test-requires)))
+    (propagated-inputs
+     `(("perl-plack" ,perl-plack)))
+    (home-page "https://metacpan.org/release/Plack-Middleware-Deflater")
+    (synopsis "Compress response body with Gzip or Deflate")
+    (description
+     "Plack::Middleware::Deflater is a middleware to encode your response body
+in gzip or deflate, based on \"Accept-Encoding\" HTTP request header.  It
+would save the bandwidth a little bit but should increase the Plack server
+load, so ideally you should handle this on the frontend reverse proxy
+servers.")
+    (license l:perl-license)))
+
 (define-public perl-plack-middleware-fixmissingbodyinredirect
   (package
     (name "perl-plack-middleware-fixmissingbodyinredirect")
@@ -4608,14 +4665,15 @@ handling many of the web standards in use today.")
 (define-public surfraw
   (package
     (name "surfraw")
-    (version "2.2.9")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://surfraw.alioth.debian.org/dist/"
-                                  name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"))))
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://gitlab.com/surfraw/Surfraw/uploads/"
+                           "2de827b2786ef2fe43b6f07913ca7b7f/"
+                           "surfraw-" version ".tar.gz"))
+       (sha256
+        (base32 "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -4753,14 +4811,14 @@ tools like SSH (Secure Shell) to reach the outside world.")
 (define-public stunnel
   (package
   (name "stunnel")
-  (version "5.50")
+  (version "5.53")
   (source
     (origin
       (method url-fetch)
       (uri (string-append "https://www.stunnel.org/downloads/stunnel-"
                           version ".tar.gz"))
       (sha256
-       (base32 "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm"))))
+       (base32 "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"))))
   (build-system gnu-build-system)
   (native-inputs
    ;; For tests.
@@ -5096,7 +5154,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.0")
+    (version "2.9.2")
     (home-page "https://github.com/nodejs/http-parser")
     (source (origin
               (method git-fetch)
@@ -5105,7 +5163,7 @@ into your tests.  It automatically starts up a HTTP server in a separate thread
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1qa3rh9x4as2fc2p0y2hah83iqs7jr5106a8anv317359dgf3ssj"))))
+                "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -5125,6 +5183,36 @@ Depending on your architecture, it only requires about 40 bytes of data per
 message stream (in a web server that is per connection).")
     (license l:expat)))
 
+(define-public python-httpretty
+  (package
+    (name "python-httpretty")
+    (version "0.9.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpretty" version))
+       (sha256
+        (base32 "1p1rb4mpngh0632xrmdfhvc8yink519yfkqz97d2ww3y0x2jvd81"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)))
+    (native-inputs
+     `(("python-coverage" ,python-coverage)
+       ("python-httplib2" ,python-httplib2)
+       ("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)
+       ("python-nose-randomly" ,python-nose-randomly)
+       ("python-rednose" ,python-rednose)
+       ("python-requests" ,python-requests)
+       ("python-sure" ,python-sure)
+       ("python-tornado" ,python-tornado)
+       ("python-urllib3" ,python-urllib3)))
+    (home-page "https://httpretty.readthedocs.io")
+    (synopsis "HTTP client mock for Python")
+    (description "@code{httpretty} is a helper for faking web requests,
+inspired by Ruby's @code{fakeweb}.")
+    (license l:expat)))
+
 (define-public python2-httpretty
   (package
     (name "python2-httpretty")
@@ -6430,3 +6518,32 @@ compressed JSON header blocks.
 provided by Guix.  The list of packages is searchable and provides
 instructions on how to use Guix in a shared HPC environment.")
       (license l:agpl3+))))
+
+(define-public httrack
+  (package
+    (name "httrack")
+    (version "3.49.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://mirror.httrack.com/historical/"
+                                  "httrack-" version ".tar.gz"))
+              (sha256
+               (base32
+                "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libressl" ,libressl)
+       ("zlib" ,zlib)))
+    (home-page "https://www.httrack.com/")
+    (synopsis "Easy-to-use offline browser utility")
+    (description "HTTrack allows you to download a World Wide Web site from
+the Internet to a local directory, building recursively all directories,
+getting HTML, images, and other files from the server to your computer.
+
+HTTrack arranges the original site's relative link-structure.  Simply open
+a page of the ``mirrored'' website in your browser, and you can browse the
+site from link to link, as if you were viewing it online.  HTTrack can also
+update an existing mirrored site, and resume interrupted downloads.
+
+HTTrack is fully configurable, and has an integrated help system.")
+    (license l:gpl3+)))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 14c374dd3e..ce69d0a7d4 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -168,14 +168,15 @@ HTML/CSS applications to full-fledged web browsers.")
 (define-public webkitgtk-2.24
   (package/inherit webkitgtk
     (name "webkitgtk")
-    (version "2.24.0")
+    (version "2.24.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif"))))
+                "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"))
+              (patches (search-patches "webkitgtk-sse2.patch"))))
     (native-inputs
      `(("gcc" ,gcc-7)  ; webkitgtk-2.22 requires gcc-6 or newer
        ,@(package-native-inputs webkitgtk)))
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 57b755c8a2..9cafa07c28 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -310,7 +310,7 @@ integrate Windows applications into your desktop.")
 (define-public wine-staging-patchset-data
   (package
     (name "wine-staging-patchset-data")
-    (version "4.5")
+    (version "4.6")
     (source
      (origin
        (method git-fetch)
@@ -320,7 +320,7 @@ integrate Windows applications into your desktop.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "18xpha7nl3jg7c24cgbncciyyqqb6svsyfp1xk81993wnl6r8abs"))))
+         "0mripibsi1p8h2j9ngqszkcjppdxji027ss4shqwb0nypaydd9w2"))))
     (build-system trivial-build-system)
     (native-inputs
      `(("bash" ,bash)
@@ -366,7 +366,7 @@ integrate Windows applications into your desktop.")
               (file-name (string-append name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1dy1v27cw9vp2xnr8y4bdcvvw5ivcgpk2375jgn536csbwaxgwjz"))))
+                "1nk2nlkdklwpd0kbq8hx59gl05b5wglcla0v3892by6k4kwh341j"))))
     (inputs `(("autoconf" ,autoconf) ; for autoreconf
               ("faudio" ,faudio)
               ("ffmpeg" ,ffmpeg)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a0076f24cf..2695b5f99c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -536,7 +536,7 @@ tiled on several screens.")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://hackage/package/xmobar/"
-                                  name "-" version ".tar.gz"))
+                                  "xmobar-" version ".tar.gz"))
               (sha256
                (base32
                 "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd"))))
@@ -1048,14 +1048,14 @@ its size
 (define-public polybar
   (package
     (name "polybar")
-    (version "3.3.0")
+    (version "3.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/jaagr/polybar/releases/"
-                           "download/" version "/polybar.tar"))
+                           "download/" version "/polybar-" version ".tar"))
        (sha256
-        (base32 "0sjh3xmf11g09spi88zj7xsc3a3vv78kixab6n5i7436py7xwzb4"))
+        (base32 "0758na059vpgnsrcdrxmh9wsahs80wnmizb9g7bmixlrkxr2m65h"))
        (file-name (string-append name "-" version ".tar"))))
     (build-system cmake-build-system)
     (arguments
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 9fde0fcbd4..c4b7f9a87f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -957,7 +957,7 @@ Escape key when Left Control is pressed and released on its own.")
 (define-public libwacom
   (package
     (name "libwacom")
-    (version "0.32")
+    (version "0.33")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -965,7 +965,7 @@ Escape key when Left Control is pressed and released on its own.")
                     "libwacom-" version "/libwacom-" version ".tar.bz2"))
               (sha256
                (base32
-                "102kz0q7i0bjsnl6yy83vcj2rpir12rs2d4xr0wvhw84rs5sp7bb"))))
+                "1wnv34y7m9l6avlvwqvfrnksfnsz1lbgb412dn6s7x1h3wvs7y4l"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 18270a6771..d3e6b79277 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5961,18 +5961,17 @@ Conventions Manual) and some of the @dfn{EWMH}
 (define-public xcompmgr
   (package
     (name "xcompmgr")
-    (version "1.1.7")
+    (version "1.1.8")
     (source
      (origin
-       ;; there's no current tarball
+       ;; There's no current tarball.
        (method git-fetch)
        (uri (git-reference
              (url "https://anongit.freedesktop.org/git/xorg/app/xcompmgr.git")
-             (commit (string-append name "-" version))))
+             (commit (string-append "xcompmgr-" version))))
        (sha256
-        (base32
-         "04swkrm3gk689wrjc418bd3n25w8r20kg1xfbn5j8d7mx1r5gf16"))
-       (file-name (string-append name "-" version))))
+        (base32 "11i7vyk3pynw8q8aczpy56qncm84y0cmhlvyja3sj8dgy60g03q2"))
+       (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm
index 43b34a38d9..b433c59e12 100644
--- a/gnu/services/sddm.scm
+++ b/gnu/services/sddm.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -139,8 +140,7 @@ SessionCommand="       (sddm-configuration-session-command config)             "
 SessionDir="           (sddm-configuration-sessions-directory config)          "
 
 [X11]
-ServerPath="           (xorg-configuration-server
-                        (sddm-configuration-xorg config)) "/bin/X"             "
+ServerPath="           (xorg-start-command (sddm-configuration-xorg config))   "
 XauthPath="            (sddm-configuration-xauth-path config)                  "
 XephyrPath="           (sddm-configuration-xephyr-path config)                 "
 DisplayCommand="       (sddm-configuration-xdisplay-start config)              "
diff --git a/gnu/system.scm b/gnu/system.scm
index ad0c9e57dc..24243eb707 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -78,6 +78,8 @@
             operating-system-kernel
             operating-system-kernel-file
             operating-system-kernel-arguments
+            operating-system-label
+            operating-system-default-label
             operating-system-initrd-modules
             operating-system-initrd
             operating-system-users
@@ -160,6 +162,9 @@
   (kernel-arguments operating-system-user-kernel-arguments
                     (default '()))                ; list of gexps/strings
   (bootloader operating-system-bootloader)        ; <bootloader-configuration>
+  (label operating-system-label                   ; string
+         (thunked)
+         (default (operating-system-default-label this-operating-system)))
 
   (keyboard-layout operating-system-keyboard-layout ;#f | <keyboard-layout>
                    (default #f))
@@ -911,15 +916,18 @@ listed in OS.  The C library expects to find it under
   (cond ((package? kernel)
          (string-append "GNU with "
                         (string-titlecase (package-name kernel)) " "
-                        (package-version kernel)
-                        " (beta)"))
+                        (package-version kernel)))
         ((inferior-package? kernel)
          (string-append "GNU with "
                         (string-titlecase (inferior-package-name kernel)) " "
-                        (inferior-package-version kernel)
-                        " (beta)"))
+                        (inferior-package-version kernel)))
         (else "GNU")))
 
+(define (operating-system-default-label os)
+  "Return the default label for OS, as it will appear in the bootloader menu
+entry."
+  (kernel->boot-label (operating-system-kernel os)))
+
 (define (store-file-system file-systems)
   "Return the file system object among FILE-SYSTEMS that contains the store."
   (match (filter (lambda (fs)
@@ -968,7 +976,7 @@ such as '--root' and '--load' to <boot-parameters>."
          (bootloader      (bootloader-configuration-bootloader
                            (operating-system-bootloader os)))
          (bootloader-name (bootloader-name bootloader))
-         (label           (kernel->boot-label (operating-system-kernel os))))
+         (label           (operating-system-label os)))
     (boot-parameters
      (label label)
      (root-device root-device)
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index baeb5e2d77..3931bad60d 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -58,8 +58,8 @@
                      gvfs)
                     %base-packages))
 
-  ;; Add GNOME and/or Xfce---we can choose at the log-in
-  ;; screen with F1.  Use the "desktop" services, which
+  ;; Add GNOME and Xfce---we can choose at the log-in screen
+  ;; by clicking the gear.  Use the "desktop" services, which
   ;; include the X11 log-in service, networking with
   ;; NetworkManager, and more.
   (services (append (list (service gnome-desktop-service-type)
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 91e7b481e8..d887313132 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -27,6 +27,7 @@
   #:use-module (guix gexp)
   #:use-module (guix store)
   #:use-module (guix monads)
+  #:use-module ((guix packages) #:select (package-version))
   #:use-module ((guix store) #:select (%store-prefix))
   #:use-module (gnu installer)
   #:use-module (gnu services dbus)
@@ -73,19 +74,93 @@
 ;;; Code:
 
 
-(define (log-to-info)
+;;;
+;;; Documentation service.
+;;;
+
+(define %installation-node-names
+  ;; Translated name of the "System Installation" node of the manual.  Ideally
+  ;; we'd extract it from the 'guix-manual' gettext domain, but that one is
+  ;; usually not available at run time, hence this hack.
+  '(("de" . "Systeminstallation")
+    ("en" . "System Installation")
+    ("fr" . "Installation du système")))
+
+(define (log-to-info tty user)
   "Return a script that spawns the Info reader on the right section of the
 manual."
   (program-file "log-to-info"
-                #~(begin
+                #~(let* ((tty      (open-file #$(string-append "/dev/" tty)
+                                              "r0+"))
+                         (locale   (cadr (command-line)))
+                         (language (string-take locale
+                                                (string-index locale #\_)))
+                         (infodir  "/run/current-system/profile/share/info")
+                         (per-lang (string-append infodir "/guix." language
+                                                  ".info.gz"))
+                         (file     (if (file-exists? per-lang)
+                                       per-lang
+                                       (string-append infodir "/guix.info")))
+                         (node     (or (assoc-ref '#$%installation-node-names
+                                                  language)
+                                       "System Installation")))
+                    (redirect-port tty (current-output-port))
+                    (redirect-port tty (current-error-port))
+                    (redirect-port tty (current-input-port))
+
+                    (let ((pw (getpwnam #$user)))
+                      (setgid (passwd:gid pw))
+                      (setuid (passwd:uid pw)))
+
                     ;; 'gunzip' is needed to decompress the doc.
                     (setenv "PATH" (string-append #$gzip "/bin"))
 
-                    (execl (string-append #$info-reader "/bin/info") "info"
-                           "-d" "/run/current-system/profile/share/info"
-                           "-f" (string-append #$guix "/share/info/guix.info")
-                           "-n" "System Installation"))))
+                    ;; Change this process' locale so that command-line
+                    ;; arguments to 'info' are properly encoded.
+                    (catch #t
+                      (lambda ()
+                        (setlocale LC_ALL locale)
+                        (setenv "LC_ALL" locale))
+                      (lambda _
+                        ;; Sometimes LOCALE itself is not available.  In that
+                        ;; case pick the one UTF-8 locale that's known to work
+                        ;; instead of failing.
+                        (setlocale LC_ALL "en_US.utf8")
+                        (setenv "LC_ALL" "en_US.utf8")))
+
+                    (execl #$(file-append info-reader "/bin/info")
+                           "info" "-d" infodir "-f" file "-n" node))))
+
+(define (documentation-shepherd-service tty)
+  (list (shepherd-service
+         (provision (list (symbol-append 'term- (string->symbol tty))))
+         (requirement '(user-processes host-name udev virtual-terminal))
+         (start #~(lambda* (#:optional (locale "en_US.utf8"))
+                    (fork+exec-command
+                     (list #$(log-to-info tty "documentation") locale)
+                     #:environment-variables
+                     `("GUIX_LOCPATH=/run/current-system/locale"
+                       "TERM=linux"))))
+         (stop #~(make-kill-destructor)))))
+
+(define %documentation-users
+  ;; User account for the Info viewer.
+  (list (user-account (name "documentation")
+                      (system? #t)
+                      (group "nogroup")
+                      (home-directory "/var/empty"))))
+
+(define documentation-service-type
+  ;; Documentation viewer service.
+  (service-type (name 'documentation)
+                (extensions
+                 (list (service-extension shepherd-root-service-type
+                                          documentation-shepherd-service)
+                       (service-extension account-service-type
+                                          (const %documentation-users))))
+                (description "Run the Info reader on a tty.")))
 
+
 (define %backing-directory
   ;; Sub-directory used as the backing store for copy-on-write.
   "/tmp/guix-inst")
@@ -239,10 +314,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
           ;; Documentation.  The manual is in UTF-8, but
           ;; 'console-font-service' sets up Unicode support and loads a font
           ;; with all the useful glyphs like em dash and quotation marks.
-          (mingetty-service (mingetty-configuration
-                             (tty "tty2")
-                             (auto-login "guest")
-                             (login-program (log-to-info))))
+          (service documentation-service-type "tty2")
 
           ;; Documentation add-on.
           %configuration-template-service
@@ -271,12 +343,18 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
           ;; since it takes the installation directory as an argument.
           (cow-store-service)
 
-          ;; Install Unicode support and a suitable font.  Use a font that
-          ;; doesn't have more than 256 glyphs so that we can use colors with
-          ;; varying brightness levels (see note in setfont(8)).
+          ;; Install Unicode support and a suitable font.
           (service console-font-service-type
-                   (map (lambda (tty)
-                          (cons tty "lat9u-16"))
+                   (map (match-lambda
+                          ("tty2"
+                           ;; Use a font that contains characters such as
+                           ;; curly quotes as found in the manual.
+                           '("tty2" . "LatGrkCyr-8x16"))
+                          (tty
+                           ;; Use a font that doesn't have more than 256
+                           ;; glyphs so that we can use colors with varying
+                           ;; brightness levels (see note in setfont(8)).
+                           `(,tty . "lat9u-16")))
                         '("tty1" "tty2" "tty3" "tty4" "tty5" "tty6")))
 
           ;; To facilitate copy/paste.
@@ -346,6 +424,9 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
     (bootloader (bootloader-configuration
                  (bootloader grub-bootloader)
                  (target "/dev/sda")))
+    (label (string-append "GNU Guix installation "
+                          (package-version guix)))
+
     (file-systems
      ;; Note: the disk image build code overrides this root file system with
      ;; the appropriate one.
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index db9b1707d7..22e3fcc522 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -94,6 +94,12 @@
 (define %linux-vm-file-systems
   ;; File systems mounted for 'derivation-in-linux-vm'.  These are shared with
   ;; the host over 9p.
+  ;;
+  ;; The 9p documentation says that cache=loose is "intended for exclusive,
+  ;; read-only mounts", without additional details.  It's much faster than the
+  ;; default cache=none, especially when copying and registering store items.
+  ;; Thus, use cache=loose, except for /xchg where we want to ensure
+  ;; consistency.
   (list (file-system
           (mount-point (%store-prefix))
           (device "store")
@@ -102,18 +108,12 @@
           (flags '(read-only))
           (options "trans=virtio,cache=loose")
           (check? #f))
-
-        ;; The 9p documentation says that cache=loose is "intended for
-        ;; exclusive, read-only mounts", without additional details.  In
-        ;; practice it seems to work well for these, and it's much faster than
-        ;; the default cache=none, especially when copying and registering
-        ;; store items.
         (file-system
           (mount-point "/xchg")
           (device "xchg")
           (type "9p")
           (needed-for-boot? #t)
-          (options "trans=virtio,cache=loose")
+          (options "trans=virtio")
           (check? #f))
         (file-system
           (mount-point "/tmp")
@@ -530,10 +530,7 @@ should set REGISTER-CLOSURES? to #f."
                  #$os
                  #:compressor '(#+(file-append gzip "/bin/gzip") "-9n")
                  #:creation-time (make-time time-utc 0 1)
-                 #:transformations `((,root-directory -> "")))
-
-                ;; Make sure the tarball is fully written before rebooting.
-                (sync))))))
+                 #:transformations `((,root-directory -> ""))))))))
     (expression->derivation-in-linux-vm
      name build
      #:make-disk-image? #f
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index c0debbd840..430a102378 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -504,8 +504,8 @@ export GUIX_BUILD_OPTIONS=--no-grafts
 guix build isc-dhcp
 parted --script /dev/vdb mklabel gpt \\
   mkpart primary ext2 1M 3M \\
-  mkpart primary ext2 3M 100M \\
-  mkpart primary ext2 100M 1.2G \\
+  mkpart primary ext2 3M 400M \\
+  mkpart primary ext2 400M 2.1G \\
   set 1 boot on \\
   set 1 bios_grub on
 mkfs.ext4 -L root-fs /dev/vdb2
@@ -514,6 +514,7 @@ mount /dev/vdb2 /mnt
 mkdir /mnt/gnu
 mount /dev/vdb3 /mnt/gnu
 df -h /mnt
+df -h /mnt/gnu
 herd start cow-store /mnt
 mkdir /mnt/etc
 cp /etc/target-config.scm /mnt/etc/config.scm
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 7ff4e90f71..dc137421e9 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -59,13 +59,17 @@ to NAME and VERSION."
 (define %cargo-build-system-modules
   ;; Build-side modules imported by default.
   `((guix build cargo-build-system)
+    (json parser)
     ,@%cargo-utils-modules))
 
 (define* (cargo-build store name inputs
                       #:key
                       (tests? #t)
                       (test-target #f)
+                      (vendor-dir "guix-vendor")
                       (cargo-build-flags ''("--release"))
+                      (cargo-test-flags ''("--release"))
+                      (skip-build? #f)
                       (phases '(@ (guix build cargo-build-system)
                                   %standard-phases))
                       (outputs '("out"))
@@ -90,8 +94,11 @@ to NAME and VERSION."
                                  source))
                     #:system ,system
                     #:test-target ,test-target
+                    #:vendor-dir ,vendor-dir
                     #:cargo-build-flags ,cargo-build-flags
-                    #:tests? ,tests?
+                    #:cargo-test-flags ,cargo-test-flags
+                    #:skip-build? ,skip-build?
+                    #:tests? ,(and tests? (not skip-build?))
                     #:phases ,phases
                     #:outputs %outputs
                     #:search-paths ',(map search-path-specification->sexp
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm
new file mode 100644
index 0000000000..6084d22210
--- /dev/null
+++ b/guix/build-system/linux-module.scm
@@ -0,0 +1,175 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
+;;;
+;;; 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 (guix build-system linux-module)
+  #:use-module (guix store)
+  #:use-module (guix utils)
+  #:use-module (guix derivations)
+  #:use-module (guix search-paths)
+  #:use-module (guix build-system)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix packages)
+  #:use-module (ice-9 match)
+  #:export (%linux-module-build-system-modules
+            linux-module-build
+            linux-module-build-system))
+
+;; Commentary:
+;;
+;; Code:
+
+(define %linux-module-build-system-modules
+  ;; Build-side modules imported by default.
+  `((guix build linux-module-build-system)
+    ,@%gnu-build-system-modules))
+
+(define (default-linux)
+  "Return the default Linux package."
+
+  ;; Do not use `@' to avoid introducing circular dependencies.
+  (let ((module (resolve-interface '(gnu packages linux))))
+    (module-ref module 'linux-libre)))
+
+(define (default-kmod)
+  "Return the default kmod package."
+
+  ;; Do not use `@' to avoid introducing circular dependencies.
+  (let ((module (resolve-interface '(gnu packages linux))))
+    (module-ref module 'kmod)))
+
+(define (default-gcc)
+  "Return the default gcc package."
+
+  ;; Do not use `@' to avoid introducing circular dependencies.
+  (let ((module (resolve-interface '(gnu packages gcc))))
+    (module-ref module 'gcc-7)))
+
+(define (make-linux-module-builder linux)
+  (package
+    (inherit linux)
+    (name (string-append (package-name linux) "-module-builder"))
+    (native-inputs
+     `(("linux" ,linux)
+       ,@(package-native-inputs linux)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments linux)
+      ((#:phases phases)
+       `(modify-phases ,phases
+          (replace 'build
+            (lambda _
+              (invoke "make" "modules_prepare")))
+          (delete 'strip) ; faster.
+          (replace 'install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (out-lib-build (string-append out "/lib/modules/build")))
+                ; TODO: Only preserve the minimum, i.e. [Kbuild], Kconfig, scripts, include, ".config".
+                (copy-recursively "." out-lib-build)
+                (let* ((linux (assoc-ref inputs "linux")))
+                  (install-file (string-append linux "/System.map")
+                                out-lib-build)
+                  (let ((source (string-append linux "/Module.symvers")))
+                    (if (file-exists? source)
+                        (install-file source out-lib-build))))
+                #t)))))))))
+
+(define* (lower name
+                #:key source inputs native-inputs outputs
+                system target
+                (linux (default-linux))
+                #:allow-other-keys
+                #:rest arguments)
+  "Return a bag for NAME."
+  (define private-keywords
+    '(#:source #:target #:gcc #:kmod #:linux #:inputs #:native-inputs))
+
+  (and (not target)                               ;XXX: no cross-compilation
+       (bag
+         (name name)
+         (system system)
+         (host-inputs `(,@(if source
+                              `(("source" ,source))
+                              '())
+                        ,@inputs
+                        ,@(standard-packages)))
+         (build-inputs `(("linux" ,linux) ; for "Module.symvers".
+                         ("linux-module-builder"
+                         ,(make-linux-module-builder linux))
+                         ,@native-inputs
+                         ;; TODO: Remove "gmp", "mpfr", "mpc" since they are only needed to compile the gcc plugins.  Maybe remove "flex", "bison", "elfutils", "perl", "openssl".  That leaves very little ("bc", "gcc", "kmod").
+                         ,@(package-native-inputs linux)))
+         (outputs outputs)
+         (build linux-module-build)
+         (arguments (strip-keyword-arguments private-keywords arguments)))))
+
+(define* (linux-module-build store name inputs
+                             #:key
+                             (search-paths '())
+                             (tests? #t)
+                             (phases '(@ (guix build linux-module-build-system)
+                                         %standard-phases))
+                             (outputs '("out"))
+                             (system (%current-system))
+                             (guile #f)
+                             (imported-modules
+                              %linux-module-build-system-modules)
+                             (modules '((guix build linux-module-build-system)
+                                        (guix build utils))))
+  "Build SOURCE using LINUX, and with INPUTS."
+  (define builder
+    `(begin
+       (use-modules ,@modules)
+       (linux-module-build #:name ,name
+                     #:source ,(match (assoc-ref inputs "source")
+                                      (((? derivation? source))
+                                       (derivation->output-path source))
+                                      ((source)
+                                       source)
+                                      (source
+                                        source))
+                     #:search-paths ',(map search-path-specification->sexp
+                                           search-paths)
+                     #:phases ,phases
+                     #:system ,system
+                     #:tests? ,tests?
+                     #:outputs %outputs
+                     #:inputs %build-inputs)))
+
+  (define guile-for-build
+    (match guile
+      ((? package?)
+       (package-derivation store guile system #:graft? #f))
+      (#f                                         ; the default
+       (let* ((distro (resolve-interface '(gnu packages commencement)))
+              (guile  (module-ref distro 'guile-final)))
+         (package-derivation store guile system #:graft? #f)))))
+
+  (build-expression->derivation store name builder
+                                #:system system
+                                #:inputs inputs
+                                #:modules imported-modules
+                                #:outputs outputs
+                                #:guile-for-build guile-for-build))
+
+(define linux-module-build-system
+  (build-system
+    (name 'linux-module)
+    (description "The Linux module build system")
+    (lower lower)))
+
+;;; linux-module.scm ends here
diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 20087fa6c4..b68a1f90d2 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (ice-9 ftw)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
+  #:use-module (json parser)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
@@ -37,81 +39,86 @@
 ;;
 ;; Code:
 
-;; FIXME: Needs to be parsed from url not package name.
-(define (package-name->crate-name name)
-  "Return the crate name of NAME."
-  (match (string-split name #\-)
-    (("rust" rest ...)
-     (string-join rest "-"))
-    (_ #f)))
-
-(define* (configure #:key inputs #:allow-other-keys)
-  "Replace Cargo.toml [dependencies] section with guix inputs."
-  ;; Make sure Cargo.toml is writeable when the crate uses git-fetch.
-  (chmod "Cargo.toml" #o644)
+(define (manifest-targets)
+  "Extract all targets from the Cargo.toml manifest"
+  (let* ((port (open-input-pipe "cargo read-manifest"))
+         (data (json->scm port))
+         (targets (hash-ref data "targets" '())))
+    (close-port port)
+    targets))
+
+(define (has-executable-target?)
+  "Check if the current cargo project declares any binary targets."
+  (let* ((bin? (lambda (kind) (string=? kind "bin")))
+         (get-kinds (lambda (dep) (hash-ref dep "kind")))
+         (bin-dep? (lambda (dep) (find bin? (get-kinds dep)))))
+    (find bin-dep? (manifest-targets))))
+
+(define* (configure #:key inputs
+                    (vendor-dir "guix-vendor")
+                    #:allow-other-keys)
+  "Vendor Cargo.toml dependencies as guix inputs."
   (chmod "." #o755)
-  (if (not (file-exists? "vendor"))
-    (if (not (file-exists? "Cargo.lock"))
-      (begin
-        (substitute* "Cargo.toml"
-          ((".*32-sys.*") "
-")
-          ((".*winapi.*") "
-")
-          ((".*core-foundation.*") "
-"))
-        ;; Prepare one new directory with all the required dependencies.
-        ;; It's necessary to do this (instead of just using /gnu/store as the
-        ;; directory) because we want to hide the libraries in subdirectories
-        ;;   share/rust-source/... instead of polluting the user's profile root.
-        (mkdir "vendor")
-        (for-each
-          (match-lambda
-            ((name . path)
-             (let ((crate (package-name->crate-name name)))
-               (when (and crate path)
-                 (match (string-split (basename path) #\-)
-                   ((_ ... version)
-                    (symlink (string-append path "/share/rust-source")
-                             (string-append "vendor/" (basename path)))))))))
-          inputs)
-        ;; Configure cargo to actually use this new directory.
-        (mkdir-p ".cargo")
-        (let ((port (open-file ".cargo/config" "w" #:encoding "utf-8")))
-          (display "
+  ;; Prepare one new directory with all the required dependencies.
+  ;; It's necessary to do this (instead of just using /gnu/store as the
+  ;; directory) because we want to hide the libraries in subdirectories
+  ;; share/rust-source/... instead of polluting the user's profile root.
+  (mkdir-p vendor-dir)
+  (for-each
+    (match-lambda
+      ((name . path)
+       (let* ((rust-share (string-append path "/share/rust-source"))
+              (basepath (basename path))
+              (link-dir (string-append vendor-dir "/" basepath)))
+         (and (file-exists? rust-share)
+              ;; Gracefully handle duplicate inputs
+              (not (file-exists? link-dir))
+              (symlink rust-share link-dir)))))
+    inputs)
+  ;; Configure cargo to actually use this new directory.
+  (mkdir-p ".cargo")
+  (let ((port (open-file ".cargo/config" "w" #:encoding "utf-8")))
+    (display "
 [source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'
 
 [source.vendored-sources]
 directory = '" port)
-          (display (getcwd) port)
-          (display "/vendor" port)
-          (display "'
+    (display (string-append (getcwd) "/" vendor-dir) port)
+    (display "'
 " port)
-          (close-port port)))))
-    (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
+    (close-port port))
 
-    ;(setenv "CARGO_HOME" "/gnu/store")
-    ; (setenv "CMAKE_C_COMPILER" cc)
+  ;; Lift restriction on any lints: a crate author may have decided to opt
+  ;; into stricter lints (e.g. #![deny(warnings)]) during their own builds
+  ;; but we don't want any build failures that could be caused later by
+  ;; upgrading the compiler for example.
+  (setenv "RUSTFLAGS" "--cap-lints allow")
+  (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
   #t)
 
-(define* (build #:key (cargo-build-flags '("--release"))
+(define* (build #:key
+                skip-build?
+                (cargo-build-flags '("--release"))
                 #:allow-other-keys)
   "Build a given Cargo package."
-  (zero? (apply system* `("cargo" "build" ,@cargo-build-flags))))
+  (or skip-build?
+      (zero? (apply system* `("cargo" "build" ,@cargo-build-flags)))))
 
-(define* (check #:key tests? #:allow-other-keys)
+(define* (check #:key
+                tests?
+                (cargo-test-flags '("--release"))
+                #:allow-other-keys)
   "Run tests for a given Cargo package."
-  (if (and tests? (file-exists? "Cargo.lock"))
-      (zero? (system* "cargo" "test"))
+  (if tests?
+      (zero? (apply system* `("cargo" "test" ,@cargo-test-flags)))
       #t))
 
 (define (touch file-name)
   (call-with-output-file file-name (const #t)))
 
-(define* (install #:key inputs outputs #:allow-other-keys)
-  "Install a given Cargo package."
+(define* (install-source #:key inputs outputs #:allow-other-keys)
+  "Install the source for a given Cargo package."
   (let* ((out (assoc-ref outputs "out"))
          (src (assoc-ref inputs "source"))
          (rsrc (string-append (assoc-ref outputs "src")
@@ -120,24 +127,36 @@ directory = '" port)
     ;; Rust doesn't have a stable ABI yet. Because of this
     ;; Cargo doesn't have a search path for binaries yet.
     ;; Until this changes we are working around this by
-    ;; distributing crates as source and replacing
-    ;; references in Cargo.toml with store paths.
-    (copy-recursively "src" (string-append rsrc "/src"))
+    ;; vendoring the crates' sources by symlinking them
+    ;; to store paths.
+    (copy-recursively "." rsrc)
     (touch (string-append rsrc "/.cargo-ok"))
-    (generate-checksums rsrc src)
+    (generate-checksums rsrc "/dev/null")
     (install-file "Cargo.toml" rsrc)
-    ;; When the package includes executables we install
-    ;; it using cargo install. This fails when the crate
-    ;; doesn't contain an executable.
-    (if (file-exists? "Cargo.lock")
-        (zero? (system* "cargo" "install" "--root" out))
-        (begin
-          (mkdir out)
-          #t))))
+    #t))
+
+(define* (install #:key inputs outputs skip-build? #:allow-other-keys)
+  "Install a given Cargo package."
+  (let* ((out (assoc-ref outputs "out")))
+    (mkdir-p out)
+
+    ;; Make cargo reuse all the artifacts we just built instead
+    ;; of defaulting to making a new temp directory
+    (setenv "CARGO_TARGET_DIR" "./target")
+    ;; Force cargo to honor our .cargo/config definitions
+    ;; https://github.com/rust-lang/cargo/issues/6397
+    (setenv "CARGO_HOME" ".")
+
+    ;; Only install crates which include binary targets,
+    ;; otherwise cargo will raise an error.
+    (or skip-build?
+        (not (has-executable-target?))
+        (zero? (system* "cargo" "install" "--path" "." "--root" out)))))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
     (delete 'bootstrap)
+    (add-before 'configure 'install-source install-source)
     (replace 'configure configure)
     (replace 'build build)
     (replace 'check check)
diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm
new file mode 100644
index 0000000000..cd76df2de7
--- /dev/null
+++ b/guix/build/linux-module-build-system.scm
@@ -0,0 +1,91 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
+;;;
+;;; 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 (guix build linux-module-build-system)
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
+  #:use-module (guix build utils)
+  #:use-module (ice-9 ftw)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
+  #:export (%standard-phases
+            linux-module-build))
+
+;; Commentary:
+;;
+;; Builder-side code of linux-module build.
+;;
+;; Code:
+
+;; Copied from make-linux-libre's "configure" phase.
+(define* (configure #:key inputs target #:allow-other-keys)
+  (setenv "KCONFIG_NOTIMESTAMP" "1")
+  (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
+  ;(let ((arch ,(system->linux-architecture
+  ;                         (or (%current-target-system)
+  ;                             (%current-system)))))
+  ;  (setenv "ARCH" arch)
+  ;  (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")))
+  (when target
+    (setenv "CROSS_COMPILE" (string-append target "-"))
+    (format #t "`CROSS_COMPILE' set to `~a'~%"
+               (getenv "CROSS_COMPILE")))
+  ; TODO: (setenv "EXTRA_VERSION" ,extra-version)
+  ; TODO: kernel ".config".
+  #t)
+
+(define* (build #:key inputs make-flags #:allow-other-keys)
+  (apply invoke "make" "-C"
+         (string-append (assoc-ref inputs "linux-module-builder")
+                        "/lib/modules/build")
+         (string-append "M=" (getcwd))
+         (or make-flags '())))
+
+;; This block was copied from make-linux-libre--only took the "modules_install"
+;; part.
+(define* (install #:key inputs native-inputs outputs #:allow-other-keys)
+  (let* ((out (assoc-ref outputs "out"))
+         (moddir (string-append out "/lib/modules"))
+         (kmod (assoc-ref (or native-inputs inputs) "kmod")))
+    ;; Install kernel modules
+    (mkdir-p moddir)
+    (invoke "make" "-C"
+            (string-append (assoc-ref inputs "linux-module-builder")
+                           "/lib/modules/build")
+            (string-append "M=" (getcwd))
+            (string-append "DEPMOD=" kmod "/bin/depmod")
+            (string-append "MODULE_DIR=" moddir)
+            (string-append "INSTALL_PATH=" out)
+            (string-append "INSTALL_MOD_PATH=" out)
+            "INSTALL_MOD_STRIP=1"
+            "modules_install")))
+
+(define %standard-phases
+  (modify-phases gnu:%standard-phases
+    (replace 'configure configure)
+    (replace 'build build)
+    (replace 'install install)))
+
+(define* (linux-module-build #:key inputs (phases %standard-phases)
+                       #:allow-other-keys #:rest args)
+  "Build the given package, applying all of PHASES in order, with a Linux kernel in attendance."
+  (apply gnu:gnu-build
+         #:inputs inputs #:phases phases
+         args))
+
+;;; linux-module-build-system.scm ends here
diff --git a/guix/colors.scm b/guix/colors.scm
new file mode 100644
index 0000000000..7949cf5763
--- /dev/null
+++ b/guix/colors.scm
@@ -0,0 +1,188 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 2014 Free Software Foundation, Inc.
+;;; Copyright © 2018 Sahithi Yarlagadda <sahi@swecha.net>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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 (guix colors)
+  #:use-module (guix memoization)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-9)
+  #:use-module (srfi srfi-9 gnu)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
+  #:export (color
+            color?
+
+            colorize-string
+            highlight
+            color-rules
+            color-output?
+            isatty?*))
+
+;;; Commentary:
+;;;
+;;; This module provides tools to produce colored output using ANSI escapes.
+;;;
+;;; Code:
+
+;; Record type for "colors", which are actually lists of color attributes.
+(define-record-type <color>
+  (make-color symbols ansi)
+  color?
+  (symbols  color-symbols)
+  (ansi     color-ansi))
+
+(define (print-color color port)
+  (format port "#<color ~a>"
+          (string-join (map symbol->string
+                            (color-symbols color)))))
+
+(set-record-type-printer! <color> print-color)
+
+(define-syntax define-color-table
+  (syntax-rules ()
+    "Define NAME as a macro that builds a list of color attributes."
+    ((_ name (color escape) ...)
+     (begin
+       (define-syntax color-codes
+         (syntax-rules (color ...)
+           ((_)
+            '())
+           ((_ color rest (... ...))
+            `(escape ,@(color-codes rest (... ...))))
+           ...))
+
+       (define-syntax-rule (name colors (... ...))
+         "Return a list of color attributes that can be passed to
+'colorize-string'."
+         (make-color '(colors (... ...))
+                     (color-codes->ansi (color-codes colors (... ...)))))))))
+
+(define-color-table color
+  (CLEAR        "0")
+  (RESET        "0")
+  (BOLD         "1")
+  (DARK         "2")
+  (UNDERLINE    "4")
+  (UNDERSCORE   "4")
+  (BLINK        "5")
+  (REVERSE      "6")
+  (CONCEALED    "8")
+  (BLACK       "30")
+  (RED         "31")
+  (GREEN       "32")
+  (YELLOW      "33")
+  (BLUE        "34")
+  (MAGENTA     "35")
+  (CYAN        "36")
+  (WHITE       "37")
+  (ON-BLACK    "40")
+  (ON-RED      "41")
+  (ON-GREEN    "42")
+  (ON-YELLOW   "43")
+  (ON-BLUE     "44")
+  (ON-MAGENTA  "45")
+  (ON-CYAN     "46")
+  (ON-WHITE    "47"))
+
+(define (color-codes->ansi codes)
+  "Convert CODES, a list of color attribute codes, to a ANSI escape string."
+  (match codes
+    (()
+     "")
+    (_
+     (string-append (string #\esc #\[)
+                    (string-join codes ";" 'infix)
+                    "m"))))
+
+(define %reset
+  (color RESET))
+
+(define (colorize-string str color)
+  "Return a copy of STR colorized using ANSI escape sequences according to
+COLOR.  At the end of the returned string, the color attributes are reset such
+that subsequent output will not have any colors in effect."
+  (string-append (color-ansi color)
+                 str
+                 (color-ansi %reset)))
+
+(define isatty?*
+  (mlambdaq (port)
+    "Return true if PORT is a tty.  Memoize the result."
+    (isatty? port)))
+
+(define (color-output? port)
+  "Return true if we should write colored output to PORT."
+  (and (not (getenv "INSIDE_EMACS"))
+       (not (getenv "NO_COLOR"))
+       (isatty?* port)))
+
+(define %highlight-color (color BOLD))
+
+(define* (highlight str #:optional (port (current-output-port)))
+  "Return STR with extra ANSI color attributes to highlight it if PORT
+supports it."
+  (if (color-output? port)
+      (colorize-string str %highlight-color)
+      str))
+
+(define (colorize-matches rules)
+  "Return a procedure that, when passed a string, returns that string
+colorized according to RULES.  RULES must be a list of tuples like:
+
+  (REGEXP COLOR1 COLOR2 ...)
+
+where COLOR1 specifies how to colorize the first submatch of REGEXP, and so
+on."
+  (lambda (str)
+    (if (string-index str #\nul)
+        str
+        (let loop ((rules rules))
+          (match rules
+            (()
+             str)
+            (((regexp . colors) . rest)
+             (match (regexp-exec regexp str)
+               (#f (loop rest))
+               (m  (let loop ((n 1)
+                              (colors colors)
+                              (result (list (match:prefix m))))
+                     (match colors
+                       (()
+                        (string-concatenate-reverse
+                         (cons (match:suffix m) result)))
+                       ((first . tail)
+                        (loop (+ n 1)
+                              tail
+                              (cons (colorize-string (match:substring m n)
+                                                     first)
+                                    result)))))))))))))
+
+(define-syntax color-rules
+  (syntax-rules ()
+    "Return a procedure that colorizes the string it is passed according to
+the given rules.  Each rule has the form:
+
+  (REGEXP COLOR1 COLOR2 ...)
+
+where COLOR1 specifies how to colorize the first submatch of REGEXP, and so
+on."
+    ((_ (regexp colors ...) ...)
+     (colorize-matches `((,(make-regexp regexp) ,(color colors) ...)
+                         ...)))))
diff --git a/guix/derivations.scm b/guix/derivations.scm
index fb2fa177be..7a5c3bca94 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -344,7 +344,8 @@ OUTPUTS of DRV and not already available in STORE, recursively, and the list
 of required store paths that can be substituted.  SUBSTITUTABLE-INFO must be a
 one-argument procedure similar to that returned by 'substitution-oracle'."
   (define built?
-    (cut valid-path? store <>))
+    (mlambda (item)
+      (valid-path? store item)))
 
   (define input-built?
     (compose (cut any built? <>) derivation-input-output-paths))
diff --git a/guix/download.scm b/guix/download.scm
index 8865777818..11984cf671 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -415,11 +415,7 @@
               (object->string %content-addressed-mirrors)))
 
 (define built-in-builders*
-  (let ((proc (store-lift built-in-builders)))
-    (lambda ()
-      "Return, as a monadic value, the list of built-in builders supported by
-the daemon; cache the return value."
-      (mcached (proc) built-in-builders))))
+  (store-lift built-in-builders))
 
 (define* (built-in-download file-name url
                             #:key system hash-algo hash
diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index 36028a01d6..5dcc0e97a3 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -58,7 +58,12 @@
 (define-peg-pattern weird-record all (and key (* SP) dict))
 (define-peg-pattern key body (+ (or (range #\a #\z) "-")))
 (define-peg-pattern value body (and (or conditional-value ground-value operator) (* SP)))
-(define-peg-pattern ground-value body (and (or multiline-string string-pat list-pat var) (* SP)))
+(define-peg-pattern choice-pat all (and (ignore "(") (* SP) choice (* SP)  (ignore ")")))
+(define-peg-pattern choice body
+  (or (and (or conditional-value ground-value) (* SP) (ignore "|") (* SP) choice)
+      conditional-value
+      ground-value))
+(define-peg-pattern ground-value body (and (or multiline-string string-pat choice-pat list-pat var) (* SP)))
 (define-peg-pattern conditional-value all (and ground-value (* SP) condition))
 (define-peg-pattern string-pat all (and QUOTE (* STRCHR) QUOTE))
 (define-peg-pattern list-pat all (and (ignore "[") (* SP) (* (and value (* SP))) (ignore "]")))
@@ -80,7 +85,8 @@
 (define-peg-pattern condition-form2 body
                     (and (* SP) (or condition-greater-or-equal condition-greater
                                     condition-lower-or-equal condition-lower
-                                    condition-neq condition-eq condition-content) (* SP)))
+                                    condition-neq condition-eq condition-not
+                                    condition-content) (* SP)))
 
 ;(define-peg-pattern condition-operator all (and (ignore operator) (* SP) condition-string))
 (define-peg-pattern condition-greater-or-equal all (and (ignore (and ">" "=")) (* SP) condition-string))
@@ -91,10 +97,12 @@
 (define-peg-pattern condition-or all (and condition-form2 (* SP) (ignore "|") (* SP) condition-form))
 (define-peg-pattern condition-eq all (and (? condition-content) (* SP) (ignore "=") (* SP) condition-content))
 (define-peg-pattern condition-neq all (and (? condition-content) (* SP) (ignore (and "!" "=")) (* SP) condition-content))
-(define-peg-pattern condition-content body (or condition-string condition-var))
+(define-peg-pattern condition-not all (and (ignore (and "!")) (* SP) condition-content))
+(define-peg-pattern condition-content body (or condition-paren condition-string condition-var))
 (define-peg-pattern condition-content2 body (and condition-content (* SP) (not-followed-by (or "&" "=" "!"))))
+(define-peg-pattern condition-paren body (and "(" condition-form ")"))
 (define-peg-pattern condition-string all (and QUOTE (* STRCHR) QUOTE))
-(define-peg-pattern condition-var all (+ (or (range #\a #\z) "-")))
+(define-peg-pattern condition-var all (+ (or (range #\a #\z) "-" ":")))
 
 (define (get-opam-repository)
   "Update or fetch the latest version of the opam repository and return the
@@ -171,18 +179,24 @@ path to the repository."
 (define (dependency->input dependency)
   (match dependency
     (('string-pat str) str)
+    ;; Arbitrary select the first dependency
+    (('choice-pat choice ...) (dependency->input (car choice)))
     (('conditional-value val condition)
      (if (native? condition) "" (dependency->input val)))))
 
 (define (dependency->native-input dependency)
   (match dependency
     (('string-pat str) "")
+    ;; Arbitrary select the first dependency
+    (('choice-pat choice ...) (dependency->input (car choice)))
     (('conditional-value val condition)
      (if (native? condition) (dependency->input val) ""))))
 
 (define (dependency->name dependency)
   (match dependency
     (('string-pat str) str)
+    ;; Arbitrary select the first dependency
+    (('choice-pat choice ...) (dependency->input (car choice)))
     (('conditional-value val condition)
      (dependency->name val))))
 
@@ -233,39 +247,55 @@ path to the repository."
              (url-dict (metadata-ref opam-content "url"))
              (source-url (metadata-ref url-dict "src"))
              (requirements (metadata-ref opam-content "depends"))
-             (dependencies (dependency-list->names requirements))
+             (dependencies (filter
+                              (lambda (name)
+                                (not (member name '("dune" "jbuilder"))))
+                              (dependency-list->names requirements)))
+             (native-dependencies (depends->native-inputs requirements))
              (inputs (dependency-list->inputs (depends->inputs requirements)))
-             (native-inputs (dependency-list->inputs (depends->native-inputs requirements))))
-        (call-with-temporary-output-file
-          (lambda (temp port)
-            (and (url-fetch source-url temp)
-                 (values
-                  `(package
-                     (name ,(ocaml-name->guix-name name))
-                     (version ,(if (string-prefix? "v" version)
-                                 (substring version 1)
-                                 version))
-                     (source
-                       (origin
-                         (method url-fetch)
-                         (uri ,source-url)
-                         (sha256 (base32 ,(guix-hash-url temp)))))
-                     (build-system ocaml-build-system)
-                     ,@(if (null? inputs)
-                         '()
-                         `((inputs ,(list 'quasiquote inputs))))
-                     ,@(if (null? native-inputs)
-                         '()
-                         `((native-inputs ,(list 'quasiquote native-inputs))))
-                     ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name)))
-                         '()
-                         `((properties
-                             ,(list 'quasiquote `((upstream-name . ,name))))))
-                     (home-page ,(metadata-ref opam-content "homepage"))
-                     (synopsis ,(metadata-ref opam-content "synopsis"))
-                     (description ,(metadata-ref opam-content "description"))
-                     (license #f))
-                  dependencies))))))
+             (native-inputs (dependency-list->inputs
+                              ;; Do not add dune nor jbuilder since they are
+                              ;; implicit inputs of the dune-build-system.
+                              (filter
+                                (lambda (name)
+                                  (not (member name '("dune" "jbuilder"))))
+                                native-dependencies))))
+        ;; If one of these are required at build time, it means we
+        ;; can use the much nicer dune-build-system.
+        (let ((use-dune? (or (member "dune" native-dependencies)
+                        (member "jbuilder" native-dependencies))))
+          (call-with-temporary-output-file
+            (lambda (temp port)
+              (and (url-fetch source-url temp)
+                   (values
+                    `(package
+                       (name ,(ocaml-name->guix-name name))
+                       (version ,(if (string-prefix? "v" version)
+                                   (substring version 1)
+                                   version))
+                       (source
+                         (origin
+                           (method url-fetch)
+                           (uri ,source-url)
+                           (sha256 (base32 ,(guix-hash-url temp)))))
+                       (build-system ,(if use-dune?
+                                          'dune-build-system
+                                          'ocaml-build-system))
+                       ,@(if (null? inputs)
+                           '()
+                           `((inputs ,(list 'quasiquote inputs))))
+                       ,@(if (null? native-inputs)
+                           '()
+                           `((native-inputs ,(list 'quasiquote native-inputs))))
+                       ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name)))
+                           '()
+                           `((properties
+                               ,(list 'quasiquote `((upstream-name . ,name))))))
+                       (home-page ,(metadata-ref opam-content "homepage"))
+                       (synopsis ,(metadata-ref opam-content "synopsis"))
+                       (description ,(metadata-ref opam-content "description"))
+                       (license #f))
+                    dependencies)))))))
 
 (define (opam-recursive-import package-name)
   (recursive-import package-name #f
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 6564526aee..dfc9ba1ca0 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -118,6 +118,7 @@
             profile-search-paths
 
             generation-number
+            generation-profile
             generation-numbers
             profile-generations
             relative-generation-spec->number
@@ -1552,6 +1553,20 @@ already effective."
              (compose string->number (cut match:substring <> 1)))
       0))
 
+(define %profile-generation-rx
+  ;; Regexp that matches profile generation.
+  (make-regexp "(.*)-([0-9]+)-link$"))
+
+(define (generation-profile file)
+  "If FILE is a profile generation GC root such as \"guix-profile-42-link\",
+return its corresponding profile---e.g., \"guix-profile\".  Otherwise return
+#f."
+  (match (regexp-exec %profile-generation-rx file)
+    (#f #f)
+    (m  (let ((profile (match:substring m 1)))
+          (and (file-exists? (string-append profile "/manifest"))
+               profile)))))
+
 (define (generation-numbers profile)
   "Return the sorted list of generation numbers of PROFILE, or '(0) if no
 former profiles were found."
diff --git a/guix/scripts.scm b/guix/scripts.scm
index e4b11d295d..77cbf12350 100644
--- a/guix/scripts.scm
+++ b/guix/scripts.scm
@@ -201,16 +201,12 @@ available."
     (when (< ratio threshold)
       (warning (G_ "only ~,1f% of free space available on ~a~%")
                (* ratio 100) (%store-prefix))
-      (if profile
-          (display-hint (format #f (G_ "Consider deleting old profile
+      (display-hint (format #f (G_ "Consider deleting old profile
 generations and collecting garbage, along these lines:
 
 @example
-guix package -p ~s --delete-generations=1m
-guix gc
+guix gc --delete-generations=1m
 @end example\n")
-                                profile))
-          (display-hint (G_ "Consider running @command{guix gc} to free
-space."))))))
+                            profile)))))
 
 ;;; scripts.scm ends here
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 28864435df..fc0c0e2ad3 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -119,7 +119,7 @@ found.  Return #f if no build log was found."
   (let* ((root (if (string-prefix? "/" root)
                    root
                    (string-append (canonicalize-path (dirname root))
-                                  "/" root))))
+                                  "/" (basename root)))))
     (catch 'system-error
       (lambda ()
         (match paths
diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 6f37b767ff..9a57e5fd1e 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,7 +20,10 @@
   #:use-module (guix ui)
   #:use-module (guix scripts)
   #:use-module (guix store)
+  #:use-module (guix store roots)
   #:autoload   (guix build syscalls) (free-disk-space)
+  #:autoload   (guix profiles) (generation-profile)
+  #:autoload   (guix scripts package) (delete-generations)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
@@ -47,7 +50,12 @@ Invoke the garbage collector.\n"))
   (display (G_ "
   -F, --free-space=FREE  attempt to reach FREE available space in the store"))
   (display (G_ "
-  -d, --delete           attempt to delete PATHS"))
+  -d, --delete-generations[=PATTERN]
+                         delete profile generations matching PATTERN"))
+  (display (G_ "
+  -D, --delete           attempt to delete PATHS"))
+  (display (G_ "
+      --list-roots       list the user's garbage collector roots"))
   (display (G_ "
       --optimize         optimize the store by deduplicating identical files"))
   (display (G_ "
@@ -95,6 +103,16 @@ Invoke the garbage collector.\n"))
             lst)
           '()))))
 
+(define (delete-old-generations store profile pattern)
+  "Remove the generations of PROFILE that match PATTERN, a duration pattern.
+Do nothing if none matches."
+  (let* ((current (generation-number profile))
+         (numbers (matching-generations pattern profile
+                                        #:duration-relation >)))
+
+    ;; Make sure we don't inadvertently remove the current generation.
+    (delete-generations store profile (delv current numbers))))
+
 (define %options
   ;; Specification of the command-line options.
   (list (option '(#\h "help") #f #f
@@ -120,10 +138,25 @@ Invoke the garbage collector.\n"))
         (option '(#\F "free-space") #t #f
                 (lambda (opt name arg result)
                   (alist-cons 'free-space (size->number arg) result)))
-        (option '(#\d "delete") #f #f
+        (option '(#\D "delete") #f #f            ;used to be '-d' (lower case)
                 (lambda (opt name arg result)
                   (alist-cons 'action 'delete
                               (alist-delete 'action result))))
+        (option '(#\d "delete-generations") #f #t
+                (lambda (opt name arg result)
+                  (if (and arg (store-path? arg))
+                      (begin
+                        (warning (G_ "'-d' as an alias for '--delete' \
+is deprecated; use '-D'~%"))
+                        `((action . delete)
+                          (argument . ,arg)
+                          (alist-delete 'action result)))
+                      (begin
+                        (when (and arg (not (string->duration arg)))
+                          (leave (G_ "~s does not denote a duration~%")
+                                 arg))
+                        (alist-cons 'delete-generations (or arg "")
+                                    result)))))
         (option '("optimize") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'action 'optimize
@@ -135,6 +168,10 @@ Invoke the garbage collector.\n"))
                                 (alist-cons 'verify-options options
                                             (alist-delete 'action
                                                           result))))))
+        (option '("list-roots") #f #f
+                (lambda (opt name arg result)
+                  (alist-cons 'action 'list-roots
+                              (alist-delete 'action result))))
         (option '("list-dead") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'action 'list-dead
@@ -205,6 +242,27 @@ Invoke the garbage collector.\n"))
             (info (G_ "freeing ~h MiBs~%") (/ to-free 1024. 1024.))
             (collect-garbage store to-free)))))
 
+  (define (delete-generations store pattern)
+    ;; Delete the generations matching PATTERN of all the user's profiles.
+    (let ((profiles (delete-duplicates
+                     (filter-map (lambda (root)
+                                   (and (or (zero? (getuid))
+                                            (user-owned? root))
+                                        (generation-profile root)))
+                                 (gc-roots)))))
+      (for-each (lambda (profile)
+                  (delete-old-generations store profile pattern))
+                profiles)))
+
+  (define (list-roots)
+    ;; List all the user-owned GC roots.
+    (let ((roots (filter (if (zero? (getuid)) (const #t) user-owned?)
+                         (gc-roots))))
+      (for-each (lambda (root)
+                  (display root)
+                  (newline))
+                roots)))
+
   (with-error-handling
     (let* ((opts  (parse-options))
            (store (open-connection))
@@ -229,6 +287,10 @@ Invoke the garbage collector.\n"))
          (assert-no-extra-arguments)
          (let ((min-freed  (assoc-ref opts 'min-freed))
                (free-space (assoc-ref opts 'free-space)))
+           (match (assoc-ref opts 'delete-generations)
+             (#f #t)
+             ((? string? pattern)
+              (delete-generations store pattern)))
            (cond
             (free-space
              (ensure-free-space store free-space))
@@ -238,6 +300,9 @@ Invoke the garbage collector.\n"))
             (else
              (let-values (((paths freed) (collect-garbage store)))
               (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.)))))))
+        ((list-roots)
+         (assert-no-extra-arguments)
+         (list-roots))
         ((delete)
          (delete-paths store (map direct-store-path paths)))
         ((list-references)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index b0c6a7ced7..564236988e 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -278,11 +278,19 @@ path definition to be returned."
                 (evaluate-search-paths search-paths profiles
                                        getenv))))
 
+(define (absolutize file)
+  "Return an absolute file name equivalent to FILE, but without resolving
+symlinks like 'canonicalize-path' would do."
+  (if (string-prefix? "/" file)
+      file
+      (string-append (getcwd) "/" file)))
+
 (define* (display-search-paths entries profiles
                                #:key (kind 'exact))
   "Display the search path environment variables that may need to be set for
 ENTRIES, a list of manifest entries, in the context of PROFILE."
-  (let* ((profiles (map user-friendly-profile profiles))
+  (let* ((profiles (map (compose user-friendly-profile absolutize)
+                        profiles))
          (settings (search-path-environment-variables entries profiles
                                                       #:kind kind)))
     (unless (null? settings)
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 2aaf1cc44a..55137fce8f 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -91,8 +91,6 @@ Download and deploy the latest version of Guix.\n"))
   (display (G_ "
   -p, --profile=PROFILE  use PROFILE instead of ~/.config/guix/current"))
   (display (G_ "
-  -n, --dry-run          show what would be pulled and built"))
-  (display (G_ "
   -v, --verbosity=LEVEL  use the given verbosity LEVEL"))
   (display (G_ "
   -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""))
diff --git a/guix/status.scm b/guix/status.scm
index bddaa003db..cbea4151f2 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -20,7 +20,7 @@
 (define-module (guix status)
   #:use-module (guix records)
   #:use-module (guix i18n)
-  #:use-module ((guix ui) #:select (colorize-string))
+  #:use-module (guix colors)
   #:use-module (guix progress)
   #:autoload   (guix build syscalls) (terminal-columns)
   #:use-module ((guix build download)
@@ -339,10 +339,6 @@ build-log\" traces."
   (and (current-store-protocol-version)
        (>= (current-store-protocol-version) #x163)))
 
-(define isatty?*
-  (mlambdaq (port)
-    (isatty? port)))
-
 (define spin!
   (let ((steps (circular-list "\\" "|" "/" "-")))
     (lambda (phase port)
@@ -362,44 +358,6 @@ the current build phase."
              (format port (G_ "'~a' phase") phase))
            (force-output port)))))))
 
-(define (color-output? port)
-  "Return true if we should write colored output to PORT."
-  (and (not (getenv "INSIDE_EMACS"))
-       (not (getenv "NO_COLOR"))
-       (isatty?* port)))
-
-(define-syntax color-rules
-  (syntax-rules ()
-    "Return a procedure that colorizes the string it is passed according to
-the given rules.  Each rule has the form:
-
-  (REGEXP COLOR1 COLOR2 ...)
-
-where COLOR1 specifies how to colorize the first submatch of REGEXP, and so
-on."
-    ((_ (regexp colors ...) rest ...)
-     (let ((next (color-rules rest ...))
-           (rx   (make-regexp regexp)))
-       (lambda (str)
-         (if (string-index str #\nul)
-             str
-             (match (regexp-exec rx str)
-               (#f (next str))
-               (m  (let loop ((n 1)
-                              (c '(colors ...))
-                              (result '()))
-                     (match c
-                       (()
-                        (string-concatenate-reverse result))
-                       ((first . tail)
-                        (loop (+ n 1) tail
-                              (cons (colorize-string (match:substring m n)
-                                                     first)
-                                    result)))))))))))
-    ((_)
-     (lambda (str)
-       str))))
-
 (define colorize-log-line
   ;; Take a string and return a possibly colorized string according to the
   ;; rules below.
@@ -452,17 +410,17 @@ produce colorful output.  When PRINT-LOG? is true, display the build log in
 addition to build events."
   (define info
     (if colorize?
-        (cut colorize-string <> 'BOLD)
+        (cute colorize-string <> (color BOLD))
         identity))
 
   (define success
     (if colorize?
-        (cut colorize-string <> 'GREEN 'BOLD)
+        (cute colorize-string <> (color GREEN BOLD))
         identity))
 
   (define failure
     (if colorize?
-        (cut colorize-string <> 'RED 'BOLD)
+        (cute colorize-string <> (color RED BOLD))
         identity))
 
   (define (report-build-progress phase %)
diff --git a/guix/store.scm b/guix/store.scm
index 0a0a7c7c52..1b485ab5fa 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -368,7 +368,9 @@
   (ats-cache    store-connection-add-to-store-cache)
   (atts-cache   store-connection-add-text-to-store-cache)
   (object-cache store-connection-object-cache
-                (default vlist-null)))            ;vhash
+                (default vlist-null))             ;vhash
+  (built-in-builders store-connection-built-in-builders
+                     (default (delay '()))))      ;promise
 
 (set-record-type-printer! <store-connection>
                           (lambda (obj port)
@@ -557,13 +559,17 @@ for this connection will be pinned.  Return a server object."
                           (write-int cpu-affinity port)))
                       (when (>= (protocol-minor v) 11)
                         (write-int (if reserve-space? 1 0) port))
-                      (let ((conn (%make-store-connection port
-                                                          (protocol-major v)
-                                                          (protocol-minor v)
-                                                          output flush
-                                                          (make-hash-table 100)
-                                                          (make-hash-table 100)
-                                                          vlist-null)))
+                      (letrec* ((built-in-builders
+                                 (delay (%built-in-builders conn)))
+                                (conn
+                                 (%make-store-connection port
+                                                         (protocol-major v)
+                                                         (protocol-minor v)
+                                                         output flush
+                                                         (make-hash-table 100)
+                                                         (make-hash-table 100)
+                                                         vlist-null
+                                                         built-in-builders)))
                         (let loop ((done? (process-stderr conn)))
                           (or done? (process-stderr conn)))
                         conn)))))))))
@@ -578,13 +584,17 @@ already taken place on PORT and that we're just continuing on this established
 connection.  Use with care."
   (let-values (((output flush)
                 (buffering-output-port port (make-bytevector 8192))))
-    (%make-store-connection port
-                            (protocol-major version)
-                            (protocol-minor version)
-                            output flush
-                            (make-hash-table 100)
-                            (make-hash-table 100)
-                            vlist-null)))
+    (define connection
+      (%make-store-connection port
+                              (protocol-major version)
+                              (protocol-minor version)
+                              output flush
+                              (make-hash-table 100)
+                              (make-hash-table 100)
+                              vlist-null
+                              (delay (%built-in-builders connection))))
+
+    connection))
 
 (define (store-connection-version store)
   "Return the protocol version of STORE as an integer."
@@ -602,19 +612,23 @@ connection.  Use with care."
   "Close the connection to SERVER."
   (close (store-connection-socket server)))
 
-(define-syntax-rule (with-store store exp ...)
-  "Bind STORE to an open connection to the store and evaluate EXPs;
-automatically close the store when the dynamic extent of EXP is left."
+(define (call-with-store proc)
+  "Call PROC with an open store connection."
   (let ((store (open-connection)))
     (dynamic-wind
       (const #f)
       (lambda ()
         (parameterize ((current-store-protocol-version
                         (store-connection-version store)))
-         exp) ...)
+          (proc store)))
       (lambda ()
         (false-if-exception (close-connection store))))))
 
+(define-syntax-rule (with-store store exp ...)
+  "Bind STORE to an open connection to the store and evaluate EXPs;
+automatically close the store when the dynamic extent of EXP is left."
+  (call-with-store (lambda (store) exp ...)))
+
 (define current-store-protocol-version
   ;; Protocol version of the store currently used.  XXX: This is a hack to
   ;; communicate the protocol version to the build output port.  It's a hack
@@ -982,14 +996,52 @@ string).  Raise an error if no such path exists."
          (operation (add-text-to-store (string name) (bytevector text)
                                        (string-list references))
                     #f
-                    store-path)))
+                    store-path))
+        (lookup (if (profiled? "add-data-to-store-cache")
+                    (let ((lookups 0)
+                          (hits    0)
+                          (drv     0)
+                          (scheme  0))
+                      (define (show-stats)
+                        (define (% n)
+                          (if (zero? lookups)
+                              100.
+                              (* 100. (/ n lookups))))
+
+                        (format (current-error-port) "
+'add-data-to-store' cache:
+  lookups:      ~5@a
+  hits:         ~5@a (~,1f%)
+  .drv files:   ~5@a (~,1f%)
+  Scheme files: ~5@a (~,1f%)~%"
+                                lookups hits (% hits)
+                                drv (% drv)
+                                scheme (% scheme)))
+
+                      (register-profiling-hook! "add-data-to-store-cache"
+                                                show-stats)
+                      (lambda (cache args)
+                        (let ((result (hash-ref cache args)))
+                          (set! lookups (+ 1 lookups))
+                          (when result
+                            (set! hits (+ 1 hits)))
+                          (match args
+                            ((_ name _)
+                             (cond ((string-suffix? ".drv" name)
+                                    (set! drv (+ drv 1)))
+                                   ((string-suffix? "-builder" name)
+                                    (set! scheme (+ scheme 1)))
+                                   ((string-suffix? ".scm" name)
+                                    (set! scheme (+ scheme 1))))))
+                          result)))
+                    hash-ref)))
     (lambda* (server name bytes #:optional (references '()))
       "Add BYTES under file NAME in the store, and return its store path.
 REFERENCES is the list of store paths referred to by the resulting store
 path."
       (let* ((args  `(,bytes ,name ,references))
              (cache (store-connection-add-text-to-store-cache server)))
-        (or (hash-ref cache args)
+        (or (lookup cache args)
             (let ((path (add-text-to-store server name bytes references)))
               (hash-set! cache args path)
               path))))))
@@ -1367,13 +1419,13 @@ that there is no guarantee that the order of the resulting list matches the
 order of PATHS."
              substitutable-path-list))
 
-(define built-in-builders
+(define %built-in-builders
   (let ((builders (operation (built-in-builders)
                              "Return the built-in builders."
                              string-list)))
     (lambda (store)
       "Return the names of the supported built-in derivation builders
-supported by STORE."
+supported by STORE.  The result is memoized for STORE."
       ;; Check whether STORE's version supports this RPC and built-in
       ;; derivation builders in general, which appeared in Guix > 0.11.0.
       ;; Return the empty list if it doesn't.  Note that this RPC does not
@@ -1384,6 +1436,11 @@ supported by STORE."
           (builders store)
           '()))))
 
+(define (built-in-builders store)
+  "Return the names of the supported built-in derivation builders
+supported by STORE."
+  (force (store-connection-built-in-builders store)))
+
 (define-operation (optimize-store)
   "Optimize the store by hard-linking identical files (\"deduplication\".)
 Return #t on success."
diff --git a/guix/store/roots.scm b/guix/store/roots.scm
new file mode 100644
index 0000000000..4f23ae34e8
--- /dev/null
+++ b/guix/store/roots.scm
@@ -0,0 +1,120 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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 (guix store roots)
+  #:use-module (guix config)
+  #:use-module ((guix store) #:select (store-path? %gc-roots-directory))
+  #:use-module (guix sets)
+  #:use-module (guix build syscalls)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-26)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
+  #:re-export (%gc-roots-directory)
+  #:export (gc-roots
+            user-owned?))
+
+;;; Commentary:
+;;;
+;;; This module provides tools to list and access garbage collector roots ("GC
+;;; roots").
+;;;
+;;; Code:
+
+(define %profile-directory
+  ;; Directory where user profiles are stored.
+  ;; XXX: This is redundant with the definition in (guix profiles) and not
+  ;; entirely needed since in practice /var/guix/gcroots/profiles links to
+  ;; it.
+  (string-append %state-directory "/profiles"))
+
+(define (gc-roots)
+  "Return the list of garbage collector roots (\"GC roots\").  This includes
+\"regular\" roots fount in %GC-ROOTS-DIRECTORY as well as indirect roots that
+are user-controlled symlinks stored anywhere on the file system."
+  (define (regular? file)
+    (match file
+      (((or "." "..") . _) #f)
+      (_ #t)))
+
+  (define (file-type=? type)
+    (match-lambda
+      ((file . properties)
+       (match (assq-ref properties 'type)
+         ('unknown
+          (let ((stat (lstat file)))
+            (eq? type (stat:type stat))))
+         (actual-type
+          (eq? type actual-type))))))
+
+  (define directory?
+    (file-type=? 'directory))
+
+  (define symlink?
+    (file-type=? 'symlink))
+
+  (define canonical-root
+    (match-lambda
+      ((file . properties)
+       (let ((target (readlink file)))
+         (cond ((store-path? target)
+                ;; Regular root: FILE points to the store.
+                file)
+
+               ;; Indirect root: FILE points to a user-controlled file outside
+               ;; the store.
+               ((string-prefix? "/" target)
+                target)
+               (else
+                (string-append (dirname file) "/" target)))))))
+
+  (let loop ((directories (list %gc-roots-directory
+                                %profile-directory))
+             (roots       '())
+             (visited     (set)))
+    (match directories
+      (()
+       roots)
+      ((directory . rest)
+       (if (set-contains? visited directory)
+           (loop rest roots visited)
+           (let*-values (((scope)
+                          (cut string-append directory "/" <>))
+                         ((sub-directories files)
+                          (partition directory?
+                                     (map (match-lambda
+                                            ((file . properties)
+                                             (cons (scope file) properties)))
+                                          (scandir* directory regular?)))))
+             (loop (append rest (map first sub-directories))
+                   (append (map canonical-root (filter symlink? files))
+                           roots)
+                   (set-insert directory visited))))))))
+
+(define* (user-owned? root #:optional (uid (getuid)))
+  "Return true if ROOT exists and is owned by UID, false otherwise."
+  ;; If ROOT is an indirect root, then perhaps it no longer exists.  Thus,
+  ;; catch 'system-error' exceptions.
+  (catch 'system-error
+    (lambda ()
+      (define stat
+        (lstat root))
+
+      (= (stat:uid stat) uid))
+    (const #f)))
diff --git a/guix/ui.scm b/guix/ui.scm
index 0070301c47..92c845e944 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -10,8 +10,6 @@
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch>
 ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com>
-;;; Copyright © 2013, 2014 Free Software Foundation, Inc.
-;;; Copyright © 2018 Sahithi Yarlagadda <sahi@swecha.net>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -31,6 +29,7 @@
 
 (define-module (guix ui)
   #:use-module (guix i18n)
+  #:use-module (guix colors)
   #:use-module (guix gexp)
   #:use-module (guix sets)
   #:use-module (guix utils)
@@ -118,8 +117,7 @@
             guix-warning-port
             warning
             info
-            guix-main
-            colorize-string))
+            guix-main))
 
 ;;; Commentary:
 ;;;
@@ -127,45 +125,124 @@
 ;;;
 ;;; Code:
 
-(define-syntax-rule (define-diagnostic name prefix)
-  "Create a diagnostic macro (i.e., NAME), which will prepend PREFIX to all
+(define-syntax highlight-argument
+  (lambda (s)
+    "Given FMT and ARG, expand ARG to a call that highlights it, provided FMT
+is a trivial format string."
+    (define (trivial-format-string? fmt)
+      (define len
+        (string-length fmt))
+
+      (let loop ((start 0))
+        (or (>= (+ 1 start) len)
+            (let ((tilde (string-index fmt #\~ start)))
+              (or (not tilde)
+                  (case (string-ref fmt (+ tilde 1))
+                    ((#\a #\A #\%) (loop (+ tilde 2)))
+                    (else          #f)))))))
+
+    ;; Be conservative: limit format argument highlighting to cases where the
+    ;; format string contains nothing but ~a escapes.  If it contained ~s
+    ;; escapes, this strategy wouldn't work.
+    (syntax-case s ()
+      ((_ "~a~%" arg)                          ;don't highlight whole messages
+       #'arg)
+      ((_ fmt arg)
+       (trivial-format-string? (syntax->datum #'fmt))
+       #'(%highlight-argument arg))
+      ((_ fmt arg)
+       #'arg))))
+
+(define* (%highlight-argument arg #:optional (port (guix-warning-port)))
+  "Highlight ARG, a format string argument, if PORT supports colors."
+  (cond ((string? arg)
+         (highlight arg port))
+        ((symbol? arg)
+         (highlight (symbol->string arg) port))
+        (else arg)))
+
+(define-syntax define-diagnostic
+  (syntax-rules ()
+    "Create a diagnostic macro (i.e., NAME), which will prepend PREFIX to all
 messages."
-  (define-syntax name
-    (lambda (x)
-      (define (augmented-format-string fmt)
-        (string-append "~:[~*~;guix ~a: ~]~a" (syntax->datum fmt)))
-
-      (syntax-case x ()
-        ((name (underscore fmt) args (... ...))
-         (and (string? (syntax->datum #'fmt))
-              (free-identifier=? #'underscore #'G_))
-         (with-syntax ((fmt*   (augmented-format-string #'fmt))
-                       (prefix (datum->syntax x prefix)))
-           #'(format (guix-warning-port) (gettext fmt*)
-                     (program-name) (program-name) prefix
-                     args (... ...))))
-        ((name (N-underscore singular plural n) args (... ...))
-         (and (string? (syntax->datum #'singular))
-              (string? (syntax->datum #'plural))
-              (free-identifier=? #'N-underscore #'N_))
-         (with-syntax ((s      (augmented-format-string #'singular))
-                       (p      (augmented-format-string #'plural))
-                       (prefix (datum->syntax x prefix)))
-           #'(format (guix-warning-port)
-                     (ngettext s p n %gettext-domain)
-                     (program-name) (program-name) prefix
-                     args (... ...))))))))
-
-(define-diagnostic warning "warning: ") ; emit a warning
-(define-diagnostic info "")
-
-(define-diagnostic report-error "error: ")
+    ((_ name (G_ prefix) colors)
+     (define-syntax name
+       (lambda (x)
+         (syntax-case x ()
+           ((name location (underscore fmt) args (... ...))
+            (and (string? (syntax->datum #'fmt))
+                 (free-identifier=? #'underscore #'G_))
+            #'(begin
+                (print-diagnostic-prefix prefix location
+                                         #:colors colors)
+                (format (guix-warning-port) (gettext fmt %gettext-domain)
+                        (highlight-argument fmt args) (... ...))))
+           ((name location (N-underscore singular plural n)
+                  args (... ...))
+            (and (string? (syntax->datum #'singular))
+                 (string? (syntax->datum #'plural))
+                 (free-identifier=? #'N-underscore #'N_))
+            #'(begin
+                (print-diagnostic-prefix prefix location
+                                         #:colors colors)
+                (format (guix-warning-port)
+                        (ngettext singular plural n %gettext-domain)
+                        (highlight-argument singular args) (... ...))))
+           ((name (underscore fmt) args (... ...))
+            (free-identifier=? #'underscore #'G_)
+            #'(name #f (underscore fmt) args (... ...)))
+           ((name (N-underscore singular plural n)
+                  args (... ...))
+            (free-identifier=? #'N-underscore #'N_)
+            #'(name #f (N-underscore singular plural n)
+                    args (... ...)))))))))
+
+;; XXX: This doesn't work well for right-to-left languages.
+;; TRANSLATORS: The goal is to emit "warning:" followed by a short phrase;
+;; "~a" is a placeholder for that phrase.
+(define-diagnostic warning (G_ "warning: ") %warning-color) ;emit a warning
+(define-diagnostic info (G_ "") %info-color)
+(define-diagnostic report-error (G_ "error: ") %error-color)
+
 (define-syntax-rule (leave args ...)
   "Emit an error message and exit."
   (begin
     (report-error args ...)
     (exit 1)))
 
+(define %warning-color (color BOLD MAGENTA))
+(define %info-color (color BOLD))
+(define %error-color (color BOLD RED))
+(define %hint-color (color BOLD CYAN))
+
+(define* (print-diagnostic-prefix prefix #:optional location
+                                  #:key (colors (color)))
+  "Print PREFIX as a diagnostic line prefix."
+  (define color?
+    (color-output? (guix-warning-port)))
+
+  (define location-color
+    (if color?
+        (cut colorize-string <> (color BOLD))
+        identity))
+
+  (define prefix-color
+    (if color?
+        (lambda (prefix)
+          (colorize-string prefix colors))
+        identity))
+
+  (let ((prefix (if (string-null? prefix)
+                    prefix
+                    (gettext prefix %gettext-domain))))
+    (if location
+        (format (guix-warning-port) "~a: ~a"
+                (location-color (location->string location))
+                (prefix-color prefix))
+        (format (guix-warning-port) "~:[~*~;guix ~a: ~]~a"
+                (program-name) (program-name)
+                (prefix-color prefix)))))
+
 (define (print-unbound-variable-error port key args default-printer)
   ;; Print unbound variable errors more nicely, and in the right language.
   (match args
@@ -317,11 +394,18 @@ VARIABLE and return it, or #f if none was found."
 (define* (display-hint message #:optional (port (current-error-port)))
   "Display MESSAGE, a l10n message possibly containing Texinfo markup, to
 PORT."
-  (format port (G_ "hint: ~a~%")
-          ;; XXX: We should arrange so that the initial indent is wider.
-          (parameterize ((%text-width (max 15
-                                           (- (terminal-columns) 5))))
-            (texi->plain-text message))))
+  (define colorize
+    (if (color-output? port)
+        (lambda (str)
+          (colorize-string str %hint-color))
+        identity))
+
+  (display (colorize (G_ "hint: ")) port)
+  (display
+   ;; XXX: We should arrange so that the initial indent is wider.
+   (parameterize ((%text-width (max 15 (- (terminal-columns) 5))))
+     (texi->plain-text message))
+   port))
 
 (define* (report-unbound-variable-error args #:key frame)
   "Return the given unbound-variable error, where ARGS is the list of 'throw'
@@ -356,21 +440,15 @@ ARGS is the list of arguments received by the 'throw' handler."
          (apply throw args)))
     (('syntax-error proc message properties form . rest)
      (let ((loc (source-properties->location properties)))
-       (format (current-error-port) (G_ "~a: error: ~a~%")
-               (location->string loc) message)))
+       (report-error loc (G_ "~a~%") message)))
     (('unbound-variable _ ...)
      (report-unbound-variable-error args #:frame frame))
     (('srfi-34 obj)
      (if (message-condition? obj)
-         (if (error-location? obj)
-             (format (current-error-port)
-                     (G_ "~a: error: ~a~%")
-                     (location->string (error-location obj))
-                     (gettext (condition-message obj)
-                              %gettext-domain))
-             (report-error (G_ "~a~%")
-                           (gettext (condition-message obj)
-                                    %gettext-domain)))
+         (report-error (and (error-location? obj)
+                            (error-location obj))
+                       (G_ "~a~%")
+                       (gettext (condition-message obj) %gettext-domain))
          (report-error (G_ "exception thrown: ~s~%") obj))
      (when (fix-hint? obj)
        (display-hint (condition-fix-hint obj))))
@@ -394,8 +472,7 @@ exiting.  ARGS is the list of arguments received by the 'throw' handler."
        (warning (G_ "failed to load '~a': ~a~%") file (strerror err))))
     (('syntax-error proc message properties form . rest)
      (let ((loc (source-properties->location properties)))
-       (format (current-error-port) (G_ "~a: warning: ~a~%")
-               (location->string loc) message)))
+       (warning loc (G_ "~a~%") message)))
     (('srfi-34 obj)
      (if (message-condition? obj)
          (warning (G_ "failed to load '~a': ~a~%")
@@ -727,17 +804,14 @@ directories:~{ ~a~}~%")
                     (cons (invoke-error-program c)
                           (invoke-error-arguments c))))
             ((and (error-location? c) (message-condition? c))
-             (format (current-error-port)
-                     (G_ "~a: error: ~a~%")
-                     (location->string (error-location c))
-                     (gettext (condition-message c) %gettext-domain))
+             (report-error (error-location c) (G_ "~a~%")
+                           (gettext (condition-message c) %gettext-domain))
              (when (fix-hint? c)
                (display-hint (condition-fix-hint c)))
              (exit 1))
             ((and (message-condition? c) (fix-hint? c))
-             (format (current-error-port) "~a: error: ~a~%"
-                     (program-name)
-                     (gettext (condition-message c) %gettext-domain))
+             (report-error (G_ "~a~%")
+                           (gettext (condition-message c) %gettext-domain))
              (display-hint (condition-fix-hint c))
              (exit 1))
             ((message-condition? c)
@@ -1490,7 +1564,7 @@ DURATION-RELATION with the current time."
 (define (display-generation profile number)
   "Display a one-line summary of generation NUMBER of PROFILE."
   (unless (zero? number)
-    (let ((header (format #f (G_ "Generation ~a\t~a") number
+    (let ((header (format #f (highlight (G_ "Generation ~a\t~a")) number
                           (date->string
                            (time-utc->date
                             (generation-time profile number))
@@ -1703,54 +1777,4 @@ and signal handling has already been set up."
   (initialize-guix)
   (apply run-guix args))
 
-(define color-table
-  `((CLEAR       .   "0")
-    (RESET       .   "0")
-    (BOLD        .   "1")
-    (DARK        .   "2")
-    (UNDERLINE   .   "4")
-    (UNDERSCORE  .   "4")
-    (BLINK       .   "5")
-    (REVERSE     .   "6")
-    (CONCEALED   .   "8")
-    (BLACK       .  "30")
-    (RED         .  "31")
-    (GREEN       .  "32")
-    (YELLOW      .  "33")
-    (BLUE        .  "34")
-    (MAGENTA     .  "35")
-    (CYAN        .  "36")
-    (WHITE       .  "37")
-    (ON-BLACK    .  "40")
-    (ON-RED      .  "41")
-    (ON-GREEN    .  "42")
-    (ON-YELLOW   .  "43")
-    (ON-BLUE     .  "44")
-    (ON-MAGENTA  .  "45")
-    (ON-CYAN     .  "46")
-    (ON-WHITE    .  "47")))
-
-(define (color . lst)
-  "Return a string containing the ANSI escape sequence for producing the
-requested set of attributes in LST.  Unknown attributes are ignored."
-  (let ((color-list
-         (remove not
-                 (map (lambda (color) (assq-ref color-table color))
-                      lst))))
-    (if (null? color-list)
-        ""
-        (string-append
-         (string #\esc #\[)
-         (string-join color-list ";" 'infix)
-         "m"))))
-
-(define (colorize-string str . color-list)
-  "Return a copy of STR colorized using ANSI escape sequences according to the
-attributes STR.  At the end of the returned string, the color attributes will
-be reset such that subsequent output will not have any colors in effect."
-  (string-append
-   (apply color color-list)
-   str
-   (color 'RESET)))
-
 ;;; ui.scm ends here
diff --git a/po/guix/fr.po b/po/guix/fr.po
index 7928b4f93d..6378164185 100644
--- a/po/guix/fr.po
+++ b/po/guix/fr.po
@@ -15,10 +15,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: guix 0.16.0\n"
+"Project-Id-Version: guix 1.0.0-pre1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2018-11-28 15:05+0100\n"
-"PO-Revision-Date: 2018-12-03 19:23+0100\n"
+"POT-Creation-Date: 2019-04-10 21:48+0200\n"
+"PO-Revision-Date: 2019-04-15 21:19+0200\n"
 "Last-Translator: Julien Lepiller <julien@lepiller.eu>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -29,12 +29,12 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Offlate 0.1\n"
 
-#: gnu.scm:82
+#: gnu.scm:83
 #, scheme-format
 msgid "module ~a not found"
-msgstr "module « ~a » introuvable"
+msgstr "module ~a introuvable"
 
-#: gnu.scm:100
+#: gnu.scm:101
 msgid ""
 "You may use @command{guix package --show=foo | grep location} to search\n"
 "for the location of package @code{foo}.\n"
@@ -46,12 +46,12 @@ msgstr ""
 "Si vous voyez la ligne @code{location: gnu/packages/bar.scm:174:2},\n"
 "ajoutez @code{bar} dans @code{use-package-modules}."
 
-#: gnu.scm:108
+#: gnu.scm:109
 #, scheme-format
 msgid "Try adding @code{(use-package-modules ~a)}."
 msgstr "Essayez d'ajouter @code{(use-package-modules ~a)}."
 
-#: gnu.scm:123
+#: gnu.scm:124
 #, scheme-format
 msgid ""
 "You may use @command{guix system search ~a} to search for a service\n"
@@ -64,47 +64,47 @@ msgstr ""
 "Si vous voyez la ligne @code{location: gnu/services/foo.scm:188:2},\n"
 "ajoutez @code{foo} dans @code{use-service-modules}."
 
-#: gnu.scm:132
+#: gnu.scm:133
 #, scheme-format
 msgid "Try adding @code{(use-service-modules ~a)}."
 msgstr "Essayez d'ajouter @code{(use-service-modules ~a)}."
 
-#: gnu/packages.scm:94
+#: gnu/packages.scm:103
 #, scheme-format
 msgid "~a: patch not found"
 msgstr "~a : correctif introuvable"
 
-#: gnu/packages.scm:110
+#: gnu/packages.scm:119
 #, scheme-format
 msgid "could not find bootstrap binary '~a' for system '~a'"
 msgstr "impossible de trouver le binaire d'initialisation « ~a » pour le système « ~a »"
 
-#: gnu/packages.scm:270
+#: gnu/packages.scm:480 gnu/packages.scm:521
 #, scheme-format
 msgid "ambiguous package specification `~a'~%"
 msgstr "spécification du paquet « ~a » ambiguë~%"
 
-#: gnu/packages.scm:271
+#: gnu/packages.scm:481 gnu/packages.scm:522
 #, scheme-format
 msgid "choosing ~a@~a from ~a~%"
 msgstr "choix de ~a@~a parmi ~a~%"
 
-#: gnu/packages.scm:276 guix/scripts/package.scm:206
+#: gnu/packages.scm:486 guix/scripts/package.scm:208
 #, scheme-format
 msgid "package '~a' has been superseded by '~a'~%"
 msgstr "le paquet « ~a » a été remplacé par « ~a »~%"
 
-#: gnu/packages.scm:283
+#: gnu/packages.scm:493 gnu/packages.scm:510
 #, scheme-format
 msgid "~A: package not found for version ~a~%"
 msgstr "~A : paquet introuvable pour la version ~a~%"
 
-#: gnu/packages.scm:284
+#: gnu/packages.scm:494 gnu/packages.scm:511
 #, scheme-format
 msgid "~A: unknown package~%"
 msgstr "~A : paquet inconnu~%"
 
-#: gnu/packages.scm:312
+#: gnu/packages.scm:546
 #, scheme-format
 msgid "package `~a' lacks output `~a'~%"
 msgstr "le paquet « ~a » requiert la sortie « ~a »~%"
@@ -213,22 +213,22 @@ msgstr "plus d'un service cible de type « ~a »"
 msgid "service of type '~a' not found"
 msgstr "service de type « ~a » pas trouvé"
 
-#: gnu/system.scm:317
+#: gnu/system.scm:329
 #, scheme-format
 msgid "unrecognized boot parameters at '~a'~%"
 msgstr "paramètres de démarrage non reconnus dans « ~a »~%"
 
-#: gnu/system.scm:725
+#: gnu/system.scm:727
 #, scheme-format
 msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%"
 msgstr "l'utilisation d'une chaîne pour le fichier « ~a » est obsolète. Utilisez plutôt « plain-file »~%"
 
-#: gnu/system.scm:741
+#: gnu/system.scm:743
 #, scheme-format
 msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%"
 msgstr "l'utilisation d'une valeur monadic pour « ~a » est obsolète. Utilisez plutôt « plain-file »~%"
 
-#: gnu/system.scm:885
+#: gnu/system.scm:888
 #, scheme-format
 msgid "~a: invalid locale name"
 msgstr "~a : nom d'environnement linguistique non valide"
@@ -243,12 +243,12 @@ msgstr "service « ~a » fourni plus d'une fois"
 msgid "service '~a' requires '~a', which is not provided by any service"
 msgstr "le service « ~a » requiert « ~a » qui n'est fourni pas aucun service"
 
-#: gnu/system/mapped-devices.scm:147
+#: gnu/system/mapped-devices.scm:136
 #, scheme-format
 msgid "you may need these modules in the initrd for ~a:~{ ~a~}"
 msgstr "vous pourriez avoir besoin de ces modules dans l’image de démarrage pour ~a :~{ ~a~}"
 
-#: gnu/system/mapped-devices.scm:151
+#: gnu/system/mapped-devices.scm:140
 #, scheme-format
 msgid ""
 "Try adding them to the\n"
@@ -278,42 +278,433 @@ msgstr ""
 "Si vous pensez que ce diagnostic est inexact, utilisez l'option @option{--skip-checks}\n"
 "de @command{guix system}.\n"
 
-#: gnu/system/mapped-devices.scm:230
+#: gnu/system/mapped-devices.scm:219
 #, scheme-format
 msgid "no LUKS partition with UUID '~a'"
 msgstr "aucune partition LUKS avec l’UUID « ~a »"
 
-#: gnu/system/shadow.scm:258
+#: gnu/system/shadow.scm:236
 #, scheme-format
 msgid "supplementary group '~a' of user '~a' is undeclared"
 msgstr "le groupe supplémentaire « ~a » de l'utilisateur « ~a » n'est pas déclaré"
 
-#: gnu/system/shadow.scm:268
+#: gnu/system/shadow.scm:246
 #, scheme-format
 msgid "primary group '~a' of user '~a' is undeclared"
 msgstr "le groupe primaire « ~a » de l'utilisateur « ~a » n'est pas déclaré"
 
-#: guix/scripts.scm:60
+#: guix/import/opam.scm:133
+#, scheme-format
+msgid "Package not found in opam repository: ~a~%"
+msgstr "Paquet introuvable dans le dépôt opam : ~a~%"
+
+#: guix/import/opam.scm:344
+msgid "Updater for OPAM packages"
+msgstr "Logiciel de mise à jour des paquets OPAM"
+
+#: gnu/installer.scm:183
+msgid "Locale"
+msgstr "Paramètres régionaux"
+
+#: gnu/installer.scm:199 gnu/installer/newt/timezone.scm:55
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+#: gnu/installer.scm:215
+msgid "Keyboard mapping selection"
+msgstr "Sélection de la disposition du clavier"
+
+#: gnu/installer.scm:224
+msgid "Partitioning"
+msgstr "Partitionnement"
+
+#: gnu/installer.scm:232 gnu/installer/newt/hostname.scm:26
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+#: gnu/installer.scm:241
+msgid "Network selection"
+msgstr "Sélection du réseau"
+
+#: gnu/installer.scm:248 gnu/installer/newt/user.scm:46
+msgid "User creation"
+msgstr "Création de l'utilisateur"
+
+#: gnu/installer.scm:256
+msgid "Services"
+msgstr "Services"
+
+#: gnu/installer.scm:263
+msgid "Configuration file"
+msgstr "Fichier de configuration"
+
+#: gnu/installer/connman.scm:196
+msgid "Could not determine the state of connman."
+msgstr "Impossible de déterminer l'état de connman."
+
+#: gnu/installer/connman.scm:322
+msgid "Unable to find expected regexp."
+msgstr "Impossible de trouver l'expression régulière attendue."
+
+#: gnu/installer/newt.scm:60
+#, scheme-format
+msgid "The installer has encountered an unexpected problem. The backtrace is displayed below. Please report it by email to <~a>."
+msgstr "L'installateur a rencontré un problème inattendu. La trace de débogage est affichée ci-dessous. Merci de l'envoyer par courriel à <~a>."
+
+#: gnu/installer/newt.scm:63
+msgid "Unexpected problem"
+msgstr "Problème inattendu"
+
+#: gnu/installer/newt/ethernet.scm:65
+msgid "No ethernet service available, please try again."
+msgstr "Aucun service de réseau filaire disponible, réessayez."
+
+#: gnu/installer/newt/ethernet.scm:66
+msgid "No service"
+msgstr "Aucun service"
+
+#: gnu/installer/newt/ethernet.scm:71
+msgid "Please select an ethernet network."
+msgstr "Sélectionnez un réseau filaire."
+
+#: gnu/installer/newt/ethernet.scm:72
+msgid "Ethernet connection"
+msgstr "Connexion filaire"
+
+#: gnu/installer/newt/ethernet.scm:75 gnu/installer/newt/keymap.scm:43
+#: gnu/installer/newt/locale.scm:42 gnu/installer/newt/network.scm:61
+#: gnu/installer/newt/network.scm:76 gnu/installer/newt/page.scm:155
+#: gnu/installer/newt/page.scm:480 gnu/installer/newt/page.scm:537
+#: gnu/installer/newt/timezone.scm:60 gnu/installer/newt/user.scm:119
+#: gnu/installer/newt/wifi.scm:201
+msgid "Exit"
+msgstr "Sortir"
+
+#: gnu/installer/newt/hostname.scm:25
+msgid "Please enter the system hostname."
+msgstr "Saisissez le nom d'hôte du système."
+
+#: gnu/installer/newt/keymap.scm:36
+msgid "Layout"
+msgstr "Disposition"
+
+#: gnu/installer/newt/keymap.scm:39
+msgid "Please choose your keyboard layout."
+msgstr "Choisissez la disposition de votre clavier."
+
+#: gnu/installer/newt/keymap.scm:51
+msgid "Variant"
+msgstr "Variante"
+
+#: gnu/installer/newt/keymap.scm:54
+msgid "Please choose a variant for your keyboard layout."
+msgstr "Choisissez une variante pour la disposition de votre clavier."
+
+#: gnu/installer/newt/keymap.scm:58 gnu/installer/newt/locale.scm:56
+#: gnu/installer/newt/locale.scm:71 gnu/installer/newt/locale.scm:87
+#: gnu/installer/newt/timezone.scm:61
+msgid "Back"
+msgstr "Retour"
+
+#: gnu/installer/newt/locale.scm:33
+msgid "Locale language"
+msgstr "Paramètres linguistiques"
+
+#: gnu/installer/newt/locale.scm:36
+msgid "Choose the language to use for the installation process and for the installed system."
+msgstr "Choisissez la langue à utiliser pour le processus d'installation et le système installé."
+
+#: gnu/installer/newt/locale.scm:50
+msgid "Locale location"
+msgstr "Situation géographique"
+
+#: gnu/installer/newt/locale.scm:53
+msgid "Choose a territory for this language."
+msgstr "Choisissez votre situation géographique."
+
+#: gnu/installer/newt/locale.scm:64
+msgid "Locale codeset"
+msgstr "Jeu de caractères"
+
+#: gnu/installer/newt/locale.scm:67
+msgid "Choose the locale encoding."
+msgstr "Choisissez l'encodage de la langue."
+
+#: gnu/installer/newt/locale.scm:79
+msgid "Locale modifier"
+msgstr "Modificateur régional"
+
+#: gnu/installer/newt/locale.scm:82
+msgid "Choose your locale's modifier. The most frequent modifier is euro. It indicates that you want to use Euro as the currency symbol."
+msgstr "Choisissez le modificateur pour vos paramètres linguistiques. Le plus courant est « euro ». Cela indique que vous voulez utiliser l'Euro comme symbole monétaire."
+
+#: gnu/installer/newt/locale.scm:176
+msgid "No location"
+msgstr "Pas de situation géographique"
+
+#: gnu/installer/newt/locale.scm:203
+msgid "No modifier"
+msgstr "Pas de modificateur"
+
+#: gnu/installer/newt/menu.scm:35
+msgid "Choose where you want to resume the install.You can also abort the installation by pressing the Abort button."
+msgstr "Choisissez où reprendre l'installation. Vous pouvez aussi l'annuler en appuyant sur le bouton « Annuler »."
+
+#: gnu/installer/newt/menu.scm:37
+msgid "Installation menu"
+msgstr "Menu d'installation"
+
+#: gnu/installer/newt/menu.scm:41
+msgid "Abort"
+msgstr "Annuler"
+
+#: gnu/installer/newt/network.scm:59 gnu/installer/newt/network.scm:73
+msgid "Internet access"
+msgstr "Accès internet"
+
+#: gnu/installer/newt/network.scm:60 gnu/installer/newt/page.scm:154
+msgid "Continue"
+msgstr "Continuer"
+
+#: gnu/installer/newt/network.scm:62
+msgid "The install process requires Internet access but no network device were found. Do you want to continue anyway?"
+msgstr "Le processus d'installation a besoin d'un accès à internet mais aucun périphérique réseau n'a été trouvé. Voulez-vous tout de même continuer ?"
+
+#: gnu/installer/newt/network.scm:71
+msgid "The install process requires Internet access. Please select a network device."
+msgstr "Le processus d'installation a besoin d'une connexion internet. Sélectionnez un périphérique réseau."
+
+#: gnu/installer/newt/network.scm:95
+msgid "Powering technology"
+msgstr "Démarrage de la technologie"
+
+#: gnu/installer/newt/network.scm:115
+msgid "Checking connectivity"
+msgstr "Vérification de la connexion"
+
+#: gnu/installer/newt/network.scm:116
+msgid "Waiting for Internet access establishment..."
+msgstr "Attente de l'accès internet…"
+
+#: gnu/installer/newt/network.scm:126
+msgid "The selected network does not provide access to the Internet, please try again."
+msgstr "Le réseau sélectionné ne fournit pas d'accès à internet, réessayez."
+
+#: gnu/installer/newt/network.scm:128 gnu/installer/newt/wifi.scm:105
+msgid "Connection error"
+msgstr "Erreur à la connexion"
+
+#: gnu/installer/newt/page.scm:70
+#, scheme-format
+msgid "Connecting to ~a, please wait."
+msgstr "Connexion à ~a, patientez."
+
+#: gnu/installer/newt/page.scm:71
+msgid "Connection in progress"
+msgstr "Connexion…"
+
+#: gnu/installer/newt/page.scm:88 gnu/installer/newt/page.scm:479
+#: gnu/installer/newt/page.scm:536 gnu/installer/newt/user.scm:44
+#: gnu/installer/newt/user.scm:118
+msgid "OK"
+msgstr "OK"
+
+#: gnu/installer/newt/page.scm:103
+msgid "Please enter a non empty input."
+msgstr "Saisissez une valeur non vide."
+
+#: gnu/installer/newt/page.scm:104 gnu/installer/newt/user.scm:76
+msgid "Empty input"
+msgstr "Valeur vide"
+
+#: gnu/installer/newt/services.scm:35
+msgid "Please select the desktop(s) environment(s) you wish to install. If you select multiple desktops environments, you will be able to choose the one to use on the log-in screen."
+msgstr "Sélectionnez les environnements de bureau que vous souhaitez installer. Si vous sélectionnez plusieurs environnements de bureau, vous pourrez choisir celui à utiliser sur l'écran de connexion."
+
+#: gnu/installer/newt/services.scm:38
+msgid "Desktop environment"
+msgstr "Environnement de bureau"
+
+#: gnu/installer/newt/services.scm:53
+msgid "You can now select networking services to run on your system."
+msgstr "Vous pouvez maintenant sélectionner les services réseau à exécuter sur votre système."
+
+#: gnu/installer/newt/services.scm:55
+msgid "Network service"
+msgstr "Service réseau"
+
+#: gnu/installer/newt/timezone.scm:56
+msgid "Please select a timezone."
+msgstr "Sélectionnez un fuseau horaire."
+
+#: gnu/installer/newt/user.scm:36
+msgid "Name"
+msgstr "Nom"
+
+#: gnu/installer/newt/user.scm:38
+msgid "Home directory"
+msgstr "Répertoire personnel"
+
+#: gnu/installer/newt/user.scm:75
+msgid "Empty inputs are not allowed."
+msgstr "Les valeurs vides ne sont pas permises."
+
+#: gnu/installer/newt/user.scm:106
+msgid "Please add at least one user to system using the 'Add' button."
+msgstr "Ajoutez au moins un utilisateur au système avec le bouton « Ajouter »."
+
+#: gnu/installer/newt/user.scm:109
+msgid "Add"
+msgstr "Ajouter"
+
+#: gnu/installer/newt/user.scm:110
+msgid "Delete"
+msgstr "Supprimer"
+
+#: gnu/installer/newt/user.scm:169
+msgid "Please create at least one user."
+msgstr "Définissez au moins un utilisateur."
+
+#: gnu/installer/newt/user.scm:170
+msgid "No user"
+msgstr "Aucun utilisateur"
+
+#: gnu/installer/newt/welcome.scm:95
+msgid "GNU Guix install"
+msgstr "Installation de GNU Guix"
+
+#: gnu/installer/newt/welcome.scm:96
+msgid ""
+"Welcome to GNU Guix system installer!\n"
+"\n"
+"You will be guided through a graphical installation program.\n"
+"\n"
+"If you are familiar with GNU/Linux and you want tight control over the installation process, you can instead choose manual installation.  Documentation is accessible at any time by pressing Ctrl-Alt-F2."
+msgstr ""
+"Bienvenue dans l'installateur du système GNU Guix !\n"
+"\n"
+"Nous allons vous guider à travers ce programme d'installation graphique.\n"
+"\n"
+"Si vous connaissez bien GNU/Linux et que vous voulez contrôler finement le processus d'installation, vous pouvez aussi choisir l'installation manuelle.\n"
+"La documentation est disponible à tout moment en appuyant sur Ctrl-Alt-F2."
+
+#: gnu/installer/newt/welcome.scm:105
+msgid "Graphical install using a terminal based interface"
+msgstr "Installation graphique avec une interface orientée terminal"
+
+#: gnu/installer/newt/welcome.scm:108
+msgid "Install using the shell based process"
+msgstr "Installation avec un processus orienté shell"
+
+#: gnu/installer/newt/welcome.scm:115
+msgid "Reboot"
+msgstr "Redémarrer"
+
+#: gnu/installer/newt/wifi.scm:80
+msgid "Unable to find a wifi technology"
+msgstr "Impossible de trouver un périphérique wifi"
+
+#: gnu/installer/newt/wifi.scm:84
+msgid "Scanning wifi for available networks, please wait."
+msgstr "Scan des réseaux wifi disponible, patientez."
+
+#: gnu/installer/newt/wifi.scm:85
+msgid "Scan in progress"
+msgstr "Scan en cours…"
+
+#: gnu/installer/newt/wifi.scm:89
+msgid "Please enter the wifi password."
+msgstr "Saisissez le mot de passe wifi."
+
+#: gnu/installer/newt/wifi.scm:90
+msgid "Password required"
+msgstr "Mot de passe requis"
+
+#: gnu/installer/newt/wifi.scm:95
+#, scheme-format
+msgid "The password you entered for ~a is incorrect."
+msgstr "Le mot de passe que vous avez saisi pour ~a est incorrect."
+
+#: gnu/installer/newt/wifi.scm:97
+msgid "Wrong password"
+msgstr "Mauvais mot de passe"
+
+#: gnu/installer/newt/wifi.scm:103
+#, scheme-format
+msgid "An error occurred while trying to connect to ~a, please retry."
+msgstr "Une erreur est survenue lors de la tentative de connexion à ~a, réessayez."
+
+#: gnu/installer/newt/wifi.scm:196
+msgid "Please select a wifi network."
+msgstr "Sélectionnez un réseau wifi."
+
+#: gnu/installer/newt/wifi.scm:202
+msgid "Scan"
+msgstr "Scan"
+
+#: gnu/installer/newt/wifi.scm:207
+msgid "No wifi detected"
+msgstr "Aucun réseau wifi détecté"
+
+#: gnu/installer/newt/wifi.scm:222
+msgid "Wifi"
+msgstr "Wifi"
+
+#: gnu/installer/parted.scm:428 gnu/installer/parted.scm:465
+msgid "Free space"
+msgstr "Espace libre"
+
+#: gnu/installer/parted.scm:1345
+#, scheme-format
+msgid "Device ~a is still in use."
+msgstr "Le périphérique ~a est toujours utilisé."
+
+#: gnu/installer/services.scm:66
+msgid "OpenSSH secure shell daemon (sshd)"
+msgstr "Démon de shell sécurisé OpenSSH (sshd)"
+
+#: gnu/installer/services.scm:70
+msgid "Tor anonymous network router"
+msgstr "Réseau anonyme Tor"
+
+#: gnu/installer/services.scm:76
+msgid "NetworkManager network connection manager"
+msgstr "Gestionnaire de connexions réseaux NetworkManager"
+
+#: gnu/installer/services.scm:80
+msgid "Connman network connection manager"
+msgstr "Gestionnaire de connexions réseaux Connman"
+
+#: gnu/installer/services.scm:84
+msgid "DHCP client (dynamic IP address assignment)"
+msgstr "Client DHCP (affectation dynamique d'adresse IP)"
+
+#: gnu/installer/timezone.scm:110
+#, scheme-format
+msgid "Unable to locate path: ~a."
+msgstr "Impossible de trouver le chemin : ~a."
+
+#: guix/scripts.scm:61
 #, scheme-format
 msgid "invalid argument: ~a~%"
 msgstr "argument non valide : ~a~%"
 
-#: guix/scripts.scm:88 guix/scripts/download.scm:135
+#: guix/scripts.scm:89 guix/scripts/download.scm:135
 #: guix/scripts/import/cran.scm:84 guix/scripts/import/elpa.scm:85
-#: guix/scripts/publish.scm:881 guix/scripts/edit.scm:81
-#: guix/scripts/describe.scm:197 guix/scripts/processes.scm:216
+#: guix/scripts/publish.scm:888 guix/scripts/edit.scm:79
+#: guix/scripts/describe.scm:199 guix/scripts/processes.scm:216
 #, scheme-format
 msgid "~A: unrecognized option~%"
 msgstr "~A : option non reconnue~%"
 
-#: guix/scripts.scm:182
+#: guix/scripts.scm:172
 #, scheme-format
 msgid "Your Guix installation is ~a day old.\n"
 msgid_plural "Your Guix installation is ~a days old.\n"
 msgstr[0] "Votre installation Guix est vieille de ~a jour.\n"
 msgstr[1] "Votre installation Guix est vieille de ~a jours.\n"
 
-#: guix/scripts.scm:187
+#: guix/scripts.scm:178
 #, scheme-format
 msgid ""
 "Consider running 'guix pull' followed by\n"
@@ -322,52 +713,48 @@ msgstr ""
 "Envisagez d'exécuter « guix pull » suivi de\n"
 "« ~a » pour obtenir des paquets à jour et des mises à jour de sécurité.\n"
 
-#: guix/scripts.scm:211
+#: guix/scripts.scm:202
 #, scheme-format
 msgid "only ~,1f% of free space available on ~a~%"
 msgstr "seulement ~,1f % d'espace libre sur ~a~%"
 
-#: guix/scripts.scm:214
-#, scheme-format
+#: guix/scripts.scm:204
 msgid ""
 "Consider deleting old profile\n"
 "generations and collecting garbage, along these lines:\n"
 "\n"
 "@example\n"
-"guix package -p ~s --delete-generations=1m\n"
-"guix gc\n"
+"guix gc --delete-generations=1m\n"
 "@end example\n"
 msgstr ""
 "Pensez à supprimer de vieilles générations du profil\n"
 "et à lancer le ramasse-miettes de cette façon :\n"
 "\n"
 "@example\n"
-"guix package -p ~s --delete-generations=1m\n"
-"guix gc\n"
+"guix gc --delete-generations=1m\n"
 "@end example\n"
 
-#: guix/scripts.scm:222
-msgid ""
-"Consider running @command{guix gc} to free\n"
-"space."
-msgstr "Pensez à lancer @command{guix gc} pour libérer de l'espace."
-
-#: guix/scripts/build.scm:84
+#: guix/scripts/build.scm:86
 #, scheme-format
 msgid "cannot access build log at '~a':~%"
 msgstr "aucun journal de compilation sur « ~a »~%"
 
-#: guix/scripts/build.scm:138
+#: guix/scripts/build.scm:140
 #, scheme-format
 msgid "failed to create GC root `~a': ~a~%"
 msgstr "impossible de créer la racine du GC « ~a » : ~a~%"
 
-#: guix/scripts/build.scm:240
+#: guix/scripts/build.scm:245 guix/scripts/build.scm:310
 #, scheme-format
 msgid "invalid replacement specification: ~s~%"
 msgstr "spécification de remplacement invalide : ~s~%"
 
-#: guix/scripts/build.scm:297
+#: guix/scripts/build.scm:292
+#, scheme-format
+msgid "the source of ~a is not a Git reference~%"
+msgstr "la source de ~a n'est pas une référence Git~%"
+
+#: guix/scripts/build.scm:417
 msgid ""
 "\n"
 "      --with-source=SOURCE\n"
@@ -377,7 +764,7 @@ msgstr ""
 "      --with-source=SOURCE\n"
 "                         utiliser la SOURCE donnée pour compiler le paquet correspondant"
 
-#: guix/scripts/build.scm:300
+#: guix/scripts/build.scm:420
 msgid ""
 "\n"
 "      --with-input=PACKAGE=REPLACEMENT\n"
@@ -387,7 +774,7 @@ msgstr ""
 "      --with-input=PAQUET=REMPLACEMENT\n"
 "                         remplacer le paquet de dépendance PAQUET par REMPLACEMENT"
 
-#: guix/scripts/build.scm:303
+#: guix/scripts/build.scm:423
 msgid ""
 "\n"
 "      --with-graft=PACKAGE=REPLACEMENT\n"
@@ -397,12 +784,42 @@ msgstr ""
 "      --with-graft=PAQUET=REMPLACEMENT\n"
 "                         greffer le paquet REMPLACEMENT sur les paquets qui font référence à PAQUET"
 
-#: guix/scripts/build.scm:328
+#: guix/scripts/build.scm:426
+msgid ""
+"\n"
+"      --with-branch=PACKAGE=BRANCH\n"
+"                         build PACKAGE from the latest commit of BRANCH"
+msgstr ""
+"\n"
+"      --with-branch=PAQUET=BRANCHE\n"
+"                         construit le PAQUET à partir du dernier commit de la BRANCHE"
+
+#: guix/scripts/build.scm:429
+msgid ""
+"\n"
+"      --with-commit=PACKAGE=COMMIT\n"
+"                         build PACKAGE from COMMIT"
+msgstr ""
+"\n"
+"      --with-commit=PAQUET=COMMIT\n"
+"                         construit le PAQUET à partir du COMMIT"
+
+#: guix/scripts/build.scm:432
+msgid ""
+"\n"
+"      --with-git-url=PACKAGE=URL\n"
+"                         build PACKAGE from the repository at URL"
+msgstr ""
+"\n"
+"      --with-git-url=PAQUET=URL\n"
+"                         construit le PAQUET à partir de l'URL du dépôt"
+
+#: guix/scripts/build.scm:463
 #, scheme-format
 msgid "transformation '~a' had no effect on ~a~%"
 msgstr "la transformation « ~a » n'a pas d'effet sur ~a~%"
 
-#: guix/scripts/build.scm:346
+#: guix/scripts/build.scm:481
 msgid ""
 "\n"
 "  -L, --load-path=DIR    prepend DIR to the package module search path"
@@ -410,7 +827,7 @@ msgstr ""
 "\n"
 "  -L, --load-path=REP    préfixer le chemin de recherche par REP"
 
-#: guix/scripts/build.scm:348
+#: guix/scripts/build.scm:483
 msgid ""
 "\n"
 "  -K, --keep-failed      keep build tree of failed builds"
@@ -418,7 +835,7 @@ msgstr ""
 "\n"
 "  -K, --keep-failed      garder l'arbre de compilation pour les compilations ayant échoué"
 
-#: guix/scripts/build.scm:350
+#: guix/scripts/build.scm:485
 msgid ""
 "\n"
 "  -k, --keep-going       keep going when some of the derivations fail"
@@ -426,7 +843,7 @@ msgstr ""
 "\n"
 "  -k, --keep-going       continuer si certaines dérivations échouent"
 
-#: guix/scripts/build.scm:352
+#: guix/scripts/build.scm:487
 msgid ""
 "\n"
 "  -n, --dry-run          do not build the derivations"
@@ -434,7 +851,7 @@ msgstr ""
 "\n"
 "  -n, --dry-run          ne pas compiler les dérivations"
 
-#: guix/scripts/build.scm:354
+#: guix/scripts/build.scm:489
 msgid ""
 "\n"
 "      --fallback         fall back to building when the substituter fails"
@@ -442,7 +859,7 @@ msgstr ""
 "\n"
 "      --fallback         revenir à la compilation quand le substitut échoue"
 
-#: guix/scripts/build.scm:356
+#: guix/scripts/build.scm:491
 msgid ""
 "\n"
 "      --no-substitutes   build instead of resorting to pre-built substitutes"
@@ -450,7 +867,7 @@ msgstr ""
 "\n"
 "      --no-substitutes   compiler plutôt que recourir à des substituts pré-compilés"
 
-#: guix/scripts/build.scm:358 guix/scripts/size.scm:223
+#: guix/scripts/build.scm:493 guix/scripts/size.scm:233
 msgid ""
 "\n"
 "      --substitute-urls=URLS\n"
@@ -460,7 +877,7 @@ msgstr ""
 "      --substitute-urls=URLS\n"
 "                         récupérer les substituts depuis les URLS si elles sont autorisées"
 
-#: guix/scripts/build.scm:361
+#: guix/scripts/build.scm:496
 msgid ""
 "\n"
 "      --no-grafts        do not graft packages"
@@ -468,7 +885,7 @@ msgstr ""
 "\n"
 "      --no-grafts        ne pas greffer les paquets"
 
-#: guix/scripts/build.scm:363
+#: guix/scripts/build.scm:498
 msgid ""
 "\n"
 "      --no-build-hook    do not attempt to offload builds via the build hook"
@@ -476,7 +893,7 @@ msgstr ""
 "\n"
 "      --no-build-hook    ne pas essayer de décharger les compilations via le hook de compilation"
 
-#: guix/scripts/build.scm:365
+#: guix/scripts/build.scm:500
 msgid ""
 "\n"
 "      --max-silent-time=SECONDS\n"
@@ -486,7 +903,7 @@ msgstr ""
 "      --max-silent-time=N\n"
 "                         marquer la compilation comme ayant échouée après N secondes de silence"
 
-#: guix/scripts/build.scm:368
+#: guix/scripts/build.scm:503
 msgid ""
 "\n"
 "      --timeout=SECONDS  mark the build as failed after SECONDS of activity"
@@ -494,15 +911,7 @@ msgstr ""
 "\n"
 "      --timeout=N        marquer la compilation comme ayant échouée après N secondes d'activité"
 
-#: guix/scripts/build.scm:370
-msgid ""
-"\n"
-"      --verbosity=LEVEL  use the given verbosity LEVEL"
-msgstr ""
-"\n"
-"      --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné"
-
-#: guix/scripts/build.scm:372
+#: guix/scripts/build.scm:505
 msgid ""
 "\n"
 "      --rounds=N         build N times in a row to detect non-determinism"
@@ -510,7 +919,7 @@ msgstr ""
 "\n"
 "      --rounds=N         compiler N fois de suite pour détecter les non déterminismes"
 
-#: guix/scripts/build.scm:374
+#: guix/scripts/build.scm:507
 msgid ""
 "\n"
 "  -c, --cores=N          allow the use of up to N CPU cores for the build"
@@ -518,7 +927,7 @@ msgstr ""
 "\n"
 "  -c, --cores=N          utiliser jusqu'à N cœurs CPU pour la compilation"
 
-#: guix/scripts/build.scm:376
+#: guix/scripts/build.scm:509
 msgid ""
 "\n"
 "  -M, --max-jobs=N       allow at most N build jobs"
@@ -526,12 +935,20 @@ msgstr ""
 "\n"
 "  -M, --max-jobs=N       autoriser au plus N tâches de compilation"
 
-#: guix/scripts/build.scm:486 guix/scripts/build.scm:493
+#: guix/scripts/build.scm:511
+msgid ""
+"\n"
+"      --debug=LEVEL      produce debugging output at LEVEL"
+msgstr ""
+"\n"
+"      --debug=NIVEAU     produire une sortie de débogage à ce NIVEAU"
+
+#: guix/scripts/build.scm:621 guix/scripts/build.scm:628
 #, scheme-format
 msgid "not a number: '~a' option argument: ~a~%"
 msgstr "pas un nombre: argument d'option « ~a » : ~a~%"
 
-#: guix/scripts/build.scm:514
+#: guix/scripts/build.scm:650
 msgid ""
 "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n"
 "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"
@@ -539,7 +956,7 @@ msgstr ""
 "Usage: guix build [OPTION]... PAQUET-OU-DERIVATION...\n"
 "Compiler le PAQUET-OU-DERIVATION donné et retourner leurs chemins de sortie.\n"
 
-#: guix/scripts/build.scm:516
+#: guix/scripts/build.scm:652
 msgid ""
 "\n"
 "  -e, --expression=EXPR  build the package or derivation EXPR evaluates to"
@@ -547,7 +964,7 @@ msgstr ""
 "\n"
 "  -e, --expression=EXPR  compiler le paquet ou la dérivation évalué par EXPR"
 
-#: guix/scripts/build.scm:518
+#: guix/scripts/build.scm:654
 msgid ""
 "\n"
 "  -f, --file=FILE        build the package or derivation that the code within\n"
@@ -557,7 +974,7 @@ msgstr ""
 "  -f, --file=FICHIER     compiler le paquet ou la dérivation qui est évaluée\n"
 "                         par le code dans FICHIER"
 
-#: guix/scripts/build.scm:521
+#: guix/scripts/build.scm:657
 msgid ""
 "\n"
 "  -S, --source           build the packages' source derivations"
@@ -565,7 +982,7 @@ msgstr ""
 "\n"
 "  -S, --source           compiler les dérivations de source du paquet"
 
-#: guix/scripts/build.scm:523
+#: guix/scripts/build.scm:659
 msgid ""
 "\n"
 "      --sources[=TYPE]   build source derivations; TYPE may optionally be one\n"
@@ -575,7 +992,8 @@ msgstr ""
 "      --sources[=TYPE]   compiler les dérivations sources. TYPE peut optionnellement\n"
 "                         être « package », « all » (défaut) ou « transitive »"
 
-#: guix/scripts/build.scm:526 guix/scripts/pack.scm:712
+#: guix/scripts/build.scm:662 guix/scripts/pull.scm:95
+#: guix/scripts/pack.scm:754
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""
@@ -583,7 +1001,7 @@ msgstr ""
 "\n"
 "  -s, --system=SYSTÈME   essayer de compiler pour le SYSTÈME donné, par exemple « i686-linux »"
 
-#: guix/scripts/build.scm:528 guix/scripts/pack.scm:714
+#: guix/scripts/build.scm:664 guix/scripts/pack.scm:756
 msgid ""
 "\n"
 "      --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""
@@ -591,7 +1009,7 @@ msgstr ""
 "\n"
 "      --target=TRIPLET   effectuer une compilation croisée pour TRIPLET, par exemple « armel-linux-gnu »"
 
-#: guix/scripts/build.scm:530
+#: guix/scripts/build.scm:666
 msgid ""
 "\n"
 "  -d, --derivations      return the derivation paths of the given packages"
@@ -599,7 +1017,7 @@ msgstr ""
 "\n"
 "  -d, --derivations      retourner les chemins de dérivation pour les paquets donnés"
 
-#: guix/scripts/build.scm:532
+#: guix/scripts/build.scm:668
 msgid ""
 "\n"
 "      --check            rebuild items to check for non-determinism issues"
@@ -607,7 +1025,7 @@ msgstr ""
 "\n"
 "      --check            recompiler les éléments pour détecter des problèmes de non déterminisme"
 
-#: guix/scripts/build.scm:534
+#: guix/scripts/build.scm:670
 msgid ""
 "\n"
 "      --repair           repair the specified items"
@@ -615,7 +1033,7 @@ msgstr ""
 "\n"
 "      --repair           réparer les éléments spécifiés"
 
-#: guix/scripts/build.scm:536
+#: guix/scripts/build.scm:672
 msgid ""
 "\n"
 "  -r, --root=FILE        make FILE a symlink to the result, and register it\n"
@@ -625,7 +1043,17 @@ msgstr ""
 "  -r, --root=FICHIER     faire de FICHIER un lien symbolique pointant sur le résultat\n"
 "                         et l'enregistrer en tant que racine du garbage collector"
 
-#: guix/scripts/build.scm:539
+#: guix/scripts/build.scm:675 guix/scripts/package.scm:360
+#: guix/scripts/pull.scm:93 guix/scripts/system.scm:1032
+#: guix/scripts/copy.scm:120 guix/scripts/pack.scm:771
+msgid ""
+"\n"
+"  -v, --verbosity=LEVEL  use the given verbosity LEVEL"
+msgstr ""
+"\n"
+"      --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné"
+
+#: guix/scripts/build.scm:677
 msgid ""
 "\n"
 "  -q, --quiet            do not show the build log"
@@ -633,7 +1061,7 @@ msgstr ""
 "\n"
 "  -q, --quiet            ne pas montrer le journal de compilation"
 
-#: guix/scripts/build.scm:541
+#: guix/scripts/build.scm:679
 msgid ""
 "\n"
 "      --log-file         return the log file names for the given derivations"
@@ -641,16 +1069,16 @@ msgstr ""
 "\n"
 "      --log-file         retourner les fichiers de journalisation pour les dérivations données"
 
-#: guix/scripts/build.scm:548 guix/scripts/download.scm:83
-#: guix/scripts/package.scm:366 guix/scripts/gc.scm:76
+#: guix/scripts/build.scm:686 guix/scripts/download.scm:83
+#: guix/scripts/package.scm:378 guix/scripts/gc.scm:84
 #: guix/scripts/hash.scm:60 guix/scripts/import.scm:93
-#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:95
-#: guix/scripts/substitute.scm:889 guix/scripts/system.scm:1017
-#: guix/scripts/lint.scm:1115 guix/scripts/publish.scm:94
-#: guix/scripts/edit.scm:44 guix/scripts/size.scm:234
-#: guix/scripts/graph.scm:472 guix/scripts/challenge.scm:241
-#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:730
-#: guix/scripts/weather.scm:259 guix/scripts/describe.scm:71
+#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:101
+#: guix/scripts/substitute.scm:898 guix/scripts/system.scm:1035
+#: guix/scripts/lint.scm:1178 guix/scripts/publish.scm:94
+#: guix/scripts/edit.scm:43 guix/scripts/size.scm:244
+#: guix/scripts/graph.scm:499 guix/scripts/challenge.scm:241
+#: guix/scripts/copy.scm:125 guix/scripts/pack.scm:776
+#: guix/scripts/weather.scm:270 guix/scripts/describe.scm:71
 #: guix/scripts/processes.scm:200 guix/scripts/container.scm:34
 #: guix/scripts/container/exec.scm:43
 msgid ""
@@ -660,16 +1088,16 @@ msgstr ""
 "\n"
 "  -h, --help             afficher cette aide et quitter"
 
-#: guix/scripts/build.scm:550 guix/scripts/download.scm:85
-#: guix/scripts/package.scm:368 guix/scripts/gc.scm:78
+#: guix/scripts/build.scm:688 guix/scripts/download.scm:85
+#: guix/scripts/package.scm:380 guix/scripts/gc.scm:86
 #: guix/scripts/hash.scm:62 guix/scripts/import.scm:95
-#: guix/scripts/import/cran.scm:51 guix/scripts/pull.scm:97
-#: guix/scripts/substitute.scm:891 guix/scripts/system.scm:1019
-#: guix/scripts/lint.scm:1119 guix/scripts/publish.scm:96
-#: guix/scripts/edit.scm:46 guix/scripts/size.scm:236
-#: guix/scripts/graph.scm:474 guix/scripts/challenge.scm:243
-#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:732
-#: guix/scripts/weather.scm:261 guix/scripts/describe.scm:73
+#: guix/scripts/import/cran.scm:51 guix/scripts/pull.scm:103
+#: guix/scripts/substitute.scm:900 guix/scripts/system.scm:1037
+#: guix/scripts/lint.scm:1182 guix/scripts/publish.scm:96
+#: guix/scripts/edit.scm:45 guix/scripts/size.scm:246
+#: guix/scripts/graph.scm:501 guix/scripts/challenge.scm:243
+#: guix/scripts/copy.scm:127 guix/scripts/pack.scm:778
+#: guix/scripts/weather.scm:272 guix/scripts/describe.scm:73
 #: guix/scripts/processes.scm:202 guix/scripts/container.scm:36
 #: guix/scripts/container/exec.scm:45
 msgid ""
@@ -679,7 +1107,7 @@ msgstr ""
 "\n"
 "  -V, --version          afficher les informations sur la version et quitter"
 
-#: guix/scripts/build.scm:577
+#: guix/scripts/build.scm:715
 #, scheme-format
 msgid ""
 "invalid argument: '~a' option argument: ~a, ~\n"
@@ -688,22 +1116,22 @@ msgstr ""
 "argument invalide: argument en option « ~a » : ~a, ~\n"
 "doit être « package », « all » ou « transitive »~%"
 
-#: guix/scripts/build.scm:630
+#: guix/scripts/build.scm:774
 #, scheme-format
 msgid "~s: not something we can build~%"
 msgstr "~s : pas quelque chose qu'on sait compiler~%"
 
-#: guix/scripts/build.scm:688
+#: guix/scripts/build.scm:832
 #, scheme-format
 msgid "~a: warning: package '~a' has no source~%"
 msgstr "~a : attention : le paquet « ~a » n'a pas de source~%"
 
-#: guix/scripts/build.scm:726
+#: guix/scripts/build.scm:872
 #, scheme-format
 msgid "no build log for '~a'~%"
 msgstr "aucun journal de compilation pour « ~a »~%"
 
-#: guix/discovery.scm:91
+#: guix/discovery.scm:92
 #, scheme-format
 msgid "cannot access `~a': ~a~%"
 msgstr "impossible d'accéder à « ~a » : ~a~%"
@@ -722,7 +1150,7 @@ msgstr ""
 "au fichier spécifié puis afficher son nom de fichier et l'empreinte de son\n"
 "contenu.\n"
 "\n"
-"Formats supportés : « nix-base32 » (par défaut), « base32 », et « base16 »\n"
+"Formats pris en charge : « nix-base32 » (par défaut), « base32 », et « base16 »\n"
 "(« hex » et « hexadecimal » peuvent aussi être utilisés).\n"
 
 #: guix/scripts/download.scm:75 guix/scripts/hash.scm:55
@@ -754,10 +1182,10 @@ msgstr ""
 #: guix/scripts/download.scm:103 guix/scripts/hash.scm:83
 #, scheme-format
 msgid "unsupported hash format: ~a~%"
-msgstr "format d'empreinte non supporté : ~a~%"
+msgstr "format d'empreinte non pris en charge : ~a~%"
 
-#: guix/scripts/download.scm:138 guix/scripts/package.scm:905
-#: guix/scripts/publish.scm:883
+#: guix/scripts/download.scm:138 guix/scripts/package.scm:896
+#: guix/scripts/publish.scm:890
 #, scheme-format
 msgid "~A: extraneous argument~%"
 msgstr "~A : argument superflu~%"
@@ -777,45 +1205,45 @@ msgstr "~a : impossible d'évaluer l'URI~%"
 msgid "~a: download failed~%"
 msgstr "~a : le téléchargement a échoué~%"
 
-#: guix/scripts/package.scm:109
+#: guix/scripts/package.scm:111
 #, scheme-format
 msgid "not removing generation ~a, which is current~%"
 msgstr "la génération ~a n'est pas supprimée car elle est actuelle~%"
 
-#: guix/scripts/package.scm:116
+#: guix/scripts/package.scm:118
 #, scheme-format
 msgid "no matching generation~%"
 msgstr "aucune génération correspondante~%"
 
-#: guix/scripts/package.scm:119 guix/scripts/package.scm:707
-#: guix/scripts/system.scm:622
+#: guix/scripts/package.scm:121 guix/scripts/package.scm:693
+#: guix/scripts/system.scm:626
 #, scheme-format
 msgid "invalid syntax: ~a~%"
 msgstr "syntaxe non valide : ~a~%"
 
-#: guix/scripts/package.scm:148
+#: guix/scripts/package.scm:150
 #, scheme-format
 msgid "nothing to be done~%"
 msgstr "aucune action à faire~%"
 
-#: guix/scripts/package.scm:162
+#: guix/scripts/package.scm:164
 #, scheme-format
 msgid "~a package in profile~%"
 msgid_plural "~a packages in profile~%"
 msgstr[0] "~a paquet dans le profile~%"
 msgstr[1] "~a paquets dans le profile~%"
 
-#: guix/scripts/package.scm:248
+#: guix/scripts/package.scm:251
 #, scheme-format
 msgid "package '~a' no longer exists~%"
 msgstr "le paquet « ~a » n'existe plus~%"
 
-#: guix/scripts/package.scm:286
+#: guix/scripts/package.scm:297
 #, scheme-format
 msgid "The following environment variable definitions may be needed:~%"
 msgstr "Il pourrait être nécessaire de définir les variables d'environnement suivantes :~%"
 
-#: guix/scripts/package.scm:305
+#: guix/scripts/package.scm:317
 msgid ""
 "Usage: guix package [OPTION]...\n"
 "Install, remove, or upgrade packages in a single transaction.\n"
@@ -823,7 +1251,7 @@ msgstr ""
 "Usage : guix package [OPTION]...\n"
 "Installer, supprimer ou mettre à jour les paquets en une seule transaction.\n"
 
-#: guix/scripts/package.scm:307
+#: guix/scripts/package.scm:319
 msgid ""
 "\n"
 "  -i, --install PACKAGE ...\n"
@@ -833,7 +1261,7 @@ msgstr ""
 "  -i, --install=PAQUET ...\n"
 "                         installer les PAQUETs"
 
-#: guix/scripts/package.scm:310
+#: guix/scripts/package.scm:322
 msgid ""
 "\n"
 "  -e, --install-from-expression=EXP\n"
@@ -843,7 +1271,7 @@ msgstr ""
 "  -e, --install-from-expression=EXP\n"
 "                         installer le paquet évalué par EXP"
 
-#: guix/scripts/package.scm:313
+#: guix/scripts/package.scm:325
 msgid ""
 "\n"
 "  -f, --install-from-file=FILE\n"
@@ -855,7 +1283,7 @@ msgstr ""
 "                         installer le paquet évalué par le code dans\n"
 "                         FICHIER"
 
-#: guix/scripts/package.scm:317
+#: guix/scripts/package.scm:329
 msgid ""
 "\n"
 "  -r, --remove PACKAGE ...\n"
@@ -865,7 +1293,7 @@ msgstr ""
 "  -r, --remove=PAQUET ...\n"
 "                         supprimer les PAQUETs"
 
-#: guix/scripts/package.scm:320
+#: guix/scripts/package.scm:332
 msgid ""
 "\n"
 "  -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP"
@@ -873,7 +1301,7 @@ msgstr ""
 "\n"
 "  -u, --upgrade[=REGEXP] mettre à jour tous les paquets installés correspondant à REGEXP"
 
-#: guix/scripts/package.scm:322
+#: guix/scripts/package.scm:334
 msgid ""
 "\n"
 "  -m, --manifest=FILE    create a new profile generation with the manifest\n"
@@ -883,7 +1311,7 @@ msgstr ""
 "  -m, --manifest=FICHIER créer une nouvelle génération de profil avec le\n"
 "                         manifeste dans FICHIER"
 
-#: guix/scripts/package.scm:325
+#: guix/scripts/package.scm:337
 msgid ""
 "\n"
 "      --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP"
@@ -891,7 +1319,7 @@ msgstr ""
 "\n"
 "      --do-not-upgrade[=REGEXP] ne pas mettre à jour les paquets correspondant à REGEXP"
 
-#: guix/scripts/package.scm:327
+#: guix/scripts/package.scm:339
 msgid ""
 "\n"
 "      --roll-back        roll back to the previous generation"
@@ -899,7 +1327,7 @@ msgstr ""
 "\n"
 "      --roll-back        revenir à la génération antérieure"
 
-#: guix/scripts/package.scm:329
+#: guix/scripts/package.scm:341
 msgid ""
 "\n"
 "      --search-paths[=KIND]\n"
@@ -909,7 +1337,7 @@ msgstr ""
 "      --search-paths=[GENRE]\n"
 "                         afficher les définitions de variables d'environnement requises"
 
-#: guix/scripts/package.scm:332 guix/scripts/pull.scm:84
+#: guix/scripts/package.scm:344 guix/scripts/pull.scm:88
 msgid ""
 "\n"
 "  -l, --list-generations[=PATTERN]\n"
@@ -919,7 +1347,7 @@ msgstr ""
 "  -l, --list-generations[=MOTIF]\n"
 "                         lister les générations correspondant à MOTIF"
 
-#: guix/scripts/package.scm:335
+#: guix/scripts/package.scm:347
 msgid ""
 "\n"
 "  -d, --delete-generations[=PATTERN]\n"
@@ -929,7 +1357,7 @@ msgstr ""
 "  -d, --delete-generations[=MOTIF]\n"
 "                         supprimer les générations correspondant à MOTIF"
 
-#: guix/scripts/package.scm:338
+#: guix/scripts/package.scm:350
 msgid ""
 "\n"
 "  -S, --switch-generation=PATTERN\n"
@@ -939,7 +1367,7 @@ msgstr ""
 "  -S, --switch-generation=MOTIF\n"
 "                         basculer vers une génération correspondant à MOTIF"
 
-#: guix/scripts/package.scm:341
+#: guix/scripts/package.scm:353
 msgid ""
 "\n"
 "  -p, --profile=PROFILE  use PROFILE instead of the user's default profile"
@@ -947,7 +1375,7 @@ msgstr ""
 "\n"
 "  -p, --profile=PROFIL   utiliser PROFIL au lieu du profil par défaut de l'utilisateur"
 
-#: guix/scripts/package.scm:344
+#: guix/scripts/package.scm:356
 msgid ""
 "\n"
 "      --allow-collisions do not treat collisions in the profile as an error"
@@ -955,7 +1383,7 @@ msgstr ""
 "\n"
 "      --allow-collisions ne pas traiter les collisions dans le profil comme une erreur"
 
-#: guix/scripts/package.scm:346
+#: guix/scripts/package.scm:358
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap Guile to build the profile"
@@ -963,15 +1391,7 @@ msgstr ""
 "\n"
 "      --bootstrap        utiliser le programme d'amorçage Guile pour compiler le profil"
 
-#: guix/scripts/package.scm:348 guix/scripts/pull.scm:74
-msgid ""
-"\n"
-"      --verbose          produce verbose output"
-msgstr ""
-"\n"
-"      --verbose          produire une sortie verbeuse"
-
-#: guix/scripts/package.scm:351
+#: guix/scripts/package.scm:363
 msgid ""
 "\n"
 "  -s, --search=REGEXP    search in synopsis and description using REGEXP"
@@ -979,7 +1399,7 @@ msgstr ""
 "\n"
 "  -s, --search=REGEXP    chercher dans le synopsis et la description en utilisant REGEXP"
 
-#: guix/scripts/package.scm:353
+#: guix/scripts/package.scm:365
 msgid ""
 "\n"
 "  -I, --list-installed[=REGEXP]\n"
@@ -989,7 +1409,7 @@ msgstr ""
 "  -I, --list-installed[=REGEXP]\n"
 "                         lister les paquets installés correspondant à REGEXP"
 
-#: guix/scripts/package.scm:356
+#: guix/scripts/package.scm:368
 msgid ""
 "\n"
 "  -A, --list-available[=REGEXP]\n"
@@ -999,7 +1419,7 @@ msgstr ""
 "  -A, --list-available[=REGEXP]\n"
 "                         lister les paquets disponibles correspondant à REGEXP"
 
-#: guix/scripts/package.scm:359
+#: guix/scripts/package.scm:371
 msgid ""
 "\n"
 "      --show=PACKAGE     show details about PACKAGE"
@@ -1007,42 +1427,42 @@ msgstr ""
 "\n"
 "      --show=PAQUET      montrer des détails du PAQUET"
 
-#: guix/scripts/package.scm:411
+#: guix/scripts/package.scm:423
 #, scheme-format
 msgid "upgrade regexp '~a' looks like a command-line option~%"
 msgstr "l'expression régulière « ~a » ressemble à une option de la ligne de commande~%"
 
-#: guix/scripts/package.scm:414
+#: guix/scripts/package.scm:426
 #, scheme-format
 msgid "is this intended?~%"
 msgstr "est-ce intentionnel ?~%"
 
-#: guix/scripts/package.scm:459
+#: guix/scripts/package.scm:471
 #, scheme-format
 msgid "~a: unsupported kind of search path~%"
-msgstr "~a : type de chemin de recherche non supporté~%"
+msgstr "~a : type de chemin de recherche non pris en charge~%"
 
-#: guix/scripts/package.scm:776
+#: guix/scripts/package.scm:767
 #, scheme-format
 msgid "~a~@[@~a~]: package not found~%"
 msgstr "~a~@[@~a~] : paquet introuvable~%"
 
-#: guix/scripts/package.scm:810
+#: guix/scripts/package.scm:801
 #, scheme-format
 msgid "cannot switch to generation '~a'~%"
 msgstr "impossible de passer à la génération « ~a »~%"
 
-#: guix/scripts/package.scm:827
+#: guix/scripts/package.scm:818
 #, scheme-format
 msgid "would install new manifest from '~a' with ~d entries~%"
 msgstr "installerait le nouveau manifeste depuis « ~a » avec ~d entrées~%"
 
-#: guix/scripts/package.scm:829
+#: guix/scripts/package.scm:820
 #, scheme-format
 msgid "installing new manifest from '~a' with ~d entries~%"
 msgstr "installation du nouveau manifeste depuis « ~a » avec ~d entrées~%"
 
-#: guix/scripts/gc.scm:42
+#: guix/scripts/gc.scm:45
 msgid ""
 "Usage: guix gc [OPTION]... PATHS...\n"
 "Invoke the garbage collector.\n"
@@ -1050,7 +1470,7 @@ msgstr ""
 "Usage : guix gc [OPTION]... CHEMINS...\n"
 "Appeler le ramasse-miettes (GC).\n"
 
-#: guix/scripts/gc.scm:44
+#: guix/scripts/gc.scm:47
 msgid ""
 "\n"
 "  -C, --collect-garbage[=MIN]\n"
@@ -1060,7 +1480,7 @@ msgstr ""
 "  -C, --collect-garbage[=MIN]\n"
 "                         collecter au moins MIN octets dans le ramasse-miettes"
 
-#: guix/scripts/gc.scm:47
+#: guix/scripts/gc.scm:50
 msgid ""
 "\n"
 "  -F, --free-space=FREE  attempt to reach FREE available space in the store"
@@ -1068,15 +1488,33 @@ msgstr ""
 "\n"
 "  -F, --free-space=LIBRE essayer d'atteindre LIBRE espace dans le dépôt"
 
-#: guix/scripts/gc.scm:49
+#: guix/scripts/gc.scm:52
 msgid ""
 "\n"
-"  -d, --delete           attempt to delete PATHS"
+"  -d, --delete-generations[=PATTERN]\n"
+"                         delete profile generations matching PATTERN"
 msgstr ""
 "\n"
-"  -d, --delete           essayer de supprimer les CHEMINS"
+"  -d, --delete-generations[=MOTIF]\n"
+"                         supprimer les générations correspondant à MOTIF"
 
-#: guix/scripts/gc.scm:51
+#: guix/scripts/gc.scm:55
+msgid ""
+"\n"
+"  -D, --delete           attempt to delete PATHS"
+msgstr ""
+"\n"
+"  -D, --delete           essayer de supprimer les CHEMINS"
+
+#: guix/scripts/gc.scm:57
+msgid ""
+"\n"
+"      --list-roots       list the user's garbage collector roots"
+msgstr ""
+"\n"
+"      --list-roots       lister les racine du ramasse-miettes pour l'utilisateur"
+
+#: guix/scripts/gc.scm:59
 msgid ""
 "\n"
 "      --optimize         optimize the store by deduplicating identical files"
@@ -1084,7 +1522,7 @@ msgstr ""
 "\n"
 "      --optimize         optimise le dépôt en supprimant les doublons des fichiers identiques"
 
-#: guix/scripts/gc.scm:53
+#: guix/scripts/gc.scm:61
 msgid ""
 "\n"
 "      --list-dead        list dead paths"
@@ -1092,7 +1530,7 @@ msgstr ""
 "\n"
 "      --list-dead        lister les chemins non valides"
 
-#: guix/scripts/gc.scm:55
+#: guix/scripts/gc.scm:63
 msgid ""
 "\n"
 "      --list-live        list live paths"
@@ -1100,7 +1538,7 @@ msgstr ""
 "\n"
 "      --list-live        lister les chemins valides"
 
-#: guix/scripts/gc.scm:58
+#: guix/scripts/gc.scm:66
 msgid ""
 "\n"
 "      --references       list the references of PATHS"
@@ -1108,7 +1546,7 @@ msgstr ""
 "\n"
 "      --references       lister les références de CHEMINS"
 
-#: guix/scripts/gc.scm:60
+#: guix/scripts/gc.scm:68
 msgid ""
 "\n"
 "  -R, --requisites       list the requisites of PATHS"
@@ -1116,7 +1554,7 @@ msgstr ""
 "\n"
 "  -R, --requisites       lister les prérequis de CHEMINS"
 
-#: guix/scripts/gc.scm:62
+#: guix/scripts/gc.scm:70
 msgid ""
 "\n"
 "      --referrers        list the referrers of PATHS"
@@ -1124,7 +1562,7 @@ msgstr ""
 "\n"
 "      --referrers        lister les référents de CHEMINS"
 
-#: guix/scripts/gc.scm:64
+#: guix/scripts/gc.scm:72
 msgid ""
 "\n"
 "      --derivers         list the derivers of PATHS"
@@ -1132,7 +1570,7 @@ msgstr ""
 "\n"
 "      --derivers        lister les dérivations menant à CHEMINS"
 
-#: guix/scripts/gc.scm:67
+#: guix/scripts/gc.scm:75
 msgid ""
 "\n"
 "      --verify[=OPTS]    verify the integrity of the store; OPTS is a\n"
@@ -1144,7 +1582,7 @@ msgstr ""
 "                         combinaison de « repair » et « contents » séparés\n"
 "                         par une virgule"
 
-#: guix/scripts/gc.scm:71
+#: guix/scripts/gc.scm:79
 msgid ""
 "\n"
 "      --list-failures    list cached build failures"
@@ -1152,7 +1590,7 @@ msgstr ""
 "\n"
 "      --list-failures    lister les échecs de compilation en cache"
 
-#: guix/scripts/gc.scm:73
+#: guix/scripts/gc.scm:81
 msgid ""
 "\n"
 "      --clear-failures   remove PATHS from the set of cached failures"
@@ -1160,30 +1598,40 @@ msgstr ""
 "\n"
 "      --clear-failures   supprimer CHEMINS de l'ensemble des échecs en cache"
 
-#: guix/scripts/gc.scm:87
+#: guix/scripts/gc.scm:95
 #, scheme-format
 msgid "~a: invalid '--verify' option~%"
 msgstr "~a : option « --verify » invalide~%"
 
-#: guix/scripts/gc.scm:117
+#: guix/scripts/gc.scm:135
 #, scheme-format
 msgid "invalid amount of storage: ~a~%"
 msgstr "quantité de stockage non valide : ~a~%"
 
-#: guix/scripts/gc.scm:202
+#: guix/scripts/gc.scm:149
+#, scheme-format
+msgid "'-d' as an alias for '--delete' is deprecated; use '-D'~%"
+msgstr "l'utilisation de « -d » pour « --delete » est obsolète. Utilisez plutôt « -D »~%"
+
+#: guix/scripts/gc.scm:156
+#, scheme-format
+msgid "~s does not denote a duration~%"
+msgstr "« ~s » ne correspond pas à une durée~%"
+
+#: guix/scripts/gc.scm:239
 msgid "already ~h MiBs available on ~a, nothing to do~%"
 msgstr "déjà ~h Mo disponibles sur ~a, rien à faire~%"
 
-#: guix/scripts/gc.scm:205
+#: guix/scripts/gc.scm:242
 msgid "freeing ~h MiBs~%"
 msgstr "libération de ~h Mo~%"
 
-#: guix/scripts/gc.scm:217
+#: guix/scripts/gc.scm:271
 #, scheme-format
 msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "arguments superflus : ~{~a ~}~%"
 
-#: guix/scripts/gc.scm:237 guix/scripts/gc.scm:240
+#: guix/scripts/gc.scm:295 guix/scripts/gc.scm:298
 msgid "freed ~h MiBs~%"
 msgstr "~h Mo libérés~%"
 
@@ -1198,7 +1646,7 @@ msgstr ""
 "Usage : guix hash [OPTION] FICHIER\n"
 "Retourner l'empreinte cryptographique du FICHIER.\n"
 "\n"
-"Formats supportés: « nix-base32 » (par défaut), « base32 », et « base16 » (« hex »\n"
+"Formats pris en charge : « nix-base32 » (par défaut), « base32 », et « base16 » (« hex »\n"
 "et « hexadecimal » peuvent également être utilisés).\n"
 
 #: guix/scripts/hash.scm:53
@@ -1217,13 +1665,16 @@ msgstr ""
 "\n"
 "  -r, --recursive        calculer l'empreinte de FICHIER de manière récursive"
 
-#: guix/scripts/hash.scm:151 guix/ui.scm:371 guix/ui.scm:728 guix/ui.scm:781
+#: guix/scripts/hash.scm:151 guix/ui.scm:450 guix/ui.scm:457 guix/ui.scm:482
+#: guix/ui.scm:792 guix/ui.scm:814 guix/ui.scm:820 guix/ui.scm:826
+#: guix/ui.scm:879
 #, scheme-format
 msgid "~a~%"
 msgstr "~a~%"
 
-#: guix/scripts/hash.scm:154 guix/scripts/system.scm:1189
-#: guix/scripts/system.scm:1198 guix/scripts/system.scm:1205
+#: guix/scripts/hash.scm:154 guix/scripts/system.scm:1213
+#: guix/scripts/system.scm:1223 guix/scripts/system.scm:1230
+#: guix/scripts/system.scm:1237
 #, scheme-format
 msgid "wrong number of arguments~%"
 msgstr "nombre d'arguments incorrect~%"
@@ -1243,7 +1694,7 @@ msgstr "IMPORTATEUR doit être un des importateurs listés ci-dessous:\n"
 #: guix/scripts/import.scm:104
 #, scheme-format
 msgid "guix import: missing importer name~%"
-msgstr "guix import: nom d'importateur manquant~%"
+msgstr "guix import: nom d'importateur absent~%"
 
 #: guix/scripts/import.scm:124
 #, scheme-format
@@ -1339,7 +1790,7 @@ msgstr ""
 msgid "failed to download package '~a'~%"
 msgstr "échec lors du téléchargement du paquet « ~a »~%"
 
-#: guix/scripts/pull.scm:72
+#: guix/scripts/pull.scm:76
 msgid ""
 "Usage: guix pull [OPTION]...\n"
 "Download and deploy the latest version of Guix.\n"
@@ -1347,7 +1798,15 @@ msgstr ""
 "Usage : guix pull [OPTION]...\n"
 "Télécharger et déployer la dernière version de Guix.\n"
 
-#: guix/scripts/pull.scm:76
+#: guix/scripts/pull.scm:78
+msgid ""
+"\n"
+"      --verbose          produce verbose output"
+msgstr ""
+"\n"
+"      --verbose          produire une sortie verbeuse"
+
+#: guix/scripts/pull.scm:80
 msgid ""
 "\n"
 "  -C, --channels=FILE    deploy the channels defined in FILE"
@@ -1355,7 +1814,7 @@ msgstr ""
 "\n"
 "  -C, --channels=FICHIER déploie les canaux définis dans FICHIER"
 
-#: guix/scripts/pull.scm:78
+#: guix/scripts/pull.scm:82
 msgid ""
 "\n"
 "      --url=URL          download from the Git repository at URL"
@@ -1363,7 +1822,7 @@ msgstr ""
 "\n"
 "      --url=URL          télécharger le dépôt Git depuis URL"
 
-#: guix/scripts/pull.scm:80
+#: guix/scripts/pull.scm:84
 msgid ""
 "\n"
 "      --commit=COMMIT    download the specified COMMIT"
@@ -1371,7 +1830,7 @@ msgstr ""
 "\n"
 "      --commit=COMMIT    télécharger le COMMIT indiqué"
 
-#: guix/scripts/pull.scm:82
+#: guix/scripts/pull.scm:86
 msgid ""
 "\n"
 "      --branch=BRANCH    download the tip of the specified BRANCH"
@@ -1379,7 +1838,7 @@ msgstr ""
 "\n"
 "      --branch=BRANCHE   télécharger le bout de la BRANCHE indiquée"
 
-#: guix/scripts/pull.scm:87
+#: guix/scripts/pull.scm:91
 #, scheme-format
 msgid ""
 "\n"
@@ -1388,15 +1847,7 @@ msgstr ""
 "\n"
 "  -p, --profile=PROFIL   utiliser PROFIL au lieu de ~/.config/guix/current"
 
-#: guix/scripts/pull.scm:89
-msgid ""
-"\n"
-"  -n, --dry-run          show what would be pulled and built"
-msgstr ""
-"\n"
-"  -n, --dry-run          montrer ce qui serait récupéré et ce qui serait construit"
-
-#: guix/scripts/pull.scm:91
+#: guix/scripts/pull.scm:97
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap Guile to build the new Guix"
@@ -1404,63 +1855,72 @@ msgstr ""
 "\n"
 "      --bootstrap        utiliser le programme d'amorçage Guile pour compiler le nouveau Guix"
 
-#: guix/scripts/pull.scm:165
+#: guix/scripts/pull.scm:183
 msgid "New in this revision:\n"
 msgstr "Nouveautés de cette révision :\n"
 
-#: guix/scripts/pull.scm:223
+#: guix/scripts/pull.scm:207
+#, scheme-format
+msgid ""
+"After setting @code{PATH}, run\n"
+"@command{hash guix} to make sure your shell refers to @file{~a}."
+msgstr ""
+"Après avoir paramétré @code{PATH}, lancez\n"
+"@command{hash guix} pour vous assurez que votre shell se réfère à @file{~a}."
+
+#: guix/scripts/pull.scm:231
 #, scheme-format
 msgid "Git error ~a~%"
 msgstr "Erreur Git : ~a~%"
 
-#: guix/scripts/pull.scm:225
+#: guix/scripts/pull.scm:233 guix/git.scm:306
 #, scheme-format
 msgid "Git error: ~a~%"
 msgstr "Erreur Git : ~a~%"
 
-#: guix/scripts/pull.scm:250
+#: guix/scripts/pull.scm:258
 #, scheme-format
 msgid "Migrating profile generations to '~a'...~%"
 msgstr "Migration des générations du profil vers « ~a »...~%"
 
-#: guix/scripts/pull.scm:285
+#: guix/scripts/pull.scm:293
 #, scheme-format
 msgid "while creating symlink '~a': ~a~%"
 msgstr "pendant la création du lien symbolique « ~a » : ~a ~%"
 
-#: guix/scripts/pull.scm:307
+#: guix/scripts/pull.scm:315
 #, scheme-format
 msgid "    repository URL: ~a~%"
 msgstr "    URL du dépôt : ~a~%"
 
-#: guix/scripts/pull.scm:309
+#: guix/scripts/pull.scm:317
 #, scheme-format
 msgid "    branch: ~a~%"
 msgstr "    branche: ~a~%"
 
-#: guix/scripts/pull.scm:310
+#: guix/scripts/pull.scm:318
 #, scheme-format
 msgid "    commit: ~a~%"
 msgstr "    commit : ~a~%"
 
-#: guix/scripts/pull.scm:376
+#: guix/scripts/pull.scm:413
 msgid "  ~h new package: ~a~%"
 msgid_plural "  ~h new packages: ~a~%"
 msgstr[0] "  ~h nouveau paquet : ~a~%"
-msgstr[1] "  ~h nouveau paquets : ~a~%"
+msgstr[1] "  ~h nouveaux paquets : ~a~%"
 
-#: guix/scripts/pull.scm:387
+#: guix/scripts/pull.scm:421
 msgid "  ~h package upgraded: ~a~%"
 msgid_plural "  ~h packages upgraded: ~a~%"
 msgstr[0] "  ~h paquet mis à jour : ~a~%"
 msgstr[1] "  ~h paquets mis à jour : ~a~%"
 
-#: guix/scripts/pull.scm:451
+#: guix/scripts/pull.scm:483
 #, scheme-format
 msgid "'~a' did not return a list of channels~%"
 msgstr "« ~a » n'a pas renvoyé une liste de canaux~%"
 
-#: guix/scripts/pull.scm:465
+#: guix/scripts/pull.scm:497
 #, scheme-format
 msgid ""
 "The 'GUIX_PULL_URL' environment variable is deprecated.\n"
@@ -1469,12 +1929,12 @@ msgstr ""
 "La variable d'environnement « GUIX_PULL_URL » est obsolète.\n"
 "Utilisez « ~/.config/guix/channels.scm » à la place."
 
-#: guix/scripts/pull.scm:490
+#: guix/scripts/pull.scm:522
 #, scheme-format
 msgid "'--url', '--commit', and '--branch' are not applicable~%"
 msgstr "'--url', '--commit' et '--branch' ne sont pas utilisables~%"
 
-#: guix/scripts/pull.scm:515
+#: guix/scripts/pull.scm:548
 #, scheme-format
 msgid "Building from this channel:~%"
 msgid_plural "Building from these channels:~%"
@@ -1504,7 +1964,7 @@ msgstr "essayez l'option « --no-substitutes » si le problème persiste~%"
 #: guix/scripts/substitute.scm:226
 #, scheme-format
 msgid "unsupported substitute URI scheme: ~a~%"
-msgstr "schéma de substitution URI non supporté : ~a~%"
+msgstr "schéma de substitution d'URI non pris en charge : ~a~%"
 
 #: guix/scripts/substitute.scm:261
 #, scheme-format
@@ -1524,7 +1984,7 @@ msgstr "la version de la signature doit être un nombre: ~s~%"
 #: guix/scripts/substitute.scm:320
 #, scheme-format
 msgid "unsupported signature version: ~a~%"
-msgstr "version de signature non supportée : ~a~%"
+msgstr "version de signature non prise en charge : ~a~%"
 
 #: guix/scripts/substitute.scm:328
 #, scheme-format
@@ -1556,37 +2016,37 @@ msgstr "« ~a » est signé avec une clé non autorisée~%"
 msgid "signature on '~a' is corrupt~%"
 msgstr "la signature de « ~a » est corrompue~%"
 
-#: guix/scripts/substitute.scm:458
+#: guix/scripts/substitute.scm:467
 #, scheme-format
 msgid "'~a' does not name a store item~%"
 msgstr "« ~a » ne nomme pas un élément du stockage~%"
 
-#: guix/scripts/substitute.scm:620
+#: guix/scripts/substitute.scm:629
 #, scheme-format
 msgid "updating substitutes from '~a'... ~5,1f%"
 msgstr "mise à jour des substituts depuis « ~a »... ~5,1f%"
 
-#: guix/scripts/substitute.scm:684
+#: guix/scripts/substitute.scm:693
 #, scheme-format
 msgid "~s: unsupported server URI scheme~%"
-msgstr "~s : schéma de URI serveur non supporté~%"
+msgstr "~s : schéma d'URI du serveur non pris en charge~%"
 
-#: guix/scripts/substitute.scm:694
+#: guix/scripts/substitute.scm:703
 #, scheme-format
 msgid "'~a' uses different store '~a'; ignoring it~%"
 msgstr "« ~a » utilise un stockage « ~a » différent. Il est ignoré~%"
 
-#: guix/scripts/substitute.scm:863
+#: guix/scripts/substitute.scm:872
 #, scheme-format
 msgid "host name lookup error: ~a~%"
 msgstr "erreur lors de la consultation du nom d'hôte : ~a~%"
 
-#: guix/scripts/substitute.scm:868
+#: guix/scripts/substitute.scm:877
 #, scheme-format
 msgid "TLS error in procedure '~a': ~a~%"
 msgstr "Erreur TLS dans la procédure « ~a » : ~a~%"
 
-#: guix/scripts/substitute.scm:879
+#: guix/scripts/substitute.scm:888
 msgid ""
 "Usage: guix substitute [OPTION]...\n"
 "Internal tool to substitute a pre-built binary to a local build.\n"
@@ -1594,7 +2054,7 @@ msgstr ""
 "Usage : guix substitute [OPTION]...\n"
 "Outil interne pour substituer un binaire pré-compilé à une compilation locale.\n"
 
-#: guix/scripts/substitute.scm:881
+#: guix/scripts/substitute.scm:890
 msgid ""
 "\n"
 "      --query            report on the availability of substitutes for the\n"
@@ -1605,7 +2065,7 @@ msgstr ""
 "                         noms de fichiers de dépôt passés sur l'entrée\n"
 "                         standard"
 
-#: guix/scripts/substitute.scm:884
+#: guix/scripts/substitute.scm:893
 msgid ""
 "\n"
 "      --substitute STORE-FILE DESTINATION\n"
@@ -1617,26 +2077,26 @@ msgstr ""
 "                         télécharger FICHIER-DÉPÔT et l'enregistrer comme un Nar\n"
 "                         dans le fichier DESTINATION"
 
-#: guix/scripts/substitute.scm:949
+#: guix/scripts/substitute.scm:958
 #, scheme-format
 msgid "no valid substitute for '~a'~%"
 msgstr "pas de substitut valide pour « ~a »~%"
 
-#: guix/scripts/substitute.scm:957
+#: guix/scripts/substitute.scm:966
 #, scheme-format
 msgid "Downloading ~a...~%"
 msgstr "Téléchargement de « ~a »...~%"
 
-#: guix/scripts/substitute.scm:1019
+#: guix/scripts/substitute.scm:1028
 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n"
 msgstr "L'ACL pour l'import d'archives ne semble pas initialisée ; les substituts pourraient être indisponibles\n"
 
-#: guix/scripts/substitute.scm:1073
+#: guix/scripts/substitute.scm:1082
 #, scheme-format
 msgid "~a: invalid URI~%"
 msgstr "~a : URI invalide~%"
 
-#: guix/scripts/substitute.scm:1144
+#: guix/scripts/substitute.scm:1153
 #, scheme-format
 msgid "~a: unrecognized options~%"
 msgstr "~a : options non reconnues~%"
@@ -1675,77 +2135,77 @@ msgstr ""
 msgid "wrong arguments"
 msgstr "mauvais arguments"
 
-#: guix/scripts/system.scm:148
+#: guix/scripts/system.scm:150
 #, scheme-format
 msgid "failed to register '~a' under '~a'~%"
 msgstr "impossible d'enregistrer « ~a » sous « ~a »~%"
 
-#: guix/scripts/system.scm:163
+#: guix/scripts/system.scm:165
 #, scheme-format
 msgid "copying to '~a'..."
 msgstr "copie vers « ~a »..."
 
-#: guix/scripts/system.scm:204
+#: guix/scripts/system.scm:206
 #, scheme-format
 msgid "failed to install bootloader ~a~%"
 msgstr "impossible d'installer le chargeur de démarrage : ~a~%"
 
-#: guix/scripts/system.scm:224
+#: guix/scripts/system.scm:226
 #, scheme-format
 msgid "initializing the current root file system~%"
 msgstr "initialisation du système de fichier racine courant~%"
 
-#: guix/scripts/system.scm:238
+#: guix/scripts/system.scm:240
 #, scheme-format
 msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%"
 msgstr "n'est pas exécuté en tant que « root » donc le propriétaire de « ~a » pourrait être incorrect !~%"
 
-#: guix/scripts/system.scm:290
+#: guix/scripts/system.scm:292
 #, scheme-format
 msgid "while talking to shepherd: ~a~%"
 msgstr "en parlant au shepherd : ~a~%"
 
-#: guix/scripts/system.scm:297
+#: guix/scripts/system.scm:299
 #, scheme-format
 msgid "service '~a' could not be found~%"
 msgstr "service: « ~a » introuvable~%"
 
-#: guix/scripts/system.scm:300
+#: guix/scripts/system.scm:302
 #, scheme-format
 msgid "service '~a' does not have an action '~a'~%"
 msgstr "le service « ~a » n'a pas d'action « ~a »~%"
 
-#: guix/scripts/system.scm:304
+#: guix/scripts/system.scm:306
 #, scheme-format
 msgid "exception caught while executing '~a' on service '~a':~%"
 msgstr "exception interceptée pendant l'exécution de « ~a » sur le service « ~a »:~%"
 
-#: guix/scripts/system.scm:312
+#: guix/scripts/system.scm:314
 #, scheme-format
 msgid "something went wrong: ~s~%"
 msgstr "quelque chose s'est mal passé : ~s~%"
 
-#: guix/scripts/system.scm:315
+#: guix/scripts/system.scm:317
 #, scheme-format
 msgid "shepherd error~%"
 msgstr "erreur du shepherd~%"
 
-#: guix/scripts/system.scm:332
+#: guix/scripts/system.scm:334
 #, scheme-format
 msgid "failed to obtain list of shepherd services~%"
 msgstr "erreur en essayant d'obtenir la liste des services du shepherd~%"
 
-#: guix/scripts/system.scm:352
+#: guix/scripts/system.scm:354
 #, scheme-format
 msgid "unloading service '~a'...~%"
 msgstr "déchargement du service « ~a »...~%"
 
-#: guix/scripts/system.scm:361
+#: guix/scripts/system.scm:363
 #, scheme-format
 msgid "loading new services:~{ ~a~}...~%"
 msgstr "chargement des nouveaux services :~{ ~a~}...~%"
 
-#: guix/scripts/system.scm:366
+#: guix/scripts/system.scm:368
 msgid ""
 "To complete the upgrade, run 'herd restart SERVICE' to stop,\n"
 "upgrade, and restart each service that was not automatically restarted.\n"
@@ -1754,41 +2214,41 @@ msgstr ""
 "mettre à jour et redémarrer tous les services qui n'ont pas été redémarrés\n"
 "automatiquement.\n"
 
-#: guix/scripts/system.scm:393
+#: guix/scripts/system.scm:395
 #, scheme-format
 msgid "activating system...~%"
 msgstr "activation du système...~%"
 
-#: guix/scripts/system.scm:471
+#: guix/scripts/system.scm:473
 #, scheme-format
 msgid "cannot switch to system generation '~a'~%"
 msgstr "impossible de passer à la génération « ~a » du système~%"
 
-#: guix/scripts/system.scm:542
+#: guix/scripts/system.scm:546
 msgid "the DAG of services"
 msgstr "le graphe orienté acyclique (DAG) des services"
 
-#: guix/scripts/system.scm:555
+#: guix/scripts/system.scm:559
 msgid "the dependency graph of shepherd services"
 msgstr "le graphique des dépendances des services du shepherd"
 
-#: guix/scripts/system.scm:579
+#: guix/scripts/system.scm:583
 #, scheme-format
 msgid "  file name: ~a~%"
 msgstr "  nom de fichier: ~a~%"
 
-#: guix/scripts/system.scm:580
+#: guix/scripts/system.scm:584
 #, scheme-format
 msgid "  canonical file name: ~a~%"
 msgstr "  nom de fichier canonique : ~a~%"
 
 #. TRANSLATORS: Please preserve the two-space indentation.
-#: guix/scripts/system.scm:582
+#: guix/scripts/system.scm:586
 #, scheme-format
 msgid "  label: ~a~%"
 msgstr "  étiquette : ~a~%"
 
-#: guix/scripts/system.scm:583
+#: guix/scripts/system.scm:587
 #, scheme-format
 msgid "  bootloader: ~a~%"
 msgstr "  chargeur de démarrage : ~a~%"
@@ -1801,22 +2261,22 @@ msgstr "  chargeur de démarrage : ~a~%"
 #. root device: label: "my-root"
 #. or just:
 #. root device: /dev/sda3
-#: guix/scripts/system.scm:593
+#: guix/scripts/system.scm:597
 #, scheme-format
 msgid "  root device: ~[UUID: ~a~;label: ~s~;~a~]~%"
 msgstr "  périphérique racine : ~[UUID : ~a~;étiquette : ~s~;~a~]~%"
 
-#: guix/scripts/system.scm:604
+#: guix/scripts/system.scm:608
 #, scheme-format
 msgid "  kernel: ~a~%"
 msgstr "  noyau : ~a~%"
 
-#: guix/scripts/system.scm:675
+#: guix/scripts/system.scm:679
 #, scheme-format
 msgid "~a: error: device '~a' not found: ~a~%"
 msgstr "~a : erreur : périphérique « ~a » non trouvé : ~a~%"
 
-#: guix/scripts/system.scm:679
+#: guix/scripts/system.scm:683
 #, scheme-format
 msgid ""
 "If '~a' is a file system\n"
@@ -1825,37 +2285,37 @@ msgstr ""
 "Si « ~a » est une étiquette de système de fichiers, écrivez\n"
 "@code{(file-system-label ~s)} dans votre champ @code{device}."
 
-#: guix/scripts/system.scm:687
+#: guix/scripts/system.scm:691
 #, scheme-format
 msgid "~a: error: file system with label '~a' not found~%"
 msgstr "~a : erreur : le système de fichier étiqueté « ~a » est introuvable~%"
 
-#: guix/scripts/system.scm:692
+#: guix/scripts/system.scm:696
 #, scheme-format
 msgid "~a: error: file system with UUID '~a' not found~%"
 msgstr "~a : erreur : le système de fichier avec l'UUID « ~a » est introuvable~%"
 
-#: guix/scripts/system.scm:793
+#: guix/scripts/system.scm:797
 #, scheme-format
 msgid "~a not found: 'guix pull' was never run~%"
 msgstr "~a pas trouvé : « guix pull » n'a jamais été exécuté~%"
 
-#: guix/scripts/system.scm:794
+#: guix/scripts/system.scm:798
 #, scheme-format
 msgid "Consider running 'guix pull' before 'reconfigure'.~%"
 msgstr "Envisagez d'exécuter « guix pull » avant « reconfigure ».~%"
 
-#: guix/scripts/system.scm:795
+#: guix/scripts/system.scm:799
 #, scheme-format
 msgid "Failing to do that may downgrade your system!~%"
 msgstr "Si vous ne le faites pas, votre système pourrait être amené à une version inférieure !~%"
 
-#: guix/scripts/system.scm:907
+#: guix/scripts/system.scm:920
 #, scheme-format
 msgid "initializing operating system under '~a'...~%"
 msgstr "initialisation du système d'exploitation sous « ~a »...~%"
 
-#: guix/scripts/system.scm:952
+#: guix/scripts/system.scm:965
 msgid ""
 "Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n"
 "Build the operating system declared in FILE according to ACTION.\n"
@@ -1863,69 +2323,73 @@ msgid ""
 msgstr ""
 "Usage : guix system [OPTION ...] ACTION [ARG ...] [FICHIER]\n"
 "Compiler le système d'exploitation déclaré dans FICHER en suivant ACTION.\n"
-"Certaines ACTIONS supportent des ARGUMENTS supplémentaires.\n"
+"Certaines ACTIONS prennent en charge des ARGUMENTS supplémentaires.\n"
 
-#: guix/scripts/system.scm:956 guix/scripts/container.scm:29
+#: guix/scripts/system.scm:969 guix/scripts/container.scm:29
 msgid "The valid values for ACTION are:\n"
 msgstr "Les valeurs possibles pour ACTION sont :\n"
 
-#: guix/scripts/system.scm:958
+#: guix/scripts/system.scm:971
 msgid "   search           search for existing service types\n"
 msgstr "   search           chercher des types de services existants\n"
 
-#: guix/scripts/system.scm:960
+#: guix/scripts/system.scm:973
 msgid "   reconfigure      switch to a new operating system configuration\n"
 msgstr "   reconfigure      basculer vers une nouvelle configuration du système d'exploitation\n"
 
-#: guix/scripts/system.scm:962
+#: guix/scripts/system.scm:975
 msgid "   roll-back        switch to the previous operating system configuration\n"
 msgstr "   roll-back        basculer vers la configuration du système d'exploitation précédente\n"
 
-#: guix/scripts/system.scm:964
+#: guix/scripts/system.scm:977
+msgid "   list-generations list the system generations\n"
+msgstr "   list-generations lister les générations du système\n"
+
+#: guix/scripts/system.scm:979
 msgid "   switch-generation switch to an existing operating system configuration\n"
 msgstr "   switch-generation basculer vers une configuration du système d'exploitation existante\n"
 
-#: guix/scripts/system.scm:966
-msgid "   list-generations list the system generations\n"
-msgstr "   list-generations lister les générations du système\n"
+#: guix/scripts/system.scm:981
+msgid "   delete-generations delete old system generations\n"
+msgstr "   delete-generations supprimer les anciennes générations du système\n"
 
-#: guix/scripts/system.scm:968
+#: guix/scripts/system.scm:983
 msgid "   build            build the operating system without installing anything\n"
 msgstr "   build            compiler le système d'exploitation sans rien installer\n"
 
-#: guix/scripts/system.scm:970
+#: guix/scripts/system.scm:985
 msgid "   container        build a container that shares the host's store\n"
 msgstr "   container        compiler un conteneur qui partage le dépôt de l'hôte\n"
 
-#: guix/scripts/system.scm:972
+#: guix/scripts/system.scm:987
 msgid "   vm               build a virtual machine image that shares the host's store\n"
 msgstr "   vm               compiler une machine virtuelle partageant le dépôt de l'hôte\n"
 
-#: guix/scripts/system.scm:974
+#: guix/scripts/system.scm:989
 msgid "   vm-image         build a freestanding virtual machine image\n"
 msgstr "   vm-image         compiler une image autonome de machine virtuelle\n"
 
-#: guix/scripts/system.scm:976
+#: guix/scripts/system.scm:991
 msgid "   disk-image       build a disk image, suitable for a USB stick\n"
 msgstr "   disk-image       compiler une image disque adaptée pour une clé USB\n"
 
-#: guix/scripts/system.scm:978
+#: guix/scripts/system.scm:993
 msgid "   docker-image     build a Docker image\n"
 msgstr "   docker-image     compiler une image Docker\n"
 
-#: guix/scripts/system.scm:980
+#: guix/scripts/system.scm:995
 msgid "   init             initialize a root file system to run GNU\n"
 msgstr "   init             initialiser un système de fichier racine pour lancer GNU.\n"
 
-#: guix/scripts/system.scm:982
+#: guix/scripts/system.scm:997
 msgid "   extension-graph  emit the service extension graph in Dot format\n"
 msgstr "   extension-graph  produire le graphique des extensions de service au format Dot\n"
 
-#: guix/scripts/system.scm:984
+#: guix/scripts/system.scm:999
 msgid "   shepherd-graph   emit the graph of shepherd services in Dot format\n"
 msgstr "   shepherd-graph   produire le graphique des services du shepherd au format Dot\n"
 
-#: guix/scripts/system.scm:988
+#: guix/scripts/system.scm:1003
 msgid ""
 "\n"
 "  -d, --derivation       return the derivation of the given system"
@@ -1933,7 +2397,7 @@ msgstr ""
 "\n"
 "  -d, --derivation       retourner les dérivations pour le système donné"
 
-#: guix/scripts/system.scm:990
+#: guix/scripts/system.scm:1005
 msgid ""
 "\n"
 "  -e, --expression=EXPR  consider the operating-system EXPR evaluates to\n"
@@ -1943,17 +2407,19 @@ msgstr ""
 "  -e, --expression=EXPR  considère le paquet évalué par EXPR\n"
 "                         au lieu de lire FICHIER, lorsque c'est possible"
 
-#: guix/scripts/system.scm:993
+#: guix/scripts/system.scm:1008
 msgid ""
 "\n"
 "      --on-error=STRATEGY\n"
-"                         apply STRATEGY when an error occurs while reading FILE"
+"                         apply STRATEGY (one of nothing-special, backtrace,\n"
+"                         or debug) when an error occurs while reading FILE"
 msgstr ""
 "\n"
 "      --on-error=STRATÉGIE\n"
-"                         appliquer la STRATÉGIE quand une erreur survient en lisant le FICHIER"
+"                         appliquer la STRATÉGIE (nothing-special, backtrace ou debug)\n"
+"                         quand une erreur survient en lisant le FICHIER"
 
-#: guix/scripts/system.scm:996
+#: guix/scripts/system.scm:1012
 msgid ""
 "\n"
 "      --file-system-type=TYPE\n"
@@ -1965,7 +2431,7 @@ msgstr ""
 "                         avec « disk-image », produit un système de fichiers racine de TYPE\n"
 "                         (parmis « ext4» et « iso9660 »)"
 
-#: guix/scripts/system.scm:1000
+#: guix/scripts/system.scm:1016
 msgid ""
 "\n"
 "      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
@@ -1974,7 +2440,7 @@ msgstr ""
 "      --image-size=TAILLE\n"
 "                         pour « vm-image », produire une image de TAILLE"
 
-#: guix/scripts/system.scm:1002
+#: guix/scripts/system.scm:1018
 msgid ""
 "\n"
 "      --no-bootloader    for 'init', do not install a bootloader"
@@ -1982,7 +2448,7 @@ msgstr ""
 "\n"
 "      --no-bootloader    pour « init », ne pas installer un chargeur de démarrage"
 
-#: guix/scripts/system.scm:1004
+#: guix/scripts/system.scm:1020
 msgid ""
 "\n"
 "      --share=SPEC       for 'vm', share host file system according to SPEC"
@@ -1991,7 +2457,7 @@ msgstr ""
 "      --share=SPEC       pour « vm », partager le système de fichiers hôte selon\n"
 "                         SPEC"
 
-#: guix/scripts/system.scm:1006
+#: guix/scripts/system.scm:1022
 msgid ""
 "\n"
 "  -r, --root=FILE        for 'vm', 'vm-image', 'disk-image', 'container',\n"
@@ -2004,7 +2470,7 @@ msgstr ""
 "                         sur le résultat et l'enregistrer en tant que racine du\n"
 "                         ramasse-miettes"
 
-#: guix/scripts/system.scm:1010
+#: guix/scripts/system.scm:1026
 msgid ""
 "\n"
 "      --expose=SPEC      for 'vm', expose host file system according to SPEC"
@@ -2013,7 +2479,7 @@ msgstr ""
 "      --expose=SPEC      pour « vm », exposer le système de fichiers hôte selon\n"
 "                         SPEC"
 
-#: guix/scripts/system.scm:1012
+#: guix/scripts/system.scm:1028
 msgid ""
 "\n"
 "      --full-boot        for 'vm', make a full boot sequence"
@@ -2021,7 +2487,7 @@ msgstr ""
 "\n"
 "      --full-boot        pour « vm », accomplir une séquence complète de démarrage"
 
-#: guix/scripts/system.scm:1014
+#: guix/scripts/system.scm:1030
 msgid ""
 "\n"
 "      --skip-checks      skip file system and initrd module safety checks"
@@ -2030,54 +2496,54 @@ msgstr ""
 "      --skip-checks      ignorer les tests de sécurité des systèmes de fichiers et\n"
 "                         des modules de l'initrd"
 
-#: guix/scripts/system.scm:1116
+#: guix/scripts/system.scm:1140
 #, scheme-format
 msgid "both file and expression cannot be specified~%"
 msgstr "on ne peut pas spécifier à la fois un fichier et une expression~%"
 
-#: guix/scripts/system.scm:1123
+#: guix/scripts/system.scm:1147
 #, scheme-format
 msgid "no configuration specified~%"
 msgstr "aucune configuration spécifiée~%"
 
-#: guix/scripts/system.scm:1224
+#: guix/scripts/system.scm:1257
 #, scheme-format
 msgid "~a: unknown action~%"
 msgstr "~a : action inconnue~%"
 
-#: guix/scripts/system.scm:1240
+#: guix/scripts/system.scm:1273
 #, scheme-format
 msgid "wrong number of arguments for action '~a'~%"
 msgstr "nombre d'arguments incorrect pour l'action « ~a »~%"
 
-#: guix/scripts/system.scm:1245
+#: guix/scripts/system.scm:1278
 #, scheme-format
 msgid "guix system: missing command name~%"
 msgstr "guix system : nom de commande manquant~%"
 
-#: guix/scripts/system.scm:1247
+#: guix/scripts/system.scm:1280
 #, scheme-format
 msgid "Try 'guix system --help' for more information.~%"
 msgstr "Essayez « guix system --help » pour plus d'informations.~%"
 
-#: guix/scripts/system/search.scm:88 guix/ui.scm:1205 guix/ui.scm:1219
+#: guix/scripts/system/search.scm:88 guix/ui.scm:1337 guix/ui.scm:1351
 msgid "unknown"
 msgstr "inconnu"
 
-#: guix/scripts/lint.scm:140
+#: guix/scripts/lint.scm:145
 #, scheme-format
 msgid "Available checkers:~%"
 msgstr "Vérificateurs disponibles :~%"
 
-#: guix/scripts/lint.scm:164
+#: guix/scripts/lint.scm:169
 msgid "description should not be empty"
 msgstr "la description ne devrait pas être vide"
 
-#: guix/scripts/lint.scm:174
+#: guix/scripts/lint.scm:179
 msgid "Texinfo markup in description is invalid"
 msgstr "Des balises Texinfo dans la description sont invalides"
 
-#: guix/scripts/lint.scm:184
+#: guix/scripts/lint.scm:189
 #, scheme-format
 msgid ""
 "description should not contain ~\n"
@@ -2088,15 +2554,15 @@ msgstr ""
 
 #. TRANSLATORS: '@code' is Texinfo markup and must be kept
 #. as is.
-#: guix/scripts/lint.scm:197
+#: guix/scripts/lint.scm:202
 msgid "use @code or similar ornament instead of quotes"
 msgstr "utiliser @code ou une décoration similaire au lieu des guillemets"
 
-#: guix/scripts/lint.scm:204
+#: guix/scripts/lint.scm:209
 msgid "description should start with an upper-case letter or digit"
 msgstr "la description devrait commencer par une majuscule ou un chiffre"
 
-#: guix/scripts/lint.scm:220
+#: guix/scripts/lint.scm:225
 #, scheme-format
 msgid ""
 "sentences in description should be followed ~\n"
@@ -2105,261 +2571,278 @@ msgstr ""
 "les phrases dans la description devraient être suivies ~\n"
 "par deux espaces. Infraction probable~p à ~{~a~^, ~}"
 
-#: guix/scripts/lint.scm:238
+#: guix/scripts/lint.scm:243
 #, scheme-format
 msgid "invalid description: ~s"
 msgstr "description invalide : ~s"
 
-#: guix/scripts/lint.scm:283
+#: guix/scripts/lint.scm:288
 #, scheme-format
 msgid "'~a' should probably be a native input"
 msgstr "« ~a » devrait sans doute être une entrée native"
 
-#: guix/scripts/lint.scm:299
+#: guix/scripts/lint.scm:304
 #, scheme-format
 msgid "'~a' should probably not be an input at all"
 msgstr "« ~a » ne devrait probablement pas être une entrée du tout"
 
-#: guix/scripts/lint.scm:316
+#: guix/scripts/lint.scm:321
 msgid "synopsis should not be empty"
 msgstr "le synopsis ne devrait pas être vide"
 
-#: guix/scripts/lint.scm:324
+#: guix/scripts/lint.scm:329
 msgid "no period allowed at the end of the synopsis"
 msgstr "un point n'est pas autorisé à la fin du synopsis"
 
-#: guix/scripts/lint.scm:336
+#: guix/scripts/lint.scm:341
 msgid "no article allowed at the beginning of the synopsis"
 msgstr "les articles ne sont pas permis au début du synopsis"
 
-#: guix/scripts/lint.scm:343
+#: guix/scripts/lint.scm:348
 msgid "synopsis should be less than 80 characters long"
 msgstr "le synopsis devrait être plus court que 80 caractères"
 
-#: guix/scripts/lint.scm:349
+#: guix/scripts/lint.scm:354
 msgid "synopsis should start with an upper-case letter or digit"
 msgstr "le synopsis devrait commencer par une majuscule ou un chiffre"
 
-#: guix/scripts/lint.scm:356
+#: guix/scripts/lint.scm:361
 msgid "synopsis should not start with the package name"
 msgstr "le synopsis ne devrait pas commencer par un nom de paquet"
 
-#: guix/scripts/lint.scm:366
+#: guix/scripts/lint.scm:371
 msgid "Texinfo markup in synopsis is invalid"
 msgstr "La balise Texinfo dans le synopsis est invalide"
 
-#: guix/scripts/lint.scm:385
+#: guix/scripts/lint.scm:390
 #, scheme-format
 msgid "invalid synopsis: ~s"
 msgstr "synopsis non valide : ~s"
 
-#: guix/scripts/lint.scm:504
+#: guix/scripts/lint.scm:509
 #, scheme-format
 msgid "URI ~a returned suspiciously small file (~a bytes)"
 msgstr "L'URI ~a a renvoyé un fichier étrangement petit (~a octets)"
 
-#: guix/scripts/lint.scm:514
+#: guix/scripts/lint.scm:519
 #, scheme-format
 msgid "permanent redirect from ~a to ~a"
 msgstr "redirection permanente de ~a vers ~a"
 
-#: guix/scripts/lint.scm:521
+#: guix/scripts/lint.scm:526
 #, scheme-format
 msgid "invalid permanent redirect from ~a"
 msgstr "redirection permanente invalide : ~a"
 
-#: guix/scripts/lint.scm:528 guix/scripts/lint.scm:540
+#: guix/scripts/lint.scm:533 guix/scripts/lint.scm:545
 #, scheme-format
 msgid "URI ~a not reachable: ~a (~s)"
 msgstr "L'URI ~a n'a pu être atteinte : ~a (~s)"
 
-#: guix/scripts/lint.scm:547
+#: guix/scripts/lint.scm:552
 #, scheme-format
 msgid "URI ~a domain not found: ~a"
 msgstr "Le domaine de l'URI ~a n'a pas été trouvé : ~a"
 
-#: guix/scripts/lint.scm:555
+#: guix/scripts/lint.scm:560
 #, scheme-format
 msgid "URI ~a unreachable: ~a"
 msgstr "L'URI ~a n'a pu être atteinte : ~a"
 
-#: guix/scripts/lint.scm:564
+#: guix/scripts/lint.scm:569
 #, scheme-format
 msgid "TLS certificate error: ~a"
 msgstr "Erreur de certificat TLS : ~a"
 
-#: guix/scripts/lint.scm:585
+#: guix/scripts/lint.scm:590
 msgid "invalid value for home page"
 msgstr "valeur invalide pour la page d'accueil"
 
-#: guix/scripts/lint.scm:588
+#: guix/scripts/lint.scm:593
 #, scheme-format
 msgid "invalid home page URL: ~s"
 msgstr "URL de la page d'accueil invalide : ~s"
 
-#: guix/scripts/lint.scm:614
+#: guix/scripts/lint.scm:620
 msgid "file names of patches should start with the package name"
 msgstr "les noms de fichiers des correctifs devraient commencer par le nom du paquet"
 
-#: guix/scripts/lint.scm:630
+#: guix/scripts/lint.scm:636
 #, scheme-format
 msgid "~a: file name is too long"
 msgstr "~a : le nom de fichier est trop long"
 
-#: guix/scripts/lint.scm:671
+#: guix/scripts/lint.scm:677
 #, scheme-format
 msgid "~a: ~a: proposed synopsis: ~s~%"
 msgstr "~a : ~a : synopsis proposé : ~s~%"
 
-#: guix/scripts/lint.scm:684
+#: guix/scripts/lint.scm:690
 #, scheme-format
 msgid "~a: ~a: proposed description:~%     \"~a\"~%"
 msgstr "~a : ~a : description proposée :~%     « ~a »~%"
 
-#: guix/scripts/lint.scm:726
+#: guix/scripts/lint.scm:732
 msgid "all the source URIs are unreachable:"
 msgstr "toutes les URI sources sont inatteignables :"
 
-#: guix/scripts/lint.scm:748
+#: guix/scripts/lint.scm:754
 msgid "the source file name should contain the package name"
 msgstr "le nom du fichier source devrait contenir le nom du paquet"
 
-#: guix/scripts/lint.scm:764
+#: guix/scripts/lint.scm:766
+msgid "the source URI should not be an autogenerated tarball"
+msgstr "l'URI de la source ne devrait pas être une archive auto-générée"
+
+#: guix/scripts/lint.scm:787
 #, scheme-format
 msgid "URL should be 'mirror://~a/~a'"
 msgstr "L'URL devrait être « mirror://~a/~a »"
 
-#: guix/scripts/lint.scm:783 guix/scripts/lint.scm:788
+#: guix/scripts/lint.scm:827
+#, scheme-format
+msgid "URL should be '~a'"
+msgstr "L'URL devrait être « ~a »"
+
+#: guix/scripts/lint.scm:838 guix/scripts/lint.scm:843
 #, scheme-format
 msgid "failed to create ~a derivation: ~a"
 msgstr "échec à la création de la dérivation pour ~a : ~a"
 
-#: guix/scripts/lint.scm:805
+#: guix/scripts/lint.scm:860
 #, scheme-format
 msgid "failed to create ~a derivation: ~s"
 msgstr "échec à la création de la dérivation pour ~a : ~s"
 
-#: guix/scripts/lint.scm:817
+#: guix/scripts/lint.scm:872
 msgid "invalid license field"
 msgstr "champ de licence invalide"
 
-#: guix/scripts/lint.scm:824
+#: guix/scripts/lint.scm:879
 #, scheme-format
 msgid "~a: HTTP GET error for ~a: ~a (~s)~%"
 msgstr "~a : erreur HTTP GET pour ~a : ~a (~s)~%"
 
-#: guix/scripts/lint.scm:834
+#: guix/scripts/lint.scm:889
 #, scheme-format
 msgid "~a: host lookup failure: ~a~%"
 msgstr "~a : erreur lors de la consultation du nom d'hôte : ~a~%"
 
-#: guix/scripts/lint.scm:839
+#: guix/scripts/lint.scm:894
 #, scheme-format
 msgid "~a: TLS certificate error: ~a"
 msgstr "~a : erreur de certificat TLS : ~a"
 
-#: guix/scripts/lint.scm:854
+#: guix/scripts/lint.scm:909
 msgid "while retrieving CVE vulnerabilities"
 msgstr "pendant la récupération des vulnérabilités CVE"
 
-#: guix/scripts/lint.scm:891
+#: guix/scripts/lint.scm:946
 #, scheme-format
 msgid "probably vulnerable to ~a"
 msgstr "probablement vulnérable à ~a"
 
-#: guix/scripts/lint.scm:898
+#: guix/scripts/lint.scm:953
 #, scheme-format
 msgid "while retrieving upstream info for '~a'"
 msgstr "pendant la récupération des informations en amont de « ~a »"
 
-#: guix/scripts/lint.scm:906
+#: guix/scripts/lint.scm:961
 #, scheme-format
 msgid "can be upgraded to ~a"
 msgstr "peut être mis à jour vers ~a"
 
-#: guix/scripts/lint.scm:921
+#: guix/scripts/lint.scm:976
 #, scheme-format
 msgid "tabulation on line ~a, column ~a"
 msgstr "tabulation à la ligne ~a, colonne ~a"
 
-#: guix/scripts/lint.scm:930
+#: guix/scripts/lint.scm:985
 #, scheme-format
 msgid "trailing white space on line ~a"
 msgstr "espace à la fin de la ligne ~a"
 
-#: guix/scripts/lint.scm:940
+#: guix/scripts/lint.scm:995
 #, scheme-format
 msgid "line ~a is way too long (~a characters)"
 msgstr "la ligne ~a est beaucoup trop longue (~a caractères)"
 
-#: guix/scripts/lint.scm:951
+#: guix/scripts/lint.scm:1006
 #, scheme-format
 msgid "line ~a: parentheses feel lonely, move to the previous or next line"
 msgstr "ligne ~a : des parenthèses se sentent seules. À déplacer à la ligne suivante ou précédente"
 
-#: guix/scripts/lint.scm:1021
+#: guix/scripts/lint.scm:1076
 msgid "Validate package descriptions"
 msgstr "Valider des descriptions de paquets"
 
-#: guix/scripts/lint.scm:1025
+#: guix/scripts/lint.scm:1080
 msgid "Validate synopsis & description of GNU packages"
 msgstr "Valider le synopsis et la description de paquets GNU"
 
-#: guix/scripts/lint.scm:1029
+#: guix/scripts/lint.scm:1084
 msgid "Identify inputs that should be native inputs"
 msgstr "Identifier les entrées qui devraient être natives"
 
-#: guix/scripts/lint.scm:1033
+#: guix/scripts/lint.scm:1088
 msgid "Identify inputs that shouldn't be inputs at all"
 msgstr "Identifier les entrées qui ne devraient pas être des entrées du tout"
 
-#: guix/scripts/lint.scm:1037
+#: guix/scripts/lint.scm:1092
 msgid "Validate file names and availability of patches"
 msgstr "Valider les noms de fichiers et la disponibilité de correctifs"
 
-#: guix/scripts/lint.scm:1041
+#: guix/scripts/lint.scm:1096
 msgid "Validate home-page URLs"
 msgstr "Valider les URL des pages d'accueil"
 
 #. TRANSLATORS: <license> is the name of a data type and must not be
 #. translated.
-#: guix/scripts/lint.scm:1047
+#: guix/scripts/lint.scm:1102
 msgid "Make sure the 'license' field is a <license> or a list thereof"
-msgstr "Assurez vous que le champ « licence » est une <licence> ou une telle liste"
+msgstr "S'assurer que le champ « licence » est une <licence> ou une telle liste"
 
-#: guix/scripts/lint.scm:1052
+#: guix/scripts/lint.scm:1107
 msgid "Validate source URLs"
 msgstr "Valider les URL sources"
 
-#: guix/scripts/lint.scm:1056
+#: guix/scripts/lint.scm:1111
 msgid "Suggest 'mirror://' URLs"
-msgstr "Suggérer les URL « mirror:// »"
+msgstr "Suggérer des URL « mirror:// »"
+
+#: guix/scripts/lint.scm:1115
+msgid "Suggest GitHub URLs"
+msgstr "Suggérer des URL GitHub"
 
-#: guix/scripts/lint.scm:1060
+#: guix/scripts/lint.scm:1119
 msgid "Validate file names of sources"
 msgstr "Valider les noms des fichiers des sources"
 
-#: guix/scripts/lint.scm:1064
+#: guix/scripts/lint.scm:1123
+msgid "Check for autogenerated tarballs"
+msgstr "Vérifier les archives auto-générées"
+
+#: guix/scripts/lint.scm:1127
 msgid "Report failure to compile a package to a derivation"
 msgstr "Signaler l'échec de la compilation d'un paquet d'une dérivation"
 
-#: guix/scripts/lint.scm:1068
+#: guix/scripts/lint.scm:1131
 msgid "Validate package synopses"
 msgstr "Valider les synopsis des paquets"
 
-#: guix/scripts/lint.scm:1072
+#: guix/scripts/lint.scm:1135
 msgid "Check the Common Vulnerabilities and Exposures (CVE) database"
 msgstr "Vérifier la base de données des vulnérabilités et failles connues (CVE)"
 
-#: guix/scripts/lint.scm:1077
+#: guix/scripts/lint.scm:1140
 msgid "Check the package for new upstream releases"
 msgstr "Vérifier s'il y a une nouvelle version en amont pour le paquet"
 
-#: guix/scripts/lint.scm:1081
+#: guix/scripts/lint.scm:1144
 msgid "Look for formatting issues in the source"
 msgstr "Rechercher des problèmes de format dans la source"
 
-#: guix/scripts/lint.scm:1109
+#: guix/scripts/lint.scm:1172
 msgid ""
 "Usage: guix lint [OPTION]... [PACKAGE]...\n"
 "Run a set of checkers on the specified package; if none is specified,\n"
@@ -2369,7 +2852,7 @@ msgstr ""
 "Lancer un ensemble de vérificateurs sur le paquet spécifié ; si aucun n'est spécifié,\n"
 "lancer les vérificateurs sur tous les paquets.\n"
 
-#: guix/scripts/lint.scm:1112
+#: guix/scripts/lint.scm:1175
 msgid ""
 "\n"
 "  -c, --checkers=CHECKER1,CHECKER2...\n"
@@ -2379,7 +2862,7 @@ msgstr ""
 "  -c, --checkers=CHECKER1,CHECKER2...\n"
 "                         lancer uniquement les vérificateurs spécifiés"
 
-#: guix/scripts/lint.scm:1117
+#: guix/scripts/lint.scm:1180
 msgid ""
 "\n"
 "  -l, --list-checkers    display the list of available lint checkers"
@@ -2387,7 +2870,7 @@ msgstr ""
 "\n"
 "  -l, --list-checkers    afficher la liste des vérificateurs disponibles"
 
-#: guix/scripts/lint.scm:1137
+#: guix/scripts/lint.scm:1200
 #, scheme-format
 msgid "~a: invalid checker~%"
 msgstr "~a : vérificateur non valide~%"
@@ -2509,29 +2992,29 @@ msgstr "la recherche de l'hôte « ~a » n'a rien retourné"
 #: guix/scripts/publish.scm:165
 #, scheme-format
 msgid "zlib support is missing; compression disabled~%"
-msgstr "le support zlib est manquant. La compression est désactivée~%"
+msgstr "la prise en charge de zlib est absente. La compression est désactivée~%"
 
 #: guix/scripts/publish.scm:179
 #, scheme-format
 msgid "~a: invalid duration~%"
 msgstr "~a : durée non valide~%"
 
-#: guix/scripts/publish.scm:869
+#: guix/scripts/publish.scm:876
 #, scheme-format
 msgid "user '~a' not found: ~a~%"
 msgstr "utilisateur « ~a » non trouvé : ~a~%"
 
-#: guix/scripts/publish.scm:910
+#: guix/scripts/publish.scm:917
 #, scheme-format
 msgid "server running as root; consider using the '--user' option!~%"
 msgstr "le serveur tourne en tant que root. Envisagez d'utiliser l'option « --user » !~%"
 
-#: guix/scripts/publish.scm:915
+#: guix/scripts/publish.scm:922
 #, scheme-format
 msgid "publishing ~a on ~a, port ~d~%"
 msgstr "diffusion de ~a sur ~a, port ~d~%"
 
-#: guix/scripts/edit.scm:41
+#: guix/scripts/edit.scm:40
 msgid ""
 "Usage: guix edit PACKAGE...\n"
 "Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"
@@ -2539,39 +3022,34 @@ msgstr ""
 "Usage : guix edit PAQUET...\n"
 "Démarrer $VISUAL ou $EDITOR pour éditer la définition de PAQUET...\n"
 
-#: guix/scripts/edit.scm:62
+#: guix/scripts/edit.scm:61
 #, scheme-format
 msgid "file '~a' not found in search path ~s~%"
 msgstr "fichier « ~a » pas trouvé dans le chemin de recherche ~s~%"
 
-#: guix/scripts/edit.scm:90
-#, scheme-format
-msgid "source location of package '~a' is unknown~%"
-msgstr "l'emplacement source du paquet « ~a » est inconnue~%"
-
-#: guix/scripts/edit.scm:103
+#: guix/scripts/edit.scm:96
 #, scheme-format
 msgid "failed to launch '~a': ~a~%"
 msgstr "impossible de démarrer « ~a » : ~a~%"
 
-#: guix/scripts/size.scm:68
+#: guix/scripts/size.scm:69
 #, scheme-format
 msgid "no available substitute information for '~a'~%"
 msgstr "pas d'information de substitution disponible pour « ~a »~%"
 
-#: guix/scripts/size.scm:90
+#: guix/scripts/size.scm:91
 msgid "store item"
 msgstr "élément stockage"
 
-#: guix/scripts/size.scm:90
+#: guix/scripts/size.scm:91
 msgid "total"
 msgstr "total"
 
-#: guix/scripts/size.scm:90
+#: guix/scripts/size.scm:91
 msgid "self"
 msgstr "lui-même"
 
-#: guix/scripts/size.scm:98
+#: guix/scripts/size.scm:99
 #, scheme-format
 msgid "total: ~,1f MiB~%"
 msgstr "total : ~,1f MiB~%"
@@ -2579,11 +3057,11 @@ msgstr "total : ~,1f MiB~%"
 #. TRANSLATORS: This is the title of a graph, meaning that the graph
 #. represents a profile of the store (the "store" being the place where
 #. packages are stored.)
-#: guix/scripts/size.scm:212
+#: guix/scripts/size.scm:222
 msgid "store profile"
 msgstr "profil du dépôt"
 
-#: guix/scripts/size.scm:221
+#: guix/scripts/size.scm:231
 msgid ""
 "Usage: guix size [OPTION]... PACKAGE\n"
 "Report the size of PACKAGE and its dependencies.\n"
@@ -2591,7 +3069,7 @@ msgstr ""
 "Usage : guix size [OPTION]... PAQUET\n"
 "Rapporter la taille du PAQUET et de ses dépendances.\n"
 
-#: guix/scripts/size.scm:226
+#: guix/scripts/size.scm:236
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    consider packages for SYSTEM--e.g., \"i686-linux\""
@@ -2600,7 +3078,7 @@ msgstr ""
 "  -s, --system=SYSTÈME   prend en compte les paquets pour le SYSTÈME, par exemple « i686-linux »"
 
 #. TRANSLATORS: "closure" and "self" must not be translated.
-#: guix/scripts/size.scm:229
+#: guix/scripts/size.scm:239
 msgid ""
 "\n"
 "      --sort=KEY         sort according to KEY--\"closure\" or \"self\""
@@ -2608,7 +3086,7 @@ msgstr ""
 "\n"
 "      --sort=CLEF        tri en fonction de la CLEF : « closure » ou « self »"
 
-#: guix/scripts/size.scm:231
+#: guix/scripts/size.scm:241
 msgid ""
 "\n"
 "  -m, --map-file=FILE    write to FILE a graphical map of disk usage"
@@ -2616,90 +3094,94 @@ msgstr ""
 "\n"
 "  -m, --map-file=FICHIER écrit dans le FICHIER une carte graphique de l'utilisation du disque"
 
-#: guix/scripts/size.scm:262
+#: guix/scripts/size.scm:272
 #, scheme-format
 msgid "~a: invalid sorting key~%"
 msgstr "~a : clef de tri invalide~%"
 
-#: guix/scripts/size.scm:297
+#: guix/scripts/size.scm:307
 msgid "missing store item argument\n"
 msgstr "argument d'élément de stockage manquant\n"
 
-#: guix/scripts/graph.scm:87
+#: guix/scripts/graph.scm:88
 #, scheme-format
 msgid "~a: invalid argument (package name expected)"
 msgstr "~a : argument invalide (nom de paquet attendu)"
 
-#: guix/scripts/graph.scm:98
+#: guix/scripts/graph.scm:99
 msgid "the DAG of packages, excluding implicit inputs"
 msgstr "le DAG des paquets en excluant les entrées implicites"
 
-#: guix/scripts/graph.scm:124
+#: guix/scripts/graph.scm:135
 msgid "the reverse DAG of packages"
 msgstr "le graphe orienté acyclique (DAG) inversé des paquets"
 
-#: guix/scripts/graph.scm:174
+#: guix/scripts/graph.scm:185
 msgid "the DAG of packages, including implicit inputs"
 msgstr "le DAG des paquets en incluant les entrées implicites"
 
-#: guix/scripts/graph.scm:184
+#: guix/scripts/graph.scm:195
 msgid "the DAG of packages and origins, including implicit inputs"
 msgstr "le DAG des paquets et origines en incluant les entrées implicites"
 
-#: guix/scripts/graph.scm:214
+#: guix/scripts/graph.scm:225
 msgid "same as 'bag', but without the bootstrap nodes"
 msgstr "comme « bag » mais sans les nœuds d'amorçage"
 
-#: guix/scripts/graph.scm:256
+#: guix/scripts/graph.scm:242
+msgid "the reverse DAG of packages, including implicit inputs"
+msgstr "le DAG inversé des paquets en incluant les entrées implicites"
+
+#: guix/scripts/graph.scm:282
 msgid "the DAG of derivations"
 msgstr "le DAG des dérivations"
 
-#: guix/scripts/graph.scm:268
+#: guix/scripts/graph.scm:294
 msgid "unsupported argument for derivation graph"
-msgstr "argument non supporté pour le graphe de dérivation"
+msgstr "argument non pris en charge pour le graphe de dérivation"
 
-#: guix/scripts/graph.scm:294
+#: guix/scripts/graph.scm:320
 msgid "unsupported argument for this type of graph"
-msgstr "argument non supporté pour ce type de graphe"
+msgstr "argument non pris en charge pour ce type de graphe"
 
-#: guix/scripts/graph.scm:307
+#: guix/scripts/graph.scm:333
 #, scheme-format
 msgid "references for '~a' are not known~%"
 msgstr "les références pour « ~a » sont inconnues~%"
 
-#: guix/scripts/graph.scm:314
+#: guix/scripts/graph.scm:340
 msgid "the DAG of run-time dependencies (store references)"
 msgstr "le DAG des dépendances à l'exécution (stockage des références)"
 
-#: guix/scripts/graph.scm:330
+#: guix/scripts/graph.scm:356
 msgid "the DAG of referrers in the store"
 msgstr "le graphe orienté acyclique (DAG) des référents dans le stockage"
 
-#: guix/scripts/graph.scm:360
+#: guix/scripts/graph.scm:386
 msgid "the graph of package modules"
 msgstr "le graphe des modules de paquets"
 
-#: guix/scripts/graph.scm:388
+#: guix/scripts/graph.scm:415
 #, scheme-format
 msgid "~a: unknown node type~%"
 msgstr "~a : type de nœud inconnu~%"
 
-#: guix/scripts/graph.scm:395
+#: guix/scripts/graph.scm:422
 #, scheme-format
 msgid "~a: unknown backend~%"
 msgstr "~a : moteur de graphe inconnu~%"
 
-#: guix/scripts/graph.scm:399
+#: guix/scripts/graph.scm:426
 msgid "The available node types are:\n"
 msgstr "Les types de nœuds disponibles sont :\n"
 
-#: guix/scripts/graph.scm:409
+#: guix/scripts/graph.scm:436
 msgid "The available backend types are:\n"
 msgstr "Les types de moteurs de graphes disponibles sont :\n"
 
 #. TRANSLATORS: Here 'dot' is the name of a program; it must not be
 #. translated.
-#: guix/scripts/graph.scm:457
+#: guix/scripts/graph.scm:484
 msgid ""
 "Usage: guix graph PACKAGE...\n"
 "Emit a representation of the dependency graph of PACKAGE...\n"
@@ -2707,7 +3189,7 @@ msgstr ""
 "Usage : guix graph PAQUET...\n"
 "Produit une représentation du graphe des dépendances de PAQUET...\n"
 
-#: guix/scripts/graph.scm:459
+#: guix/scripts/graph.scm:486
 msgid ""
 "\n"
 "  -b, --backend=TYPE     produce a graph with the given backend TYPE"
@@ -2715,7 +3197,7 @@ msgstr ""
 "\n"
 "  -b, --backend=TYPE     produire un graphe avec le TYPE de moteur donné"
 
-#: guix/scripts/graph.scm:461
+#: guix/scripts/graph.scm:488
 msgid ""
 "\n"
 "      --list-backends    list the available graph backends"
@@ -2723,7 +3205,7 @@ msgstr ""
 "\n"
 "      --list-backends    lister les types de moteurs de graphes disponibles"
 
-#: guix/scripts/graph.scm:463
+#: guix/scripts/graph.scm:490
 msgid ""
 "\n"
 "  -t, --type=TYPE        represent nodes of the given TYPE"
@@ -2731,7 +3213,7 @@ msgstr ""
 "\n"
 "  -t, --type=TYPE        représenter les nœuds du TYPE donné"
 
-#: guix/scripts/graph.scm:465
+#: guix/scripts/graph.scm:492
 msgid ""
 "\n"
 "      --list-types       list the available graph types"
@@ -2739,7 +3221,7 @@ msgstr ""
 "\n"
 "      --list-types       lister les types de graphes disponibles"
 
-#: guix/scripts/graph.scm:467 guix/scripts/pack.scm:710
+#: guix/scripts/graph.scm:494 guix/scripts/pack.scm:752
 msgid ""
 "\n"
 "  -e, --expression=EXPR  consider the package EXPR evaluates to"
@@ -2747,7 +3229,7 @@ msgstr ""
 "\n"
 "  -e, --expression=EXPR  considère le paquet évalué par EXPR"
 
-#: guix/scripts/graph.scm:469
+#: guix/scripts/graph.scm:496
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    consider the graph for SYSTEM--e.g., \"i686-linux\""
@@ -2832,17 +3314,17 @@ msgstr ""
 "\n"
 "      -v, --verbose      montrer les détails des comparaisons réussies"
 
-#: guix/scripts/copy.scm:59
+#: guix/scripts/copy.scm:60
 #, scheme-format
 msgid "~a: invalid TCP port number~%"
 msgstr "~a : numéro de port TCP invalide~%"
 
-#: guix/scripts/copy.scm:61
+#: guix/scripts/copy.scm:62
 #, scheme-format
 msgid "~a: invalid SSH specification~%"
 msgstr "~a : spécification SSH invalide~%"
 
-#: guix/scripts/copy.scm:113
+#: guix/scripts/copy.scm:114
 msgid ""
 "Usage: guix copy [OPTION]... ITEMS...\n"
 "Copy ITEMS to or from the specified host over SSH.\n"
@@ -2850,7 +3332,7 @@ msgstr ""
 "Usage: guix copy [OPTION]... ÉLÉMENTS...\n"
 "Copier les ÉLÉMENTS vers ou depuis l'hôte spécifié en SSH.\n"
 
-#: guix/scripts/copy.scm:115
+#: guix/scripts/copy.scm:116
 msgid ""
 "\n"
 "      --to=HOST          send ITEMS to HOST"
@@ -2858,7 +3340,7 @@ msgstr ""
 "\n"
 "      --to=HÔTE          envoyer les ÉLÉMENTS vers l'HÔTE"
 
-#: guix/scripts/copy.scm:117
+#: guix/scripts/copy.scm:118
 msgid ""
 "\n"
 "      --from=HOST        receive ITEMS from HOST"
@@ -2866,17 +3348,17 @@ msgstr ""
 "\n"
 "      --from=HÔTE        recevoir les ÉLÉMENTS depuis l'HÔTE"
 
-#: guix/scripts/copy.scm:169
+#: guix/scripts/copy.scm:182
 #, scheme-format
 msgid "use '--to' or '--from'~%"
 msgstr "utilisez « --to » ou « --from »~%"
 
-#: guix/scripts/pack.scm:93
+#: guix/scripts/pack.scm:95
 #, scheme-format
 msgid "~a: compressor not found~%"
 msgstr "~a : compresseur introuvable~%"
 
-#: guix/scripts/pack.scm:504
+#: guix/scripts/pack.scm:513
 #, scheme-format
 msgid ""
 "cross-compilation not implemented here;\n"
@@ -2885,11 +3367,11 @@ msgstr ""
 "la compilation croisée n'est pas implémentée ici ;\n"
 "envoyez un courriel à « ~a »~%"
 
-#: guix/scripts/pack.scm:615
+#: guix/scripts/pack.scm:644
 msgid "The supported formats for 'guix pack' are:"
-msgstr "Les formats supportés par « guix pack » sont :"
+msgstr "Les formats pris en charge par « guix pack » sont :"
 
-#: guix/scripts/pack.scm:617
+#: guix/scripts/pack.scm:646
 msgid ""
 "\n"
 "  tarball       Self-contained tarball, ready to run on another machine"
@@ -2897,7 +3379,7 @@ msgstr ""
 "\n"
 "  tarball       Archive auto-contenue, prête à être lancée sur d'autres machines"
 
-#: guix/scripts/pack.scm:619
+#: guix/scripts/pack.scm:648
 msgid ""
 "\n"
 "  squashfs      Squashfs image suitable for Singularity"
@@ -2905,7 +3387,7 @@ msgstr ""
 "\n"
 "  squashfs      Image Squashfs compatible avec Singularity"
 
-#: guix/scripts/pack.scm:621
+#: guix/scripts/pack.scm:650
 msgid ""
 "\n"
 "  docker        Tarball ready for 'docker load'"
@@ -2913,17 +3395,17 @@ msgstr ""
 "\n"
 "  docker        Archive prête à être utilisée avec « docker load »"
 
-#: guix/scripts/pack.scm:678
+#: guix/scripts/pack.scm:712
 #, scheme-format
 msgid "~a: invalid symlink specification~%"
 msgstr "~a : spécification de lien symbolique invalide~%"
 
-#: guix/scripts/pack.scm:689
+#: guix/scripts/pack.scm:726
 #, scheme-format
 msgid "~a: unsupported profile name~%"
-msgstr "~a : nom de profil non supporté~%"
+msgstr "~a : nom de profil non pris en charge~%"
 
-#: guix/scripts/pack.scm:698
+#: guix/scripts/pack.scm:740
 msgid ""
 "Usage: guix pack [OPTION]... PACKAGE...\n"
 "Create a bundle of PACKAGE.\n"
@@ -2931,7 +3413,7 @@ msgstr ""
 "Utilisation : guix pack [OPTION]... PAQUET...\n"
 "Créer un lot applicatif de PAQUET.\n"
 
-#: guix/scripts/pack.scm:704
+#: guix/scripts/pack.scm:746
 msgid ""
 "\n"
 "  -f, --format=FORMAT    build a pack in the given FORMAT"
@@ -2939,7 +3421,7 @@ msgstr ""
 "\n"
 "  -f, --format=FORMAT    créer un lot applicatif dans le FORMAT donné"
 
-#: guix/scripts/pack.scm:706
+#: guix/scripts/pack.scm:748
 msgid ""
 "\n"
 "      --list-formats     list the formats available"
@@ -2947,7 +3429,7 @@ msgstr ""
 "\n"
 "      --list-formats     lister les formats disponibles"
 
-#: guix/scripts/pack.scm:708
+#: guix/scripts/pack.scm:750
 msgid ""
 "\n"
 "  -R, --relocatable      produce relocatable executables"
@@ -2955,7 +3437,7 @@ msgstr ""
 "\n"
 "  -R, --relocatable      produire des exécutables repositionnables"
 
-#: guix/scripts/pack.scm:716
+#: guix/scripts/pack.scm:758
 msgid ""
 "\n"
 "  -C, --compression=TOOL compress using TOOL--e.g., \"lzip\""
@@ -2964,7 +3446,7 @@ msgstr ""
 "  -C, --compression=OUTIL\n"
 "                         compresser en utilisant l'OUTIL, par ex, « lzip »"
 
-#: guix/scripts/pack.scm:718
+#: guix/scripts/pack.scm:760
 msgid ""
 "\n"
 "  -S, --symlink=SPEC     create symlinks to the profile according to SPEC"
@@ -2972,7 +3454,7 @@ msgstr ""
 "\n"
 "  -S, --symlink=SPEC     créer des liens symboliques vers le profil selon la SPEC"
 
-#: guix/scripts/pack.scm:720
+#: guix/scripts/pack.scm:762
 msgid ""
 "\n"
 "  -m, --manifest=FILE    create a pack with the manifest from FILE"
@@ -2980,7 +3462,15 @@ msgstr ""
 "\n"
 "  -m, --manifest=FICHIER créer un lot avec le manifeste dans FICHIER"
 
-#: guix/scripts/pack.scm:722
+#: guix/scripts/pack.scm:764
+msgid ""
+"\n"
+"      --save-provenance  save provenance information"
+msgstr ""
+"\n"
+"      --save-provenance  sauvegarder les informations de provenance"
+
+#: guix/scripts/pack.scm:766
 msgid ""
 "\n"
 "      --localstatedir    include /var/guix in the resulting pack"
@@ -2988,7 +3478,7 @@ msgstr ""
 "\n"
 "      --localstatedir    inclure /var/guix dans le lot résultant"
 
-#: guix/scripts/pack.scm:724
+#: guix/scripts/pack.scm:768
 msgid ""
 "\n"
 "      --profile-name=NAME\n"
@@ -2997,7 +3487,7 @@ msgstr ""
 "\n"
 "      --profile-name=NOM rempli /var/guix/profiles/.../NOM"
 
-#: guix/scripts/pack.scm:727
+#: guix/scripts/pack.scm:773
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap binaries to build the pack"
@@ -3005,91 +3495,96 @@ msgstr ""
 "\n"
 "      --bootstrap        utiliser les programmes d'amorçage pour compiler le lot"
 
-#: guix/scripts/pack.scm:769
+#: guix/scripts/pack.scm:818
+#, scheme-format
+msgid "could not determine provenance of package ~a~%"
+msgstr "impossible de déterminer la provenance du paquet ~a~%"
+
+#: guix/scripts/pack.scm:827
 #, scheme-format
 msgid "both a manifest and a package list were given~%"
 msgstr "vous avez donné à la fois un manifeste et une liste de paquets~%"
 
-#: guix/scripts/pack.scm:814
+#: guix/scripts/pack.scm:882
 #, scheme-format
 msgid "~a: unknown pack format~%"
 msgstr "~a : format de lot inconnu~%"
 
-#: guix/scripts/weather.scm:73
+#: guix/scripts/weather.scm:80
 msgid "computing ~h package derivations for ~a...~%"
 msgstr "calcul de ~h dérivations de paquets pour ~a…~%"
 
-#: guix/scripts/weather.scm:162
+#: guix/scripts/weather.scm:169
 msgid "looking for ~h store items on ~a...~%"
 msgstr "recherche de ~h éléments du dépôt sur ~a...~%"
 
-#: guix/scripts/weather.scm:174
+#: guix/scripts/weather.scm:181
 msgid "  ~2,1f% substitutes available (~h out of ~h)~%"
 msgstr "  ~2,1f% substituts disponibles (~h sur ~h)~%"
 
-#: guix/scripts/weather.scm:180
+#: guix/scripts/weather.scm:187
 #, scheme-format
 msgid "  unknown substitute sizes~%"
 msgstr "  taille des substituts inconnue~%"
 
-#: guix/scripts/weather.scm:183
+#: guix/scripts/weather.scm:190
 msgid "  ~,1h MiB of nars (compressed)~%"
 msgstr "  ~,1h Mo de fichiers nar (compressés)~%"
 
-#: guix/scripts/weather.scm:184
+#: guix/scripts/weather.scm:191
 msgid "  at least ~,1h MiB of nars (compressed)~%"
 msgstr "  au moins ~,1h Mo de fichiers nar (compressés)~%"
 
-#: guix/scripts/weather.scm:186
+#: guix/scripts/weather.scm:193
 msgid "  ~,1h MiB on disk (uncompressed)~%"
 msgstr "  ~,1h Mo sur le disque (décompressé)~%"
 
-#: guix/scripts/weather.scm:188
+#: guix/scripts/weather.scm:195
 msgid "  ~,3h seconds per request (~,1h seconds in total)~%"
 msgstr "  ~,3h secondes par requête (~,1h secondesen tout)~%"
 
-#: guix/scripts/weather.scm:190
+#: guix/scripts/weather.scm:197
 msgid "  ~,1h requests per second~%"
 msgstr "  ~,1h requêtes par seconde~%"
 
-#: guix/scripts/weather.scm:196
+#: guix/scripts/weather.scm:203
 #, scheme-format
 msgid "  (continuous integration information unavailable)~%"
 msgstr "  (informations sur l’intégration continue indisponibles)~%"
 
-#: guix/scripts/weather.scm:199
+#: guix/scripts/weather.scm:206
 #, scheme-format
 msgid "  '~a' returned ~a (~s)~%"
 msgstr "  « ~a » a renvoyé ~a (~s)~%"
 
-#: guix/scripts/weather.scm:216
+#: guix/scripts/weather.scm:223
 msgid "  ~,1f% (~h out of ~h) of the missing items are queued~%"
 msgstr "  ~,1f% (~h sur ~h) des éléments manquants sont dans la queue~%"
 
-#: guix/scripts/weather.scm:222
+#: guix/scripts/weather.scm:229
 msgid "  at least ~h queued builds~%"
 msgstr "  au moins ~h constructions dans la queue~%"
 
-#: guix/scripts/weather.scm:223
+#: guix/scripts/weather.scm:230
 msgid "  ~h queued builds~%"
 msgstr "  ~h constructions dans la queue~%"
 
-#: guix/scripts/weather.scm:226
+#: guix/scripts/weather.scm:233
 #, scheme-format
 msgid "      ~a: ~a (~0,1f%)~%"
 msgstr "      ~a : ~a (~0,1f%)~%"
 
-#: guix/scripts/weather.scm:232
+#: guix/scripts/weather.scm:239
 #, scheme-format
 msgid "  build rate: ~1,2f builds per hour~%"
 msgstr "  vitesse de construction : ~1,2f constructions par l'heure~%"
 
-#: guix/scripts/weather.scm:236
+#: guix/scripts/weather.scm:243
 #, scheme-format
 msgid "      ~a: ~,2f builds per hour~%"
 msgstr "      ~a: ~,2f constructions par heure~%"
 
-#: guix/scripts/weather.scm:248
+#: guix/scripts/weather.scm:255
 msgid ""
 "Usage: guix weather [OPTIONS]\n"
 "Report the availability of substitutes.\n"
@@ -3097,7 +3592,7 @@ msgstr ""
 "Usage : guix weather [OPTIONS]\n"
 "Rapporte la disponibilité des substituts.\n"
 
-#: guix/scripts/weather.scm:250
+#: guix/scripts/weather.scm:257
 msgid ""
 "\n"
 "      --substitute-urls=URLS\n"
@@ -3107,7 +3602,7 @@ msgstr ""
 "      --substitute-urls=URLS\n"
 "                         vérifie la disponibilité des substituts aux URLS"
 
-#: guix/scripts/weather.scm:253
+#: guix/scripts/weather.scm:260
 msgid ""
 "\n"
 "  -m, --manifest=MANIFEST\n"
@@ -3117,7 +3612,19 @@ msgstr ""
 "  -m, --manifest=MANIFESTE\n"
 "                         recherche les substituts des paquets du MANIFESTE"
 
-#: guix/scripts/weather.scm:256
+#: guix/scripts/weather.scm:263
+msgid ""
+"\n"
+"  -c, --coverage[=COUNT]\n"
+"                         show substitute coverage for packages with at least\n"
+"                         COUNT dependents"
+msgstr ""
+"\n"
+"  -c, --coverage[=COMPTE]\n"
+"                         affiche la couverture des substituts pour les paquets qui ont au\n"
+"                         moins COMPTE paquets qui en dépendent"
+
+#: guix/scripts/weather.scm:267
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    consider substitutes for SYSTEM--e.g., \"i686-linux\""
@@ -3125,15 +3632,29 @@ msgstr ""
 "\n"
 "  -s, --system=SYSTÈME   prend en compte les substituts pour le SYSTÈME, par exemple « i686-linux »"
 
-#: guix/scripts/weather.scm:280
+#: guix/scripts/weather.scm:291
 #, scheme-format
 msgid "~a: invalid URL~%"
 msgstr "~a : URL invalide~%"
 
+#: guix/scripts/weather.scm:420
+#, scheme-format
+msgid "The following ~a package is missing from '~a' for '~a':~%"
+msgid_plural "The following ~a packages are missing from '~a' for '~a':~%"
+msgstr[0] "Le (~a) paquet suivant n'est pas sur « ~a » pour « ~a » :~%"
+msgstr[1] "Les ~a paquets suivants ne sont pas sur « ~a » pour « ~a » :~%"
+
+#: guix/scripts/weather.scm:426
+#, scheme-format
+msgid "~a package is missing from '~a' for '~a':~%"
+msgid_plural "~a packages are missing from '~a' for '~a', among which:~%"
+msgstr[0] "~a paquet n'est pas sur « ~a » pour « ~a » :~%"
+msgstr[1] "~a paquets ne sont pas sur « ~a » pour « ~a » :~%"
+
 #: guix/scripts/describe.scm:45
 #, scheme-format
 msgid "~a: unsupported output format~%"
-msgstr "~a : format de sortie non supporté~%"
+msgstr "~a : format de sortie non pris en charge~%"
 
 #: guix/scripts/describe.scm:64
 msgid ""
@@ -3164,27 +3685,32 @@ msgstr ""
 msgid "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%"
 msgstr "~%;; attention : GUIX_PACKAGE_PATH=\"~a\"~%"
 
-#: guix/scripts/describe.scm:115
+#: guix/scripts/describe.scm:90
+#, scheme-format
+msgid "'GUIX_PACKAGE_PATH' is set but it is not captured~%"
+msgstr "« GUIX_PACKAGE_PATH » est renseigné mais n'est pas utilisé~%"
+
+#: guix/scripts/describe.scm:117
 #, scheme-format
 msgid "failed to determine origin~%"
 msgstr "échec à la détection de l'origine~%"
 
-#: guix/scripts/describe.scm:121
+#: guix/scripts/describe.scm:123
 #, scheme-format
 msgid "Git checkout:~%"
 msgstr "Dépôt git :~%"
 
-#: guix/scripts/describe.scm:122
+#: guix/scripts/describe.scm:124
 #, scheme-format
 msgid "  repository: ~a~%"
 msgstr "  URL du dépôt : ~a~%"
 
-#: guix/scripts/describe.scm:123
+#: guix/scripts/describe.scm:125
 #, scheme-format
 msgid "  branch: ~a~%"
 msgstr "  branche: ~a~%"
 
-#: guix/scripts/describe.scm:124
+#: guix/scripts/describe.scm:126
 #, scheme-format
 msgid "  commit: ~a~%"
 msgstr "  commit : ~a~%"
@@ -3197,23 +3723,23 @@ msgstr ""
 "Utilisation : guix processes\n"
 "Liste les sessions Guix actuelles et leurs processus."
 
-#: guix/gnu-maintenance.scm:661
+#: guix/gnu-maintenance.scm:660
 msgid "Updater for GNU packages"
 msgstr "Logiciel de mise à jour des paquets GNU"
 
-#: guix/gnu-maintenance.scm:670
+#: guix/gnu-maintenance.scm:669
 msgid "Updater for GNU packages only available via FTP"
 msgstr "Logiciel de mise à jour des paquets GNU disponibles uniquement par FTP"
 
-#: guix/gnu-maintenance.scm:679
+#: guix/gnu-maintenance.scm:678
 msgid "Updater for KDE packages"
 msgstr "Logiciel de mise à jour des paquets KDE"
 
-#: guix/gnu-maintenance.scm:686
+#: guix/gnu-maintenance.scm:685
 msgid "Updater for X.org packages"
 msgstr "Logiciel de mise à jour des paquets X.org"
 
-#: guix/gnu-maintenance.scm:693
+#: guix/gnu-maintenance.scm:692
 msgid "Updater for packages hosted on kernel.org"
 msgstr "Logiciel de mise à jour des paquets hébergés sur kernel.org"
 
@@ -3272,90 +3798,89 @@ msgstr "aucun processus ~d~%"
 msgid "exec failed with status ~d~%"
 msgstr "exec a échoué avec le statut ~d~%"
 
-#: guix/upstream.scm:250
+#: guix/upstream.scm:327
 #, scheme-format
 msgid "signature verification failed for `~a'~%"
 msgstr "la vérification de la signature a échoué pour « ~a »~%"
 
-#: guix/upstream.scm:252
+#: guix/upstream.scm:329
 #, scheme-format
 msgid "(could be because the public key is not in your keyring)~%"
 msgstr "(il est possible que la clé publique ne soit pas dans dans votre trousseau)~%"
 
-#: guix/upstream.scm:337
+#: guix/upstream.scm:397
+#, scheme-format
+msgid "cannot download for this method: ~s"
+msgstr "impossible de télécharger pour cette méthode : ~s"
+
+#: guix/upstream.scm:460
 #, scheme-format
 msgid "~a: could not locate source file"
 msgstr "~a : le fichier source est introuvable"
 
-#: guix/upstream.scm:342
+#: guix/upstream.scm:465
 #, scheme-format
 msgid "~a: ~a: no `version' field in source; skipping~%"
 msgstr "~a : ~a : aucun champ « version » dans la source ; ignoré~%"
 
-#: guix/ui.scm:175
+#. TRANSLATORS: The goal is to emit "warning:" followed by a short phrase;
+#. "~a" is a placeholder for that phrase.
+#: guix/ui.scm:209
+msgid "warning: "
+msgstr "avertissement : "
+
+#: guix/ui.scm:211
+msgid "error: "
+msgstr "erreur : "
+
+#: guix/ui.scm:259
 #, scheme-format
 msgid "error: ~a: unbound variable"
 msgstr "erreur : ~a : variable non liée"
 
-#: guix/ui.scm:271
+#: guix/ui.scm:355
 msgid "entering debugger; type ',bt' for a backtrace\n"
 msgstr "entrée dans le débogueur; tapez « ,bt » pour la trace d'exécution\n"
 
-#: guix/ui.scm:320
-#, scheme-format
-msgid "hint: ~a~%"
-msgstr "conseil : ~a~%"
+#: guix/ui.scm:410
+msgid "hint: "
+msgstr "conseil : "
 
-#: guix/ui.scm:336
+#: guix/ui.scm:427
 msgid "Did you forget a @code{use-modules} form?"
 msgstr "Auriez-vous oublié un @code{use-modules} ?"
 
-#: guix/ui.scm:338
+#: guix/ui.scm:429
 #, scheme-format
 msgid "Did you forget @code{(use-modules ~a)}?"
 msgstr "Auriez-vous oublié @code{(use-modules ~a)} ?"
 
-#: guix/ui.scm:347 guix/ui.scm:387 guix/ui.scm:394
+#: guix/ui.scm:438 guix/ui.scm:479 guix/ui.scm:485
 #, scheme-format
 msgid "failed to load '~a': ~a~%"
 msgstr "impossible de charger « ~a » : ~a~%"
 
-#: guix/ui.scm:354
+#: guix/ui.scm:445
 #, scheme-format
 msgid "~amissing closing parenthesis~%"
 msgstr "~a parenthèses fermantes manquantes~%"
 
-#: guix/ui.scm:359 guix/ui.scm:367 guix/ui.scm:714
-#, scheme-format
-msgid "~a: error: ~a~%"
-msgstr "~a : erreur: ~a~%"
-
-#: guix/ui.scm:374 guix/ui.scm:784
+#: guix/ui.scm:459 guix/ui.scm:882
 #, scheme-format
 msgid "exception thrown: ~s~%"
 msgstr "exception générée : ~s~%"
 
-#: guix/ui.scm:378 guix/ui.scm:400
+#: guix/ui.scm:463 guix/ui.scm:491
 #, scheme-format
 msgid "failed to load '~a':~%"
 msgstr "échec lors du chargement de « ~a » :~%"
 
-#: guix/ui.scm:390
-#, scheme-format
-msgid "~a: warning: ~a~%"
-msgstr "~a : avertissement : ~a~%"
-
-#: guix/ui.scm:397
+#: guix/ui.scm:488
 #, scheme-format
 msgid "failed to load '~a': exception thrown: ~s~%"
 msgstr "échec lors du chargement de « ~a » : exception générée : ~s~%"
 
-#: guix/ui.scm:433
-#, scheme-format
-msgid "failed to install locale: ~a~%"
-msgstr "impossible d'installer l'environnement linguistique : ~a~%"
-
-#: guix/ui.scm:435
+#: guix/ui.scm:521
 msgid ""
 "Consider installing the @code{glibc-utf8-locales} or\n"
 "@code{glibc-locales} package and defining @code{GUIX_LOCPATH}, along these\n"
@@ -3382,15 +3907,15 @@ msgstr ""
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
-#: guix/ui.scm:473
+#: guix/ui.scm:559
 msgid "(C)"
 msgstr "©"
 
-#: guix/ui.scm:474
+#: guix/ui.scm:560
 msgid "the Guix authors\n"
 msgstr "les auteurs de Guix\n"
 
-#: guix/ui.scm:475
+#: guix/ui.scm:561
 msgid ""
 "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
@@ -3404,7 +3929,7 @@ msgstr ""
 #. package.  Please add another line saying "Report translation bugs to
 #. ...\n" with the address for translation bugs (typically your translation
 #. team's web or email address).
-#: guix/ui.scm:487
+#: guix/ui.scm:573
 #, scheme-format
 msgid ""
 "\n"
@@ -3414,7 +3939,7 @@ msgstr ""
 "Signalez toute anomalie à : ~a.\n"
 "Signalez toute erreur de traduction à : traduc@traduc.org."
 
-#: guix/ui.scm:489
+#: guix/ui.scm:575
 #, scheme-format
 msgid ""
 "\n"
@@ -3423,7 +3948,7 @@ msgstr ""
 "\n"
 "~a page d'accueil : <~a>"
 
-#: guix/ui.scm:491
+#: guix/ui.scm:577
 msgid ""
 "\n"
 "General help using GNU software: <http://www.gnu.org/gethelp/>"
@@ -3431,27 +3956,27 @@ msgstr ""
 "\n"
 "Aide générale sur l'utilisation des logiciels GNU : <http://www.gnu.org/gethelp/>"
 
-#: guix/ui.scm:539
+#: guix/ui.scm:632
 #, scheme-format
 msgid "'~a' is not a valid regular expression: ~a~%"
 msgstr "« ~a » n'est pas une expression rationnelle valide : ~a~%"
 
-#: guix/ui.scm:545
+#: guix/ui.scm:638
 #, scheme-format
 msgid "~a: invalid number~%"
 msgstr "~a : nombre non valide~%"
 
-#: guix/ui.scm:562
+#: guix/ui.scm:655
 #, scheme-format
 msgid "invalid number: ~a~%"
 msgstr "nombre non valide : ~a~%"
 
-#: guix/ui.scm:585
+#: guix/ui.scm:678
 #, scheme-format
 msgid "unknown unit: ~a~%"
 msgstr "unité inconnue : ~a~%"
 
-#: guix/ui.scm:600
+#: guix/ui.scm:693
 #, scheme-format
 msgid ""
 "You cannot have two different versions\n"
@@ -3460,7 +3985,7 @@ msgstr ""
 "Vous ne pouvez pas avoir deux versions ou variantes\n"
 "différentes de @code{~a} dans le même profil."
 
-#: guix/ui.scm:603
+#: guix/ui.scm:696
 #, scheme-format
 msgid ""
 "Try upgrading both @code{~a} and @code{~a},\n"
@@ -3469,116 +3994,116 @@ msgstr ""
 "Essayez de mettre à jour à la fois @code{~a} et @code{~a},\n"
 "ou supprimez-en un du profil."
 
-#: guix/ui.scm:622
+#: guix/ui.scm:715
 #, scheme-format
 msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%"
 msgstr "~a :~a :~a : le paquet « ~a » a une entrée non valide : ~s~%"
 
-#: guix/ui.scm:629
+#: guix/ui.scm:722
 #, scheme-format
 msgid "~a: ~a: build system `~a' does not support cross builds~%"
-msgstr "~a : ~a : le système de compilation « ~a » ne supporte pas la compilation croisée~%"
+msgstr "~a : ~a : le système de construction « ~a » ne prend pas en charge la compilation croisée~%"
 
-#: guix/ui.scm:635
+#: guix/ui.scm:728
 #, scheme-format
 msgid "~s: invalid G-expression input~%"
 msgstr "~s : entrée G-expression invalide~%"
 
-#: guix/ui.scm:638
+#: guix/ui.scm:731
 #, scheme-format
 msgid "profile '~a' does not exist~%"
 msgstr "le profile « ~a » n'existe pas~%"
 
-#: guix/ui.scm:641
+#: guix/ui.scm:734
 #, scheme-format
 msgid "generation ~a of profile '~a' does not exist~%"
 msgstr "la génération ~a du profile « ~a » n'existe pas~%"
 
-#: guix/ui.scm:650
+#: guix/ui.scm:739
+#, scheme-format
+msgid "package '~a~@[@~a~]~@[:~a~]' not found in profile~%"
+msgstr "le paquet « ~a~@[@~a~]~@[:~a~] » n'a pas été trouvé dans le profil~%"
+
+#: guix/ui.scm:751
 #, scheme-format
 msgid "   ... propagated from ~a@~a~%"
 msgstr "   ... propagé depuis ~a@~a~%"
 
-#: guix/ui.scm:660
+#: guix/ui.scm:761
 #, scheme-format
 msgid "profile contains conflicting entries for ~a~a~%"
 msgstr "le profil contient des entrées en conflit pour ~a~a~%"
 
-#: guix/ui.scm:663
+#: guix/ui.scm:764
 #, scheme-format
 msgid "  first entry: ~a@~a~a ~a~%"
 msgstr "  première entrée : ~a@~a~a ~a~%"
 
-#: guix/ui.scm:669
+#: guix/ui.scm:770
 #, scheme-format
 msgid "  second entry: ~a@~a~a ~a~%"
 msgstr "  deuxième entrée : ~a@~a~a ~a~%"
 
-#: guix/ui.scm:681
+#: guix/ui.scm:782
 #, scheme-format
 msgid "corrupt input while restoring '~a' from ~s~%"
 msgstr "entrée corrompue en restaurant « ~a » depuis ~s~%"
 
-#: guix/ui.scm:683
+#: guix/ui.scm:784
 #, scheme-format
 msgid "corrupt input while restoring archive from ~s~%"
 msgstr "entrée corrompue en restaurant l'archive depuis ~s~%"
 
-#: guix/ui.scm:686
+#: guix/ui.scm:787
 #, scheme-format
 msgid "failed to connect to `~a': ~a~%"
 msgstr "impossible de se connecter à « ~a » : ~a~%"
 
-#: guix/ui.scm:691
-#, scheme-format
-msgid "build failed: ~a~%"
-msgstr "la compilation a échoué : ~a~%"
-
-#: guix/ui.scm:694
+#: guix/ui.scm:795
 #, scheme-format
 msgid "reference to invalid output '~a' of derivation '~a'~%"
 msgstr "référence à la sortie invalide « ~a » de la dérivation « ~a »~%"
 
-#: guix/ui.scm:698
+#: guix/ui.scm:799
 #, scheme-format
 msgid "file '~a' could not be found in these directories:~{ ~a~}~%"
 msgstr "le fichier « ~a » n'a pas été trouvé dans ces répertoires :~{ ~a~}~%"
 
-#: guix/ui.scm:703
+#: guix/ui.scm:804
 #, scheme-format
 msgid "program exited~@[ with non-zero exit status ~a~]~@[ terminated by signal ~a~]~@[ stopped by signal ~a~]: ~s~%"
 msgstr "le programme a quitté~@[ avec un statut non nul ~a~]~@[ terminé par le signal ~a~]~@[ arrêté par le signal ~a~] : ~s~%"
 
-#: guix/ui.scm:734
+#: guix/ui.scm:832
 #, scheme-format
 msgid "~a: ~a~%"
 msgstr "~a: ~a~%"
 
-#: guix/ui.scm:769
+#: guix/ui.scm:867
 #, scheme-format
 msgid "failed to read expression ~s: ~s~%"
 msgstr "impossible de lire l'expression ~s : ~s~%"
 
-#: guix/ui.scm:775
+#: guix/ui.scm:873
 #, scheme-format
 msgid "failed to evaluate expression '~a':~%"
 msgstr "impossible d'évaluer l'expression « ~a » :~%"
 
-#: guix/ui.scm:778
+#: guix/ui.scm:876
 #, scheme-format
 msgid "syntax error: ~a~%"
 msgstr "erreur de syntaxe : ~a~%"
 
-#: guix/ui.scm:796
+#: guix/ui.scm:894
 #, scheme-format
 msgid "expression ~s does not evaluate to a package~%"
 msgstr "l'expression ~s ne correspond à aucun paquet~%"
 
-#: guix/ui.scm:816
+#: guix/ui.scm:914
 msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%"
 msgstr "au moins ~,1h Mo sont nécessaires mais seulement ~,1h Mo sont disponibles dans ~a~%"
 
-#: guix/ui.scm:894
+#: guix/ui.scm:1016
 #, scheme-format
 msgid "~:[The following derivation would be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations would be built:~%~{   ~a~%~}~;~]"
@@ -3587,25 +4112,32 @@ msgstr[1] "~:[Les dérivations suivantes seraient compilées :~%~{   ~a~%~}~;~]"
 
 #. TRANSLATORS: "MB" is for "megabyte"; it should be
 #. translated to the corresponding abbreviation.
-#: guix/ui.scm:902
+#: guix/ui.scm:1024
 msgid "~:[~,1h MB would be downloaded:~%~{   ~a~%~}~;~]"
 msgstr "~:[~,1h Mo seraient téléchargés :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:907
+#: guix/ui.scm:1029
 #, scheme-format
 msgid "~:[The following file would be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files would be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Le fichier suivant serait téléchargé :~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[Les fichiers suivants seraient téléchargés :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:913
+#: guix/ui.scm:1035
 #, scheme-format
 msgid "~:[The following graft would be made:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following grafts would be made:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[La greffe suivante serait effectuée :~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[Les greffes suivantes seraient effectuées :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:919
+#: guix/ui.scm:1040
+#, scheme-format
+msgid "~:[The following profile hook would be built:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following profile hooks would be built:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[Le crochet suivante serait compilé :~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[Les crochets suivants seraient compilés :~%~{   ~a~%~}~;~]"
+
+#: guix/ui.scm:1046
 #, scheme-format
 msgid "~:[The following derivation will be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations will be built:~%~{   ~a~%~}~;~]"
@@ -3614,85 +4146,92 @@ msgstr[1] "~:[Les dérivations suivantes seront compilées :~%~{   ~a~%~}~;~]"
 
 #. TRANSLATORS: "MB" is for "megabyte"; it should be
 #. translated to the corresponding abbreviation.
-#: guix/ui.scm:927
+#: guix/ui.scm:1054
 msgid "~:[~,1h MB will be downloaded:~%~{   ~a~%~}~;~]"
 msgstr "~:[~,1h Mo seront téléchargés :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:932
+#: guix/ui.scm:1059
 #, scheme-format
 msgid "~:[The following file will be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files will be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Le fichier suivant sera téléchargé :~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[Les fichiers suivants seront téléchargés :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:938
+#: guix/ui.scm:1065
 #, scheme-format
 msgid "~:[The following graft will be made:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following grafts will be made:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[La greffe suivante sera effectuée :~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[Les greffes suivantes seront effectuées :~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:997
+#: guix/ui.scm:1070
+#, scheme-format
+msgid "~:[The following profile hook will be built:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following profile hooks will be built:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[Le crochet suivant sera compilée :~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[Les crochets suivants seront compilés :~%~{   ~a~%~}~;~]"
+
+#: guix/ui.scm:1129
 #, scheme-format
 msgid "The following package would be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be removed:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant serait supprimé :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seraient supprimés :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1002
+#: guix/ui.scm:1134
 #, scheme-format
 msgid "The following package will be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be removed:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant sera supprimé :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seront supprimés :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1015
+#: guix/ui.scm:1147
 #, scheme-format
 msgid "The following package would be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant serait mis à une version inférieure :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seraient mis à des versions inférieures :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1020
+#: guix/ui.scm:1152
 #, scheme-format
 msgid "The following package will be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant sera mis à une version inférieure :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seront mis à des versions inférieures :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1033
+#: guix/ui.scm:1165
 #, scheme-format
 msgid "The following package would be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant serait mis à jour :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seraient mis à jour :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1038
+#: guix/ui.scm:1170
 #, scheme-format
 msgid "The following package will be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant sera mis à jour :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seront mis à jour :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1049
+#: guix/ui.scm:1181
 #, scheme-format
 msgid "The following package would be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be installed:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant serait installé :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seraient installés :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1054
+#: guix/ui.scm:1186
 #, scheme-format
 msgid "The following package will be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be installed:~%~{~a~%~}~%"
 msgstr[0] "Le paquet suivant sera installé :~%~{~a~%~}~%"
 msgstr[1] "Les paquets suivants seront installés :~%~{~a~%~}~%"
 
-#: guix/ui.scm:1071
+#: guix/ui.scm:1203 guix/deprecation.scm:46
 msgid "<unknown location>"
 msgstr "<emplacement inconnu>"
 
-#: guix/ui.scm:1436
+#: guix/ui.scm:1574
 #, scheme-format
 msgid "Generation ~a\t~a"
 msgstr "Génération ~a\t~a"
@@ -3702,7 +4241,7 @@ msgstr "Génération ~a\t~a"
 #. usual way of presenting dates in your locale.
 #. See https://www.gnu.org/software/guile/manual/html_node/SRFI_002d19-Date-to-string.html
 #. for details.
-#: guix/ui.scm:1445
+#: guix/ui.scm:1583
 #, scheme-format
 msgid "~b ~d ~Y ~T"
 msgstr "~d ~b ~Y ~T"
@@ -3710,27 +4249,27 @@ msgstr "~d ~b ~Y ~T"
 #. TRANSLATORS: The word "current" here is an adjective for
 #. "Generation", as in "current generation".  Use the appropriate
 #. gender where applicable.
-#: guix/ui.scm:1451
+#: guix/ui.scm:1589
 #, scheme-format
 msgid "~a\t(current)~%"
 msgstr "~a\t(actuelle)~%"
 
-#: guix/ui.scm:1494
+#: guix/ui.scm:1632
 #, scheme-format
 msgid "switched from generation ~a to ~a~%"
 msgstr "passé de la génération ~a à ~a~%"
 
-#: guix/ui.scm:1510
+#: guix/ui.scm:1648
 #, scheme-format
 msgid "deleting ~a~%"
 msgstr "suppression de ~a~%"
 
-#: guix/ui.scm:1541
+#: guix/ui.scm:1679
 #, scheme-format
 msgid "Try `guix --help' for more information.~%"
 msgstr "Essayez « guix --help » pour plus d'informations.~%"
 
-#: guix/ui.scm:1569
+#: guix/ui.scm:1707
 msgid ""
 "Usage: guix COMMAND ARGS...\n"
 "Run COMMAND with ARGS.\n"
@@ -3738,92 +4277,153 @@ msgstr ""
 "Usage : guix COMMANDE ARGS...\n"
 "Lance la COMMANDE avec les arguments ARGS.\n"
 
-#: guix/ui.scm:1572
+#: guix/ui.scm:1710
 msgid "COMMAND must be one of the sub-commands listed below:\n"
 msgstr "COMMANDE doit être une des sous-commandes listées ci-dessous :\n"
 
-#: guix/ui.scm:1592
+#: guix/ui.scm:1730
 #, scheme-format
 msgid "guix: ~a: command not found~%"
 msgstr "guix : ~a : commande introuvable~%"
 
-#: guix/ui.scm:1622
+#: guix/ui.scm:1760
 #, scheme-format
 msgid "guix: missing command name~%"
 msgstr "guix : nom de commande manquant~%"
 
-#: guix/ui.scm:1630
+#: guix/ui.scm:1768
 #, scheme-format
 msgid "guix: unrecognized option '~a'~%"
 msgstr "guix : option « ~a » non reconnue ~%"
 
-#: guix/status.scm:335
+#. TRANSLATORS: The word "phase" here denotes a "build phase";
+#. "~a" is a placeholder for the untranslated name of the current
+#. build phase--e.g., 'configure' or 'build'.
+#: guix/status.scm:358
+#, scheme-format
+msgid "'~a' phase"
+msgstr "phase « ~a »"
+
+#: guix/status.scm:378
+msgid "building directory of Info manuals..."
+msgstr "construction du répertoire des manuels Info…"
+
+#: guix/status.scm:380
+msgid "building GHC package cache..."
+msgstr "construction du cache des paquets GHC…"
+
+#: guix/status.scm:382
+msgid "building CA certificate bundle..."
+msgstr "construction de l'ensemble des certificats des AC…"
+
+#: guix/status.scm:384
+msgid "generating GLib schema cache..."
+msgstr "génération du cache de schémas GLib…"
+
+#: guix/status.scm:386
+msgid "creating GTK+ icon theme cache..."
+msgstr "création du cache des thèmes d'icônes GTK+…"
+
+#: guix/status.scm:388
+msgid "building cache files for GTK+ input methods..."
+msgstr "construction des fichiers de cache pour les méthodes d'entrée GTK+…"
+
+#: guix/status.scm:390
+msgid "building XDG desktop file cache..."
+msgstr "construction du cache des fichiers desktop du XDG…"
+
+#: guix/status.scm:392
+msgid "building XDG MIME database..."
+msgstr "construction de la base de données MIME du XDG…"
+
+#: guix/status.scm:394
+msgid "building fonts directory..."
+msgstr "construction du répertoire des polices…"
+
+#: guix/status.scm:396
+msgid "building TeX Live configuration..."
+msgstr "construction de la configuration de TeX Live…"
+
+#: guix/status.scm:398
+msgid "building database for manual pages..."
+msgstr "construction de la base de données des pages de manuel…"
+
+#: guix/status.scm:400
+msgid "building package cache..."
+msgstr "construction du cache des paquets…"
+
+#: guix/status.scm:475
 #, scheme-format
 msgid "applying ~a graft for ~a..."
 msgid_plural "applying ~a grafts for ~a..."
 msgstr[0] "application de ~a greffe pour ~a..."
 msgstr[1] "application de ~a greffes pour ~a..."
 
-#: guix/status.scm:340
+#: guix/status.scm:484
+#, scheme-format
+msgid "running profile hook of type '~a'..."
+msgstr "lancement du crochet de profil de type « ~a »…"
+
+#: guix/status.scm:487
 #, scheme-format
 msgid "building ~a..."
 msgstr "construction de ~a..."
 
-#: guix/status.scm:344
+#: guix/status.scm:492
 #, scheme-format
 msgid "successfully built ~a"
 msgstr "construction de ~a réussie"
 
-#: guix/status.scm:350
+#: guix/status.scm:498
 #, scheme-format
 msgid "The following build is still in progress:~%~{  ~a~%~}~%"
 msgid_plural "The following builds are still in progress:~%~{  ~a~%~}~%"
 msgstr[0] "La construction suivante est toujours en cours :~%~{  ~a~%~}~%"
 msgstr[1] "Les constructions suivantes sont toujours en cours :~%~{  ~a~%~}~%"
 
-#: guix/status.scm:355
+#: guix/status.scm:504
 #, scheme-format
 msgid "build of ~a failed"
 msgstr "la compilation de ~a a échoué"
 
-#: guix/status.scm:359
+#: guix/status.scm:508
 #, scheme-format
 msgid "Could not find build log for '~a'."
-msgstr "Aucun journal de compilation pour « ~a »~%"
+msgstr "Aucun journal de compilation pour « ~a »."
 
-#: guix/status.scm:362
+#: guix/status.scm:511
 #, scheme-format
 msgid "View build log at '~a'."
 msgstr "Vous trouverez le journal de compilation dans « ~a »."
 
-#: guix/status.scm:366
+#: guix/status.scm:516
 #, scheme-format
 msgid "substituting ~a..."
 msgstr "substitution de ~a..."
 
-#: guix/status.scm:369
+#: guix/status.scm:520
 #, scheme-format
 msgid "downloading from ~a..."
 msgstr "téléchargement depuis ~a..."
 
-#: guix/status.scm:394
+#: guix/status.scm:545
 #, scheme-format
 msgid "substitution of ~a complete"
 msgstr "substitution de ~a terminée"
 
-#: guix/status.scm:397
+#: guix/status.scm:548
 #, scheme-format
 msgid "substitution of ~a failed"
 msgstr "la substitution de ~a a échoué"
 
 #. TRANSLATORS: The final string looks like "sha256 hash mismatch for
 #. /gnu/store/…-sth:", where "sha256" is the hash algorithm.
-#: guix/status.scm:402
+#: guix/status.scm:553
 #, scheme-format
 msgid "~a hash mismatch for ~a:"
 msgstr "l'empreinte ~a ne correspond pas pour ~a :"
 
-#: guix/status.scm:404
+#: guix/status.scm:555
 #, scheme-format
 msgid ""
 "  expected hash: ~a\n"
@@ -3832,7 +4432,7 @@ msgstr ""
 "  empreinte attendue : ~a\n"
 "  empreinte obtenue :   ~a~%"
 
-#: guix/status.scm:409
+#: guix/status.scm:560
 #, scheme-format
 msgid "offloading build of ~a to '~a'"
 msgstr "déchargement de la construction de ~a sur « ~a »"
@@ -3889,35 +4489,78 @@ msgstr "les fichiers importés requièrent une signature"
 msgid "invalid inter-file archive mark"
 msgstr "marque d'archive inter-fichier non valide"
 
-#: guix/channels.scm:108
+#: guix/channels.scm:176
 #, scheme-format
 msgid "Updating channel '~a' from Git repository at '~a'...~%"
 msgstr "Mise à jour du canal « ~a » depuis le dépôt Git sur « ~a »...~%"
 
-#: guix/profiles.scm:501
+#: guix/channels.scm:365
+msgid "'guix' channel is lacking"
+msgstr "le canal « guix » est absent"
+
+#: guix/profiles.scm:511
 msgid "unsupported manifest format"
-msgstr "format de manifeste non supporté"
+msgstr "format de manifeste non pris en charge"
 
-#: guix/profiles.scm:1630
+#: guix/profiles.scm:1748
 #, scheme-format
 msgid "while creating directory `~a': ~a"
 msgstr "pendant la création du répertoire « ~a » : ~a"
 
-#: guix/profiles.scm:1635
+#: guix/profiles.scm:1753
 #, scheme-format
 msgid "Please create the @file{~a} directory, with you as the owner."
 msgstr "Veuillez créer le répertoire @file{~a} dont vous êtes le propriétaire."
 
-#: guix/profiles.scm:1644
+#: guix/profiles.scm:1762
 #, scheme-format
 msgid "directory `~a' is not owned by you"
 msgstr "vous ne possédez pas le répertoire « ~a »"
 
-#: guix/profiles.scm:1648
+#: guix/profiles.scm:1766
 #, scheme-format
 msgid "Please change the owner of @file{~a} to user ~s."
 msgstr "Veuillez définir le propriétaire de @file{~a} comme étant ~s."
 
+#: guix/git.scm:159
+msgid "long Git object ID is required"
+msgstr "l'ID long de l'objet Git est requis"
+
+#: guix/git.scm:192
+#, scheme-format
+msgid "updating submodule '~a'...~%"
+msgstr "mise à jour du sous-module « ~a »…~%"
+
+#: guix/git.scm:205
+#, scheme-format
+msgid "Support for submodules is missing; please upgrade Guile-Git.~%"
+msgstr "La prise en charge des sous-modules est absente ; mettez Guile-Git à jour.~%"
+
+#: guix/git.scm:344
+#, scheme-format
+msgid "cannot fetch commit ~a from ~a: ~a"
+msgstr "impossible de récupérer le commit ~a depuis ~a : ~a"
+
+#: guix/git.scm:347
+#, scheme-format
+msgid "cannot fetch branch '~a' from ~a: ~a"
+msgstr "impossible de récupérer la branche « ~a » depuis ~a : ~a"
+
+#: guix/git.scm:350
+#, scheme-format
+msgid "Git failure while fetching ~a: ~a"
+msgstr "Échec de Git pendant la récupération de ~a : ~a"
+
+#: guix/deprecation.scm:51
+#, scheme-format
+msgid "~a: warning: '~a' is deprecated~@[, use '~a' instead~]~%"
+msgstr "~a : attention : « ~a » est obsolète~@[, utilisez « ~a » à la place~]~%"
+
+#: gnu/build/bootloader.scm:91
+#, scheme-format
+msgid "'~a~{ ~a~}' exited with status ~a; output follows:~%~%~{  ~a~%~}"
+msgstr "« ~a~{ ~a~} » a quitté avec le statut ~a ; la sortie est la suivante :~%~%~{  ~a~%~}"
+
 #: nix/nix-daemon/guix-daemon.cc:66
 msgid "guix-daemon -- perform derivation builds and store accesses"
 msgstr "guix-daemon -- réalise les compilations des dérivations et les accès au stockage"
@@ -4042,6 +4685,30 @@ msgstr "écoute sur SOCKET pour des connexions"
 msgid "produce debugging output"
 msgstr "produit une sortie de déboguage"
 
+#~ msgid ""
+#~ "Consider running @command{guix gc} to free\n"
+#~ "space."
+#~ msgstr "Pensez à lancer @command{guix gc} pour libérer de l'espace."
+
+#~ msgid ""
+#~ "\n"
+#~ "  -n, --dry-run          show what would be pulled and built"
+#~ msgstr ""
+#~ "\n"
+#~ "  -n, --dry-run          montrer ce qui serait récupéré et ce qui serait construit"
+
+#~ msgid "source location of package '~a' is unknown~%"
+#~ msgstr "l'emplacement source du paquet « ~a » est inconnue~%"
+
+#~ msgid "~a: error: ~a~%"
+#~ msgstr "~a : erreur: ~a~%"
+
+#~ msgid "failed to install locale: ~a~%"
+#~ msgstr "impossible d'installer l'environnement linguistique : ~a~%"
+
+#~ msgid "build failed: ~a~%"
+#~ msgstr "la compilation a échoué : ~a~%"
+
 #~ msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
 #~ msgstr "Essayez « info '(guix) Invoking guix package' » pour plus d'information.~%"
 
@@ -4116,9 +4783,6 @@ msgstr "produit une sortie de déboguage"
 #~ msgid "failed to lookup NIST host: ~a~%"
 #~ msgstr "impossible de trouver l'hôte NIST: ~a~%"
 
-#~ msgid "Updater for GNOME packages"
-#~ msgstr "Logiciel de mise à jour des paquets GNOME"
-
 #~ msgid "failed to create configuration directory `~a': ~a~%"
 #~ msgstr "impossible de créer le répertoire de configuration « ~a »: ~a~%"
 
@@ -4143,9 +4807,6 @@ msgstr "produit une sortie de déboguage"
 #~ msgid "error: %s: invalid number of rounds\n"
 #~ msgstr "erreur: %s: nombre de tours invalide\n"
 
-#~ msgid "error: %s\n"
-#~ msgstr "erreur: %s\n"
-
 #~ msgid "error: libgcrypt version mismatch\n"
 #~ msgstr "erreur: désaccord de version de libgcrypt\n"
 
diff --git a/po/packages/fr.po b/po/packages/fr.po
index 6a69172c7a..3e9f361f0c 100644
--- a/po/packages/fr.po
+++ b/po/packages/fr.po
@@ -5,10 +5,10 @@
 # Julien Lepiller <julien@lepiller.eu>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-packages 0.16.0\n"
+"Project-Id-Version: guix-packages 1.0.0-pre1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2018-11-28 15:05+0100\n"
-"PO-Revision-Date: 2018-11-30 21:50+0100\n"
+"POT-Creation-Date: 2019-04-10 21:48+0200\n"
+"PO-Revision-Date: 2019-04-13 14:27+0200\n"
 "Last-Translator: Julien Lepiller <julien@lepiller.eu>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Offlate 0.1\n"
 
-#: gnu/packages/abiword.scm:114
+#: gnu/packages/abiword.scm:115
 msgid "Word processing program"
 msgstr "Éditeur de texte"
 
@@ -27,7 +27,7 @@ msgstr "Éditeur de texte"
 #. descriptions may occasionally include Texinfo markup.  Texinfo markup
 #. looks like "@code{rm -rf}", "@emph{important}", etc.  When translating,
 #. please leave markup as is.
-#: gnu/packages/abiword.scm:123
+#: gnu/packages/abiword.scm:124
 msgid ""
 "AbiWord is a word processing program.  It is rapidly\n"
 "becoming a state of the art word processor, with lots of features useful for\n"
@@ -38,7 +38,7 @@ msgstr ""
 "pour votre travail quotidien, vos besoins personnels ou juste pour\n"
 "le plaisir de taper."
 
-#: gnu/packages/aspell.scm:85 gnu/packages/libreoffice.scm:777
+#: gnu/packages/aspell.scm:85 gnu/packages/libreoffice.scm:771
 msgid "Spell checker"
 msgstr "Correcteur orthographique"
 
@@ -60,7 +60,7 @@ msgstr ""
 "Ce paquet fournit un dictionnaire pour le correcteur orthographique\n"
 "GNU Aspell."
 
-#: gnu/packages/aspell.scm:310 gnu/packages/libreoffice.scm:827
+#: gnu/packages/aspell.scm:324 gnu/packages/libreoffice.scm:821
 msgid ""
 "This package provides a dictionary for the Hunspell spell-checking\n"
 "library."
@@ -68,35 +68,35 @@ msgstr ""
 "Ce paquet fournit un dictionnaire pour le correcteur orthographique\n"
 "Hunspell."
 
-#: gnu/packages/aspell.scm:328
+#: gnu/packages/aspell.scm:342
 msgid "Hunspell dictionary for English"
 msgstr "Dictionnaire Hunspell pour l'anglais"
 
-#: gnu/packages/aspell.scm:332
+#: gnu/packages/aspell.scm:346
 msgid "Hunspell dictionary for Australian English"
 msgstr "Dictionnaire Hunspell pour l'anglais australien"
 
-#: gnu/packages/aspell.scm:336
+#: gnu/packages/aspell.scm:350
 msgid "Hunspell dictionary for Canadian English"
 msgstr "Dictionnaire Hunspell pour l'anglais canadien"
 
-#: gnu/packages/aspell.scm:340
+#: gnu/packages/aspell.scm:354
 msgid "Hunspell dictionary for British English, with -ise endings"
 msgstr "Dictionnaire Hunspell pour l'anglais britannique, avec des terminaisons en -ise"
 
-#: gnu/packages/aspell.scm:344
+#: gnu/packages/aspell.scm:358
 msgid "Hunspell dictionary for British English, with -ize endings"
 msgstr "Dictionnaire Hunspell pour l'anglais britannique, avec des terminaisons en -ize"
 
-#: gnu/packages/aspell.scm:348
+#: gnu/packages/aspell.scm:362
 msgid "Hunspell dictionary for United States English"
 msgstr "Dictionnaire Hunspell pour l'anglais états-unien"
 
-#: gnu/packages/audio.scm:140
+#: gnu/packages/audio.scm:147
 msgid "Realtime modular synthesizer and effect processor"
 msgstr "Synthétiseur modulaire en temps réel et traitement d'effets"
 
-#: gnu/packages/audio.scm:142
+#: gnu/packages/audio.scm:149
 msgid ""
 "AlsaModularSynth is a digital implementation of a classical analog\n"
 "modular synthesizer system.  It uses virtual control voltages to control the\n"
@@ -110,11 +110,11 @@ msgstr ""
 "fréquence, par exemple du VCO (Oscillateur commandé en tension) ou du VCF\n"
 "(Filtre contrôlé en tension) suivent la convention de 1 V / Octave."
 
-#: gnu/packages/audio.scm:181
+#: gnu/packages/audio.scm:188
 msgid "Library for audio labelling"
 msgstr "Bibliothèque pour l'étiquetage de fichiers audio"
 
-#: gnu/packages/audio.scm:183
+#: gnu/packages/audio.scm:190
 msgid ""
 "aubio is a tool designed for the extraction of annotations from audio\n"
 "signals.  Its features include segmenting a sound file before each of its\n"
@@ -126,11 +126,11 @@ msgstr ""
 "chaque attaque, à la détection de ton, en passant par l'écoute du rythme\n"
 "et la production de fichiers MIDI à partir d'audio en direct."
 
-#: gnu/packages/audio.scm:285
+#: gnu/packages/audio.scm:314
 msgid "Digital audio workstation"
 msgstr "Station de travail audio numérique"
 
-#: gnu/packages/audio.scm:287
+#: gnu/packages/audio.scm:316
 msgid ""
 "Ardour is a multi-channel digital audio workstation, allowing users to\n"
 "record, edit, mix and master audio and MIDI projects.  It is targeted at audio\n"
@@ -141,11 +141,11 @@ msgstr ""
 "conçu pour les ingénieurs du son, les musiciens, les éditeurs de bandes son et\n"
 "les compositeurs."
 
-#: gnu/packages/audio.scm:425
+#: gnu/packages/audio.scm:454
 msgid "Software for recording and editing sounds"
 msgstr "Logiciel pour enregistrer et modifier des sons"
 
-#: gnu/packages/audio.scm:427
+#: gnu/packages/audio.scm:456
 msgid ""
 "Audacity is a multi-track audio editor designed for recording, playing\n"
 "and editing digital audio.  It features digital effects and spectrum analysis\n"
@@ -155,22 +155,22 @@ msgstr ""
 "et modifier des sons numériques. Il propose des effets numériques et des\n"
 "outils d'analyse spectrale."
 
-#: gnu/packages/audio.scm:463
+#: gnu/packages/audio.scm:492
 msgid "Pitch-correction LADSPA audio plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:465
+#: gnu/packages/audio.scm:494
 msgid ""
 "Autotalent is a LADSPA plugin for real-time pitch-correction.  Among its\n"
 "controls are allowable notes, strength of correction, LFO for vibrato and\n"
 "formant warp."
 msgstr ""
 
-#: gnu/packages/audio.scm:509
+#: gnu/packages/audio.scm:538
 msgid "Tonewheel organ synthesizer"
 msgstr "Synthétiseur d'organe tonewheel"
 
-#: gnu/packages/audio.scm:511
+#: gnu/packages/audio.scm:540
 msgid ""
 "AZR-3 is a port of the free VST plugin AZR-3.  It is a tonewheel organ\n"
 "with drawbars, distortion and rotating speakers.  The organ has three\n"
@@ -179,11 +179,11 @@ msgid ""
 "plugins are provided."
 msgstr ""
 
-#: gnu/packages/audio.scm:548
+#: gnu/packages/audio.scm:577
 msgid "Audio plug-in pack for LV2 and JACK environments"
 msgstr ""
 
-#: gnu/packages/audio.scm:550
+#: gnu/packages/audio.scm:579
 msgid ""
 "Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments.\n"
 "The suite contains lots of effects (delay, modulation, signal processing,\n"
@@ -192,46 +192,33 @@ msgid ""
 "tools (analyzer, mono/stereo tools, crossovers)."
 msgstr ""
 
-#: gnu/packages/audio.scm:593
+#: gnu/packages/audio.scm:622
 msgid "LV2 port of the CAPS audio plugin colection"
 msgstr "Port LV2 de la collection de greffons audio CAPS"
 
-#: gnu/packages/audio.scm:595
+#: gnu/packages/audio.scm:624
 msgid ""
 "LV2 port of CAPS, a collection of audio plugins comprising basic virtual\n"
 "guitar amplification and a small range of classic effects, signal processors and\n"
 "generators of mostly elementary and occasionally exotic nature."
 msgstr ""
 
-#: gnu/packages/audio.scm:645
-msgid "Software speech synthesizer"
-msgstr ""
-
-#: gnu/packages/audio.scm:646
-msgid ""
-"eSpeak is a software speech synthesizer for English and\n"
-"other languages.  eSpeak uses a \"formant synthesis\" method.  This allows many\n"
-"languages to be provided in a small size.  The speech is clear, and can be used\n"
-"at high speeds, but is not as natural or smooth as larger synthesizers which are\n"
-"based on human speech recordings."
-msgstr ""
-
-#: gnu/packages/audio.scm:685
+#: gnu/packages/audio.scm:661
 msgid "LV2 plugins for live use"
 msgstr ""
 
-#: gnu/packages/audio.scm:687
+#: gnu/packages/audio.scm:663
 msgid ""
 "The infamous plugins are a collection of LV2 audio plugins for live\n"
 "performances.  The plugins include a cellular automaton synthesizer, an\n"
 "envelope follower, distortion effects, tape effects and more."
 msgstr ""
 
-#: gnu/packages/audio.scm:729
+#: gnu/packages/audio.scm:705
 msgid "SWH plugins in LV2 format"
 msgstr ""
 
-#: gnu/packages/audio.scm:731
+#: gnu/packages/audio.scm:707
 msgid ""
 "Swh-plugins-lv2 is a collection of audio plugins in LV2 format.  Plugin\n"
 "classes include: dynamics (compressor, limiter), time (delay, chorus,\n"
@@ -239,42 +226,42 @@ msgid ""
 "emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc."
 msgstr ""
 
-#: gnu/packages/audio.scm:765
+#: gnu/packages/audio.scm:741
 msgid "Sound and music computing system"
 msgstr ""
 
-#: gnu/packages/audio.scm:767
+#: gnu/packages/audio.scm:743
 msgid ""
 "Csound is a user-programmable and user-extensible sound processing\n"
 "language and software synthesizer."
 msgstr ""
 
-#: gnu/packages/audio.scm:808 gnu/packages/audio.scm:3085
+#: gnu/packages/audio.scm:785 gnu/packages/audio.scm:3102
 msgid "C++ wrapper around the ALSA API"
 msgstr ""
 
-#: gnu/packages/audio.scm:810
+#: gnu/packages/audio.scm:787
 msgid ""
 "clalsadrv is a C++ wrapper around the ALSA API simplifying access to\n"
 "ALSA PCM devices."
 msgstr ""
 
-#: gnu/packages/audio.scm:847
+#: gnu/packages/audio.scm:824
 msgid "LADSPA ambisonics plugins"
 msgstr ""
 
-#: gnu/packages/audio.scm:849
+#: gnu/packages/audio.scm:826
 msgid ""
 "The AMB plugins are a set of LADSPA ambisonics plugins, mainly to be\n"
 "used within Ardour.  Features include: mono and stereo to B-format panning,\n"
 "horizontal rotator, square, hexagon and cube decoders."
 msgstr ""
 
-#: gnu/packages/audio.scm:884
+#: gnu/packages/audio.scm:861
 msgid "Chorus, phaser, and vintage high-pass and low-pass filters"
 msgstr ""
 
-#: gnu/packages/audio.scm:886
+#: gnu/packages/audio.scm:863
 msgid ""
 "This package provides various LADSPA plugins.  @code{cs_chorus} and\n"
 "@code{cs_phaser} provide chorus and phaser effects, respectively;\n"
@@ -284,21 +271,21 @@ msgid ""
 "the non-linear circuit elements of their original analog counterparts."
 msgstr ""
 
-#: gnu/packages/audio.scm:924
+#: gnu/packages/audio.scm:901
 msgid "LADSPA reverb plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:926
+#: gnu/packages/audio.scm:903
 msgid ""
 "This package provides a stereo reverb LADSPA plugin based on the\n"
 "well-known greverb."
 msgstr ""
 
-#: gnu/packages/audio.scm:960
+#: gnu/packages/audio.scm:937
 msgid "LADSPA four-band parametric equalizer plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:962
+#: gnu/packages/audio.scm:939
 msgid ""
 "This package provides a LADSPA plugin for a four-band parametric\n"
 "equalizer.  Each section has an active/bypass switch, frequency, bandwidth and\n"
@@ -307,17 +294,17 @@ msgid ""
 "The 2nd order resonant filters are implemented using a Mitra-Regalia style\n"
 "lattice filter, which is stable even while parameters are being changed.\n"
 "\n"
-"All switches and controls are internally smoothed, so they can be used 'live'\n"
+"All switches and controls are internally smoothed, so they can be used @code{live}\n"
 "without any clicks or zipper noises.  This makes this plugin suitable for use\n"
 "in systems that allow automation of plugin control ports, such as Ardour, or\n"
 "for stage use."
 msgstr ""
 
-#: gnu/packages/audio.scm:1005
+#: gnu/packages/audio.scm:982
 msgid "LADSPA stereo width plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:1007
+#: gnu/packages/audio.scm:984
 msgid ""
 "This package provides a LADSPA plugin to manipulate the stereo width of\n"
 "audio signals."
@@ -325,11 +312,11 @@ msgstr ""
 "Ce paquet fournit des un greffon LADSPA pour manipuler la profondeur\n"
 "des signaux audio."
 
-#: gnu/packages/audio.scm:1042
+#: gnu/packages/audio.scm:1019
 msgid "LADSPA plugin for synthesizer oscillators"
 msgstr ""
 
-#: gnu/packages/audio.scm:1044
+#: gnu/packages/audio.scm:1021
 msgid ""
 "The @code{blvco} LADSPA plugin provides three anti-aliased oscillators:\n"
 "\n"
@@ -344,11 +331,11 @@ msgid ""
 "output of analog synthesizers such as the Moog Voyager."
 msgstr ""
 
-#: gnu/packages/audio.scm:1086
+#: gnu/packages/audio.scm:1063
 msgid "LADSPA Autowah effect plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:1088
+#: gnu/packages/audio.scm:1065
 msgid ""
 "This package provides a LADSPA plugin for a Wah effect with envelope\n"
 "follower."
@@ -356,19 +343,19 @@ msgstr ""
 "Ce paquet fournit un greffon LADSPA pour l'effet Wah avec un suiveur\n"
 "d'enveloppe."
 
-#: gnu/packages/audio.scm:1122
+#: gnu/packages/audio.scm:1099
 msgid "LADSPA stereo reverb plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:1124
+#: gnu/packages/audio.scm:1101
 msgid "This package provides a LADSPA plugin for a stereo reverb effect."
 msgstr "Ce paquet fournit un greffon LADSPA pour l'effet stereo reverb."
 
-#: gnu/packages/audio.scm:1163
+#: gnu/packages/audio.scm:1140
 msgid "SoundFont synthesizer"
 msgstr ""
 
-#: gnu/packages/audio.scm:1165
+#: gnu/packages/audio.scm:1142
 msgid ""
 "FluidSynth is a real-time software synthesizer based on the SoundFont 2\n"
 "specifications.  FluidSynth reads and handles MIDI events from the MIDI input\n"
@@ -376,39 +363,39 @@ msgid ""
 "also play midifiles using a Soundfont."
 msgstr ""
 
-#: gnu/packages/audio.scm:1212
+#: gnu/packages/audio.scm:1189
 msgid "MPEG-4 and MPEG-2 AAC decoder"
 msgstr ""
 
-#: gnu/packages/audio.scm:1214
+#: gnu/packages/audio.scm:1191
 msgid ""
 "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR,\n"
 "PS, and DAB+."
 msgstr ""
 
-#: gnu/packages/audio.scm:1254
+#: gnu/packages/audio.scm:1231
 msgid "Signal processing language"
 msgstr ""
 
-#: gnu/packages/audio.scm:1256
+#: gnu/packages/audio.scm:1233
 msgid "Faust is a programming language for realtime audio signal processing."
 msgstr ""
 
-#: gnu/packages/audio.scm:1323
+#: gnu/packages/audio.scm:1300
 msgid "GUS compatible patches for MIDI players"
 msgstr ""
 
-#: gnu/packages/audio.scm:1325
+#: gnu/packages/audio.scm:1302
 msgid ""
 "FreePats is a project to create a free and open set of GUS compatible\n"
 "patches that can be used with softsynths such as Timidity and WildMidi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1378
+#: gnu/packages/audio.scm:1368
 msgid "Virtual guitar amplifier"
 msgstr ""
 
-#: gnu/packages/audio.scm:1379
+#: gnu/packages/audio.scm:1369
 msgid ""
 "Guitarix is a virtual guitar amplifier running JACK.\n"
 "Guitarix takes the signal from your guitar as a mono-signal from your sound\n"
@@ -419,11 +406,11 @@ msgid ""
 "auto-wah."
 msgstr ""
 
-#: gnu/packages/audio.scm:1433
+#: gnu/packages/audio.scm:1423
 msgid "Audio effects processor"
 msgstr ""
 
-#: gnu/packages/audio.scm:1435
+#: gnu/packages/audio.scm:1425
 msgid ""
 "Rakarrack is a richly featured multi-effects processor emulating a\n"
 "guitar effects pedalboard.  Effects include compressor, expander, noise gate,\n"
@@ -435,22 +422,22 @@ msgid ""
 "well suited to all musical instruments and vocals."
 msgstr ""
 
-#: gnu/packages/audio.scm:1486
+#: gnu/packages/audio.scm:1476
 msgid "LV2 convolution reverb"
 msgstr ""
 
-#: gnu/packages/audio.scm:1488
+#: gnu/packages/audio.scm:1478
 msgid ""
 "IR is a low-latency, real-time, high performance signal convolver\n"
 "especially for creating reverb effects.  It supports impulse responses with 1,\n"
 "2 or 4 channels, in any soundfile format supported by libsndfile."
 msgstr ""
 
-#: gnu/packages/audio.scm:1526
+#: gnu/packages/audio.scm:1516
 msgid "JACK audio connection kit"
 msgstr ""
 
-#: gnu/packages/audio.scm:1528
+#: gnu/packages/audio.scm:1518
 msgid ""
 "JACK is a low-latency audio server.  It can connect a number of\n"
 "different applications to an audio device, as well as allowing them to share\n"
@@ -460,32 +447,32 @@ msgid ""
 "synchronous execution of all clients, and low latency operation."
 msgstr ""
 
-#: gnu/packages/audio.scm:1624
+#: gnu/packages/audio.scm:1616
 msgid "Simple LV2 host for JACK"
 msgstr ""
 
-#: gnu/packages/audio.scm:1626
+#: gnu/packages/audio.scm:1618
 msgid ""
 "Jalv is a simple but fully featured LV2 host for JACK.  It runs LV2\n"
 "plugins and exposes their ports as JACK ports, essentially making any LV2\n"
 "plugin function as a JACK application."
 msgstr ""
 
-#: gnu/packages/audio.scm:1669
+#: gnu/packages/audio.scm:1662
 msgid "Linux Audio Developer's Simple Plugin API (LADSPA)"
 msgstr ""
 
-#: gnu/packages/audio.scm:1671
+#: gnu/packages/audio.scm:1664
 msgid ""
 "LADSPA is a standard that allows software audio processors and effects\n"
 "to be plugged into a wide range of audio synthesis and recording packages."
 msgstr ""
 
-#: gnu/packages/audio.scm:1717
+#: gnu/packages/audio.scm:1710
 msgid "Audio application session manager"
 msgstr ""
 
-#: gnu/packages/audio.scm:1719
+#: gnu/packages/audio.scm:1712
 msgid ""
 "LASH is a session management system for audio applications.  It allows\n"
 "you to save and restore audio sessions consisting of multiple interconneced\n"
@@ -493,11 +480,11 @@ msgid ""
 "connections between them."
 msgstr ""
 
-#: gnu/packages/audio.scm:1740
+#: gnu/packages/audio.scm:1733
 msgid "Bauer stereophonic-to-binaural DSP"
 msgstr ""
 
-#: gnu/packages/audio.scm:1742
+#: gnu/packages/audio.scm:1735
 msgid ""
 "The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is\n"
 "designed to improve headphone listening of stereo audio records.  Recommended\n"
@@ -505,21 +492,21 @@ msgid ""
 "essential distortions."
 msgstr ""
 
-#: gnu/packages/audio.scm:1765
+#: gnu/packages/audio.scm:1758
 msgid "Implementation of the Open Sound Control protocol"
 msgstr "Implantation du protocole Open Sound Control"
 
-#: gnu/packages/audio.scm:1767
+#: gnu/packages/audio.scm:1760
 msgid ""
 "liblo is a lightweight library that provides an easy to use\n"
 "implementation of the Open Sound Control (@dfn{OSC}) protocol."
 msgstr ""
 
-#: gnu/packages/audio.scm:1790
+#: gnu/packages/audio.scm:1779
 msgid "Bindings for PortAudio v19"
 msgstr "Liaisons pour PortAudio v19"
 
-#: gnu/packages/audio.scm:1791
+#: gnu/packages/audio.scm:1780
 msgid ""
 "This package provides bindings for PortAudio v19, the\n"
 "cross-platform audio input/output stream library."
@@ -527,11 +514,11 @@ msgstr ""
 "Ce paquet fournit les liaisons Python pour PortAudio v19, la\n"
 "bibliothèque de flux audio d'entrée/sortie multiplateforme."
 
-#: gnu/packages/audio.scm:1816
+#: gnu/packages/audio.scm:1805
 msgid "Python bindings for liblo"
 msgstr ""
 
-#: gnu/packages/audio.scm:1818
+#: gnu/packages/audio.scm:1807
 msgid ""
 "Pyliblo is a Python wrapper for the liblo Open Sound Control (OSC)\n"
 "library.  It supports almost the complete functionality of liblo, allowing you\n"
@@ -539,22 +526,22 @@ msgid ""
 "included are the command line utilities @code{send_osc} and @code{dump_osc}."
 msgstr ""
 
-#: gnu/packages/audio.scm:1859
+#: gnu/packages/audio.scm:1848
 msgid "Library to simplify use of LV2 plugins in applications"
 msgstr ""
 
-#: gnu/packages/audio.scm:1861
+#: gnu/packages/audio.scm:1850
 msgid ""
 "Lilv is a C library to make the use of LV2 plugins as simple as possible\n"
 "for applications.  Lilv is the successor to SLV2, rewritten to be\n"
 "significantly faster and have minimal dependencies."
 msgstr ""
 
-#: gnu/packages/audio.scm:1887
+#: gnu/packages/audio.scm:1876
 msgid "LV2 audio plugin specification"
 msgstr ""
 
-#: gnu/packages/audio.scm:1889
+#: gnu/packages/audio.scm:1878
 msgid ""
 "LV2 is an open specification for audio plugins and host applications.\n"
 "At its core, LV2 is a simple stable interface, accompanied by extensions which\n"
@@ -562,38 +549,38 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnu/packages/audio.scm:1941
+#: gnu/packages/audio.scm:1914
 msgid "LV2 port of the mda Piano plugin"
 msgstr "Port LV2 du greffon mda Piano"
 
-#: gnu/packages/audio.scm:1942
+#: gnu/packages/audio.scm:1915
 msgid "An LV2 port of the mda Piano VSTi."
 msgstr "Un port LV2 du VSTi mda Piano."
 
-#: gnu/packages/audio.scm:1955
+#: gnu/packages/audio.scm:1928
 msgid "LV2 port of the mda EPiano plugin"
 msgstr "Port LV2 du greffon mda EPiano"
 
-#: gnu/packages/audio.scm:1956
+#: gnu/packages/audio.scm:1929
 msgid "An LV2 port of the mda EPiano VSTi."
 msgstr "Un port LV2 du VSTi mda EPiano."
 
-#: gnu/packages/audio.scm:2001
+#: gnu/packages/audio.scm:1974
 msgid "C++ libraries for LV2 plugins"
 msgstr ""
 
-#: gnu/packages/audio.scm:2003
+#: gnu/packages/audio.scm:1976
 msgid ""
 "The LV2 Toolkit (LVTK) contains libraries that wrap the LV2 C API and\n"
 "extensions into easy to use C++ classes.  It is the successor of\n"
 "lv2-c++-tools."
 msgstr ""
 
-#: gnu/packages/audio.scm:2044
+#: gnu/packages/audio.scm:2017
 msgid "3D audio API"
 msgstr ""
 
-#: gnu/packages/audio.scm:2046
+#: gnu/packages/audio.scm:2019
 msgid ""
 "OpenAL provides capabilities for playing audio in a virtual 3D\n"
 "environment.  Distance attenuation, doppler shift, and directional sound\n"
@@ -603,50 +590,60 @@ msgid ""
 "buffers, and audio capture."
 msgstr ""
 
-#: gnu/packages/audio.scm:2076
+#: gnu/packages/audio.scm:2049
 msgid "Free implementation of OpenAL's ALUT standard"
 msgstr ""
 
-#: gnu/packages/audio.scm:2077
+#: gnu/packages/audio.scm:2050
 msgid "freealut is the OpenAL Utility Toolkit."
 msgstr ""
 
-#: gnu/packages/audio.scm:2106
+#: gnu/packages/audio.scm:2081
 msgid "Modular patch bay for audio and MIDI systems"
 msgstr ""
 
-#: gnu/packages/audio.scm:2108
+#: gnu/packages/audio.scm:2083
 msgid ""
 "Patchage is a modular patch bay for audio and MIDI systems based on JACK\n"
 "and ALSA."
 msgstr ""
 
-#: gnu/packages/audio.scm:2135
+#: gnu/packages/audio.scm:2111
+msgid "Portable C audio library"
+msgstr "Bibliothèque audio portable en C"
+
+#: gnu/packages/audio.scm:2113
+msgid ""
+"The Portable C Audio Library (pcaudiolib) provides a C@tie{}API to\n"
+"different audio devices such as ALSA or PulseAudio."
+msgstr ""
+
+#: gnu/packages/audio.scm:2143
 msgid "Jack server control application"
 msgstr ""
 
-#: gnu/packages/audio.scm:2136
+#: gnu/packages/audio.scm:2144
 msgid ""
 "Control a Jack server.  Allows you to plug various sources\n"
 "into various outputs and to start, stop and configure jackd"
 msgstr ""
 
-#: gnu/packages/audio.scm:2169
+#: gnu/packages/audio.scm:2177
 msgid "Stereo audio recorder for JACK"
 msgstr ""
 
-#: gnu/packages/audio.scm:2170
+#: gnu/packages/audio.scm:2178
 msgid ""
 "QJackRcd is a simple graphical stereo recorder for JACK\n"
 "supporting silence processing for automatic pause, file splitting, and\n"
 "background file post-processing."
 msgstr ""
 
-#: gnu/packages/audio.scm:2267
+#: gnu/packages/audio.scm:2261
 msgid "Synthesis engine and programming language"
 msgstr "Moteur de synthèse et langage de programmation"
 
-#: gnu/packages/audio.scm:2268
+#: gnu/packages/audio.scm:2262
 msgid ""
 "SuperCollider is a synthesis engine (@code{scsynth} or\n"
 "@code{supernova}) and programming language (@code{sclang}).  It can be used\n"
@@ -655,55 +652,55 @@ msgid ""
 "SuperCollider requires jackd to be installed in your user profile and your\n"
 "user must be allowed to access the realtime features of the kernel.  Search\n"
 "for \"realtime\" in the index of the Guix manual to learn how to achieve this\n"
-"using GuixSD."
+"using Guix System."
 msgstr ""
 
-#: gnu/packages/audio.scm:2299
+#: gnu/packages/audio.scm:2293
 msgid "Real-time audio utility library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2301
+#: gnu/packages/audio.scm:2295
 msgid ""
 "Raul (Real-time Audio Utility Library) is a C++ utility library primarily\n"
 "aimed at audio/musical applications."
 msgstr ""
 
-#: gnu/packages/audio.scm:2345
+#: gnu/packages/audio.scm:2339
 msgid "Audio time-stretching and pitch-shifting library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2347
+#: gnu/packages/audio.scm:2341
 msgid ""
 "Rubber Band is a library and utility program that permits changing the\n"
 "tempo and pitch of an audio recording independently of one another."
 msgstr ""
 
-#: gnu/packages/audio.scm:2391
+#: gnu/packages/audio.scm:2385
 msgid "Cross-platform MIDI library for C++"
 msgstr ""
 
-#: gnu/packages/audio.scm:2393
+#: gnu/packages/audio.scm:2387
 msgid ""
 "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific\n"
 "classes) that provide a common cross-platform API for realtime MIDI\n"
 "input/output."
 msgstr ""
 
-#: gnu/packages/audio.scm:2418
+#: gnu/packages/audio.scm:2412
 msgid "Library for serialising LV2 atoms to/from RDF"
 msgstr ""
 
-#: gnu/packages/audio.scm:2420
+#: gnu/packages/audio.scm:2414
 msgid ""
 "Sratom is a library for serialising LV2 atoms to/from RDF, particularly\n"
 "the Turtle syntax."
 msgstr ""
 
-#: gnu/packages/audio.scm:2448
+#: gnu/packages/audio.scm:2442
 msgid "Library for loading and wrapping LV2 plugin UIs"
 msgstr ""
 
-#: gnu/packages/audio.scm:2450
+#: gnu/packages/audio.scm:2444
 msgid ""
 "Suil is a lightweight C library for loading and wrapping LV2 plugin UIs.\n"
 "\n"
@@ -715,11 +712,11 @@ msgid ""
 "Suil currently supports every combination of Gtk, Qt, and X11."
 msgstr ""
 
-#: gnu/packages/audio.scm:2507
+#: gnu/packages/audio.scm:2501
 msgid "Software synthesizer for playing MIDI files"
 msgstr ""
 
-#: gnu/packages/audio.scm:2509
+#: gnu/packages/audio.scm:2503
 msgid ""
 "TiMidity++ is a software synthesizer.  It can play MIDI files by\n"
 "converting them into PCM waveform data; give it a MIDI data along with digital\n"
@@ -728,43 +725,43 @@ msgid ""
 "disks as various audio file formats."
 msgstr ""
 
-#: gnu/packages/audio.scm:2547
+#: gnu/packages/audio.scm:2541
 msgid "Modular and extensible audio processing system"
 msgstr ""
 
-#: gnu/packages/audio.scm:2549
+#: gnu/packages/audio.scm:2543
 msgid ""
 "Vamp is an audio processing plugin system for plugins that extract\n"
 "descriptive information from audio data — typically referred to as audio\n"
 "analysis plugins or audio feature extraction plugins."
 msgstr ""
 
-#: gnu/packages/audio.scm:2588
+#: gnu/packages/audio.scm:2583
 msgid "Library for time stretching and pitch scaling of audio"
 msgstr ""
 
-#: gnu/packages/audio.scm:2590
+#: gnu/packages/audio.scm:2585
 msgid ""
 "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time\n"
 "stretching and pitch scaling of audio.  This package contains the library."
 msgstr ""
 
-#: gnu/packages/audio.scm:2612
+#: gnu/packages/audio.scm:2607
 msgid "Hybrid lossless audio codec"
 msgstr ""
 
-#: gnu/packages/audio.scm:2614
+#: gnu/packages/audio.scm:2609
 msgid ""
 "WavPack is an audio compression format with lossless, lossy and hybrid\n"
 "compression modes.  This package contains command-line programs and library to\n"
 "encode and decode wavpack files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2633
+#: gnu/packages/audio.scm:2628
 msgid "Mod file playing library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2635
+#: gnu/packages/audio.scm:2630
 msgid ""
 "Libmodplug renders mod music files as raw audio data, for playing or\n"
 "conversion.  mod, .s3m, .it, .xm, and a number of lesser-known formats are\n"
@@ -772,33 +769,33 @@ msgid ""
 "surround and reverb."
 msgstr ""
 
-#: gnu/packages/audio.scm:2654
+#: gnu/packages/audio.scm:2649
 msgid "Module player library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2656
+#: gnu/packages/audio.scm:2651
 msgid ""
 "Libxmp is a library that renders module files to PCM data.  It supports\n"
 "over 90 mainstream and obscure module formats including Protracker (MOD),\n"
 "Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT)."
 msgstr ""
 
-#: gnu/packages/audio.scm:2679
+#: gnu/packages/audio.scm:2674
 msgid "Extended module player"
 msgstr ""
 
-#: gnu/packages/audio.scm:2681
+#: gnu/packages/audio.scm:2676
 msgid ""
 "Xmp is a portable module player that plays over 90 mainstream and\n"
 "obscure module formats, including Protracker MOD, Fasttracker II XM, Scream\n"
 "Tracker 3 S3M and Impulse Tracker IT files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2709
+#: gnu/packages/audio.scm:2704
 msgid "Audio processing library for changing tempo, pitch and playback rate"
 msgstr ""
 
-#: gnu/packages/audio.scm:2711
+#: gnu/packages/audio.scm:2706
 msgid ""
 "SoundTouch is an audio processing library for changing the tempo, pitch\n"
 "and playback rates of audio streams or audio files.  It is intended for\n"
@@ -806,11 +803,11 @@ msgid ""
 "control functionality, or just for playing around with the sound effects."
 msgstr ""
 
-#: gnu/packages/audio.scm:2748
+#: gnu/packages/audio.scm:2743
 msgid "Sound processing utility"
 msgstr ""
 
-#: gnu/packages/audio.scm:2750
+#: gnu/packages/audio.scm:2745
 msgid ""
 "SoX (Sound eXchange) is a command line utility that can convert\n"
 "various formats of computer audio files to other formats.  It can also\n"
@@ -818,92 +815,92 @@ msgid ""
 "can play and record audio files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2773
+#: gnu/packages/audio.scm:2768
 msgid "One-dimensional sample-rate conversion library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2775
+#: gnu/packages/audio.scm:2770
 msgid ""
 "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate\n"
 "conversion.  It may be used, for example, to resample PCM-encoded audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:2805
+#: gnu/packages/audio.scm:2800
 msgid "MPEG Audio Layer 2 (MP2) encoder"
 msgstr ""
 
-#: gnu/packages/audio.scm:2807
+#: gnu/packages/audio.scm:2802
 msgid ""
 "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on\n"
 "tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and\n"
 "portions of LAME."
 msgstr ""
 
-#: gnu/packages/audio.scm:2840
+#: gnu/packages/audio.scm:2854
 msgid "Audio I/O library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2842
+#: gnu/packages/audio.scm:2856
 msgid ""
 "PortAudio is a portable C/C++ audio I/O library providing a simple API\n"
 "to record and/or play sound using a callback function or a blocking read/write\n"
 "interface."
 msgstr ""
 
-#: gnu/packages/audio.scm:2872
+#: gnu/packages/audio.scm:2885
 msgid "Graphical user interface for FluidSynth"
 msgstr ""
 
-#: gnu/packages/audio.scm:2874
+#: gnu/packages/audio.scm:2887
 msgid ""
 "Qsynth is a GUI front-end application for the FluidSynth SoundFont\n"
 "synthesizer written in C++."
 msgstr ""
 
-#: gnu/packages/audio.scm:2911
+#: gnu/packages/audio.scm:2924
 msgid "Networked audio system"
 msgstr ""
 
-#: gnu/packages/audio.scm:2913
+#: gnu/packages/audio.scm:2926
 msgid ""
 "RSound allows you to send audio from an application and transfer it\n"
 "directly to a different computer on your LAN network.  It is an audio daemon\n"
 "with a much different focus than most other audio daemons."
 msgstr ""
 
-#: gnu/packages/audio.scm:2944
+#: gnu/packages/audio.scm:2957
 msgid "JACK audio frequency analyzer and display"
 msgstr ""
 
-#: gnu/packages/audio.scm:2946
+#: gnu/packages/audio.scm:2959
 msgid ""
 "XJackFreak is an audio analysis and equalizing tool for the Jack Audio\n"
 "Connection Kit.  It can display the FFT of any input, modify it and output the\n"
 "result."
 msgstr ""
 
-#: gnu/packages/audio.scm:2992
+#: gnu/packages/audio.scm:3007
 msgid "Fast, partitioned convolution engine library"
 msgstr ""
 
-#: gnu/packages/audio.scm:2994
+#: gnu/packages/audio.scm:3009
 msgid ""
 "Zita convolver is a C++ library providing a real-time convolution\n"
 "engine."
 msgstr ""
 
-#: gnu/packages/audio.scm:3041
+#: gnu/packages/audio.scm:3057
 msgid "C++ library for resampling audio signals"
 msgstr "Bibliothèque C++ pour ré-échantillonner des signaux audio"
 
-#: gnu/packages/audio.scm:3043
+#: gnu/packages/audio.scm:3059
 msgid ""
 "Libzita-resampler is a C++ library for resampling audio signals.  It is\n"
 "designed to be used within a real-time processing context, to be fast, and to\n"
 "provide high-quality sample rate conversion."
 msgstr ""
 
-#: gnu/packages/audio.scm:3087
+#: gnu/packages/audio.scm:3104
 msgid ""
 "Zita-alsa-pcmi is a C++ wrapper around the ALSA API.  It provides easy\n"
 "access to ALSA PCM devices, taking care of the many functions required to\n"
@@ -911,11 +908,11 @@ msgid ""
 "point audio data."
 msgstr ""
 
-#: gnu/packages/audio.scm:3113
+#: gnu/packages/audio.scm:3130
 msgid "Cue and toc file parsers and utilities"
 msgstr ""
 
-#: gnu/packages/audio.scm:3114
+#: gnu/packages/audio.scm:3131
 msgid ""
 "Cuetools is a set of programs that are useful for manipulating\n"
 "and using CUE sheet (cue) files and Table of Contents (toc) files.  CUE and TOC\n"
@@ -923,11 +920,11 @@ msgid ""
 "machine-readable ASCII format."
 msgstr ""
 
-#: gnu/packages/audio.scm:3133
+#: gnu/packages/audio.scm:3150
 msgid "WAVE audio data processing tool"
 msgstr ""
 
-#: gnu/packages/audio.scm:3134
+#: gnu/packages/audio.scm:3151
 msgid ""
 "shntool is a multi-purpose WAVE data processing and reporting\n"
 "utility.  File formats are abstracted from its core, so it can process any file\n"
@@ -936,63 +933,63 @@ msgid ""
 "use them split WAVE data into multiple files."
 msgstr ""
 
-#: gnu/packages/audio.scm:3173
+#: gnu/packages/audio.scm:3190
 msgid "DTS Coherent Acoustics decoder"
 msgstr ""
 
-#: gnu/packages/audio.scm:3174
+#: gnu/packages/audio.scm:3191
 msgid ""
 "Dcadec is a DTS Coherent Acoustics surround sound decoder\n"
 "with support for HD extensions."
 msgstr ""
 
-#: gnu/packages/audio.scm:3195
+#: gnu/packages/audio.scm:3221
 msgid "Tool to adjust loudness of media files"
 msgstr ""
 
-#: gnu/packages/audio.scm:3197
+#: gnu/packages/audio.scm:3223
 msgid ""
 "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its\n"
 "flavors EBU R128, ATSC A/85, and ReplayGain 2.0.  It helps normalizing the\n"
 "loudness of audio and video files to the same level."
 msgstr ""
 
-#: gnu/packages/audio.scm:3228
+#: gnu/packages/audio.scm:3254
 msgid "Lightweight audio filtering library"
 msgstr ""
 
-#: gnu/packages/audio.scm:3229
+#: gnu/packages/audio.scm:3255
 msgid ""
 "An easy to use audio filtering library made from webrtc\n"
 "code, used in @code{libtoxcore}."
 msgstr ""
 
-#: gnu/packages/audio.scm:3273
+#: gnu/packages/audio.scm:3301
 msgid "GSM 06.10 lossy speech compression library"
 msgstr "Bibliothèque de compression de la voix avec perte GSM 06.10"
 
-#: gnu/packages/audio.scm:3274
+#: gnu/packages/audio.scm:3302
 msgid ""
 "This C library provides an encoder and a decoder for the GSM\n"
 "06.10 RPE-LTP lossy speech compression algorithm."
 msgstr ""
 
-#: gnu/packages/audio.scm:3295
+#: gnu/packages/audio.scm:3323
 msgid "ALSA wrappers for Python"
 msgstr ""
 
-#: gnu/packages/audio.scm:3297
+#: gnu/packages/audio.scm:3325
 msgid ""
 "This package contains wrappers for accessing the ALSA API from Python.\n"
 "It is currently fairly complete for PCM devices, and has some support for\n"
 "mixers."
 msgstr ""
 
-#: gnu/packages/audio.scm:3335
+#: gnu/packages/audio.scm:3363
 msgid "Bluetooth ALSA backend"
 msgstr ""
 
-#: gnu/packages/audio.scm:3336
+#: gnu/packages/audio.scm:3364
 msgid ""
 "This project is a rebirth of a direct integration between\n"
 "Bluez and ALSA.  Since Bluez >= 5, the build-in integration has been removed\n"
@@ -1005,22 +1002,22 @@ msgid ""
 "on the ALSA software PCM plugin."
 msgstr ""
 
-#: gnu/packages/audio.scm:3398
+#: gnu/packages/audio.scm:3426
 msgid "Sound editor"
 msgstr "Éditeur de son"
 
-#: gnu/packages/audio.scm:3401
+#: gnu/packages/audio.scm:3429
 msgid ""
 "Snd is a sound editor modelled loosely after Emacs.  It can be\n"
 "customized and extended using either the s7 Scheme implementation (included in\n"
 "the Snd sources), Ruby, or Forth."
 msgstr ""
 
-#: gnu/packages/audio.scm:3434
+#: gnu/packages/audio.scm:3462
 msgid "LV2 plugin for broadband noise reduction"
 msgstr ""
 
-#: gnu/packages/audio.scm:3435
+#: gnu/packages/audio.scm:3463
 msgid ""
 "Noise Repellent is an LV2 plugin to reduce noise.  It has\n"
 "the following features:\n"
@@ -1040,40 +1037,40 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/audio.scm:3504
+#: gnu/packages/audio.scm:3532
 msgid "Command-line audio visualizer"
 msgstr "Visionneuse audio en ligne de commande"
 
-#: gnu/packages/audio.scm:3505
+#: gnu/packages/audio.scm:3533
 msgid ""
 "@code{cli-visualizer} displays fast-Fourier\n"
 "transforms (FFTs) of the sound being played, as well as other graphical\n"
 "representations."
 msgstr ""
 
-#: gnu/packages/audio.scm:3556
+#: gnu/packages/audio.scm:3586
 msgid "Console audio visualizer for ALSA, MPD, and PulseAudio"
 msgstr ""
 
-#: gnu/packages/audio.scm:3557
+#: gnu/packages/audio.scm:3587
 msgid ""
 "C.A.V.A. is a bar audio spectrum visualizer for the terminal\n"
 "using ALSA, MPD, PulseAudio, or a FIFO buffer as its input."
 msgstr ""
 
-#: gnu/packages/audio.scm:3590
+#: gnu/packages/audio.scm:3620
 msgid "Pro-quality GM soundfont"
 msgstr ""
 
-#: gnu/packages/audio.scm:3591
+#: gnu/packages/audio.scm:3621
 msgid "Fluid-3 is Frank Wen's pro-quality GM soundfont."
 msgstr ""
 
-#: gnu/packages/audio.scm:3617
+#: gnu/packages/audio.scm:3647
 msgid "Fraunhofer FDK AAC library"
 msgstr ""
 
-#: gnu/packages/audio.scm:3618
+#: gnu/packages/audio.scm:3648
 msgid ""
 "FDK is a library for encoding and decoding Advanced Audio\n"
 "Coding (AAC) format audio, developed by Fraunhofer IIS, and included as part of\n"
@@ -1084,22 +1081,32 @@ msgid ""
 "surround)."
 msgstr ""
 
-#: gnu/packages/audio.scm:3657
+#: gnu/packages/audio.scm:3687
 msgid "Audio editing and playback for OpenShot"
 msgstr ""
 
-#: gnu/packages/audio.scm:3658
+#: gnu/packages/audio.scm:3688
 msgid ""
 "OpenShot Audio Library (libopenshot-audio) allows\n"
 "high-quality editing and playback of audio, and is based on the JUCE\n"
 "library."
 msgstr ""
 
-#: gnu/packages/backup.scm:122
+#: gnu/packages/audio.scm:3714
+msgid "XAudio reimplementation"
+msgstr "Réimplémentation de XAudio"
+
+#: gnu/packages/audio.scm:3715
+msgid ""
+"FAudio is an XAudio reimplementation that focuses solely on\n"
+"developing fully accurate DirectX Audio runtime libraries."
+msgstr ""
+
+#: gnu/packages/backup.scm:126
 msgid "Encrypted backup using rsync algorithm"
 msgstr "Système de sauvegarde chiffrée utilisant l'algorithme rsync"
 
-#: gnu/packages/backup.scm:124
+#: gnu/packages/backup.scm:128
 msgid ""
 "Duplicity backs up directories by producing encrypted tar-format volumes\n"
 "and uploading them to a remote or local file server.  Because duplicity uses\n"
@@ -1115,11 +1122,11 @@ msgstr ""
 "dernière sauvegarde. L'utilisation de GnuPG pour chiffrer ou signer ces archives\n"
 "permet de prévenir tout rique d'espionnage ou d'altération par le serveur."
 
-#: gnu/packages/backup.scm:149
+#: gnu/packages/backup.scm:153
 msgid "File verification and repair tools"
 msgstr ""
 
-#: gnu/packages/backup.scm:150
+#: gnu/packages/backup.scm:154
 msgid ""
 "Par2cmdline uses Reed-Solomon error-correcting codes to\n"
 "generate and verify PAR2 recovery files.  These files can be distributed\n"
@@ -1131,11 +1138,11 @@ msgid ""
 "can even repair them."
 msgstr ""
 
-#: gnu/packages/backup.scm:186
+#: gnu/packages/backup.scm:190
 msgid "Simple incremental backup tool"
 msgstr "Outil simple de sauvegarde incrémentale"
 
-#: gnu/packages/backup.scm:188
+#: gnu/packages/backup.scm:192
 msgid ""
 "Hdup2 is a backup utility, its aim is to make backup really simple.  The\n"
 "backup scheduling is done by means of a cron job.  It supports an\n"
@@ -1147,11 +1154,11 @@ msgstr ""
 "supporte un mécanisme d'inclusion et d'exclusion, les sauvegardes distantes,\n"
 "chiffrées ou morcelées (appelées chunks) permettant un gravure sur CD/DVD aisée."
 
-#: gnu/packages/backup.scm:262
+#: gnu/packages/backup.scm:267
 msgid "Multi-format archive and compression library"
 msgstr "Bibliothèque de compression et d'archivage multi-format"
 
-#: gnu/packages/backup.scm:264
+#: gnu/packages/backup.scm:269
 msgid ""
 "Libarchive provides a flexible interface for reading and writing\n"
 "archives in various formats such as tar and cpio.  Libarchive also supports\n"
@@ -1169,11 +1176,11 @@ msgstr ""
 "l'archive en continu. Notez qu'il n'existe pour l'instant aucun support intégré\n"
 "pour les accès aléatoires ou les modifications ponctuelles."
 
-#: gnu/packages/backup.scm:322
+#: gnu/packages/backup.scm:343
 msgid "Provide a list of files to backup"
 msgstr "Fournit une liste des fichiers à sauvegarder"
 
-#: gnu/packages/backup.scm:324
+#: gnu/packages/backup.scm:345
 msgid ""
 "Rdup is a utility inspired by rsync and the plan9 way of doing backups.\n"
 "Rdup itself does not backup anything, it only print a list of absolute\n"
@@ -1185,11 +1192,11 @@ msgstr ""
 "liste de fichiers sur la sortie standard. Des scripts auxiliaires utilisant\n"
 "cette liste et implantant la stratégie de sauvegarde sont nécessaires."
 
-#: gnu/packages/backup.scm:354
+#: gnu/packages/backup.scm:375
 msgid "Tar-compatible archiver"
 msgstr "Archiveur compatible avec le format tar"
 
-#: gnu/packages/backup.scm:356
+#: gnu/packages/backup.scm:377
 msgid ""
 "Btar is a tar-compatible archiver which allows arbitrary compression and\n"
 "ciphering, redundancy, differential backup, indexed extraction, multicore\n"
@@ -1201,11 +1208,11 @@ msgstr ""
 "l'extraction indexée, la compression multi-coeurs, la sérialisation des entrées-\n"
 "sorties et la tolérance aux erreurs d'archivage partielles."
 
-#: gnu/packages/backup.scm:382
+#: gnu/packages/backup.scm:403
 msgid "Local/remote mirroring+incremental backup"
 msgstr "Sauvegarde mirroir/incrémentales, locales ou distantes"
 
-#: gnu/packages/backup.scm:384
+#: gnu/packages/backup.scm:405
 msgid ""
 "Rdiff-backup backs up one directory to another, possibly over a network.\n"
 "The target directory ends up a copy of the source directory, but extra reverse\n"
@@ -1232,11 +1239,11 @@ msgstr ""
 "différence sera transmise. Enfin, rdiff-backup est simple d'utilisation et la\n"
 "configuration par défaut sera généralement suffisante."
 
-#: gnu/packages/backup.scm:426
+#: gnu/packages/backup.scm:447
 msgid "Deduplicating snapshot backup utility based on rsync"
 msgstr "Utilitaire de sauvegarde dédupliquées basé sur rsync"
 
-#: gnu/packages/backup.scm:427
+#: gnu/packages/backup.scm:448
 msgid ""
 "rsnapshot is a file system snapshot utility based on rsync.\n"
 "rsnapshot makes it easy to make periodic snapshots of local machines, and\n"
@@ -1249,11 +1256,11 @@ msgstr ""
 "pour chaque sauvegarde, rsnapshot utilise des liens en dur pour dédupliquer\n"
 "les fichiers identiques."
 
-#: gnu/packages/backup.scm:480
+#: gnu/packages/backup.scm:501
 msgid "Tools & library for data backup and distributed storage"
 msgstr "Outils et bibliothèque pour la sauvegarde de données et le stockage distribué"
 
-#: gnu/packages/backup.scm:482
+#: gnu/packages/backup.scm:503
 msgid ""
 "Libchop is a set of utilities and library for data backup and\n"
 "distributed storage.  Its main application is @command{chop-backup}, an\n"
@@ -1272,11 +1279,11 @@ msgstr ""
 "le stockage adressable par contenu, le clefs de hash, les arbres de Merkle,\n"
 "la détection de similarité et la compression sans perte."
 
-#: gnu/packages/backup.scm:606
+#: gnu/packages/backup.scm:621
 msgid "Deduplicated, encrypted, authenticated and compressed backups"
 msgstr "Sauvegardes dédupliquées, chiffrées, authentifiées et compressées"
 
-#: gnu/packages/backup.scm:607
+#: gnu/packages/backup.scm:622
 msgid ""
 "Borg is a deduplicating backup program.  Optionally, it\n"
 "supports compression and authenticated encryption.  The main goal of Borg is to\n"
@@ -1293,11 +1300,11 @@ msgstr ""
 "chiffrement authentifié le rend adapté aux sauvegardes vers des cibles qui ne\n"
 "sont pas de confiance.  Borg est un fork de Attic."
 
-#: gnu/packages/backup.scm:653
+#: gnu/packages/backup.scm:666
 msgid "Deduplicating backup program"
 msgstr "Programme de sauvegardes dédupliquées"
 
-#: gnu/packages/backup.scm:654
+#: gnu/packages/backup.scm:667
 msgid ""
 "Attic is a deduplicating backup program.  The main goal of\n"
 "Attic is to provide an efficient and secure way to backup data.  The data\n"
@@ -1309,11 +1316,11 @@ msgstr ""
 "technique de déduplication de données utilisée par Attic le rend adapté aux\n"
 "sauvegardes quotidiennes car seuls les changements sont stockés."
 
-#: gnu/packages/backup.scm:684
+#: gnu/packages/backup.scm:697
 msgid "WIM file manipulation library and utilities"
 msgstr "Bibliothèque et utilitaires de manipulation de fichiers WIM"
 
-#: gnu/packages/backup.scm:685
+#: gnu/packages/backup.scm:698
 msgid ""
 "wimlib is a C library and set of command-line utilities for\n"
 "creating, modifying, extracting, and mounting archives in the Windows Imaging\n"
@@ -1326,11 +1333,11 @@ msgstr ""
 "directement depuis ou sur des volumes NTFS avec @code{ntfs-3g}, et préserve\n"
 "les attributs spécifiques à NTFS."
 
-#: gnu/packages/backup.scm:742
+#: gnu/packages/backup.scm:755
 msgid "Retired backup program"
 msgstr "Programme de sauvegardes obsolète"
 
-#: gnu/packages/backup.scm:744
+#: gnu/packages/backup.scm:757
 msgid ""
 "Warning: @uref{https://blog.liw.fi/posts/2017/08/13/retiring_obnam/,\n"
 "the Obnam project is retired}.  You should use another backup solution instead.\n"
@@ -1350,22 +1357,22 @@ msgstr ""
 "ou en ligne avec le protocole SSH SFTP.  Le serveur de sauvegarde, s'il est\n"
 "utilisé, ne requiert aucun programme spécifique en dehors de SSH."
 
-#: gnu/packages/backup.scm:852
+#: gnu/packages/backup.scm:865
 msgid "Fast, disk based, rotating network backup system"
 msgstr ""
 
-#: gnu/packages/backup.scm:854
+#: gnu/packages/backup.scm:867
 msgid ""
 "With dirvish you can maintain a set of complete images of your\n"
 "file systems with unattended creation and expiration.  A dirvish backup vault\n"
 "is like a time machine for your data. "
 msgstr ""
 
-#: gnu/packages/backup.scm:952
+#: gnu/packages/backup.scm:965
 msgid "Backup program with multiple revisions, encryption and more"
 msgstr ""
 
-#: gnu/packages/backup.scm:953
+#: gnu/packages/backup.scm:966
 msgid ""
 "Restic is a program that does backups right and was designed\n"
 "with the following principles in mind:\n"
@@ -1397,11 +1404,22 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/base.scm:79
+#: gnu/packages/backup.scm:1017
+msgid "Differential backup and restore"
+msgstr ""
+
+#: gnu/packages/backup.scm:1018
+msgid ""
+"Burp is a network backup and restore program.  It attempts\n"
+"to reduce network traffic and the amount of space that is used by each\n"
+"backup."
+msgstr ""
+
+#: gnu/packages/base.scm:83
 msgid "Hello, GNU world: An example GNU package"
 msgstr "Hello, GNU world: Un exemple de paquet GNU"
 
-#: gnu/packages/base.scm:81
+#: gnu/packages/base.scm:85
 msgid ""
 "GNU Hello prints the message \"Hello, world!\" and then exits.  It\n"
 "serves as an example of standard GNU coding practices.  As such, it supports\n"
@@ -1411,11 +1429,11 @@ msgstr ""
 "d'exemple pour les pratiques de programmation GNU standard. Il supporte\n"
 "les arguments en ligne de commande, plusieurs langages, etc."
 
-#: gnu/packages/base.scm:116
+#: gnu/packages/base.scm:129
 msgid "Print lines matching a pattern"
 msgstr "Affiche les lignes correspondant à un pattern donné"
 
-#: gnu/packages/base.scm:118
+#: gnu/packages/base.scm:131
 msgid ""
 "grep is a tool for finding text inside files.  Text is found by\n"
 "matching a pattern provided by the user in one or many files.  The pattern\n"
@@ -1433,11 +1451,11 @@ msgstr ""
 "les numéros de ligne. GNU grep offre de nombreuses extensions, incluant par exemple\n"
 "la recherche récursive sur des répertoires."
 
-#: gnu/packages/base.scm:140
+#: gnu/packages/base.scm:153
 msgid "Stream editor"
 msgstr "Éditeur de flux"
 
-#: gnu/packages/base.scm:156
+#: gnu/packages/base.scm:169
 msgid ""
 "Sed is a non-interactive, text stream editor.  It receives a text\n"
 "input from a file or from standard input and it then applies a series of text\n"
@@ -1451,11 +1469,11 @@ msgstr ""
 "des morceaux de texte dans un flux. L'implantation GNU ajoute plusieurs extensions\n"
 "à l'utilitaire standard."
 
-#: gnu/packages/base.scm:216
+#: gnu/packages/base.scm:229
 msgid "Managing tar archives"
 msgstr "Gestion d'archives tar"
 
-#: gnu/packages/base.scm:218
+#: gnu/packages/base.scm:231
 msgid ""
 "Tar provides the ability to create tar archives, as well as the\n"
 "ability to extract, update or list files in an existing archive.  It is\n"
@@ -1471,11 +1489,11 @@ msgstr ""
 "les permissions et les dates de création/modification. GNU tar ajoute de\n"
 "nombreuses extensions à l'utilaire standard."
 
-#: gnu/packages/base.scm:247
+#: gnu/packages/base.scm:260
 msgid "Apply differences to originals, with optional backups"
 msgstr "Applique les différences aux originaux, avec sauvegardes optionnelles"
 
-#: gnu/packages/base.scm:249
+#: gnu/packages/base.scm:262
 msgid ""
 "Patch is a program that applies changes to files based on differences\n"
 "laid out as by the program \"diff\".  The changes may be applied to one or more\n"
@@ -1489,11 +1507,11 @@ msgstr ""
 "accepte différents formats diff. Il peut aussi être utilisé pour annuler des\n"
 "différences appliquées antérieurement."
 
-#: gnu/packages/base.scm:270
+#: gnu/packages/base.scm:283
 msgid "Comparing and merging files"
 msgstr "Comparaison et fusion des fichiers"
 
-#: gnu/packages/base.scm:272
+#: gnu/packages/base.scm:285
 msgid ""
 "GNU Diffutils is a package containing tools for finding the\n"
 "differences between files.  The \"diff\" command is used to show how two files\n"
@@ -1507,11 +1525,11 @@ msgstr ""
 "numéros de lignes et décalages où ils diffèrent. « diff3 » permet de comparer\n"
 "trois fichiers. Enfin, « sdiff » offre un moyen interactif de fusionner deux fichiers."
 
-#: gnu/packages/base.scm:315
+#: gnu/packages/base.scm:330
 msgid "Operating on files matching given criteria"
 msgstr "Opération sur les fichiers correspondant au critère donné"
 
-#: gnu/packages/base.scm:317
+#: gnu/packages/base.scm:332
 msgid ""
 "Findutils supplies the basic file directory searching utilities of the\n"
 "GNU system.  It consists of two primary searching utilities: \"find\"\n"
@@ -1527,11 +1545,11 @@ msgstr ""
 "sont inclus : \"updatedb\" met à jour la base de données et \"xargs\" peut être utilisé \n"
 "pour appliquer des commandes avec des arguments longs et arbitraires."
 
-#: gnu/packages/base.scm:375
+#: gnu/packages/base.scm:400
 msgid "Core GNU utilities (file, text, shell)"
 msgstr "Utilitaires GNU (fichier, texte, shell)"
 
-#: gnu/packages/base.scm:377
+#: gnu/packages/base.scm:402
 msgid ""
 "GNU Coreutils includes all of the basic command-line tools that are\n"
 "expected in a POSIX system.  These provide the basic file, shell and text\n"
@@ -1543,11 +1561,11 @@ msgstr ""
 "de fichiers, du shell et de textes d'un système GNU. Ils offrent pour la plupart\n"
 "des fonctionnalités étendues au-delà de ce qui est défini dans le standard POSIX."
 
-#: gnu/packages/base.scm:424
+#: gnu/packages/base.scm:449
 msgid "Remake files automatically"
 msgstr "Recompiler les fichiers automatiquement"
 
-#: gnu/packages/base.scm:426
+#: gnu/packages/base.scm:451
 msgid ""
 "Make is a program that is used to control the production of\n"
 "executables or other files from their source files.  The process is\n"
@@ -1564,11 +1582,11 @@ msgstr ""
 "regénérés. GNU make possède beaucoup d'extensions en plus de\n"
 "l'utilitaire standard."
 
-#: gnu/packages/base.scm:472
+#: gnu/packages/base.scm:497
 msgid "Binary utilities: bfd gas gprof ld"
 msgstr "Utilitaires binaires: bfd gas gprof ld"
 
-#: gnu/packages/base.scm:474
+#: gnu/packages/base.scm:499
 msgid ""
 "GNU Binutils is a collection of tools for working with binary files.\n"
 "Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler.\n"
@@ -1584,25 +1602,25 @@ msgstr ""
 "des archives. La bibliothèque \"bfd\", permettant de travailler avec des exécutables et des\n"
 "des formats objet, est aussi incluse."
 
-#: gnu/packages/base.scm:560
+#: gnu/packages/base.scm:601
 msgid "The linker wrapper"
 msgstr "L'enveloppe de l'éditeur de lien"
 
-#: gnu/packages/base.scm:562
+#: gnu/packages/base.scm:603
 msgid ""
-"The linker wrapper (or 'ld-wrapper') wraps the linker to add any\n"
-"missing '-rpath' flags, and to detect any misuse of libraries outside of the\n"
-"store."
+"The linker wrapper (or @code{ld-wrapper}) wraps the linker to add any\n"
+"missing @code{-rpath} flags, and to detect any misuse of libraries outside of\n"
+"the store."
 msgstr ""
-"L'enveloppe de l'éditeur de lien (ou « ld-wrapper ») enveloppe l'éditeur de\n"
-"liens pour ajouter les drapeaux « -rpath » manquants et pour détecter la\n"
-"mauvaise utilisation de bibliothèques en dehors du store."
+"L'enveloppe de l'éditeur de lien (ou @code{ld-wrapper}) enveloppe l'éditeur de\n"
+"liens pour ajouter les drapeaux @code{-rpath} absents et pour détecter la\n"
+"mauvaise utilisation de bibliothèques en dehors du dépôt."
 
-#: gnu/packages/base.scm:782
+#: gnu/packages/base.scm:866
 msgid "The GNU C Library"
 msgstr "La bibliothèque GNU C"
 
-#: gnu/packages/base.scm:784
+#: gnu/packages/base.scm:868
 msgid ""
 "Any Unix-like operating system needs a C library: the library which\n"
 "defines the \"system calls\" and other basic facilities such as open, malloc,\n"
@@ -1616,47 +1634,43 @@ msgstr ""
 "telles que open, malloc, printf, exit, ... La bibliothèque GNU C est utilisée comme\n"
 "bibliothèque C dans les systèmes GNU et la plupart des systèmes basés sur le noyau Linux."
 
-#: gnu/packages/base.scm:861
-msgid "The GNU C Library (GNU Hurd variant)"
-msgstr "La bibliothèque GNU C (variante GNU Hurd)"
-
-#: gnu/packages/base.scm:1015
+#: gnu/packages/base.scm:1019
 msgid "All the locales supported by the GNU C Library"
 msgstr ""
 
-#: gnu/packages/base.scm:1017
+#: gnu/packages/base.scm:1021
 msgid ""
 "This package provides all the locales supported by the GNU C Library,\n"
-"more than 400 in total.  To use them set the 'LOCPATH' environment variable to\n"
-"the 'share/locale' sub-directory of this package."
+"more than 400 in total.  To use them set the @code{LOCPATH} environment variable\n"
+"to the @code{share/locale} sub-directory of this package."
 msgstr ""
 
-#: gnu/packages/base.scm:1086
+#: gnu/packages/base.scm:1090
 msgid "Small sample of UTF-8 locales"
 msgstr ""
 
-#: gnu/packages/base.scm:1088
+#: gnu/packages/base.scm:1092
 msgid ""
 "This package provides a small sample of UTF-8 locales mostly useful in\n"
 "test environments."
 msgstr ""
 
-#: gnu/packages/base.scm:1106
+#: gnu/packages/base.scm:1122
 msgid "Find full path of shell commands"
 msgstr ""
 
-#: gnu/packages/base.scm:1108
+#: gnu/packages/base.scm:1124
 msgid ""
 "The which program finds the location of executables in PATH, with a\n"
 "variety of options.  It is an alternative to the shell \"type\" built-in\n"
 "command."
 msgstr ""
 
-#: gnu/packages/base.scm:1211
+#: gnu/packages/base.scm:1220
 msgid "Database of current and historical time zones"
 msgstr "Base de données des fuseaux horaires courant et historiques"
 
-#: gnu/packages/base.scm:1212
+#: gnu/packages/base.scm:1221
 msgid ""
 "The Time Zone Database (often called tz or zoneinfo)\n"
 "contains code and data that represent the history of local time for many\n"
@@ -1670,22 +1684,22 @@ msgstr ""
 "pour refléter les changements effectués par les entités politiques aux limites de ces zones,\n"
 "les décalages UTC et les changements d'heures."
 
-#: gnu/packages/base.scm:1266
+#: gnu/packages/base.scm:1277
 msgid "Character set conversion library"
 msgstr "Bibliothèque de conversion de jeux de caractères"
 
-#: gnu/packages/base.scm:1268
+#: gnu/packages/base.scm:1279
 msgid ""
 "libiconv provides an implementation of the iconv function for systems\n"
 "that lack it.  iconv is used to convert between character encodings in a\n"
 "program.  It supports a wide variety of different encodings."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:113
+#: gnu/packages/bittorrent.scm:114
 msgid "Fast and easy BitTorrent client"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:115
+#: gnu/packages/bittorrent.scm:116
 msgid ""
 "Transmission is a BitTorrent client that comes with graphical,\n"
 "textual, and Web user interfaces.  Transmission also has a daemon for\n"
@@ -1693,72 +1707,72 @@ msgid ""
 "DHT, µTP, PEX and Magnet Links."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:147
+#: gnu/packages/bittorrent.scm:148
 msgid "BitTorrent library of rtorrent"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:149
+#: gnu/packages/bittorrent.scm:150
 msgid ""
 "LibTorrent is a BitTorrent library used by and developed in parallel\n"
 "with the BitTorrent client rtorrent.  It is written in C++ with emphasis on\n"
 "speed and efficiency."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:176
+#: gnu/packages/bittorrent.scm:177
 msgid "BitTorrent client with ncurses interface"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:178
+#: gnu/packages/bittorrent.scm:179
 msgid ""
 "rTorrent is a BitTorrent client with an ncurses interface.  It supports\n"
 "full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via\n"
 "XML-RPC over SCGI."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:209 gnu/packages/bittorrent.scm:250
+#: gnu/packages/bittorrent.scm:210 gnu/packages/bittorrent.scm:251
 msgid "Console client for the Transmission BitTorrent daemon"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:210
+#: gnu/packages/bittorrent.scm:211
 msgid ""
 "Tremc is a console client, with a curses interface, for the\n"
 "Transmission BitTorrent daemon."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:251
+#: gnu/packages/bittorrent.scm:252
 msgid ""
 "Transmission-remote-cli is a console client, with a curses\n"
 "interface, for the Transmission BitTorrent daemon.  This package is no longer\n"
 "maintained upstream."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:299
+#: gnu/packages/bittorrent.scm:301
 msgid "Utility for parallel downloading files"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:301
+#: gnu/packages/bittorrent.scm:303
 msgid ""
 "Aria2 is a lightweight, multi-protocol & multi-source command-line\n"
 "download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.\n"
 "Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:332
+#: gnu/packages/bittorrent.scm:334
 msgid "Universal download manager with GTK+ interface"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:334
+#: gnu/packages/bittorrent.scm:336
 msgid ""
 "uGet is portable download manager with GTK+ interface supporting\n"
 "HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection\n"
 "downloads, download scheduling, download rate limiting."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:363
+#: gnu/packages/bittorrent.scm:366
 msgid "Utility to create BitTorrent metainfo files"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:365
+#: gnu/packages/bittorrent.scm:368
 msgid ""
 "mktorrent is a simple command-line utility to create BitTorrent\n"
 "@dfn{metainfo} files, often known simply as @dfn{torrents}, from both single\n"
@@ -1768,22 +1782,22 @@ msgid ""
 "and will take advantage of multiple processor cores where possible."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:416
+#: gnu/packages/bittorrent.scm:419
 msgid "Feature complete BitTorrent implementation"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:418
+#: gnu/packages/bittorrent.scm:421
 msgid ""
 "libtorrent-rasterbar is a feature complete C++ BitTorrent implementation\n"
 "focusing on efficiency and scalability.  It runs on embedded devices as well as\n"
 "desktops."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:456
+#: gnu/packages/bittorrent.scm:459
 msgid "Graphical BitTorrent client"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:458
+#: gnu/packages/bittorrent.scm:461
 msgid ""
 "qBittorrent is a BitTorrent client programmed in C++/Qt that uses\n"
 "libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.\n"
@@ -1793,11 +1807,11 @@ msgid ""
 "features."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:493
+#: gnu/packages/bittorrent.scm:496
 msgid "Fully-featured cross-platform ​BitTorrent client"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:495
+#: gnu/packages/bittorrent.scm:498
 msgid ""
 "Deluge contains the common features to BitTorrent clients such as\n"
 "Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange\n"
@@ -1839,11 +1853,11 @@ msgid ""
 "within Guix."
 msgstr ""
 
-#: gnu/packages/compression.scm:104
+#: gnu/packages/compression.scm:108
 msgid "Compression library"
 msgstr "Bibliothèque de compression"
 
-#: gnu/packages/compression.scm:106
+#: gnu/packages/compression.scm:110
 msgid ""
 "zlib is designed to be a free, general-purpose, legally unencumbered --\n"
 "that is, not covered by any patents -- lossless data-compression library for\n"
@@ -1856,42 +1870,42 @@ msgid ""
 "in compression."
 msgstr ""
 
-#: gnu/packages/compression.scm:134
+#: gnu/packages/compression.scm:138
 msgid "Zip Compression library"
 msgstr ""
 
-#: gnu/packages/compression.scm:136
+#: gnu/packages/compression.scm:140
 msgid ""
 "Minizip is a minimalistic library that supports compressing,\n"
 "extracting and viewing ZIP archives.  This version is extracted from\n"
 "the @code{zlib} source."
 msgstr ""
 
-#: gnu/packages/compression.scm:155
+#: gnu/packages/compression.scm:159
 msgid "Replacement for Sun's 'jar' utility"
 msgstr ""
 
-#: gnu/packages/compression.scm:157
+#: gnu/packages/compression.scm:161
 msgid ""
-"FastJar is an attempt to create a much faster replacement for Sun's 'jar'\n"
-"utility.  Instead of being written in Java, FastJar is written in C."
+"FastJar is an attempt to create a much faster replacement for Sun's\n"
+"@code{jar} utility.  Instead of being written in Java, FastJar is written in C."
 msgstr ""
 
-#: gnu/packages/compression.scm:186
+#: gnu/packages/compression.scm:190
 msgid "C library for manipulating POSIX tar files"
 msgstr "Bibliothèque C pour manipuler des fichiers tar POSIX"
 
-#: gnu/packages/compression.scm:188
+#: gnu/packages/compression.scm:192
 msgid ""
 "libtar is a C library for manipulating POSIX tar files.  It handles\n"
 "adding and extracting files to/from a tar archive."
 msgstr ""
 
-#: gnu/packages/compression.scm:205
+#: gnu/packages/compression.scm:209
 msgid "General file (de)compression (using lzw)"
 msgstr ""
 
-#: gnu/packages/compression.scm:219
+#: gnu/packages/compression.scm:238
 msgid ""
 "GNU Gzip provides data compression and decompression utilities; the\n"
 "typical extension is \".gz\".  Unlike the \"zip\" format, it compresses a single\n"
@@ -1899,11 +1913,11 @@ msgid ""
 "\".tar.gz\" or \".tgz\", etc."
 msgstr ""
 
-#: gnu/packages/compression.scm:304
+#: gnu/packages/compression.scm:332
 msgid "High-quality data compression program"
 msgstr ""
 
-#: gnu/packages/compression.scm:306
+#: gnu/packages/compression.scm:334
 msgid ""
 "bzip2 is a freely available, patent free (see below), high-quality data\n"
 "compressor.  It typically compresses files to within 10% to 15% of the best\n"
@@ -1912,11 +1926,11 @@ msgid ""
 "decompression."
 msgstr ""
 
-#: gnu/packages/compression.scm:327
+#: gnu/packages/compression.scm:368
 msgid "Parallel bzip2 compression utility"
 msgstr ""
 
-#: gnu/packages/compression.scm:329
+#: gnu/packages/compression.scm:370
 msgid ""
 "lbzip2 is a multi-threaded compression utility with support for the\n"
 "bzip2 compressed file format.  lbzip2 can process standard bz2 files in\n"
@@ -1926,11 +1940,11 @@ msgid ""
 "compatible with bzip2 – both at file format and command line level."
 msgstr ""
 
-#: gnu/packages/compression.scm:359
+#: gnu/packages/compression.scm:400
 msgid "Parallel bzip2 implementation"
 msgstr ""
 
-#: gnu/packages/compression.scm:361
+#: gnu/packages/compression.scm:402
 msgid ""
 "Pbzip2 is a parallel implementation of the bzip2 block-sorting file\n"
 "compressor that uses pthreads and achieves near-linear speedup on SMP machines.\n"
@@ -1938,11 +1952,11 @@ msgid ""
 "compressed with pbzip2 can be decompressed with bzip2)."
 msgstr ""
 
-#: gnu/packages/compression.scm:382
+#: gnu/packages/compression.scm:423
 msgid "General-purpose data compression"
 msgstr ""
 
-#: gnu/packages/compression.scm:384
+#: gnu/packages/compression.scm:425
 msgid ""
 "XZ Utils is free general-purpose data compression software with high\n"
 "compression ratio.  XZ Utils were written for POSIX-like systems, but also\n"
@@ -1955,11 +1969,25 @@ msgid ""
 "than gzip and 15 % smaller output than bzip2."
 msgstr ""
 
-#: gnu/packages/compression.scm:412
+#: gnu/packages/compression.scm:461
+msgid "LHA archive decompressor"
+msgstr ""
+
+#: gnu/packages/compression.scm:462
+msgid ""
+"Lhasa is a replacement for the Unix LHA tool, for\n"
+"decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives.  The backend for the\n"
+"tool is a library, so that it can be reused for other purposes.  Lhasa aims to\n"
+"be compatible with as many types of lzh/lzs archives as possible.  It also aims\n"
+"to generate the same output as the (non-free) Unix LHA tool, so that it will\n"
+"act as a free drop-in replacement."
+msgstr ""
+
+#: gnu/packages/compression.scm:486
 msgid "Data compression library suitable for real-time data de-/compression"
 msgstr ""
 
-#: gnu/packages/compression.scm:414
+#: gnu/packages/compression.scm:488
 msgid ""
 "LZO is a data compression library which is suitable for data\n"
 "de-/compression in real-time.  This means it favours speed over\n"
@@ -1969,22 +1997,11 @@ msgid ""
 "format are designed to be portable across platforms."
 msgstr ""
 
-#: gnu/packages/compression.scm:450
-msgid "Python bindings for the LZO data compression library"
-msgstr "Liaisons python pour la bibliothèque de compression LZO"
-
-#: gnu/packages/compression.scm:452
-msgid ""
-"Python-LZO provides Python bindings for LZO, i.e. you can access\n"
-"the LZO library from your Python scripts thereby compressing ordinary\n"
-"Python strings."
-msgstr ""
-
-#: gnu/packages/compression.scm:475
+#: gnu/packages/compression.scm:511
 msgid "Compress or expand files"
 msgstr "Compresse et décompresse des fichiers"
 
-#: gnu/packages/compression.scm:477
+#: gnu/packages/compression.scm:513
 msgid ""
 "Lzop is a file compressor which is very similar to gzip.  Lzop uses the\n"
 "LZO data compression library for compression services, and its main advantages\n"
@@ -1992,11 +2009,11 @@ msgid ""
 "some compression ratio)."
 msgstr ""
 
-#: gnu/packages/compression.scm:496
+#: gnu/packages/compression.scm:532
 msgid "Lossless data compressor based on the LZMA algorithm"
 msgstr ""
 
-#: gnu/packages/compression.scm:498
+#: gnu/packages/compression.scm:534
 msgid ""
 "Lzip is a lossless data compressor with a user interface similar to the\n"
 "one of gzip or bzip2.  Lzip decompresses almost as fast as gzip and compresses\n"
@@ -2004,11 +2021,11 @@ msgid ""
 "archiving.  Lzip is a clean implementation of the LZMA algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:517
+#: gnu/packages/compression.scm:553
 msgid "Recover and decompress data from damaged lzip files"
 msgstr ""
 
-#: gnu/packages/compression.scm:519
+#: gnu/packages/compression.scm:555
 msgid ""
 "Lziprecover is a data recovery tool and decompressor for files in the lzip\n"
 "compressed data format (.lz).  It can test the integrity of lzip files, extract\n"
@@ -2024,11 +2041,11 @@ msgid ""
 "decompressors when faced with corrupted input."
 msgstr ""
 
-#: gnu/packages/compression.scm:561
+#: gnu/packages/compression.scm:610
 msgid "Archives in shell scripts, uuencode/uudecode"
 msgstr ""
 
-#: gnu/packages/compression.scm:563
+#: gnu/packages/compression.scm:612
 msgid ""
 "GNU sharutils is a package for creating and manipulating shell\n"
 "archives that can be readily emailed.  A shell archive is a file that can be\n"
@@ -2036,71 +2053,41 @@ msgid ""
 "This package is mostly for compatibility and historical interest."
 msgstr ""
 
-#: gnu/packages/compression.scm:594
+#: gnu/packages/compression.scm:643
 msgid "Library for SoundFont decompression"
 msgstr ""
 
-#: gnu/packages/compression.scm:596
+#: gnu/packages/compression.scm:645
 msgid ""
 "SfArkLib is a C++ library for decompressing SoundFont files compressed\n"
 "with the sfArk algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:631
+#: gnu/packages/compression.scm:680
 msgid "Basic sfArk decompressor"
 msgstr ""
 
-#: gnu/packages/compression.scm:632
+#: gnu/packages/compression.scm:681
 msgid ""
 "SfArk extractor converts SoundFonts in the compressed legacy\n"
 "sfArk file format to the uncompressed sf2 format."
 msgstr ""
 
-#: gnu/packages/compression.scm:650
+#: gnu/packages/compression.scm:699
 msgid "Compression tools for some formats used by Microsoft"
 msgstr ""
 
-#: gnu/packages/compression.scm:652
+#: gnu/packages/compression.scm:701
 msgid ""
 "The purpose of libmspack is to provide both compression and\n"
 "decompression of some loosely related file formats used by Microsoft."
 msgstr ""
 
-#: gnu/packages/compression.scm:671
-msgid "Low-level interface to bzip2 compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:672
-msgid ""
-"This module provides a Perl interface to the bzip2\n"
-"compression library."
-msgstr ""
-
-#: gnu/packages/compression.scm:706
-msgid "Low-level interface to zlib compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:707
-msgid ""
-"This module provides a Perl interface to the zlib\n"
-"compression library."
-msgstr ""
-
-#: gnu/packages/compression.scm:728
-msgid "IO Interface to compressed files/buffers"
-msgstr ""
-
-#: gnu/packages/compression.scm:729
-msgid ""
-"IO-Compress provides a Perl interface to allow reading and\n"
-"writing of compressed data created with the zlib and bzip2 libraries."
-msgstr ""
-
-#: gnu/packages/compression.scm:755
+#: gnu/packages/compression.scm:727
 msgid "Compression algorithm focused on speed"
 msgstr ""
 
-#: gnu/packages/compression.scm:756
+#: gnu/packages/compression.scm:728
 msgid ""
 "LZ4 is a lossless compression algorithm, providing\n"
 "compression speed at 400 MB/s per core (0.16 Bytes/cycle).  It also features an\n"
@@ -2109,30 +2096,11 @@ msgid ""
 "time for compression ratio."
 msgstr ""
 
-#: gnu/packages/compression.scm:781
-msgid "LZ4 bindings for Python"
-msgstr "Liaisons LZ4 pour Python"
-
-#: gnu/packages/compression.scm:783
-msgid ""
-"This package provides python bindings for the lz4 compression library\n"
-"by Yann Collet.  The project contains bindings for the LZ4 block format and\n"
-"the LZ4 frame format."
-msgstr ""
-
-#: gnu/packages/compression.scm:806
-msgid "String compression"
-msgstr ""
-
-#: gnu/packages/compression.scm:807
-msgid "Lz-string is a string compressor library for Python."
-msgstr ""
-
-#: gnu/packages/compression.scm:845
+#: gnu/packages/compression.scm:777
 msgid "Tools to create and extract squashfs file systems"
 msgstr ""
 
-#: gnu/packages/compression.scm:847
+#: gnu/packages/compression.scm:779
 msgid ""
 "Squashfs is a highly compressed read-only file system for Linux.  It uses\n"
 "zlib to compress files, inodes, and directories.  All blocks are packed to\n"
@@ -2142,21 +2110,21 @@ msgid ""
 "extract such file systems."
 msgstr ""
 
-#: gnu/packages/compression.scm:901
+#: gnu/packages/compression.scm:833
 msgid "Parallel implementation of gzip"
 msgstr ""
 
-#: gnu/packages/compression.scm:903
+#: gnu/packages/compression.scm:835
 msgid ""
 "This package provides a parallel implementation of gzip that exploits\n"
 "multiple processors and multiple cores when compressing data."
 msgstr ""
 
-#: gnu/packages/compression.scm:927
+#: gnu/packages/compression.scm:859
 msgid "Parallel indexing implementation of LZMA"
 msgstr ""
 
-#: gnu/packages/compression.scm:929
+#: gnu/packages/compression.scm:861
 msgid ""
 "The existing XZ Utils provide great compression in the .xz file format,\n"
 "but they produce just one big block of compressed data.  Pixz instead produces\n"
@@ -2165,11 +2133,11 @@ msgid ""
 "tarballs."
 msgstr ""
 
-#: gnu/packages/compression.scm:971
+#: gnu/packages/compression.scm:903
 msgid "Implementation of the Brotli compression algorithm"
 msgstr ""
 
-#: gnu/packages/compression.scm:973
+#: gnu/packages/compression.scm:905
 msgid ""
 "Brotli is a general-purpose lossless compression algorithm.  It is\n"
 "similar in speed to deflate but offers denser compression.  This package\n"
@@ -2177,11 +2145,11 @@ msgid ""
 "respectively, based on the reference implementation from Google."
 msgstr ""
 
-#: gnu/packages/compression.scm:1007
+#: gnu/packages/compression.scm:939
 msgid "Patch binary files"
 msgstr ""
 
-#: gnu/packages/compression.scm:1009
+#: gnu/packages/compression.scm:941
 msgid ""
 "@command{bsdiff} and @command{bspatch} are tools for building and\n"
 "applying patches to binary files.  By using suffix sorting (specifically\n"
@@ -2190,19 +2158,19 @@ msgid ""
 "smaller than those produced by @code{Xdelta}."
 msgstr ""
 
-#: gnu/packages/compression.scm:1055
+#: gnu/packages/compression.scm:987
 msgid "Tool to unpack Cabinet archives"
 msgstr ""
 
-#: gnu/packages/compression.scm:1056
+#: gnu/packages/compression.scm:988
 msgid "Extracts files out of Microsoft Cabinet (.cab) archives"
 msgstr ""
 
-#: gnu/packages/compression.scm:1089
+#: gnu/packages/compression.scm:1021
 msgid "Delta encoder for binary files"
 msgstr ""
 
-#: gnu/packages/compression.scm:1090
+#: gnu/packages/compression.scm:1022
 msgid ""
 "xdelta encodes only the differences between two binary files\n"
 "using the VCDIFF algorithm and patch file format described in RFC 3284.  It can\n"
@@ -2211,11 +2179,11 @@ msgid ""
 "human-readable output."
 msgstr ""
 
-#: gnu/packages/compression.scm:1123
+#: gnu/packages/compression.scm:1055
 msgid "Large file compressor with a very high compression ratio"
 msgstr ""
 
-#: gnu/packages/compression.scm:1124
+#: gnu/packages/compression.scm:1056
 msgid ""
 "lrzip is a compression utility that uses long-range\n"
 "redundancy reduction to improve the subsequent compression ratio of\n"
@@ -2226,22 +2194,11 @@ msgid ""
 "well as bzip2."
 msgstr ""
 
-#: gnu/packages/compression.scm:1154
-msgid "Filter for improving compression of typed binary data"
-msgstr ""
-
-#: gnu/packages/compression.scm:1155
-msgid ""
-"Bitshuffle is an algorithm that rearranges typed, binary data\n"
-"for improving compression, as well as a python/C package that implements this\n"
-"algorithm within the Numpy framework."
-msgstr ""
-
-#: gnu/packages/compression.scm:1176
+#: gnu/packages/compression.scm:1083
 msgid "Fast compressor/decompressor"
 msgstr ""
 
-#: gnu/packages/compression.scm:1177
+#: gnu/packages/compression.scm:1084
 msgid ""
 "Snappy is a compression/decompression library.  It does not\n"
 "aim for maximum compression, or compatibility with any other compression library;\n"
@@ -2251,63 +2208,31 @@ msgid ""
 "100% bigger."
 msgstr ""
 
-#: gnu/packages/compression.scm:1306
-msgid "Compression/decompression algorithm in Java"
-msgstr ""
-
-#: gnu/packages/compression.scm:1307
-msgid ""
-"Snappy-java is a Java port of snappy, a fast C++\n"
-"compressor/decompressor."
-msgstr ""
-
-#: gnu/packages/compression.scm:1412
-msgid "Java port of the Snappy (de)compressor"
-msgstr ""
-
-#: gnu/packages/compression.scm:1414
-msgid ""
-"Iq80-snappy is a port of the Snappy compressor and decompressor rewritten\n"
-"in pure Java.  This compression code produces a byte-for-byte exact copy of the\n"
-"output created by the original C++ code, and is extremely fast."
-msgstr ""
-
-#: gnu/packages/compression.scm:1453
-msgid "Java bzip2 compression/decompression library"
-msgstr "Bibliothèque de compression et décompression bzip2 pour Java"
-
-#: gnu/packages/compression.scm:1454
-msgid ""
-"Jbzip2 is a Java bzip2 compression/decompression library.\n"
-"It can be used as a replacement for the Apache @code{CBZip2InputStream} /\n"
-"@code{CBZip2OutputStream} classes."
-msgstr ""
-
-#: gnu/packages/compression.scm:1520
+#: gnu/packages/compression.scm:1153
 msgid "Command-line file archiver with high compression ratio"
 msgstr ""
 
-#: gnu/packages/compression.scm:1521
+#: gnu/packages/compression.scm:1154
 msgid ""
 "p7zip is a command-line port of 7-Zip, a file archiver that\n"
 "handles the 7z format which features very high compression ratios."
 msgstr ""
 
-#: gnu/packages/compression.scm:1562
+#: gnu/packages/compression.scm:1195
 msgid "Compressed C++ iostream"
 msgstr ""
 
-#: gnu/packages/compression.scm:1563
+#: gnu/packages/compression.scm:1196
 msgid ""
 "gzstream is a small library for providing zlib\n"
 "functionality in a C++ iostream."
 msgstr ""
 
-#: gnu/packages/compression.scm:1612
+#: gnu/packages/compression.scm:1245
 msgid "Incremental journaling archiver"
 msgstr ""
 
-#: gnu/packages/compression.scm:1613
+#: gnu/packages/compression.scm:1246
 msgid ""
 "ZPAQ is a command-line archiver for realistic situations with\n"
 "many duplicate and already compressed files.  It backs up only those files\n"
@@ -2321,21 +2246,21 @@ msgid ""
 "or junctions, and always follows hard links."
 msgstr ""
 
-#: gnu/packages/compression.scm:1695
+#: gnu/packages/compression.scm:1345
 msgid "Extract CAB files from InstallShield installers"
 msgstr ""
 
-#: gnu/packages/compression.scm:1697
+#: gnu/packages/compression.scm:1347
 msgid ""
 "@command{unshield} is a tool and library for extracting @file{.cab}\n"
 " archives from InstallShield installers."
 msgstr ""
 
-#: gnu/packages/compression.scm:1727
+#: gnu/packages/compression.scm:1377
 msgid "Zstandard real-time compression algorithm"
 msgstr ""
 
-#: gnu/packages/compression.scm:1728
+#: gnu/packages/compression.scm:1378
 msgid ""
 "Zstandard (@command{zstd}) is a lossless compression algorithm\n"
 "that combines very fast operation with a compression ratio comparable to that of\n"
@@ -2345,11 +2270,11 @@ msgid ""
 "speed."
 msgstr ""
 
-#: gnu/packages/compression.scm:1770
+#: gnu/packages/compression.scm:1420
 msgid "Threaded implementation of the Zstandard compression algorithm"
 msgstr ""
 
-#: gnu/packages/compression.scm:1771
+#: gnu/packages/compression.scm:1421
 msgid ""
 "Parallel Zstandard (PZstandard or @command{pzstd}) is a\n"
 "multi-threaded implementation of the @uref{http://zstd.net/, Zstandard\n"
@@ -2362,11 +2287,11 @@ msgid ""
 "the actual decompression, the other input and output."
 msgstr ""
 
-#: gnu/packages/compression.scm:1809
+#: gnu/packages/compression.scm:1459
 msgid "Compression and file packing utility"
 msgstr "Utilitaire de compression et de paquetage de fichiers"
 
-#: gnu/packages/compression.scm:1811
+#: gnu/packages/compression.scm:1461
 msgid ""
 "Zip is a compression and file packaging/archive utility.  Zip is useful\n"
 "for packaging a set of files for distribution, for archiving files, and for\n"
@@ -2394,11 +2319,11 @@ msgstr ""
 "pour chaque fichier.Des ratios de compression de 2 à 3 sont généralement\n"
 "atteignables pour les fichiers texte."
 
-#: gnu/packages/compression.scm:1873
+#: gnu/packages/compression.scm:1523
 msgid "Decompression and file extraction utility"
 msgstr "Utilitaire de décompression et d'extraction de fichiers"
 
-#: gnu/packages/compression.scm:1875
+#: gnu/packages/compression.scm:1525
 msgid ""
 "UnZip is an extraction utility for archives compressed in .zip format,\n"
 "also called \"zipfiles\".\n"
@@ -2415,31 +2340,19 @@ msgstr ""
 "vers le répertoire courant et ses sous-répertoires. Unzip recrée par défaut la\n"
 "structure des répertoires contenus dans l'archive."
 
-#: gnu/packages/compression.scm:1906
+#: gnu/packages/compression.scm:1556
 msgid "Library for accessing zip files"
 msgstr "Bibliothèque de manipulation des fichiers zip"
 
-#: gnu/packages/compression.scm:1908
+#: gnu/packages/compression.scm:1558
 msgid "ZZipLib is a library based on zlib for accessing zip files."
 msgstr "ZZipLib est une bibliothèque basée sur zlip pour la manipulation de fichiers zip."
 
-#: gnu/packages/compression.scm:1930
-msgid "Provides an interface to Zip archive files"
-msgstr "Fournit une interface pour les fichiers d'archives ZIP"
-
-#: gnu/packages/compression.scm:1931
-msgid ""
-"The @code{Archive::Zip} module allows a Perl program to\n"
-"create, manipulate, read, and write Zip archive files."
-msgstr ""
-"Le module @code{Archive::Zip} permet à un programme Perl de créer,\n"
-"manipuler, lire et écrire des fichiers d'archives Zip."
-
-#: gnu/packages/compression.scm:1953
+#: gnu/packages/compression.scm:1580
 msgid "C library for reading, creating, and modifying zip archives"
 msgstr ""
 
-#: gnu/packages/compression.scm:1954
+#: gnu/packages/compression.scm:1581
 msgid ""
 "Libzip is a C library for reading, creating, and modifying\n"
 "zip archives.  Files can be added from data buffers, files, or compressed data\n"
@@ -2447,11 +2360,11 @@ msgid ""
 "archive can be reverted."
 msgstr ""
 
-#: gnu/packages/compression.scm:1987
+#: gnu/packages/compression.scm:1614
 msgid "Universal tool to manage file archives of various types"
 msgstr ""
 
-#: gnu/packages/compression.scm:1988
+#: gnu/packages/compression.scm:1615
 msgid ""
 "The main command is @command{aunpack} which extracts files\n"
 "from an archive.  The other commands provided are @command{apack} (to create\n"
@@ -2461,33 +2374,11 @@ msgid ""
 "of archives."
 msgstr ""
 
-#: gnu/packages/compression.scm:2010
-msgid "Generic archive extracting mechanism"
-msgstr ""
-
-#: gnu/packages/compression.scm:2011
-msgid ""
-"It allows you to extract any archive file of the type .tar,\n"
-".tar.gz, .gz, .Z, tar.bz2, .tbz, .bz2, .zip, .xz,, .txz, .tar.xz or .lzma\n"
-"without having to worry how it does so, or use different interfaces for each\n"
-"type by using either Perl modules, or command-line tools on your system."
-msgstr ""
-
-#: gnu/packages/compression.scm:2047
-msgid "XZ in Java"
-msgstr ""
-
-#: gnu/packages/compression.scm:2048
-msgid ""
-"Tukaani-xz is an implementation of xz compression/decompression\n"
-"algorithms in Java."
-msgstr ""
-
-#: gnu/packages/compression.scm:2068
+#: gnu/packages/compression.scm:1639
 msgid "Small, stand-alone lzip decompressor"
 msgstr ""
 
-#: gnu/packages/compression.scm:2070
+#: gnu/packages/compression.scm:1641
 msgid ""
 "Lunzip is a decompressor for files in the lzip compression format (.lz),\n"
 "written as a single small C tool with no dependencies.  This makes it\n"
@@ -2497,11 +2388,11 @@ msgid ""
 "Lunzip is intended to be fully compatible with the regular lzip package."
 msgstr ""
 
-#: gnu/packages/compression.scm:2095
+#: gnu/packages/compression.scm:1666
 msgid "Small, stand-alone lzip compressor and decompressor"
 msgstr "Compresseur et décompresseur lzip léger et autonome"
 
-#: gnu/packages/compression.scm:2097
+#: gnu/packages/compression.scm:1668
 msgid ""
 "Clzip is a compressor and decompressor for files in the lzip compression\n"
 "format (.lz), written as a single small C tool with no dependencies.  This makes\n"
@@ -2510,11 +2401,11 @@ msgid ""
 "Clzip is intended to be fully compatible with the regular lzip package."
 msgstr ""
 
-#: gnu/packages/compression.scm:2124
+#: gnu/packages/compression.scm:1693
 msgid "Lzip data compression C library"
 msgstr "Bibliothèque C de compression lzip"
 
-#: gnu/packages/compression.scm:2126
+#: gnu/packages/compression.scm:1695
 msgid ""
 "Lzlib is a C library for in-memory LZMA compression and decompression in\n"
 "the lzip format.  It supports integrity checking of the decompressed data, and\n"
@@ -2522,11 +2413,11 @@ msgid ""
 "corrupted input."
 msgstr ""
 
-#: gnu/packages/compression.scm:2148
+#: gnu/packages/compression.scm:1717
 msgid "Parallel lossless data compressor for the lzip format"
 msgstr ""
 
-#: gnu/packages/compression.scm:2150
+#: gnu/packages/compression.scm:1719
 msgid ""
 "Plzip is a massively parallel (multi-threaded) lossless data compressor\n"
 "and decompressor that uses the lzip file format (.lz).  Files produced by plzip\n"
@@ -2540,21 +2431,21 @@ msgid ""
 "single-member files which can't be decompressed in parallel."
 msgstr ""
 
-#: gnu/packages/compression.scm:2184
+#: gnu/packages/compression.scm:1753
 msgid "Tool for extracting Inno Setup installers"
 msgstr ""
 
-#: gnu/packages/compression.scm:2185
+#: gnu/packages/compression.scm:1754
 msgid ""
 "innoextract allows extracting Inno Setup installers under\n"
 "non-Windows systems without running the actual installer using wine."
 msgstr ""
 
-#: gnu/packages/compression.scm:2221
+#: gnu/packages/compression.scm:1792
 msgid "General-purpose lossless compression"
 msgstr ""
 
-#: gnu/packages/compression.scm:2222
+#: gnu/packages/compression.scm:1793
 msgid ""
 "This package provides the reference implementation of Brotli,\n"
 "a generic-purpose lossless compression algorithm that compresses data using a\n"
@@ -2566,11 +2457,11 @@ msgid ""
 "The specification of the Brotli Compressed Data Format is defined in RFC 7932."
 msgstr ""
 
-#: gnu/packages/compression.scm:2245
+#: gnu/packages/compression.scm:1816
 msgid "Portable lossless data compression library"
 msgstr "Bibliothèque de compression de données sans perte portable"
 
-#: gnu/packages/compression.scm:2246
+#: gnu/packages/compression.scm:1817
 msgid ""
 "UCL implements a number of compression algorithms that\n"
 "achieve an excellent compression ratio while allowing fast decompression.\n"
@@ -2580,11 +2471,11 @@ msgid ""
 "decompression is a little bit slower."
 msgstr ""
 
-#: gnu/packages/compression.scm:2302
+#: gnu/packages/compression.scm:1873
 msgid "Compression tool for executables"
 msgstr "Outil de compression pour les exécutables"
 
-#: gnu/packages/compression.scm:2304
+#: gnu/packages/compression.scm:1875
 msgid ""
 "The Ultimate Packer for eXecutables (UPX) is an executable file\n"
 "compressor.  UPX typically reduces the file size of programs and shared\n"
@@ -2592,88 +2483,64 @@ msgid ""
 "download times, and other distribution and storage costs."
 msgstr ""
 
-#: gnu/packages/databases.scm:159
+#: gnu/packages/databases.scm:160
 msgid "Clustered RDF storage and query engine"
 msgstr ""
 
-#: gnu/packages/databases.scm:160
+#: gnu/packages/databases.scm:161
 msgid ""
 "4store is a RDF/SPARQL store written in C, supporting\n"
 "either single machines or networked clusters."
 msgstr ""
 
-#: gnu/packages/databases.scm:179
-msgid "Hash library of database functions compatible with traditional dbm"
-msgstr ""
-
-#: gnu/packages/databases.scm:181
-msgid ""
-"GDBM is a library for manipulating hashed databases.  It is used to\n"
-"store key/value pairs in a file in a manner similar to the Unix dbm library\n"
-"and provides interfaces to the traditional file format."
-msgstr ""
-
-#: gnu/packages/databases.scm:222
+#: gnu/packages/databases.scm:203
 msgid "@code{mgo} offers a rich MongoDB driver for Go."
 msgstr ""
 
-#: gnu/packages/databases.scm:224
+#: gnu/packages/databases.scm:205
 msgid ""
 "@code{mgo} (pronounced as mango) is a MongoDB driver for the Go language.\n"
 "It implements a rich selection of features under a simple API following\n"
 "standard Go idioms."
 msgstr ""
 
-#: gnu/packages/databases.scm:274
-msgid "Berkeley database"
-msgstr "Base de données Berkeley"
-
-#: gnu/packages/databases.scm:276
-msgid ""
-"Berkeley DB is an embeddable database allowing developers the choice of\n"
-"SQL, Key/Value, XML/XQuery or Java Object storage for their data model."
-msgstr ""
-"Berkeley DB est une base de données embarquée proposant aux développeurs\n"
-"le choix de SQL, clé/valeur, XML/XQuery ou Java Object Storage pour leur\n"
-"modèle de données."
-
-#: gnu/packages/databases.scm:353
+#: gnu/packages/databases.scm:231
 msgid "Utility for dumping and restoring ElasticSearch indexes"
 msgstr ""
 
-#: gnu/packages/databases.scm:355
+#: gnu/packages/databases.scm:233
 msgid ""
 "This package provides a utility for dumping the contents of an\n"
 "ElasticSearch index to a compressed file and restoring the dumpfile back to an\n"
 "ElasticSearch server"
 msgstr ""
 
-#: gnu/packages/databases.scm:393
+#: gnu/packages/databases.scm:258
 msgid "Fast key-value storage library"
 msgstr ""
 
-#: gnu/packages/databases.scm:395
+#: gnu/packages/databases.scm:260
 msgid ""
 "LevelDB is a fast key-value storage library that provides an ordered\n"
 "mapping from string keys to string values."
 msgstr ""
 
-#: gnu/packages/databases.scm:416
+#: gnu/packages/databases.scm:280
 msgid "In-memory caching service"
 msgstr ""
 
-#: gnu/packages/databases.scm:417
+#: gnu/packages/databases.scm:281
 msgid ""
 "Memcached is an in-memory key-value store.  It has a small\n"
 "and generic API, and was originally intended for use with dynamic web\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/databases.scm:541
+#: gnu/packages/databases.scm:404
 msgid "High performance and high availability document database"
 msgstr ""
 
-#: gnu/packages/databases.scm:543
+#: gnu/packages/databases.scm:406
 msgid ""
 "Mongo is a high-performance, high availability, schema-free\n"
 "document-oriented database.  A key goal of MongoDB is to bridge the gap\n"
@@ -2681,11 +2548,11 @@ msgid ""
 "RDBMS systems (which are deep in functionality)."
 msgstr ""
 
-#: gnu/packages/databases.scm:613
+#: gnu/packages/databases.scm:476
 msgid "Fast, easy to use, and popular database"
 msgstr "Base de données rapide, facile d'utilisation et populaire"
 
-#: gnu/packages/databases.scm:615
+#: gnu/packages/databases.scm:478
 msgid ""
 "MySQL is a fast, reliable, and easy to use relational database\n"
 "management system that supports the standardized Structured Query\n"
@@ -2694,21 +2561,21 @@ msgstr ""
 "MySQL est un système de gestion de base de données relationnelle rapide,\n"
 " fiable et facile d'emploi, supportant le SQL standardisé."
 
-#: gnu/packages/databases.scm:797
+#: gnu/packages/databases.scm:666
 msgid "SQL database server"
 msgstr ""
 
-#: gnu/packages/databases.scm:799
+#: gnu/packages/databases.scm:668
 msgid ""
 "MariaDB is a multi-user and multi-threaded SQL database server, designed\n"
 "as a drop-in replacement of MySQL."
 msgstr ""
 
-#: gnu/packages/databases.scm:838
+#: gnu/packages/databases.scm:708
 msgid "Powerful object-relational database system"
 msgstr "Système de base de données relationnelle puissant"
 
-#: gnu/packages/databases.scm:840
+#: gnu/packages/databases.scm:710
 msgid ""
 "PostgreSQL is a powerful object-relational database system.  It is fully\n"
 "ACID compliant, has full support for foreign keys, joins, views, triggers, and\n"
@@ -2724,21 +2591,21 @@ msgstr ""
 "INTERVAL et TIMESTAMP. Il supporte aussi le stockage binaire de grands objets, dont\n"
 "les images, le son et la vidéo."
 
-#: gnu/packages/databases.scm:880
+#: gnu/packages/databases.scm:749
 msgid "Pure-Python MySQL driver"
 msgstr ""
 
-#: gnu/packages/databases.scm:882
+#: gnu/packages/databases.scm:751
 msgid ""
 "PyMySQL is a pure-Python MySQL client library, based on PEP 249.\n"
 "Most public APIs are compatible with @command{mysqlclient} and MySQLdb."
 msgstr ""
 
-#: gnu/packages/databases.scm:907
+#: gnu/packages/databases.scm:776
 msgid "Key-value database"
 msgstr "Base de données clef-valeur"
 
-#: gnu/packages/databases.scm:908
+#: gnu/packages/databases.scm:777
 msgid ""
 "QDBM is a library of routines for managing a\n"
 "database.  The database is a simple data file containing key-value\n"
@@ -2748,11 +2615,11 @@ msgid ""
 "organized in a hash table or B+ tree."
 msgstr ""
 
-#: gnu/packages/databases.scm:963
+#: gnu/packages/databases.scm:813
 msgid "Manipulate plain text files as databases"
 msgstr "Manipule les fichiers texte comme des bases de données"
 
-#: gnu/packages/databases.scm:965
+#: gnu/packages/databases.scm:815
 msgid ""
 "GNU Recutils is a set of tools and libraries for creating and\n"
 "manipulating text-based, human-editable databases.  Despite being text-based,\n"
@@ -2767,11 +2634,11 @@ msgstr ""
 "les timestamps et plus encore. De nombreux types de champs sont supportés, tout comme\n"
 "le chiffrement."
 
-#: gnu/packages/databases.scm:1061
+#: gnu/packages/databases.scm:912
 msgid "Persistent key-value store for fast storage"
 msgstr ""
 
-#: gnu/packages/databases.scm:1063
+#: gnu/packages/databases.scm:914
 msgid ""
 "RocksDB is a library that forms the core building block for a fast\n"
 "key-value server, especially suited for storing data on flash drives.  It\n"
@@ -2782,14 +2649,14 @@ msgid ""
 "data in a single database.  RocksDB is partially based on @code{LevelDB}."
 msgstr ""
 
-#: gnu/packages/databases.scm:1123
+#: gnu/packages/databases.scm:974
 msgid "Command-line tool for accessing SPARQL endpoints over HTTP"
 msgstr ""
 
-#: gnu/packages/databases.scm:1124
+#: gnu/packages/databases.scm:975
 msgid ""
 "Sparql-query is a command-line tool for accessing SPARQL\n"
-"endpoints over HTTP.  It has been intentionally designed to 'feel' similar to\n"
+"endpoints over HTTP.  It has been intentionally designed to @code{feel} similar to\n"
 "tools for interrogating SQL databases.  For example, you can enter a query over\n"
 "several lines, using a semi-colon at the end of a line to indicate the end of\n"
 "your query.  It also supports readline so that you can more easily recall and\n"
@@ -2797,11 +2664,11 @@ msgid ""
 "for example from a shell script."
 msgstr ""
 
-#: gnu/packages/databases.scm:1158
+#: gnu/packages/databases.scm:1009
 msgid "Text console-based database viewer and editor"
 msgstr ""
 
-#: gnu/packages/databases.scm:1160
+#: gnu/packages/databases.scm:1011
 msgid ""
 "SQLcrush lets you view and edit a database directly from the text\n"
 "console through an ncurses interface.  You can explore each table's structure,\n"
@@ -2809,27 +2676,11 @@ msgid ""
 "changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:1197
-msgid "The SQLite database management system"
-msgstr "Le système de gestion de bases de données SQLite"
-
-#: gnu/packages/databases.scm:1199
-msgid ""
-"SQLite is a software library that implements a self-contained, serverless,\n"
-"zero-configuration, transactional SQL database engine.  SQLite is the most\n"
-"widely deployed SQL database engine in the world.  The source code for SQLite\n"
-"is in the public domain."
-msgstr ""
-"SQLite est une bibliothèque logicielle implémantant un moteur de bases\n"
-"de données SQL indépendant, sans serveur, sans configuration et transactionnel.\n"
-"SQLite est le moteur de bases de données SQL le plus déployé de part le monde.\n"
-"Le code source de SQLite est dans le domaine public."
-
-#: gnu/packages/databases.scm:1255
+#: gnu/packages/databases.scm:1047
 msgid "Trivial database"
 msgstr "Base de données triviale"
 
-#: gnu/packages/databases.scm:1257
+#: gnu/packages/databases.scm:1049
 msgid ""
 "TDB is a Trivial Database.  In concept, it is very much like GDBM,\n"
 "and BSD's DB except that it allows multiple simultaneous writers and uses\n"
@@ -2841,19 +2692,19 @@ msgstr ""
 "accès simultanés en écriture et utilise un verrouillage interne pour éviter les\n"
 "empiétements. Notez que TDB est aussi très léger."
 
-#: gnu/packages/databases.scm:1276
+#: gnu/packages/databases.scm:1068
 msgid "Database independent interface for Perl"
 msgstr "Interface de base de données pour Perl"
 
-#: gnu/packages/databases.scm:1277
+#: gnu/packages/databases.scm:1069
 msgid "This package provides an database interface for Perl."
 msgstr "Ce paquet fournit une interface de base de données pour Perl."
 
-#: gnu/packages/databases.scm:1325
+#: gnu/packages/databases.scm:1117
 msgid "Extensible and flexible object <-> relational mapper"
 msgstr ""
 
-#: gnu/packages/databases.scm:1326
+#: gnu/packages/databases.scm:1118
 msgid ""
 "An SQL to OO mapper with an object API inspired by\n"
 "Class::DBI (with a compatibility layer as a springboard for porting) and a\n"
@@ -2865,21 +2716,21 @@ msgid ""
 "\"ORDER BY\" and \"HAVING\" support."
 msgstr ""
 
-#: gnu/packages/databases.scm:1357
+#: gnu/packages/databases.scm:1149
 msgid "Cursor with built-in caching support"
 msgstr ""
 
-#: gnu/packages/databases.scm:1358
+#: gnu/packages/databases.scm:1150
 msgid ""
 "DBIx::Class::Cursor::Cached provides a cursor class with\n"
 "built-in caching support."
 msgstr ""
 
-#: gnu/packages/databases.scm:1380
+#: gnu/packages/databases.scm:1172
 msgid "Introspect many-to-many relationships"
 msgstr ""
 
-#: gnu/packages/databases.scm:1381
+#: gnu/packages/databases.scm:1173
 msgid ""
 "Because the many-to-many relationships are not real\n"
 "relationships, they can not be introspected with DBIx::Class.  Many-to-many\n"
@@ -2889,22 +2740,22 @@ msgid ""
 "introspected and examined."
 msgstr ""
 
-#: gnu/packages/databases.scm:1439
+#: gnu/packages/databases.scm:1231
 msgid "Create a DBIx::Class::Schema based on a database"
 msgstr ""
 
-#: gnu/packages/databases.scm:1440
+#: gnu/packages/databases.scm:1232
 msgid ""
 "DBIx::Class::Schema::Loader automates the definition of a\n"
 "DBIx::Class::Schema by scanning database table definitions and setting up the\n"
 "columns, primary keys, unique constraints and relationships."
 msgstr ""
 
-#: gnu/packages/databases.scm:1464
+#: gnu/packages/databases.scm:1256
 msgid "DBI PostgreSQL interface"
 msgstr "Interface DBI PostgreSQL"
 
-#: gnu/packages/databases.scm:1465
+#: gnu/packages/databases.scm:1257
 msgid ""
 "This package provides a PostgreSQL driver for the Perl5\n"
 "@dfn{Database Interface} (DBI)."
@@ -2912,11 +2763,11 @@ msgstr ""
 "Ce paquet fournit un pilote PostgreSQL pour la @dfn{Database Interface}\n"
 "(DBI) de Perl5."
 
-#: gnu/packages/databases.scm:1502
+#: gnu/packages/databases.scm:1293
 msgid "DBI MySQL interface"
 msgstr "Interface DBI MySQL"
 
-#: gnu/packages/databases.scm:1503
+#: gnu/packages/databases.scm:1294
 msgid ""
 "This package provides a MySQL driver for the Perl5\n"
 "@dfn{Database Interface} (DBI)."
@@ -2924,11 +2775,11 @@ msgstr ""
 "Ce paquet fournit un pilote MySQL pour la @dfn{Database Interface}\n"
 "(DBI) de Perl5."
 
-#: gnu/packages/databases.scm:1522
+#: gnu/packages/databases.scm:1313
 msgid "SQlite interface for Perl"
 msgstr "Interface SQLite pour Perl"
 
-#: gnu/packages/databases.scm:1523
+#: gnu/packages/databases.scm:1314
 msgid ""
 "DBD::SQLite is a Perl DBI driver for SQLite, that includes\n"
 "the entire thing in the distribution.  So in order to get a fast transaction\n"
@@ -2939,11 +2790,11 @@ msgstr ""
 "de la distribution.  Donc il suffit d'installer ce module dans votre projet\n"
 "pour obtenir un RDBMS capable de transactions rapides et rien d'autre."
 
-#: gnu/packages/databases.scm:1554
+#: gnu/packages/databases.scm:1344
 msgid "Generate SQL from Perl data structures"
 msgstr ""
 
-#: gnu/packages/databases.scm:1555
+#: gnu/packages/databases.scm:1345
 msgid ""
 "This module was inspired by the excellent DBIx::Abstract.\n"
 "While based on the concepts used by DBIx::Abstract, the concepts used have\n"
@@ -2953,32 +2804,32 @@ msgid ""
 "time your data changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:1584
+#: gnu/packages/databases.scm:1374
 msgid "Split SQL code into atomic statements"
 msgstr ""
 
-#: gnu/packages/databases.scm:1585
+#: gnu/packages/databases.scm:1375
 msgid ""
 "This module tries to split any SQL code, even including\n"
 "non-standard extensions, into the atomic statements it is composed of."
 msgstr ""
 
-#: gnu/packages/databases.scm:1603
+#: gnu/packages/databases.scm:1393
 msgid "SQL tokenizer"
 msgstr ""
 
-#: gnu/packages/databases.scm:1604
+#: gnu/packages/databases.scm:1394
 msgid ""
 "SQL::Tokenizer is a tokenizer for SQL queries.  It does not\n"
 "claim to be a parser or query verifier.  It just creates sane tokens from a\n"
 "valid SQL query."
 msgstr ""
 
-#: gnu/packages/databases.scm:1622
+#: gnu/packages/databases.scm:1412
 msgid "Data source abstraction library"
 msgstr "Bibliothèque d'abstraction de source de données"
 
-#: gnu/packages/databases.scm:1623
+#: gnu/packages/databases.scm:1413
 msgid ""
 "Unixodbc is a library providing an API with which to access\n"
 "data sources.  Data sources include SQL Servers and any software with an ODBC\n"
@@ -2988,11 +2839,11 @@ msgstr ""
 "d'accéder à des sources de données. Ces sources incluent des serveurs SQL\n"
 "où tout logiciel avec un driver ODBC."
 
-#: gnu/packages/databases.scm:1647
+#: gnu/packages/databases.scm:1437
 msgid "In-memory key/value and document store"
 msgstr ""
 
-#: gnu/packages/databases.scm:1649
+#: gnu/packages/databases.scm:1439
 msgid ""
 "UnQLite is an in-process software library which implements a\n"
 "self-contained, serverless, zero-configuration, transactional NoSQL\n"
@@ -3001,33 +2852,33 @@ msgid ""
 "similar to BerkeleyDB, LevelDB, etc."
 msgstr ""
 
-#: gnu/packages/databases.scm:1677
+#: gnu/packages/databases.scm:1467
 msgid "Key-value cache and store"
 msgstr ""
 
-#: gnu/packages/databases.scm:1678
+#: gnu/packages/databases.scm:1468
 msgid ""
 "Redis is an advanced key-value cache and store.  Redis\n"
 "supports many data structures including strings, hashes, lists, sets, sorted\n"
 "sets, bitmaps and hyperloglogs."
 msgstr ""
 
-#: gnu/packages/databases.scm:1705
+#: gnu/packages/databases.scm:1495
 msgid "Kyoto Cabinet is a modern implementation of the DBM database"
 msgstr ""
 
-#: gnu/packages/databases.scm:1707
+#: gnu/packages/databases.scm:1497
 msgid ""
 "Kyoto Cabinet is a standalone file-based database that supports Hash\n"
 "and B+ Tree data storage models.  It is a fast key-value lightweight\n"
 "database and supports many programming languages.  It is a NoSQL database."
 msgstr ""
 
-#: gnu/packages/databases.scm:1733
+#: gnu/packages/databases.scm:1523
 msgid "Tokyo Cabinet is a modern implementation of the DBM database"
 msgstr ""
 
-#: gnu/packages/databases.scm:1735
+#: gnu/packages/databases.scm:1525
 msgid ""
 "Tokyo Cabinet is a library of routines for managing a database.\n"
 "The database is a simple data file containing records, each is a pair of a\n"
@@ -3037,11 +2888,11 @@ msgid ""
 "organized in hash table, B+ tree, or fixed-length array."
 msgstr ""
 
-#: gnu/packages/databases.scm:1771
+#: gnu/packages/databases.scm:1561
 msgid "NoSQL data engine"
 msgstr ""
 
-#: gnu/packages/databases.scm:1773
+#: gnu/packages/databases.scm:1563
 msgid ""
 "WiredTiger is an extensible platform for data management.  It supports\n"
 "row-oriented storage (where all columns of a row are stored together),\n"
@@ -3050,11 +2901,11 @@ msgid ""
 "trees (LSM), for sustained throughput under random insert workloads."
 msgstr ""
 
-#: gnu/packages/databases.scm:1824
+#: gnu/packages/databases.scm:1614
 msgid "WiredTiger bindings for GNU Guile"
 msgstr "Liaisons WiredTiger pour GNU Guile"
 
-#: gnu/packages/databases.scm:1826
+#: gnu/packages/databases.scm:1616
 msgid ""
 "This package provides Guile bindings to the WiredTiger ``NoSQL''\n"
 "database."
@@ -3062,19 +2913,19 @@ msgstr ""
 "Ce paquet fournit les liaisons Guile pour le système de base de données « NoSQL »\n"
 "WiredTiger."
 
-#: gnu/packages/databases.scm:1858
+#: gnu/packages/databases.scm:1648
 msgid "Perl5 access to Berkeley DB version 1.x"
 msgstr ""
 
-#: gnu/packages/databases.scm:1860
+#: gnu/packages/databases.scm:1650
 msgid "The DB::File module provides Perl bindings to the Berkeley DB version 1.x."
 msgstr ""
 
-#: gnu/packages/databases.scm:1887
+#: gnu/packages/databases.scm:1678
 msgid "Lightning Memory-Mapped Database library"
 msgstr ""
 
-#: gnu/packages/databases.scm:1889
+#: gnu/packages/databases.scm:1680
 msgid ""
 "The @dfn{Lightning Memory-Mapped Database} (LMDB) is a high-performance\n"
 "transactional database.  Unlike more complex relational databases, LMDB handles\n"
@@ -3087,22 +2938,22 @@ msgid ""
 "virtual address space — not physical RAM."
 msgstr ""
 
-#: gnu/packages/databases.scm:1926
+#: gnu/packages/databases.scm:1717
 msgid "C++ connector for PostgreSQL"
 msgstr ""
 
-#: gnu/packages/databases.scm:1928
+#: gnu/packages/databases.scm:1719
 msgid ""
 "Libpqxx is a C++ library to enable user programs to communicate with the\n"
 "PostgreSQL database back-end.  The database back-end can be local or it may be\n"
 "on another machine, accessed via TCP/IP."
 msgstr ""
 
-#: gnu/packages/databases.scm:1951
+#: gnu/packages/databases.scm:1742
 msgid "Small object-relational mapping utility"
 msgstr ""
 
-#: gnu/packages/databases.scm:1953
+#: gnu/packages/databases.scm:1744
 msgid ""
 "Peewee is a simple and small ORM (object-relation mapping) tool.  Peewee\n"
 "handles converting between pythonic values and those used by databases, so you\n"
@@ -3111,11 +2962,11 @@ msgid ""
 "can autogenerate peewee models using @code{pwiz}, a model generator."
 msgstr ""
 
-#: gnu/packages/databases.scm:2000
+#: gnu/packages/databases.scm:1790
 msgid "Library providing transparent encryption of SQLite database files"
 msgstr ""
 
-#: gnu/packages/databases.scm:2001
+#: gnu/packages/databases.scm:1791
 msgid ""
 "SQLCipher is an implementation of SQLite, extended to\n"
 "provide transparent 256-bit AES encryption of database files.  Pages are\n"
@@ -3124,27 +2975,27 @@ msgid ""
 "development."
 msgstr ""
 
-#: gnu/packages/databases.scm:2033 gnu/packages/databases.scm:2060
+#: gnu/packages/databases.scm:1823 gnu/packages/databases.scm:1849
 msgid "Python ODBC Library"
 msgstr "La bibliothèque Python ODBC"
 
-#: gnu/packages/databases.scm:2034
+#: gnu/packages/databases.scm:1824
 msgid ""
 "@code{python-pyodbc-c} provides a Python DB-API driver\n"
 "for ODBC."
 msgstr ""
 
-#: gnu/packages/databases.scm:2061
+#: gnu/packages/databases.scm:1850
 msgid ""
 "@code{python-pyodbc} provides a Python DB-API driver\n"
 "for ODBC."
 msgstr ""
 
-#: gnu/packages/databases.scm:2093
+#: gnu/packages/databases.scm:1882
 msgid "Read Microsoft Access databases"
 msgstr ""
 
-#: gnu/packages/databases.scm:2094
+#: gnu/packages/databases.scm:1883
 msgid ""
 "MDB Tools is a set of tools and applications to read the\n"
 "proprietary MDB file format used in Microsoft's Access database package.  This\n"
@@ -3153,77 +3004,65 @@ msgid ""
 "etc., and an SQL engine for performing simple SQL queries."
 msgstr ""
 
-#: gnu/packages/databases.scm:2137
+#: gnu/packages/databases.scm:1926
 msgid "Python binding for the ‘Lightning’ database (LMDB)"
 msgstr ""
 
-#: gnu/packages/databases.scm:2139
+#: gnu/packages/databases.scm:1928
 msgid ""
 "python-lmdb or py-lmdb is a Python binding for the @dfn{Lightning\n"
 "Memory-Mapped Database} (LMDB), a high-performance key-value store."
 msgstr ""
 
-#: gnu/packages/databases.scm:2193
+#: gnu/packages/databases.scm:1982
 msgid "ActiveRecord ORM for Python"
 msgstr ""
 
-#: gnu/packages/databases.scm:2195
+#: gnu/packages/databases.scm:1984
 msgid ""
 "Orator provides a simple ActiveRecord-like Object Relational Mapping\n"
 "implementation for Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2228
+#: gnu/packages/databases.scm:2017
 msgid "Multi-model database system"
 msgstr "Système de base de données multi-modèles"
 
-#: gnu/packages/databases.scm:2229
+#: gnu/packages/databases.scm:2018
 msgid ""
 "Virtuoso is a scalable cross-platform server that combines\n"
 "relational, graph, and document data management with web application server\n"
 "and web services platform functionality."
 msgstr ""
 
-#: gnu/packages/databases.scm:2260
-msgid "Database interface and MySQL driver for R"
-msgstr "Interface de base de données et pilote MySQL pour R"
-
-#: gnu/packages/databases.scm:2262
-msgid ""
-"This package provides a DBI interface to MySQL / MariaDB.  The RMySQL\n"
-"package contains an old implementation based on legacy code from S-PLUS which\n"
-"is being phased out.  A modern MySQL client based on Rcpp is available from\n"
-"the RMariaDB package."
-msgstr ""
-
-#: gnu/packages/databases.scm:2287
+#: gnu/packages/databases.scm:2044
 msgid ""
 "Cassandra Cluster Manager for Apache Cassandra clusters on\n"
 "localhost"
 msgstr ""
 
-#: gnu/packages/databases.scm:2289
+#: gnu/packages/databases.scm:2046
 msgid ""
 "Cassandra Cluster Manager is a development tool for testing\n"
 "local Cassandra clusters. It creates, launches and removes Cassandra clusters\n"
 "on localhost."
 msgstr ""
 
-#: gnu/packages/databases.scm:2315
+#: gnu/packages/databases.scm:2072
 msgid "SQLite bindings for Python"
 msgstr "Liaisons SQLite pour Python"
 
-#: gnu/packages/databases.scm:2317
+#: gnu/packages/databases.scm:2074
 msgid ""
 "Pysqlite provides SQLite bindings for Python that comply to the\n"
 "Database API 2.0T."
 msgstr ""
 
-#: gnu/packages/databases.scm:2344
+#: gnu/packages/databases.scm:2099
 msgid "Database abstraction library"
 msgstr "Bibliothèque d'abstraction de bases de données"
 
-#: gnu/packages/databases.scm:2346
+#: gnu/packages/databases.scm:2101
 msgid ""
 "SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that\n"
 "gives application developers the full power and flexibility of SQL.  It\n"
@@ -3232,11 +3071,11 @@ msgid ""
 "simple and Pythonic domain language."
 msgstr ""
 
-#: gnu/packages/databases.scm:2385
+#: gnu/packages/databases.scm:2140
 msgid "Various utility functions for SQLAlchemy"
 msgstr ""
 
-#: gnu/packages/databases.scm:2387
+#: gnu/packages/databases.scm:2142
 msgid ""
 "SQLAlchemy-utils provides various utility functions and custom data types\n"
 "for SQLAlchemy.  SQLAlchemy is an SQL database abstraction library for Python.\n"
@@ -3253,21 +3092,21 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/databases.scm:2428
+#: gnu/packages/databases.scm:2183
 msgid "Database migration tool for SQLAlchemy"
 msgstr ""
 
-#: gnu/packages/databases.scm:2430
+#: gnu/packages/databases.scm:2185
 msgid ""
 "Alembic is a lightweight database migration tool for usage with the\n"
 "SQLAlchemy Database Toolkit for Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2456
+#: gnu/packages/databases.scm:2211
 msgid "Tiny key value database with concurrency support"
 msgstr ""
 
-#: gnu/packages/databases.scm:2458
+#: gnu/packages/databases.scm:2213
 msgid ""
 "PickleShare is a small ‘shelve’-like datastore with concurrency support.\n"
 "Like shelve, a PickleShareDB object acts like a normal dictionary.  Unlike\n"
@@ -3278,11 +3117,11 @@ msgid ""
 "PickleShare."
 msgstr ""
 
-#: gnu/packages/databases.scm:2510
+#: gnu/packages/databases.scm:2265
 msgid "Another Python SQLite Wrapper"
 msgstr ""
 
-#: gnu/packages/databases.scm:2511
+#: gnu/packages/databases.scm:2266
 msgid ""
 "APSW is a Python wrapper for the SQLite\n"
 "embedded relational database engine.  In contrast to other wrappers such as\n"
@@ -3290,22 +3129,22 @@ msgid ""
 "translate the complete SQLite API into Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2535
+#: gnu/packages/databases.scm:2290
 msgid "Neo4j driver code written in Python"
 msgstr ""
 
-#: gnu/packages/databases.scm:2536
+#: gnu/packages/databases.scm:2291
 msgid ""
 "This package provides the Neo4j Python driver that connects\n"
 "to the database using Neo4j's binary protocol.  It aims to be minimal, while\n"
 "being idiomatic to Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2555
+#: gnu/packages/databases.scm:2310
 msgid "Library and toolkit for working with Neo4j in Python"
 msgstr ""
 
-#: gnu/packages/databases.scm:2556
+#: gnu/packages/databases.scm:2311
 msgid ""
 "This package provides a client library and toolkit for\n"
 "working with Neo4j from within Python applications and from the command\n"
@@ -3313,32 +3152,32 @@ msgid ""
 "designed to be easy and intuitive to use."
 msgstr ""
 
-#: gnu/packages/databases.scm:2581
+#: gnu/packages/databases.scm:2335
 msgid "Python PostgreSQL adapter"
 msgstr "Adaptateur Python pour PostgreSQL"
 
-#: gnu/packages/databases.scm:2583
+#: gnu/packages/databases.scm:2337
 msgid ""
 "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API\n"
 "2.0."
 msgstr ""
 
-#: gnu/packages/databases.scm:2608
+#: gnu/packages/databases.scm:2362
 msgid "SQLAlchemy schema displayer"
 msgstr ""
 
-#: gnu/packages/databases.scm:2609
+#: gnu/packages/databases.scm:2363
 msgid ""
 "This package provides a program to build Entity\n"
 "Relationship diagrams from a SQLAlchemy model (or directly from the\n"
 "database)."
 msgstr ""
 
-#: gnu/packages/databases.scm:2639
+#: gnu/packages/databases.scm:2393
 msgid "MySQLdb is an interface to the popular MySQL database server for Python"
 msgstr ""
 
-#: gnu/packages/databases.scm:2640
+#: gnu/packages/databases.scm:2394
 msgid ""
 "MySQLdb is an interface to the popular MySQL database server\n"
 "for Python.  The design goals are:\n"
@@ -3349,21 +3188,21 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/databases.scm:2668
+#: gnu/packages/databases.scm:2422
 msgid "Python extension that wraps protocol parsing code in hiredis"
 msgstr ""
 
-#: gnu/packages/databases.scm:2669
+#: gnu/packages/databases.scm:2423
 msgid ""
 "Python-hiredis is a python extension that wraps protocol\n"
 "parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 msgstr ""
 
-#: gnu/packages/databases.scm:2692
+#: gnu/packages/databases.scm:2446
 msgid "Fake implementation of redis API for testing purposes"
 msgstr ""
 
-#: gnu/packages/databases.scm:2694
+#: gnu/packages/databases.scm:2448
 msgid ""
 "Fakeredis is a pure-Python implementation of the redis-py Python client\n"
 "that simulates talking to a redis server.  It was created for a single purpose:\n"
@@ -3374,61 +3213,61 @@ msgid ""
 "reasonable substitute."
 msgstr ""
 
-#: gnu/packages/databases.scm:2723
+#: gnu/packages/databases.scm:2477
 msgid "Redis Python client"
 msgstr ""
 
-#: gnu/packages/databases.scm:2725
+#: gnu/packages/databases.scm:2479
 msgid "This package provides a Python interface to the Redis key-value store."
 msgstr "Ce paquet fournit une interface Python pour le dépôt clef-valeur Redis."
 
-#: gnu/packages/databases.scm:2746
+#: gnu/packages/databases.scm:2500
 msgid "Simple job queues for Python"
 msgstr ""
 
-#: gnu/packages/databases.scm:2748
+#: gnu/packages/databases.scm:2502
 msgid ""
 "RQ (Redis Queue) is a simple Python library for queueing jobs and\n"
 "processing them in the background with workers.  It is backed by Redis and it\n"
 "is designed to have a low barrier to entry."
 msgstr ""
 
-#: gnu/packages/databases.scm:2771
+#: gnu/packages/databases.scm:2525
 msgid "Port of asyncio-redis to trollius"
 msgstr ""
 
-#: gnu/packages/databases.scm:2772
+#: gnu/packages/databases.scm:2526
 msgid ""
 "@code{trollius-redis} is a Redis client for Python\n"
 "  trollius.  It is an asynchronious IO (PEP 3156) implementation of the\n"
 "  Redis protocol."
 msgstr ""
 
-#: gnu/packages/databases.scm:2799
+#: gnu/packages/databases.scm:2553
 msgid "Non-validating SQL parser"
 msgstr ""
 
-#: gnu/packages/databases.scm:2800
+#: gnu/packages/databases.scm:2554
 msgid ""
 "Sqlparse is a non-validating SQL parser for Python.  It\n"
 "provides support for parsing, splitting and formatting SQL statements."
 msgstr ""
 
-#: gnu/packages/databases.scm:2820
+#: gnu/packages/databases.scm:2573
 msgid "Library to write SQL queries in a pythonic way"
 msgstr ""
 
-#: gnu/packages/databases.scm:2821
+#: gnu/packages/databases.scm:2574
 msgid ""
 "@code{python-sql} is a library to write SQL queries, that\n"
 "transforms idiomatic python function calls to well-formed SQL queries."
 msgstr ""
 
-#: gnu/packages/databases.scm:2906
+#: gnu/packages/databases.scm:2671
 msgid "Various tools for interacting with MongoDB and BSON"
 msgstr ""
 
-#: gnu/packages/databases.scm:2908
+#: gnu/packages/databases.scm:2673
 msgid ""
 "This package includes a collection of tools related to MongoDB.\n"
 "@table @code\n"
@@ -3453,11 +3292,11 @@ msgid ""
 "@end table"
 msgstr ""
 
-#: gnu/packages/databases.scm:2994
+#: gnu/packages/databases.scm:2757
 msgid "Columnar in-memory analytics"
 msgstr ""
 
-#: gnu/packages/databases.scm:2995
+#: gnu/packages/databases.scm:2758
 msgid ""
 "Apache Arrow is a columnar in-memory analytics layer\n"
 "designed to accelerate big data. It houses a set of canonical in-memory\n"
@@ -3466,22 +3305,22 @@ msgid ""
 "algorithm implementations."
 msgstr ""
 
-#: gnu/packages/databases.scm:3039
+#: gnu/packages/databases.scm:2803
 msgid "Python bindings for Apache Arrow"
 msgstr "Liaisons python pour Apache Arrow"
 
-#: gnu/packages/databases.scm:3040
+#: gnu/packages/databases.scm:2804
 msgid ""
 "This library provides a Pythonic API wrapper for the reference\n"
 "Arrow C++ implementation, along with tools for interoperability with pandas,\n"
 "NumPy, and other traditional Python scientific computing packages."
 msgstr ""
 
-#: gnu/packages/debug.scm:80
+#: gnu/packages/debug.scm:85
 msgid "Heuristical file minimizer"
 msgstr ""
 
-#: gnu/packages/debug.scm:82
+#: gnu/packages/debug.scm:87
 msgid ""
 "Delta assists you in minimizing \"interesting\" files subject to a test\n"
 "of their interestingness.  A common such situation is when attempting to\n"
@@ -3489,11 +3328,11 @@ msgid ""
 "program to exhibit a bug."
 msgstr ""
 
-#: gnu/packages/debug.scm:138
+#: gnu/packages/debug.scm:143
 msgid "Reducer for interesting code"
 msgstr ""
 
-#: gnu/packages/debug.scm:140
+#: gnu/packages/debug.scm:145
 msgid ""
 "C-Reduce is a tool that takes a large C or C++ program that has a\n"
 "property of interest (such as triggering a compiler bug) and automatically\n"
@@ -3502,11 +3341,11 @@ msgid ""
 "tools that process C/C++ code."
 msgstr ""
 
-#: gnu/packages/debug.scm:248
+#: gnu/packages/debug.scm:252
 msgid "Security-oriented fuzzer"
 msgstr ""
 
-#: gnu/packages/debug.scm:250
+#: gnu/packages/debug.scm:254
 msgid ""
 "American fuzzy lop is a security-oriented fuzzer that employs a novel\n"
 "type of compile-time instrumentation and genetic algorithms to automatically\n"
@@ -3517,11 +3356,11 @@ msgid ""
 "down the road."
 msgstr ""
 
-#: gnu/packages/debug.scm:305
+#: gnu/packages/debug.scm:310
 msgid "Expose race conditions in Makefiles"
 msgstr ""
 
-#: gnu/packages/debug.scm:307
+#: gnu/packages/debug.scm:312
 msgid ""
 "Stress Make is a customized GNU Make that explicitely manages the order\n"
 "in which concurrent jobs are run to provoke erroneous behavior into becoming\n"
@@ -3531,17 +3370,30 @@ msgid ""
 "conditions."
 msgstr ""
 
-#: gnu/packages/debug.scm:334
+#: gnu/packages/debug.scm:339
 msgid "Transparent application input fuzzer"
 msgstr ""
 
-#: gnu/packages/debug.scm:335
+#: gnu/packages/debug.scm:340
 msgid ""
 "Zzuf is a transparent application input fuzzer.  It works by\n"
 "intercepting file operations and changing random bits in the program's\n"
 "input.  Zzuf's behaviour is deterministic, making it easy to reproduce bugs."
 msgstr ""
 
+#: gnu/packages/debug.scm:393
+msgid "Memory scanner"
+msgstr ""
+
+#: gnu/packages/debug.scm:394
+msgid ""
+"Scanmem is a debugging utility designed to isolate the\n"
+"address of an arbitrary variable in an executing process.  Scanmem simply\n"
+"needs to be told the pid of the process and the value of the variable at\n"
+"several different times.  After several scans of the process, scanmem isolates\n"
+"the position of the variable and allows you to modify its value."
+msgstr ""
+
 #: gnu/packages/dejagnu.scm:78
 msgid "GNU software testing framework"
 msgstr ""
@@ -3553,25 +3405,40 @@ msgid ""
 "multiple test suites, which are then all managed by a single harness."
 msgstr ""
 
-#: gnu/packages/games.scm:176
+#: gnu/packages/games.scm:229
+msgid "Action game in four spatial dimensions"
+msgstr ""
+
+#: gnu/packages/games.scm:231
+msgid ""
+"Adanaxis is a fast-moving first person shooter set in deep space, where\n"
+"the fundamentals of space itself are changed.  By adding another dimension to\n"
+"space this game provides an environment with movement in four directions and\n"
+"six planes of rotation.  Initially the game explains the 4D control system via\n"
+"a graphical sequence, before moving on to 30 levels of gameplay with numerous\n"
+"enemy, ally, weapon and mission types.  Features include simulated 4D texturing,\n"
+"mouse and joystick control, and original music."
+msgstr ""
+
+#: gnu/packages/games.scm:260
 msgid "Tron clone in 3D"
 msgstr ""
 
-#: gnu/packages/games.scm:177
+#: gnu/packages/games.scm:261
 msgid ""
-"Armagetron is a multiplayer game in 3d that attempts to\n"
-"emulate and expand on the lightcycle sequence from the movie Tron.  It's\n"
-"an old school arcade game slung into the 21st century.  Highlights include\n"
-"a customizable playing arena, HUD, unique graphics, and AI bots.  For the\n"
-"more advanced player there are new game modes and a wide variety of physics\n"
-"settings to tweak as well."
+"Armagetron Advanced is a multiplayer game in 3d that\n"
+"attempts to emulate and expand on the lightcycle sequence from the movie Tron.\n"
+"It's an old school arcade game slung into the 21st century.  Highlights\n"
+"include a customizable playing arena, HUD, unique graphics, and AI bots.  For\n"
+"the more advanced player there are new game modes and a wide variety of\n"
+"physics settings to tweak as well."
 msgstr ""
 
-#: gnu/packages/games.scm:239
+#: gnu/packages/games.scm:326
 msgid "Antagonistic Tetris-style falling brick game for text terminals"
 msgstr ""
 
-#: gnu/packages/games.scm:241
+#: gnu/packages/games.scm:328
 msgid ""
 "Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick\n"
 "game.  Unlike normal Tetris, Bastet does not choose the next brick at random.\n"
@@ -3581,26 +3448,27 @@ msgid ""
 "canyons and wait for the long I-shaped block to clear four rows at a time."
 msgstr ""
 
-#: gnu/packages/games.scm:305
+#: gnu/packages/games.scm:389
 msgid "Survival horror roguelike video game"
 msgstr ""
 
-#: gnu/packages/games.scm:307
+#: gnu/packages/games.scm:391
 msgid ""
-"Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic\n"
-"world.  Struggle to survive in a harsh, persistent, procedurally generated\n"
-"world.  Scavenge the remnants of a dead civilization for food, equipment, or,\n"
-"if you are lucky, a vehicle with a full tank of gas to get you out of Dodge.\n"
-"Fight to defeat or escape from a wide variety of powerful monstrosities, from\n"
-"zombies to giant insects to killer robots and things far stranger and deadlier,\n"
-"and against the others like yourself, that want what you have."
+"Cataclysm: Dark Days Ahead (or \"DDA\" for short) is a roguelike set\n"
+"in a post-apocalyptic world.  Struggle to survive in a harsh, persistent,\n"
+"procedurally generated world.  Scavenge the remnants of a dead civilization\n"
+"for food, equipment, or, if you are lucky, a vehicle with a full tank of gas\n"
+"to get you out of Dodge.  Fight to defeat or escape from a wide variety of\n"
+"powerful monstrosities, from zombies to giant insects to killer robots and\n"
+"things far stranger and deadlier, and against the others like yourself, that\n"
+"want what you have."
 msgstr ""
 
-#: gnu/packages/games.scm:348
+#: gnu/packages/games.scm:436
 msgid "Speaking cow text filter"
 msgstr ""
 
-#: gnu/packages/games.scm:349
+#: gnu/packages/games.scm:437
 msgid ""
 "Cowsay is basically a text filter.  Send some text into it,\n"
 "and you get a cow saying your text.  If you think a talking cow isn't enough,\n"
@@ -3608,11 +3476,11 @@ msgid ""
 "tired of cows, a variety of other ASCII-art messengers are available."
 msgstr ""
 
-#: gnu/packages/games.scm:416
+#: gnu/packages/games.scm:506
 msgid "Free content game based on the Doom engine"
 msgstr "Jeu au contenu libre basé sur le moteur Doom"
 
-#: gnu/packages/games.scm:425
+#: gnu/packages/games.scm:515
 msgid ""
 "The Freedoom project aims to create a complete free content first person\n"
 "shooter game.  Freedoom by itself is just the raw material for a game: it must\n"
@@ -3626,11 +3494,11 @@ msgstr ""
 "pour être jouable.  Freedoom complète le moteur Doom sur trois niveaux : les\n"
 "graphismes, les effets sonores et la musique pour faire un jeu entièrement libre."
 
-#: gnu/packages/games.scm:473
+#: gnu/packages/games.scm:563
 msgid "Isometric role-playing game against killer robots"
 msgstr ""
 
-#: gnu/packages/games.scm:475
+#: gnu/packages/games.scm:565
 msgid ""
 "Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics.\n"
 "The game tells the story of a world destroyed by a conflict between robots and\n"
@@ -3640,11 +3508,11 @@ msgid ""
 "real-time combat."
 msgstr ""
 
-#: gnu/packages/games.scm:552
+#: gnu/packages/games.scm:642
 msgid "Software for exploring cellular automata"
 msgstr ""
 
-#: gnu/packages/games.scm:554
+#: gnu/packages/games.scm:644
 msgid ""
 "Golly simulates Conway's Game of Life and many other types of cellular\n"
 "automata.  The following features are available:\n"
@@ -3665,11 +3533,11 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/games.scm:602
+#: gnu/packages/games.scm:689
 msgid "Puzzle/platform game"
 msgstr ""
 
-#: gnu/packages/games.scm:603
+#: gnu/packages/games.scm:690
 msgid ""
 "Me and My Shadow is a puzzle/platform game in which you try\n"
 "to reach the exit by solving puzzles.  Spikes, moving blocks, fragile blocks\n"
@@ -3677,11 +3545,11 @@ msgid ""
 "shadow mimic them to reach blocks you couldn't reach alone."
 msgstr ""
 
-#: gnu/packages/games.scm:638
+#: gnu/packages/games.scm:725
 msgid "Multiplayer dungeon game involving knights and quests"
 msgstr ""
 
-#: gnu/packages/games.scm:639
+#: gnu/packages/games.scm:726
 msgid ""
 "Knights is a multiplayer game involving several knights who\n"
 "must run around a dungeon and complete various quests.  Each game revolves\n"
@@ -3693,29 +3561,29 @@ msgid ""
 "destroying an ancient book using a special wand."
 msgstr ""
 
-#: gnu/packages/games.scm:676
+#: gnu/packages/games.scm:763
 msgid "Backgammon game"
 msgstr "Jeu de backgammon"
 
-#: gnu/packages/games.scm:677
+#: gnu/packages/games.scm:764
 msgid ""
-"The GNU backgammon application can be used for playing,\n"
-"analyzing and teaching the game.  It has an advanced evaluation engine based on\n"
-"artificial neural networks suitable for both beginners and advanced players.  In\n"
-"addition to a command-line interface, it also features an attractive, 3D\n"
-"representation of the playing board."
+"The GNU backgammon application (also known as \"gnubg\") can\n"
+"be used for playing, analyzing and teaching the game.  It has an advanced\n"
+"evaluation engine based on artificial neural networks suitable for both\n"
+"beginners and advanced players.  In addition to a command-line interface, it\n"
+"also features an attractive, 3D representation of the playing board."
 msgstr ""
-"L'application GNU backgammon peut être utilisée pour jouer, analyser et\n"
-"apprendre le jeu.  Il possède un moteur d'analyse avancé basé sur des réseaux\n"
-"neuronaux artificiels adaptés aux débutants et au joueurs avancés.  En plus\n"
-"d'une interface en ligne de commande, il possède aussi une représentation 3D\n"
-"attractive du plateau de jeu."
+"L'application GNU backgammon (aussi connue sous le nom de « gnubg ») peut\n"
+"être utilisée pour jouer, analyser et apprendre le jeu.  Il possède un moteur\n"
+"d'analyse avancé basé sur des réseaux neuronaux artificiels adaptés aux débutants\n"
+"et aux joueurs avancés.  En plus d'une interface en ligne de commande, il possède\n"
+"aussi une représentation 3D attractive du plateau de jeu."
 
-#: gnu/packages/games.scm:706
+#: gnu/packages/games.scm:796
 msgid "3d Rubik's cube game"
 msgstr "Jeu de Rubik's cube en 3d"
 
-#: gnu/packages/games.scm:708
+#: gnu/packages/games.scm:798
 msgid ""
 "GNUbik is a puzzle game in which you must manipulate a cube to make\n"
 "each of its faces have a uniform color.  The game is customizable, allowing\n"
@@ -3729,11 +3597,11 @@ msgstr ""
 "pouvez même utiliser des photos pour les faces à la place des couleurs.  Le jeu\n"
 "peut être scripté avec Guile."
 
-#: gnu/packages/games.scm:730
+#: gnu/packages/games.scm:820
 msgid "The game of Shogi (Japanese chess)"
 msgstr "Le jeu de Shōgi (les échecs japonais)"
 
-#: gnu/packages/games.scm:731
+#: gnu/packages/games.scm:821
 msgid ""
 "GNU Shogi is a program that plays the game Shogi (Japanese\n"
 "Chess).  It is similar to standard chess but this variant is far more complicated."
@@ -3741,11 +3609,11 @@ msgstr ""
 "GNU Shogi est un programme qui joue au Shōgi (les échecs japonais).\n"
 "Il est similaire aux échecs standards mais cette variante est bien plus complexe."
 
-#: gnu/packages/games.scm:762
+#: gnu/packages/games.scm:852
 msgid "Tetris clone based on the SDL library"
 msgstr ""
 
-#: gnu/packages/games.scm:764
+#: gnu/packages/games.scm:854
 msgid ""
 "LTris is a tetris clone: differently shaped blocks are falling down the\n"
 "rectangular playing field and can be moved sideways or rotated by 90 degree\n"
@@ -3759,11 +3627,11 @@ msgid ""
 "watch your CPU playing while enjoying a cup of tea!"
 msgstr ""
 
-#: gnu/packages/games.scm:886
+#: gnu/packages/games.scm:977
 msgid "Classic dungeon crawl game"
 msgstr ""
 
-#: gnu/packages/games.scm:887
+#: gnu/packages/games.scm:978
 msgid ""
 "NetHack is a single player dungeon exploration game that runs\n"
 "on a wide variety of computer systems, with a variety of graphical and text\n"
@@ -3777,11 +3645,11 @@ msgid ""
 "role, and your gender."
 msgstr ""
 
-#: gnu/packages/games.scm:932
+#: gnu/packages/games.scm:1022
 msgid "Logical tile puzzle"
 msgstr ""
 
-#: gnu/packages/games.scm:934
+#: gnu/packages/games.scm:1024
 msgid ""
 "PipeWalker is a simple puzzle game with many diffent themes: connect all\n"
 "computers to one network server, bring water from a source to the taps, etc.\n"
@@ -3790,31 +3658,31 @@ msgid ""
 "Every puzzle has a complete solution, although there may be more than one."
 msgstr ""
 
-#: gnu/packages/games.scm:982
+#: gnu/packages/games.scm:1071
 msgid "Version of the classic 3D shoot'em'up game Doom"
 msgstr "Version du jeu classique de shoot'em'up Doom en 3D"
 
-#: gnu/packages/games.scm:984
+#: gnu/packages/games.scm:1073
 msgid "PrBoom+ is a Doom source port developed from the original PrBoom project."
 msgstr ""
 "PrBoom+ est un port des sources de Doom développé à partir du projet\n"
 "PrBoom original."
 
-#: gnu/packages/games.scm:1032
+#: gnu/packages/games.scm:1121
 msgid "Action platformer game"
 msgstr ""
 
-#: gnu/packages/games.scm:1034
+#: gnu/packages/games.scm:1123
 msgid ""
 "ReTux is an action platformer loosely inspired by the Mario games,\n"
 "utilizing the art assets from the @code{SuperTux} project."
 msgstr ""
 
-#: gnu/packages/games.scm:1140
+#: gnu/packages/games.scm:1229
 msgid "A classical roguelike/sandbox game"
 msgstr ""
 
-#: gnu/packages/games.scm:1142
+#: gnu/packages/games.scm:1231
 msgid ""
 "RogueBox Adventures is a graphical roguelike with strong influences\n"
 "from sandbox games like Minecraft or Terraria.  The main idea of RogueBox\n"
@@ -3822,19 +3690,19 @@ msgid ""
 "can be explored and changed freely."
 msgstr ""
 
-#: gnu/packages/games.scm:1169
+#: gnu/packages/games.scm:1258
 msgid "User interface for gnushogi"
 msgstr "Interface pour gnushogi"
 
-#: gnu/packages/games.scm:1170
+#: gnu/packages/games.scm:1259
 msgid "A graphical user interface for the package @code{gnushogi}."
 msgstr "Une interface utilisateur graphique pour le paquet @code{gnushogi}"
 
-#: gnu/packages/games.scm:1221
+#: gnu/packages/games.scm:1310
 msgid "GNU/Linux port of the indie game \"l'Abbaye des Morts\""
 msgstr "Port GNU/Linux du jeu indépendant « l'Abbaye des Morts »"
 
-#: gnu/packages/games.scm:1222
+#: gnu/packages/games.scm:1311
 msgid ""
 "L'Abbaye des Morts is a 2D platform game set in 13th century\n"
 "France.  The Cathars, who preach about good Christian beliefs, were being\n"
@@ -3843,11 +3711,11 @@ msgid ""
 "that beneath its ruins lay buried an ancient evil."
 msgstr ""
 
-#: gnu/packages/games.scm:1275
+#: gnu/packages/games.scm:1367
 msgid "Dungeon exploration roguelike"
 msgstr "Roguelike d'exploration de donjon"
 
-#: gnu/packages/games.scm:1276
+#: gnu/packages/games.scm:1368
 msgid ""
 "Angband is a Classic dungeon exploration roguelike.  Explore\n"
 "the depths below Angband, seeking riches, fighting monsters, and preparing to\n"
@@ -3857,11 +3725,11 @@ msgstr ""
 "en dessous d'Angband, cherchez des richesses, combattez des montres et préparez-vous\n"
 "à combattre Morgoth, le Seigneur des Ténèbres."
 
-#: gnu/packages/games.scm:1312
+#: gnu/packages/games.scm:1406
 msgid "Lemmings clone"
 msgstr "Clone de Lemmings"
 
-#: gnu/packages/games.scm:1314
+#: gnu/packages/games.scm:1408
 msgid ""
 "Pingus is a free Lemmings-like puzzle game in which the player takes\n"
 "command of a bunch of small animals and has to guide them through levels.\n"
@@ -3876,11 +3744,11 @@ msgstr ""
 "leur donnant des ordres.  Plusieurs de ces ordres sont nécessaires pour atteindre\n"
 "la fin du niveau.  Le jeu est présenté en 2D, en vue de côté."
 
-#: gnu/packages/games.scm:1336
+#: gnu/packages/games.scm:1430
 msgid "Convert English text to humorous dialects"
 msgstr "Convertit du texte en anglais vers des dialectes rigolos"
 
-#: gnu/packages/games.scm:1337
+#: gnu/packages/games.scm:1431
 msgid ""
 "The GNU Talk Filters are programs that convert English text\n"
 "into stereotyped or otherwise humorous dialects.  The filters are provided as\n"
@@ -3890,11 +3758,11 @@ msgstr ""
 "vers des dialectes stéréotypés ou rigolos.  Les filtres sont fournis en tant que\n"
 "bibliothèques C, pour qu'ils puissent être facilement intégrés à d'autres programmes."
 
-#: gnu/packages/games.scm:1369
+#: gnu/packages/games.scm:1462
 msgid "Simulate the display from \"The Matrix\""
 msgstr "Simule l'affichage comme dans « Matrix »"
 
-#: gnu/packages/games.scm:1370
+#: gnu/packages/games.scm:1463
 msgid ""
 "CMatrix simulates the display from \"The Matrix\" and is\n"
 "based on the screensaver from the movie's website.  It works with terminal\n"
@@ -3906,11 +3774,11 @@ msgstr ""
 "peut faire défiler les lignes à la même vitesse ou de manière asynchrone\n"
 "à une vitesse définie par l'utilisateur."
 
-#: gnu/packages/games.scm:1390
+#: gnu/packages/games.scm:1483
 msgid "Full chess implementation"
 msgstr "Implémentation complète du jeu d'échecs"
 
-#: gnu/packages/games.scm:1391
+#: gnu/packages/games.scm:1484
 msgid ""
 "GNU Chess is a chess engine.  It allows you to compete\n"
 "against the computer in a game of chess, either through the default terminal\n"
@@ -3921,11 +3789,11 @@ msgstr ""
 "textuelle par défaut soit via une interface visuelle externe comme\n"
 "GNU XBoard."
 
-#: gnu/packages/games.scm:1419
+#: gnu/packages/games.scm:1524
 msgid "Twisted adventures of young pig farmer Dink Smallwood"
 msgstr ""
 
-#: gnu/packages/games.scm:1421
+#: gnu/packages/games.scm:1526
 msgid ""
 "GNU FreeDink is a free and portable re-implementation of the engine\n"
 "for the role-playing game Dink Smallwood.  It supports not only the original\n"
@@ -3933,29 +3801,29 @@ msgid ""
 "To that extent, it also includes a front-end for managing all of your D-Mods."
 msgstr ""
 
-#: gnu/packages/games.scm:1446
+#: gnu/packages/games.scm:1552
 msgid "Game data for GNU Freedink"
 msgstr "Données de jeu pour GNU Freedink"
 
-#: gnu/packages/games.scm:1448
+#: gnu/packages/games.scm:1554
 msgid "This package contains the game data of GNU Freedink."
 msgstr "Ce paquet continet les données du jeu GNU Freedink."
 
-#: gnu/packages/games.scm:1469
+#: gnu/packages/games.scm:1577
 msgid "Front-end for managing and playing Dink Modules"
 msgstr "Interface pour gérer et jouer à des modules pour Dink"
 
-#: gnu/packages/games.scm:1470
+#: gnu/packages/games.scm:1578
 msgid ""
 "DFArc makes it easy to play and manage the GNU FreeDink game\n"
 "and its numerous D-Mods."
 msgstr ""
 
-#: gnu/packages/games.scm:1522
+#: gnu/packages/games.scm:1630
 msgid "Graphical user interface for chess programs"
 msgstr "Interface utilisateur Graphique pour les programmes d'échecs"
 
-#: gnu/packages/games.scm:1523
+#: gnu/packages/games.scm:1631
 msgid ""
 "GNU XBoard is a graphical board for all varieties of chess,\n"
 "including international chess, xiangqi (Chinese chess), shogi (Japanese chess)\n"
@@ -3969,23 +3837,11 @@ msgstr ""
 "supportées.  Il présente une interface utilisateur complètement interactive et\n"
 "peut charger et sauvegarder les jeux dans la Notation de Jeu Universelle."
 
-#: gnu/packages/games.scm:1577
-msgid "Ball and paddle game"
-msgstr ""
-
-#: gnu/packages/games.scm:1578
-msgid ""
-"XBoing is a blockout type game where you have a paddle which\n"
-"you control to bounce a ball around the game zone destroying blocks with a\n"
-"proton ball.  Each block carries a different point value.  The more blocks you\n"
-"destroy, the better your score.  The person with the highest score wins."
-msgstr ""
-
-#: gnu/packages/games.scm:1612
+#: gnu/packages/games.scm:1665
 msgid "Typing tutor"
 msgstr "Tutorial pour apprendre à taper"
 
-#: gnu/packages/games.scm:1614
+#: gnu/packages/games.scm:1667
 msgid ""
 "GNU Typist is a universal typing tutor.  It can be used to learn and\n"
 "practice touch-typing.  Several tutorials are included; in addition to\n"
@@ -3994,11 +3850,11 @@ msgid ""
 "are primarily in English, however some in other languages are provided."
 msgstr ""
 
-#: gnu/packages/games.scm:1680
+#: gnu/packages/games.scm:1733
 msgid "3D game engine written in C++"
 msgstr "Moteur de jeu 3D écrit en C++"
 
-#: gnu/packages/games.scm:1682
+#: gnu/packages/games.scm:1735
 msgid ""
 "The Irrlicht Engine is a high performance realtime 3D engine written in\n"
 "C++.  Features include an OpenGL renderer, extensible materials, scene graph\n"
@@ -4011,11 +3867,11 @@ msgstr ""
 "effets spéciaux, le support pour des formats de fichiers graphiques usuels et la\n"
 "détection de collision."
 
-#: gnu/packages/games.scm:1734
+#: gnu/packages/games.scm:1787
 msgid "2D space shooter"
 msgstr "Jeu de tir spatial en 2D"
 
-#: gnu/packages/games.scm:1736
+#: gnu/packages/games.scm:1789
 msgid ""
 "M.A.R.S. is a 2D space shooter with pretty visual effects and\n"
 "attractive physics.  Players can battle each other or computer controlled\n"
@@ -4023,19 +3879,19 @@ msgid ""
 "match, cannon keep, and grave-itation pit."
 msgstr ""
 
-#: gnu/packages/games.scm:1770
+#: gnu/packages/games.scm:1823
 msgid "Main game data for the Minetest game engine"
 msgstr "Données principales du jeu pour le moteur de jeu Minetest"
 
-#: gnu/packages/games.scm:1772
+#: gnu/packages/games.scm:1825
 msgid "Game data for the Minetest infinite-world block sandox game."
 msgstr ""
 
-#: gnu/packages/games.scm:1832
+#: gnu/packages/games.scm:1885
 msgid "Infinite-world block sandbox game"
 msgstr ""
 
-#: gnu/packages/games.scm:1834
+#: gnu/packages/games.scm:1887
 msgid ""
 "Minetest is a sandbox construction game.  Players can create and destroy\n"
 "various types of blocks in a three-dimensional open world.  This allows\n"
@@ -4044,11 +3900,11 @@ msgid ""
 "in different ways."
 msgstr ""
 
-#: gnu/packages/games.scm:1873
+#: gnu/packages/games.scm:1926
 msgid "Curses Implementation of the Glk API"
 msgstr "Implémentation en Curses de l'API Glk"
 
-#: gnu/packages/games.scm:1875
+#: gnu/packages/games.scm:1928
 msgid ""
 "Glk defines a portable API for applications with text UIs.  It was\n"
 "primarily designed for interactive fiction, but it should be suitable for many\n"
@@ -4063,11 +3919,11 @@ msgstr ""
 "tourne dans une fenêtre de terminal et qui utilise la bibliothèque @code{curses.h}\n"
 "pour le contrôle de l'écran."
 
-#: gnu/packages/games.scm:1913
+#: gnu/packages/games.scm:1966
 msgid "Interpreter for Glulx VM"
 msgstr "Interpréteur pour Glulx VM"
 
-#: gnu/packages/games.scm:1915
+#: gnu/packages/games.scm:1968
 msgid ""
 "Glulx is a 32-bit portable virtual machine intended for writing and\n"
 "playing interactive fiction.  It was designed by Andrew Plotkin to relieve\n"
@@ -4079,11 +3935,11 @@ msgstr ""
 "relacher certaines contraintes du vénérable format Z-machine.  C'est l'interpréteur\n"
 "de référence, qui utilise l'API Glk."
 
-#: gnu/packages/games.scm:1949
+#: gnu/packages/games.scm:2002
 msgid "Z-machine interpreter"
 msgstr "Interpréteur Z-machine"
 
-#: gnu/packages/games.scm:1951
+#: gnu/packages/games.scm:2004
 msgid ""
 "Fizmo is a console-based Z-machine interpreter.  It is used to play\n"
 "interactive fiction, also known as text adventures, which were implemented\n"
@@ -4093,11 +3949,11 @@ msgstr ""
 "à des fictions interactives, aussi connues sous le nom d'aventures textuelles,\n"
 "qui étaient implémentées soit par Infocom ou crées avec le compilateur Inform."
 
-#: gnu/packages/games.scm:1969
+#: gnu/packages/games.scm:2022
 msgid "Play the game of Go"
 msgstr "Jouer au jeu de Go"
 
-#: gnu/packages/games.scm:1971
+#: gnu/packages/games.scm:2024
 msgid ""
 "GNU Go is a program that plays the game of Go, in which players\n"
 "place stones on a grid to form territory or capture other stones.  While\n"
@@ -4115,11 +3971,11 @@ msgstr ""
 "de stockage standard pour les jeux (SGF, Smart Game Format) et le format\n"
 "de communication inter-processus (GMP, Go Modem Protocol)."
 
-#: gnu/packages/games.scm:1999
+#: gnu/packages/games.scm:2052
 msgid "High-speed arctic racing game based on Tux Racer"
 msgstr ""
 
-#: gnu/packages/games.scm:2001
+#: gnu/packages/games.scm:2054
 msgid ""
 "Extreme Tux Racer, or etracer as it is called for short, is\n"
 "a simple OpenGL racing game featuring Tux, the Linux mascot.  The goal of the\n"
@@ -4132,11 +3988,11 @@ msgid ""
 "This game is based on the GPL version of the famous game TuxRacer."
 msgstr ""
 
-#: gnu/packages/games.scm:2083
+#: gnu/packages/games.scm:2143
 msgid "3D kart racing game"
 msgstr "Jeu de course de karts en 3D"
 
-#: gnu/packages/games.scm:2084
+#: gnu/packages/games.scm:2144
 msgid ""
 "SuperTuxKart is a 3D kart racing game, with a focus on\n"
 "having fun over realism.  You can play with up to 4 friends on one PC, racing\n"
@@ -4148,12 +4004,12 @@ msgstr ""
 "la courses les uns contre les autres ou d'essayer de battre l'ordinateur.  Un\n"
 "mode solo est aussi disponible."
 
-#: gnu/packages/games.scm:2116
+#: gnu/packages/games.scm:2176
 msgid "Game of jumping to the next floor, trying not to fall"
 msgstr "Un jeu où on saute à l'étage au dessus en essayent de ne pas tomber"
 
 # replay en français ?
-#: gnu/packages/games.scm:2118
+#: gnu/packages/games.scm:2178
 msgid ""
 "GNUjump is a simple, yet addictive game in which you must jump from\n"
 "platform to platform to avoid falling, while the platforms drop at faster rates\n"
@@ -4166,11 +4022,11 @@ msgstr ""
 "propose du multijoueur, des FPS illimités, une chute douce du sol des\n"
 "graphismes et des sons personnalisables et des replays."
 
-#: gnu/packages/games.scm:2152
+#: gnu/packages/games.scm:2212
 msgid "Turn-based strategy game"
 msgstr "Jeu de stratégie en tour par tour"
 
-#: gnu/packages/games.scm:2154
+#: gnu/packages/games.scm:2214
 msgid ""
 "The Battle for Wesnoth is a fantasy, turn based tactical strategy game,\n"
 "with several single player campaigns, and multiplayer games (both networked and\n"
@@ -4190,11 +4046,11 @@ msgstr ""
 "gagnent de l'expérience et augmentent de niveau, et sont rejoués d'un scénario\n"
 "à la campagne suivante."
 
-#: gnu/packages/games.scm:2176
+#: gnu/packages/games.scm:2239
 msgid "Dedicated @emph{Battle for Wesnoth} server"
 msgstr "Serveur dédié pour la @emph{Bataille pour Wesnoth}"
 
-#: gnu/packages/games.scm:2177
+#: gnu/packages/games.scm:2240
 msgid ""
 "This package contains a dedicated server for @emph{The\n"
 "Battle for Wesnoth}."
@@ -4202,11 +4058,11 @@ msgstr ""
 "Ce paquet contient un serveur dédié pour @emph{La bataille\n"
 "pour Wesnoth}."
 
-#: gnu/packages/games.scm:2218
+#: gnu/packages/games.scm:2284
 msgid "Mouse and keyboard discovery for children"
 msgstr "Découverte de la souris et du clavier pour les enfants"
 
-#: gnu/packages/games.scm:2220
+#: gnu/packages/games.scm:2286
 msgid ""
 "Gamine is a game designed for young children who are learning to use the\n"
 "mouse and keyboard.  The child uses the mouse to draw colored dots and lines\n"
@@ -4216,25 +4072,12 @@ msgstr ""
 "souris et le clavier. L'enfant utilise la souris pour dessiner des points colorés\n"
 "et des lignes sur l'écran et le clavier pour afficher des lettres."
 
-#: gnu/packages/games.scm:2260
-msgid "Puzzle game with a cat in lead role"
-msgstr ""
-
-#: gnu/packages/games.scm:2261
-msgid ""
-"Project Raincat is a game developed by Carnegie Mellon\n"
-"students through GCS during the Fall 2008 semester.  Raincat features game\n"
-"play inspired from classics Lemmings and The Incredible Machine.  The project\n"
-"proved to be an excellent learning experience for the programmers.  Everything\n"
-"is programmed in Haskell."
-msgstr ""
-
 # Traductino officielle du nom du jeu ?
-#: gnu/packages/games.scm:2295
+#: gnu/packages/games.scm:2319
 msgid "Client for 'The Mana World' and similar games"
 msgstr "Client pour « the Mana World » et des jeux similaires"
 
-#: gnu/packages/games.scm:2297
+#: gnu/packages/games.scm:2321
 msgid ""
 "ManaPlus is a 2D MMORPG client for game servers.  It is the only\n"
 "fully supported client for @uref{http://www.themanaworld.org, The mana\n"
@@ -4245,11 +4088,11 @@ msgstr ""
 "client entièrement supporté par @uref{http://www.themanaworld.org, the Mana World},\n"
 "@uref{http://evolonline.org, Evol Online} et @uref{http://landoffire.org, Land of fire}."
 
-#: gnu/packages/games.scm:2365
-msgid "Transportation economics simulator"
+#: gnu/packages/games.scm:2388
+msgid "Transportation economics simulator game"
 msgstr "Simulateur de l'économie du transport"
 
-#: gnu/packages/games.scm:2366
+#: gnu/packages/games.scm:2389
 msgid ""
 "OpenTTD is a game in which you transport goods and\n"
 "passengers by land, water and air.  It is a re-implementation of Transport\n"
@@ -4266,11 +4109,11 @@ msgstr ""
 "ne contient que le moteur de jeu. Lorsque vous le démarrez, il vous sera demandé de télécharger\n"
 "un thème graphique."
 
-#: gnu/packages/games.scm:2423
+#: gnu/packages/games.scm:2446
 msgid "Base graphics set for OpenTTD"
 msgstr ""
 
-#: gnu/packages/games.scm:2425
+#: gnu/packages/games.scm:2448
 msgid ""
 "The OpenGFX projects is an implementation of the OpenTTD base grahics\n"
 "set that aims to ensure the best possible out-of-the-box experience.\n"
@@ -4285,49 +4128,49 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/games.scm:2470
+#: gnu/packages/games.scm:2493
 msgid "Base sounds for OpenTTD"
 msgstr ""
 
-#: gnu/packages/games.scm:2471
+#: gnu/packages/games.scm:2494
 msgid ""
 "OpenSFX is a set of free base sounds for OpenTTD which make\n"
 "it possible to play OpenTTD without requiring the proprietary sound files from\n"
 "the original Transport Tycoon Deluxe."
 msgstr ""
 
-#: gnu/packages/games.scm:2508
+#: gnu/packages/games.scm:2531
 msgid "Music set for OpenTTD"
 msgstr ""
 
-#: gnu/packages/games.scm:2509
+#: gnu/packages/games.scm:2532
 msgid ""
 "OpenMSX is a music set for OpenTTD which makes it possible\n"
 "to play OpenTTD without requiring the proprietary music from the original\n"
 "Transport Tycoon Deluxe."
 msgstr ""
 
-#: gnu/packages/games.scm:2578
+#: gnu/packages/games.scm:2601
 msgid "Title sequences for OpenRCT2"
 msgstr ""
 
-#: gnu/packages/games.scm:2580
+#: gnu/packages/games.scm:2603
 msgid "openrct2-title-sequences is a set of title sequences for OpenRCT2."
 msgstr ""
 
-#: gnu/packages/games.scm:2619
+#: gnu/packages/games.scm:2641
 msgid "Objects for OpenRCT2"
 msgstr ""
 
-#: gnu/packages/games.scm:2621
+#: gnu/packages/games.scm:2643
 msgid "openrct2-objects is a set of objects for OpenRCT2."
 msgstr ""
 
-#: gnu/packages/games.scm:2684
+#: gnu/packages/games.scm:2708
 msgid "Free software re-implementation of RollerCoaster Tycoon 2"
 msgstr ""
 
-#: gnu/packages/games.scm:2685
+#: gnu/packages/games.scm:2709
 msgid ""
 "OpenRCT2 is a free software re-implementation of\n"
 "RollerCoaster Tycoon 2 (RCT2).  The gameplay revolves around building and\n"
@@ -4337,43 +4180,43 @@ msgid ""
 "images, etc.)"
 msgstr ""
 
-#: gnu/packages/games.scm:2727
+#: gnu/packages/games.scm:2751
 msgid "Pinball simulator"
 msgstr ""
 
-#: gnu/packages/games.scm:2728
+#: gnu/packages/games.scm:2752
 msgid ""
 "The Emilia Pinball Project is a pinball simulator.  There\n"
 "are only two levels to play with, but they are very addictive."
 msgstr ""
 
-#: gnu/packages/games.scm:2751
+#: gnu/packages/games.scm:2775
 msgid "Board game inspired by The Settlers of Catan"
 msgstr ""
 
-#: gnu/packages/games.scm:2752
+#: gnu/packages/games.scm:2776
 msgid ""
 "Pioneers is an emulation of the board game The Settlers of\n"
 "Catan.  It can be played on a local network, on the internet, and with AI\n"
 "players."
 msgstr ""
 
-#: gnu/packages/games.scm:2793 gnu/packages/gnome.scm:2655
+#: gnu/packages/games.scm:2817 gnu/packages/gnome.scm:2746
 msgid "Logic puzzle game"
 msgstr ""
 
-#: gnu/packages/games.scm:2794
+#: gnu/packages/games.scm:2818
 msgid ""
 "The goal of this logic game is to open all cards in a 6x6\n"
 "grid, using a number of hints as to their relative position.  The game idea\n"
 "is attributed to Albert Einstein."
 msgstr ""
 
-#: gnu/packages/games.scm:2823
+#: gnu/packages/games.scm:2846
 msgid "MUD and telnet client"
 msgstr ""
 
-#: gnu/packages/games.scm:2825
+#: gnu/packages/games.scm:2848
 msgid ""
 "POWWOW is a client software which can be used for telnet as well as for\n"
 "@dfn{Multi-User Dungeon} (MUD).  Additionally it can serve as a nice client for\n"
@@ -4381,33 +4224,33 @@ msgid ""
 "http://lavachat.symlynx.com/unix/"
 msgstr ""
 
-#: gnu/packages/games.scm:3000
+#: gnu/packages/games.scm:3023
 msgid "Arena shooter derived from the Cube 2 engine"
 msgstr ""
 
-#: gnu/packages/games.scm:3002
+#: gnu/packages/games.scm:3025
 msgid ""
 "Red Eclipse is an arena shooter, created from the Cube2 engine.\n"
 "Offering an innovative parkour system and distinct but all potent weapons,\n"
 "Red Eclipse provides fast paced and accessible gameplay."
 msgstr ""
 
-#: gnu/packages/games.scm:3062
+#: gnu/packages/games.scm:3085
 msgid "Text adventure game"
 msgstr ""
 
-#: gnu/packages/games.scm:3064
+#: gnu/packages/games.scm:3087
 msgid ""
 "Grue Hunter is a text adventure game written in Perl.  You must make\n"
 "your way through an underground cave system in search of the Grue.  Can you\n"
 "capture it and get out alive?"
 msgstr ""
 
-#: gnu/packages/games.scm:3106
+#: gnu/packages/games.scm:3129
 msgid "Old-school earthworm action game"
 msgstr ""
 
-#: gnu/packages/games.scm:3108
+#: gnu/packages/games.scm:3131
 msgid ""
 "lierolibre is an earthworm action game where you fight another player\n"
 "(or the computer) underground using a wide array of weapons.\n"
@@ -4432,11 +4275,11 @@ msgid ""
 "fullscreen, use F5 or Alt+Enter."
 msgstr ""
 
-#: gnu/packages/games.scm:3181
+#: gnu/packages/games.scm:3205
 msgid "3D Real-time strategy and real-time tactics game"
 msgstr ""
 
-#: gnu/packages/games.scm:3183
+#: gnu/packages/games.scm:3207
 msgid ""
 "Warzone 2100 offers campaign, multi-player, and single-player skirmish\n"
 "modes. An extensive tech tree with over 400 different technologies, combined\n"
@@ -4444,11 +4287,11 @@ msgid ""
 "tactics."
 msgstr ""
 
-#: gnu/packages/games.scm:3216
+#: gnu/packages/games.scm:3240
 msgid "2D scrolling shooter game"
 msgstr ""
 
-#: gnu/packages/games.scm:3218
+#: gnu/packages/games.scm:3242
 msgid ""
 "In the year 2579, the intergalactic weapons corporation, WEAPCO, has\n"
 "dominated the galaxy.  Guide Chris Bainfield and his friend Sid Wilson on\n"
@@ -4457,11 +4300,11 @@ msgid ""
 "in strikes against the evil corporation."
 msgstr ""
 
-#: gnu/packages/games.scm:3249
+#: gnu/packages/games.scm:3276
 msgid "Fast-paced, arcade-style, top-scrolling space shooter"
 msgstr ""
 
-#: gnu/packages/games.scm:3251
+#: gnu/packages/games.scm:3278
 msgid ""
 "In this game you are the captain of the cargo ship Chromium B.S.U. and\n"
 "are responsible for delivering supplies to the troops on the front line.  Your\n"
@@ -4469,11 +4312,11 @@ msgid ""
 "safety of the Chromium vessel."
 msgstr ""
 
-#: gnu/packages/games.scm:3327
+#: gnu/packages/games.scm:3360
 msgid "Drawing software for children"
 msgstr ""
 
-#: gnu/packages/games.scm:3329
+#: gnu/packages/games.scm:3362
 msgid ""
 "Tux Paint is a free drawing program designed for young children (kids\n"
 "ages 3 and up).  It has a simple, easy-to-use interface; fun sound effects;\n"
@@ -4482,52 +4325,52 @@ msgid ""
 "your child be creative."
 msgstr ""
 
-#: gnu/packages/games.scm:3368
+#: gnu/packages/games.scm:3401
 msgid "Stamp images for Tux Paint"
 msgstr ""
 
-#: gnu/packages/games.scm:3370
+#: gnu/packages/games.scm:3403
 msgid ""
 "This package contains a set of \"Rubber Stamp\" images which can be used\n"
 "with the \"Stamp\" tool within Tux Paint."
 msgstr ""
 
-#: gnu/packages/games.scm:3417
+#: gnu/packages/games.scm:3450
 msgid "Configure Tux Paint"
 msgstr ""
 
-#: gnu/packages/games.scm:3419
+#: gnu/packages/games.scm:3452
 msgid "Tux Paint Config is a graphical configuration editor for Tux Paint."
 msgstr ""
 
-#: gnu/packages/games.scm:3451
+#: gnu/packages/games.scm:3484
 msgid "2D platformer game"
 msgstr ""
 
-#: gnu/packages/games.scm:3452
+#: gnu/packages/games.scm:3485
 msgid ""
 "SuperTux is a free classic 2D jump'n run sidescroller game\n"
 "in a style similar to the original Super Mario games covered under\n"
 "the GNU GPL."
 msgstr ""
 
-#: gnu/packages/games.scm:3486
+#: gnu/packages/games.scm:3520
 msgid "MUD client"
 msgstr ""
 
-#: gnu/packages/games.scm:3488
+#: gnu/packages/games.scm:3522
 msgid ""
-"TinTin++ is a MUD client which supports MCCP (Mud Client Compression Protocol),\n"
-"MMCP (Mud Master Chat Protocol), xterm 256 colors, most TELNET options used by MUDs,\n"
-"as well as those required to login via telnet on Linux / Mac OS X servers, and an\n"
-"auto mapper with a VT100 map display."
+"TinTin++ is a MUD client which supports MCCP (Mud Client Compression\n"
+"Protocol), MMCP (Mud Master Chat Protocol), xterm 256 colors, most TELNET\n"
+"options used by MUDs, as well as those required to login via telnet on\n"
+"Linux / Mac OS X servers, and an auto mapper with a VT100 map display."
 msgstr ""
 
-#: gnu/packages/games.scm:3525
+#: gnu/packages/games.scm:3559
 msgid "Programming game"
 msgstr ""
 
-#: gnu/packages/games.scm:3526
+#: gnu/packages/games.scm:3560
 msgid ""
 "Learn programming, playing with ants and spider webs ;-)\n"
 "Your robot ant can be programmed in many languages: OCaml, Python, C, C++,\n"
@@ -4535,22 +4378,22 @@ msgid ""
 "programmers may also add their own favorite language."
 msgstr ""
 
-#: gnu/packages/games.scm:3571
+#: gnu/packages/games.scm:3605
 msgid "Keyboard mashing and doodling game for babies"
 msgstr ""
 
-#: gnu/packages/games.scm:3572
+#: gnu/packages/games.scm:3606
 msgid ""
 "Bambam is a simple baby keyboard (and gamepad) masher\n"
 "application that locks the keyboard and mouse and instead displays bright\n"
 "colors, pictures, and sounds."
 msgstr ""
 
-#: gnu/packages/games.scm:3636
+#: gnu/packages/games.scm:3670
 msgid "Arcade-style fire fighting game"
 msgstr ""
 
-#: gnu/packages/games.scm:3638
+#: gnu/packages/games.scm:3672
 msgid ""
 "Mr. Rescue is an arcade styled 2d action game centered around evacuating\n"
 "civilians from burning buildings.  The game features fast-paced fire\n"
@@ -4558,11 +4401,11 @@ msgid ""
 "throwing people around in pseudo-randomly generated buildings."
 msgstr ""
 
-#: gnu/packages/games.scm:3747
+#: gnu/packages/games.scm:3781
 msgid "Non-euclidean graphical rogue-like game"
 msgstr ""
 
-#: gnu/packages/games.scm:3749
+#: gnu/packages/games.scm:3783
 msgid ""
 "HyperRogue is a game in which the player collects treasures and fights\n"
 "monsters -- rogue-like but for the fact that it is played on the hyperbolic\n"
@@ -4576,21 +4419,21 @@ msgid ""
 "symbols, it still needs graphics to render the non-euclidean world."
 msgstr ""
 
-#: gnu/packages/games.scm:3792
+#: gnu/packages/games.scm:3826
 msgid "Shooter with space station destruction"
 msgstr ""
 
-#: gnu/packages/games.scm:3794
+#: gnu/packages/games.scm:3828
 msgid ""
 "Kobo Deluxe is an enhanced version of Akira Higuchi's XKobo graphical game\n"
 "for Un*x systems with X11."
 msgstr ""
 
-#: gnu/packages/games.scm:3826
+#: gnu/packages/games.scm:3860
 msgid "Turn based empire building strategy game"
 msgstr ""
 
-#: gnu/packages/games.scm:3827
+#: gnu/packages/games.scm:3861
 msgid ""
 "Freeciv is a turn based empire building strategy game\n"
 "inspired by the history of human civilization.  The game commences in\n"
@@ -4598,11 +4441,11 @@ msgid ""
 "to the Space Age."
 msgstr ""
 
-#: gnu/packages/games.scm:3858
+#: gnu/packages/games.scm:3892
 msgid "Recreation of data decryption effect in \"Sneakers\""
 msgstr ""
 
-#: gnu/packages/games.scm:3860
+#: gnu/packages/games.scm:3894
 msgid ""
 "@code{No More Secrets} provides a command line tool called \"nms\"\n"
 "that recreates the famous data decryption effect seen on screen in the 1992\n"
@@ -4613,41 +4456,41 @@ msgid ""
 "starting a decryption sequence to reveal the original plaintext characters."
 msgstr ""
 
-#: gnu/packages/games.scm:3887
+#: gnu/packages/games.scm:3921
 msgid "Data files for MegaGlest"
 msgstr "Fichiers de données pour MegaGlest"
 
-#: gnu/packages/games.scm:3888
+#: gnu/packages/games.scm:3922
 msgid "This package contains the data files required for MegaGlest."
 msgstr "Ce paquet contient les fichiers de données requis par MegaGlest."
 
-#: gnu/packages/games.scm:3941
+#: gnu/packages/games.scm:3975
 msgid "3D real-time strategy (RTS) game"
 msgstr ""
 
-#: gnu/packages/games.scm:3942
+#: gnu/packages/games.scm:3976
 msgid ""
 "MegaGlest is a cross-platform 3D real-time strategy (RTS)\n"
 "game, where you control the armies of one of seven different factions: Tech,\n"
 "Magic, Egypt, Indians, Norsemen, Persian or Romans."
 msgstr ""
 
-#: gnu/packages/games.scm:3993
+#: gnu/packages/games.scm:4027
 msgid "Side-scrolling physics platformer with a ball of tar"
 msgstr ""
 
-#: gnu/packages/games.scm:3994
+#: gnu/packages/games.scm:4028
 msgid ""
 "In FreeGish you control Gish, a ball of tar who lives\n"
 "happily with his girlfriend Brea, until one day a mysterious dark creature\n"
 "emerges from a sewer hole and pulls her below ground."
 msgstr ""
 
-#: gnu/packages/games.scm:4030
+#: gnu/packages/games.scm:4064
 msgid "Classic overhead run-and-gun game"
 msgstr ""
 
-#: gnu/packages/games.scm:4031
+#: gnu/packages/games.scm:4065
 msgid ""
 "C-Dogs SDL is a classic overhead run-and-gun game,\n"
 "supporting up to 4 players in co-op and deathmatch modes.  Customize your\n"
@@ -4655,33 +4498,33 @@ msgid ""
 "over 100 user-created campaigns."
 msgstr ""
 
-#: gnu/packages/games.scm:4131
+#: gnu/packages/games.scm:4165
 msgid "3D puzzle game"
 msgstr ""
 
-#: gnu/packages/games.scm:4132
+#: gnu/packages/games.scm:4166
 msgid ""
 "Kiki the nano bot is a 3D puzzle game.  It is basically a\n"
 "mixture of the games Sokoban and Kula-World.  Your task is to help Kiki, a\n"
 "small robot living in the nano world, repair its maker."
 msgstr ""
 
-#: gnu/packages/games.scm:4264
+#: gnu/packages/games.scm:4300
 msgid "2D retro multiplayer shooter game"
 msgstr ""
 
-#: gnu/packages/games.scm:4265
+#: gnu/packages/games.scm:4301
 msgid ""
 "Teeworlds is an online multiplayer game.  Battle with up to\n"
 "16 players in a variety of game modes, including Team Deathmatch and Capture\n"
 "The Flag.  You can even design your own maps!"
 msgstr ""
 
-#: gnu/packages/games.scm:4318
+#: gnu/packages/games.scm:4354
 msgid "Puzzle game with a dexterity component"
 msgstr ""
 
-#: gnu/packages/games.scm:4319
+#: gnu/packages/games.scm:4355
 msgid ""
 "Enigma is a puzzle game with 550 unique levels.  The object\n"
 "of the game is to find and uncover pairs of identically colored ‘Oxyd’ stones.\n"
@@ -4693,11 +4536,11 @@ msgid ""
 "with the mouse isn’t always trivial."
 msgstr ""
 
-#: gnu/packages/games.scm:4352
+#: gnu/packages/games.scm:4388
 msgid "Abstract puzzle game"
 msgstr ""
 
-#: gnu/packages/games.scm:4353
+#: gnu/packages/games.scm:4389
 msgid ""
 "Chroma is an abstract puzzle game. A variety of colourful\n"
 "shapes are arranged in a series of increasingly complex patterns, forming\n"
@@ -4707,11 +4550,11 @@ msgid ""
 " becoming difficult enough to tax even the brightest of minds."
 msgstr ""
 
-#: gnu/packages/games.scm:4422
+#: gnu/packages/games.scm:4458
 msgid "Puzzle game"
 msgstr ""
 
-#: gnu/packages/games.scm:4423
+#: gnu/packages/games.scm:4459
 msgid ""
 "Fish Fillets NG is strictly a puzzle game.  The goal in\n"
 "every of the seventy levels is always the same: find a safe way out.  The fish\n"
@@ -4720,26 +4563,26 @@ msgid ""
 "fish.  The whole game is accompanied by quiet, comforting music."
 msgstr ""
 
-#: gnu/packages/games.scm:4487
+#: gnu/packages/games.scm:4536
 msgid "Roguelike dungeon crawler game"
 msgstr ""
 
-#: gnu/packages/games.scm:4488
+#: gnu/packages/games.scm:4537
 msgid ""
-"Dungeon Crawl Stone Soup is a roguelike adventure through\n"
-"dungeons filled with dangerous monsters in a quest to find the mystifyingly\n"
-"fabulous Orb of Zot."
+"Dungeon Crawl Stone Soup (also known as \"Crawl\" or DCSS\n"
+"for short) is a roguelike adventure through dungeons filled with dangerous\n"
+"monsters in a quest to find the mystifyingly fabulous Orb of Zot."
 msgstr ""
 
-#: gnu/packages/games.scm:4534
+#: gnu/packages/games.scm:4586
 msgid "Graphical roguelike dungeon crawler game"
 msgstr ""
 
-#: gnu/packages/games.scm:4564
+#: gnu/packages/games.scm:4619
 msgid "Cross-platform third-person action game"
 msgstr ""
 
-#: gnu/packages/games.scm:4565
+#: gnu/packages/games.scm:4620
 msgid ""
 "Lugaru is a third-person action game.  The main character,\n"
 "Turner, is an anthropomorphic rebel bunny rabbit with impressive combat skills.\n"
@@ -4749,19 +4592,19 @@ msgid ""
 "fight against their plot and save his fellow rabbits from slavery."
 msgstr ""
 
-#: gnu/packages/games.scm:4615
+#: gnu/packages/games.scm:4670
 msgid "Data files for 0ad"
 msgstr ""
 
-#: gnu/packages/games.scm:4616
+#: gnu/packages/games.scm:4671
 msgid "0ad-data provides the data files required by the game 0ad."
 msgstr ""
 
-#: gnu/packages/games.scm:4734
+#: gnu/packages/games.scm:4789
 msgid "3D real-time strategy game of ancient warfare"
 msgstr ""
 
-#: gnu/packages/games.scm:4735
+#: gnu/packages/games.scm:4790
 msgid ""
 "0 A.D. is a real-time strategy (RTS) game of ancient\n"
 "warfare.  It's a historically-based war/economy game that allows players to\n"
@@ -4771,11 +4614,11 @@ msgid ""
 "0ad needs a window manager that supports 'Extended Window Manager Hints'."
 msgstr ""
 
-#: gnu/packages/games.scm:4810
+#: gnu/packages/games.scm:4865
 msgid "Colossal Cave Adventure"
 msgstr ""
 
-#: gnu/packages/games.scm:4811
+#: gnu/packages/games.scm:4866
 msgid ""
 "The original Colossal Cave Adventure from 1976 was the\n"
 "origin of all text adventures, dungeon-crawl (computer) games, and\n"
@@ -4784,11 +4627,11 @@ msgid ""
 "\"adventure 2.5\" and \"430-point adventure\"."
 msgstr ""
 
-#: gnu/packages/games.scm:4822
+#: gnu/packages/games.scm:4877
 msgid "Single-player, RPG roguelike game set in the world of Eyal"
 msgstr ""
 
-#: gnu/packages/games.scm:4930
+#: gnu/packages/games.scm:4987
 msgid ""
 "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based\n"
 "combat and advanced character building.  Play as one of many unique races and\n"
@@ -4799,29 +4642,29 @@ msgid ""
 "Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century."
 msgstr ""
 
-#: gnu/packages/games.scm:4976
+#: gnu/packages/games.scm:5036
 msgid "First person shooter engine for Quake 1"
 msgstr ""
 
-#: gnu/packages/games.scm:4977
+#: gnu/packages/games.scm:5037
 msgid ""
 "Quakespasm is a modern engine for id software's Quake 1.\n"
 "It includes support for 64 bit CPUs, custom music playback, a new sound driver,\n"
 "some graphical niceities, and numerous bug-fixes and other improvements."
 msgstr ""
 
-#: gnu/packages/games.scm:5027
+#: gnu/packages/games.scm:5087
 msgid ""
 "vkquake is a modern engine for id software's Quake 1.\n"
 "It includes support for 64 bit CPUs, custom music playback, a new sound driver,\n"
 "some graphical niceities, and numerous bug-fixes and other improvements."
 msgstr ""
 
-#: gnu/packages/games.scm:5078
+#: gnu/packages/games.scm:5138
 msgid "First person shooter engine based on quake2"
 msgstr ""
 
-#: gnu/packages/games.scm:5079
+#: gnu/packages/games.scm:5139
 msgid ""
 "Yamagi Quake II is an enhanced client for id Software's Quake II.\n"
 "The main focus is an unchanged single player experience like back in 1997,\n"
@@ -4831,30 +4674,30 @@ msgid ""
 "making Yamagi Quake II one of the most solid Quake II implementations available."
 msgstr ""
 
-#: gnu/packages/games.scm:5107
+#: gnu/packages/games.scm:5167
 msgid "Sudoku for your terminal"
 msgstr ""
 
-#: gnu/packages/games.scm:5108
+#: gnu/packages/games.scm:5168
 msgid "Nudoku is a ncurses-based Sudoku game for your terminal."
 msgstr ""
 
-#: gnu/packages/games.scm:5154
+#: gnu/packages/games.scm:5214
 msgid "Realistic physics puzzle game"
 msgstr ""
 
-#: gnu/packages/games.scm:5155
+#: gnu/packages/games.scm:5215
 msgid ""
 "The Butterfly Effect (tbe) is a game that uses\n"
 "realistic physics simulations to combine lots of simple mechanical\n"
 "elements to achieve a simple goal in the most complex way possible."
 msgstr ""
 
-#: gnu/packages/games.scm:5206
+#: gnu/packages/games.scm:5266
 msgid "Game of lonely space adventure"
 msgstr ""
 
-#: gnu/packages/games.scm:5208
+#: gnu/packages/games.scm:5268
 msgid ""
 "Pioneer is a space adventure game set in our galaxy at the turn of the\n"
 "31st century.  The game is open-ended, and you are free to eke out whatever\n"
@@ -4865,22 +4708,22 @@ msgid ""
 "whatever you make of it."
 msgstr ""
 
-#: gnu/packages/games.scm:5235
+#: gnu/packages/games.scm:5295
 msgid "Hacking contribution graphs in git"
 msgstr ""
 
-#: gnu/packages/games.scm:5237
+#: gnu/packages/games.scm:5297
 msgid ""
 "Badass generates false commits for a range of dates, essentially\n"
 "hacking the gamification of contribution graphs on platforms such as\n"
 "Github or Gitlab."
 msgstr ""
 
-#: gnu/packages/games.scm:5315
+#: gnu/packages/games.scm:5370
 msgid "Educational programming strategy game"
 msgstr ""
 
-#: gnu/packages/games.scm:5316
+#: gnu/packages/games.scm:5371
 msgid ""
 "Colobot: Gold Edition is a real-time strategy game, where\n"
 "you can program your units (bots) in a language called CBOT, which is similar\n"
@@ -4888,11 +4731,11 @@ msgid ""
 "You can save humanity and get programming skills!"
 msgstr ""
 
-#: gnu/packages/games.scm:5399
+#: gnu/packages/games.scm:5454
 msgid "Modern Doom 2 source port"
 msgstr ""
 
-#: gnu/packages/games.scm:5400
+#: gnu/packages/games.scm:5455
 msgid ""
 "GZdoom is a port of the Doom 2 game engine, with a modern\n"
 "renderer.  It improves modding support with ZDoom's advanced mapping features\n"
@@ -4900,29 +4743,40 @@ msgid ""
 "Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom."
 msgstr ""
 
-#: gnu/packages/games.scm:5470
+#: gnu/packages/games.scm:5491
+msgid "Multiplayer Doom port"
+msgstr ""
+
+#: gnu/packages/games.scm:5492
+msgid ""
+"Odamex is a modification of the Doom engine that\n"
+"allows players to easily join servers dedicated to playing Doom\n"
+"online."
+msgstr ""
+
+#: gnu/packages/games.scm:5558
 msgid "The Fortune Cookie program from BSD games"
 msgstr ""
 
-#: gnu/packages/games.scm:5471
+#: gnu/packages/games.scm:5559
 msgid ""
 "Fortune is a command-line utility which displays a random\n"
 "quotation from a collection of quotes."
 msgstr ""
 
-#: gnu/packages/games.scm:5511
+#: gnu/packages/games.scm:5599
 msgid "Data files for Xonotic"
 msgstr "Fichiers de données pour Xonotic"
 
-#: gnu/packages/games.scm:5513
+#: gnu/packages/games.scm:5601
 msgid "Xonotic-data provides the data files required by the game Xonotic."
 msgstr "Ce paquet contient les fichiers de données requis par le jeu Xonotic."
 
-#: gnu/packages/games.scm:5707
+#: gnu/packages/games.scm:5795
 msgid "Fast-paced first-person shooter game"
 msgstr ""
 
-#: gnu/packages/games.scm:5709
+#: gnu/packages/games.scm:5797
 msgid ""
 "Xonotic is a free, fast-paced first-person shooter.\n"
 "The project is geared towards providing addictive arena shooter\n"
@@ -4932,11 +4786,11 @@ msgid ""
 "open-source FPS of its kind."
 msgstr ""
 
-#: gnu/packages/games.scm:5759
+#: gnu/packages/games.scm:5847
 msgid "Portable Z-machine interpreter (ncurses version) for text adventure games"
 msgstr ""
 
-#: gnu/packages/games.scm:5760
+#: gnu/packages/games.scm:5848
 msgid ""
 "Frotz is an interpreter for Infocom games and other Z-machine\n"
 "games in the text adventure/interactive fiction genre.  This version of Frotz\n"
@@ -4945,11 +4799,11 @@ msgid ""
 "ncurses for text display."
 msgstr ""
 
-#: gnu/packages/games.scm:5801
+#: gnu/packages/games.scm:5889
 msgid "Portable Z-machine dumb interpreter for text adventure games"
 msgstr ""
 
-#: gnu/packages/games.scm:5802
+#: gnu/packages/games.scm:5890
 msgid ""
 "Frotz is an interpreter for Infocom games and\n"
 "other Z-machine games in the text adventure/interactive fiction genre.\n"
@@ -4961,11 +4815,11 @@ msgid ""
 "to play games on webpages.  It can also be made into a chat bot."
 msgstr ""
 
-#: gnu/packages/games.scm:5865
+#: gnu/packages/games.scm:5953
 msgid "Portable Z-machine interpreter (SDL port) for text adventure games"
 msgstr ""
 
-#: gnu/packages/games.scm:5866
+#: gnu/packages/games.scm:5954
 msgid ""
 "Frotz is an interpreter for Infocom games and other Z-machine\n"
 "games in the text adventure/interactive fiction genre.  This version of Frotz\n"
@@ -4975,6 +4829,178 @@ msgid ""
 "when packaged in Blorb container files or optionally from individual files."
 msgstr ""
 
+#: gnu/packages/games.scm:5985
+msgid "Game controller library"
+msgstr ""
+
+#: gnu/packages/games.scm:5986
+msgid ""
+"Libmanette is a small GObject library giving you simple\n"
+"access to game controllers.  It supports the de-facto standard gamepads as\n"
+"defined by the W3C standard Gamepad specification or as implemented by the SDL\n"
+"GameController."
+msgstr ""
+
+#: gnu/packages/games.scm:6021
+msgid "GNOME version of Tetris"
+msgstr ""
+
+#: gnu/packages/games.scm:6022
+msgid ""
+"Quadrapassel comes from the classic falling-block game,\n"
+"Tetris.  The goal of the game is to create complete horizontal lines of\n"
+"blocks, which will disappear.  The blocks come in seven different shapes made\n"
+"from four blocks each: one straight, two L-shaped, one square, and two\n"
+"S-shaped.  The blocks fall from the top center of the screen in a random\n"
+"order.  You rotate the blocks and move them across the screen to drop them in\n"
+"complete lines.  You score by dropping blocks fast and completing lines.  As\n"
+"your score gets higher, you level up and the blocks fall faster."
+msgstr ""
+
+#: gnu/packages/games.scm:6076
+msgid "2D space trading and combat game"
+msgstr ""
+
+#: gnu/packages/games.scm:6077
+msgid ""
+"Endless Sky is a 2D space trading and combat game.  Explore\n"
+"other star systems.  Earn money by trading, carrying passengers, or completing\n"
+"missions.  Use your earnings to buy a better ship or to upgrade the weapons and\n"
+"engines on your current one.  Blow up pirates.  Take sides in a civil war.  Or\n"
+"leave human space behind and hope to find friendly aliens whose culture is more\n"
+"civilized than your own."
+msgstr ""
+
+#: gnu/packages/games.scm:6226
+msgid "Advanced rhythm game designed for both home and arcade use"
+msgstr ""
+
+#: gnu/packages/games.scm:6227
+msgid ""
+"StepMania is a dance and rhythm game.  It features 3D\n"
+"graphics, keyboard and dance pad support, and an editor for creating your own\n"
+"steps.\n"
+"\n"
+"This package provides the core application, but no song is shipped.  You need\n"
+"to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory."
+msgstr ""
+
+#: gnu/packages/games.scm:6311
+msgid "Multiplayer tank battle game"
+msgstr ""
+
+#: gnu/packages/games.scm:6312
+msgid ""
+"Battle Tanks (also known as \"btanks\") is a funny battle\n"
+"game, where you can choose one of three vehicles and eliminate your enemy\n"
+"using the whole arsenal of weapons.  It has original cartoon-like graphics and\n"
+"cool music, it’s fun and dynamic, it has several network modes for deathmatch\n"
+"and cooperative."
+msgstr ""
+
+#: gnu/packages/games.scm:6345
+msgid "Simple 2D shooting strategy game set in space"
+msgstr ""
+
+#: gnu/packages/games.scm:6346
+msgid ""
+"Slingshot is a two-dimensional strategy game where two\n"
+"players attempt to shoot one another through a section of space populated by\n"
+"planets.  The main feature of the game is that the shots, once fired, are\n"
+"affected by the gravity of the planets."
+msgstr ""
+
+#: gnu/packages/games.scm:6392
+msgid "4D Tetris"
+msgstr ""
+
+#: gnu/packages/games.scm:6393
+msgid ""
+"4D-TRIS is an alteration of the well-known Tetris game.  The\n"
+"game field is extended to 4D space, which has to filled up by the gamer with\n"
+"4D hyper cubes."
+msgstr ""
+
+#: gnu/packages/games.scm:6469
+msgid "Port of Arx Fatalis, a first-person role-playing game"
+msgstr ""
+
+#: gnu/packages/games.scm:6470
+msgid ""
+"Arx Libertatis is a cross-platform, open source port of Arx\n"
+"Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by\n"
+"Arkane Studios.  This port however does not include the game data, so you need\n"
+"to obtain a copy of the original Arx Fatalis or its demo to play Arx\n"
+"Libertatis.  Arx Fatalis features crafting, melee and ranged combat, as well\n"
+"as a unique casting system where the player draws runes in real time to effect\n"
+"the desired spell."
+msgstr ""
+
+#: gnu/packages/games.scm:6518
+msgid "2d action platformer game"
+msgstr ""
+
+#: gnu/packages/games.scm:6519
+msgid ""
+"The Legend of Edgar is a 2D platform game with a persistent world.\n"
+"When Edgar's father fails to return home after venturing out one dark and stormy night,\n"
+"Edgar fears the worst: he has been captured by the evil sorcerer who lives in\n"
+"a fortress beyond the forbidden swamp."
+msgstr ""
+
+#: gnu/packages/games.scm:6607
+msgid "Multiplayer action game where you control small and nimble humanoids"
+msgstr ""
+
+#: gnu/packages/games.scm:6608
+msgid ""
+"OpenClonk is a multiplayer action/tactics/skill game.  It is\n"
+"often referred to as a mixture of The Settlers and Worms.  In a simple 2D\n"
+"antfarm-style landscape, the player controls his crew of Clonks, small but\n"
+"robust humanoid beings.  The game encourages free play but the normal goal is\n"
+"to either exploit valuable resources from the earth by building a mine or\n"
+"fight each other on an arena-like map."
+msgstr ""
+
+#: gnu/packages/games.scm:6639
+msgid "Action Roleplaying Engine"
+msgstr ""
+
+#: gnu/packages/games.scm:6640
+msgid ""
+"Flare (Free Libre Action Roleplaying Engine) is a simple\n"
+"game engine built to handle a very specific kind of game: single-player 2D\n"
+"action RPGs."
+msgstr ""
+
+#: gnu/packages/games.scm:6704
+msgid "Fantasy action RPG using the FLARE engine"
+msgstr ""
+
+#: gnu/packages/games.scm:6705
+msgid ""
+"Flare is a single-player 2D action RPG with\n"
+"fast-paced action and a dark fantasy style."
+msgstr ""
+
+#: gnu/packages/games.scm:6756
+msgid "Action-adventure dungeon crawl game"
+msgstr ""
+
+#: gnu/packages/games.scm:6757
+msgid ""
+"Far below the surface of the planet is a place of limitless\n"
+"power.  Those that seek to control such a utopia will soon bring an end to\n"
+"themselves.  Seeking an end to the troubles that plague him, PSI user Merit\n"
+"journeys into the hallowed Orcus Dome in search of answers.\n"
+"\n"
+"Meritous is a action-adventure game with simple controls but a challenge to\n"
+"find a balance of power versus recovery time during real-time battles.  Set in\n"
+"a procedurally generated world, the player can explore thousands of rooms in\n"
+"search of powerful artifacts, tools to help them, and to eventually free the\n"
+"Orcus Dome from evil."
+msgstr ""
+
 #: gnu/packages/gcc.scm:348
 msgid "GNU Compiler Collection"
 msgstr "GNU Compiler Collection"
@@ -4989,7 +5015,7 @@ msgstr ""
 "pour plusieurs langages, dont C, C++, Objective-C, Fortran, Java, Ada,\n"
 "et Go. Il inclut également le support de bibliothèques pour ces langages."
 
-#: gnu/packages/gcc.scm:516
+#: gnu/packages/gcc.scm:504
 msgid ""
 "GCC is the GNU Compiler Collection.  It provides compiler front-ends\n"
 "for several languages, including C, C++, Objective-C, Fortran, Ada, and Go.\n"
@@ -4999,25 +5025,25 @@ msgstr ""
 "pour plusieurs langages, dont C, C++, Objective-C, Fortran, Ada et Go.\n"
 "Il inclut également le support de bibliothèques pour ces langages."
 
-#: gnu/packages/gcc.scm:561
+#: gnu/packages/gcc.scm:549
 msgid "GNU C++ standard library"
 msgstr "Bibliothèque standard C++ GNU"
 
-#: gnu/packages/gcc.scm:596
+#: gnu/packages/gcc.scm:584
 msgid "Collection of subroutines used by various GNU programs"
 msgstr "Collection de sous-routines utilisées par divers programmes GNU"
 
-#: gnu/packages/gcc.scm:803
+#: gnu/packages/gcc.scm:791
 msgid "GNU libstdc++ documentation"
 msgstr "Documentation de GNU libstdc++"
 
-#: gnu/packages/gcc.scm:873
+#: gnu/packages/gcc.scm:861
 msgid "Manipulating sets and relations of integer points bounded by linear constraints"
 msgstr ""
 "Manipulation des ensembles et relations d'entiers liés par des\n"
 "contraintes linéaires"
 
-#: gnu/packages/gcc.scm:876
+#: gnu/packages/gcc.scm:864
 msgid ""
 "isl is a library for manipulating sets and relations of integer points\n"
 "bounded by linear constraints.  Supported operations on sets include\n"
@@ -5029,11 +5055,11 @@ msgid ""
 "dependence analysis and bounds on piecewise step-polynomials."
 msgstr ""
 
-#: gnu/packages/gcc.scm:926
+#: gnu/packages/gcc.scm:928
 msgid "Library to generate code for scanning Z-polyhedra"
 msgstr "Bibliothèque poru générer du code pour analyser des Z-polyhèdres"
 
-#: gnu/packages/gcc.scm:928
+#: gnu/packages/gcc.scm:930
 msgid ""
 "CLooG is a free software library to generate code for scanning\n"
 "Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that\n"
@@ -5059,11 +5085,11 @@ msgstr ""
 "contrôle complet de la qualité du code généré, mais CLooG est conçu pour\n"
 "éviter le sur-coût des contrôles et pour produire un code très efficace."
 
-#: gnu/packages/gcc.scm:983
+#: gnu/packages/gcc.scm:985
 msgid "Reference manual for the C programming language"
 msgstr "Manuel de référence pour le langage de programmation C"
 
-#: gnu/packages/gcc.scm:985
+#: gnu/packages/gcc.scm:987
 msgid ""
 "This is a reference manual for the C programming language, as\n"
 "implemented by the GNU C Compiler (gcc).  As a reference, it is not intended\n"
@@ -5096,11 +5122,11 @@ msgstr ""
 msgid "Tools and documentation for translation"
 msgstr "Outils et documentation pour la traduction"
 
-#: gnu/packages/gettext.scm:201
+#: gnu/packages/gettext.scm:206
 msgid "Scripts to ease maintenance of translations"
 msgstr "Scripts pour faciliter la maintenance des traductions"
 
-#: gnu/packages/gettext.scm:203
+#: gnu/packages/gettext.scm:208
 msgid ""
 "The po4a (PO for anything) project goal is to ease translations (and\n"
 "more interestingly, the maintenance of translations) using gettext tools on\n"
@@ -5205,33 +5231,33 @@ msgid ""
 "transfering the style of an image."
 msgstr ""
 
-#: gnu/packages/gnome.scm:208
+#: gnu/packages/gnome.scm:221
 msgid "CD/DVD burning tool for Gnome"
 msgstr ""
 
-#: gnu/packages/gnome.scm:209
+#: gnu/packages/gnome.scm:222
 msgid ""
 "Brasero is an application to burn CD/DVD for the Gnome\n"
 "Desktop.  It is designed to be as simple as possible and has some unique\n"
 "features to enable users to create their discs easily and quickly."
 msgstr ""
 
-#: gnu/packages/gnome.scm:284
+#: gnu/packages/gnome.scm:297
 msgid "Simple backup tool, for regular encrypted backups"
 msgstr ""
 
-#: gnu/packages/gnome.scm:286
+#: gnu/packages/gnome.scm:299
 msgid ""
 "Déjà Dup is a simple backup tool, for regular encrypted backups.  It\n"
 "uses duplicity as the backend, which supports incremental backups and storage\n"
 "either on a local, or remote machine via a number of methods."
 msgstr ""
 
-#: gnu/packages/gnome.scm:333
+#: gnu/packages/gnome.scm:346
 msgid "Diagram creation for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:334
+#: gnu/packages/gnome.scm:347
 msgid ""
 "Dia can be used to draw different types of diagrams, and\n"
 "includes support for UML static structure diagrams (class diagrams), entity\n"
@@ -5239,33 +5265,33 @@ msgid ""
 "formats like PNG, SVG, PDF and EPS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:390
+#: gnu/packages/gnome.scm:397
 msgid "Library for accessing online service APIs"
 msgstr "Bibliothèque d'accès à des API de services en ligne"
 
-#: gnu/packages/gnome.scm:392
+#: gnu/packages/gnome.scm:399
 msgid ""
 "libgdata is a GLib-based library for accessing online service APIs using\n"
 "the GData protocol — most notably, Google's services.  It provides APIs to\n"
 "access the common Google services, and has full asynchronous support."
 msgstr ""
 
-#: gnu/packages/gnome.scm:425
+#: gnu/packages/gnome.scm:432
 msgid "GObject-based library for handling and rendering XPS documents"
 msgstr ""
 
-#: gnu/packages/gnome.scm:427
+#: gnu/packages/gnome.scm:434
 msgid ""
 "libgxps is a GObject-based library for handling and rendering XPS\n"
 "documents.  This package also contains binaries that can convert XPS documents\n"
 "to other formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:447
+#: gnu/packages/gnome.scm:454
 msgid "Bootstrap GNOME modules built from Git"
 msgstr ""
 
-#: gnu/packages/gnome.scm:448
+#: gnu/packages/gnome.scm:455
 msgid ""
 "gnome-common contains various files needed to bootstrap\n"
 "GNOME modules built from Git.  It contains a common \"autogen.sh\" script that\n"
@@ -5273,11 +5299,11 @@ msgid ""
 "commonly used macros."
 msgstr ""
 
-#: gnu/packages/gnome.scm:499
+#: gnu/packages/gnome.scm:506
 msgid "Libgnome-desktop, gnome-about, and desktop-wide documents"
 msgstr ""
 
-#: gnu/packages/gnome.scm:501
+#: gnu/packages/gnome.scm:508
 msgid ""
 "The libgnome-desktop library provides API shared by several applications\n"
 "on the desktop, but that cannot live in the platform for various reasons.\n"
@@ -5287,49 +5313,49 @@ msgid ""
 "The gnome-about program helps find which version of GNOME is installed."
 msgstr ""
 
-#: gnu/packages/gnome.scm:534
+#: gnu/packages/gnome.scm:541
 msgid "Documentation utilities for the Gnome project"
 msgstr "Utilitaires de documentation pour le projet Gnome"
 
-#: gnu/packages/gnome.scm:536
+#: gnu/packages/gnome.scm:543
 msgid ""
 "Gnome-doc-utils is a collection of documentation utilities for the\n"
 "Gnome project.  It includes xml2po tool which makes it easier to translate\n"
 "and keep up to date translations of documentation."
 msgstr ""
 
-#: gnu/packages/gnome.scm:575
+#: gnu/packages/gnome.scm:582
 msgid "Disk management utility for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:576
+#: gnu/packages/gnome.scm:583
 msgid "Disk management utility for GNOME."
 msgstr ""
 
-#: gnu/packages/gnome.scm:619
+#: gnu/packages/gnome.scm:626
 msgid "Libraries for displaying certificates and accessing key stores"
 msgstr ""
 
-#: gnu/packages/gnome.scm:621
+#: gnu/packages/gnome.scm:628
 msgid ""
 "The GCR package contains libraries used for displaying certificates and\n"
 "accessing key stores.  It also provides the viewer for crypto files on the\n"
 "GNOME Desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:650
+#: gnu/packages/gnome.scm:657
 msgid "Accessing passwords from the GNOME keyring"
 msgstr ""
 
-#: gnu/packages/gnome.scm:652
+#: gnu/packages/gnome.scm:659
 msgid "Client library to access passwords from the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:722
+#: gnu/packages/gnome.scm:729
 msgid "Daemon to store passwords and encryption keys"
 msgstr ""
 
-#: gnu/packages/gnome.scm:724
+#: gnu/packages/gnome.scm:731
 msgid ""
 "gnome-keyring is a program that keeps passwords and other secrets for\n"
 "users.  It is run as a daemon in the session, similar to ssh-agent, and other\n"
@@ -5340,11 +5366,11 @@ msgid ""
 "forgotten when the session ends."
 msgstr ""
 
-#: gnu/packages/gnome.scm:798
+#: gnu/packages/gnome.scm:805
 msgid "GNOME's document viewer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:800
+#: gnu/packages/gnome.scm:807
 msgid ""
 "Evince is a document viewer for multiple document formats.  It\n"
 "currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal\n"
@@ -5352,50 +5378,50 @@ msgid ""
 "on the GNOME Desktop with a single simple application."
 msgstr ""
 
-#: gnu/packages/gnome.scm:829
+#: gnu/packages/gnome.scm:836
 msgid "GNOME settings for various desktop components"
 msgstr ""
 
-#: gnu/packages/gnome.scm:831
+#: gnu/packages/gnome.scm:838
 msgid ""
 "Gsettings-desktop-schemas contains a collection of GSettings schemas\n"
 "for settings shared by various components of the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:865
+#: gnu/packages/gnome.scm:872
 msgid "Utility to implement the Freedesktop Icon Naming Specification"
 msgstr ""
 
-#: gnu/packages/gnome.scm:867
+#: gnu/packages/gnome.scm:874
 msgid ""
 "To help with the transition to the Freedesktop Icon Naming\n"
 "Specification, the icon naming utility maps the icon names used by the\n"
 "GNOME and KDE desktops to the icon names proposed in the specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:898
+#: gnu/packages/gnome.scm:905
 msgid "GNOME icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:900
+#: gnu/packages/gnome.scm:907
 msgid "Icons for the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:937
+#: gnu/packages/gnome.scm:944
 msgid "Tango icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:938
+#: gnu/packages/gnome.scm:945
 msgid ""
 "This is an icon theme that follows the Tango visual\n"
 "guidelines."
 msgstr ""
 
-#: gnu/packages/gnome.scm:964
+#: gnu/packages/gnome.scm:971
 msgid "Database of common MIME types"
 msgstr ""
 
-#: gnu/packages/gnome.scm:966
+#: gnu/packages/gnome.scm:973
 msgid ""
 "The shared-mime-info package contains the core database of common types\n"
 "and the update-mime-database command used to extend it.  It requires glib2 to\n"
@@ -5404,19 +5430,30 @@ msgid ""
 "database is translated at Transifex."
 msgstr ""
 
-#: gnu/packages/gnome.scm:990
+#: gnu/packages/gnome.scm:1055
+msgid "CUPS administration tool"
+msgstr ""
+
+#: gnu/packages/gnome.scm:1057
+msgid ""
+"system-config-printer is a CUPS administration tool.  It's written in\n"
+"Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when\n"
+"configuring CUPS."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1079
 msgid "Freedesktop icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:992
+#: gnu/packages/gnome.scm:1081
 msgid "Freedesktop icon theme."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1020
+#: gnu/packages/gnome.scm:1109
 msgid "GNOME desktop notification library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1022
+#: gnu/packages/gnome.scm:1111
 msgid ""
 "Libnotify is a library that sends desktop notifications to a\n"
 "notification daemon, as defined in the Desktop Notifications spec.  These\n"
@@ -5424,11 +5461,11 @@ msgid ""
 "some form of information without getting in the user's way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1056
+#: gnu/packages/gnome.scm:1145
 msgid "GObject plugin system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1058
+#: gnu/packages/gnome.scm:1147
 msgid ""
 "Libpeas is a gobject-based plugin engine, targeted at giving every\n"
 "application the chance to assume its own extensibility.  It also has a set of\n"
@@ -5437,33 +5474,33 @@ msgid ""
 "API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1097
+#: gnu/packages/gnome.scm:1186
 msgid "OpenGL extension to GTK+"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1098
+#: gnu/packages/gnome.scm:1187
 msgid ""
 "GtkGLExt is an OpenGL extension to GTK+.  It provides\n"
 "additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget\n"
 "API add-ons to make GTK+ widgets OpenGL-capable."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1141
+#: gnu/packages/gnome.scm:1230
 msgid "GTK+ rapid application development tool"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1142
+#: gnu/packages/gnome.scm:1231
 msgid ""
 "Glade is a rapid application development (RAD) tool to\n"
 "enable quick & easy development of user interfaces for the GTK+ toolkit and\n"
 "the GNOME desktop environment."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1170
+#: gnu/packages/gnome.scm:1259
 msgid "CSS2 parsing and manipulation library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1172
+#: gnu/packages/gnome.scm:1261
 msgid ""
 "Libcroco is a standalone CSS2 parsing and manipulation library.\n"
 "The parser provides a low level event driven SAC-like API and a CSS object\n"
@@ -5471,31 +5508,31 @@ msgid ""
 "XML/CSS rendering engine."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1205
+#: gnu/packages/gnome.scm:1294
 msgid "GNOME's Structured File Library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1207
+#: gnu/packages/gnome.scm:1296
 msgid ""
 "Libgsf aims to provide an efficient extensible I/O abstraction for\n"
 "dealing with different structured file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1272
+#: gnu/packages/gnome.scm:1361
 msgid "Render SVG files using Cairo"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1274
+#: gnu/packages/gnome.scm:1363
 msgid ""
 "Librsvg is a C library to render SVG files using the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1298
+#: gnu/packages/gnome.scm:1387
 msgid "Create trees of CORBA Interface Definition Language files"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1299
+#: gnu/packages/gnome.scm:1388
 msgid ""
 "Libidl is a library for creating trees of CORBA Interface\n"
 "Definition Language (idl) files, which is a specification for defining\n"
@@ -5504,144 +5541,144 @@ msgid ""
 "functionality was designed to be as reusable and portable as possible."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1339
+#: gnu/packages/gnome.scm:1432
 msgid "CORBA 2.4-compliant Object Request Broker"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1340
+#: gnu/packages/gnome.scm:1433
 msgid ""
 "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)\n"
 "featuring mature C, C++ and Python bindings."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1387
+#: gnu/packages/gnome.scm:1488
 msgid "Framework for creating reusable components for use in GNOME applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1388
+#: gnu/packages/gnome.scm:1489
 msgid ""
 "Bonobo is a framework for creating reusable components for\n"
 "use in GNOME applications, built on top of CORBA."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1419
+#: gnu/packages/gnome.scm:1520
 msgid "Store application preferences"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1420
+#: gnu/packages/gnome.scm:1521
 msgid ""
 "Gconf is a system for storing application preferences.  It\n"
 "is intended for user preferences; not arbitrary data storage."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1454
+#: gnu/packages/gnome.scm:1555
 msgid "Base MIME and Application database for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1455
+#: gnu/packages/gnome.scm:1556
 msgid ""
 "GNOME Mime Data is a module which contains the base MIME\n"
 "and Application database for GNOME.  The data stored by this module is\n"
 "designed to be accessed through the MIME functions in GnomeVFS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1498
+#: gnu/packages/gnome.scm:1599
 msgid "Access files and folders in GNOME applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1500
+#: gnu/packages/gnome.scm:1601
 msgid ""
 "GnomeVFS is the core library used to access files and folders in GNOME\n"
 "applications.  It provides a file system abstraction which allows applications\n"
 "to access local and remote files with a single consistent API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1545
+#: gnu/packages/gnome.scm:1646
 msgid "Useful routines for building applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1546
+#: gnu/packages/gnome.scm:1647
 msgid ""
 "The libgnome library provides a number of useful routines\n"
 "for building modern applications, including session management, activation of\n"
 "files and URIs, and displaying help."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1569
+#: gnu/packages/gnome.scm:1670
 msgid "2D drawing library"
 msgstr "Bibliothèque de dessin 2D"
 
-#: gnu/packages/gnome.scm:1570
+#: gnu/packages/gnome.scm:1671
 msgid ""
 "Libart is a 2D drawing library intended as a\n"
 "high-quality vector-based 2D library with antialiasing and alpha composition."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1597
+#: gnu/packages/gnome.scm:1698
 msgid "Flexible widget for creating interactive structured graphics"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1598
+#: gnu/packages/gnome.scm:1699
 msgid ""
 "The GnomeCanvas widget provides a flexible widget for\n"
 "creating interactive structured graphics."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1622
+#: gnu/packages/gnome.scm:1723
 msgid "C++ bindings to the GNOME Canvas library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1623
+#: gnu/packages/gnome.scm:1724
 msgid "C++ bindings to the GNOME Canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1655
+#: gnu/packages/gnome.scm:1756
 msgid "Additional widgets for applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1656
+#: gnu/packages/gnome.scm:1757
 msgid ""
 "The libgnomeui library provides additional widgets for\n"
 "applications.  Many of the widgets from libgnomeui have already been\n"
 "ported to GTK+."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1682
+#: gnu/packages/gnome.scm:1783
 msgid "Load glade interfaces and access the glade built widgets"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1683
+#: gnu/packages/gnome.scm:1784
 msgid ""
 "Libglade is a library that provides interfaces for loading\n"
 "graphical interfaces described in glade files and for accessing the\n"
 "widgets built in the loading process."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1713 gnu/packages/gnome.scm:1745
+#: gnu/packages/gnome.scm:1814 gnu/packages/gnome.scm:1846
 msgid "Printing framework for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1715
+#: gnu/packages/gnome.scm:1816
 msgid ""
 "GNOME-print was a printing framework for GNOME.  It has been deprecated\n"
 "since ca. 2006, when GTK+ itself incorporated printing support."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1789
+#: gnu/packages/gnome.scm:1890
 msgid "Some user interface controls using Bonobo"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1790
+#: gnu/packages/gnome.scm:1891
 msgid ""
 "The Bonobo UI library provides a number of user interface\n"
 "controls using the Bonobo component framework."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1815
+#: gnu/packages/gnome.scm:1916
 msgid "Window Navigator Construction Kit"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1817
+#: gnu/packages/gnome.scm:1918
 msgid ""
 "Libwnck is the Window Navigator Construction Kit, a library for use in\n"
 "writing pagers, tasklists, and more generally applications that are dealing\n"
@@ -5649,19 +5686,19 @@ msgid ""
 "Hints specification (EWMH)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1870
+#: gnu/packages/gnome.scm:1971
 msgid "Document-centric objects and utilities"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1871
+#: gnu/packages/gnome.scm:1972
 msgid "A GLib/GTK+ set of document-centric objects and utilities."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1955
+#: gnu/packages/gnome.scm:2056
 msgid "Spreadsheet application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1957
+#: gnu/packages/gnome.scm:2058
 msgid ""
 "GNUmeric is a GNU spreadsheet application, running under GNOME.  It is\n"
 "interoperable with other spreadsheet applications.  It has a vast array of\n"
@@ -5670,29 +5707,29 @@ msgid ""
 "engineering."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1997
+#: gnu/packages/gnome.scm:2098
 msgid "Default GNOME 3 themes"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1999
+#: gnu/packages/gnome.scm:2100
 msgid "The default GNOME 3 themes (Adwaita and some accessibility themes)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2032
+#: gnu/packages/gnome.scm:2133
 msgid "Manage encryption keys and passwords in the GNOME keyring"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2034
+#: gnu/packages/gnome.scm:2135
 msgid ""
 "Seahorse is a GNOME application for managing encryption keys and\n"
 "passwords in the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2072 gnu/packages/gnome.scm:2296
+#: gnu/packages/gnome.scm:2178 gnu/packages/gnome.scm:2411
 msgid "Compiler for the GObject type system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2074
+#: gnu/packages/gnome.scm:2180
 msgid ""
 "Vala is a programming language that aims to bring modern programming\n"
 "language features to GNOME developers without imposing any additional runtime\n"
@@ -5700,11 +5737,11 @@ msgid ""
 "libraries written in C."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2106
+#: gnu/packages/gnome.scm:2212
 msgid "Virtual Terminal Emulator"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2108
+#: gnu/packages/gnome.scm:2214
 msgid ""
 "VTE is a library (libvte) implementing a terminal emulator widget for\n"
 "GTK+, and a minimal sample application (vte) using that.  Vte is mainly used in\n"
@@ -5712,39 +5749,39 @@ msgid ""
 "editors, IDEs, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2140
+#: gnu/packages/gnome.scm:2246
 msgid "Enhanced VTE terminal widget"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2142
+#: gnu/packages/gnome.scm:2248
 msgid ""
 "VTE is a library (libvte) implementing a terminal emulator widget for\n"
 "GTK+, this fork provides additional functions exposed for keyboard text\n"
 "selection and URL hints."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2228
+#: gnu/packages/gnome.scm:2344
 msgid "Remote desktop viewer for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2229
+#: gnu/packages/gnome.scm:2345
 msgid ""
 "Vinagre is a remote display client supporting the VNC, SPICE\n"
 "and RDP protocols."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2268
+#: gnu/packages/gnome.scm:2384
 msgid "Low-level GNOME configuration system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2269
+#: gnu/packages/gnome.scm:2385
 msgid ""
 "Dconf is a low-level configuration system.  Its main purpose\n"
 "is to provide a backend to GSettings on platforms that don't already have\n"
 "configuration storage systems."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2298
+#: gnu/packages/gnome.scm:2413
 msgid ""
 "JSON-GLib is a C library based on GLib providing serialization and\n"
 "deserialization support for the JavaScript Object Notation (JSON) format\n"
@@ -5753,11 +5790,11 @@ msgid ""
 "and objects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2337
+#: gnu/packages/gnome.scm:2452
 msgid "High-level API for X Keyboard Extension"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2339
+#: gnu/packages/gnome.scm:2454
 msgid ""
 "LibXklavier is a library providing high-level API for X Keyboard\n"
 "Extension known as XKB.  This library is intended to support XFree86 and other\n"
@@ -5765,58 +5802,58 @@ msgid ""
 "indicators etc)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2367
+#: gnu/packages/gnome.scm:2482
 msgid "Python bindings to librsvg"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2369
+#: gnu/packages/gnome.scm:2484
 msgid ""
 "This packages provides Python bindings to librsvg, the SVG rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2419
+#: gnu/packages/gnome.scm:2523
 msgid "Network-related GIO modules"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2421
+#: gnu/packages/gnome.scm:2525
 msgid ""
 "This package contains various network related extensions for the GIO\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2452
+#: gnu/packages/gnome.scm:2556
 msgid "RESTful web api query library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2454
+#: gnu/packages/gnome.scm:2558
 msgid ""
 "This library was designed to make it easier to access web services that\n"
 "claim to be \"RESTful\".  It includes convenience wrappers for libsoup and\n"
 "libxml to ease remote use of the RESTful API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2577
+#: gnu/packages/gnome.scm:2668
 msgid "GLib-based HTTP Library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2579
+#: gnu/packages/gnome.scm:2670
 msgid ""
 "LibSoup is an HTTP client/server library for GNOME.  It uses GObjects\n"
 "and the GLib main loop, to integrate well with GNOME applications."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2625
+#: gnu/packages/gnome.scm:2716
 msgid "GObject bindings for \"Secret Service\" API"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2627
+#: gnu/packages/gnome.scm:2718
 msgid ""
 "Libsecret is a GObject based library for storing and retrieving passwords\n"
 "and other secrets.  It communicates with the \"Secret Service\" using DBus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2656
+#: gnu/packages/gnome.scm:2747
 msgid ""
 "Five or More is a game where you try to align\n"
 " five or more objects of the same color and shape causing them to disappear.\n"
@@ -5824,21 +5861,21 @@ msgid ""
 " Try to last as long as possible."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2694
+#: gnu/packages/gnome.scm:2785
 msgid "Minesweeper game"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2696
+#: gnu/packages/gnome.scm:2787
 msgid ""
 "Mines (previously gnomine) is a puzzle game where you locate mines\n"
 "floating in an ocean using only your brain and a little bit of luck."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2727
+#: gnu/packages/gnome.scm:2818
 msgid "Japanese logic game"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2729
+#: gnu/packages/gnome.scm:2820
 msgid ""
 "Sudoku is a Japanese logic game that exploded in popularity in 2005.\n"
 "GNOME Sudoku is meant to have an interface as simple and unobstrusive as\n"
@@ -5846,11 +5883,11 @@ msgid ""
 "more fun."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2775
+#: gnu/packages/gnome.scm:2866
 msgid "Terminal emulator"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2777
+#: gnu/packages/gnome.scm:2868
 msgid ""
 "GNOME Terminal is a terminal emulator application for accessing a\n"
 "UNIX shell environment which can be used to run programs available on\n"
@@ -5860,22 +5897,22 @@ msgid ""
 "keyboard shortcuts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2843
+#: gnu/packages/gnome.scm:2934
 msgid "Color management service"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2844
+#: gnu/packages/gnome.scm:2935
 msgid ""
 "Colord is a system service that makes it easy to manage,\n"
 "install and generate color profiles to accurately color manage input and\n"
 "output devices."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2889
+#: gnu/packages/gnome.scm:2980
 msgid "Geolocation service"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2890
+#: gnu/packages/gnome.scm:2981
 msgid ""
 "Geoclue is a D-Bus service that provides location\n"
 "information.  The primary goal of the Geoclue project is to make creating\n"
@@ -5884,11 +5921,11 @@ msgid ""
 "permission from user."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2925
+#: gnu/packages/gnome.scm:3016
 msgid "Geocoding and reverse-geocoding library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2927
+#: gnu/packages/gnome.scm:3018
 msgid ""
 "geocode-glib is a convenience library for geocoding (finding longitude,\n"
 "and latitude from an address) and reverse geocoding (finding an address from\n"
@@ -5896,11 +5933,11 @@ msgid ""
 "faster results and to avoid unnecessary server load."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2974
+#: gnu/packages/gnome.scm:3065
 msgid "System daemon for managing power devices"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2976
+#: gnu/packages/gnome.scm:3067
 msgid ""
 "UPower is an abstraction for enumerating power devices,\n"
 "listening to device events and querying history and statistics.  Any\n"
@@ -5908,21 +5945,21 @@ msgid ""
 "service via the system message bus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3034
+#: gnu/packages/gnome.scm:3125
 msgid "Location, time zone, and weather library for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3036
+#: gnu/packages/gnome.scm:3127
 msgid ""
 "libgweather is a library to access weather information from online\n"
 "services for numerous locations."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3087
+#: gnu/packages/gnome.scm:3178
 msgid "GNOME settings daemon"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3089
+#: gnu/packages/gnome.scm:3180
 msgid ""
 "This package contains the daemon responsible for setting the various\n"
 "parameters of a GNOME session and the applications that run under it.  It\n"
@@ -5930,42 +5967,42 @@ msgid ""
 "settings, themes, mouse settings, and startup of other daemons."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3126
+#: gnu/packages/gnome.scm:3217
 msgid "Library to parse and save media playlists for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3127
+#: gnu/packages/gnome.scm:3218
 msgid ""
 "Totem-pl-parser is a GObjects-based library to parse and save\n"
 "playlists in a variety of formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3161
+#: gnu/packages/gnome.scm:3252
 msgid "Solitaire card games"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3163
+#: gnu/packages/gnome.scm:3254
 msgid ""
 "Aisleriot (also known as Solitaire or sol) is a collection of card games\n"
 "which are easy to play with the aid of a mouse."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3187
+#: gnu/packages/gnome.scm:3278
 msgid "API documentation browser for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3189
+#: gnu/packages/gnome.scm:3280
 msgid ""
 "Devhelp is an API documentation browser for GTK+ and GNOME.  It works\n"
 "natively with GTK-Doc (the API reference system developed for GTK+ and used\n"
 "throughout GNOME for API documentation)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3256
+#: gnu/packages/gnome.scm:3347
 msgid "Object oriented GL/GLES Abstraction/Utility Layer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3258
+#: gnu/packages/gnome.scm:3349
 msgid ""
 "Cogl is a small library for using 3D graphics hardware to draw pretty\n"
 "pictures.  The API departs from the flat state machine style of OpenGL and is\n"
@@ -5973,38 +6010,38 @@ msgid ""
 "without stepping on each others toes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3315
-msgid "Open GL based interactive canvas library"
+#: gnu/packages/gnome.scm:3406
+msgid "OpenGL-based interactive canvas library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3317 gnu/packages/gnome.scm:3346
+#: gnu/packages/gnome.scm:3408 gnu/packages/gnome.scm:3437
 msgid ""
-"Clutter is an Open GL based interactive canvas library, designed for\n"
+"Clutter is an OpenGL-based interactive canvas library, designed for\n"
 "creating fast, mainly 2D single window applications such as media box UIs,\n"
 "presentations, kiosk style applications and so on."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3344
-msgid "Open GL based interactive canvas library GTK+ widget"
+#: gnu/packages/gnome.scm:3435
+msgid "OpenGL-based interactive canvas library GTK+ widget"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3374
+#: gnu/packages/gnome.scm:3464
 msgid "Integration library for using GStreamer with Clutter"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3376
+#: gnu/packages/gnome.scm:3466
 msgid ""
 "Clutter-Gst is an integration library for using GStreamer with Clutter.\n"
 "It provides a GStreamer sink to upload frames to GL and an actor that\n"
-"implements the ClutterGstPlayer interface using playbin.  Clutter is an Open\n"
-"GL based interactive canvas library."
+"implements the ClutterGstPlayer interface using playbin.  Clutter is an\n"
+"OpenGL-based interactive canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3410
+#: gnu/packages/gnome.scm:3500
 msgid "C library providing a ClutterActor to display maps"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3412
+#: gnu/packages/gnome.scm:3502
 msgid ""
 "libchamplain is a C library providing a ClutterActor to display maps.\n"
 "It also provides a Gtk+ widget to display maps in Gtk+ applications.  Python\n"
@@ -6012,32 +6049,32 @@ msgid ""
 "such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3443
+#: gnu/packages/gnome.scm:3533
 msgid "Object mapper from GObjects to SQLite"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3445
+#: gnu/packages/gnome.scm:3535
 msgid ""
 "Gom provides an object mapper from GObjects to SQLite.  It helps you\n"
 "write applications that need to store structured data as well as make complex\n"
 "queries upon that data."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3480
+#: gnu/packages/gnome.scm:3570
 msgid "Useful functionality shared among GNOME games"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3482
+#: gnu/packages/gnome.scm:3572
 msgid ""
 "libgnome-games-support is a small library intended for internal use by\n"
 "GNOME Games, but it may be used by others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3510
+#: gnu/packages/gnome.scm:3600
 msgid "Sliding block puzzles"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3512
+#: gnu/packages/gnome.scm:3602
 msgid ""
 "GNOME Klotski is a set of block sliding puzzles.  The objective is to move\n"
 "the patterned block to the area bordered by green markers.  To do so, you will\n"
@@ -6045,55 +6082,55 @@ msgid ""
 "as possible!"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3566
+#: gnu/packages/gnome.scm:3656
 msgid "Framework for discovering and browsing media"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3568 gnu/packages/gnome.scm:3621
+#: gnu/packages/gnome.scm:3658 gnu/packages/gnome.scm:3711
 msgid ""
 "Grilo is a framework focused on making media discovery and browsing easy\n"
 "for application developers."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3619
+#: gnu/packages/gnome.scm:3709
 msgid "Plugins for the Grilo media discovery library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3722
+#: gnu/packages/gnome.scm:3812
 msgid "Simple media player for GNOME based on GStreamer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3723
+#: gnu/packages/gnome.scm:3813
 msgid ""
 "Totem is a simple yet featureful media player for GNOME\n"
 "which can read a large number of file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3824
+#: gnu/packages/gnome.scm:3914
 msgid "Music player for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3825
+#: gnu/packages/gnome.scm:3915
 msgid ""
 "Rhythmbox is a music playing application for GNOME.  It\n"
 "supports playlists, song ratings, and any codecs installed through gstreamer."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3875
+#: gnu/packages/gnome.scm:3965
 msgid "GNOME image viewer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3876
+#: gnu/packages/gnome.scm:3966
 msgid ""
 "Eye of GNOME is the GNOME image viewer.  It\n"
 "supports image conversion, rotation, and slideshows."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3898
+#: gnu/packages/gnome.scm:3988
 msgid "Extensions for the Eye of GNOME image viewer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3910
+#: gnu/packages/gnome.scm:4000
 msgid ""
 "This package provides plugins for the Eye of GNOME (EOG) image viewer,\n"
 "notably:\n"
@@ -6106,21 +6143,21 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3946
+#: gnu/packages/gnome.scm:4036
 msgid "GObject bindings for libudev"
 msgstr "Liaisons GObject pour libudev"
 
-#: gnu/packages/gnome.scm:3948
+#: gnu/packages/gnome.scm:4038
 msgid ""
 "This library provides GObject bindings for libudev.  It was originally\n"
 "part of udev-extras, then udev, then systemd.  It's now a project on its own."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3996
+#: gnu/packages/gnome.scm:4086
 msgid "Userspace virtual file system for GIO"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3998
+#: gnu/packages/gnome.scm:4088
 msgid ""
 "GVFS is a userspace virtual file system designed to work with the I/O\n"
 "abstraction of GIO.  It contains a GIO module that seamlessly adds GVFS support\n"
@@ -6131,11 +6168,11 @@ msgid ""
 "DAV, and others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4031
+#: gnu/packages/gnome.scm:4121
 msgid "GLib binding for libusb1"
 msgstr "Liaisons GLib pour libusb1"
 
-#: gnu/packages/gnome.scm:4033
+#: gnu/packages/gnome.scm:4123
 msgid ""
 "GUsb is a GObject wrapper for libusb1 that makes it easy to do\n"
 "asynchronous control, bulk and interrupt transfers with proper cancellation\n"
@@ -6143,11 +6180,11 @@ msgid ""
 "USB transfers with your high-level application or system daemon."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4084
+#: gnu/packages/gnome.scm:4174
 msgid "Document and image scanner"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4085
+#: gnu/packages/gnome.scm:4175
 msgid ""
 "Simple Scan is an easy-to-use application, designed to let\n"
 "users connect their scanner and quickly have the image/document in an\n"
@@ -6156,62 +6193,62 @@ msgid ""
 "work and the interface is well tested."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4152
+#: gnu/packages/gnome.scm:4242
 msgid "Web browser for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4154
+#: gnu/packages/gnome.scm:4244
 msgid ""
 "Eolie is a new web browser for GNOME.  It features Firefox sync support,\n"
 "a secret password store, an adblocker, and a modern UI."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4211
+#: gnu/packages/gnome.scm:4301
 msgid "GNOME web browser"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4213
+#: gnu/packages/gnome.scm:4303
 msgid ""
 "Epiphany is a GNOME web browser targeted at non-technical users.  Its\n"
 "principles are simplicity and standards compliance."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4269
+#: gnu/packages/gnome.scm:4359
 msgid "D-Bus debugger"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4271
+#: gnu/packages/gnome.scm:4361
 msgid ""
 "D-Feet is a D-Bus debugger, which can be used to inspect D-Bus interfaces\n"
 "of running programs and invoke methods on those interfaces."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4293
+#: gnu/packages/gnome.scm:4383
 msgid "XSL stylesheets for Yelp"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4295
+#: gnu/packages/gnome.scm:4385
 msgid ""
 "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser\n"
 "to format Docbook and Mallard documents."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4326
+#: gnu/packages/gnome.scm:4416
 msgid "GNOME help browser"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4328
+#: gnu/packages/gnome.scm:4418
 msgid ""
 "Yelp is the help viewer in Gnome.  It natively views Mallard, DocBook,\n"
 "man, info, and HTML documents.  It can locate documents according to the\n"
 "freedesktop.org help system specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4356
+#: gnu/packages/gnome.scm:4446
 msgid "Yelp documentation tools"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4358
+#: gnu/packages/gnome.scm:4448
 msgid ""
 "Yelp-tools is a collection of scripts and build utilities to help create,\n"
 "manage, and publish documentation for Yelp and the web.  Most of the heavy\n"
@@ -6219,32 +6256,32 @@ msgid ""
 "wraps things up in a developer-friendly way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4395
+#: gnu/packages/gnome.scm:4485
 msgid "GObject collection library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4397
+#: gnu/packages/gnome.scm:4487
 msgid ""
 "Libgee is a utility library providing GObject-based interfaces and\n"
 "classes for commonly used data structures."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4424
+#: gnu/packages/gnome.scm:4514
 msgid "GObject wrapper around the Exiv2 photo metadata library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4426
+#: gnu/packages/gnome.scm:4516
 msgid ""
 "Gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.  It\n"
 "allows for GNOME applications to easily inspect and update EXIF, IPTC, and XMP\n"
 "metadata in photo and video files of various formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4470
+#: gnu/packages/gnome.scm:4560
 msgid "Photo manager for GNOME 3"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4472
+#: gnu/packages/gnome.scm:4562
 msgid ""
 "Shotwell is a digital photo manager designed for the GNOME desktop\n"
 "environment.  It allows you to import photos from disk or camera, organize\n"
@@ -6252,62 +6289,62 @@ msgid ""
 "share them with others via social networking and more."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4513
+#: gnu/packages/gnome.scm:4603
 msgid "Graphical archive manager for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4514
+#: gnu/packages/gnome.scm:4604
 msgid ""
 "File Roller is an archive manager for the GNOME desktop\n"
 "environment that allows users to view, unpack, and create compressed archives\n"
 "such as gzip tarballs."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4592
+#: gnu/packages/gnome.scm:4680
 msgid "Session manager for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4594
+#: gnu/packages/gnome.scm:4682
 msgid ""
 "This package contains the GNOME session manager, as well as a\n"
 "configuration program to choose applications starting on login."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4659
+#: gnu/packages/gnome.scm:4735
 msgid "Javascript bindings for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4662
+#: gnu/packages/gnome.scm:4738
 msgid ""
 "Gjs is a javascript binding for GNOME.  It's mainly based on spidermonkey\n"
 "javascript engine and the GObject introspection framework."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4721
+#: gnu/packages/gnome.scm:4797
 msgid "GNOME text editor"
 msgstr "Éditeur de texte GNOME"
 
-#: gnu/packages/gnome.scm:4722
+#: gnu/packages/gnome.scm:4798
 msgid ""
 "While aiming at simplicity and ease of use, gedit is a\n"
 "powerful general purpose text editor."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4746
+#: gnu/packages/gnome.scm:4822
 msgid "Display graphical dialog boxes from shell scripts"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4749
+#: gnu/packages/gnome.scm:4825
 msgid ""
 "Zenity is a rewrite of gdialog, the GNOME port of dialog which allows you\n"
 "to display dialog boxes from the commandline and shell scripts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4848
+#: gnu/packages/gnome.scm:4924
 msgid "Window and compositing manager"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4851
+#: gnu/packages/gnome.scm:4927
 msgid ""
 "Mutter is a window and compositing manager that displays and manages your\n"
 "desktop via OpenGL.  Mutter combines a sophisticated display engine using the\n"
@@ -6315,11 +6352,11 @@ msgid ""
 "window manager."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4885
+#: gnu/packages/gnome.scm:4977
 msgid "Single sign-on framework for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4888
+#: gnu/packages/gnome.scm:4980
 msgid ""
 "GNOME Online Accounts provides interfaces so that applications and\n"
 "libraries in GNOME can access the user's online accounts.  It has providers for\n"
@@ -6327,32 +6364,32 @@ msgid ""
 "Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4972
+#: gnu/packages/gnome.scm:5098
 msgid "Store address books and calendars"
 msgstr ""
 
-#: gnu/packages/gnome.scm:4975
+#: gnu/packages/gnome.scm:5101
 msgid ""
 "This package provides a unified backend for programs that work with\n"
 "contacts, tasks, and calendar information.  It was originally developed for\n"
 "Evolution (hence the name), but is now used by other packages as well."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5038
+#: gnu/packages/gnome.scm:5164
 msgid "Text entry and UI navigation application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5041
+#: gnu/packages/gnome.scm:5167
 msgid ""
 "Caribou is an input assistive technology intended for switch and pointer\n"
 "users."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5159
+#: gnu/packages/gnome.scm:5285
 msgid "Network connection manager"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5162
+#: gnu/packages/gnome.scm:5288
 msgid ""
 "NetworkManager is a system network service that manages your network\n"
 "devices and connections, attempting to keep active network connectivity when\n"
@@ -6361,39 +6398,39 @@ msgid ""
 "services."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5196
+#: gnu/packages/gnome.scm:5322
 msgid "OpenVPN plug-in for NetworkManager"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5198
+#: gnu/packages/gnome.scm:5324
 msgid ""
 "This extension of NetworkManager allows it to take care of connections\n"
 "to virtual private networks (VPNs) via OpenVPN."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5220
+#: gnu/packages/gnome.scm:5346
 msgid "Database of broadband connection configuration"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5221
+#: gnu/packages/gnome.scm:5347
 msgid "Database of broadband connection configuration."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5255
+#: gnu/packages/gnome.scm:5381
 msgid "Applet for managing network connections"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5258
+#: gnu/packages/gnome.scm:5384
 msgid ""
 "This package contains a systray applet for NetworkManager.  It displays\n"
 "the available networks and allows users to easily switch between them."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5283
+#: gnu/packages/gnome.scm:5409
 msgid "C++ wrapper for XML parser library libxml2"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5285
+#: gnu/packages/gnome.scm:5411
 msgid ""
 "This package provides a C++ wrapper for the XML parser library\n"
 "libxml2."
@@ -6401,31 +6438,31 @@ msgstr ""
 "Ce paquet fournit une enveloppe C++ autour de la bibliothèque d'analyseur XML\n"
 "libxml2."
 
-#: gnu/packages/gnome.scm:5422
+#: gnu/packages/gnome.scm:5575
 msgid "Display manager for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5425
+#: gnu/packages/gnome.scm:5578
 msgid ""
 "GNOME Display Manager is a system service that is responsible for\n"
 "providing graphical log-ins and managing local and remote displays."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5449
+#: gnu/packages/gnome.scm:5602
 msgid "Portable system access library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5452
+#: gnu/packages/gnome.scm:5605
 msgid ""
 "LibGTop is a library to get system specific data such as CPU and memory\n"
 "usage and information about running processes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5482
+#: gnu/packages/gnome.scm:5635
 msgid "GNOME Bluetooth subsystem"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5485
+#: gnu/packages/gnome.scm:5638
 msgid ""
 "This package contains tools for managing and manipulating Bluetooth\n"
 "devices using the GNOME desktop."
@@ -6433,11 +6470,11 @@ msgstr ""
 "Ce paquet contient des outils pour gérer et manipuler des appareils bluetooth\n"
 "depuis le bureau GNOME."
 
-#: gnu/packages/gnome.scm:5551
+#: gnu/packages/gnome.scm:5705
 msgid "Utilities to configure the GNOME desktop"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5554
+#: gnu/packages/gnome.scm:5708
 msgid ""
 "This package contains configuration applets for the GNOME desktop,\n"
 "allowing to set accessibility configuration, desktop fonts, keyboard and mouse\n"
@@ -6445,21 +6482,21 @@ msgid ""
 "properties, screen resolution, and other GNOME parameters."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5639
+#: gnu/packages/gnome.scm:5853
 msgid "Desktop shell for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5642
+#: gnu/packages/gnome.scm:5856
 msgid ""
 "GNOME Shell provides core user interface functions for the GNOME desktop,\n"
 "like switching to windows and launching applications."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5677
+#: gnu/packages/gnome.scm:5891
 msgid "VNC viewer widget for GTK+"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5679
+#: gnu/packages/gnome.scm:5893
 msgid ""
 "GTK-VNC is a VNC viewer widget for GTK+, used by remote desktop viewing\n"
 "applications, for instance the Vinagre client, GNOME Boxes and virt-viewer.\n"
@@ -6467,43 +6504,43 @@ msgid ""
 "as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5707
+#: gnu/packages/gnome.scm:5921
 msgid "Archives integration support for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5710
+#: gnu/packages/gnome.scm:5924
 msgid ""
 "GNOME Autoar is a library which makes creating and extracting archives\n"
 "easy, safe, and automatic."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5762
+#: gnu/packages/gnome.scm:5976
 msgid "Metadata database, indexer and search tool"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5765
+#: gnu/packages/gnome.scm:5979
 msgid ""
 "Tracker is an advanced framework for first class objects with associated\n"
 "metadata and tags.  It provides a one stop solution for all metadata, tags,\n"
 "shared object databases, search tools and indexing."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5816
+#: gnu/packages/gnome.scm:6030
 msgid "File manager for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5819
+#: gnu/packages/gnome.scm:6033
 msgid ""
 "Nautilus (Files) is a file manager designed to fit the GNOME desktop\n"
 "design and behaviour, giving the user a simple way to navigate and manage its\n"
 "files."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5851
+#: gnu/packages/gnome.scm:6065
 msgid "Disk usage analyzer for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5853
+#: gnu/packages/gnome.scm:6067
 msgid ""
 "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk\n"
 "usage in the GNOME desktop environment.  It can easily scan device volumes or\n"
@@ -6511,11 +6548,11 @@ msgid ""
 "is complete it provides a graphical representation of each selected folder."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5877
+#: gnu/packages/gnome.scm:6091
 msgid "Background images for the GNOME desktop"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5879
+#: gnu/packages/gnome.scm:6093
 msgid ""
 "GNOME backgrounds package contains a collection of graphics files which\n"
 "can be used as backgrounds in the GNOME Desktop environment.  Additionally,\n"
@@ -6523,33 +6560,33 @@ msgid ""
 "can add your own files to the collection."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5912
+#: gnu/packages/gnome.scm:6126
 msgid "Take pictures of your screen"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5914
+#: gnu/packages/gnome.scm:6128
 msgid ""
 "GNOME Screenshot is a utility used for taking screenshots of the entire\n"
 "screen, a window or a user defined area of the screen, with optional\n"
 "beautifying border effects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5951
+#: gnu/packages/gnome.scm:6165
 msgid "Graphical editor for GNOME's dconf configuration system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5953
+#: gnu/packages/gnome.scm:6167
 msgid ""
 "Dconf-editor is a graphical tool for browsing and editing the dconf\n"
 "configuration system for GNOME.  It allows users to configure desktop\n"
 "software that do not provide their own configuration interface."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5982
+#: gnu/packages/gnome.scm:6196
 msgid "Default MIME type associations for the GNOME desktop"
 msgstr ""
 
-#: gnu/packages/gnome.scm:5984
+#: gnu/packages/gnome.scm:6198
 msgid ""
 "Given many installed packages which might handle a given MIME type, a\n"
 "user running the GNOME desktop probably has some preferences: for example,\n"
@@ -6558,94 +6595,94 @@ msgid ""
 "associations for GNOME."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6043
+#: gnu/packages/gnome.scm:6258
 msgid "The GNU desktop environment"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6046
+#: gnu/packages/gnome.scm:6261
 msgid ""
 "GNOME is the graphical desktop for GNU.  It includes a wide variety of\n"
 "applications for browsing the web, editing text and images, creating\n"
 "documents and diagrams, playing media, scanning, and much more."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6098
+#: gnu/packages/gnome.scm:6313
 msgid "Desktop recording program"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6099
+#: gnu/packages/gnome.scm:6314
 msgid ""
 "Byzanz is a simple desktop recording program with a\n"
 "command-line interface.  It can record part or all of an X display for a\n"
 "specified duration and save it as a GIF encoded animated image file."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6126
+#: gnu/packages/gnome.scm:6341
 msgid "GObject wrapper for libcanberra"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6128
+#: gnu/packages/gnome.scm:6343
 msgid ""
 "GSound is a small library for playing system sounds.  It's designed to be\n"
 "used via GObject Introspection, and is a thin wrapper around the libcanberra C\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6155
+#: gnu/packages/gnome.scm:6370
 msgid "Library for accessing SkyDrive and Hotmail"
 msgstr "Bibliothèque pour accéder à SkyDrive et Hotmail"
 
-#: gnu/packages/gnome.scm:6157
+#: gnu/packages/gnome.scm:6372
 msgid ""
 "Libzapojit is a GLib-based library for accessing online service APIs of\n"
 "Microsoft SkyDrive and Hotmail, using their REST protocols."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6193
+#: gnu/packages/gnome.scm:6408
 msgid "GNOME's clock application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6195
+#: gnu/packages/gnome.scm:6410
 msgid ""
 "GNOME Clocks is a simple clocks application designed to fit the GNOME\n"
 "desktop.  It supports world clock, stop watch, alarms, and count down timer."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6227
+#: gnu/packages/gnome.scm:6443
 msgid "GNOME's calendar application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6229
+#: gnu/packages/gnome.scm:6445
 msgid ""
 "GNOME Calendar is a simple calendar application designed to fit the GNOME\n"
 "desktop.  It supports multiple calendars, month, week and year view."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6279
+#: gnu/packages/gnome.scm:6496
 msgid "GNOME's ToDo Application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6281
+#: gnu/packages/gnome.scm:6498
 msgid ""
 "GNOME To Do is a simplistic personal task manager designed to perfectly\n"
 "fit the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6319
+#: gnu/packages/gnome.scm:6536
 msgid "Look up words in dictionary sources"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6321
+#: gnu/packages/gnome.scm:6538
 msgid ""
 "GNOME Dictionary can look for the definition or translation of a word in\n"
 "existing databases over the internet."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6381
+#: gnu/packages/gnome.scm:6598
 msgid "Customize advanced GNOME 3 options"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6384
+#: gnu/packages/gnome.scm:6601
 msgid ""
 "GNOME Tweak Tool allows adjusting advanced configuration settings in\n"
 "GNOME 3.  This includes things like the fonts used in user interface elements,\n"
@@ -6653,63 +6690,63 @@ msgid ""
 "GNOME Shell appearance and extension, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6411
+#: gnu/packages/gnome.scm:6628
 msgid "Extensions for GNOME Shell"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6412
+#: gnu/packages/gnome.scm:6629
 msgid ""
 "GNOME Shell extensions modify and extend GNOME Shell\n"
 "functionality and behavior."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6442
+#: gnu/packages/gnome.scm:6664
 msgid "A flat GTK+ theme with transparent elements"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6443
+#: gnu/packages/gnome.scm:6665
 msgid ""
 "Arc is a flat theme with transparent elements for GTK 3, GTK\n"
 "2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments\n"
 "like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6474
+#: gnu/packages/gnome.scm:6696
 msgid "Faba icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6476
+#: gnu/packages/gnome.scm:6698
 msgid ""
 "Faba is a minimal icon set used as a basis for other themes such as\n"
 "Moka"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6500
+#: gnu/packages/gnome.scm:6722
 msgid "Moka icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6501
+#: gnu/packages/gnome.scm:6723
 msgid ""
 "Moka is a stylized desktop icon set, designed to be clear,\n"
 "simple and consistent."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6533
+#: gnu/packages/gnome.scm:6755
 msgid "Arc icon theme"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6534
+#: gnu/packages/gnome.scm:6756
 msgid ""
 "The Arc icon theme provides a set of icons matching the\n"
 "style of the Arc GTK theme.  Icons missing from the Arc theme are provided by\n"
 "the Moka icon theme."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6566
+#: gnu/packages/gnome.scm:6788
 msgid "Library to aggregate data about people"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6567
+#: gnu/packages/gnome.scm:6789
 msgid ""
 "Libfolks is a library that aggregates information about people\n"
 "from multiple sources (e.g., Telepathy connection managers for IM contacts,\n"
@@ -6718,31 +6755,31 @@ msgid ""
 "compiled."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6602
+#: gnu/packages/gnome.scm:6824
 msgid "GLib/GObject wrapper for the Facebook API"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6603
+#: gnu/packages/gnome.scm:6825
 msgid ""
 "This library allows you to use the Facebook API from\n"
 "GLib/GObject code."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6631
+#: gnu/packages/gnome.scm:6853
 msgid "GNOME keyboard configuration library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6633
+#: gnu/packages/gnome.scm:6855
 msgid ""
 "Libgnomekbd is a keyboard configuration library for the GNOME desktop\n"
 "environment, which can notably display keyboard layouts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6667
+#: gnu/packages/gnome.scm:6889
 msgid "Library for writing single instance applications"
 msgstr "Bibliothèque pour écrire des applications à instance unique"
 
-#: gnu/packages/gnome.scm:6669
+#: gnu/packages/gnome.scm:6891
 msgid ""
 "Libunique is a library for writing single instance applications.  If you\n"
 "launch a single instance application twice, the second instance will either just\n"
@@ -6752,32 +6789,32 @@ msgid ""
 "handling the startup notification side."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6702
+#: gnu/packages/gnome.scm:6924
 msgid "Desktop calculator"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6704
+#: gnu/packages/gnome.scm:6926
 msgid ""
 "Calculator is an application that solves mathematical equations and\n"
 "is suitable as a default application in a Desktop environment."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6732
+#: gnu/packages/gnome.scm:6954
 msgid "Virtual sticky note"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6734
+#: gnu/packages/gnome.scm:6956
 msgid ""
 "Xpad is a sticky note that strives to be simple, fault tolerant,\n"
 "and customizable.  Xpad consists of independent pad windows, each is\n"
 "basically a text box in which notes can be written."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6764
+#: gnu/packages/gnome.scm:6986
 msgid "Unicode character picker and font browser"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6766
+#: gnu/packages/gnome.scm:6988
 msgid ""
 "This program allows you to browse through all the available Unicode\n"
 "characters and categories for the installed fonts, and to examine their\n"
@@ -6785,22 +6822,22 @@ msgid ""
 "only know by its Unicode name or code point."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6796
+#: gnu/packages/gnome.scm:7018
 msgid "Web development studio"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6798
+#: gnu/packages/gnome.scm:7020
 msgid ""
 "Bluefish is an editor targeted towards programmers and web developers,\n"
 "with many options to write web sites, scripts and other code.\n"
 "Bluefish supports many programming and markup languages."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6830
+#: gnu/packages/gnome.scm:7052
 msgid "Process viewer and system resource monitor for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6832
+#: gnu/packages/gnome.scm:7054
 msgid ""
 "GNOME System Monitor is a GNOME process viewer and system monitor with\n"
 "an attractive, easy-to-use interface.  It has features, such as a tree view\n"
@@ -6809,43 +6846,43 @@ msgid ""
 "kill/reinice processes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6858
+#: gnu/packages/gnome.scm:7080
 msgid "Python client bindings for D-Bus AT-SPI"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6862
+#: gnu/packages/gnome.scm:7084
 msgid ""
 "This package includes a python client library for the AT-SPI D-Bus\n"
 "accessibility infrastructure."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6921
+#: gnu/packages/gnome.scm:7143
 msgid "Screen reader for individuals who are blind or visually impaired"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6924
+#: gnu/packages/gnome.scm:7146
 msgid ""
 "Orca is a screen reader that provides access to the graphical desktop\n"
 "via speech and refreshable braille.  Orca works with applications and toolkits\n"
 "that support the Assistive Technology Service Provider Interface (AT-SPI)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6976
+#: gnu/packages/gnome.scm:7198
 msgid "GNOME's alternative spell checker"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6978
+#: gnu/packages/gnome.scm:7200
 msgid ""
 "gspell provides a flexible API to add spell-checking to a GTK+\n"
 "application.  It provides a GObject API, spell-checking to text entries and\n"
 "text views, and buttons to choose the language."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7020
+#: gnu/packages/gnome.scm:7242
 msgid "Project management software for the GNOME desktop"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7022
+#: gnu/packages/gnome.scm:7244
 msgid ""
 "GNOME Planner is a project management tool based on the Work Breakdown\n"
 "Structure (WBS).  Its goal is to enable you to easily plan projects.  Based on\n"
@@ -6857,11 +6894,11 @@ msgid ""
 "views can be printed as PDF or PostScript files, or exported to HTML."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7088
+#: gnu/packages/gnome.scm:7310
 msgid "GNOME music playing application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7090
+#: gnu/packages/gnome.scm:7312
 msgid ""
 "Lollypop is a music player designed to play well with GNOME desktop.\n"
 "Lollypop plays audio formats such as mp3, mp4, ogg and flac and gets information\n"
@@ -6869,31 +6906,31 @@ msgid ""
 "automatically and it can stream songs from online music services and charts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7117
+#: gnu/packages/gnome.scm:7339
 msgid "Video effects for Cheese and other GNOME applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7119
+#: gnu/packages/gnome.scm:7341
 msgid ""
 "A collection of GStreamer video filters and effects to be used in\n"
 "photo-booth-like software, such as Cheese."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7179
+#: gnu/packages/gnome.scm:7401
 msgid "Webcam photo booth software for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7181
+#: gnu/packages/gnome.scm:7403
 msgid ""
 "Cheese uses your webcam to take photos and videos.  Cheese can also\n"
 "apply fancy special effects and lets you share the fun with others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7218
+#: gnu/packages/gnome.scm:7440
 msgid "Audio music cd ripper"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7219
+#: gnu/packages/gnome.scm:7441
 msgid ""
 "Sound Juicer extracts audio from compact discs and convert it\n"
 "into audio files that a personal computer or digital audio player can play.\n"
@@ -6901,99 +6938,99 @@ msgid ""
 "mp3, Ogg Vorbis and FLAC"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7283
+#: gnu/packages/gnome.scm:7498
 msgid "Convert between audio formats with a graphical interface"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7285
+#: gnu/packages/gnome.scm:7500
 msgid ""
 "SoundConverter supports converting between many audio formats including\n"
 "Opus, Ogg Vorbis, FLAC and more.  It supports parallel conversion, and\n"
 "configurable file renaming. "
 msgstr ""
 
-#: gnu/packages/gnome.scm:7330
+#: gnu/packages/gnome.scm:7543
 msgid "Tool to help prevent repetitive strain injury (RSI)"
 msgstr ""
 
-#: gnu/packages/gnome.scm:7332
+#: gnu/packages/gnome.scm:7545
 msgid ""
 "Workrave is a program that assists in the recovery and prevention of\n"
 "repetitive strain injury (@dfn{RSI}).  The program frequently alerts you to take\n"
 "micro-pauses and rest breaks, and restricts you to your daily limit."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7361
+#: gnu/packages/gnome.scm:7574
 msgid "GNOME hexadecimal editor"
 msgstr "Éditeur hexadécimal de GNOME"
 
-#: gnu/packages/gnome.scm:7362
+#: gnu/packages/gnome.scm:7575
 msgid ""
 "The GHex program can view and edit files in two ways:\n"
 "hexadecimal or ASCII.  It is useful for editing binary files in general."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:127
-msgid "Mozilla javascript engine"
+#: gnu/packages/gnome.scm:7619
+msgid "Companion library to GObject and Gtk+"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:128
+#: gnu/packages/gnome.scm:7620
 msgid ""
-"SpiderMonkey is Mozilla's JavaScript engine written\n"
-"in C/C++."
+"The libdazzle library is a companion library to GObject and\n"
+"Gtk+.  It provides various features that the authors wish were in the\n"
+"underlying library but cannot for various reasons.  In most cases, they are\n"
+"wildly out of scope for those libraries.  In other cases, they are not quite\n"
+"generic enough to work for everyone."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:357
-msgid "Netscape API for system level and libc-like functions"
+#: gnu/packages/gnome.scm:7668
+msgid "Manage your email, contacts and schedule"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:358
+#: gnu/packages/gnome.scm:7669
 msgid ""
-"Netscape Portable Runtime (@dfn{NSPR}) provides a\n"
-"platform-neutral API for system level and libc-like functions.  It is used\n"
-"in the Mozilla clients."
+"Evolution is a personal information management application\n"
+"that provides integrated mail, calendaring and address book\n"
+"functionality."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:464
-msgid "Network Security Services"
+#: gnu/packages/gnuzilla.scm:137
+msgid "Mozilla javascript engine"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:466
+#: gnu/packages/gnuzilla.scm:138
 msgid ""
-"Network Security Services (@dfn{NSS}) is a set of libraries designed to\n"
-"support cross-platform development of security-enabled client and server\n"
-"applications.  Applications built with NSS can support SSL v2 and v3, TLS,\n"
-"PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other\n"
-"security standards."
+"SpiderMonkey is Mozilla's JavaScript engine written\n"
+"in C/C++."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:840
+#: gnu/packages/gnuzilla.scm:955
 msgid "Entirely free browser derived from Mozilla Firefox"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:842
+#: gnu/packages/gnuzilla.scm:957
 msgid ""
 "IceCat is the GNU version of the Firefox browser.  It is entirely free\n"
 "software, which does not recommend non-free plugins and addons.  It also\n"
 "features built-in privacy-protecting features."
 msgstr ""
 
-#: gnu/packages/gtk.scm:105
+#: gnu/packages/gtk.scm:109
 msgid "GNOME accessibility toolkit"
 msgstr ""
 
-#: gnu/packages/gtk.scm:107
+#: gnu/packages/gtk.scm:111
 msgid ""
 "ATK provides the set of accessibility interfaces that are implemented\n"
 "by other toolkits and applications.  Using the ATK interfaces, accessibility\n"
 "tools have full access to view and control running applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:147
+#: gnu/packages/gtk.scm:150
 msgid "2D graphics library"
 msgstr "Bibliothèque graphique 2D"
 
-#: gnu/packages/gtk.scm:149
+#: gnu/packages/gtk.scm:152
 msgid ""
 "Cairo is a 2D graphics library with support for multiple output devices.\n"
 "Currently supported output targets include the X Window System (via both\n"
@@ -7011,56 +7048,56 @@ msgid ""
 "affine transformation (scale, rotation, shear, etc.)."
 msgstr ""
 
-#: gnu/packages/gtk.scm:177
+#: gnu/packages/gtk.scm:180
 msgid "2D graphics library (with X11 support)"
 msgstr ""
 
-#: gnu/packages/gtk.scm:211
+#: gnu/packages/gtk.scm:214
 msgid "OpenType text shaping engine"
 msgstr ""
 
-#: gnu/packages/gtk.scm:213
+#: gnu/packages/gtk.scm:216
 msgid "HarfBuzz is an OpenType text shaping engine."
 msgstr ""
 
-#: gnu/packages/gtk.scm:250
+#: gnu/packages/gtk.scm:252
 msgid "GNOME text and font handling library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:252
+#: gnu/packages/gtk.scm:254
 msgid ""
 "Pango is the core text and font handling library used in GNOME\n"
 "applications.  It has extensive support for the different writing systems\n"
 "used throughout the world."
 msgstr ""
 
-#: gnu/packages/gtk.scm:291
+#: gnu/packages/gtk.scm:280
 msgid "Obsolete pango functions"
 msgstr ""
 
-#: gnu/packages/gtk.scm:292
+#: gnu/packages/gtk.scm:281
 msgid ""
 "Pangox was a X backend to pango.  It is now obsolete and no\n"
 "longer provided by recent pango releases.  pangox-compat provides the\n"
 "functions which were removed."
 msgstr ""
 
-#: gnu/packages/gtk.scm:329
+#: gnu/packages/gtk.scm:319
 msgid "GTK+ widget for interactive graph-like environments"
 msgstr ""
 
-#: gnu/packages/gtk.scm:331
+#: gnu/packages/gtk.scm:321
 msgid ""
 "Ganv is an interactive GTK+ widget for interactive “boxes and lines” or\n"
 "graph-like environments, e.g. modular synths or finite state machine\n"
 "diagrams."
 msgstr ""
 
-#: gnu/packages/gtk.scm:400
+#: gnu/packages/gtk.scm:390
 msgid "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget"
 msgstr ""
 
-#: gnu/packages/gtk.scm:402
+#: gnu/packages/gtk.scm:392
 msgid ""
 "GtkSourceView is a portable C library that extends the standard GTK+\n"
 "framework for multiline text editing with support for configurable syntax\n"
@@ -7068,56 +7105,56 @@ msgid ""
 "printing and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:451
+#: gnu/packages/gtk.scm:441
 msgid "GNOME source code widget"
 msgstr ""
 
-#: gnu/packages/gtk.scm:452
+#: gnu/packages/gtk.scm:442
 msgid ""
 "GtkSourceView is a text widget that extends the standard\n"
 "GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax\n"
 "highlighting and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:502
+#: gnu/packages/gtk.scm:509
 msgid "GNOME image loading and manipulation library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:504
+#: gnu/packages/gtk.scm:511
 msgid ""
 "GdkPixbuf is a library for image loading and manipulation developed\n"
 "in the GNOME project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:538
+#: gnu/packages/gtk.scm:545
 msgid "GNOME image loading and manipulation library, with SVG support"
 msgstr ""
 
-#: gnu/packages/gtk.scm:578
+#: gnu/packages/gtk.scm:585
 msgid "Assistive Technology Service Provider Interface, core components"
 msgstr ""
 
-#: gnu/packages/gtk.scm:580
+#: gnu/packages/gtk.scm:587
 msgid ""
 "The Assistive Technology Service Provider Interface, core components,\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:613
+#: gnu/packages/gtk.scm:620
 msgid "Assistive Technology Service Provider Interface, ATK bindings"
 msgstr ""
 
-#: gnu/packages/gtk.scm:615
+#: gnu/packages/gtk.scm:622
 msgid ""
 "The Assistive Technology Service Provider Interface\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:675
+#: gnu/packages/gtk.scm:682
 msgid "Cross-platform toolkit for creating graphical user interfaces"
 msgstr ""
 
-#: gnu/packages/gtk.scm:677
+#: gnu/packages/gtk.scm:684
 msgid ""
 "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating\n"
 "graphical user interfaces.  Offering a complete set of widgets, GTK+ is\n"
@@ -7125,11 +7162,11 @@ msgid ""
 "application suites."
 msgstr ""
 
-#: gnu/packages/gtk.scm:811
+#: gnu/packages/gtk.scm:840
 msgid "Cairo bindings for GNU Guile"
 msgstr "Liaisons Cairo pour GNU Guile"
 
-#: gnu/packages/gtk.scm:813
+#: gnu/packages/gtk.scm:842
 msgid ""
 "Guile-Cairo wraps the Cairo graphics library for Guile Scheme.\n"
 "Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API\n"
@@ -7139,21 +7176,21 @@ msgid ""
 "exceptions, macros, and a dynamic programming environment."
 msgstr ""
 
-#: gnu/packages/gtk.scm:861
+#: gnu/packages/gtk.scm:890
 msgid "Render SVG images using Cairo from Guile"
 msgstr ""
 
-#: gnu/packages/gtk.scm:863
+#: gnu/packages/gtk.scm:892
 msgid ""
 "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG\n"
 "images onto Cairo surfaces."
 msgstr ""
 
-#: gnu/packages/gtk.scm:903
+#: gnu/packages/gtk.scm:932
 msgid "Create SVG or PDF presentations in Guile"
 msgstr "Création de SVG et de présentations PDF en Guile"
 
-#: gnu/packages/gtk.scm:905
+#: gnu/packages/gtk.scm:934
 msgid ""
 "Guile-Present defines a declarative vocabulary for presentations,\n"
 "together with tools to render presentation documents as SVG or PDF.\n"
@@ -7162,51 +7199,51 @@ msgid ""
 "documents."
 msgstr ""
 
-#: gnu/packages/gtk.scm:959
+#: gnu/packages/gtk.scm:988
 msgid "Guile interface for GTK+ programming for GNOME"
 msgstr ""
 
-#: gnu/packages/gtk.scm:961
+#: gnu/packages/gtk.scm:990
 msgid ""
 "Includes guile-clutter, guile-gnome-gstreamer,\n"
 "guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview."
 msgstr ""
 
-#: gnu/packages/gtk.scm:994
+#: gnu/packages/gtk.scm:1023
 msgid "C++ bindings to the Cairo 2D graphics library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:996
+#: gnu/packages/gtk.scm:1025
 msgid ""
 "Cairomm provides a C++ programming interface to the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1020
+#: gnu/packages/gtk.scm:1049
 msgid "C++ interface to the Pango text rendering library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1022
+#: gnu/packages/gtk.scm:1051
 msgid ""
 "Pangomm provides a C++ programming interface to the Pango text rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1043
+#: gnu/packages/gtk.scm:1072
 msgid "C++ interface to the ATK accessibility library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1045
+#: gnu/packages/gtk.scm:1074
 msgid ""
 "ATKmm provides a C++ programming interface to the ATK accessibility\n"
 "toolkit."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1089
+#: gnu/packages/gtk.scm:1118
 msgid "C++ interface to the GTK+ graphical user interface library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1091
+#: gnu/packages/gtk.scm:1120
 msgid ""
 "gtkmm is the official C++ interface for the popular GUI library GTK+.\n"
 "Highlights include typesafe callbacks, and a comprehensive set of widgets that\n"
@@ -7215,11 +7252,11 @@ msgid ""
 "extensive documentation, including API reference and a tutorial."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1140
+#: gnu/packages/gtk.scm:1169
 msgid "C++ interface to the GTK+ 'GtkTextView' widget"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1142
+#: gnu/packages/gtk.scm:1171
 msgid ""
 "gtksourceviewmm is a portable C++ library that extends the standard GTK+\n"
 "framework for multiline text editing with support for configurable syntax\n"
@@ -7227,41 +7264,41 @@ msgid ""
 "printing and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1172
+#: gnu/packages/gtk.scm:1201
 msgid "Python bindings for cairo"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1174
+#: gnu/packages/gtk.scm:1203
 msgid "Pycairo is a set of Python bindings for the Cairo graphics library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1247
+#: gnu/packages/gtk.scm:1276
 msgid "Python bindings for GTK+"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1249
+#: gnu/packages/gtk.scm:1278
 msgid ""
 "PyGTK allows you to write full featured GTK programs in Python.  It is\n"
 "targeted at GTK 2.x, and can be used in conjunction with gnome-python to\n"
 "write GNOME applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1273
+#: gnu/packages/gtk.scm:1302
 msgid "Perl interface to the cairo 2d vector graphics library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1274
+#: gnu/packages/gtk.scm:1303
 msgid ""
 "Cairo provides Perl bindings for the vector graphics library\n"
 "cairo.  It supports multiple output targets, including PNG, PDF and SVG.  Cairo\n"
 "produces identical output on all those targets."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1299
+#: gnu/packages/gtk.scm:1328
 msgid "Perl interface to the 2.x series of the Gimp Toolkit library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1300
+#: gnu/packages/gtk.scm:1329
 msgid ""
 "Perl bindings to the 2.x series of the Gtk+ widget set.\n"
 "This module allows you to write graphical user interfaces in a Perlish and\n"
@@ -7269,11 +7306,11 @@ msgid ""
 "yet remaining very close in spirit to original API."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1327
+#: gnu/packages/gtk.scm:1356
 msgid "Layout and render international text"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1328
+#: gnu/packages/gtk.scm:1357
 msgid ""
 "Pango is a library for laying out and rendering text, with an\n"
 "emphasis on internationalization.  Pango can be used anywhere that text layout\n"
@@ -7290,11 +7327,11 @@ msgid ""
 "and routines to assist in editing internationalized text."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1381
+#: gnu/packages/gtk.scm:1410
 msgid "Library for minimalistic gtk+3 user interfaces"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1382
+#: gnu/packages/gtk.scm:1411
 msgid ""
 "Girara is a library that implements a user interface that\n"
 "focuses on simplicity and minimalism.  Currently based on GTK+, a\n"
@@ -7305,97 +7342,97 @@ msgid ""
 "information."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1481
+#: gnu/packages/gtk.scm:1510
 msgid "Documentation generator from C source code"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1483
+#: gnu/packages/gtk.scm:1512
 msgid ""
 "GTK-Doc generates API documentation from comments added to C code.  It is\n"
 "typically used to document the public API of GTK+ and GNOME libraries, but it\n"
 "can also be used to document application code."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1511
+#: gnu/packages/gtk.scm:1540
 msgid "Theming engines for GTK+ 2.x"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1513
+#: gnu/packages/gtk.scm:1542
 msgid ""
 "This package contains the standard GTK+ 2.x theming engines including\n"
 "Clearlooks, Crux, High Contrast, Industrial, LighthouseBlue, Metal, Mist,\n"
 "Redmond95 and ThinIce."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1541
+#: gnu/packages/gtk.scm:1570
 msgid "Cairo-based theming engine for GTK+ 2.x"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1543
+#: gnu/packages/gtk.scm:1572
 msgid ""
 "Murrine is a cairo-based GTK+ theming engine.  It is named after the\n"
 "glass artworks done by Venicians glass blowers."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1569
+#: gnu/packages/gtk.scm:1598
 msgid "Spell-checking addon for GTK's TextView widget"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1571
+#: gnu/packages/gtk.scm:1600
 msgid ""
 "GtkSpell provides word-processor-style highlighting and replacement of\n"
 "misspelled words in a GtkTextView widget."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1594
+#: gnu/packages/gtk.scm:1626
 msgid "Lightweight GTK+ clipboard manager"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1596
+#: gnu/packages/gtk.scm:1628
 msgid ""
 "ClipIt is a clipboard manager with features such as a history, search\n"
 "thereof, global hotkeys and clipboard item actions.  It was forked from\n"
 "Parcellite and adds bugfixes and features."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1633
+#: gnu/packages/gtk.scm:1660
 msgid "Thin layer of graphic data types"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1634
+#: gnu/packages/gtk.scm:1661
 msgid ""
 "This library provides graphic types and their relative API;\n"
 "it does not deal with windowing system surfaces, drawing, scene graphs, or\n"
 "input."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1659
+#: gnu/packages/gtk.scm:1686
 msgid "Gtk+ widget for dealing with 2-D tabular data"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1661
+#: gnu/packages/gtk.scm:1688
 msgid ""
 "GNU Spread Sheet Widget is a library for Gtk+ which provides a widget for\n"
 "viewing and manipulating 2 dimensional tabular data in a manner similar to many\n"
 "popular spread sheet programs."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1702
+#: gnu/packages/gtk.scm:1729
 msgid "GTK+ dialog boxes for shell scripts"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1704
+#: gnu/packages/gtk.scm:1731
 msgid ""
 "This program allows you to display GTK+ dialog boxes from command line or\n"
 "shell scripts.  Example of how to use @code{yad} can be consulted at\n"
 "@url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}."
 msgstr ""
 
-#: gnu/packages/guile.scm:141 gnu/packages/guile.scm:220
+#: gnu/packages/guile.scm:125 gnu/packages/guile.scm:206
 msgid "Scheme implementation intended especially for extensions"
 msgstr "Implantation de Scheme spécialement destinée aux extensions"
 
-#: gnu/packages/guile.scm:143 gnu/packages/guile.scm:222
+#: gnu/packages/guile.scm:127 gnu/packages/guile.scm:208
 msgid ""
 "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the\n"
 "official extension language of the GNU system.  It is an implementation of\n"
@@ -7408,149 +7445,22 @@ msgstr ""
 "Scheme qui peut être facilement incluse dans d'autres applications pour faciliter\n"
 "l'ajout de fonctionnalités sans avoir à réécrire le code source."
 
-#: gnu/packages/guile.scm:410
+#: gnu/packages/guile.scm:364
 msgid "Line editing support for GNU Guile"
 msgstr "Support de l'édition de ligne pour GNU Guile"
 
-#: gnu/packages/guile.scm:412
+#: gnu/packages/guile.scm:366
 msgid ""
 "This module provides line editing support via the Readline library for\n"
 "GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its\n"
 "@code{activate-readline} procedure to enable it."
 msgstr ""
 
-#: gnu/packages/guile.scm:528
-msgid "Package manager for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:530
-msgid ""
-"Guildhall is a package manager written for Guile Scheme.  A guild is\n"
-"an association of independent craftspeople.  A guildhall is where they meet.\n"
-"This Guildhall aims to make a virtual space for Guile wizards and journeyfolk\n"
-"to share code.\n"
-"\n"
-"On a practical level, Guildhall lets you share Scheme modules and programs\n"
-"over the internet, and install code that has been shared by others.  Guildhall\n"
-"can handle dependencies, so when a program requires several libraries, and\n"
-"each of those has further dependencies, all of the prerequisites for the\n"
-"program can be installed in one go."
-msgstr ""
-
-#: gnu/packages/guile.scm:623
-msgid "Web application framework written in Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:624
-msgid ""
-"GNU Artanis is a web application framework written in Guile\n"
-"Scheme.  A web application framework (WAF) is a software framework that is\n"
-"designed to support the development of dynamic websites, web applications, web\n"
-"services and web resources.  The framework aims to alleviate the overhead\n"
-"associated with common activities performed in web development.  Artanis\n"
-"provides several tools for web development: database access, templating\n"
-"frameworks, session management, URL-remapping for RESTful, page caching, and\n"
-"more."
-msgstr ""
-
-#: gnu/packages/guile.scm:650
-msgid "Framework for building readers for GNU Guile"
-msgstr "Framework pour la construction de lecteurs GNU Guile"
-
-#: gnu/packages/guile.scm:652
-msgid ""
-"Guile-Reader is a simple framework for building readers for GNU Guile.\n"
-"\n"
-"The idea is to make it easy to build procedures that extend Guile’s read\n"
-"procedure.  Readers supporting various syntax variants can easily be written,\n"
-"possibly by re-using existing “token readers” of a standard Scheme\n"
-"readers.  For example, it is used to implement Skribilo’s R5RS-derived\n"
-"document syntax.\n"
-"\n"
-"Guile-Reader’s approach is similar to Common Lisp’s “read table”, but\n"
-"hopefully more powerful and flexible (for instance, one may instantiate as\n"
-"many readers as needed)."
-msgstr ""
-"Guile-Reader est un framework permettant de construire des lecteurs pour\n"
-"GNU Guile. L'idée est de rendre facile la construction de procédures étendant\n"
-"la procédure de lecture de Guile. Il est possible d'écrire facilement des lecteurs\n"
-"supportant de nombreuses syntaxes. Par exemple, Guile-Reader est utilisé pour\n"
-"implanter la syntaxe de documents basés sur R5RS de Skribilo.\n"
-"\n"
-"L'approche de Guile-Reader est similaire à la table de lecture de Lisp, mais\n"
-"plus puissante et plus flexible (il est par exemple possible d'instancier autant\n"
-"de lecteurs que nécessaires)."
-
-#: gnu/packages/guile.scm:706
-msgid "Guile bindings to ncurses"
-msgstr "Bindings Guile pour ncurses"
-
-#: gnu/packages/guile.scm:708
-msgid ""
-"guile-ncurses provides Guile language bindings for the ncurses\n"
-"library."
-msgstr "guile-ncurses fournit un binding Guile pour la biliothèque ncurses."
-
-#: gnu/packages/guile.scm:766
-msgid "Run jobs at scheduled times"
-msgstr "Plannification de tâches"
-
-#: gnu/packages/guile.scm:768
-msgid ""
-"GNU Mcron is a complete replacement for Vixie cron.  It is used to run\n"
-"tasks on a schedule, such as every hour or every Monday.  Mcron is written in\n"
-"Guile, so its configuration can be written in Scheme; the original cron\n"
-"format is also supported."
-msgstr ""
-"GNU Mcron est un remplaçant à Vixie cron. Il est utilisé pour la planification\n"
-"de tâches à intervalles réguliers (toutes les heures, tous les lundi, etc...).\n"
-"Mcron est écrit en Guile et peut donc être configuré en Scheme ; le format cron\n"
-"original est aussi supporté."
-
-#: gnu/packages/guile.scm:836
-msgid "Guile project tooling"
-msgstr ""
-
-#: gnu/packages/guile.scm:838
-msgid ""
-"Hall is a command-line application and a set of Guile libraries that\n"
-"allow you to quickly create and publish Guile projects.  It allows you to\n"
-"transparently support the GNU build system, manage a project hierarchy &\n"
-"provides tight coupling to Guix."
-msgstr ""
-
-#: gnu/packages/guile.scm:870
-msgid "Guile parser library for the iCalendar format"
-msgstr ""
-
-#: gnu/packages/guile.scm:872
-msgid ""
-"Guile-ICS is an iCalendar (RFC5545) format parser library written in\n"
-"pure Scheme.  The library can be used to read and write iCalendar data.\n"
-"\n"
-"The library is shipped with documentation in Info format and usage examples."
-msgstr ""
-
-#: gnu/packages/guile.scm:907
-msgid "Collection of useful Guile Scheme modules"
-msgstr "Collection de modules Scheme utiles pour Guile"
-
-#: gnu/packages/guile.scm:909
-msgid ""
-"Guile-Lib is intended as an accumulation place for pure-scheme Guile\n"
-"modules, allowing for people to cooperate integrating their generic Guile\n"
-"modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN\n"
-"for Guile\"."
-msgstr ""
-"Guile-Lib est conçue comme une collection de modules Scheme pour Guile permettant\n"
-"aux utilisateurs d'intégrer leurs modules Guile au sein d'une bilbiothéque commune\n"
-"et cohérente. Voyez Guile-Lib comme une version plus simple de CPAN limitée à Guile."
-
-#: gnu/packages/guile.scm:944
+#: gnu/packages/guile.scm:446
 msgid "JSON module for Guile"
 msgstr "Module JSON pour Guile"
 
-#: gnu/packages/guile.scm:946
+#: gnu/packages/guile.scm:448
 msgid ""
 "Guile-JSON supports parsing and building JSON documents according to the\n"
 "specification.  These are the main features:\n"
@@ -7572,213 +7482,29 @@ msgstr ""
 "@item formatage élégant.\n"
 "@end itemize\n"
 
-#: gnu/packages/guile.scm:982
-msgid "MiniKanren declarative logic system, packaged for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:984
-msgid ""
-"MiniKanren is a relational programming extension to the Scheme\n"
-"programming Language, written as a smaller version of Kanren suitable for\n"
-"pedagogical purposes.  It is featured in the book, The Reasoned Schemer,\n"
-"written by Dan Friedman, William Byrd, and Oleg Kiselyov.\n"
-"\n"
-"This is Ian Price's r6rs packaged version of miniKanren, which deviates\n"
-"slightly from miniKanren mainline.\n"
-"\n"
-"See http://minikanren.org/ for more on miniKanren generally."
-msgstr ""
-
-#: gnu/packages/guile.scm:1020
-msgid ""
-"Minimal implementation of incremental computation in Guile\n"
-"Scheme"
-msgstr ""
-
-#: gnu/packages/guile.scm:1022
-msgid ""
-"This package provides a complete Scheme implementation of\n"
-"miniAdapton, which implements the core functionality of the Adapton system for\n"
-"incremental computation (also known as self-adjusting computation).  Like\n"
-"Adapton, miniAdapton allows programmers to safely combine mutation and\n"
-"memoization.  miniAdapton is built on top of an even simpler system,\n"
-"microAdapton.  Both miniAdapton and microAdapton are designed to be easy to\n"
-"understand, extend, and port to host languages other than Scheme."
-msgstr ""
-
-#: gnu/packages/guile.scm:1064
-msgid "S-expression based regular expressions"
-msgstr ""
-
-#: gnu/packages/guile.scm:1066
-msgid ""
-"Irregex is an s-expression based alternative to your classic\n"
-"string-based regular expressions.  It implements SRFI 115 and is deeply\n"
-"inspired by the SCSH regular expression system."
-msgstr ""
-
-#: gnu/packages/guile.scm:1120
+#: gnu/packages/guile.scm:524
 msgid "Guile bindings to the GDBM library via Guile's FFI"
 msgstr ""
 
-#: gnu/packages/guile.scm:1122
+#: gnu/packages/guile.scm:526
 msgid ""
 "Guile bindings to the GDBM key-value storage system, using\n"
 "Guile's foreign function interface."
 msgstr ""
 
-#: gnu/packages/guile.scm:1154
+#: gnu/packages/guile.scm:558
 msgid "Access SQLite databases from Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:1156
+#: gnu/packages/guile.scm:560
 msgid "This package provides Guile bindings to the SQLite database system."
 msgstr "Ce paquet fournit les liaisons Guile pour le système de base de données SQLite."
 
-#: gnu/packages/guile.scm:1219
-msgid "Functional static site generator"
-msgstr ""
-
-#: gnu/packages/guile.scm:1220
-msgid ""
-"Haunt is a static site generator written in Guile\n"
-"Scheme.  Haunt features a functional build system and an extensible\n"
-"interface for reading articles in any format."
-msgstr ""
-
-#: gnu/packages/guile.scm:1252
-msgid "Guile application configuration parsing library."
-msgstr ""
-
-#: gnu/packages/guile.scm:1254
-msgid ""
-"Guile Config is a library providing a declarative approach to\n"
-"application configuration specification.  The library provides clean\n"
-"configuration declaration forms, and processors that take care of:\n"
-"configuration file creation; configuration file parsing; command-line\n"
-"parameter parsing using getopt-long; basic GNU command-line parameter\n"
-"generation (--help, --usage, --version); automatic output generation for the\n"
-"above command-line parameters."
-msgstr ""
-
-#: gnu/packages/guile.scm:1282
-msgid "Redis client library for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1283
-msgid ""
-"Guile-redis provides a Scheme interface to the Redis\n"
-"key-value cache and store."
-msgstr ""
-
-#: gnu/packages/guile.scm:1360
-msgid "Whitespace to lisp syntax for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1361
-msgid ""
-"Wisp is a syntax for Guile which provides a Python-like\n"
-"whitespace-significant language.  It may be easier on the eyes for some\n"
-"users and in some situations."
-msgstr ""
-
-#: gnu/packages/guile.scm:1412
-msgid "2D/3D game engine for GNU Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1413
-msgid ""
-"Sly is a 2D/3D game engine written in Guile Scheme.  Sly\n"
-"features a functional reactive programming interface and live coding\n"
-"capabilities."
-msgstr ""
-
-#: gnu/packages/guile.scm:1449
-msgid "Generate C bindings for Guile"
-msgstr "Génère des liaisons C pour Guile"
-
-#: gnu/packages/guile.scm:1450
-msgid ""
-"G-Wrap is a tool and Guile library for generating function\n"
-"wrappers for inter-language calls.  It currently only supports generating Guile\n"
-"wrappers for C functions.  Given a definition of the types and prototypes for\n"
-"a given C interface, G-Wrap will automatically generate the C code that\n"
-"provides access to that interface and its types from the Scheme level."
-msgstr ""
-
-#: gnu/packages/guile.scm:1492
-msgid "Guile database abstraction layer"
-msgstr "Couche d'abstraction de base de données pour Guile"
-
-#: gnu/packages/guile.scm:1495
-msgid ""
-"guile-dbi is a library for Guile that provides a convenient interface to\n"
-"SQL databases.  Database programming with guile-dbi is generic in that the same\n"
-"programming interface is presented regardless of which database system is used.\n"
-"It currently supports MySQL, Postgres and SQLite3."
-msgstr ""
-
-#: gnu/packages/guile.scm:1529
-msgid "Guile DBI driver for SQLite"
-msgstr ""
-
-#: gnu/packages/guile.scm:1532
-msgid ""
-"guile-dbi is a library for Guile that provides a convenient interface to\n"
-"SQL databases.  This package implements the interface for SQLite."
-msgstr ""
-
-#: gnu/packages/guile.scm:1575
-msgid "DSV module for Guile"
-msgstr "Module DSV pour Guile"
-
-#: gnu/packages/guile.scm:1577
-msgid ""
-"Guile-DSV is a GNU Guile module for working with the\n"
-"delimiter-separated values (DSV) data format.  Guile-DSV supports the\n"
-"Unix-style DSV format and RFC 4180 format."
-msgstr ""
-
-#: gnu/packages/guile.scm:1604
-msgid "XOSD bindings for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1606
-msgid ""
-"Guile-XOSD provides Guile bindings for @code{libxosd},\n"
-"@uref{http://sourceforge.net/projects/libxosd/, the X On Screen Display\n"
-"library}."
-msgstr ""
-
-#: gnu/packages/guile.scm:1629
-msgid "Evaluate code in a running Guile process"
-msgstr ""
-
-#: gnu/packages/guile.scm:1631
-msgid ""
-"Guile-Daemon is a small Guile program that loads your initial\n"
-"configuration file, and then reads and evaluates Guile expressions that\n"
-"you send to a FIFO file."
-msgstr ""
-
-#: gnu/packages/guile.scm:1665
-msgid "CommonMark parser for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1667
-msgid ""
-"guile-commonmark is a library for parsing CommonMark, a fully specified\n"
-"variant of Markdown.  The library is written in Guile Scheme and is designed\n"
-"to transform a CommonMark document to SXML.  guile-commonmark tries to closely\n"
-"follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference\n"
-"is no support for parsing block and inline level HTML."
-msgstr ""
-
-#: gnu/packages/guile.scm:1698
+#: gnu/packages/guile.scm:584
 msgid "Structured access to bytevector contents for Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:1700
+#: gnu/packages/guile.scm:586
 msgid ""
 "Guile bytestructures offers a system imitating the type system\n"
 "of the C programming language, to be used on bytevectors.  C's type\n"
@@ -7787,216 +7513,16 @@ msgid ""
 "type system, elevating types to first-class status."
 msgstr ""
 
-#: gnu/packages/guile.scm:1744
-msgid "Spell-checking from Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1746
-msgid ""
-"guile-aspell is a Guile Scheme library for comparing a string against a\n"
-"dictionary and suggesting spelling corrections."
-msgstr ""
-
-#: gnu/packages/guile.scm:1795
-msgid "Extend Bash using Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1797
-#, scheme-format
-msgid ""
-"Guile-Bash provides a shared library and set of Guile modules,\n"
-"allowing you to extend Bash in Scheme.  Scheme interfaces allow you to access\n"
-"the following aspects of Bash:\n"
-"\n"
-"@itemize\n"
-"@item aliases;\n"
-"@item setting and getting Bash variables;\n"
-"@item creating dynamic variables;\n"
-"@item creating Bash functions with a Scheme implementation;\n"
-"@item reader macro for output capturing;\n"
-"@item reader macro for evaluating raw Bash commands.\n"
-"@end itemize\n"
-"\n"
-"To enable it, run:\n"
-"\n"
-"@example\n"
-"enable -f ~/.guix-profile/lib/bash/libguile-bash.so scm\n"
-"@end example\n"
-"\n"
-"and then run @command{scm example.scm}."
-msgstr ""
-
-#: gnu/packages/guile.scm:1844
-msgid "Asynchronous actor model library for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1846
-msgid ""
-"GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming\n"
-"library for GNU Guile based on the actor model.\n"
-"\n"
-"Note that 8sync is only available for Guile 2.2."
-msgstr ""
-
-#: gnu/packages/guile.scm:1883
-msgid "Lightweight concurrency facility for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1885
-msgid ""
-"Fibers is a Guile library that implements a a lightweight concurrency\n"
-"facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is\n"
-"like a \"goroutine\" from the Go language: a lightweight thread-like\n"
-"abstraction.  Systems built with Fibers can scale up to millions of concurrent\n"
-"fibers, tens of thousands of concurrent socket connections, and many parallel\n"
-"cores.  The Fibers library also provides Concurrent ML-like channels for\n"
-"communication between fibers.\n"
-"\n"
-"Note that Fibers makes use of some Guile 2.1/2.2-specific features and\n"
-"is not available for Guile 2.0."
-msgstr ""
-
-#: gnu/packages/guile.scm:1922
+#: gnu/packages/guile.scm:620
 msgid "Guile bindings for libgit2"
 msgstr "Liaisons Guile pour libgit2"
 
-#: gnu/packages/guile.scm:1924
+#: gnu/packages/guile.scm:622
 msgid ""
 "This package provides Guile bindings to libgit2, a library to\n"
 "manipulate repositories of the Git version control system."
 msgstr ""
 
-#: gnu/packages/guile.scm:1949
-msgid "General-purpose syntax highlighter for GNU Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1950
-msgid ""
-"Guile-syntax-highlight is a general-purpose syntax\n"
-"highlighting library for GNU Guile.  It can parse code written in various\n"
-"programming languages into a simple s-expression that can be converted to\n"
-"HTML (via SXML) or any other format for rendering."
-msgstr ""
-
-#: gnu/packages/guile.scm:1976
-msgid "S-expression based json reader/writer for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1977
-msgid ""
-"guile-sjson is a json reader/writer for Guile.\n"
-"It has a nice, simple s-expression based syntax."
-msgstr ""
-
-#: gnu/packages/guile.scm:1997
-msgid "Colorized REPL for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1999
-msgid "Guile-colorized provides you with a colorized REPL for GNU Guile."
-msgstr ""
-
-#: gnu/packages/guile.scm:2054
-msgid "Purely functional data structures for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:2056
-msgid ""
-"This package provides purely functional data structures written in R6RS\n"
-"Scheme and compiled for Guile.  It has been tested with Racket, Guile 2,\n"
-"Vicare Scheme and IronScheme.  Right now it contains:\n"
-"\n"
-"@itemize\n"
-"@item queues\n"
-"@item deques\n"
-"@item bbtrees\n"
-"@item sets\n"
-"@item dlists\n"
-"@item priority search queues (PSQs)\n"
-"@item finger trees\n"
-"@item sequences\n"
-"@item heaps\n"
-"@item hash array mapped tries (HAMTs).\n"
-"@end itemize\n"
-msgstr ""
-
-#: gnu/packages/guile.scm:2089
-msgid "AA tree data structure for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:2091
-msgid ""
-"This package provides an implementation of @dfn{AA trees}, a\n"
-"self-balancing binary tree data structure, for Guile.  It ensure @math{O(log\n"
-"n)} worst case performance for core operations.  The module provides\n"
-"non-mutating insert, delete, and search operations, with support for\n"
-"convenient nested tree operations."
-msgstr ""
-
-#: gnu/packages/guile.scm:2130
-msgid "Guile wrapper over ZeroMQ library"
-msgstr ""
-
-#: gnu/packages/guile.scm:2132
-msgid ""
-"This package provides a Guile programming interface to the ZeroMQ\n"
-"messaging library."
-msgstr ""
-"Ce paquet fournit une interface de programmation Guile pour la bibliothèque\n"
-"de messages ZeroMQ."
-
-#: gnu/packages/guile.scm:2218
-msgid "Guile kernel for the Jupyter Notebook"
-msgstr ""
-
-#: gnu/packages/guile.scm:2220
-msgid ""
-"This package provides a Guile 2.x kernel for the Jupyter Notebook.  It\n"
-"allows users to interact with the Guile REPL through Jupyter."
-msgstr ""
-
-#: gnu/packages/guile.scm:2243
-msgid "SPARQL module for Guile"
-msgstr "Module SPARQL pour Guile"
-
-#: gnu/packages/guile.scm:2244
-msgid ""
-"This package provides the functionality to query a SPARQL\n"
-"endpoint.  Additionally, it provides an interface to write SPARQL queries\n"
-"using S-expressions."
-msgstr ""
-
-#: gnu/packages/guile.scm:2270
-msgid "Guile interface to the Debbugs bug tracking service"
-msgstr ""
-
-#: gnu/packages/guile.scm:2272
-msgid ""
-"This package provides a Guile library to communicate with a Debbugs bug\n"
-"tracker's SOAP service, such as @url{https://bugs.gnu.org}."
-msgstr ""
-
-#: gnu/packages/guile.scm:2300
-msgid "Guile email parser"
-msgstr ""
-
-#: gnu/packages/guile.scm:2301
-msgid ""
-"This package provides an email parser written in pure\n"
-"Guile."
-msgstr "Ce paquet fournit un analyseur de courriels en pur Guile."
-
-#: gnu/packages/guile.scm:2357
-msgid "Guile bindings to Newt"
-msgstr "Liaisons Guile pour Newt"
-
-#: gnu/packages/guile.scm:2359
-msgid ""
-"This package provides bindings for Newt, a programming library for\n"
-"color text mode, widget based user interfaces.  The bindings are written in pure\n"
-"Scheme by using Guile’s foreign function interface."
-msgstr ""
-
 #: gnu/packages/imagemagick.scm:113 gnu/packages/imagemagick.scm:216
 msgid "Create, edit, compose, or convert bitmap images"
 msgstr ""
@@ -8030,63 +7556,52 @@ msgid ""
 "processing, and 2D vector rendering."
 msgstr ""
 
-#: gnu/packages/image.scm:103
+#: gnu/packages/image.scm:108
 msgid "Library for handling PNG files"
 msgstr "Bibliothèque pour manipuler des fichiers PNG"
 
-#: gnu/packages/image.scm:105
+#: gnu/packages/image.scm:110
 msgid ""
 "Libpng is the official PNG (Portable Network Graphics) reference\n"
 "library.  It supports almost all PNG features and is extensible."
 msgstr ""
 
-#: gnu/packages/image.scm:169
+#: gnu/packages/image.scm:174
 msgid "APNG patch for libpng"
 msgstr ""
 
-#: gnu/packages/image.scm:171
+#: gnu/packages/image.scm:176
 msgid ""
 "APNG (Animated Portable Network Graphics) is an unofficial\n"
 "extension of the APNG (Portable Network Graphics) format.\n"
 "APNG patch provides APNG support to libpng."
 msgstr ""
 
-#: gnu/packages/image.scm:211
-msgid "Read and write PNG images"
-msgstr ""
-
-#: gnu/packages/image.scm:213
-msgid ""
-"This package provides an easy and simple way to read, write and display\n"
-"bitmap images stored in the PNG format.  It can read and write both files and\n"
-"in-memory raw vectors."
-msgstr ""
-
-#: gnu/packages/image.scm:248
+#: gnu/packages/image.scm:231
 msgid "Utility to compress PNG files"
 msgstr ""
 
-#: gnu/packages/image.scm:249
+#: gnu/packages/image.scm:232
 msgid ""
 "pngcrusqh is an optimizer for PNG (Portable Network Graphics)\n"
 "files.  It can compress them as much as 40% losslessly."
 msgstr ""
 
-#: gnu/packages/image.scm:307
+#: gnu/packages/image.scm:290
 msgid "Pretty small png library"
 msgstr "Bibliothèque png très petite"
 
-#: gnu/packages/image.scm:308
+#: gnu/packages/image.scm:291
 msgid ""
 "A pretty small png library.\n"
 "Currently all documentation resides in @file{pnglite.h}."
 msgstr ""
 
-#: gnu/packages/image.scm:323
+#: gnu/packages/image.scm:306
 msgid "Library for handling JPEG files"
 msgstr "Bibliothèque de manipulation des fichiers JPEG"
 
-#: gnu/packages/image.scm:325
+#: gnu/packages/image.scm:308
 msgid ""
 "Libjpeg implements JPEG image encoding, decoding, and transcoding.\n"
 "JPEG is a standardized compression method for full-color and gray-scale\n"
@@ -8103,32 +7618,32 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/image.scm:398
+#: gnu/packages/image.scm:381
 msgid "Implementation of the JPEG XR standard"
 msgstr "Implémentation du standard JPEG XR"
 
-#: gnu/packages/image.scm:399
+#: gnu/packages/image.scm:382
 msgid ""
 "JPEG XR is an approved ISO/IEC International standard (its\n"
 "official designation is ISO/IEC 29199-2). This library is an implementation of that standard."
 msgstr ""
 
-#: gnu/packages/image.scm:421
+#: gnu/packages/image.scm:404
 msgid "Optimize JPEG images"
 msgstr ""
 
-#: gnu/packages/image.scm:423
+#: gnu/packages/image.scm:406
 msgid ""
 "jpegoptim provides lossless optimization (based on optimizing\n"
 "the Huffman tables) and \"lossy\" optimization based on setting\n"
 "maximum quality factor."
 msgstr ""
 
-#: gnu/packages/image.scm:448
+#: gnu/packages/image.scm:431
 msgid "Library for handling Mac OS icns resource files"
 msgstr "Bibliothèque de manipulation des fichiers de resources d'icones Mac OS"
 
-#: gnu/packages/image.scm:450
+#: gnu/packages/image.scm:433
 msgid ""
 "Libicns is a library for the manipulation of Mac OS IconFamily resource\n"
 "type files (ICNS).  @command{icns2png} and @command{png2icns} are provided to\n"
@@ -8138,11 +7653,11 @@ msgid ""
 "extracting icontainer icon files."
 msgstr ""
 
-#: gnu/packages/image.scm:486
+#: gnu/packages/image.scm:466
 msgid "Library for handling TIFF files"
 msgstr "Bibliothèque de manipulation de fichiers TIFF"
 
-#: gnu/packages/image.scm:488
+#: gnu/packages/image.scm:468
 msgid ""
 "Libtiff provides support for the Tag Image File Format (TIFF), a format\n"
 "used for storing image data.\n"
@@ -8150,11 +7665,11 @@ msgid ""
 "collection of tools for doing simple manipulations of TIFF images."
 msgstr ""
 
-#: gnu/packages/image.scm:551
+#: gnu/packages/image.scm:521
 msgid "Library and tools for image processing and analysis"
 msgstr ""
 
-#: gnu/packages/image.scm:553
+#: gnu/packages/image.scm:523
 msgid ""
 "Leptonica is a C library and set of command-line tools for efficient\n"
 "image processing and image analysis operations.  It supports rasterop, affine\n"
@@ -8164,13 +7679,13 @@ msgid ""
 "arithmetic ops."
 msgstr ""
 
-#: gnu/packages/image.scm:576
+#: gnu/packages/image.scm:546
 msgid "Decoder of the JBIG2 image compression format"
 msgstr ""
 
-#: gnu/packages/image.scm:578
+#: gnu/packages/image.scm:548
 msgid ""
-"JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit\n"
+"JBIG2 is designed for lossy or lossless encoding of @code{bilevel} (1-bit\n"
 "monochrome) images at moderately high resolution, and in particular scanned\n"
 "paper documents.  In this domain it is very efficient, offering compression\n"
 "ratios on the order of 100:1.\n"
@@ -8181,11 +7696,11 @@ msgid ""
 "work."
 msgstr ""
 
-#: gnu/packages/image.scm:628
+#: gnu/packages/image.scm:584
 msgid "JPEG 2000 codec"
 msgstr ""
 
-#: gnu/packages/image.scm:630
+#: gnu/packages/image.scm:586
 msgid ""
 "The OpenJPEG library is a JPEG 2000 codec written in C.  It has\n"
 "been developed in order to promote the use of JPEG 2000, the new\n"
@@ -8198,11 +7713,11 @@ msgid ""
 "error-resilience, a Java-viewer for j2k-images, ..."
 msgstr ""
 
-#: gnu/packages/image.scm:697
+#: gnu/packages/image.scm:667
 msgid "Tools and library for working with GIF images"
 msgstr "Outils et bibliothèque pour travailler avec les images GIF"
 
-#: gnu/packages/image.scm:699
+#: gnu/packages/image.scm:669
 msgid ""
 "GIFLIB is a library for reading and writing GIF images.  It is API and\n"
 "ABI compatible with libungif which was in wide use while the LZW compression\n"
@@ -8210,19 +7725,19 @@ msgid ""
 "compose, and analyze GIF images."
 msgstr ""
 
-#: gnu/packages/image.scm:721
+#: gnu/packages/image.scm:691
 msgid "GIF decompression library"
 msgstr "Bibliothèque de décompression GIF"
 
-#: gnu/packages/image.scm:723
+#: gnu/packages/image.scm:693
 msgid "libungif is the old GIF decompression library by the GIFLIB project."
 msgstr ""
 
-#: gnu/packages/image.scm:752
+#: gnu/packages/image.scm:722
 msgid "Loading, saving, rendering and manipulating image files"
 msgstr ""
 
-#: gnu/packages/image.scm:754
+#: gnu/packages/image.scm:724
 msgid ""
 "Imlib2 is a library that does image file loading and saving as well as\n"
 "rendering, manipulation, arbitrary polygon support, etc.\n"
@@ -8235,32 +7750,32 @@ msgid ""
 "more modular, simple, and flexible."
 msgstr ""
 
-#: gnu/packages/image.scm:786
+#: gnu/packages/image.scm:756
 msgid "Wrapper library for imlib2"
 msgstr ""
 
-#: gnu/packages/image.scm:788
+#: gnu/packages/image.scm:758
 msgid ""
 "Giblib is a simple library which wraps imlib2's context API, avoiding\n"
 "all the context_get/set calls, adds fontstyles to the truetype renderer and\n"
 "supplies a generic doubly-linked list and some string functions."
 msgstr ""
 
-#: gnu/packages/image.scm:869
+#: gnu/packages/image.scm:839
 msgid "Library for handling popular graphics image formats"
 msgstr ""
 
-#: gnu/packages/image.scm:871
+#: gnu/packages/image.scm:841
 msgid ""
 "FreeImage is a library for developers who would like to support popular\n"
 "graphics image formats like PNG, BMP, JPEG, TIFF and others."
 msgstr ""
 
-#: gnu/packages/image.scm:933
+#: gnu/packages/image.scm:907
 msgid "Computer vision library"
 msgstr ""
 
-#: gnu/packages/image.scm:935
+#: gnu/packages/image.scm:909
 msgid ""
 "VIGRA stands for Vision with Generic Algorithms.  It is an image\n"
 "processing and analysis library that puts its main emphasis on customizable\n"
@@ -8268,22 +7783,22 @@ msgid ""
 "multi-dimensional image processing."
 msgstr ""
 
-#: gnu/packages/image.scm:968
+#: gnu/packages/image.scm:942
 msgid "C interface to the VIGRA computer vision library"
 msgstr "Interface C à la bibliothèque de vision par ordinateur VIGRA"
 
-#: gnu/packages/image.scm:970
+#: gnu/packages/image.scm:944
 msgid ""
 "This package provides a C interface to the VIGRA C++ computer vision\n"
 "library.  It is designed primarily to ease the implementation of higher-level\n"
 "language bindings to VIGRA."
 msgstr ""
 
-#: gnu/packages/image.scm:1010
+#: gnu/packages/image.scm:984
 msgid "Lossless and lossy image compression"
 msgstr ""
 
-#: gnu/packages/image.scm:1012
+#: gnu/packages/image.scm:986
 msgid ""
 "WebP is a new image format that provides lossless and lossy compression\n"
 "for images.  WebP lossless images are 26% smaller in size compared to\n"
@@ -8295,52 +7810,52 @@ msgid ""
 "channels."
 msgstr ""
 
-#: gnu/packages/image.scm:1040
+#: gnu/packages/image.scm:1014
 msgid "Library for handling MNG files"
 msgstr "Bibliothèque de manipulation des fichiers MNG"
 
-#: gnu/packages/image.scm:1042
+#: gnu/packages/image.scm:1016
 msgid "Libmng is the MNG (Multiple-image Network Graphics) reference library."
 msgstr ""
 
-#: gnu/packages/image.scm:1070
+#: gnu/packages/image.scm:1044
 msgid "Library and command-line utility to manage image metadata"
 msgstr ""
 
-#: gnu/packages/image.scm:1072
+#: gnu/packages/image.scm:1046
 msgid ""
 "Exiv2 is a C++ library and a command line utility to manage image\n"
 "metadata.  It provides fast and easy read and write access to the Exif, IPTC\n"
 "and XMP metadata of images in various formats."
 msgstr ""
 
-#: gnu/packages/image.scm:1112
+#: gnu/packages/image.scm:1086
 msgid "Library for manipulating many image formats"
 msgstr ""
 
-#: gnu/packages/image.scm:1113
+#: gnu/packages/image.scm:1087
 msgid ""
 "Developer's Image Library (DevIL) is a library to develop\n"
 "applications with support for many types of images.  DevIL can load, save,\n"
 "convert, manipulate, filter and display a wide variety of image formats."
 msgstr ""
 
-#: gnu/packages/image.scm:1133
+#: gnu/packages/image.scm:1108
 msgid "JPEG-2000 library"
 msgstr ""
 
-#: gnu/packages/image.scm:1134
+#: gnu/packages/image.scm:1109
 msgid ""
 "The JasPer Project is an initiative to provide a reference\n"
 "implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,\n"
 "ISO/IEC 15444-1)."
 msgstr ""
 
-#: gnu/packages/image.scm:1164
+#: gnu/packages/image.scm:1140
 msgid "Scaling, colorspace conversion, and dithering library"
 msgstr ""
 
-#: gnu/packages/image.scm:1165
+#: gnu/packages/image.scm:1141
 msgid ""
 "Zimg implements the commonly required image processing basics\n"
 "of scaling, colorspace conversion, and depth conversion.  A simple API enables\n"
@@ -8348,11 +7863,11 @@ msgid ""
 "the programmer."
 msgstr ""
 
-#: gnu/packages/image.scm:1198
+#: gnu/packages/image.scm:1175
 msgid "Perceptual image comparison utility"
 msgstr ""
 
-#: gnu/packages/image.scm:1199
+#: gnu/packages/image.scm:1176
 msgid ""
 "PerceptualDiff visually compares two images to determine\n"
 "whether they look alike.  It uses a computational model of the human visual\n"
@@ -8360,33 +7875,33 @@ msgid ""
 "differences in file encoding, image quality, and other small variations."
 msgstr ""
 
-#: gnu/packages/image.scm:1239
+#: gnu/packages/image.scm:1216
 msgid "Image and audio steganography"
 msgstr ""
 
-#: gnu/packages/image.scm:1241
+#: gnu/packages/image.scm:1218
 msgid ""
 "Steghide is a program to hide data in various kinds of image and audio\n"
 "files (known as @dfn{steganography}).  Neither color nor sample frequencies are\n"
 "changed, making the embedding resistant against first-order statistical tests."
 msgstr ""
 
-#: gnu/packages/image.scm:1266
+#: gnu/packages/image.scm:1243
 msgid "Image library for Extempore"
 msgstr ""
 
-#: gnu/packages/image.scm:1268
+#: gnu/packages/image.scm:1245
 msgid ""
 "This package is a collection of assorted single-file libraries.  Of\n"
 "all included libraries only the image loading and decoding library is\n"
 "installed as @code{stb_image}."
 msgstr ""
 
-#: gnu/packages/image.scm:1305
+#: gnu/packages/image.scm:1282
 msgid "Optimizer that recompresses PNG image files to a smaller size"
 msgstr ""
 
-#: gnu/packages/image.scm:1306
+#: gnu/packages/image.scm:1283
 msgid ""
 "OptiPNG is a PNG optimizer that recompresses image\n"
 "files to a smaller size, without losing any information.  This program\n"
@@ -8394,11 +7909,11 @@ msgid ""
 "PNG, and performs PNG integrity checks and corrections."
 msgstr ""
 
-#: gnu/packages/image.scm:1331
+#: gnu/packages/image.scm:1309
 msgid "SIMD-accelerated JPEG image handling library"
 msgstr ""
 
-#: gnu/packages/image.scm:1332
+#: gnu/packages/image.scm:1310
 msgid ""
 "libjpeg-turbo is a JPEG image codec that accelerates baseline\n"
 "JPEG compression and decompression using SIMD instructions: MMX on x86, SSE2 on\n"
@@ -8411,11 +7926,11 @@ msgid ""
 "and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.)."
 msgstr ""
 
-#: gnu/packages/image.scm:1382
+#: gnu/packages/image.scm:1372
 msgid "Library for reading and writing files in the nifti-1 format"
 msgstr ""
 
-#: gnu/packages/image.scm:1383
+#: gnu/packages/image.scm:1373
 msgid ""
 "Niftilib is a set of i/o libraries for reading and writing\n"
 "files in the nifti-1 data format - a binary file format for storing\n"
@@ -8423,19 +7938,19 @@ msgid ""
 "(fMRI) brain images."
 msgstr ""
 
-#: gnu/packages/image.scm:1422
+#: gnu/packages/image.scm:1414
 msgid "Color picker"
 msgstr ""
 
-#: gnu/packages/image.scm:1423
+#: gnu/packages/image.scm:1415
 msgid "Gpick is an advanced color picker and palette editing tool."
 msgstr ""
 
-#: gnu/packages/image.scm:1441
+#: gnu/packages/image.scm:1433
 msgid "IPTC metadata manipulation library"
 msgstr "Bibliothèque de manipulation de métadonnées IPTC"
 
-#: gnu/packages/image.scm:1443
+#: gnu/packages/image.scm:1435
 msgid ""
 "Libiptcdata is a C library for manipulating the International Press\n"
 "Telecommunications Council (@dfn{IPTC}) metadata stored within multimedia files\n"
@@ -8444,11 +7959,11 @@ msgid ""
 "parsing, viewing, modifying, and saving this metadata."
 msgstr ""
 
-#: gnu/packages/image.scm:1479
+#: gnu/packages/image.scm:1472
 msgid "Powerful yet simple to use screenshot software"
 msgstr ""
 
-#: gnu/packages/image.scm:1480
+#: gnu/packages/image.scm:1473
 msgid ""
 "Flameshot is a screenshot program.\n"
 "Features:\n"
@@ -8462,22 +7977,22 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/image.scm:1506
+#: gnu/packages/image.scm:1499
 msgid "Read and write JPEG images with R"
 msgstr ""
 
-#: gnu/packages/image.scm:1507
+#: gnu/packages/image.scm:1500
 msgid ""
 "This package provides a way to read, write and display bitmap\n"
 "images stored in the JPEG format with R.  It can read and write both files and\n"
 "in-memory raw vectors."
 msgstr ""
 
-#: gnu/packages/image.scm:1541
+#: gnu/packages/image.scm:1534
 msgid "Edit GIF images and animations"
 msgstr ""
 
-#: gnu/packages/image.scm:1542
+#: gnu/packages/image.scm:1535
 msgid ""
 "Gifsicle is a command-line GIF image manipulation tool that:\n"
 "\n"
@@ -8496,19 +8011,37 @@ msgid ""
 "identical visual appearance."
 msgstr ""
 
-#: gnu/packages/image.scm:1581
+#: gnu/packages/image.scm:1575
 msgid "Convert JPEG images to ASCII"
 msgstr ""
 
-#: gnu/packages/image.scm:1583
+#: gnu/packages/image.scm:1577
 msgid "Jp2a is a small utility that converts JPEG images to ASCII."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:93
-msgid "Fast and light imlib2-based image viewer"
+#: gnu/packages/image.scm:1601
+msgid "Create screenshots from a Wayland compositor"
+msgstr ""
+
+#: gnu/packages/image.scm:1602
+msgid "grim can create screenshots from a Wayland compositor."
+msgstr ""
+
+#: gnu/packages/image.scm:1626
+msgid "Select a region in a Wayland compositor"
+msgstr ""
+
+#: gnu/packages/image.scm:1627
+msgid ""
+"Slurp can select a region in a Wayland compositor and print it\n"
+"to the standard output.  It works well together with grim."
 msgstr ""
 
 #: gnu/packages/image-viewers.scm:95
+msgid "Fast and light imlib2-based image viewer"
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:97
 msgid ""
 "feh is an X11 image viewer aimed mostly at console users.\n"
 "Unlike most other viewers, it does not have a fancy GUI, but simply\n"
@@ -8517,11 +8050,11 @@ msgid ""
 "actions."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:156
+#: gnu/packages/image-viewers.scm:155
 msgid "Lightweight GTK+ based image viewer"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:158
+#: gnu/packages/image-viewers.scm:157
 msgid ""
 "Geeqie is a lightweight GTK+ based image viewer for Unix like operating\n"
 "systems.  It features: EXIF, IPTC and XMP metadata browsing and editing\n"
@@ -8531,21 +8064,21 @@ msgid ""
 "collection.  Geeqie was initially based on GQview."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:183
+#: gnu/packages/image-viewers.scm:182
 msgid "Simple and fast image viewer for X"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:184
+#: gnu/packages/image-viewers.scm:183
 msgid ""
 "gpicview is a lightweight GTK+ 2.x based image viewer.\n"
 "It is the default image viewer on LXDE desktop environment."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:225
+#: gnu/packages/image-viewers.scm:224
 msgid "Simple X Image Viewer"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:227
+#: gnu/packages/image-viewers.scm:226
 msgid ""
 "sxiv is an alternative to feh and qiv.  Its primary goal is to\n"
 "provide the most basic features required for fast image viewing.  It has\n"
@@ -8554,11 +8087,11 @@ msgid ""
 "it and customize it for your needs."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:267
+#: gnu/packages/image-viewers.scm:268
 msgid "Simple, fast and elegant image viewer"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:268
+#: gnu/packages/image-viewers.scm:269
 msgid ""
 "Viewnior is an image viewer program.  Created to be simple,\n"
 "fast and elegant.  Its minimalistic interface provides more screenspace for\n"
@@ -8576,21 +8109,21 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:336
+#: gnu/packages/image-viewers.scm:324
 msgid "Render images in the terminal"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:338
+#: gnu/packages/image-viewers.scm:326
 msgid ""
 "Catimg is a little program that prints images in the terminal.\n"
 "It supports JPEG, PNG and GIF formats."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:389
+#: gnu/packages/image-viewers.scm:377
 msgid "High dynamic range (HDR) imaging application"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:391
+#: gnu/packages/image-viewers.scm:379
 msgid ""
 "Luminance HDR (formerly QtPFSGui) is a graphical user interface\n"
 "application that aims to provide a workflow for high dynamic range (HDR)\n"
@@ -8606,11 +8139,11 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:439
+#: gnu/packages/image-viewers.scm:427
 msgid "Image viewer for comics"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:440
+#: gnu/packages/image-viewers.scm:428
 msgid ""
 "MComix is a customizable image viewer that specializes as\n"
 "a comic and manga reader.  It supports a variety of container formats\n"
@@ -8630,21 +8163,21 @@ msgstr ""
 "Inkscape est un éditeur graphique vectoriel. Ce qui différencie Inkscape\n"
 "est son utilisation du format SVG, un standard W3C basé sur XML, comme format natif."
 
-#: gnu/packages/jemalloc.scm:64
+#: gnu/packages/jemalloc.scm:63
 msgid "General-purpose scalable concurrent malloc implementation"
 msgstr ""
 
-#: gnu/packages/jemalloc.scm:66
+#: gnu/packages/jemalloc.scm:65
 msgid ""
 "This library providing a malloc(3) implementation that emphasizes\n"
 "fragmentation avoidance and scalable concurrency support."
 msgstr ""
 
-#: gnu/packages/key-mon.scm:50
+#: gnu/packages/key-mon.scm:51
 msgid "Show keyboard and mouse status"
 msgstr ""
 
-#: gnu/packages/key-mon.scm:52
+#: gnu/packages/key-mon.scm:53
 msgid ""
 "The key-mon utility displays the current keyboard and mouse status.\n"
 "This is useful for teaching and screencasts."
@@ -8671,11 +8204,11 @@ msgstr ""
 msgid "Clone of the Motif toolkit for the X window system."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:100
+#: gnu/packages/libreoffice.scm:103
 msgid "General purpose formula parser and interpreter"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:101
+#: gnu/packages/libreoffice.scm:104
 msgid ""
 "Ixion is a library for calculating the results of formula\n"
 "expressions stored in multiple named targets, or \"cells\".  The cells can\n"
@@ -8683,11 +8216,11 @@ msgid ""
 "their dependencies automatically upon calculation."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:128
+#: gnu/packages/libreoffice.scm:131
 msgid "File import filter library for spreadsheet documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:129
+#: gnu/packages/libreoffice.scm:132
 msgid ""
 "Orcus is a library that provides a collection of standalone\n"
 "file processing filters.  It is currently focused on providing filters for\n"
@@ -8697,33 +8230,33 @@ msgid ""
 "CSV, CSS and XML."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:163
+#: gnu/packages/libreoffice.scm:166
 msgid "Document importer for office suites"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:164
+#: gnu/packages/libreoffice.scm:167
 msgid ""
 "Librevenge is a base library for writing document import\n"
 "filters.  It has interfaces for text documents, vector graphics,\n"
 "spreadsheets and presentations."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:189
+#: gnu/packages/libreoffice.scm:192
 msgid "Library for importing WordPerfect documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:190
+#: gnu/packages/libreoffice.scm:193
 msgid ""
 "Libwpd is a C++ library designed to help process\n"
 "WordPerfect documents.  It is most commonly used to import such documents\n"
 "into other word processors."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:223
+#: gnu/packages/libreoffice.scm:226
 msgid "Library for import of reflowable e-book formats"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:224
+#: gnu/packages/libreoffice.scm:227
 msgid ""
 "Libe-book is a library and a set of tools for reading and\n"
 "converting various reflowable e-book formats.  Currently supported are:\n"
@@ -8733,22 +8266,22 @@ msgid ""
 "ZVR (simple compressed text format)."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:254
+#: gnu/packages/libreoffice.scm:257
 msgid "EPUB generator library for librevenge"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:255
+#: gnu/packages/libreoffice.scm:258
 msgid ""
 "libepubgen is an EPUB generator for librevenge.  It supports\n"
 "librevenge's text document interface and--currently in a very limited\n"
 "way--presentation and vector drawing interfaces."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:281
+#: gnu/packages/libreoffice.scm:284
 msgid "Library and tools for the WordPerfect Graphics format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:282
+#: gnu/packages/libreoffice.scm:285
 msgid ""
 "The libwpg project provides a library and tools for\n"
 "working with graphics in the WPG (WordPerfect Graphics) format."
@@ -8775,31 +8308,31 @@ msgid ""
 "AbiWord documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:387
+#: gnu/packages/libreoffice.scm:384
 msgid "Library for parsing the CorelDRAW format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:388
+#: gnu/packages/libreoffice.scm:385
 msgid ""
 "Libcdr is a library that parses the file format of\n"
 "CorelDRAW documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:420
+#: gnu/packages/libreoffice.scm:418
 msgid "Library for parsing the Apple Keynote format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:421
+#: gnu/packages/libreoffice.scm:419
 msgid ""
 "Libetonyek is a library that parses the file format of\n"
 "Apple Keynote documents.  It currently supports Keynote versions 2 to 5."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:445
+#: gnu/packages/libreoffice.scm:443
 msgid "Library to access tags for identifying languages"
 msgstr "Bibliothèque pour accéder aux étiquettes qui identifient les langues"
 
-#: gnu/packages/libreoffice.scm:446
+#: gnu/packages/libreoffice.scm:444
 msgid ""
 "Liblangtag implements an interface to work with tags\n"
 "for identifying languages as described in RFC 5646.  It supports the\n"
@@ -8808,73 +8341,73 @@ msgid ""
 "standard 21.0.2."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:466
+#: gnu/packages/libreoffice.scm:464
 msgid "Text Categorization library"
 msgstr "Bibliothèque de catégorisation de textes"
 
-#: gnu/packages/libreoffice.scm:467
+#: gnu/packages/libreoffice.scm:465
 msgid ""
 "Libexttextcat is an N-Gram-Based Text Categorization\n"
 "library primarily intended for language guessing."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:497
+#: gnu/packages/libreoffice.scm:495
 msgid "Library for parsing the FreeHand format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:498
+#: gnu/packages/libreoffice.scm:496
 msgid ""
 "Libfreehand is a library that parses the file format of\n"
 "Aldus/Macromedia/Adobe FreeHand documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:524
+#: gnu/packages/libreoffice.scm:522
 msgid "Library for parsing the Microsoft Publisher format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:525
+#: gnu/packages/libreoffice.scm:523
 msgid ""
 "Libmspub is a library that parses the file format of\n"
 "Microsoft Publisher documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:551
+#: gnu/packages/libreoffice.scm:543
 msgid "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:553
+#: gnu/packages/libreoffice.scm:545
 msgid ""
 "The libnumbertext library provides language-neutral @code{NUMBERTEXT}\n"
 "and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and\n"
 "Java."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:579
+#: gnu/packages/libreoffice.scm:571
 msgid "Library for parsing the PageMaker format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:580
+#: gnu/packages/libreoffice.scm:572
 msgid ""
 "Libpagemaker is a library that parses the file format of\n"
 "Aldus/Adobe PageMaker documents.  Currently it only understands documents\n"
 "created by PageMaker version 6.x and 7."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:610
+#: gnu/packages/libreoffice.scm:602
 msgid "Library for parsing the Microsoft Visio format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:611
+#: gnu/packages/libreoffice.scm:603
 msgid ""
 "Libvisio is a library that parses the file format of\n"
 "Microsoft Visio documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:639
+#: gnu/packages/libreoffice.scm:631
 msgid "ODF (Open Document Format) library"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:640
+#: gnu/packages/libreoffice.scm:632
 msgid ""
 "Libodfgen is a library for generating documents in the\n"
 "Open Document Format (ODF).  It provides generator implementations for all\n"
@@ -8882,49 +8415,49 @@ msgid ""
 "text documents, vector drawings, presentations and spreadsheets."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:667
+#: gnu/packages/libreoffice.scm:659
 msgid "Import library for some old Macintosh text documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:668
+#: gnu/packages/libreoffice.scm:660
 msgid ""
 "Libmwaw contains some import filters for old Macintosh\n"
 "text documents (MacWrite, ClarisWorks, ... ) and for some graphics and\n"
 "spreadsheet documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:691
+#: gnu/packages/libreoffice.scm:683
 msgid "Provides LibreOffice support for old StarOffice documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:692
+#: gnu/packages/libreoffice.scm:684
 msgid ""
 "@code{libstaroffice} is an import filter for the document formats\n"
 "from the old StarOffice (.sdc, .sdw, ...)."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:717
+#: gnu/packages/libreoffice.scm:709
 msgid "Import library for Microsoft Works text documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:718
+#: gnu/packages/libreoffice.scm:710
 msgid ""
 "Libwps is a library for importing files in the Microsoft\n"
 "Works word processor file format."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:748
+#: gnu/packages/libreoffice.scm:740
 msgid "Parses file format of Zoner Callisto/Draw documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:749
+#: gnu/packages/libreoffice.scm:741
 msgid ""
 "Libzmf is a library that parses the file format of Zoner\n"
 "Callisto/Draw documents.  Currently it only understands documents created by\n"
 "Zoner Draw version 4 and 5."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:778
+#: gnu/packages/libreoffice.scm:772
 msgid ""
 "Hunspell is a spell checker and morphological analyzer\n"
 "library and program designed for languages with rich morphology and complex\n"
@@ -8932,59 +8465,59 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: In French, this is "Français classique".
-#: gnu/packages/libreoffice.scm:841
+#: gnu/packages/libreoffice.scm:835
 msgid "Hunspell dictionary for ``classic'' French (recommended)"
 msgstr ""
 
 #. TRANSLATORS: In French, this is "Français moderne".
-#: gnu/packages/libreoffice.scm:846
+#: gnu/packages/libreoffice.scm:840
 msgid "Hunspell dictionary for ``modern'' French"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:850
+#: gnu/packages/libreoffice.scm:844
 msgid "Hunspell dictionary for the post @dfn{1990 réforme} French"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:854
+#: gnu/packages/libreoffice.scm:848
 msgid "Hunspell dictionary for all variants of French"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:872
+#: gnu/packages/libreoffice.scm:866
 msgid "Hyphenation library"
 msgstr "Bibliothèque de césures"
 
-#: gnu/packages/libreoffice.scm:873
+#: gnu/packages/libreoffice.scm:867
 msgid ""
 "Hyphen is a hyphenation library using TeX hyphenation\n"
 "patterns, which are pre-processed by a perl script."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:896
+#: gnu/packages/libreoffice.scm:890
 msgid "Thesaurus"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:897
+#: gnu/packages/libreoffice.scm:891
 msgid ""
 "MyThes is a simple thesaurus that uses a structured text\n"
 "data file and an index file with binary search to look up words and phrases\n"
 "and to return information on pronunciations, meanings and synonyms."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:925
+#: gnu/packages/libreoffice.scm:919
 msgid "Library and tools for the QuarkXPress file format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:926
+#: gnu/packages/libreoffice.scm:920
 msgid ""
 "libqxp is a library and a set of tools for reading and\n"
 "converting QuarkXPress file format.  It supports versions 3.1 to 4.1."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:1126
+#: gnu/packages/libreoffice.scm:1162
 msgid "Office suite"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:1127
+#: gnu/packages/libreoffice.scm:1163
 msgid ""
 "LibreOffice is a comprehensive office suite.  It contains\n"
 "a number of components: Writer, a word processor; Calc, a spreadsheet\n"
@@ -8993,19 +8526,19 @@ msgid ""
 "Math for editing mathematics."
 msgstr ""
 
-#: gnu/packages/linux.scm:220
+#: gnu/packages/linux.scm:223
 msgid "GNU Linux-Libre kernel headers"
 msgstr "Fichiers d'en-tête pour le noyau GNU Linux-Libre"
 
-#: gnu/packages/linux.scm:221
+#: gnu/packages/linux.scm:224
 msgid "Headers of the Linux-Libre kernel."
 msgstr "Fichiers d'en-tête pour le noyau Linux-Libre."
 
-#: gnu/packages/linux.scm:396
+#: gnu/packages/linux.scm:421
 msgid "100% free redistribution of a cleaned Linux kernel"
 msgstr "Redistribution 100% libre d'un noyau Linux propre"
 
-#: gnu/packages/linux.scm:398
+#: gnu/packages/linux.scm:423
 msgid ""
 "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.\n"
 "It has been modified to remove all non-free binary blobs."
@@ -9013,11 +8546,11 @@ msgstr ""
 "GNU Linux-Libre est une variante libre du noyau Linux.\n"
 "Il a été modifié pour en retirer toutes les composantes non-libres."
 
-#: gnu/packages/linux.scm:529
+#: gnu/packages/linux.scm:576
 msgid "Pluggable authentication modules for Linux"
 msgstr "Modules d'authentification pour Linux"
 
-#: gnu/packages/linux.scm:531
+#: gnu/packages/linux.scm:578
 msgid ""
 "A *Free* project to implement OSF's RFC 86.0.\n"
 "Pluggable authentication modules are small shared object files that can\n"
@@ -9030,11 +8563,11 @@ msgstr ""
 "d'un utilisateur au moment de la connexion. Ses principales fonctionnalités sont\n"
 "la reconfiguration locale et dynamique."
 
-#: gnu/packages/linux.scm:573
+#: gnu/packages/linux.scm:620
 msgid "Small utilities that use the proc file system"
 msgstr "Petits utilitaires utilisant le système de fichier proc"
 
-#: gnu/packages/linux.scm:575
+#: gnu/packages/linux.scm:622
 msgid ""
 "This PSmisc package is a set of some small useful utilities that\n"
 "use the proc file system.  We're not about changing the world, but\n"
@@ -9045,33 +8578,33 @@ msgstr ""
 "mais simplement de fournir de l'aide à l'administrateur système dans ses\n"
 "tâches les plus courantes."
 
-#: gnu/packages/linux.scm:660
+#: gnu/packages/linux.scm:714
 msgid "Collection of utilities for the Linux kernel"
 msgstr "Collection d'utilitaires pour le noyau Linux"
 
-#: gnu/packages/linux.scm:661
+#: gnu/packages/linux.scm:715
 msgid ""
 "Util-linux is a diverse collection of Linux kernel\n"
 "utilities.  It provides dmesg and includes tools for working with file systems,\n"
 "block devices, UUIDs, TTYs, and many other tools."
 msgstr ""
 
-#: gnu/packages/linux.scm:685
+#: gnu/packages/linux.scm:739
 msgid "PERPETUAL DATE CONVERTER FROM GREGORIAN TO POEE CALENDAR"
 msgstr ""
 
-#: gnu/packages/linux.scm:687
+#: gnu/packages/linux.scm:741
 msgid ""
 "ddate displays the Discordian date and holidays of a given date.\n"
 "The Discordian calendar was made popular by the \"Illuminatus!\" trilogy\n"
 "by Robert Shea and Robert Anton Wilson."
 msgstr ""
 
-#: gnu/packages/linux.scm:723
+#: gnu/packages/linux.scm:777
 msgid "Utilities that give information about processes"
 msgstr "Utilitaires fournissant des informations sur les processus"
 
-#: gnu/packages/linux.scm:725
+#: gnu/packages/linux.scm:779
 msgid ""
 "Procps is the package that has a bunch of small useful utilities\n"
 "that give information about processes using the Linux /proc file system.\n"
@@ -9083,27 +8616,27 @@ msgstr ""
 "Le paquet inclut les programmes ps, top, vmstat, w, kill, free,\n"
 "slabtop et skill."
 
-#: gnu/packages/linux.scm:751
+#: gnu/packages/linux.scm:805
 msgid "Tools for working with USB devices, such as lsusb"
 msgstr "Outils de manipulation des périphériques USB, tels que lsusb"
 
-#: gnu/packages/linux.scm:753
+#: gnu/packages/linux.scm:807
 msgid "Tools for working with USB devices, such as lsusb."
 msgstr "Outils de manipulation des périphériques USB, tels que lsusb."
 
-#: gnu/packages/linux.scm:829
+#: gnu/packages/linux.scm:883
 msgid "Creating and checking ext2/ext3/ext4 file systems"
 msgstr "Création et vérification de systèmes de fichiers ext1/ext3/ext4"
 
-#: gnu/packages/linux.scm:831
+#: gnu/packages/linux.scm:885
 msgid "This package provides tools for manipulating ext2/ext3/ext4 file systems."
 msgstr "Ce paquet fournit des outils pour manipuler les systèmes de fichiers ext2/ext3/ext4."
 
-#: gnu/packages/linux.scm:873
+#: gnu/packages/linux.scm:927
 msgid "Statically-linked e2fsck command from e2fsprogs"
 msgstr "Commandes de e2fsck liées statiquement provenant de e2fsprogs"
 
-#: gnu/packages/linux.scm:874
+#: gnu/packages/linux.scm:928
 msgid ""
 "This package provides statically-linked e2fsck command taken\n"
 "from the e2fsprogs package.  It is meant to be used in initrds."
@@ -9111,21 +8644,21 @@ msgstr ""
 "Ce paquet fournit la commande e2fsck liée statiquement issue\n"
 "du paquet e2fsprogs. Il est censé être utilisé dans les initrds."
 
-#: gnu/packages/linux.scm:895
+#: gnu/packages/linux.scm:949
 msgid "Recover deleted files from ext2/3/4 partitions"
 msgstr ""
 
-#: gnu/packages/linux.scm:897
+#: gnu/packages/linux.scm:951
 msgid ""
 "Extundelete is a set of tools that can recover deleted files from an\n"
 "ext3 or ext4 partition."
 msgstr ""
 
-#: gnu/packages/linux.scm:928
+#: gnu/packages/linux.scm:982
 msgid "Zero non-allocated regions in ext2/ext3/ext4 file systems"
 msgstr "Remet à zéro les régions non allouées dans les systèmes de fichiers ext2/ext3/ext4"
 
-#: gnu/packages/linux.scm:930
+#: gnu/packages/linux.scm:984
 msgid ""
 "Zerofree finds the unallocated blocks with non-zero value content in an\n"
 "ext2, ext3, or ext4 file system and fills them with zeroes (or another value).\n"
@@ -9133,11 +8666,11 @@ msgid ""
 "Zerofree requires the file system to be unmounted or mounted read-only."
 msgstr ""
 
-#: gnu/packages/linux.scm:962
+#: gnu/packages/linux.scm:1016
 msgid "System call tracer for Linux"
 msgstr "Traceur d'appel système pour Linux"
 
-#: gnu/packages/linux.scm:964
+#: gnu/packages/linux.scm:1018
 msgid ""
 "strace is a system call tracer, i.e. a debugging tool which prints out a\n"
 "trace of all the system calls made by a another process/program."
@@ -9145,22 +8678,22 @@ msgstr ""
 "strace est un traceur d'appels système, c-à-d un outil de débogage affichant\n"
 "les appels système effectués par un autre processus/programme."
 
-#: gnu/packages/linux.scm:985
+#: gnu/packages/linux.scm:1039
 msgid "Library call tracer for Linux"
 msgstr "Traceur d'appel système pour Linux"
 
-#: gnu/packages/linux.scm:987
+#: gnu/packages/linux.scm:1041
 msgid ""
 "ltrace intercepts and records dynamic library calls which are called by\n"
 "an executed process and the signals received by that process.  It can also\n"
 "intercept and print the system calls executed by the program."
 msgstr ""
 
-#: gnu/packages/linux.scm:1006
+#: gnu/packages/linux.scm:1060
 msgid "The Advanced Linux Sound Architecture libraries"
 msgstr "Bibliothèques ALSA (Advanced Linux Sound Architecture)"
 
-#: gnu/packages/linux.scm:1008 gnu/packages/linux.scm:1052
+#: gnu/packages/linux.scm:1062 gnu/packages/linux.scm:1106
 msgid ""
 "The Advanced Linux Sound Architecture (ALSA) provides audio and\n"
 "MIDI functionality to the Linux-based operating system."
@@ -9168,15 +8701,15 @@ msgstr ""
 "ALSA fournit des fonctionnalités audio et MIDI pour les sytèmes\n"
 "basés sur Linux."
 
-#: gnu/packages/linux.scm:1050
+#: gnu/packages/linux.scm:1104
 msgid "Utilities for the Advanced Linux Sound Architecture (ALSA)"
 msgstr "Utilitaires pour ALSA (Advanced Linux Sound Architecture)"
 
-#: gnu/packages/linux.scm:1119
+#: gnu/packages/linux.scm:1168
 msgid "Plugins for the Advanced Linux Sound Architecture (ALSA)"
 msgstr "Greffons pour ALSA (Advanced Linux Sound Architecture)"
 
-#: gnu/packages/linux.scm:1121
+#: gnu/packages/linux.scm:1170
 msgid ""
 "The Advanced Linux Sound Architecture (ALSA) provides audio and\n"
 "MIDI functionality to the Linux-based operating system.  This package enhances ALSA\n"
@@ -9185,11 +8718,11 @@ msgid ""
 "external rate conversion."
 msgstr ""
 
-#: gnu/packages/linux.scm:1155
+#: gnu/packages/linux.scm:1204
 msgid "Programs to configure Linux IP packet filtering rules"
 msgstr "Programmes de configuration de règles de filtrage des paquets IP pour Linux"
 
-#: gnu/packages/linux.scm:1157
+#: gnu/packages/linux.scm:1206
 msgid ""
 "@command{iptables} is the user-space command line program used to\n"
 "configure the Linux 2.4.x and later IPv4 packet filtering ruleset\n"
@@ -9209,11 +8742,11 @@ msgstr ""
 "\n"
 "Les deux commandes sont destinées aux administrateurs système."
 
-#: gnu/packages/linux.scm:1213
+#: gnu/packages/linux.scm:1262
 msgid "Ethernet bridge frame table administration"
 msgstr ""
 
-#: gnu/packages/linux.scm:1216
+#: gnu/packages/linux.scm:1265
 msgid ""
 "ebtables is an application program used to set up and maintain the\n"
 "tables of rules (inside the Linux kernel) that inspect Ethernet frames.  It is\n"
@@ -9221,11 +8754,11 @@ msgid ""
 "that the Ethernet protocol is much simpler than the IP protocol."
 msgstr ""
 
-#: gnu/packages/linux.scm:1264
+#: gnu/packages/linux.scm:1318
 msgid "Utilities for controlling TCP/IP networking and traffic in Linux"
 msgstr "Utilitaires de contrôle du traffic TCP/IP pour Linux"
 
-#: gnu/packages/linux.scm:1266
+#: gnu/packages/linux.scm:1320
 msgid ""
 "Iproute2 is a collection of utilities for controlling TCP/IP networking\n"
 "and traffic with the Linux kernel.  The most important of these are\n"
@@ -9237,11 +8770,11 @@ msgid ""
 "inadequately in modern network environments, and both should be deprecated."
 msgstr ""
 
-#: gnu/packages/linux.scm:1343
+#: gnu/packages/linux.scm:1397
 msgid "Tools for controlling the network subsystem in Linux"
 msgstr "Outils pour contrôler le sous-système réseau dans Linux"
 
-#: gnu/packages/linux.scm:1345
+#: gnu/packages/linux.scm:1399
 msgid ""
 "This package includes the important tools for controlling the network\n"
 "subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, rarp and\n"
@@ -9255,21 +8788,21 @@ msgstr ""
 "particulières (pliconfig, slattach) et à des aspects avancés de la configuration\n"
 "réseau (iptunnel, ipmaddr)."
 
-#: gnu/packages/linux.scm:1383
+#: gnu/packages/linux.scm:1437
 msgid "Library for working with POSIX capabilities"
 msgstr "Bibliothèque pour travailler avec les possibilités de POSIX"
 
-#: gnu/packages/linux.scm:1385
+#: gnu/packages/linux.scm:1439
 msgid ""
 "Libcap2 provides a programming interface to POSIX capabilities on\n"
 "Linux-based operating systems."
 msgstr "Libcap2 fournit une interface de programmation POSIX aux systèmes basés sur Linux."
 
-#: gnu/packages/linux.scm:1428
+#: gnu/packages/linux.scm:1482
 msgid "Manipulate Ethernet bridges"
 msgstr "Manipulation des ponts Ethernet"
 
-#: gnu/packages/linux.scm:1430
+#: gnu/packages/linux.scm:1484
 msgid ""
 "Utilities for Linux's Ethernet bridging facilities.  A bridge is a way\n"
 "to connect two Ethernet segments together in a protocol independent way.\n"
@@ -9284,11 +8817,11 @@ msgstr ""
 "niveau 2, tous les protocoles peuvent transiter de manière transparente sur un\n"
 "un pont."
 
-#: gnu/packages/linux.scm:1498
+#: gnu/packages/linux.scm:1550
 msgid "NetLink protocol library suite"
 msgstr "Bibliothèqye pour le protocole NetLink"
 
-#: gnu/packages/linux.scm:1500
+#: gnu/packages/linux.scm:1552
 msgid ""
 "The libnl suite is a collection of libraries providing APIs to netlink\n"
 "protocol based Linux kernel interfaces.  Netlink is an IPC mechanism primarily\n"
@@ -9302,21 +8835,21 @@ msgstr ""
 "est conçu pour être un successeur plus flexible à ioctl permettant de configurer\n"
 "le réseau au niveau noyau et surveiller les interfaces."
 
-#: gnu/packages/linux.scm:1530
+#: gnu/packages/linux.scm:1582
 msgid "Tool for configuring wireless devices"
 msgstr "Outils de configuration d'extensions sans fil"
 
-#: gnu/packages/linux.scm:1532
+#: gnu/packages/linux.scm:1584
 msgid ""
 "iw is a new nl80211 based CLI configuration utility for wireless\n"
 "devices.  It replaces @code{iwconfig}, which is deprecated."
 msgstr ""
 
-#: gnu/packages/linux.scm:1578
+#: gnu/packages/linux.scm:1628
 msgid "Analyze power consumption on Intel-based laptops"
 msgstr "Analyse de la consommation des portables basés sur Intel"
 
-#: gnu/packages/linux.scm:1580
+#: gnu/packages/linux.scm:1630
 msgid ""
 "PowerTOP is a Linux tool to diagnose issues with power consumption and\n"
 "power management.  In addition to being a diagnostic tool, PowerTOP also has\n"
@@ -9331,11 +8864,11 @@ msgstr ""
 "l'énergie pour des cas où le système d'exploitation n'a pas activé ces\n"
 "paramètres."
 
-#: gnu/packages/linux.scm:1602
+#: gnu/packages/linux.scm:1652
 msgid "Audio mixer for X and the console"
 msgstr "Table de mixage audio basée sur X et la console"
 
-#: gnu/packages/linux.scm:1604
+#: gnu/packages/linux.scm:1654
 msgid ""
 "Aumix adjusts an audio mixer from X, the console, a terminal,\n"
 "the command line or a script."
@@ -9343,11 +8876,11 @@ msgstr ""
 "Aumix ajuste un mixer audio depuis X, la console, un terminal,\n"
 "la ligne de commande ou un script."
 
-#: gnu/packages/linux.scm:1628
+#: gnu/packages/linux.scm:1678
 msgid "Displays the IO activity of running processes"
 msgstr "Affiche l'activité des entrées-sorties des processus en cours d'exécution"
 
-#: gnu/packages/linux.scm:1630
+#: gnu/packages/linux.scm:1680
 msgid ""
 "Iotop is a Python program with a top like user interface to show the\n"
 "processes currently causing I/O."
@@ -9355,11 +8888,11 @@ msgstr ""
 "Iotop est un programme Python doté d'une interface utilisateur affichant les\n"
 "entrées-sorties en cours des processus."
 
-#: gnu/packages/linux.scm:1684
+#: gnu/packages/linux.scm:1734
 msgid "Support file systems implemented in user space"
 msgstr "Support des systèmes de fichiers implantés dans l'espace utilisateur"
 
-#: gnu/packages/linux.scm:1686
+#: gnu/packages/linux.scm:1736
 msgid ""
 "As a consequence of its monolithic design, file system code for Linux\n"
 "normally goes into the kernel itself---which is not only a robustness issue,\n"
@@ -9376,11 +8909,11 @@ msgstr ""
 "ce problème en permettant aux utilisateurs de lancer les implantations de\n"
 "systèmes de fichiers comme des processus utilisateur."
 
-#: gnu/packages/linux.scm:1717
+#: gnu/packages/linux.scm:1767
 msgid "User-space union file system"
 msgstr ""
 
-#: gnu/packages/linux.scm:1719
+#: gnu/packages/linux.scm:1769
 msgid ""
 "UnionFS-FUSE is a flexible union file system implementation in user\n"
 "space, using the FUSE library.  Mounting a union file system allows you to\n"
@@ -9388,15 +8921,15 @@ msgid ""
 "UnionFS-FUSE additionally supports copy-on-write."
 msgstr ""
 
-#: gnu/packages/linux.scm:1747
+#: gnu/packages/linux.scm:1797
 msgid "User-space union file system (statically linked)"
 msgstr ""
 
-#: gnu/packages/linux.scm:1797
+#: gnu/packages/linux.scm:1847
 msgid "Mount remote file systems over SSH"
 msgstr "Montage de systèmes de fichier distants avec SSH"
 
-#: gnu/packages/linux.scm:1799
+#: gnu/packages/linux.scm:1849
 msgid ""
 "This is a file system client based on the SSH File Transfer Protocol.\n"
 "Since most SSH servers already support this protocol it is very easy to set\n"
@@ -9409,11 +8942,11 @@ msgstr ""
 "aussi facile de monter le système de fichiers que de se connecter avec un client\n"
 "SSH."
 
-#: gnu/packages/linux.scm:1822
+#: gnu/packages/linux.scm:1876
 msgid "Tool for mounting archive files with FUSE"
 msgstr ""
 
-#: gnu/packages/linux.scm:1823
+#: gnu/packages/linux.scm:1877
 msgid ""
 "archivemount is a FUSE-based file system for Unix variants,\n"
 "including Linux.  Its purpose is to mount archives (i.e. tar, tar.gz, etc.) to a\n"
@@ -9422,11 +8955,11 @@ msgid ""
 "compressed, transparent to other programs, without decompressing them."
 msgstr ""
 
-#: gnu/packages/linux.scm:1852
+#: gnu/packages/linux.scm:1906
 msgid "Tools for non-uniform memory access (NUMA) machines"
 msgstr "Outils pour les machines basées sur NUMA (non-uniform memory access)"
 
-#: gnu/packages/linux.scm:1854
+#: gnu/packages/linux.scm:1908
 msgid ""
 "NUMA stands for Non-Uniform Memory Access, in other words a system whose\n"
 "memory is not all in one place.  The numactl program allows you to run your\n"
@@ -9443,32 +8976,36 @@ msgstr ""
 "une application sur des noeuds CPU et mémoire spécifiques au moyen de politiques\n"
 "fournies au système d'exploitation avant le lancement du programme."
 
-#: gnu/packages/linux.scm:1890
+#: gnu/packages/linux.scm:1944
 msgid "Neo2 console layout"
 msgstr ""
 
-#: gnu/packages/linux.scm:1892
+#: gnu/packages/linux.scm:1946
 msgid ""
 "Kbd-neo provides the Neo2 keyboard layout for use with\n"
 "@command{loadkeys(1)} from @code{kbd(4)}."
 msgstr ""
 
-#: gnu/packages/linux.scm:1958
+#: gnu/packages/linux.scm:2012
 msgid "Linux keyboard utilities and keyboard maps"
 msgstr ""
 
-#: gnu/packages/linux.scm:1960
+#: gnu/packages/linux.scm:2014
 msgid ""
 "This package contains keytable files and keyboard utilities compatible\n"
 "for systems using the Linux kernel.  This includes commands such as\n"
-"'loadkeys', 'setfont', 'kbdinfo', and 'chvt'."
+"@code{loadkeys}, @code{setfont}, @code{kbdinfo}, and @code{chvt}."
 msgstr ""
 
-#: gnu/packages/linux.scm:1984
+#: gnu/packages/linux.scm:2050
+msgid "Statically-linked @command{loadkeys} program"
+msgstr "Programme @command{loadkeys} lié statiquement"
+
+#: gnu/packages/linux.scm:2075
 msgid "Monitor file accesses"
 msgstr "Surveillance des accès fichier"
 
-#: gnu/packages/linux.scm:1986
+#: gnu/packages/linux.scm:2077
 msgid ""
 "The inotify-tools packages provides a C library and command-line tools\n"
 "to use Linux' inotify mechanism, which allows file accesses to be monitored."
@@ -9477,11 +9014,11 @@ msgstr ""
 "permettant d'utiliser le mécanisme inotify de Linux qui autorise la surveillance\n"
 "des accès fichier."
 
-#: gnu/packages/linux.scm:2025
+#: gnu/packages/linux.scm:2116
 msgid "Kernel module tools"
 msgstr "Outils de module noyau"
 
-#: gnu/packages/linux.scm:2026
+#: gnu/packages/linux.scm:2117
 msgid ""
 "Kmod is a set of tools to handle common tasks with Linux\n"
 "kernel modules like insert, remove, list, check properties, resolve\n"
@@ -9499,11 +9036,11 @@ msgstr ""
 "kmod. L'objectif est d'être compatible avec les outils, les configurations et\n"
 "les indices du projet module-init-tools."
 
-#: gnu/packages/linux.scm:2089
+#: gnu/packages/linux.scm:2186
 msgid "Userspace device management"
 msgstr "Gestion de périphériques utilisateurs"
 
-#: gnu/packages/linux.scm:2090
+#: gnu/packages/linux.scm:2187
 msgid ""
 "Udev is a daemon which dynamically creates and removes\n"
 "device nodes from /dev/, handles hotplug events and loads drivers at boot\n"
@@ -9513,61 +9050,61 @@ msgstr ""
 "des noeuds de périphériques dans /dev/, gérer leur branchement à chaud\n"
 "et charger leur pilotes au démarrage."
 
-#: gnu/packages/linux.scm:2169
+#: gnu/packages/linux.scm:2266
 msgid "Logical volume management for Linux"
 msgstr "Gestion de volumes logiques pour Linux"
 
-#: gnu/packages/linux.scm:2171
+#: gnu/packages/linux.scm:2268
 msgid ""
 "LVM2 is the logical volume management tool set for Linux-based systems.\n"
 "This package includes the user-space libraries and tools, including the device\n"
 "mapper.  Kernel components are part of Linux-libre."
 msgstr ""
 
-#: gnu/packages/linux.scm:2193
+#: gnu/packages/linux.scm:2290
 msgid "Logical volume management for Linux (statically linked)"
 msgstr "Gestion de volumes logiques pour Linux (lié statiquement)"
 
-#: gnu/packages/linux.scm:2223
+#: gnu/packages/linux.scm:2320
 msgid "Tools for manipulating Linux Wireless Extensions"
 msgstr "Outils de manipulation d'extensions sans fil pour Linux"
 
-#: gnu/packages/linux.scm:2224
+#: gnu/packages/linux.scm:2321
 msgid ""
 "Wireless Tools are used to manipulate the now-deprecated\n"
-"Linux Wireless Extensions; consider using 'iw' instead.  The Wireless\n"
+"Linux Wireless Extensions; consider using @code{iw} instead.  The Wireless\n"
 "Extension was an interface allowing you to set Wireless LAN specific\n"
 "parameters and get the specific stats.  It is deprecated in favor the nl80211\n"
 "interface."
 msgstr ""
 
-#: gnu/packages/linux.scm:2301
+#: gnu/packages/linux.scm:2398
 msgid "Central regulatory domain agent (CRDA) for WiFi"
 msgstr ""
 
-#: gnu/packages/linux.scm:2303
+#: gnu/packages/linux.scm:2400
 msgid ""
 "The Central Regulatory Domain Agent (CRDA) acts as the udev helper for\n"
 "communication between the kernel Linux and user space for regulatory\n"
 "compliance."
 msgstr ""
 
-#: gnu/packages/linux.scm:2356
+#: gnu/packages/linux.scm:2453
 msgid "Wireless regulatory database"
 msgstr "Base de données sans fil réglementaire"
 
-#: gnu/packages/linux.scm:2358
+#: gnu/packages/linux.scm:2455
 msgid ""
 "This package contains the wireless regulatory database Central\n"
 "Regulatory Database Agent (CRDA) daemon.  The database contains information on\n"
 "country-specific regulations for the wireless spectrum."
 msgstr ""
 
-#: gnu/packages/linux.scm:2435
+#: gnu/packages/linux.scm:2532
 msgid "Utilities to read temperature/voltage/fan sensors"
 msgstr "Utilitaires pour la lecture de capteurs de tempéture/voltage/ventilateur"
 
-#: gnu/packages/linux.scm:2437
+#: gnu/packages/linux.scm:2534
 msgid ""
 "Lm-sensors is a hardware health monitoring package for Linux.  It allows\n"
 "you to access information from temperature, voltage, and fan speed sensors.\n"
@@ -9578,22 +9115,22 @@ msgstr ""
 "le voltage ou la vitesse des ventilatuers. Il fonctionne avec la plupart des\n"
 "systèmes les plus récents."
 
-#: gnu/packages/linux.scm:2455
+#: gnu/packages/linux.scm:2552
 msgid "Manipulate Intel microcode bundles"
 msgstr "Manipulation des lots de microcodes Intel"
 
-#: gnu/packages/linux.scm:2457
+#: gnu/packages/linux.scm:2554
 msgid ""
 "@command{iucode_tool} is a utility to work with microcode packages for\n"
 "Intel processors.  It can convert between formats, extract specific versions,\n"
 "create a firmware image suitable for the Linux kernel, and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:2486
+#: gnu/packages/linux.scm:2583
 msgid "I2C tools for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:2488
+#: gnu/packages/linux.scm:2585
 msgid ""
 "The i2c-tools package contains a heterogeneous set of I2C tools for\n"
 "Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers,\n"
@@ -9601,11 +9138,11 @@ msgid ""
 "SMBus access."
 msgstr ""
 
-#: gnu/packages/linux.scm:2525
+#: gnu/packages/linux.scm:2622
 msgid "Hardware health information viewer"
 msgstr "Utiltaire de monitoring hardware"
 
-#: gnu/packages/linux.scm:2527
+#: gnu/packages/linux.scm:2624
 msgid ""
 "Xsensors reads data from the libsensors library regarding hardware\n"
 "health such as temperature, voltage and fan speed and displays the information\n"
@@ -9615,24 +9152,24 @@ msgstr ""
 "la vitesse des ventilateurs depuis la bibliothèque libsensors et affiche les informations\n"
 "numériquement."
 
-#: gnu/packages/linux.scm:2579
+#: gnu/packages/linux.scm:2674
 msgid "Linux profiling with performance counters"
 msgstr ""
 
-#: gnu/packages/linux.scm:2581
+#: gnu/packages/linux.scm:2676
 msgid ""
 "perf is a tool suite for profiling using hardware performance counters,\n"
 "with support in the Linux kernel.  perf can instrument CPU performance\n"
 "counters, tracepoints, kprobes, and uprobes (dynamic tracing).  It is capable\n"
 "of lightweight profiling.  This package contains the user-land tools and in\n"
-"particular the 'perf' command."
+"particular the @code{perf} command."
 msgstr ""
 
-#: gnu/packages/linux.scm:2604
+#: gnu/packages/linux.scm:2699
 msgid "Simple tool for creating Linux namespace containers"
 msgstr ""
 
-#: gnu/packages/linux.scm:2605
+#: gnu/packages/linux.scm:2700
 msgid ""
 "pflask is a simple tool for creating Linux namespace\n"
 "containers.  It can be used for running a command or even booting an OS inside\n"
@@ -9641,11 +9178,11 @@ msgid ""
 "thanks to the use of namespaces."
 msgstr ""
 
-#: gnu/packages/linux.scm:2651
+#: gnu/packages/linux.scm:2755
 msgid "Container platform"
 msgstr ""
 
-#: gnu/packages/linux.scm:2652
+#: gnu/packages/linux.scm:2756
 msgid ""
 "Singularity is a container platform supporting a number of\n"
 "container image formats.  It can build SquashFS container images or import\n"
@@ -9653,11 +9190,11 @@ msgid ""
 "isolation or root privileges."
 msgstr ""
 
-#: gnu/packages/linux.scm:2680
+#: gnu/packages/linux.scm:2784
 msgid "View and tune ATA disk drive parameters"
 msgstr ""
 
-#: gnu/packages/linux.scm:2682
+#: gnu/packages/linux.scm:2786
 msgid ""
 "@command{hdparm} is a command-line utility to control ATA controllers and\n"
 "disk drives.  It can increase performance and/or reliability by careful tuning\n"
@@ -9671,22 +9208,22 @@ msgid ""
 "Translation (@dfn{SAT}) are also supported."
 msgstr ""
 
-#: gnu/packages/linux.scm:2713
+#: gnu/packages/linux.scm:2817
 msgid "Tool for enabling and disabling wireless devices"
 msgstr "Outils pour activer ou désactiver des périphériques sans fil"
 
-#: gnu/packages/linux.scm:2715
+#: gnu/packages/linux.scm:2819
 msgid ""
 "rfkill is a simple tool for accessing the rfkill device interface,\n"
 "which is used to enable and disable wireless networking devices, typically\n"
 "WLAN, Bluetooth and mobile broadband."
 msgstr ""
 
-#: gnu/packages/linux.scm:2736
+#: gnu/packages/linux.scm:2840
 msgid "Display information on ACPI devices"
 msgstr ""
 
-#: gnu/packages/linux.scm:2737
+#: gnu/packages/linux.scm:2841
 msgid ""
 "@code{acpi} attempts to replicate the functionality of the\n"
 "\"old\" @code{apm} command on ACPI systems, including battery and thermal\n"
@@ -9694,11 +9231,11 @@ msgid ""
 "about ACPI devices."
 msgstr ""
 
-#: gnu/packages/linux.scm:2756
+#: gnu/packages/linux.scm:2860
 msgid "Daemon for delivering ACPI events to user-space programs"
 msgstr ""
 
-#: gnu/packages/linux.scm:2758
+#: gnu/packages/linux.scm:2862
 msgid ""
 "acpid is designed to notify user-space programs of Advanced\n"
 "Configuration and Power Interface (ACPI) events.  acpid should be started\n"
@@ -9707,37 +9244,37 @@ msgid ""
 "specified in /etc/acpi/events and execute the rules that match the event."
 msgstr ""
 
-#: gnu/packages/linux.scm:2780
+#: gnu/packages/linux.scm:2884
 msgid "System utilities based on Linux sysfs"
 msgstr ""
 
-#: gnu/packages/linux.scm:2782
+#: gnu/packages/linux.scm:2886
 msgid ""
 "These are a set of utilities built upon sysfs, a virtual file system in\n"
 "Linux kernel versions 2.5+ that exposes a system's device tree.  The package\n"
 "also contains the libsysfs library."
 msgstr ""
 
-#: gnu/packages/linux.scm:2812
+#: gnu/packages/linux.scm:2916
 msgid "System utilities based on Linux sysfs (version 1.x)"
 msgstr ""
 
-#: gnu/packages/linux.scm:2835
+#: gnu/packages/linux.scm:2939
 msgid "Utilities to get and set CPU frequency on Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:2837
+#: gnu/packages/linux.scm:2941
 msgid ""
 "The cpufrequtils suite contains utilities to retrieve CPU frequency\n"
 "information, and set the CPU frequency if supported, using the cpufreq\n"
 "capabilities of the Linux kernel."
 msgstr ""
 
-#: gnu/packages/linux.scm:2856
+#: gnu/packages/linux.scm:2960
 msgid "Interface library for the Linux IEEE1394 drivers"
 msgstr ""
 
-#: gnu/packages/linux.scm:2858
+#: gnu/packages/linux.scm:2962
 msgid ""
 "Libraw1394 is the only supported interface to the kernel side raw1394 of\n"
 "the Linux IEEE-1394 subsystem, which provides direct access to the connected\n"
@@ -9746,46 +9283,46 @@ msgid ""
 "protocol in question."
 msgstr ""
 
-#: gnu/packages/linux.scm:2882
+#: gnu/packages/linux.scm:2986
 msgid "AV/C protocol library for IEEE 1394"
 msgstr ""
 
-#: gnu/packages/linux.scm:2884
+#: gnu/packages/linux.scm:2988
 msgid ""
 "Libavc1394 is a programming interface to the AV/C specification from\n"
 "the 1394 Trade Association.  AV/C stands for Audio/Video Control."
 msgstr ""
 
-#: gnu/packages/linux.scm:2906
+#: gnu/packages/linux.scm:3010
 msgid "Isochronous streaming media library for IEEE 1394"
 msgstr ""
 
-#: gnu/packages/linux.scm:2908
+#: gnu/packages/linux.scm:3012
 msgid ""
 "The libiec61883 library provides a higher level API for streaming DV,\n"
 "MPEG-2 and audio over Linux IEEE 1394."
 msgstr ""
 
-#: gnu/packages/linux.scm:2957
+#: gnu/packages/linux.scm:3061
 msgid "Tool for managing Linux Software RAID arrays"
 msgstr ""
 
-#: gnu/packages/linux.scm:2959
+#: gnu/packages/linux.scm:3063
 msgid ""
 "mdadm is a tool for managing Linux Software RAID arrays.  It can create,\n"
 "assemble, report on, and monitor arrays.  It can also move spares between raid\n"
 "arrays when needed."
 msgstr ""
 
-#: gnu/packages/linux.scm:2991
+#: gnu/packages/linux.scm:3095
 msgid "Statically-linked 'mdadm' command for use in an initrd"
 msgstr "Commandes mdadm liées statiquement à utiliser dans un initrd"
 
-#: gnu/packages/linux.scm:3056
+#: gnu/packages/linux.scm:3160
 msgid "Access block devices through multiple paths"
 msgstr ""
 
-#: gnu/packages/linux.scm:3058
+#: gnu/packages/linux.scm:3162
 msgid ""
 "This package provides the following binaries to drive the\n"
 "Linux Device Mapper multipathing driver:\n"
@@ -9798,74 +9335,85 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3090
+#: gnu/packages/linux.scm:3194
 msgid "Linux-native asynchronous I/O access library"
 msgstr ""
 
-#: gnu/packages/linux.scm:3092
+#: gnu/packages/linux.scm:3196
 msgid ""
 "This library enables userspace to use Linux kernel asynchronous I/O\n"
 "system calls, important for the performance of databases and other advanced\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/linux.scm:3114
+#: gnu/packages/linux.scm:3218
 msgid "Bluetooth subband audio codec"
 msgstr ""
 
-#: gnu/packages/linux.scm:3116
+#: gnu/packages/linux.scm:3220
 msgid ""
 "The SBC is a digital audio encoder and decoder used to transfer data to\n"
 "Bluetooth audio output devices like headphones or loudspeakers."
 msgstr ""
 
-#: gnu/packages/linux.scm:3182
+#: gnu/packages/linux.scm:3286
 msgid "Linux Bluetooth protocol stack"
 msgstr ""
 
-#: gnu/packages/linux.scm:3184
+#: gnu/packages/linux.scm:3288
 msgid ""
 "BlueZ provides support for the core Bluetooth layers and protocols.  It\n"
 "is flexible, efficient and uses a modular implementation."
 msgstr ""
 
-#: gnu/packages/linux.scm:3206
+#: gnu/packages/linux.scm:3310
 msgid "Mount exFAT file systems"
 msgstr "Montage de systèmes de fichier exFAT"
 
-#: gnu/packages/linux.scm:3208
+#: gnu/packages/linux.scm:3312
 msgid ""
 "This package provides a FUSE-based file system that provides read and\n"
 "write access to exFAT devices."
 msgstr ""
 
-#: gnu/packages/linux.scm:3250
+#: gnu/packages/linux.scm:3335
+msgid "Mount ISO file system images"
+msgstr "Montage de systèmes de fichier ISO"
+
+#: gnu/packages/linux.scm:3337
+msgid ""
+"FuseISO is a FUSE module to mount ISO filesystem images (.iso, .nrg,\n"
+".bin, .mdf and .img files).  It supports plain ISO9660 Level 1 and 2, Rock\n"
+"Ridge, Joliet, and zisofs."
+msgstr ""
+
+#: gnu/packages/linux.scm:3380
 msgid "Mouse support for the Linux console"
 msgstr ""
 
-#: gnu/packages/linux.scm:3252
+#: gnu/packages/linux.scm:3382
 msgid ""
 "The GPM (general-purpose mouse) daemon is a mouse server for\n"
 "applications running on the Linux console.  It allows users to select items\n"
 "and copy/paste text in the console and in xterm."
 msgstr ""
 
-#: gnu/packages/linux.scm:3315
+#: gnu/packages/linux.scm:3446
 msgid "Create and manage btrfs copy-on-write file systems"
 msgstr ""
 
-#: gnu/packages/linux.scm:3316
+#: gnu/packages/linux.scm:3447
 msgid ""
 "Btrfs is a @dfn{copy-on-write} (CoW) file system for Linux\n"
 "aimed at implementing advanced features while focusing on fault tolerance,\n"
 "repair and easy administration."
 msgstr ""
 
-#: gnu/packages/linux.scm:3349
+#: gnu/packages/linux.scm:3480
 msgid "Statically-linked btrfs command from btrfs-progs"
 msgstr "Commandes btrfs de btrfs-progs liées statiquement"
 
-#: gnu/packages/linux.scm:3350
+#: gnu/packages/linux.scm:3481
 msgid ""
 "This package provides the statically-linked @command{btrfs}\n"
 "from the btrfs-progs package.  It is meant to be used in initrds."
@@ -9873,22 +9421,22 @@ msgstr ""
 "Ce paquet fournit la commande liée statiquement @command{btrfs}\n"
 "issue du paquet btrfs-progs. Il est censé être utilisé dans les initrd."
 
-#: gnu/packages/linux.scm:3387
+#: gnu/packages/linux.scm:3518
 msgid "Userland tools for f2fs"
 msgstr ""
 
-#: gnu/packages/linux.scm:3389
+#: gnu/packages/linux.scm:3520
 msgid ""
 "F2FS, the Flash-Friendly File System, is a modern file system\n"
 "designed to be fast and durable on flash devices such as solid-state\n"
 "disks and SD cards.  This package provides the userland utilities."
 msgstr ""
 
-#: gnu/packages/linux.scm:3437
+#: gnu/packages/linux.scm:3568
 msgid "Free-fall protection for spinning laptop hard drives"
 msgstr ""
 
-#: gnu/packages/linux.scm:3439
+#: gnu/packages/linux.scm:3570
 msgid ""
 "Prevents shock damage to the internal spinning hard drive(s) of some\n"
 "HP and Dell laptops.  When sudden movement is detected, all input/output\n"
@@ -9898,11 +9446,11 @@ msgid ""
 "feature, and a laptop with an accelerometer.  It has no effect on SSDs."
 msgstr ""
 
-#: gnu/packages/linux.scm:3494
+#: gnu/packages/linux.scm:3627
 msgid "Simple fan control program"
 msgstr ""
 
-#: gnu/packages/linux.scm:3496
+#: gnu/packages/linux.scm:3629
 msgid ""
 "Thinkfan is a simple fan control program.  It reads temperatures,\n"
 "checks them against configured limits and switches to appropriate (also\n"
@@ -9911,22 +9459,22 @@ msgid ""
 "from userspace."
 msgstr ""
 
-#: gnu/packages/linux.scm:3544
+#: gnu/packages/linux.scm:3679
 msgid "Read-write access to NTFS file systems"
 msgstr ""
 
-#: gnu/packages/linux.scm:3546
+#: gnu/packages/linux.scm:3681
 msgid ""
 "NTFS-3G provides read-write access to NTFS file systems, which are\n"
 "commonly found on Microsoft Windows.  It is implemented as a FUSE file system.\n"
 "The package provides additional NTFS tools."
 msgstr ""
 
-#: gnu/packages/linux.scm:3588
+#: gnu/packages/linux.scm:3723
 msgid "Utilities and libraries for working with RDMA devices"
 msgstr ""
 
-#: gnu/packages/linux.scm:3590
+#: gnu/packages/linux.scm:3725
 msgid ""
 "This package provides userspace components for the InfiniBand\n"
 "subsystem of the Linux kernel.  Specifically it contains userspace\n"
@@ -9946,11 +9494,11 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3643
+#: gnu/packages/linux.scm:3778
 msgid "Open Fabrics Enterprise Distribution (OFED) Performance Tests"
 msgstr ""
 
-#: gnu/packages/linux.scm:3644
+#: gnu/packages/linux.scm:3779
 msgid ""
 "This is a collection of tests written over uverbs intended for\n"
 "use as a performance micro-benchmark. The tests may be used for hardware or\n"
@@ -9966,32 +9514,32 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3681
+#: gnu/packages/linux.scm:3817
 msgid "Random number generator daemon"
 msgstr ""
 
-#: gnu/packages/linux.scm:3683
+#: gnu/packages/linux.scm:3819
 msgid ""
 "Monitor a hardware random number generator, and supply entropy\n"
 "from that to the system kernel's @file{/dev/random} machinery."
 msgstr ""
 
-#: gnu/packages/linux.scm:3720
+#: gnu/packages/linux.scm:3858
 msgid "CPU frequency and voltage scaling tools for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:3722
+#: gnu/packages/linux.scm:3860
 msgid ""
 "cpupower is a set of user-space tools that use the cpufreq feature of the\n"
 "Linux kernel to retrieve and control processor features related to power saving,\n"
 "such as frequency and voltage scaling."
 msgstr ""
 
-#: gnu/packages/linux.scm:3742
+#: gnu/packages/linux.scm:3880
 msgid "Entropy source for the Linux random number generator"
 msgstr ""
 
-#: gnu/packages/linux.scm:3744
+#: gnu/packages/linux.scm:3882
 msgid ""
 "haveged generates an unpredictable stream of random numbers for use by\n"
 "Linux's @file{/dev/random} and @file{/dev/urandom} devices.  The kernel's\n"
@@ -10009,11 +9557,11 @@ msgid ""
 "not as a replacement for it."
 msgstr ""
 
-#: gnu/packages/linux.scm:3829
+#: gnu/packages/linux.scm:3967
 msgid "eCryptfs cryptographic file system utilities"
 msgstr ""
 
-#: gnu/packages/linux.scm:3831
+#: gnu/packages/linux.scm:3969
 msgid ""
 "eCryptfs is a POSIX-compliant stacked cryptographic file system for Linux.\n"
 "Each file's cryptographic meta-data is stored inside the file itself, along\n"
@@ -10023,11 +9571,11 @@ msgid ""
 "2.6.19.  This package contains the userland utilities to manage it."
 msgstr ""
 
-#: gnu/packages/linux.scm:3862
+#: gnu/packages/linux.scm:4000
 msgid "NFSv4 support library for name/ID mapping"
 msgstr ""
 
-#: gnu/packages/linux.scm:3863
+#: gnu/packages/linux.scm:4001
 msgid ""
 "Libnfsidmap is a library holding mulitiple methods of\n"
 "mapping names to ids and visa versa, mainly for NFSv4.  It provides an\n"
@@ -10035,23 +9583,23 @@ msgid ""
 "the default @code{nsswitch} and the experimental @code{umich_ldap}."
 msgstr ""
 
-#: gnu/packages/linux.scm:3897
+#: gnu/packages/linux.scm:4035
 msgid "Tools for loading and managing Linux kernel modules"
 msgstr "Outils de chargement et de gestion de modules noyau pour Linux"
 
-#: gnu/packages/linux.scm:3899
+#: gnu/packages/linux.scm:4037
 msgid ""
-"Tools for loading and managing Linux kernel modules, such as `modprobe',\n"
-"`insmod', `lsmod', and more."
+"Tools for loading and managing Linux kernel modules, such as\n"
+"@code{modprobe}, @code{insmod}, @code{lsmod}, and more."
 msgstr ""
 "Outils pour le chargement et la gestion des modules noyau Linux, tels que\n"
-"\"modprob\", \"insmod\", \"lsmod\" et plus."
+"@code{modprobe}, @code{insmod}, @code{lsmod} et plus."
 
-#: gnu/packages/linux.scm:3936
+#: gnu/packages/linux.scm:4074
 msgid "Machine check monitor for x86 Linux systems"
 msgstr ""
 
-#: gnu/packages/linux.scm:3938
+#: gnu/packages/linux.scm:4076
 msgid ""
 "The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU,\n"
 "and other hardware errors on x86 systems.  It can also perform user-defined\n"
@@ -10059,11 +9607,11 @@ msgid ""
 "are exceeded."
 msgstr ""
 
-#: gnu/packages/linux.scm:3967
+#: gnu/packages/linux.scm:4105
 msgid "MTD Flash Storage Utilities"
 msgstr ""
 
-#: gnu/packages/linux.scm:3968
+#: gnu/packages/linux.scm:4106
 msgid ""
 "This package provides utilities for testing, partitioning, etc\n"
 "of flash storage."
@@ -10071,11 +9619,11 @@ msgstr ""
 "Ce paquet fournit des outils pour tester, partitionner, etc\n"
 "les périphériques flash."
 
-#: gnu/packages/linux.scm:3991
+#: gnu/packages/linux.scm:4129
 msgid "Interface to Linux's seccomp syscall filtering mechanism"
 msgstr ""
 
-#: gnu/packages/linux.scm:3992
+#: gnu/packages/linux.scm:4130
 msgid ""
 "The libseccomp library provides an easy to use, platform\n"
 "independent, interface to the Linux Kernel's syscall filtering mechanism.  The\n"
@@ -10085,11 +9633,11 @@ msgid ""
 "developers."
 msgstr ""
 
-#: gnu/packages/linux.scm:4034
+#: gnu/packages/linux.scm:4174
 msgid "Usage monitor for AMD Radeon graphics"
 msgstr ""
 
-#: gnu/packages/linux.scm:4035
+#: gnu/packages/linux.scm:4175
 msgid ""
 "RadeonTop monitors resource consumption on supported AMD\n"
 "Radeon Graphics Processing Units (GPUs), either in real time as bar graphs on\n"
@@ -10099,21 +9647,21 @@ msgid ""
 "under OpenGL graphics workloads."
 msgstr ""
 
-#: gnu/packages/linux.scm:4071
+#: gnu/packages/linux.scm:4211
 msgid "Tool and library to manipulate EFI variables"
 msgstr ""
 
-#: gnu/packages/linux.scm:4072
+#: gnu/packages/linux.scm:4212
 msgid ""
 "This package provides a library and a command line\n"
 "interface to the variable facility of UEFI boot firmware."
 msgstr ""
 
-#: gnu/packages/linux.scm:4110
+#: gnu/packages/linux.scm:4246
 msgid "Modify the Extensible Firmware Interface (EFI) boot manager"
 msgstr ""
 
-#: gnu/packages/linux.scm:4112
+#: gnu/packages/linux.scm:4248
 msgid ""
 "@code{efibootmgr} is a user-space application to modify the Intel\n"
 "Extensible Firmware Interface (EFI) Boot Manager.  This application can\n"
@@ -10121,11 +9669,11 @@ msgid ""
 "running boot option, and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:4148
+#: gnu/packages/linux.scm:4284
 msgid "Performance monitoring tools for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:4149
+#: gnu/packages/linux.scm:4285
 msgid ""
 "The sysstat utilities are a collection of performance\n"
 "monitoring tools for Linux.  These include @code{mpstat}, @code{iostat},\n"
@@ -10133,11 +9681,11 @@ msgid ""
 "@code{sadf} and @code{sa}."
 msgstr ""
 
-#: gnu/packages/linux.scm:4173
+#: gnu/packages/linux.scm:4309
 msgid "GNU/Linux application to control backlights"
 msgstr ""
 
-#: gnu/packages/linux.scm:4175
+#: gnu/packages/linux.scm:4311
 msgid ""
 "Light is a program to send commands to screen backlight controllers\n"
 "under GNU/Linux.  Features include:\n"
@@ -10153,11 +9701,25 @@ msgid ""
 "Light is the successor of lightscript."
 msgstr ""
 
-#: gnu/packages/linux.scm:4282
+#: gnu/packages/linux.scm:4354
+msgid "Backlight and LED brightness control"
+msgstr ""
+
+#: gnu/packages/linux.scm:4356
+msgid ""
+"This program allows you read and control device brightness.  Devices\n"
+"include backlight and LEDs.  It can also preserve current brightness before\n"
+"applying the operation, such as on lid close.\n"
+"\n"
+"The appropriate permissions must be set on the backlight or LED control\n"
+"interface in sysfs, which can be accomplished with the included udev rules."
+msgstr ""
+
+#: gnu/packages/linux.scm:4457
 msgid "Power management tool for Linux"
 msgstr "Outil de gestion de l'énergie pour Linux"
 
-#: gnu/packages/linux.scm:4283
+#: gnu/packages/linux.scm:4458
 msgid ""
 "TLP is a power management tool for Linux.  It comes with\n"
 "a default configuration already optimized for battery life.  Nevertheless,\n"
@@ -10165,11 +9727,11 @@ msgid ""
 "every time the power supply source is changed."
 msgstr ""
 
-#: gnu/packages/linux.scm:4310
+#: gnu/packages/linux.scm:4484
 msgid "List hardware information"
 msgstr "Liste les informations sur le matériel"
 
-#: gnu/packages/linux.scm:4312
+#: gnu/packages/linux.scm:4486
 msgid ""
 "@command{lshw} (Hardware Lister) is a small tool to provide\n"
 "detailed information on the hardware configuration of the machine.\n"
@@ -10179,11 +9741,11 @@ msgid ""
 "machines (PowerMac G4 is known to work)."
 msgstr ""
 
-#: gnu/packages/linux.scm:4335
+#: gnu/packages/linux.scm:4509
 msgid "Netlink utility library"
 msgstr "Bibliothèque pour le protocole NetLink"
 
-#: gnu/packages/linux.scm:4336
+#: gnu/packages/linux.scm:4510
 msgid ""
 "Libmnl is a minimalistic user-space library oriented to\n"
 "Netlink developers.  There are a lot of common tasks in parsing, validating,\n"
@@ -10192,11 +9754,11 @@ msgid ""
 "re-use code and to avoid re-inventing the wheel."
 msgstr ""
 
-#: gnu/packages/linux.scm:4361
+#: gnu/packages/linux.scm:4534
 msgid "Netlink programming interface to the Linux nf_tables subsystem"
 msgstr ""
 
-#: gnu/packages/linux.scm:4362
+#: gnu/packages/linux.scm:4535
 msgid ""
 "Libnftnl is a userspace library providing a low-level netlink\n"
 "programming interface to the in-kernel nf_tables subsystem.  The library\n"
@@ -10204,11 +9766,11 @@ msgid ""
 "used by nftables."
 msgstr ""
 
-#: gnu/packages/linux.scm:4389
+#: gnu/packages/linux.scm:4564
 msgid "Userspace utility for Linux packet filtering"
 msgstr "Utilitaire en espcae utilisateur pour les règles de filtrage des paquets IP pour Linux"
 
-#: gnu/packages/linux.scm:4390
+#: gnu/packages/linux.scm:4565
 msgid ""
 "nftables is the project that aims to replace the existing\n"
 "{ip,ip6,arp,eb}tables framework.  Basically, this project provides a new packet\n"
@@ -10218,11 +9780,11 @@ msgid ""
 "userspace queueing component and the logging subsystem."
 msgstr ""
 
-#: gnu/packages/linux.scm:4487
+#: gnu/packages/linux.scm:4662
 msgid "Unprivileged chroot, bind mount, and binfmt_misc"
 msgstr ""
 
-#: gnu/packages/linux.scm:4489
+#: gnu/packages/linux.scm:4664
 msgid ""
 "PRoot is a user-space implementation of @code{chroot}, @code{mount --bind},\n"
 "and @code{binfmt_misc}.  This means that users don't need any privileges or\n"
@@ -10235,15 +9797,15 @@ msgid ""
 "available in the kernel Linux."
 msgstr ""
 
-#: gnu/packages/linux.scm:4505
+#: gnu/packages/linux.scm:4680
 msgid "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)"
 msgstr ""
 
-#: gnu/packages/linux.scm:4551
+#: gnu/packages/linux.scm:4726
 msgid "Linux tool to dump x86 CPUID information about the CPU(s)"
 msgstr ""
 
-#: gnu/packages/linux.scm:4552
+#: gnu/packages/linux.scm:4727
 msgid ""
 "cpuid dumps detailed information about the CPU(s) gathered\n"
 "from the CPUID instruction, and also determines the exact model of CPU(s).  It\n"
@@ -10251,22 +9813,22 @@ msgid ""
 "NexGen, Rise, and SiS CPUs."
 msgstr ""
 
-#: gnu/packages/linux.scm:4579
+#: gnu/packages/linux.scm:4754
 msgid "Use a FUSE file system to access data over MTP"
 msgstr ""
 
-#: gnu/packages/linux.scm:4580
+#: gnu/packages/linux.scm:4755
 msgid ""
 "jmtpfs uses FUSE (file system in userspace) to provide access\n"
 "to data over the Media Transfer Protocol (MTP).  Unprivileged users can mount\n"
 "the MTP device as a file system."
 msgstr ""
 
-#: gnu/packages/linux.scm:4603
+#: gnu/packages/linux.scm:4778
 msgid "Utility to show process environment"
 msgstr ""
 
-#: gnu/packages/linux.scm:4604
+#: gnu/packages/linux.scm:4779
 msgid ""
 "Procenv is a command-line tool that displays as much detail about\n"
 "itself and its environment as possible.  It can be used as a test\n"
@@ -10274,11 +9836,11 @@ msgid ""
 "comparing system environments."
 msgstr ""
 
-#: gnu/packages/linux.scm:4631
+#: gnu/packages/linux.scm:4806
 msgid "Open Fabric Interfaces"
 msgstr ""
 
-#: gnu/packages/linux.scm:4633
+#: gnu/packages/linux.scm:4808
 msgid ""
 "OpenFabrics Interfaces (OFI) is a framework focused on exporting fabric\n"
 "communication services to applications.  OFI is best described as a collection\n"
@@ -10292,11 +9854,11 @@ msgid ""
 "libraries, which are often integrated directly into libfabric."
 msgstr ""
 
-#: gnu/packages/linux.scm:4679
+#: gnu/packages/linux.scm:4861
 msgid "Intel Performance Scaled Messaging (PSM) Libraries"
 msgstr ""
 
-#: gnu/packages/linux.scm:4681
+#: gnu/packages/linux.scm:4863
 msgid ""
 "The PSM Messaging API, or PSM API, is Intel's low-level user-level\n"
 "communications interface for the True Scale family of products.  PSM users are\n"
@@ -10304,22 +9866,22 @@ msgid ""
 "interfaces in parallel environments."
 msgstr ""
 
-#: gnu/packages/linux.scm:4722
+#: gnu/packages/linux.scm:4904
 msgid "Take screenshots of one or more Linux text consoles"
 msgstr ""
 
-#: gnu/packages/linux.scm:4724
+#: gnu/packages/linux.scm:4906
 msgid ""
 "snapscreenshot saves a screenshot of one or more Linux text consoles as a\n"
 "Targa (@dfn{.tga}) image.  It can be used by anyone with read access to the\n"
 "relevant @file{/dev/vcs*} file(s)."
 msgstr ""
 
-#: gnu/packages/linux.scm:4778
+#: gnu/packages/linux.scm:4960
 msgid "Take a screenshot of the contents of the Linux framebuffer"
 msgstr ""
 
-#: gnu/packages/linux.scm:4780
+#: gnu/packages/linux.scm:4962
 msgid ""
 "fbcat saves the contents of the Linux framebuffer (@file{/dev/fb*}), or\n"
 "a dump therof.  It supports a wide range of drivers and pixel formats.\n"
@@ -10331,22 +9893,22 @@ msgid ""
 "emulates the behaviour of Gunnar Monell's older fbgrab utility."
 msgstr ""
 
-#: gnu/packages/linux.scm:4811
+#: gnu/packages/linux.scm:4993
 msgid "Control groups management tools"
 msgstr ""
 
-#: gnu/packages/linux.scm:4812
+#: gnu/packages/linux.scm:4994
 msgid ""
 "Control groups is Linux kernel method for process resource\n"
 "restriction, permission handling and more.  This package provides userspace\n"
 "interface to this kernel feature."
 msgstr ""
 
-#: gnu/packages/linux.scm:4846
+#: gnu/packages/linux.scm:5028
 msgid "Control fan speed on Macbooks"
 msgstr ""
 
-#: gnu/packages/linux.scm:4848
+#: gnu/packages/linux.scm:5030
 msgid ""
 "mbpfan is a fan control daemon for Apple Macbooks.  It uses input from\n"
 "the @code{coretemp} module and sets the fan speed using the @code{applesmc}\n"
@@ -10354,11 +9916,11 @@ msgid ""
 "privileges."
 msgstr ""
 
-#: gnu/packages/linux.scm:4891
+#: gnu/packages/linux.scm:5073
 msgid "Intel Performance Scaled Messaging 2 (PSM2) library"
 msgstr ""
 
-#: gnu/packages/linux.scm:4893
+#: gnu/packages/linux.scm:5075
 msgid ""
 "This package is low-level user-level Intel's communications interface.\n"
 "The PSM2 API is a high-performance vendor-specific protocol that provides a\n"
@@ -10366,11 +9928,11 @@ msgid ""
 "high-speed networking devices."
 msgstr ""
 
-#: gnu/packages/linux.scm:4933
+#: gnu/packages/linux.scm:5115
 msgid "Performance event monitoring library"
 msgstr "Bibliothèque de surveillance d'événements de performance"
 
-#: gnu/packages/linux.scm:4935
+#: gnu/packages/linux.scm:5117
 msgid ""
 "This package provides a library called libpfm4, which is used to develop\n"
 "monitoring tools exploiting the performance monitoring events such as those\n"
@@ -10385,11 +9947,11 @@ msgid ""
 "introduced in Linux 2.6.31."
 msgstr ""
 
-#: gnu/packages/linux.scm:4963
+#: gnu/packages/linux.scm:5145
 msgid "Low-level netfilter netlink communication library"
 msgstr ""
 
-#: gnu/packages/linux.scm:4965
+#: gnu/packages/linux.scm:5147
 msgid ""
 "@code{libnfnetlink} is the low-level library for netfilter related\n"
 "kernel/userspace communication.  It provides a generic messaging\n"
@@ -10398,6 +9960,55 @@ msgid ""
 "management tools in userspace."
 msgstr ""
 
+#: gnu/packages/linux.scm:5177
+msgid "XFS file system tools"
+msgstr "Outils du système de fichier XFS"
+
+#: gnu/packages/linux.scm:5178
+msgid ""
+"This package provides commands to create and check XFS\n"
+"file systems."
+msgstr ""
+"Ce paquet fournit des fonctions pour créer et vérifier\n"
+"des systèmes de fichiers XFS."
+
+#: gnu/packages/linux.scm:5216
+msgid "Generate ext2 filesystem as a normal user"
+msgstr ""
+
+#: gnu/packages/linux.scm:5217
+msgid ""
+"This package provides a program to general an ext2\n"
+"filesystem as a normal (non-root) user.  It does not require you to mount\n"
+"the image file to copy files on it, nor does it require that you become\n"
+"the superuser to make device nodes."
+msgstr ""
+
+#: gnu/packages/linux.scm:5280
+msgid "Provides a fake root environment"
+msgstr ""
+
+#: gnu/packages/linux.scm:5281
+msgid ""
+"@command{fakeroot} runs a command in an environment where\n"
+"it appears to have root privileges for file manipulation. This is useful\n"
+"for allowing users to create archives (tar, ar, .deb etc.) with files in\n"
+"them with root permissions/ownership. Without fakeroot one would have to\n"
+"have root privileges to create the constituent files of the archives with\n"
+"the correct permissions and ownership, and then pack them up, or one would\n"
+"have to construct the archives directly, without using the archiver."
+msgstr ""
+
+#: gnu/packages/linux.scm:5328
+msgid "Dispatch input peripherals events to a device file"
+msgstr ""
+
+#: gnu/packages/linux.scm:5329
+msgid ""
+"inputattach dispatches input events from several device\n"
+"types and interfaces and translates so that the X server can use them."
+msgstr ""
+
 #: gnu/packages/lout.scm:100
 msgid "Document layout system"
 msgstr ""
@@ -10421,11 +10032,11 @@ msgid ""
 "beginning."
 msgstr ""
 
-#: gnu/packages/messaging.scm:119
+#: gnu/packages/messaging.scm:123
 msgid "Off-the-Record (OTR) Messaging Library and Toolkit"
 msgstr ""
 
-#: gnu/packages/messaging.scm:121
+#: gnu/packages/messaging.scm:125
 msgid ""
 "OTR allows you to have private conversations over instant messaging by\n"
 "providing: (1) Encryption: No one else can read your instant messages.  (2)\n"
@@ -10438,11 +10049,11 @@ msgid ""
 "keys, no previous conversation is compromised."
 msgstr ""
 
-#: gnu/packages/messaging.scm:155
+#: gnu/packages/messaging.scm:159
 msgid "Implementation of a ratcheting forward secrecy protocol"
 msgstr "Implémentation d'un protocole de confidentialité persistante ajustable"
 
-#: gnu/packages/messaging.scm:156
+#: gnu/packages/messaging.scm:160
 msgid ""
 "libsignal-protocol-c is an implementation of a ratcheting\n"
 "forward secrecy protocol that works in synchronous and asynchronous\n"
@@ -10450,11 +10061,11 @@ msgid ""
 "end-to-end encryption."
 msgstr ""
 
-#: gnu/packages/messaging.scm:197
+#: gnu/packages/messaging.scm:201
 msgid "IRC to instant messaging gateway"
 msgstr ""
 
-#: gnu/packages/messaging.scm:198
+#: gnu/packages/messaging.scm:202
 msgid ""
 "BitlBee brings IM (instant messaging) to IRC clients, for\n"
 "people who have an IRC client running all the time and don't want to run an\n"
@@ -10464,21 +10075,21 @@ msgid ""
 "identi.ca and status.net)."
 msgstr ""
 
-#: gnu/packages/messaging.scm:244
+#: gnu/packages/messaging.scm:248
 msgid "Discord plugin for Bitlbee"
 msgstr ""
 
-#: gnu/packages/messaging.scm:245
+#: gnu/packages/messaging.scm:249
 msgid ""
 "Bitlbee-discord is a plugin for Bitlbee witch provides\n"
 "access to servers running the Discord protocol."
 msgstr ""
 
-#: gnu/packages/messaging.scm:292
+#: gnu/packages/messaging.scm:296
 msgid "Graphical IRC Client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:294
+#: gnu/packages/messaging.scm:298
 msgid ""
 "HexChat lets you connect to multiple IRC networks at once.  The main\n"
 "window shows the list of currently connected networks and their channels, the\n"
@@ -10487,11 +10098,11 @@ msgid ""
 "dictionaries.  HexChat can be extended with multiple addons."
 msgstr ""
 
-#: gnu/packages/messaging.scm:359
+#: gnu/packages/messaging.scm:363
 msgid "Lightweight Internet Relay Chat server for small networks"
 msgstr ""
 
-#: gnu/packages/messaging.scm:361
+#: gnu/packages/messaging.scm:365
 msgid ""
 "ngIRCd is a lightweight @dfn{Internet Relay Chat} (IRC) server for small\n"
 "or private networks.  It is easy to configure, can cope with dynamic IP\n"
@@ -10499,21 +10110,21 @@ msgid ""
 "authentication."
 msgstr ""
 
-#: gnu/packages/messaging.scm:433
+#: gnu/packages/messaging.scm:437
 msgid "Graphical multi-protocol instant messaging client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:435
+#: gnu/packages/messaging.scm:439
 msgid ""
 "Pidgin is a modular instant messaging client that supports many popular\n"
 "chat protocols."
 msgstr ""
 
-#: gnu/packages/messaging.scm:473
+#: gnu/packages/messaging.scm:477
 msgid "Off-the-Record Messaging plugin for Pidgin"
 msgstr ""
 
-#: gnu/packages/messaging.scm:475
+#: gnu/packages/messaging.scm:479
 msgid ""
 "Pidgin-OTR is a plugin that adds support for OTR to the Pidgin instant\n"
 "messaging client.  OTR (Off-the-Record) Messaging allows you to have private\n"
@@ -10528,11 +10139,11 @@ msgid ""
 "compromised."
 msgstr ""
 
-#: gnu/packages/messaging.scm:542
+#: gnu/packages/messaging.scm:546
 msgid "IRC network bouncer"
 msgstr ""
 
-#: gnu/packages/messaging.scm:543
+#: gnu/packages/messaging.scm:547
 msgid ""
 "ZNC is an @dfn{IRC network bouncer} or @dfn{BNC}.  It can\n"
 "detach the client from the actual IRC server, and also from selected channels.\n"
@@ -10540,22 +10151,22 @@ msgid ""
 "simultaneously and therefore appear under the same nickname on IRC."
 msgstr ""
 
-#: gnu/packages/messaging.scm:564
+#: gnu/packages/messaging.scm:568
 msgid "Non-blocking Jabber/XMPP module"
 msgstr ""
 
-#: gnu/packages/messaging.scm:566
+#: gnu/packages/messaging.scm:570
 msgid ""
 "The goal of this python library is to provide a way for Python\n"
 "applications to use Jabber/XMPP networks in a non-blocking way.  This library\n"
 "was initially a fork of xmpppy, but uses non-blocking sockets."
 msgstr ""
 
-#: gnu/packages/messaging.scm:652
+#: gnu/packages/messaging.scm:675
 msgid "Jabber (XMPP) client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:653
+#: gnu/packages/messaging.scm:676
 msgid ""
 "Gajim is a feature-rich and easy to use Jabber/XMPP client.\n"
 "Among its features are: a tabbed chat window and single window modes; support\n"
@@ -10564,21 +10175,32 @@ msgid ""
 "end-to-end encryption support; XML console."
 msgstr ""
 
-#: gnu/packages/messaging.scm:722
+#: gnu/packages/messaging.scm:711
+msgid "Gajim OMEMO plugin"
+msgstr ""
+
+#: gnu/packages/messaging.scm:713
+msgid ""
+"This package provides the Gajim OMEMO plugin.  OMEMO is an XMPP\n"
+"Extension Protocol (XEP) for secure multi-client end-to-end encryption based\n"
+"on Axolotl and PEP."
+msgstr ""
+
+#: gnu/packages/messaging.scm:777
 msgid "Graphical Jabber (XMPP) client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:723
+#: gnu/packages/messaging.scm:778
 msgid ""
 "Dino is a Jabber (XMPP) client which aims to fit well into\n"
 "a graphical desktop environment like GNOME."
 msgstr ""
 
-#: gnu/packages/messaging.scm:812
+#: gnu/packages/messaging.scm:865
 msgid "Jabber (XMPP) server"
 msgstr ""
 
-#: gnu/packages/messaging.scm:813
+#: gnu/packages/messaging.scm:866
 msgid ""
 "Prosody is a modern XMPP communication server.  It aims to\n"
 "be easy to set up and configure, and efficient with system resources.\n"
@@ -10587,56 +10209,77 @@ msgid ""
 "protocols."
 msgstr ""
 
-#: gnu/packages/messaging.scm:848 gnu/packages/messaging.scm:882
+#: gnu/packages/messaging.scm:900
+msgid "XEP-0363: Allow clients to upload files over HTTP"
+msgstr ""
+
+#: gnu/packages/messaging.scm:901
+msgid ""
+"This module implements XEP-0363: it allows clients to\n"
+"upload files over HTTP."
+msgstr ""
+
+#: gnu/packages/messaging.scm:932
+msgid "XEP-0198: Reliability and fast reconnects for XMPP"
+msgstr ""
+
+#: gnu/packages/messaging.scm:933
+msgid ""
+"This module implements XEP-0198: when supported by both\n"
+"the client and server, it can allow clients to resume a disconnected session,\n"
+"and prevent message loss."
+msgstr ""
+
+#: gnu/packages/messaging.scm:966 gnu/packages/messaging.scm:1000
 msgid "Library for the Tox encrypted messenger protocol"
 msgstr ""
 
-#: gnu/packages/messaging.scm:850
+#: gnu/packages/messaging.scm:968
 msgid "C library implementation of the Tox encrypted messenger protocol."
 msgstr ""
 
-#: gnu/packages/messaging.scm:884
+#: gnu/packages/messaging.scm:1002
 msgid ""
 "Official fork of the C library implementation of the Tox encrypted\n"
 "messenger protocol."
 msgstr ""
 
-#: gnu/packages/messaging.scm:939
+#: gnu/packages/messaging.scm:1057
 msgid "Lightweight Tox client"
 msgstr "Client Tox léger"
 
-#: gnu/packages/messaging.scm:941
+#: gnu/packages/messaging.scm:1059
 msgid ""
 "Utox is a lightweight Tox client.  Tox is a distributed and secure\n"
 "instant messenger with audio and video chat capabilities."
 msgstr ""
 
-#: gnu/packages/messaging.scm:998
+#: gnu/packages/messaging.scm:1116
 msgid "Tox chat client using Qt"
 msgstr ""
 
-#: gnu/packages/messaging.scm:999
+#: gnu/packages/messaging.scm:1117
 msgid ""
 "qTox is a Tox client that follows the Tox design\n"
 "guidelines.  It provides an easy to use application that allows you to\n"
 "connect with friends and family without anyone else listening in."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1092
+#: gnu/packages/messaging.scm:1210
 msgid ""
 "Distributed and trustless peer-to-peer communications protocol\n"
 "for sending encrypted messages to one person or many subscribers."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1094
+#: gnu/packages/messaging.scm:1212
 msgid "Distributed peer-to-peer communication"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1113
+#: gnu/packages/messaging.scm:1231
 msgid "Multi-user chat program"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1114
+#: gnu/packages/messaging.scm:1232
 msgid ""
 "Ytalk is a replacement for the BSD talk program.  Its main\n"
 "advantage is the ability to communicate with any arbitrary number of users at\n"
@@ -10644,11 +10287,11 @@ msgid ""
 "with several different talk daemons at the same time."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1139
+#: gnu/packages/messaging.scm:1257
 msgid "Portable high-level Jabber/XMPP library for C++"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1141
+#: gnu/packages/messaging.scm:1259
 msgid ""
 "gloox is a full-featured Jabber/XMPP client library,\n"
 "written in ANSI C++.  It makes writing spec-compliant clients easy\n"
@@ -10656,7 +10299,7 @@ msgid ""
 "into existing applications."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1216
+#: gnu/packages/messaging.scm:1330
 msgid ""
 "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and\n"
 "Gtk2 event loops.  This package includes 12 applications and additional scripts:\n"
@@ -10664,26 +10307,26 @@ msgid ""
 "for @uref{https://torproject.org,tor} router) and many more."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1220
+#: gnu/packages/messaging.scm:1334
 msgid "Perl implementation of PSYC protocol"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1259
+#: gnu/packages/messaging.scm:1373
 msgid ""
 "@code{libpsyc} is a PSYC library in C which implements\n"
 "core aspects of PSYC, useful for all kinds of clients and servers\n"
 "including psyced."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1262
+#: gnu/packages/messaging.scm:1376
 msgid "PSYC library in C"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1329
+#: gnu/packages/messaging.scm:1443
 msgid "psycLPC is a multi-user network server programming language"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1331
+#: gnu/packages/messaging.scm:1445
 msgid ""
 "LPC is a bytecode language, invented to specifically implement\n"
 "multi user virtual environments on the internet.  This technology is used for\n"
@@ -10692,7 +10335,7 @@ msgid ""
 "many bug fixes."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1362
+#: gnu/packages/messaging.scm:1476
 msgid ""
 "Loudmouth is a lightweight and easy-to-use C library for programming\n"
 "with the XMPP (formerly known as Jabber) protocol.  It is designed to be\n"
@@ -10700,11 +10343,11 @@ msgid ""
 "protocol allows."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1366
+#: gnu/packages/messaging.scm:1480
 msgid "Asynchronous XMPP library"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1398
+#: gnu/packages/messaging.scm:1512
 msgid ""
 "Mcabber is a small XMPP (Jabber) console client, which includes features\n"
 "such as SASL and TLS support, @dfn{Multi-User Chat} (MUC) support, logging,\n"
@@ -10712,15 +10355,15 @@ msgid ""
 "support, and more."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1402
+#: gnu/packages/messaging.scm:1516
 msgid "Small XMPP console client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1448
+#: gnu/packages/messaging.scm:1559
 msgid "Extensible console-based Jabber client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1450
+#: gnu/packages/messaging.scm:1561
 msgid ""
 "GNU Freetalk is a command-line Jabber/XMPP chat client.  It notably uses\n"
 "the Readline library to handle input, so it features convenient navigation of\n"
@@ -10728,39 +10371,39 @@ msgid ""
 "is also scriptable and extensible via Guile."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1479 gnu/packages/messaging.scm:1508
+#: gnu/packages/messaging.scm:1590 gnu/packages/messaging.scm:1619
 msgid "C library for writing XMPP clients"
 msgstr "Bibliothèque C pour écrire des clients XMPP"
 
-#: gnu/packages/messaging.scm:1480
+#: gnu/packages/messaging.scm:1591
 msgid ""
 "Libmesode is a fork of libstrophe for use with Profanity\n"
 "XMPP Client.  In particular, libmesode provides extra TLS functionality such as\n"
 "manual SSL certificate verification."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1509
+#: gnu/packages/messaging.scm:1620
 msgid ""
 "Libstrophe is a minimal XMPP library written in C.  It has\n"
 "almost no external dependencies, only an XML parsing library (expat or libxml\n"
 "are both supported)."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1545
+#: gnu/packages/messaging.scm:1656
 msgid "Console-based XMPP client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1546
+#: gnu/packages/messaging.scm:1657
 msgid ""
 "Profanity is a console based XMPP client written in C\n"
 "using ncurses and libmesode, inspired by Irssi."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1575
+#: gnu/packages/messaging.scm:1686
 msgid "Library implementing the client IRC protocol"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1576
+#: gnu/packages/messaging.scm:1687
 msgid ""
 "Libircclient is a library which implements the client IRC\n"
 "protocol.  It is designed to be small, fast, portable and compatible with the\n"
@@ -10768,22 +10411,22 @@ msgid ""
 "building the IRC clients and bots."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1626
+#: gnu/packages/messaging.scm:1737
 msgid "Tox chat client using ncurses"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1627
+#: gnu/packages/messaging.scm:1738
 msgid ""
 "Toxic is a console-based instant messaging client, using\n"
 "c-toxcore and ncurses.  It provides audio calls, sound and desktop\n"
 "notifications, and Python scripting support."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1653
+#: gnu/packages/messaging.scm:1764
 msgid "Qt5 client library for the Matrix instant messaging protocol"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1654
+#: gnu/packages/messaging.scm:1765
 msgid ""
 "libqmatrixclient is a Qt5 library to write clients for the\n"
 "Matrix instant messaging protocol.  Quaternion is the reference client\n"
@@ -10791,11 +10434,11 @@ msgid ""
 "QMatrixClient project."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1700
+#: gnu/packages/messaging.scm:1811
 msgid "Graphical client for the Matrix instant messaging protocol"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1701
+#: gnu/packages/messaging.scm:1812
 msgid ""
 "Quaternion is a Qt5 desktop client for the Matrix instant\n"
 "messaging protocol.  It uses libqmatrixclient and is its reference client\n"
@@ -10803,11 +10446,11 @@ msgid ""
 "QMatrixClient project."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1740
+#: gnu/packages/messaging.scm:1851
 msgid "Instant messaging client for Google Hangouts"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1742
+#: gnu/packages/messaging.scm:1853
 msgid ""
 "Hangups is an instant messaging client for Google Hangouts.  It includes\n"
 "both a Python library and a reference client with a text-based user interface.\n"
@@ -10817,32 +10460,32 @@ msgid ""
 "messaging that aren’t available to clients that connect over XMPP."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1822
+#: gnu/packages/messaging.scm:1933
 msgid "Telegram messaging support for Pidgin"
 msgstr ""
 
-#: gnu/packages/messaging.scm:1824
+#: gnu/packages/messaging.scm:1935
 msgid ""
 "Telegram-purple is a plugin for Libpurple, the communication library\n"
 "used by the Pidgin instant messaging client, that adds support for the\n"
 "Telegram messenger."
 msgstr ""
 
-#: gnu/packages/mpd.scm:84
+#: gnu/packages/mpd.scm:85
 msgid "Music Player Daemon client library"
 msgstr ""
 
-#: gnu/packages/mpd.scm:85
+#: gnu/packages/mpd.scm:86
 msgid ""
 "A stable, documented, asynchronous API library for\n"
 "interfacing MPD in the C, C++ & Objective C languages."
 msgstr ""
 
-#: gnu/packages/mpd.scm:157
+#: gnu/packages/mpd.scm:163
 msgid "Music Player Daemon"
 msgstr ""
 
-#: gnu/packages/mpd.scm:158
+#: gnu/packages/mpd.scm:164
 msgid ""
 "Music Player Daemon (MPD) is a flexible, powerful,\n"
 "server-side application for playing music.  Through plugins and libraries it\n"
@@ -10850,31 +10493,31 @@ msgid ""
 "protocol."
 msgstr ""
 
-#: gnu/packages/mpd.scm:183
+#: gnu/packages/mpd.scm:189
 msgid "Music Player Daemon client"
 msgstr ""
 
-#: gnu/packages/mpd.scm:184
+#: gnu/packages/mpd.scm:190
 msgid ""
 "MPC is a minimalist command line interface to MPD, the music\n"
 "player daemon."
 msgstr ""
 
-#: gnu/packages/mpd.scm:227
+#: gnu/packages/mpd.scm:233
 msgid "Curses Music Player Daemon client"
 msgstr ""
 
-#: gnu/packages/mpd.scm:228
+#: gnu/packages/mpd.scm:234
 msgid ""
 "ncmpc is a fully featured MPD client, which runs in a\n"
 "terminal using ncurses."
 msgstr ""
 
-#: gnu/packages/mpd.scm:258
+#: gnu/packages/mpd.scm:264
 msgid "Featureful ncurses based MPD client inspired by ncmpc"
 msgstr ""
 
-#: gnu/packages/mpd.scm:259
+#: gnu/packages/mpd.scm:265
 msgid ""
 "Ncmpcpp is an mpd client with a UI very similar to ncmpc,\n"
 "but it provides new useful features such as support for regular expressions\n"
@@ -10882,42 +10525,42 @@ msgid ""
 "sort playlists, and a local file system browser."
 msgstr ""
 
-#: gnu/packages/mpd.scm:282
+#: gnu/packages/mpd.scm:288
 msgid "MPD client for track scrobbling"
 msgstr ""
 
-#: gnu/packages/mpd.scm:283
+#: gnu/packages/mpd.scm:289
 msgid ""
 "mpdscribble is a Music Player Daemon client which submits\n"
 "information about tracks being played to a scrobbler, such as Libre.FM."
 msgstr ""
 
-#: gnu/packages/mpd.scm:306
+#: gnu/packages/mpd.scm:312
 msgid "Python MPD client library"
 msgstr ""
 
-#: gnu/packages/mpd.scm:307
+#: gnu/packages/mpd.scm:313
 msgid ""
 "Python-mpd2 is a Python library which provides a client\n"
 "interface for the Music Player Daemon."
 msgstr ""
 
-#: gnu/packages/mpd.scm:356
+#: gnu/packages/mpd.scm:362
 msgid "Elegant client for the Music Player Daemon"
 msgstr ""
 
-#: gnu/packages/mpd.scm:357
+#: gnu/packages/mpd.scm:363
 msgid ""
 "Sonata is an elegant graphical client for the Music Player\n"
 "Daemon (MPD).  It supports playlists, multiple profiles (connecting to different\n"
 "MPD servers, search and multimedia key support."
 msgstr ""
 
-#: gnu/packages/netpbm.scm:179
+#: gnu/packages/netpbm.scm:184
 msgid "Toolkit for manipulation of images"
 msgstr "Outils de manipulation d'images"
 
-#: gnu/packages/netpbm.scm:181
+#: gnu/packages/netpbm.scm:186
 msgid ""
 "Netpbm is a toolkit for the manipulation of graphic images, including\n"
 "the conversion of images between a variety of different formats.\n"
@@ -10925,11 +10568,11 @@ msgid ""
 "about 100 graphics formats."
 msgstr ""
 
-#: gnu/packages/nettle.scm:52
+#: gnu/packages/nettle.scm:66
 msgid "C library for low-level cryptographic functionality"
 msgstr ""
 
-#: gnu/packages/nettle.scm:54
+#: gnu/packages/nettle.scm:68
 msgid ""
 "GNU Nettle is a low-level cryptographic library.  It is designed to\n"
 "fit in easily in almost any context.  It can be easily included in\n"
@@ -10937,11 +10580,11 @@ msgid ""
 "themselves."
 msgstr ""
 
-#: gnu/packages/networking.scm:120
+#: gnu/packages/networking.scm:124
 msgid "Viewing and manipulating MAC addresses of network interfaces"
 msgstr ""
 
-#: gnu/packages/networking.scm:121
+#: gnu/packages/networking.scm:125
 msgid ""
 "GNU MAC Changer is a utility for viewing and changing MAC\n"
 "addresses of networking devices.  New addresses may be set explicitly or\n"
@@ -10949,22 +10592,22 @@ msgid ""
 "or, more generally, MAC addresses of the same category of hardware."
 msgstr ""
 
-#: gnu/packages/networking.scm:149
+#: gnu/packages/networking.scm:154
 msgid "Teredo IPv6 tunneling software"
 msgstr ""
 
-#: gnu/packages/networking.scm:151
+#: gnu/packages/networking.scm:156
 msgid ""
 "Miredo is an implementation (client, relay, server) of the Teredo\n"
 "specification, which provides IPv6 Internet connectivity to IPv6 enabled hosts\n"
 "residing in IPv4-only networks, even when they are behind a NAT device."
 msgstr ""
 
-#: gnu/packages/networking.scm:173
+#: gnu/packages/networking.scm:178
 msgid "Open bidirectional communication channels from the command line"
 msgstr ""
 
-#: gnu/packages/networking.scm:175
+#: gnu/packages/networking.scm:180
 msgid ""
 "socat is a relay for bidirectional data transfer between two independent\n"
 "data channels---files, pipes, devices, sockets, etc.  It can create\n"
@@ -10977,22 +10620,22 @@ msgid ""
 "or server shell scripts with network connections."
 msgstr ""
 
-#: gnu/packages/networking.scm:256
+#: gnu/packages/networking.scm:262
 msgid "Monitor and filter incoming requests for network services"
 msgstr ""
 
-#: gnu/packages/networking.scm:257
+#: gnu/packages/networking.scm:263
 msgid ""
 "With this package you can monitor and filter incoming requests for\n"
 "network services.  It includes a library which may be used by daemons to\n"
 "transparently check connection attempts against an access control list."
 msgstr ""
 
-#: gnu/packages/networking.scm:277
+#: gnu/packages/networking.scm:283
 msgid "Library for message-based applications"
 msgstr ""
 
-#: gnu/packages/networking.scm:279
+#: gnu/packages/networking.scm:285
 msgid ""
 "The 0MQ lightweight messaging kernel is a library which extends the\n"
 "standard socket interfaces with features traditionally provided by specialized\n"
@@ -11002,63 +10645,63 @@ msgid ""
 "more."
 msgstr ""
 
-#: gnu/packages/networking.scm:317
+#: gnu/packages/networking.scm:323
 msgid "High-level C bindings for ØMQ"
 msgstr "Liaisons de haut-niveau pour ØMQ"
 
-#: gnu/packages/networking.scm:319
+#: gnu/packages/networking.scm:325
 msgid ""
 "czmq provides bindings for the ØMQ core API that hides the differences\n"
 "between different versions of ØMQ."
 msgstr ""
 
-#: gnu/packages/networking.scm:346
+#: gnu/packages/networking.scm:352
 msgid "C++ bindings for the ØMQ messaging library"
 msgstr "Liaisons C++ pour la bibliothèque de messagerie ØMQ"
 
-#: gnu/packages/networking.scm:348
+#: gnu/packages/networking.scm:354
 msgid ""
 "This package provides header-only C++ bindings for ØMQ.  The header\n"
 "files contain direct mappings of the abstractions provided by the ØMQ C API."
 msgstr ""
 
-#: gnu/packages/networking.scm:383
+#: gnu/packages/networking.scm:389
 msgid "Apache Kafka C/C++ client library"
 msgstr ""
 
-#: gnu/packages/networking.scm:385
+#: gnu/packages/networking.scm:391
 msgid ""
 "librdkafka is a C library implementation of the Apache Kafka protocol,\n"
 "containing both Producer and Consumer support."
 msgstr ""
 
-#: gnu/packages/networking.scm:402
+#: gnu/packages/networking.scm:408
 msgid "Library for Neighbor Discovery Protocol"
 msgstr ""
 
-#: gnu/packages/networking.scm:404
+#: gnu/packages/networking.scm:410
 msgid ""
 "libndp contains a library which provides a wrapper for IPv6 Neighbor\n"
 "Discovery Protocol.  It also provides a tool named ndptool for sending and\n"
 "receiving NDP messages."
 msgstr ""
 
-#: gnu/packages/networking.scm:422
+#: gnu/packages/networking.scm:428
 msgid "Display or change Ethernet device settings"
 msgstr ""
 
-#: gnu/packages/networking.scm:424
+#: gnu/packages/networking.scm:430
 msgid ""
 "ethtool can be used to query and change settings such as speed,\n"
 "auto-negotiation and checksum offload on many network devices, especially\n"
 "Ethernet devices."
 msgstr ""
 
-#: gnu/packages/networking.scm:463
+#: gnu/packages/networking.scm:470
 msgid "Text based network interface status monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:465
+#: gnu/packages/networking.scm:472
 msgid ""
 "IFStatus is a simple, easy-to-use program for displaying commonly\n"
 "needed/wanted real-time traffic statistics of multiple network\n"
@@ -11066,11 +10709,11 @@ msgid ""
 "intended as a substitute for the PPPStatus and EthStatus projects."
 msgstr ""
 
-#: gnu/packages/networking.scm:485
+#: gnu/packages/networking.scm:492
 msgid "Realtime console network usage monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:487
+#: gnu/packages/networking.scm:494
 msgid ""
 "Nload is a console application which monitors network traffic and\n"
 "bandwidth usage in real time.  It visualizes the in- and outgoing traffic using\n"
@@ -11078,11 +10721,11 @@ msgid ""
 "and min/max network usage."
 msgstr ""
 
-#: gnu/packages/networking.scm:530
+#: gnu/packages/networking.scm:539
 msgid "Tunnel IPv4 data through a DNS server"
 msgstr ""
 
-#: gnu/packages/networking.scm:531
+#: gnu/packages/networking.scm:540
 msgid ""
 "Iodine tunnels IPv4 data through a DNS server.  This\n"
 "can be useful in different situations where internet access is firewalled, but\n"
@@ -11090,11 +10733,11 @@ msgid ""
 "and up to 1 Mbit/s downstream."
 msgstr ""
 
-#: gnu/packages/networking.scm:568
+#: gnu/packages/networking.scm:577
 msgid "Intelligent client for the WHOIS directory service"
 msgstr ""
 
-#: gnu/packages/networking.scm:570
+#: gnu/packages/networking.scm:579
 msgid ""
 "whois searches for an object in a @dfn{WHOIS} (RFC 3912) database.\n"
 "It is commonly used to look up the registered users or assignees of an Internet\n"
@@ -11106,22 +10749,22 @@ msgid ""
 "of the same name."
 msgstr ""
 
-#: gnu/packages/networking.scm:645
+#: gnu/packages/networking.scm:653
 msgid "Network traffic analyzer"
 msgstr ""
 
-#: gnu/packages/networking.scm:646
+#: gnu/packages/networking.scm:654
 msgid ""
 "Wireshark is a network protocol analyzer, or @dfn{packet\n"
 "sniffer}, that lets you capture and interactively browse the contents of\n"
 "network frames."
 msgstr ""
 
-#: gnu/packages/networking.scm:666
+#: gnu/packages/networking.scm:673
 msgid "Send ICMP ECHO_REQUEST packets to network hosts"
 msgstr ""
 
-#: gnu/packages/networking.scm:668
+#: gnu/packages/networking.scm:675
 msgid ""
 "fping is a ping like program which uses the Internet Control Message\n"
 "Protocol (ICMP) echo request to determine if a target host is responding.\n"
@@ -11132,22 +10775,22 @@ msgid ""
 "fashion."
 msgstr ""
 
-#: gnu/packages/networking.scm:719
+#: gnu/packages/networking.scm:726
 msgid "Command-line interface to the Gandi.net Web API"
 msgstr "Interface en ligne de commande pour l'API Web de Gandi.net"
 
-#: gnu/packages/networking.scm:721
+#: gnu/packages/networking.scm:728
 msgid ""
 "This package provides a command-line client (@command{gandi}) to buy,\n"
 "manage, and delete Internet resources from Gandi.net such as domain names,\n"
 "virtual machines, and certificates."
 msgstr ""
 
-#: gnu/packages/networking.scm:751
+#: gnu/packages/networking.scm:758
 msgid "Web server latency and throughput monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:753
+#: gnu/packages/networking.scm:760
 msgid ""
 "httping measures how long it takes to connect to a web server, send an\n"
 "HTTP(S) request, and receive the reply headers.  It is somewhat similar to\n"
@@ -11156,11 +10799,11 @@ msgid ""
 "application stack itself."
 msgstr ""
 
-#: gnu/packages/networking.scm:784
+#: gnu/packages/networking.scm:792
 msgid "Visualize curl statistics"
 msgstr ""
 
-#: gnu/packages/networking.scm:786
+#: gnu/packages/networking.scm:794
 msgid ""
 "@command{httpstat} is a tool to visualize statistics from the\n"
 "@command{curl} HTTP client.  It acts as a wrapper for @command{curl} and\n"
@@ -11168,21 +10811,21 @@ msgid ""
 "TCP connection, TLS handshake and so on) in the terminal."
 msgstr ""
 
-#: gnu/packages/networking.scm:806
+#: gnu/packages/networking.scm:828
 msgid "Console based live network and disk I/O bandwidth monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:807
+#: gnu/packages/networking.scm:829
 msgid ""
 "Bandwidth Monitor NG is a small and simple console based\n"
 "live network and disk I/O bandwidth monitor."
 msgstr ""
 
-#: gnu/packages/networking.scm:867
+#: gnu/packages/networking.scm:889
 msgid "Assess WiFi network security"
 msgstr ""
 
-#: gnu/packages/networking.scm:869
+#: gnu/packages/networking.scm:891
 msgid ""
 "Aircrack-ng is a complete suite of tools to assess WiFi network\n"
 "security.  It focuses on different areas of WiFi security: monitoring,\n"
@@ -11190,11 +10833,23 @@ msgid ""
 "allows for heavy scripting."
 msgstr ""
 
-#: gnu/packages/networking.scm:893
+#: gnu/packages/networking.scm:913
+msgid "Event loop and event-driven async socket base class"
+msgstr ""
+
+#: gnu/packages/networking.scm:915
+msgid ""
+"Danga::Socket is an abstract base class for objects backed by a socket\n"
+"which provides the basic framework for event-driven asynchronous IO, designed\n"
+"to be fast.  Danga::Socket is both a base class for objects, and an event\n"
+"loop."
+msgstr ""
+
+#: gnu/packages/networking.scm:939
 msgid "IPv4 and IPv6 validation methods"
 msgstr ""
 
-#: gnu/packages/networking.scm:895
+#: gnu/packages/networking.scm:941
 msgid ""
 "This module provides several IP address validation subroutines that both\n"
 "validate and untaint their input.  This includes both basic validation\n"
@@ -11203,105 +10858,105 @@ msgid ""
 "private (reserved)."
 msgstr ""
 
-#: gnu/packages/networking.scm:923
+#: gnu/packages/networking.scm:968
 msgid "Perl Interface to the Domain Name System"
 msgstr ""
 
-#: gnu/packages/networking.scm:924
+#: gnu/packages/networking.scm:969
 msgid "Net::DNS is the Perl Interface to the Domain Name System."
 msgstr ""
 
-#: gnu/packages/networking.scm:955
+#: gnu/packages/networking.scm:1000
 msgid "IPv6 related part of the C socket.h defines and structure manipulators for Perl"
 msgstr ""
 
-#: gnu/packages/networking.scm:956
+#: gnu/packages/networking.scm:1001
 msgid ""
 "Socket6 binds the IPv6 related part of the C socket header\n"
 "definitions and structure manipulators for Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:982
+#: gnu/packages/networking.scm:1027
 msgid "Programmable DNS resolver class for offline emulation of DNS"
 msgstr ""
 
-#: gnu/packages/networking.scm:983
+#: gnu/packages/networking.scm:1028
 msgid ""
 "Net::DNS::Resolver::Programmable is a programmable DNS resolver for\n"
 "offline emulation of DNS."
 msgstr ""
 
-#: gnu/packages/networking.scm:1016
+#: gnu/packages/networking.scm:1061
 msgid "Manages IPv4 and IPv6 addresses and subnets"
 msgstr ""
 
-#: gnu/packages/networking.scm:1017
+#: gnu/packages/networking.scm:1062
 msgid "NetAddr::IP manages IPv4 and IPv6 addresses and subsets."
 msgstr ""
 
-#: gnu/packages/networking.scm:1041
+#: gnu/packages/networking.scm:1086
 msgid "Patricia Trie Perl module for fast IP address lookups"
 msgstr ""
 
-#: gnu/packages/networking.scm:1043
+#: gnu/packages/networking.scm:1088
 msgid "Net::Patricia does IP address lookups quickly in Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:1066
+#: gnu/packages/networking.scm:1111
 msgid "Perl extension for merging IPv4 or IPv6 CIDR addresses"
 msgstr ""
 
-#: gnu/packages/networking.scm:1067
+#: gnu/packages/networking.scm:1112
 msgid "Net::CIDR::Lite merges IPv4 or IPv6 CIDR addresses."
 msgstr ""
 
-#: gnu/packages/networking.scm:1089
+#: gnu/packages/networking.scm:1134
 msgid "Look up location and network information by IP Address in Perl"
 msgstr ""
 
-#: gnu/packages/networking.scm:1090
+#: gnu/packages/networking.scm:1135
 msgid ""
-"The Perl module 'Geo::IP'.  It looks up location and network\n"
-"information by IP Address."
+"The Perl module @code{Geo::IP}.  It looks up location and\n"
+"network information by IP Address."
 msgstr ""
 
-#: gnu/packages/networking.scm:1119
+#: gnu/packages/networking.scm:1164
 msgid "Perl object interface for AF_INET/AF_INET6 domain sockets"
 msgstr ""
 
-#: gnu/packages/networking.scm:1120
+#: gnu/packages/networking.scm:1165
 msgid ""
 "IO::Socket::INET6 is an interface for AF_INET/AF_INET6 domain\n"
 "sockets in Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:1149
+#: gnu/packages/networking.scm:1194
 msgid "Library providing automatic proxy configuration management"
 msgstr ""
 
-#: gnu/packages/networking.scm:1150
+#: gnu/packages/networking.scm:1195
 msgid ""
 "Libproxy handles the details of HTTP/HTTPS proxy\n"
 "configuration for applications across all scenarios.  Applications using\n"
 "libproxy only have to specify which proxy to use."
 msgstr ""
 
-#: gnu/packages/networking.scm:1186
+#: gnu/packages/networking.scm:1230
 msgid "Redirect any TCP connection through a proxy or proxy chain"
 msgstr ""
 
-#: gnu/packages/networking.scm:1187
+#: gnu/packages/networking.scm:1231
 msgid ""
 "Proxychains-ng is a preloader which hooks calls to sockets\n"
 "in dynamically linked programs and redirects them through one or more SOCKS or\n"
 "HTTP proxies."
 msgstr ""
 
-#: gnu/packages/networking.scm:1208
+#: gnu/packages/networking.scm:1251
 msgid "Network communication layer on top of UDP"
 msgstr ""
 
-#: gnu/packages/networking.scm:1210
+#: gnu/packages/networking.scm:1253
 msgid ""
 "ENet's purpose is to provide a relatively thin, simple and robust network\n"
 "communication layer on top of UDP.  The primary feature it provides is optional\n"
@@ -11311,11 +10966,11 @@ msgid ""
 "library remains flexible, portable, and easily embeddable."
 msgstr ""
 
-#: gnu/packages/networking.scm:1274
+#: gnu/packages/networking.scm:1318
 msgid "Applicative network protocol demultiplexer"
 msgstr ""
 
-#: gnu/packages/networking.scm:1276
+#: gnu/packages/networking.scm:1320
 msgid ""
 "sslh is a network protocol demultiplexer.  It acts like a switchboard,\n"
 "accepting connections from clients on one port and forwarding them to different\n"
@@ -11327,11 +10982,11 @@ msgid ""
 "that block port 22."
 msgstr ""
 
-#: gnu/packages/networking.scm:1299
+#: gnu/packages/networking.scm:1343
 msgid "TCP, UDP and SCTP bandwidth measurement tool"
 msgstr ""
 
-#: gnu/packages/networking.scm:1301
+#: gnu/packages/networking.scm:1345
 msgid ""
 "iPerf is a tool to measure achievable bandwidth on IP networks.  It\n"
 "supports tuning of various parameters related to timing, buffers and\n"
@@ -11339,11 +10994,11 @@ msgid ""
 "the bandwidth, loss, and other parameters."
 msgstr ""
 
-#: gnu/packages/networking.scm:1334
+#: gnu/packages/networking.scm:1378
 msgid "Per-process bandwidth monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:1335
+#: gnu/packages/networking.scm:1379
 msgid ""
 "NetHogs is a small 'net top' tool for Linux.  Instead of\n"
 "breaking the traffic down per protocol or per subnet, like most tools do, it\n"
@@ -11355,11 +11010,11 @@ msgid ""
 "gone wild and are suddenly taking up your bandwidth."
 msgstr ""
 
-#: gnu/packages/networking.scm:1381
+#: gnu/packages/networking.scm:1425
 msgid "Usenet binary file downloader"
 msgstr ""
 
-#: gnu/packages/networking.scm:1383
+#: gnu/packages/networking.scm:1427
 msgid ""
 "NZBGet is a binary newsgrabber, which downloads files from Usenet based\n"
 "on information given in @code{nzb} files.  NZBGet can be used in standalone\n"
@@ -11369,11 +11024,11 @@ msgid ""
 "procedure calls (RPCs)."
 msgstr ""
 
-#: gnu/packages/networking.scm:1437
+#: gnu/packages/networking.scm:1481
 msgid "Virtual network switch"
 msgstr ""
 
-#: gnu/packages/networking.scm:1440
+#: gnu/packages/networking.scm:1484
 msgid ""
 "Open vSwitch is a multilayer virtual switch.  It is designed to enable\n"
 "massive network automation through programmatic extension, while still\n"
@@ -11381,54 +11036,54 @@ msgid ""
 "IPFIX, RSPAN, CLI, LACP, 802.1ag)."
 msgstr ""
 
-#: gnu/packages/networking.scm:1462
+#: gnu/packages/networking.scm:1506
 msgid "Python class and tools for handling IP addresses and networks"
 msgstr ""
 
-#: gnu/packages/networking.scm:1463
+#: gnu/packages/networking.scm:1507
 msgid ""
 "The @code{IP} class allows a comfortable parsing and\n"
 "handling for most notations in use for IPv4 and IPv6 addresses and\n"
 "networks."
 msgstr ""
 
-#: gnu/packages/networking.scm:1487
+#: gnu/packages/networking.scm:1530
 msgid "Internet bandwidth tester"
 msgstr ""
 
-#: gnu/packages/networking.scm:1489
+#: gnu/packages/networking.scm:1532
 msgid ""
 "Command line interface for testing internet bandwidth using\n"
 "speedtest.net."
 msgstr ""
 
-#: gnu/packages/networking.scm:1507
+#: gnu/packages/networking.scm:1550
 msgid "HPA's tftp client"
 msgstr ""
 
-#: gnu/packages/networking.scm:1509
+#: gnu/packages/networking.scm:1552
 msgid ""
 "This is a tftp client derived from OpenBSD tftp with some extra options\n"
 "added and bugs fixed.  The source includes readline support but it is not\n"
 "enabled due to license conflicts between the BSD advertising clause and the GPL."
 msgstr ""
 
-#: gnu/packages/networking.scm:1537
+#: gnu/packages/networking.scm:1580
 msgid "Small Ident Daemon"
 msgstr ""
 
-#: gnu/packages/networking.scm:1539
+#: gnu/packages/networking.scm:1582
 msgid ""
 "@dfn{Pidentd} (Peter's Ident Daemon) is a identd, which implements a\n"
 "identification server.  Pidentd looks up specific TCP/IP connections and\n"
 "returns the user name and other information about the connection."
 msgstr ""
 
-#: gnu/packages/networking.scm:1586
+#: gnu/packages/networking.scm:1629
 msgid "Create secure pipes between sockets"
 msgstr ""
 
-#: gnu/packages/networking.scm:1587
+#: gnu/packages/networking.scm:1630
 msgid ""
 "Spiped (pronounced \"ess-pipe-dee\") is a utility for creating\n"
 "symmetrically encrypted and authenticated pipes between socket addresses, so\n"
@@ -11438,11 +11093,11 @@ msgid ""
 "does not use SSH and requires a pre-shared symmetric key."
 msgstr ""
 
-#: gnu/packages/networking.scm:1614
+#: gnu/packages/networking.scm:1657
 msgid "Routing Software Suite"
 msgstr ""
 
-#: gnu/packages/networking.scm:1615
+#: gnu/packages/networking.scm:1658
 msgid ""
 "Quagga is a routing software suite, providing implementations\n"
 "of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms.\n"
@@ -11454,22 +11109,22 @@ msgid ""
 "updates to the zebra daemon."
 msgstr ""
 
-#: gnu/packages/networking.scm:1666
+#: gnu/packages/networking.scm:1709
 msgid "IPv6 security research toolkit"
 msgstr ""
 
-#: gnu/packages/networking.scm:1667
+#: gnu/packages/networking.scm:1710
 msgid ""
 "The THC IPv6 Toolkit provides command-line tools and a library\n"
 "for researching IPv6 implementations and deployments.  It requires Linux 2.6 or\n"
 "newer and only works on Ethernet network interfaces."
 msgstr ""
 
-#: gnu/packages/networking.scm:1693
+#: gnu/packages/networking.scm:1736
 msgid "Bandwidth monitor"
 msgstr ""
 
-#: gnu/packages/networking.scm:1694
+#: gnu/packages/networking.scm:1737
 msgid ""
 "bmon is a monitoring and debugging tool to capture\n"
 "networking-related statistics and prepare them visually in a human-friendly\n"
@@ -11477,11 +11132,11 @@ msgid ""
 "interface and a programmable text output for scripting."
 msgstr ""
 
-#: gnu/packages/networking.scm:1734
+#: gnu/packages/networking.scm:1779
 msgid "Framework for low-level network packet construction"
 msgstr ""
 
-#: gnu/packages/networking.scm:1736
+#: gnu/packages/networking.scm:1781
 msgid ""
 "Libnet provides a fairly portable framework for network packet\n"
 "construction and injection.  It features portable packet creation interfaces\n"
@@ -11490,11 +11145,11 @@ msgid ""
 "can be whipped up with little effort."
 msgstr ""
 
-#: gnu/packages/networking.scm:1764
+#: gnu/packages/networking.scm:1809
 msgid "Network diagnostic tool"
 msgstr ""
 
-#: gnu/packages/networking.scm:1766
+#: gnu/packages/networking.scm:1811
 msgid ""
 "@dfn{mtr} (My TraceRoute) combines the functionality of the\n"
 "@command{traceroute} and @command{ping} programs in a single network diagnostic\n"
@@ -11504,22 +11159,22 @@ msgid ""
 "displays the results in real time."
 msgstr ""
 
-#: gnu/packages/networking.scm:1818
+#: gnu/packages/networking.scm:1863
 msgid "IKEv1/v2 keying daemon"
 msgstr ""
 
-#: gnu/packages/networking.scm:1819
+#: gnu/packages/networking.scm:1864
 msgid ""
 "StrongSwan is an IPsec implementation originally based upon\n"
 "the FreeS/WAN project.  It contains support for IKEv1, IKEv2, MOBIKE, IPv6,\n"
 "NAT-T and more."
 msgstr ""
 
-#: gnu/packages/networking.scm:1902
+#: gnu/packages/networking.scm:1948
 msgid "Peer-to-peer client for the eD2K and Kademlia networks"
 msgstr ""
 
-#: gnu/packages/networking.scm:1904
+#: gnu/packages/networking.scm:1950
 msgid ""
 "aMule is an eMule-like client for the eD2k and Kademlia peer-to-peer\n"
 "file sharing networks.  It includes a graphical user interface (GUI), a daemon\n"
@@ -11528,11 +11183,11 @@ msgid ""
 "remotely."
 msgstr ""
 
-#: gnu/packages/networking.scm:1927
+#: gnu/packages/networking.scm:1973
 msgid "Framework for proximity-based peer-to-peer applications"
 msgstr ""
 
-#: gnu/packages/networking.scm:1928
+#: gnu/packages/networking.scm:1974
 msgid ""
 "Zyre provides reliable group messaging over local area\n"
 "networks using zeromq.  It has these key characteristics:\n"
@@ -11549,11 +11204,11 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/networking.scm:1968
+#: gnu/packages/networking.scm:2014
 msgid "CAN utilities"
 msgstr ""
 
-#: gnu/packages/networking.scm:1969
+#: gnu/packages/networking.scm:2015
 msgid ""
 "This package provides CAN utilities in the following areas:\n"
 "\n"
@@ -11569,22 +11224,22 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/networking.scm:2006
+#: gnu/packages/networking.scm:2051
 msgid "C++ library for ASynchronous network I/O"
 msgstr ""
 
-#: gnu/packages/networking.scm:2007
+#: gnu/packages/networking.scm:2052
 msgid ""
 "Asio is a cross-platform C++ library for network and\n"
 "low-level I/O programming that provides developers with a consistent\n"
 "asynchronous model using a modern C++ approach."
 msgstr ""
 
-#: gnu/packages/networking.scm:2031
+#: gnu/packages/networking.scm:2076
 msgid "Fast tunnel proxy that helps you bypass firewalls"
 msgstr ""
 
-#: gnu/packages/networking.scm:2033
+#: gnu/packages/networking.scm:2078
 msgid ""
 "This package is a fast tunnel proxy that helps you bypass firewalls.\n"
 "\n"
@@ -11598,11 +11253,11 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/networking.scm:2111
+#: gnu/packages/networking.scm:2156
 msgid "Simple Network Management Protocol library and tools"
 msgstr ""
 
-#: gnu/packages/networking.scm:2112
+#: gnu/packages/networking.scm:2157
 msgid ""
 "The @dfn{Simple Network Management Protocol} (SNMP) is a\n"
 "widely used protocol for monitoring the health and welfare of network\n"
@@ -11611,32 +11266,32 @@ msgid ""
 "SNMP v3 using both IPv4 and IPv6."
 msgstr ""
 
-#: gnu/packages/networking.scm:2153
+#: gnu/packages/networking.scm:2198
 msgid "Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
 msgstr ""
 
-#: gnu/packages/networking.scm:2154
+#: gnu/packages/networking.scm:2199
 msgid ""
 "uBridge is a simple program to create user-land bridges\n"
 "between various technologies.  Currently, bridging between UDP tunnels,\n"
 "Ethernet and TAP interfaces is supported.  Packet capture is also supported."
 msgstr ""
 
-#: gnu/packages/networking.scm:2200
+#: gnu/packages/networking.scm:2245
 msgid "Capture wlan traffic to hashcat and John the Ripper"
 msgstr ""
 
-#: gnu/packages/networking.scm:2202
+#: gnu/packages/networking.scm:2247
 msgid ""
 "This package contains a small set of tools to capture and convert\n"
 "packets from wireless devices for use with hashcat or John the Ripper."
 msgstr ""
 
-#: gnu/packages/networking.scm:2229
+#: gnu/packages/networking.scm:2274
 msgid "Small tool to capture packets from wlan devices"
 msgstr ""
 
-#: gnu/packages/networking.scm:2231
+#: gnu/packages/networking.scm:2276
 msgid ""
 "Small tool to capture packets from WLAN devices.  After capturing,\n"
 "upload the \"uncleaned\" cap to @url{https://wpa-sec.stanev.org/?submit} to\n"
@@ -11646,11 +11301,11 @@ msgid ""
 "and check if the WLAN key or the master key was transmitted unencrypted."
 msgstr ""
 
-#: gnu/packages/networking.scm:2258
+#: gnu/packages/networking.scm:2303
 msgid "SOCKS server and client"
 msgstr ""
 
-#: gnu/packages/networking.scm:2259
+#: gnu/packages/networking.scm:2304
 msgid ""
 "Dante is a SOCKS client and server implementation.  It can\n"
 "be installed on a machine with access to an external TCP/IP network and will\n"
@@ -11659,37 +11314,69 @@ msgid ""
 "never see any machines other than the one Dante is running on."
 msgstr ""
 
-#: gnu/packages/pdf.scm:125
+#: gnu/packages/networking.scm:2357
+msgid "Asynchronous RESTful functionality to C++11 applications"
+msgstr ""
+
+#: gnu/packages/networking.scm:2358
+msgid ""
+"Restbed is a comprehensive and consistent programming\n"
+"model for building applications that require seamless and secure\n"
+"communication over HTTP."
+msgstr ""
+
+#: gnu/packages/networking.scm:2397
+msgid "Distributed Hash Table (DHT) library"
+msgstr ""
+
+#: gnu/packages/networking.scm:2398
+msgid ""
+"OpenDHT is a Distributed Hash Table (DHT) library.  It may\n"
+"be used to manage peer-to-peer network connections as needed for real time\n"
+"communication."
+msgstr ""
+
+#: gnu/packages/networking.scm:2426
+msgid "IP routing protocol suite"
+msgstr "Suite protocolaire pour le routage IP"
+
+#: gnu/packages/networking.scm:2427
+msgid ""
+"FRRouting (FRR) is an IP routing protocol suite which includes\n"
+"protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. "
+msgstr ""
+
+#: gnu/packages/pdf.scm:129
 msgid "PDF rendering library"
 msgstr "Bibliothèque de rendu PDF"
 
-#: gnu/packages/pdf.scm:127
+#: gnu/packages/pdf.scm:131
 msgid "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 msgstr ""
 
-#: gnu/packages/pdf.scm:160
+#: gnu/packages/pdf.scm:156
 msgid "Poppler encoding files for rendering of CJK and Cyrillic text"
 msgstr ""
 
-#: gnu/packages/pdf.scm:161
+#: gnu/packages/pdf.scm:157
 msgid ""
 "This package provides optional encoding files for Poppler.\n"
 "When present, Poppler is able to correctly render CJK and Cyrillic text."
 msgstr ""
 
-#: gnu/packages/pdf.scm:174
+#: gnu/packages/pdf.scm:170
 msgid "Qt4 frontend for the Poppler PDF rendering library"
 msgstr ""
 
-#: gnu/packages/pdf.scm:181
+#: gnu/packages/pdf.scm:177
 msgid "Qt5 frontend for the Poppler PDF rendering library"
 msgstr ""
 
-#: gnu/packages/pdf.scm:224
+#: gnu/packages/pdf.scm:220
 msgid "Python bindings for Poppler-Qt5"
 msgstr ""
 
-#: gnu/packages/pdf.scm:226
+#: gnu/packages/pdf.scm:222
 msgid ""
 "This package provides Python bindings for the Qt5 interface of the\n"
 "Poppler PDF rendering library."
@@ -11697,90 +11384,90 @@ msgstr ""
 "Ce paquet fournit les liaisons Python pour l'interface Qt5 de la\n"
 "bibliothèque de rendu de PDF Poppler."
 
-#: gnu/packages/pdf.scm:260
+#: gnu/packages/pdf.scm:256
 msgid "Library for generating PDF files"
 msgstr "Bibliothèque de génération de fichiers PDF"
 
-#: gnu/packages/pdf.scm:262
+#: gnu/packages/pdf.scm:258
 msgid ""
 "libHaru is a library for generating PDF files.  libHaru does not support\n"
 "reading and editing of existing PDF files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:309
+#: gnu/packages/pdf.scm:305
 msgid "Viewer for PDF files based on the Motif toolkit"
 msgstr "Visionneuse pour fichiers PDF basée sur la boîte à outil Motif"
 
-#: gnu/packages/pdf.scm:311
+#: gnu/packages/pdf.scm:307
 msgid "Xpdf is a viewer for Portable Document Format (PDF) files."
 msgstr "Xpdf est une visionneuse pour fichiers PDF (Portable Document Format)"
 
-#: gnu/packages/pdf.scm:345
+#: gnu/packages/pdf.scm:341
 msgid "Comic book support for zathura (libarchive backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:346
+#: gnu/packages/pdf.scm:342
 msgid ""
 "The zathura-cb plugin adds comic book support to zathura\n"
 "using libarchive."
 msgstr ""
 
-#: gnu/packages/pdf.scm:380
+#: gnu/packages/pdf.scm:376
 msgid "PS support for zathura (libspectre backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:381
+#: gnu/packages/pdf.scm:377
 msgid ""
 "The zathura-ps plugin adds PS support to zathura\n"
 "using libspectre."
 msgstr ""
 
-#: gnu/packages/pdf.scm:416
+#: gnu/packages/pdf.scm:412
 msgid "DjVu support for zathura (DjVuLibre backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:417
+#: gnu/packages/pdf.scm:413
 msgid ""
 "The zathura-djvu plugin adds DjVu support to zathura\n"
 "using the DjVuLibre library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:448
+#: gnu/packages/pdf.scm:456
 msgid "PDF support for zathura (mupdf backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:449
+#: gnu/packages/pdf.scm:457
 msgid ""
 "The zathura-pdf-mupdf plugin adds PDF support to zathura\n"
 "by using the @code{mupdf} rendering library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:484
+#: gnu/packages/pdf.scm:492
 msgid "PDF support for zathura (poppler backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:485
+#: gnu/packages/pdf.scm:493
 msgid ""
 "The zathura-pdf-poppler plugin adds PDF support to zathura\n"
 "by using the poppler rendering engine."
 msgstr ""
 
-#: gnu/packages/pdf.scm:540
+#: gnu/packages/pdf.scm:546
 msgid "Lightweight keyboard-driven PDF viewer"
 msgstr "Visionneuse de PDF légère gérée au clavier"
 
-#: gnu/packages/pdf.scm:541
+#: gnu/packages/pdf.scm:547
 msgid ""
 "Zathura is a customizable document viewer.  It provides a\n"
 "minimalistic interface and an interface that mainly focuses on keyboard\n"
 "interaction."
 msgstr ""
 
-#: gnu/packages/pdf.scm:583
+#: gnu/packages/pdf.scm:590
 msgid "Tools to work with the PDF file format"
 msgstr "Outils de manipulation de fichiers PDF"
 
-#: gnu/packages/pdf.scm:585
+#: gnu/packages/pdf.scm:592
 msgid ""
 "PoDoFo is a C++ library and set of command-line tools to work with the\n"
 "PDF file format.  It can parse PDF files and load them into memory, and makes\n"
@@ -11789,11 +11476,11 @@ msgid ""
 "extracting content or merging files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:640
+#: gnu/packages/pdf.scm:647
 msgid "Lightweight PDF viewer and toolkit"
 msgstr "Boite à outils légère pour la visualisation de documents PDF"
 
-#: gnu/packages/pdf.scm:642
+#: gnu/packages/pdf.scm:649
 msgid ""
 "MuPDF is a C library that implements a PDF and XPS parsing and\n"
 "rendering engine.  It is used primarily to render pages into bitmaps,\n"
@@ -11813,11 +11500,11 @@ msgstr ""
 "d'outils en ligne de commande pour le rendu par lots (@command{pdfdraw}),\n"
 "la réécriture de fichiers (pdfclean) et l'analyse de structure (@command{pdfshow})."
 
-#: gnu/packages/pdf.scm:701
+#: gnu/packages/pdf.scm:708
 msgid "Command-line tools and library for transforming PDF files"
 msgstr ""
 
-#: gnu/packages/pdf.scm:703
+#: gnu/packages/pdf.scm:710
 msgid ""
 "QPDF is a command-line program that does structural, content-preserving\n"
 "transformations on PDF files.  It could have been called something like\n"
@@ -11826,32 +11513,32 @@ msgid ""
 "program capable of converting PDF into other formats."
 msgstr ""
 
-#: gnu/packages/pdf.scm:735
+#: gnu/packages/pdf.scm:742
 msgid "Notetaking using a stylus"
 msgstr ""
 
-#: gnu/packages/pdf.scm:737
+#: gnu/packages/pdf.scm:744
 msgid ""
 "Xournal is an application for notetaking, sketching, keeping a journal\n"
 "using a stylus."
 msgstr ""
 
-#: gnu/packages/pdf.scm:759
+#: gnu/packages/pdf.scm:768
 msgid "Python library for generating PDFs and graphics"
 msgstr ""
 
-#: gnu/packages/pdf.scm:760
+#: gnu/packages/pdf.scm:769
 msgid ""
 "This is the ReportLab PDF Toolkit.  It allows rapid creation\n"
 "of rich PDF documents, and also creation of charts in a variety of bitmap and\n"
 "vector formats."
 msgstr ""
 
-#: gnu/packages/pdf.scm:813
+#: gnu/packages/pdf.scm:822
 msgid "PDF presentation tool with visual effects"
 msgstr ""
 
-#: gnu/packages/pdf.scm:815
+#: gnu/packages/pdf.scm:824
 msgid ""
 "Impressive is a tool to display PDF files that provides visual effects\n"
 "such as smooth alpha-blended slide transitions.  It provides additional tools\n"
@@ -11859,31 +11546,31 @@ msgid ""
 "the PDF pages."
 msgstr ""
 
-#: gnu/packages/pdf.scm:863
+#: gnu/packages/pdf.scm:873
 msgid "Framebuffer and drm-based image viewer"
 msgstr ""
 
-#: gnu/packages/pdf.scm:865
+#: gnu/packages/pdf.scm:875
 msgid ""
 "fbida contains a few applications for viewing and editing images on\n"
 "the framebuffer."
 msgstr ""
 
-#: gnu/packages/pdf.scm:890
+#: gnu/packages/pdf.scm:900
 msgid "PDF to SVG converter"
 msgstr ""
 
-#: gnu/packages/pdf.scm:891
+#: gnu/packages/pdf.scm:901
 msgid ""
 "@command{pdf2svg} is a simple command-line PDF to SVG\n"
 "converter using the Poppler and Cairo libraries."
 msgstr ""
 
-#: gnu/packages/pdf.scm:922 gnu/packages/pdf.scm:959
+#: gnu/packages/pdf.scm:932 gnu/packages/pdf.scm:969
 msgid "Pure Python PDF toolkit"
 msgstr ""
 
-#: gnu/packages/pdf.scm:923
+#: gnu/packages/pdf.scm:933
 msgid ""
 "PyPDF2 is a pure Python PDF library capable of:\n"
 "\n"
@@ -11903,7 +11590,7 @@ msgid ""
 "manage or manipulate PDFs."
 msgstr ""
 
-#: gnu/packages/pdf.scm:960
+#: gnu/packages/pdf.scm:970
 msgid ""
 "PyPDF2 is a pure Python PDF toolkit.\n"
 "\n"
@@ -11911,11 +11598,11 @@ msgid ""
 "python-pypdf2 instead."
 msgstr ""
 
-#: gnu/packages/pdf.scm:984
+#: gnu/packages/pdf.scm:994
 msgid "Scale and tile PDF images/pages to print on multiple pages"
 msgstr ""
 
-#: gnu/packages/pdf.scm:985
+#: gnu/packages/pdf.scm:995
 msgid ""
 "@command{pdfposter} can be used to create a large poster by\n"
 "building it from multple pages and/or printing it on large media.  It expects\n"
@@ -11928,11 +11615,11 @@ msgid ""
 "PDF.  Indeed @command{pdfposter} was inspired by @command{poster}."
 msgstr ""
 
-#: gnu/packages/pdf.scm:1016
+#: gnu/packages/pdf.scm:1026
 msgid "Command-line utility to search text in PDF files"
 msgstr ""
 
-#: gnu/packages/pdf.scm:1018
+#: gnu/packages/pdf.scm:1028
 msgid ""
 "Pdfgrep searches in pdf files for strings matching a regular expression.\n"
 "Support some GNU grep options as file name output, page number output,\n"
@@ -11940,11 +11627,11 @@ msgid ""
 "multiple files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:1052
+#: gnu/packages/pdf.scm:1062
 msgid "Presenter console with multi-monitor support for PDF files"
 msgstr ""
 
-#: gnu/packages/pdf.scm:1054
+#: gnu/packages/pdf.scm:1064
 msgid ""
 "pdfpc is a presentation viewer application which uses multi-monitor\n"
 "output to provide meta information to the speaker during the presentation.  It\n"
@@ -11954,6 +11641,17 @@ msgid ""
 "presentation.  The input files processed by pdfpc are PDF documents."
 msgstr ""
 
+#: gnu/packages/pdf.scm:1109
+msgid "Pango to PostScript converter"
+msgstr ""
+
+#: gnu/packages/pdf.scm:1111
+msgid ""
+"Paps reads a UTF-8 encoded file and generates a PostScript language\n"
+"rendering of the file.  The rendering is done by creating outline curves\n"
+"through the Pango @code{ft2} backend."
+msgstr ""
+
 #: gnu/packages/pem.scm:41
 msgid "Personal expenses manager"
 msgstr ""
@@ -11979,21 +11677,21 @@ msgid ""
 "more."
 msgstr ""
 
-#: gnu/packages/perl.scm:215
+#: gnu/packages/perl.scm:180
 msgid "Module for merging hierarchies using the C3 algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:216
+#: gnu/packages/perl.scm:181
 msgid ""
 "This module implements the C3 algorithm, which aims to\n"
 "provide a sane method resolution order under multiple inheritance."
 msgstr ""
 
-#: gnu/packages/perl.scm:234
+#: gnu/packages/perl.scm:199
 msgid "Compute differences between two files or lists"
 msgstr ""
 
-#: gnu/packages/perl.scm:235
+#: gnu/packages/perl.scm:200
 msgid ""
 "This is a module for computing the difference between two\n"
 "files, two strings, or any other two lists of things.  It uses an intelligent\n"
@@ -12002,11 +11700,11 @@ msgid ""
 "differences."
 msgstr ""
 
-#: gnu/packages/perl.scm:257
+#: gnu/packages/perl.scm:222
 msgid "Use shorter versions of class names"
 msgstr ""
 
-#: gnu/packages/perl.scm:258
+#: gnu/packages/perl.scm:223
 msgid ""
 "The alias module loads the class you specify and exports\n"
 "into your namespace a subroutine that returns the class name.  You can\n"
@@ -12014,11 +11712,11 @@ msgid ""
 "implicitly."
 msgstr ""
 
-#: gnu/packages/perl.scm:280
+#: gnu/packages/perl.scm:245
 msgid "Transparently use Moose or Mouse modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:282
+#: gnu/packages/perl.scm:247
 msgid ""
 "This module facilitates using @code{Moose} or @code{Mouse} modules\n"
 "without changing the code.  By default, Mouse will be provided to libraries,\n"
@@ -12027,31 +11725,31 @@ msgid ""
 "variable ANY_MOOSE to be Moose or Mouse."
 msgstr ""
 
-#: gnu/packages/perl.scm:305
+#: gnu/packages/perl.scm:270
 msgid "Configuration files and command line parsing"
 msgstr ""
 
-#: gnu/packages/perl.scm:306
+#: gnu/packages/perl.scm:271
 msgid ""
 "AppConfig is a bundle of Perl5 modules for reading\n"
 "configuration files and parsing command line arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:326
+#: gnu/packages/perl.scm:291
 msgid "Small utils for array manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:327
+#: gnu/packages/perl.scm:292
 msgid ""
 "@code{Array::Utils} is a small pure-perl module containing\n"
 "list manipulation routines."
 msgstr ""
 
-#: gnu/packages/perl.scm:346
+#: gnu/packages/perl.scm:313
 msgid "Allow C/XS libraries to interrupt perl asynchronously"
 msgstr ""
 
-#: gnu/packages/perl.scm:348
+#: gnu/packages/perl.scm:315
 msgid ""
 "@code{Async::Interrupt} implements a single feature only of interest\n"
 "to advanced perl modules, namely asynchronous interruptions (think \"UNIX\n"
@@ -12069,11 +11767,11 @@ msgid ""
 "sometimes even without using a single syscall."
 msgstr ""
 
-#: gnu/packages/perl.scm:378
+#: gnu/packages/perl.scm:345
 msgid "Lexically disable autovivification"
 msgstr ""
 
-#: gnu/packages/perl.scm:379
+#: gnu/packages/perl.scm:346
 msgid ""
 "When an undefined variable is dereferenced, it gets silently\n"
 "upgraded to an array or hash reference (depending of the type of the\n"
@@ -12087,19 +11785,19 @@ msgid ""
 "error when it would have happened."
 msgstr ""
 
-#: gnu/packages/perl.scm:412
+#: gnu/packages/perl.scm:379
 msgid "Disables bareword filehandles"
 msgstr ""
 
-#: gnu/packages/perl.scm:413
+#: gnu/packages/perl.scm:380
 msgid "This module disables bareword filehandles."
 msgstr ""
 
-#: gnu/packages/perl.scm:430 gnu/packages/perl.scm:6861
+#: gnu/packages/perl.scm:396 gnu/packages/perl.scm:6881
 msgid "Establish an ISA relationship with base classes at compile time"
 msgstr ""
 
-#: gnu/packages/perl.scm:431
+#: gnu/packages/perl.scm:397
 msgid ""
 "Allows you to both load one or more modules, while setting\n"
 "up inheritance from those modules at the same time.  Unless you are using the\n"
@@ -12107,11 +11805,11 @@ msgid ""
 "parent."
 msgstr ""
 
-#: gnu/packages/perl.scm:451
+#: gnu/packages/perl.scm:417
 msgid "Open a browser in a given URL"
 msgstr ""
 
-#: gnu/packages/perl.scm:452
+#: gnu/packages/perl.scm:418
 msgid ""
 "The functions exported by this module allow you to open URLs\n"
 "in the user's browser.  A set of known commands per OS-name is tested for\n"
@@ -12119,29 +11817,29 @@ msgid ""
 "all known commands are checked."
 msgstr ""
 
-#: gnu/packages/perl.scm:477
+#: gnu/packages/perl.scm:443
 msgid "Execute code after a scope finished compilation"
 msgstr ""
 
-#: gnu/packages/perl.scm:478
+#: gnu/packages/perl.scm:444
 msgid ""
 "This module allows you to execute code when perl finished\n"
 "compiling the surrounding scope."
 msgstr ""
 
-#: gnu/packages/perl.scm:499
+#: gnu/packages/perl.scm:465
 msgid "Wrap OP check callbacks"
 msgstr ""
 
-#: gnu/packages/perl.scm:500
+#: gnu/packages/perl.scm:466
 msgid "This module allows you to wrap OP check callbacks."
 msgstr ""
 
-#: gnu/packages/perl.scm:517
+#: gnu/packages/perl.scm:482
 msgid "Lists of reserved barewords and symbol names"
 msgstr ""
 
-#: gnu/packages/perl.scm:518
+#: gnu/packages/perl.scm:483
 msgid ""
 "@code{B::Keywords} supplies several arrays of exportable\n"
 "keywords: @code{@@Scalars, @@Arrays, @@Hashes, @@Filehandles, @@Symbols,\n"
@@ -12149,11 +11847,11 @@ msgid ""
 "@@ExporterSymbols}."
 msgstr ""
 
-#: gnu/packages/perl.scm:541
+#: gnu/packages/perl.scm:506
 msgid "Benchmarking with statistical confidence"
 msgstr ""
 
-#: gnu/packages/perl.scm:543
+#: gnu/packages/perl.scm:508
 msgid ""
 "The Benchmark::Timer class allows you to time portions of code\n"
 "conveniently, as well as benchmark code by allowing timings of repeated\n"
@@ -12162,11 +11860,11 @@ msgid ""
 "but don't want to go all out and profile your code."
 msgstr ""
 
-#: gnu/packages/perl.scm:567
+#: gnu/packages/perl.scm:532
 msgid "Bit vector library"
 msgstr ""
 
-#: gnu/packages/perl.scm:568
+#: gnu/packages/perl.scm:533
 msgid ""
 "Bit::Vector is an efficient C library which allows you to\n"
 "handle bit vectors, sets (of integers), \"big integer arithmetic\" and boolean\n"
@@ -12176,62 +11874,62 @@ msgid ""
 "library can nevertheless be used stand-alone, without Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:590
+#: gnu/packages/perl.scm:554
 msgid "Boolean support for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:591
+#: gnu/packages/perl.scm:555
 msgid ""
 "This module provides basic Boolean support, by defining two\n"
 "special objects: true and false."
 msgstr ""
 
-#: gnu/packages/perl.scm:609
+#: gnu/packages/perl.scm:573
 msgid "Data files for Business::ISBN"
 msgstr ""
 
-#: gnu/packages/perl.scm:610
+#: gnu/packages/perl.scm:574
 msgid ""
 "This package provides a data pack for @code{Business::ISBN}.\n"
 "These data are generated from the RangeMessage.xml file provided by the ISBN\n"
 "Agency."
 msgstr ""
 
-#: gnu/packages/perl.scm:632
+#: gnu/packages/perl.scm:596
 msgid "Work with International Standard Book Numbers"
 msgstr ""
 
-#: gnu/packages/perl.scm:633
+#: gnu/packages/perl.scm:597
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Book Numbers, including ISBN-10 and ISBN-13."
 msgstr ""
 
-#: gnu/packages/perl.scm:651
+#: gnu/packages/perl.scm:615
 msgid "Work with International Standard Serial Numbers"
 msgstr ""
 
-#: gnu/packages/perl.scm:652
+#: gnu/packages/perl.scm:616
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Serial Numbers."
 msgstr ""
 
-#: gnu/packages/perl.scm:672
+#: gnu/packages/perl.scm:635
 msgid "Work with International Standard Music Numbers"
 msgstr ""
 
-#: gnu/packages/perl.scm:673
+#: gnu/packages/perl.scm:636
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Music Numbers."
 msgstr ""
 
-#: gnu/packages/perl.scm:694
+#: gnu/packages/perl.scm:657
 msgid "Cache interface for Perl"
 msgstr "Interface de cache pour Perl"
 
-#: gnu/packages/perl.scm:695
+#: gnu/packages/perl.scm:658
 msgid ""
 "The Cache modules are designed to assist a developer in\n"
 "persisting data for a specified period of time.  Often these modules are used\n"
@@ -12242,11 +11940,11 @@ msgid ""
 "easy to use abstraction of the file system or shared memory."
 msgstr ""
 
-#: gnu/packages/perl.scm:718
+#: gnu/packages/perl.scm:680
 msgid "Shared memory interprocess cache via mmap"
 msgstr ""
 
-#: gnu/packages/perl.scm:719
+#: gnu/packages/perl.scm:681
 msgid ""
 "A shared memory cache through an mmap'ed file.  It's core is\n"
 "written in C for performance.  It uses fcntl locking to ensure multiple\n"
@@ -12254,11 +11952,11 @@ msgid ""
 "algorithm to keep the most used entries in the cache."
 msgstr ""
 
-#: gnu/packages/perl.scm:740
+#: gnu/packages/perl.scm:702
 msgid "Capture STDOUT and STDERR from Perl, XS or external programs"
 msgstr ""
 
-#: gnu/packages/perl.scm:742
+#: gnu/packages/perl.scm:704
 msgid ""
 "Capture::Tiny provides a simple, portable way to capture almost anything\n"
 "sent to STDOUT or STDERR, regardless of whether it comes from Perl, from XS\n"
@@ -12266,21 +11964,21 @@ msgid ""
 "is captured while being passed through to the original file handles."
 msgstr ""
 
-#: gnu/packages/perl.scm:761
+#: gnu/packages/perl.scm:723
 msgid "Check compatibility with the installed perl version"
 msgstr ""
 
-#: gnu/packages/perl.scm:763
+#: gnu/packages/perl.scm:725
 msgid ""
 "This module is used by Schmorp's modules during configuration stage\n"
 "to test the installed perl for compatibility with his modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:781
+#: gnu/packages/perl.scm:743
 msgid "Alternative warn and die for modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:782
+#: gnu/packages/perl.scm:744
 msgid ""
 "The @code{Carp} routines are useful in your own modules\n"
 "because they act like @code{die()} or @code{warn()}, but with a message\n"
@@ -12292,42 +11990,42 @@ msgid ""
 "but it is a good educated guess."
 msgstr ""
 
-#: gnu/packages/perl.scm:808
+#: gnu/packages/perl.scm:769
 msgid "Warns and dies noisily with stack backtraces/"
 msgstr ""
 
-#: gnu/packages/perl.scm:809
+#: gnu/packages/perl.scm:770
 msgid ""
 "This module is meant as a debugging aid.  It can be used to\n"
 "make a script complain loudly with stack backtraces when @code{warn()}-ing or\n"
 "@code{die()}ing."
 msgstr ""
 
-#: gnu/packages/perl.scm:828
+#: gnu/packages/perl.scm:789
 msgid "Executable comments for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:829
+#: gnu/packages/perl.scm:790
 msgid ""
 "Carp::Assert is intended for a purpose like the ANSI C\n"
 "library assert.h."
 msgstr ""
 
-#: gnu/packages/perl.scm:851
+#: gnu/packages/perl.scm:812
 msgid "Convenience wrappers around Carp::Assert"
 msgstr ""
 
-#: gnu/packages/perl.scm:852
+#: gnu/packages/perl.scm:813
 msgid ""
 "Carp::Assert::More is a set of handy assertion functions for\n"
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:872
+#: gnu/packages/perl.scm:833
 msgid "Report errors from a \"clan\" of modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:873
+#: gnu/packages/perl.scm:834
 msgid ""
 "This module allows errors from a clan (or family) of modules\n"
 "to appear to originate from the caller of the clan.  This is necessary in\n"
@@ -12335,29 +12033,29 @@ msgid ""
 "the Carp.pm module doesn't help."
 msgstr ""
 
-#: gnu/packages/perl.scm:893
+#: gnu/packages/perl.scm:854
 msgid "Read the CDDB entry for an audio CD in your drive"
 msgstr ""
 
-#: gnu/packages/perl.scm:894
+#: gnu/packages/perl.scm:855
 msgid "This module can retrieve information from the CDDB."
 msgstr ""
 
-#: gnu/packages/perl.scm:916
+#: gnu/packages/perl.scm:877
 msgid "Automated accessor generation"
 msgstr ""
 
-#: gnu/packages/perl.scm:917
+#: gnu/packages/perl.scm:878
 msgid ""
 "This module automagically generates accessors/mutators for\n"
 "your class."
 msgstr ""
 
-#: gnu/packages/perl.scm:939
+#: gnu/packages/perl.scm:900
 msgid "Faster, but less expandable, chained accessors"
 msgstr ""
 
-#: gnu/packages/perl.scm:940
+#: gnu/packages/perl.scm:901
 msgid ""
 "A chained accessor is one that always returns the object\n"
 "when called with parameters (to set), and the value of the field when called\n"
@@ -12365,52 +12063,52 @@ msgid ""
 "the same mk_accessors interface."
 msgstr ""
 
-#: gnu/packages/perl.scm:967
+#: gnu/packages/perl.scm:927
 msgid "Build groups of accessors"
 msgstr ""
 
-#: gnu/packages/perl.scm:968
+#: gnu/packages/perl.scm:928
 msgid ""
 "This class lets you build groups of accessors that will call\n"
 "different getters and setters."
 msgstr ""
 
-#: gnu/packages/perl.scm:988
+#: gnu/packages/perl.scm:947
 msgid "Pragma to use the C3 method resolution order algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:989
+#: gnu/packages/perl.scm:948
 msgid ""
 "This is pragma to change Perl 5's standard method resolution\n"
 "order from depth-first left-to-right (a.k.a - pre-order) to the more\n"
 "sophisticated C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:1013
+#: gnu/packages/perl.scm:972
 msgid "Drop-in replacement for NEXT"
 msgstr ""
 
-#: gnu/packages/perl.scm:1014
+#: gnu/packages/perl.scm:973
 msgid ""
 "This module is intended as a drop-in replacement for NEXT,\n"
 "supporting the same interface, but using Class::C3 to do the hard work."
 msgstr ""
 
-#: gnu/packages/perl.scm:1039
+#: gnu/packages/perl.scm:997
 msgid "Load mix-ins or components to your C3-based class"
 msgstr ""
 
-#: gnu/packages/perl.scm:1040
+#: gnu/packages/perl.scm:998
 msgid ""
 "This module will inject base classes to your module using\n"
 "the Class::C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:1058
+#: gnu/packages/perl.scm:1016
 msgid "Inheritable, overridable class data"
 msgstr ""
 
-#: gnu/packages/perl.scm:1059
+#: gnu/packages/perl.scm:1017
 msgid ""
 "Class::Data::Inheritable is for creating accessor/mutators\n"
 "to class data.  That is, if you want to store something about your class as a\n"
@@ -12418,21 +12116,21 @@ msgid ""
 "subclasses and can be overridden."
 msgstr ""
 
-#: gnu/packages/perl.scm:1080
+#: gnu/packages/perl.scm:1037
 msgid "Class for easy date and time manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:1081
+#: gnu/packages/perl.scm:1038
 msgid ""
 "This module provides a general-purpose date and datetime\n"
 "type for perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1098
+#: gnu/packages/perl.scm:1055
 msgid "Base class for error handling"
 msgstr ""
 
-#: gnu/packages/perl.scm:1100
+#: gnu/packages/perl.scm:1057
 msgid ""
 "@code{Class::ErrorHandler} provides an error-handling mechanism that is generic\n"
 "enough to be used as the base class for a variety of OO classes.  Subclasses inherit\n"
@@ -12440,104 +12138,104 @@ msgid ""
 "to the calling program."
 msgstr ""
 
-#: gnu/packages/perl.scm:1121
+#: gnu/packages/perl.scm:1078
 msgid "Utility methods for factory classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:1122
+#: gnu/packages/perl.scm:1079
 msgid "This module exports methods useful for factory classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:1139
+#: gnu/packages/perl.scm:1096
 msgid "Get information about a class and its structure"
 msgstr ""
 
-#: gnu/packages/perl.scm:1140
+#: gnu/packages/perl.scm:1097
 msgid ""
 "Class::Inspector allows you to get information about a\n"
 "loaded class."
 msgstr ""
 
-#: gnu/packages/perl.scm:1169
+#: gnu/packages/perl.scm:1125
 msgid "Working (require \"Class::Name\") and more"
 msgstr ""
 
-#: gnu/packages/perl.scm:1170
+#: gnu/packages/perl.scm:1126
 msgid ""
 "\"require EXPR\" only accepts Class/Name.pm style module\n"
 "names, not Class::Name.  For that, this module provides \"load_class\n"
 "'Class::Name'\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1194
+#: gnu/packages/perl.scm:1150
 msgid "XS implementation of parts of Class::Load"
 msgstr ""
 
-#: gnu/packages/perl.scm:1195
+#: gnu/packages/perl.scm:1151
 msgid ""
 "This module provides an XS implementation for portions of\n"
 "Class::Load."
 msgstr ""
 
-#: gnu/packages/perl.scm:1214
+#: gnu/packages/perl.scm:1170
 msgid "Create generic methods for OO Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1215
+#: gnu/packages/perl.scm:1171
 msgid ""
 "This module solves the problem of having to continually\n"
 "write accessor methods for your objects that perform standard tasks."
 msgstr ""
 
-#: gnu/packages/perl.scm:1236
+#: gnu/packages/perl.scm:1192
 msgid "Moose-like method modifiers"
 msgstr ""
 
-#: gnu/packages/perl.scm:1237
+#: gnu/packages/perl.scm:1193
 msgid ""
-"Class::Method::Modifiers provides three modifiers: 'before',\n"
-"'around', and 'after'.  'before' and 'after' are run just before and after the\n"
-"method they modify, but can not really affect that original method.  'around'\n"
-"is run in place of the original method, with a hook to easily call that\n"
-"original method."
+"Class::Method::Modifiers provides three modifiers:\n"
+"@code{before}, @code{around}, and @code{after}.  @code{before} and @code{after}\n"
+"are run just before and after the method they modify, but can not really affect\n"
+"that original method.  @code{around} is run in place of the original method,\n"
+"with a hook to easily call that original method."
 msgstr ""
 
-#: gnu/packages/perl.scm:1258
+#: gnu/packages/perl.scm:1214
 msgid "Implementation of a singleton class for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1259
+#: gnu/packages/perl.scm:1215
 msgid ""
 "This module implements a Singleton class from which other\n"
 "classes can be derived.  By itself, the Class::Singleton module does very\n"
 "little other than manage the instantiation of a single object."
 msgstr ""
 
-#: gnu/packages/perl.scm:1278
+#: gnu/packages/perl.scm:1234
 msgid "Minimalist class construction"
 msgstr ""
 
-#: gnu/packages/perl.scm:1279
+#: gnu/packages/perl.scm:1235
 msgid ""
 "This module offers a minimalist class construction kit.  It\n"
 "uses no non-core modules for any recent Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1299
+#: gnu/packages/perl.scm:1255
 msgid "Unload a class"
 msgstr ""
 
-#: gnu/packages/perl.scm:1300
+#: gnu/packages/perl.scm:1256
 msgid ""
 "Class:Unload unloads a given class by clearing out its\n"
 "symbol table and removing it from %INC."
 msgstr ""
 
-#: gnu/packages/perl.scm:1318
+#: gnu/packages/perl.scm:1274
 msgid "Generate fast XS accessors without runtime compilation"
 msgstr ""
 
-#: gnu/packages/perl.scm:1319
+#: gnu/packages/perl.scm:1275
 msgid ""
 "Class::XSAccessor implements fast read, write, and\n"
 "read/write accessors in XS.  Additionally, it can provide predicates such as\n"
@@ -12547,18 +12245,18 @@ msgid ""
 "arrays for their internal representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:1339 gnu/packages/perl.scm:1361
+#: gnu/packages/perl.scm:1295 gnu/packages/perl.scm:1317
 msgid "Recursively copy Perl datatypes"
 msgstr ""
 
-#: gnu/packages/perl.scm:1341
+#: gnu/packages/perl.scm:1297
 msgid ""
 "This module provides a clone() method which makes recursive copies of\n"
 "nested hash, array, scalar and reference types, including tied variables and\n"
 "objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:1362
+#: gnu/packages/perl.scm:1318
 msgid ""
 "This module provides a general-purpose @code{clone} function\n"
 "to make deep copies of Perl data structures.  It calls itself recursively to\n"
@@ -12566,42 +12264,55 @@ msgid ""
 "and objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:1382
+#: gnu/packages/perl.scm:1338
 msgid "Sane defaults for Perl programs"
 msgstr ""
 
-#: gnu/packages/perl.scm:1383
+#: gnu/packages/perl.scm:1339
 msgid ""
 "This module implements some sane defaults for Perl programs,\n"
 "as defined by two typical specimens of Perl coders."
 msgstr ""
 
-#: gnu/packages/perl.scm:1403
+#: gnu/packages/perl.scm:1363
+msgid "Perl extension for libconfig"
+msgstr "Extension Perl pour libconfig"
+
+#: gnu/packages/perl.scm:1365
+msgid ""
+"Conf::Libconfig is a Perl interface to the libconfig configuration file\n"
+"library.  It support scalar, array, and hash data structures just like its C/C++\n"
+"counterpart.  It reduces the effort required to implement a configuration file\n"
+"parser in your Perl programme and allows sharing configuration files between\n"
+"languages."
+msgstr ""
+
+#: gnu/packages/perl.scm:1388
 msgid "Load configuration from different file formats"
 msgstr ""
 
-#: gnu/packages/perl.scm:1404
+#: gnu/packages/perl.scm:1389
 msgid ""
 "Config::Any provides a facility for Perl applications and\n"
 "libraries to load configuration data from multiple different file formats.  It\n"
 "supports XML, YAML, JSON, Apache-style configuration, and Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:1425
+#: gnu/packages/perl.scm:1410
 msgid "Module to implement some AutoConf macros in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1426
+#: gnu/packages/perl.scm:1411
 msgid ""
 "Config::AutoConf is intended to provide the same\n"
 "opportunities to Perl developers as GNU Autoconf does for Shell developers."
 msgstr ""
 
-#: gnu/packages/perl.scm:1444
+#: gnu/packages/perl.scm:1428
 msgid "Generic Config Module"
 msgstr ""
 
-#: gnu/packages/perl.scm:1445
+#: gnu/packages/perl.scm:1429
 msgid ""
 "This module opens a config file and parses its contents for\n"
 "you.  The format of config files supported by Config::General is inspired by\n"
@@ -12612,32 +12323,32 @@ msgid ""
 "options."
 msgstr ""
 
-#: gnu/packages/perl.scm:1472
+#: gnu/packages/perl.scm:1456
 msgid "Simple .ini-file format reader and writer"
 msgstr ""
 
-#: gnu/packages/perl.scm:1473
+#: gnu/packages/perl.scm:1457
 msgid ""
 "@code{Config::INI} is a module that facilates the reading\n"
 "and writing of @code{.ini}-style configuration files."
 msgstr ""
 
-#: gnu/packages/perl.scm:1494
+#: gnu/packages/perl.scm:1478
 msgid "Preserve context during subroutine call"
 msgstr ""
 
-#: gnu/packages/perl.scm:1495
+#: gnu/packages/perl.scm:1479
 msgid ""
 "This module runs code after a subroutine call, preserving\n"
 "the context the subroutine would have seen if it were the last statement in\n"
 "the caller."
 msgstr ""
 
-#: gnu/packages/perl.scm:1520
+#: gnu/packages/perl.scm:1504
 msgid "Extract data from Macintosh BinHex files"
 msgstr ""
 
-#: gnu/packages/perl.scm:1522
+#: gnu/packages/perl.scm:1506
 msgid ""
 "BinHex is a format for transporting files safely through electronic\n"
 "mail, as short-lined, 7-bit, semi-compressed data streams.  Ths module\n"
@@ -12645,41 +12356,41 @@ msgid ""
 "data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1543
+#: gnu/packages/perl.scm:1527
 msgid "Read and write @file{Changes} files"
 msgstr ""
 
-#: gnu/packages/perl.scm:1545
+#: gnu/packages/perl.scm:1529
 msgid ""
 "@code{CPAN::Changes} helps users programmatically read and write\n"
 "@file{Changes} files that conform to a common specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:1565
+#: gnu/packages/perl.scm:1549
 msgid "Verify requirements in a CPAN::Meta object"
 msgstr ""
 
-#: gnu/packages/perl.scm:1566
+#: gnu/packages/perl.scm:1550
 msgid ""
 "This module verifies if requirements described in a\n"
 "CPAN::Meta object are present."
 msgstr ""
 
-#: gnu/packages/perl.scm:1586
+#: gnu/packages/perl.scm:1569
 msgid "JSON::XS for Cpanel"
 msgstr ""
 
-#: gnu/packages/perl.scm:1587 gnu/packages/perl.scm:4486
+#: gnu/packages/perl.scm:1570 gnu/packages/perl.scm:4529
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa."
 msgstr ""
 
-#: gnu/packages/perl.scm:1605
+#: gnu/packages/perl.scm:1588
 msgid "Random password generator"
 msgstr ""
 
-#: gnu/packages/perl.scm:1606
+#: gnu/packages/perl.scm:1589
 msgid ""
 "Crypt::RandPasswd provides three functions that can be used\n"
 "to generate random passwords, constructed from words, letters, or characters.\n"
@@ -12690,40 +12401,40 @@ msgid ""
 "Password Generator\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1631
+#: gnu/packages/perl.scm:1614
 msgid "Perl implementation of the RC4 encryption algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:1632
+#: gnu/packages/perl.scm:1615
 msgid "A pure Perl implementation of the RC4 algorithm."
 msgstr ""
 
-#: gnu/packages/perl.scm:1651
+#: gnu/packages/perl.scm:1634
 msgid "Temporarily change working directory"
 msgstr ""
 
-#: gnu/packages/perl.scm:1653
+#: gnu/packages/perl.scm:1636
 msgid ""
 "@code{Cwd::Guard} changes the current directory using a limited scope.\n"
 "It returns to the previous working directory when the object is destroyed."
 msgstr ""
 
-#: gnu/packages/perl.scm:1691
+#: gnu/packages/perl.scm:1673
 msgid "Library for genomic analysis"
 msgstr "Bibliothèque d'analyse génomique"
 
-#: gnu/packages/perl.scm:1692
+#: gnu/packages/perl.scm:1674
 msgid ""
 "Chaolin Zhang's Perl Library (czplib) contains assorted\n"
 "functions and data structures for processing and analysing genomic and\n"
 "bioinformatics data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1721 gnu/packages/perl.scm:1887
+#: gnu/packages/perl.scm:1703 gnu/packages/perl.scm:1890
 msgid "Base classes wrapping fundamental Perl data types"
 msgstr ""
 
-#: gnu/packages/perl.scm:1722
+#: gnu/packages/perl.scm:1704
 msgid ""
 "Collection of classes that wrap fundamental data types that\n"
 "exist in Perl.  These classes and methods as they exist today are an attempt\n"
@@ -12732,61 +12443,73 @@ msgid ""
 "input."
 msgstr ""
 
-#: gnu/packages/perl.scm:1745
+#: gnu/packages/perl.scm:1727
 msgid "Compare Perl data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1746
+#: gnu/packages/perl.scm:1728
 msgid ""
 "This module compares arbitrary data structures to see if\n"
 "they are copies of each other."
 msgstr ""
 
-#: gnu/packages/perl.scm:1764
+#: gnu/packages/perl.scm:1746
 msgid "Perl extension for generating unique identifiers"
 msgstr ""
 
-#: gnu/packages/perl.scm:1765
+#: gnu/packages/perl.scm:1747
 msgid ""
 "@code{Data::Uniqid} provides three simple routines for\n"
 "generating unique ids.  These ids are coded with a Base62 systen to make them\n"
 "short and handy (e.g. to use it as part of a URL)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1784
+#: gnu/packages/perl.scm:1766
 msgid "Pretty printing of data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1785
+#: gnu/packages/perl.scm:1767
 msgid ""
 "This module provide functions that takes a list of values as\n"
 "their argument and produces a string as its result.  The string contains Perl\n"
 "code that, when \"eval\"ed, produces a deep copy of the original arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:1804
+#: gnu/packages/perl.scm:1786
+msgid "Convert data structures to strings"
+msgstr ""
+
+#: gnu/packages/perl.scm:1787
+msgid ""
+"Given a list of scalars or reference variables,\n"
+"@code{Data::Dumper} writes out their contents in Perl syntax.  The references\n"
+"can also be objects.  The content of each variable is output in a single Perl\n"
+"statement.  It handles self-referential structures correctly."
+msgstr ""
+
+#: gnu/packages/perl.scm:1807
 msgid "Concise data dumper"
 msgstr ""
 
-#: gnu/packages/perl.scm:1805
+#: gnu/packages/perl.scm:1808
 msgid ""
 "Data::Dumper::Concise provides a dumper with Less\n"
 "indentation and newlines plus sub deparsing."
 msgstr ""
 
-#: gnu/packages/perl.scm:1827
+#: gnu/packages/perl.scm:1830
 msgid "Parse and validate simple name/value option pairs"
 msgstr ""
 
-#: gnu/packages/perl.scm:1829
+#: gnu/packages/perl.scm:1832
 msgid "Data::OptList provides a simple syntax for name/value option pairs."
 msgstr ""
 
-#: gnu/packages/perl.scm:1851
+#: gnu/packages/perl.scm:1854
 msgid "Help when paging through sets of results"
 msgstr ""
 
-#: gnu/packages/perl.scm:1852
+#: gnu/packages/perl.scm:1855
 msgid ""
 "When searching through large amounts of data, it is often\n"
 "the case that a result set is returned that is larger than we want to display\n"
@@ -12794,7 +12517,7 @@ msgid ""
 "The maths behind this is unfortunately fiddly, hence this module."
 msgstr ""
 
-#: gnu/packages/perl.scm:1889
+#: gnu/packages/perl.scm:1892
 msgid ""
 "@code{Data::Perl} is a container class for the following classes:\n"
 "@itemize\n"
@@ -12808,21 +12531,21 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/perl.scm:1920
+#: gnu/packages/perl.scm:1923
 msgid "Colored pretty-print of Perl data structures and objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:1921
+#: gnu/packages/perl.scm:1924
 msgid ""
 "Display Perl variables and objects on screen, properly\n"
 "formatted (to be inspected by a human)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1944
+#: gnu/packages/perl.scm:1947
 msgid "Conditionally split data into records"
 msgstr ""
 
-#: gnu/packages/perl.scm:1945
+#: gnu/packages/perl.scm:1948
 msgid ""
 "This Perl module allows you to split data into records by\n"
 "not only specifying what you wish to split the data on, but also by specifying\n"
@@ -12831,21 +12554,21 @@ msgid ""
 "like split on newlines unless newlines are embedded in quotes."
 msgstr ""
 
-#: gnu/packages/perl.scm:1973
+#: gnu/packages/perl.scm:1976
 msgid "Read multiple hunks of data out of your DATA section"
 msgstr ""
 
-#: gnu/packages/perl.scm:1974
+#: gnu/packages/perl.scm:1977
 msgid ""
 "This package provides a Perl library to read multiple hunks\n"
 "of data out of your DATA section."
 msgstr ""
 
-#: gnu/packages/perl.scm:1994
+#: gnu/packages/perl.scm:1997
 msgid "Structured tags datastructures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1996
+#: gnu/packages/perl.scm:1999
 msgid ""
 "This module is for manipulating data as hierarchical tag/value\n"
 "pairs (Structured TAGs or Simple Tree AGgregates).  These datastructures can\n"
@@ -12853,11 +12576,11 @@ msgid ""
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:2023
+#: gnu/packages/perl.scm:2026
 msgid "N at a time iteration API"
 msgstr ""
 
-#: gnu/packages/perl.scm:2024
+#: gnu/packages/perl.scm:2027
 msgid ""
 "This module tries to find middle ground between one at a\n"
 "time and all at once processing of data sets.  The purpose of this module is\n"
@@ -12866,21 +12589,21 @@ msgid ""
 "necessary later on."
 msgstr ""
 
-#: gnu/packages/perl.scm:2049
+#: gnu/packages/perl.scm:2051
 msgid "Dynamic generation of nested combinations of variants"
 msgstr ""
 
-#: gnu/packages/perl.scm:2050
+#: gnu/packages/perl.scm:2052
 msgid ""
 "Data::Tumbler - Dynamic generation of nested combinations of\n"
 "variants."
 msgstr ""
 
-#: gnu/packages/perl.scm:2076
+#: gnu/packages/perl.scm:2078
 msgid "Visitor style traversal of Perl data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:2077
+#: gnu/packages/perl.scm:2079
 msgid ""
 "This module is a simple visitor implementation for Perl\n"
 "values.  It has a main dispatcher method, visit, which takes a single perl\n"
@@ -12890,11 +12613,11 @@ msgid ""
 "structures, and all ref types (hashes, arrays, scalars, code, globs)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2102
+#: gnu/packages/perl.scm:2104
 msgid "Gregorian calendar date calculations"
 msgstr ""
 
-#: gnu/packages/perl.scm:2103
+#: gnu/packages/perl.scm:2105
 msgid ""
 "This package consists of a Perl module for date calculations\n"
 "based on the Gregorian calendar, thereby complying with all relevant norms and\n"
@@ -12902,32 +12625,32 @@ msgid ""
 "applicable)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2127
+#: gnu/packages/perl.scm:2129
 msgid "XS wrapper for Date::Calc"
 msgstr ""
 
-#: gnu/packages/perl.scm:2128
+#: gnu/packages/perl.scm:2130
 msgid ""
 "Date::Calc::XS is an XS wrapper and C library plug-in for\n"
 "Date::Calc."
 msgstr ""
 
-#: gnu/packages/perl.scm:2152
+#: gnu/packages/perl.scm:2153
 msgid "Date manipulation routines"
 msgstr ""
 
-#: gnu/packages/perl.scm:2153
+#: gnu/packages/perl.scm:2154
 msgid ""
 "Date::Manip is a series of modules for common date/time\n"
 "operations, such as comparing two times, determining a date a given amount of\n"
 "time from another, or parsing international times."
 msgstr ""
 
-#: gnu/packages/perl.scm:2172
+#: gnu/packages/perl.scm:2173
 msgid "Simple date handling"
 msgstr ""
 
-#: gnu/packages/perl.scm:2173
+#: gnu/packages/perl.scm:2174
 msgid ""
 "Dates are complex enough without times and timezones.  This\n"
 "module may be used to create simple date objects.  It handles validation,\n"
@@ -12935,11 +12658,11 @@ msgid ""
 "hours, minutes, seconds, and time zones."
 msgstr ""
 
-#: gnu/packages/perl.scm:2205
+#: gnu/packages/perl.scm:2206
 msgid "Date and time object for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2206
+#: gnu/packages/perl.scm:2207
 msgid ""
 "DateTime is a class for the representation of date/time\n"
 "combinations.  It represents the Gregorian calendar, extended backwards in\n"
@@ -13025,22 +12748,22 @@ msgid ""
 "order to create the appropriate objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:2415
+#: gnu/packages/perl.scm:2414
 msgid "Machine-readable date/time with natural parsing"
 msgstr ""
 
-#: gnu/packages/perl.scm:2416
+#: gnu/packages/perl.scm:2415
 msgid ""
 "DateTime::Format::Natural takes a string with a human\n"
 "readable date/time and creates a machine readable one by applying natural\n"
 "parsing logic."
 msgstr ""
 
-#: gnu/packages/perl.scm:2443
+#: gnu/packages/perl.scm:2442
 msgid "Parse and format strp and strf time patterns"
 msgstr ""
 
-#: gnu/packages/perl.scm:2444
+#: gnu/packages/perl.scm:2443
 msgid ""
 "This module implements most of `strptime(3)`, the POSIX\n"
 "function that is the reverse of `strftime(3)`, for `DateTime`.  While\n"
@@ -13190,53 +12913,63 @@ msgstr ""
 "Devel::GlobalDestruction fournit une fonction qui renvoie l'équivalent\n"
 "de « $@{^GLOBAL_PHASE@} eq 'DESTRUCT' » pour les vieux perls."
 
-#: gnu/packages/perl.scm:2736
+#: gnu/packages/perl.scm:2735
 msgid "Forces the unavailability of specified Perl modules (for testing)"
 msgstr ""
 
-#: gnu/packages/perl.scm:2737
+#: gnu/packages/perl.scm:2736
 msgid ""
 "Given a list of Perl modules/filenames, this module makes\n"
 "@code{require} and @code{use} statements fail (no matter whether the specified\n"
 "files/modules are installed or not)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2758
+#: gnu/packages/perl.scm:2755
+msgid "Utility for looking for perl objects that are not reclaimed"
+msgstr ""
+
+#: gnu/packages/perl.scm:2757
+msgid ""
+"This module provides a basic way to discover if a piece of perl code is\n"
+"allocating perl data and not releasing them again."
+msgstr ""
+
+#: gnu/packages/perl.scm:2777
 msgid "Alias lexical variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:2759
+#: gnu/packages/perl.scm:2778
 msgid ""
 "Devel::LexAlias provides the ability to alias a lexical\n"
 "variable in a subroutines scope to one of your choosing."
 msgstr ""
 
-#: gnu/packages/perl.scm:2783
+#: gnu/packages/perl.scm:2802
 msgid "Introspect overloaded operators"
 msgstr ""
 
-#: gnu/packages/perl.scm:2784
+#: gnu/packages/perl.scm:2803
 msgid ""
 "Devel::OverloadInfo returns information about overloaded\n"
 "operators for a given class (or object), including where in the inheritance\n"
 "hierarchy the overloads are declared and where the code implementing it is."
 msgstr ""
 
-#: gnu/packages/perl.scm:2811
+#: gnu/packages/perl.scm:2830
 msgid "Partial dumping of data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:2812
+#: gnu/packages/perl.scm:2831
 msgid ""
 "This module is a data dumper optimized for logging of\n"
 "arbitrary parameters."
 msgstr ""
 
-#: gnu/packages/perl.scm:2830
+#: gnu/packages/perl.scm:2849
 msgid "Object representing a stack trace"
 msgstr ""
 
-#: gnu/packages/perl.scm:2831
+#: gnu/packages/perl.scm:2850
 msgid ""
 "The Devel::StackTrace module contains two classes,\n"
 "Devel::StackTrace and Devel::StackTrace::Frame.  These objects encapsulate the\n"
@@ -13244,11 +12977,11 @@ msgid ""
 "providing a simple interface to this data."
 msgstr ""
 
-#: gnu/packages/perl.scm:2853
+#: gnu/packages/perl.scm:2872
 msgid "Displays stack trace in HTML"
 msgstr ""
 
-#: gnu/packages/perl.scm:2854
+#: gnu/packages/perl.scm:2873
 msgid ""
 "Devel::StackTrace::AsHTML adds as_html method to\n"
 "Devel::StackTrace which displays the stack trace in beautiful HTML, with code\n"
@@ -13257,29 +12990,29 @@ msgid ""
 "each stack frame."
 msgstr ""
 
-#: gnu/packages/perl.scm:2875
+#: gnu/packages/perl.scm:2894
 msgid "Dump symbol names or the symbol table"
 msgstr ""
 
-#: gnu/packages/perl.scm:2876
+#: gnu/packages/perl.scm:2895
 msgid "Devel::Symdump provides access to the perl symbol table."
 msgstr ""
 
-#: gnu/packages/perl.scm:2893
+#: gnu/packages/perl.scm:2912
 msgid "Keyed-Hashing for Message Authentication"
 msgstr ""
 
-#: gnu/packages/perl.scm:2894
+#: gnu/packages/perl.scm:2913
 msgid ""
 "The Digest::HMAC module follows the common Digest::\n"
 "interface for the RFC 2104 HMAC mechanism."
 msgstr ""
 
-#: gnu/packages/perl.scm:2919
+#: gnu/packages/perl.scm:2939
 msgid "Perl interface to the MD-5 algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:2921
+#: gnu/packages/perl.scm:2941
 msgid ""
 "The @code{Digest::MD5} module allows you to use the MD5 Message Digest\n"
 "algorithm from within Perl programs.  The algorithm takes as\n"
@@ -13287,41 +13020,41 @@ msgid ""
 "128-bit \"fingerprint\" or \"message digest\" of the input."
 msgstr ""
 
-#: gnu/packages/perl.scm:2939
+#: gnu/packages/perl.scm:2959
 msgid "Perl implementation of the SHA-1 message digest algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:2941
+#: gnu/packages/perl.scm:2961
 msgid ""
-"This package provides 'Digest::SHA1', an implementation of the NIST\n"
+"This package provides @code{Digest::SHA1}, an implementation of the NIST\n"
 "SHA-1 message digest algorithm for use by Perl programs."
 msgstr ""
 
-#: gnu/packages/perl.scm:2962
+#: gnu/packages/perl.scm:2982
 msgid "Declare version conflicts for your dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:2963
+#: gnu/packages/perl.scm:2983
 msgid ""
 "This module allows you to specify conflicting versions of\n"
 "modules separately and deal with them after the module is done installing."
 msgstr ""
 
-#: gnu/packages/perl.scm:2983
+#: gnu/packages/perl.scm:3003
 msgid "Detect the encoding of data"
 msgstr ""
 
-#: gnu/packages/perl.scm:2984
+#: gnu/packages/perl.scm:3004
 msgid ""
 "This package provides a class @code{Encode::Detect} to detect\n"
 "the encoding of data."
 msgstr ""
 
-#: gnu/packages/perl.scm:3002
+#: gnu/packages/perl.scm:3022
 msgid "ASCII mapping for eucJP encoding"
 msgstr ""
 
-#: gnu/packages/perl.scm:3003
+#: gnu/packages/perl.scm:3023
 msgid ""
 "This package provides an ASCII mapping for the eucJP\n"
 "encoding."
@@ -13329,21 +13062,21 @@ msgstr ""
 "Ce paquet fournit une correspondance entre ASCII et l'encodage\n"
 "eucJP."
 
-#: gnu/packages/perl.scm:3021
+#: gnu/packages/perl.scm:3041
 msgid "JIS X 0212 (aka JIS 2000) encodings"
 msgstr ""
 
-#: gnu/packages/perl.scm:3022
+#: gnu/packages/perl.scm:3042
 msgid ""
 "This package provides encodings for JIS X 0212, which is\n"
 "also known as JIS 2000."
 msgstr ""
 
-#: gnu/packages/perl.scm:3045
+#: gnu/packages/perl.scm:3065
 msgid "Additional Chinese encodings"
 msgstr ""
 
-#: gnu/packages/perl.scm:3046
+#: gnu/packages/perl.scm:3066
 msgid ""
 "This Perl module provides Chinese encodings that are not\n"
 "part of Perl by default, including \"BIG5-1984\", \"BIG5-2003\", \"BIG5PLUS\",\n"
@@ -13351,11 +13084,11 @@ msgid ""
 "\"UNISYS\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:3068
+#: gnu/packages/perl.scm:3088
 msgid "Advanced operations on path variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:3069
+#: gnu/packages/perl.scm:3089
 msgid ""
 "@code{Env::Path} presents an object-oriented interface to\n"
 "path variables, defined as that subclass of environment variables which name\n"
@@ -13363,11 +13096,11 @@ msgid ""
 "separator."
 msgstr ""
 
-#: gnu/packages/perl.scm:3089
+#: gnu/packages/perl.scm:3109
 msgid "OO-ish Error/Exception handling for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:3090
+#: gnu/packages/perl.scm:3110
 msgid ""
 "The Error package provides two interfaces.  Firstly Error\n"
 "provides a procedural interface to exception handling.  Secondly Error is a\n"
@@ -13375,11 +13108,11 @@ msgid ""
 "catch, or can simply be recorded."
 msgstr ""
 
-#: gnu/packages/perl.scm:3115
+#: gnu/packages/perl.scm:3135
 msgid "Safely and cleanly create closures via string eval"
 msgstr ""
 
-#: gnu/packages/perl.scm:3116
+#: gnu/packages/perl.scm:3136
 msgid ""
 "String eval is often used for dynamic code generation.  For\n"
 "instance, Moose uses it heavily, to generate inlined versions of accessors and\n"
@@ -13393,32 +13126,32 @@ msgid ""
 "errors are rethrown automatically."
 msgstr ""
 
-#: gnu/packages/perl.scm:3145
+#: gnu/packages/perl.scm:3165
 msgid "Allows you to declare real exception classes in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:3146
+#: gnu/packages/perl.scm:3166
 msgid ""
 "Exception::Class allows you to declare exception hierarchies\n"
 "in your modules in a \"Java-esque\" manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:3162
+#: gnu/packages/perl.scm:3182
 msgid "Lightweight exporting of functions and variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:3164
+#: gnu/packages/perl.scm:3184
 msgid ""
 "Exporter::Lite is an alternative to Exporter, intended to provide a\n"
 "lightweight subset of the most commonly-used functionality.  It supports\n"
 "import(), @@EXPORT and @@EXPORT_OK and not a whole lot else."
 msgstr ""
 
-#: gnu/packages/perl.scm:3184
+#: gnu/packages/perl.scm:3203
 msgid "Exporter with the features of Sub::Exporter but only core dependencies"
 msgstr ""
 
-#: gnu/packages/perl.scm:3185
+#: gnu/packages/perl.scm:3204
 msgid ""
 "Exporter::Tiny supports many of Sub::Exporter's\n"
 "external-facing features including renaming imported functions with the `-as`,\n"
@@ -13427,32 +13160,32 @@ msgid ""
 "only about 40% as many lines of code and with zero non-core dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:3208
+#: gnu/packages/perl.scm:3227
 msgid "Build.PL install path logic made easy"
 msgstr ""
 
-#: gnu/packages/perl.scm:3209
+#: gnu/packages/perl.scm:3228
 msgid ""
 "This module tries to make install path resolution as easy as\n"
 "possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:3227
+#: gnu/packages/perl.scm:3246
 msgid "Wrapper for perl's configuration"
 msgstr ""
 
-#: gnu/packages/perl.scm:3228
+#: gnu/packages/perl.scm:3247
 msgid ""
 "ExtUtils::Config is an abstraction around the %Config hash.\n"
 "By itself it is not a particularly interesting module by any measure, however\n"
 "it ties together a family of modern toolchain modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3248
+#: gnu/packages/perl.scm:3267
 msgid "Easily build XS extensions that depend on XS extensions"
 msgstr ""
 
-#: gnu/packages/perl.scm:3250
+#: gnu/packages/perl.scm:3269
 msgid ""
 "This module tries to make it easy to build Perl extensions that use\n"
 "functions and typemaps provided by other perl extensions.  This means that a\n"
@@ -13460,21 +13193,21 @@ msgid ""
 "XS interface besides the perl one."
 msgstr ""
 
-#: gnu/packages/perl.scm:3270
+#: gnu/packages/perl.scm:3289
 msgid "Various portability utilities for module builders"
 msgstr ""
 
-#: gnu/packages/perl.scm:3271
+#: gnu/packages/perl.scm:3290
 msgid ""
 "This module provides various portable helper functions for\n"
 "module building modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3291
+#: gnu/packages/perl.scm:3310
 msgid "Tool to build C libraries"
 msgstr ""
 
-#: gnu/packages/perl.scm:3292
+#: gnu/packages/perl.scm:3311
 msgid ""
 "Some Perl modules need to ship C libraries together with\n"
 "their Perl code.  Although there are mechanisms to compile and link (or glue)\n"
@@ -13482,11 +13215,11 @@ msgid ""
 "self-contained C libraries.  This module main goal is to help in that task."
 msgstr ""
 
-#: gnu/packages/perl.scm:3313
+#: gnu/packages/perl.scm:3332
 msgid "Simplistic interface to pkg-config"
 msgstr ""
 
-#: gnu/packages/perl.scm:3315
+#: gnu/packages/perl.scm:3334
 msgid ""
 "@code{ExtUtils::PkgConfig} is a very simplistic interface to the\n"
 "@command{pkg-config} utility, intended for use in the @file{Makefile.PL}\n"
@@ -13494,21 +13227,21 @@ msgid ""
 "It is really just boilerplate code that you would have written yourself."
 msgstr ""
 
-#: gnu/packages/perl.scm:3347
+#: gnu/packages/perl.scm:3366
 msgid "Watch for changes to files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3348
+#: gnu/packages/perl.scm:3367
 msgid ""
 "This module provides a class to monitor a directory for\n"
 "changes made to any file."
 msgstr ""
 
-#: gnu/packages/perl.scm:3369
+#: gnu/packages/perl.scm:3388
 msgid "Get directories of configuration files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3370
+#: gnu/packages/perl.scm:3389
 msgid ""
 "This module is a helper for installing, reading and finding\n"
 "configuration file locations.  @code{File::ConfigDir} is a module to help out\n"
@@ -13516,44 +13249,44 @@ msgid ""
 "configuration files from more than one location."
 msgstr ""
 
-#: gnu/packages/perl.scm:3390
+#: gnu/packages/perl.scm:3409
 msgid "Recursively copy files and directories"
 msgstr ""
 
-#: gnu/packages/perl.scm:3391
+#: gnu/packages/perl.scm:3410
 msgid ""
 "This module has 3 functions: one to copy files only, one to\n"
 "copy directories only, and one to do either depending on the argument's\n"
 "type."
 msgstr ""
 
-#: gnu/packages/perl.scm:3413
+#: gnu/packages/perl.scm:3432
 msgid "Alternative interface to File::Find"
 msgstr ""
 
-#: gnu/packages/perl.scm:3414
+#: gnu/packages/perl.scm:3433
 msgid ""
 "File::Find::Rule is a friendlier interface to File::Find.\n"
 "It allows you to build rules which specify the desired files and\n"
 "directories."
 msgstr ""
 
-#: gnu/packages/perl.scm:3437
+#: gnu/packages/perl.scm:3456
 msgid "Common rules for searching for Perl things"
 msgstr ""
 
-#: gnu/packages/perl.scm:3438
+#: gnu/packages/perl.scm:3457
 msgid ""
 "File::Find::Rule::Perl provides methods for finding various\n"
 "types Perl-related files, or replicating search queries run on a distribution\n"
 "in various parts of the CPAN ecosystem."
 msgstr ""
 
-#: gnu/packages/perl.scm:3459
+#: gnu/packages/perl.scm:3478
 msgid "Matches patterns in a series of files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3460
+#: gnu/packages/perl.scm:3479
 msgid ""
 "@code{File::Grep} provides similar functionality as perl's\n"
 "builtin @code{grep}, @code{map}, and @code{foreach} commands, but iterating\n"
@@ -13561,34 +13294,34 @@ msgid ""
 "provide a quick dropin when such functionality is needed."
 msgstr ""
 
-#: gnu/packages/perl.scm:3483
+#: gnu/packages/perl.scm:3502
 msgid "Find your home and other directories on any platform"
 msgstr ""
 
-#: gnu/packages/perl.scm:3484
+#: gnu/packages/perl.scm:3503
 msgid ""
 "File::HomeDir is a module for locating the directories that\n"
-"are \"owned\" by a user (typically your user) and to solve the various issues\n"
+"are @code{owned} by a user (typically your user) and to solve the various issues\n"
 "that arise trying to find them consistently across a wide variety of\n"
 "platforms."
 msgstr ""
 
-#: gnu/packages/perl.scm:3506
+#: gnu/packages/perl.scm:3524
 msgid "Create or remove directory trees"
 msgstr ""
 
-#: gnu/packages/perl.scm:3507
+#: gnu/packages/perl.scm:3525
 msgid ""
 "This module provide a convenient way to create directories\n"
 "of arbitrary depth and to delete an entire directory subtree from the\n"
 "file system."
 msgstr ""
 
-#: gnu/packages/perl.scm:3530
+#: gnu/packages/perl.scm:3548
 msgid "Change directory temporarily for a limited scope"
 msgstr ""
 
-#: gnu/packages/perl.scm:3531
+#: gnu/packages/perl.scm:3549
 msgid ""
 "@code{File::pushd} does a temporary @code{chdir} that is\n"
 "easily and automatically reverted, similar to @code{pushd} in some Unix\n"
@@ -13599,24 +13332,24 @@ msgid ""
 "at the end of the scope."
 msgstr ""
 
-#: gnu/packages/perl.scm:3559
+#: gnu/packages/perl.scm:3577
 msgid ""
 "Perl extension for crawling directory trees and compiling\n"
 "lists of files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3562
+#: gnu/packages/perl.scm:3580
 msgid ""
 "The File::List module crawls the directory tree starting at the\n"
 "provided base directory and can return files (and/or directories if desired)\n"
 "matching a regular expression."
 msgstr ""
 
-#: gnu/packages/perl.scm:3583
+#: gnu/packages/perl.scm:3601
 msgid "Read a file backwards by lines"
 msgstr ""
 
-#: gnu/packages/perl.scm:3584
+#: gnu/packages/perl.scm:3602
 msgid ""
 "This module reads a file backwards line by line. It is\n"
 "simple to use, memory efficient and fast.  It supports both an object and a\n"
@@ -13628,23 +13361,23 @@ msgid ""
 "the input record separator string on a per file basis."
 msgstr ""
 
-#: gnu/packages/perl.scm:3608
+#: gnu/packages/perl.scm:3628
 msgid "Remove files and directories in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:3609
+#: gnu/packages/perl.scm:3629
 msgid ""
-"File::Remove::remove removes files and directories.  It acts\n"
-"like /bin/rm, for the most part.  Although \"unlink\" can be given a list of\n"
-"files, it will not remove directories; this module remedies that.  It also\n"
-"accepts wildcards, * and ?, as arguments for file names."
+"@code{File::Remove::remove} removes files and directories.\n"
+"It acts like @code{/bin/rm}, for the most part.  Although @code{unlink} can be\n"
+"given a list of files, it will not remove directories; this module remedies\n"
+"that.  It also accepts wildcards, * and ?, as arguments for file names."
 msgstr ""
 
-#: gnu/packages/perl.scm:3633
+#: gnu/packages/perl.scm:3652
 msgid "Locate per-dist and per-module shared files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3634
+#: gnu/packages/perl.scm:3653
 msgid ""
 "The intent of File::ShareDir is to provide a companion to\n"
 "Class::Inspector and File::HomeDir.  Quite often you want or need your Perl\n"
@@ -13654,93 +13387,106 @@ msgid ""
 "the installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:3656
+#: gnu/packages/perl.scm:3674
 msgid "Locate per-dist shared files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3657
+#: gnu/packages/perl.scm:3675
 msgid ""
 "File::ShareDir::Dist finds share directories for\n"
 "distributions.  It is a companion module to File::ShareDir."
 msgstr ""
 
-#: gnu/packages/perl.scm:3677
+#: gnu/packages/perl.scm:3695
 msgid "Install shared files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3678
+#: gnu/packages/perl.scm:3696
 msgid ""
 "File::ShareDir::Install allows you to install read-only data\n"
 "files from a distribution.  It is a companion module to File::ShareDir, which\n"
 "allows you to locate these files after installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:3697
+#: gnu/packages/perl.scm:3714
 msgid "Reading/Writing/Modifying of complete files"
 msgstr ""
 
-#: gnu/packages/perl.scm:3698
+#: gnu/packages/perl.scm:3715
 msgid ""
 "File::Slurp provides subroutines to read or write entire\n"
 "files with a simple call.  It also has a subroutine for reading the list of\n"
 "file names in a directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:3721
+#: gnu/packages/perl.scm:3740
 msgid "Simple, sane and efficient module to slurp a file"
 msgstr ""
 
-#: gnu/packages/perl.scm:3722
+#: gnu/packages/perl.scm:3741
 msgid ""
 "This module provides functions for fast and correct file\n"
 "slurping and spewing.  All functions are optionally exported."
 msgstr ""
 
-#: gnu/packages/perl.scm:3739
+#: gnu/packages/perl.scm:3758
 msgid "Simple file reader and writer"
 msgstr ""
 
-#: gnu/packages/perl.scm:3741
+#: gnu/packages/perl.scm:3760
 msgid "This module provides functions for fast reading and writing of files."
 msgstr ""
 
-#: gnu/packages/perl.scm:3760
+#: gnu/packages/perl.scm:3778
 msgid "Return name and handle of a temporary file safely"
 msgstr ""
 
-#: gnu/packages/perl.scm:3761
+#: gnu/packages/perl.scm:3779
 msgid ""
 "File::Temp can be used to create and open temporary files in\n"
 "a safe way."
 msgstr ""
 
-#: gnu/packages/perl.scm:3778
+#: gnu/packages/perl.scm:3796
 msgid "Portable implementation of the `which' utility"
 msgstr ""
 
-#: gnu/packages/perl.scm:3780
+#: gnu/packages/perl.scm:3798
 msgid ""
 "File::Which was created to be able to get the paths to executable\n"
 "programs on systems under which the `which' program wasn't implemented in the\n"
 "shell."
 msgstr ""
 
-#: gnu/packages/perl.scm:3802
+#: gnu/packages/perl.scm:3820
 msgid "Extended Unix style glob functionality"
 msgstr ""
 
-#: gnu/packages/perl.scm:3803
+#: gnu/packages/perl.scm:3821
 msgid ""
 "@code{File::Zglob} provides a traditional Unix @code{glob}\n"
 "functionality; it returns a list of file names that match the given pattern.\n"
 "For instance, it supports the @code{**/*.pm} form."
 msgstr ""
 
-#: gnu/packages/perl.scm:3822
+#: gnu/packages/perl.scm:3842
+msgid "Simple and dumb file system watcher"
+msgstr ""
+
+#: gnu/packages/perl.scm:3844
+msgid ""
+"Filesys::Notify::Simple is a simple but unified interface to get\n"
+"notifications of changes to a given filesystem path.  It utilizes inotify2 on\n"
+"Linux, fsevents on OS X, kqueue on FreeBSD and FindFirstChangeNotification on\n"
+"Windows if they're installed, with a fallback to the full directory scan if\n"
+"they're not available."
+msgstr ""
+
+#: gnu/packages/perl.scm:3865
 msgid "Module to handle parsing command line options"
 msgstr ""
 
-#: gnu/packages/perl.scm:3823
+#: gnu/packages/perl.scm:3866
 msgid ""
 "The @code{Getopt::Long} module implements an extended getopt\n"
 "function called @code{GetOptions()}.  It parses the command line from\n"
@@ -13754,11 +13500,11 @@ msgid ""
 "single-letter approach, is provided but not enabled by default."
 msgstr ""
 
-#: gnu/packages/perl.scm:3857
+#: gnu/packages/perl.scm:3900
 msgid "Getopt::Long, but simpler and more powerful"
 msgstr ""
 
-#: gnu/packages/perl.scm:3858
+#: gnu/packages/perl.scm:3901
 msgid ""
 "Getopt::Long::Descriptive is yet another Getopt library.\n"
 "It's built atop Getopt::Long, and gets a lot of its features, but tries to\n"
@@ -13766,31 +13512,31 @@ msgid ""
 "usage (help) messages, data validation, and a few other useful features."
 msgstr ""
 
-#: gnu/packages/perl.scm:3876
+#: gnu/packages/perl.scm:3919
 msgid "Table-driven argument parsing for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:3878
+#: gnu/packages/perl.scm:3921
 msgid ""
 "Getopt::Tabular is a Perl 5 module for table-driven argument parsing,\n"
 "vaguely inspired by John Ousterhout's Tk_ParseArgv."
 msgstr ""
 
-#: gnu/packages/perl.scm:3899
+#: gnu/packages/perl.scm:3942
 msgid "Graph data structures and algorithms"
 msgstr ""
 
-#: gnu/packages/perl.scm:3900
+#: gnu/packages/perl.scm:3943
 msgid ""
 "This is @code{Graph}, a Perl module for dealing with graphs,\n"
 "the abstract data structures."
 msgstr ""
 
-#: gnu/packages/perl.scm:3917
+#: gnu/packages/perl.scm:3960
 msgid "Safe cleanup blocks implemented as guards"
 msgstr ""
 
-#: gnu/packages/perl.scm:3918
+#: gnu/packages/perl.scm:3961
 msgid ""
 "@code{Guard} implements so-called @dfn{guards}.  A guard is\n"
 "something (usually an object) that \"guards\" a resource, ensuring that it is\n"
@@ -13801,11 +13547,11 @@ msgid ""
 "which are tied to the scope exit."
 msgstr ""
 
-#: gnu/packages/perl.scm:3954
+#: gnu/packages/perl.scm:3997
 msgid "Lightweight field hash for inside-out objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:3955
+#: gnu/packages/perl.scm:3998
 msgid ""
 "@code{Hash::FieldHash} provides the field hash mechanism\n"
 "which supports the inside-out technique.  It is an alternative to\n"
@@ -13813,11 +13559,11 @@ msgid ""
 "relic support."
 msgstr ""
 
-#: gnu/packages/perl.scm:3975
+#: gnu/packages/perl.scm:4018
 msgid "Merge arbitrarily deep hashes into a single hash"
 msgstr ""
 
-#: gnu/packages/perl.scm:3976
+#: gnu/packages/perl.scm:4019
 msgid ""
 "Hash::Merge merges two arbitrarily deep hashes into a single\n"
 "hash.  That is, at any level, it will add non-conflicting key-value pairs from\n"
@@ -13827,21 +13573,21 @@ msgid ""
 "merged."
 msgstr ""
 
-#: gnu/packages/perl.scm:3998
+#: gnu/packages/perl.scm:4041
 msgid "Store multiple values per key"
 msgstr ""
 
-#: gnu/packages/perl.scm:3999
+#: gnu/packages/perl.scm:4042
 msgid ""
 "Hash::MultiValue is an object (and a plain hash reference)\n"
 "that may contain multiple values per key, inspired by MultiDict of WebOb."
 msgstr ""
 
-#: gnu/packages/perl.scm:4017
+#: gnu/packages/perl.scm:4060
 msgid "Alternative but compatible interface to modules that export symbols"
 msgstr ""
 
-#: gnu/packages/perl.scm:4018
+#: gnu/packages/perl.scm:4061
 msgid ""
 "This module acts as a layer between Exporter and modules which\n"
 "consume exports.  It is feature-compatible with Exporter, plus some much needed\n"
@@ -13851,11 +13597,11 @@ msgid ""
 "variables."
 msgstr ""
 
-#: gnu/packages/perl.scm:4042
+#: gnu/packages/perl.scm:4085
 msgid "Import packages into other packages"
 msgstr ""
 
-#: gnu/packages/perl.scm:4043
+#: gnu/packages/perl.scm:4086
 msgid ""
 "Writing exporters is a pain.  Some use Exporter, some use\n"
 "Sub::Exporter, some use Moose::Exporter, some use Exporter::Declare ... and\n"
@@ -13865,30 +13611,30 @@ msgid ""
 "compilation.  Import::Into provides global methods to make this painless."
 msgstr ""
 
-#: gnu/packages/perl.scm:4065
+#: gnu/packages/perl.scm:4108
 msgid "Use modules in inc/ if newer than installed"
 msgstr ""
 
-#: gnu/packages/perl.scm:4066
+#: gnu/packages/perl.scm:4109
 msgid ""
 "The inc::latest module helps bootstrap configure-time\n"
 "dependencies for CPAN distributions.  These dependencies get bundled into the\n"
 "inc directory within a distribution and are used by Makefile.PL or Build.PL."
 msgstr ""
 
-#: gnu/packages/perl.scm:4086
+#: gnu/packages/perl.scm:4129
 msgid "Lexically warn about using the indirect method call syntax"
 msgstr ""
 
-#: gnu/packages/perl.scm:4088
+#: gnu/packages/perl.scm:4131
 msgid "Indirect warns about using the indirect method call syntax."
 msgstr ""
 
-#: gnu/packages/perl.scm:4108
+#: gnu/packages/perl.scm:4151
 msgid "Write Perl subroutines in other programming languages"
 msgstr "Écrire des sous-routines Perl dans d'autres langages de programmation"
 
-#: gnu/packages/perl.scm:4109
+#: gnu/packages/perl.scm:4152
 msgid ""
 "The @code{Inline} module allows you to put source code\n"
 "from other programming languages directly (inline) in a Perl script or\n"
@@ -13896,11 +13642,11 @@ msgid ""
 "for immediate access from Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:4139
+#: gnu/packages/perl.scm:4182
 msgid "C Language Support for Inline"
 msgstr ""
 
-#: gnu/packages/perl.scm:4140
+#: gnu/packages/perl.scm:4183
 msgid ""
 "The @code{Inline::C} module allows you to write Perl\n"
 "subroutines in C.  Since version 0.30 the @code{Inline} module supports\n"
@@ -13909,11 +13655,11 @@ msgid ""
 "It also goes a bit into Perl C internals."
 msgstr ""
 
-#: gnu/packages/perl.scm:4166
+#: gnu/packages/perl.scm:4209
 msgid "@code{IO::All} to Larry Wall!"
 msgstr ""
 
-#: gnu/packages/perl.scm:4167
+#: gnu/packages/perl.scm:4210
 msgid ""
 "@code{IO::All} combines all of the best Perl IO modules into\n"
 "a single nifty object oriented interface to greatly simplify your everyday\n"
@@ -13921,11 +13667,11 @@ msgid ""
 "@code{IO::All} object.  And that object can do it all!"
 msgstr ""
 
-#: gnu/packages/perl.scm:4189
+#: gnu/packages/perl.scm:4232
 msgid "Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 msgstr ""
 
-#: gnu/packages/perl.scm:4190
+#: gnu/packages/perl.scm:4233
 msgid ""
 "@code{IO::CaptureOutput} provides routines for capturing\n"
 "@code{STDOUT} and @code{STDERR} from perl subroutines, forked system\n"
@@ -13935,66 +13681,66 @@ msgid ""
 "try @code{Capture::Tiny} instead."
 msgstr ""
 
-#: gnu/packages/perl.scm:4212
+#: gnu/packages/perl.scm:4254
 msgid "Utilities for interactive I/O"
 msgstr ""
 
-#: gnu/packages/perl.scm:4213
+#: gnu/packages/perl.scm:4255
 msgid ""
 "This module provides three utility subroutines that make it\n"
 "easier to develop interactive applications: is_interactive(), interactive(),\n"
 "and busy()."
 msgstr ""
 
-#: gnu/packages/perl.scm:4232
+#: gnu/packages/perl.scm:4274
 msgid "Emulate file interface for in-core strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:4233
+#: gnu/packages/perl.scm:4275
 msgid ""
 "IO::String is an IO::File (and IO::Handle) compatible class\n"
 "that reads or writes data from in-core strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:4251
+#: gnu/packages/perl.scm:4293
 msgid "IO:: interface for reading/writing an array of lines"
 msgstr ""
 
-#: gnu/packages/perl.scm:4252
+#: gnu/packages/perl.scm:4294
 msgid ""
 "This toolkit primarily provides modules for performing both\n"
 "traditional and object-oriented i/o) on things *other* than normal\n"
 "filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines."
 msgstr ""
 
-#: gnu/packages/perl.scm:4270
+#: gnu/packages/perl.scm:4312
 msgid "Perl interface to pseudo ttys"
 msgstr ""
 
-#: gnu/packages/perl.scm:4272
+#: gnu/packages/perl.scm:4314
 msgid ""
-"This package provides the 'IO::Pty' and 'IO::Tty' Perl interfaces to\n"
-"pseudo ttys."
+"This package provides the @code{IO::Pty} and @code{IO::Tty} Perl\n"
+"interfaces to pseudo ttys."
 msgstr ""
-"Ce paquet fournit les interfaces Perl « IO::Pty » et « IO::Tty » avec\n"
+"Ce paquet fournit les interfaces Perl @code{IO::Pty} et @code{IO::Tty} avec\n"
 "les pseudo tty."
 
-#: gnu/packages/perl.scm:4290
+#: gnu/packages/perl.scm:4331
 msgid "Run interactive command-line programs"
 msgstr ""
 
-#: gnu/packages/perl.scm:4291
+#: gnu/packages/perl.scm:4332
 msgid ""
 "@code{IPC::Cmd} allows for the searching and execution of\n"
 "any binary on your system.  It adheres to verbosity settings and is able to\n"
 "run interactively.  It also has an option to capture output/error buffers."
 msgstr ""
 
-#: gnu/packages/perl.scm:4320
+#: gnu/packages/perl.scm:4361
 msgid "Run system() and background procs w/ piping, redirs, ptys"
 msgstr ""
 
-#: gnu/packages/perl.scm:4321
+#: gnu/packages/perl.scm:4362
 msgid ""
 "IPC::Run allows you run and interact with child processes\n"
 "using files, pipes, and pseudo-ttys.  Both system()-style and scripted usages\n"
@@ -14002,11 +13748,11 @@ msgid ""
 "both supported and may be mixed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4339
+#: gnu/packages/perl.scm:4380
 msgid "Run a subprocess with input/output redirection"
 msgstr ""
 
-#: gnu/packages/perl.scm:4341
+#: gnu/packages/perl.scm:4382
 msgid ""
 "The IPC::Run3 module allows you to run a subprocess and redirect stdin,\n"
 "stdout, and/or stderr to files and perl data structures.  It aims to satisfy\n"
@@ -14014,21 +13760,21 @@ msgid ""
 "Perlish API and none of the bloat and rarely used features of IPC::Run."
 msgstr ""
 
-#: gnu/packages/perl.scm:4364
+#: gnu/packages/perl.scm:4405
 msgid "Lightweight interface to shared memory"
 msgstr "Interface légère pour la mémoire partagée"
 
-#: gnu/packages/perl.scm:4365
+#: gnu/packages/perl.scm:4406
 msgid ""
 "IPC::ShareLite provides a simple interface to shared memory,\n"
 "allowing data to be efficiently communicated between processes."
 msgstr ""
 
-#: gnu/packages/perl.scm:4383
+#: gnu/packages/perl.scm:4424
 msgid "Run commands simply, with detailed diagnostics"
 msgstr ""
 
-#: gnu/packages/perl.scm:4384
+#: gnu/packages/perl.scm:4425
 msgid ""
 "Calling Perl's in-built @code{system} function is easy,\n"
 "determining if it was successful is hard.  Let's face it, @code{$?} isn't the\n"
@@ -14039,21 +13785,21 @@ msgid ""
 "commands."
 msgstr ""
 
-#: gnu/packages/perl.scm:4409
+#: gnu/packages/perl.scm:4450
 msgid "JSON encoder/decoder for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4410
+#: gnu/packages/perl.scm:4451
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa using either JSON::XS or JSON::PP."
 msgstr ""
 
-#: gnu/packages/perl.scm:4435
+#: gnu/packages/perl.scm:4476
 msgid "Wrapper for Perl JSON classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:4437
+#: gnu/packages/perl.scm:4478
 msgid ""
 "This module tries to provide a coherent API to bring together the\n"
 "various JSON modules currently on CPAN.  This module will allow you to code to\n"
@@ -14061,11 +13807,11 @@ msgid ""
 "installed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4461
+#: gnu/packages/perl.scm:4502
 msgid "Cpanel::JSON::XS with fallback"
 msgstr ""
 
-#: gnu/packages/perl.scm:4462
+#: gnu/packages/perl.scm:4503
 msgid ""
 "This module first checks to see if either Cpanel::JSON::XS\n"
 "or JSON::XS is already loaded, in which case it uses that module.  Otherwise\n"
@@ -14073,23 +13819,23 @@ msgid ""
 "either uses the first module it finds or throws an error."
 msgstr ""
 
-#: gnu/packages/perl.scm:4485
+#: gnu/packages/perl.scm:4528
 msgid "JSON serialising/deserialising for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4508
+#: gnu/packages/perl.scm:4551
 msgid "Prevent leakage of lexical hints"
 msgstr ""
 
-#: gnu/packages/perl.scm:4510
+#: gnu/packages/perl.scm:4553
 msgid "Lexical::SealRequireHints prevents leakage of lexical hints"
 msgstr ""
 
-#: gnu/packages/perl.scm:4527
+#: gnu/packages/perl.scm:4569
 msgid "Bringing loggers and listeners together"
 msgstr ""
 
-#: gnu/packages/perl.scm:4528
+#: gnu/packages/perl.scm:4570
 msgid ""
 "@code{Log::Any} provides a standard log production API for\n"
 "modules.  @code{Log::Any::Adapter} allows applications to choose the mechanism\n"
@@ -14102,121 +13848,121 @@ msgid ""
 "\n"
 "@code{Log::Any} has a very tiny footprint and no dependencies beyond Perl\n"
 "itself, which makes it appropriate for even small CPAN modules to use.  It\n"
-"defaults to 'null' logging activity, so a module can safely log without\n"
+"defaults to @code{null} logging activity, so a module can safely log without\n"
 "worrying about whether the application has chosen (or will ever choose) a\n"
 "logging mechanism."
 msgstr ""
 
-#: gnu/packages/perl.scm:4564
+#: gnu/packages/perl.scm:4606
 msgid "Log::Any adapter for Log::Log4perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4565
+#: gnu/packages/perl.scm:4607
 msgid ""
 "@code{Log::Any::Adapter::Log4perl} provides a\n"
 "@code{Log::Any} adapter using @code{Log::Log4perl} for logging."
 msgstr ""
 
-#: gnu/packages/perl.scm:4586
+#: gnu/packages/perl.scm:4628
 msgid "Log4j implementation for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4587
+#: gnu/packages/perl.scm:4629
 msgid ""
 "@code{Log::Log4perl} lets you remote-control and fine-tune\n"
 "the logging behaviour of your system from the outside.  It implements the\n"
 "widely popular (Java-based) Log4j logging package in pure Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:4607
+#: gnu/packages/perl.scm:4649
 msgid "Log::Report in the lightest form"
 msgstr ""
 
-#: gnu/packages/perl.scm:4609
+#: gnu/packages/perl.scm:4651
 msgid ""
 "This module allows libraries to have a dependency to a small module\n"
 "instead of the full Log-Report distribution.  The full power of\n"
 "@code{Log::Report} is only released when the main program uses that module.\n"
-"In that case, the module using the 'Optional' will also use the full\n"
+"In that case, the module using the @code{Optional} will also use the full\n"
 "@code{Log::Report}, otherwise the dressed-down @code{Log::Report::Minimal}\n"
 "version."
 msgstr ""
 
-#: gnu/packages/perl.scm:4634
+#: gnu/packages/perl.scm:4676
 msgid "Get messages to users and logs"
 msgstr ""
 
-#: gnu/packages/perl.scm:4636
+#: gnu/packages/perl.scm:4678
 msgid ""
 "@code{Log::Report} combines three tasks which are closely related in\n"
 "one: logging, exceptions, and translations."
 msgstr ""
 
-#: gnu/packages/perl.scm:4665
+#: gnu/packages/perl.scm:4706
 msgid "High-level interface to Uniforum message translation"
 msgstr ""
 
-#: gnu/packages/perl.scm:4666
+#: gnu/packages/perl.scm:4707
 msgid ""
 "This package is an internationalization library for Perl\n"
 "that aims to be compatible with the Uniforum message translations system as\n"
 "implemented for example in GNU gettext."
 msgstr ""
 
-#: gnu/packages/perl.scm:4685
+#: gnu/packages/perl.scm:4726
 msgid "Transliterate text between writing systems"
 msgstr ""
 
-#: gnu/packages/perl.scm:4686
+#: gnu/packages/perl.scm:4727
 msgid ""
 "@code{Lingua::Translit} can be used to convert text from one\n"
 "writing system to another, based on national or international transliteration\n"
 "tables.  Where possible a reverse transliteration is supported."
 msgstr ""
 
-#: gnu/packages/perl.scm:4710
+#: gnu/packages/perl.scm:4751
 msgid "Combination of List::Util and List::MoreUtils"
 msgstr ""
 
-#: gnu/packages/perl.scm:4711
+#: gnu/packages/perl.scm:4752
 msgid ""
 "This module exports all of the functions that either\n"
 "List::Util or List::MoreUtils defines, with preference to List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:4733
+#: gnu/packages/perl.scm:4774
 msgid "Compare elements of two or more lists"
 msgstr ""
 
-#: gnu/packages/perl.scm:4734
+#: gnu/packages/perl.scm:4775
 msgid ""
 "@code{List::Compare} provides a module to perform\n"
 "comparative operations on two or more lists.  Provided operations include\n"
 "intersections, unions, unique elements, complements and many more."
 msgstr ""
 
-#: gnu/packages/perl.scm:4769 gnu/packages/perl.scm:4820
+#: gnu/packages/perl.scm:4810 gnu/packages/perl.scm:4860
 msgid "Provide the stuff missing in List::Util"
 msgstr ""
 
-#: gnu/packages/perl.scm:4770
+#: gnu/packages/perl.scm:4811
 msgid ""
 "List::MoreUtils provides some trivial but commonly needed\n"
 "functionality on lists which is not going to go into List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:4792
+#: gnu/packages/perl.scm:4833
 msgid "Provide the stuff missing in List::Util in XS"
 msgstr ""
 
-#: gnu/packages/perl.scm:4793
+#: gnu/packages/perl.scm:4834
 msgid ""
 "@code{List::MoreUtils::XS} provides some trivial but\n"
 "commonly needed functionality on lists which is not going to go into\n"
 "@code{List::Util}."
 msgstr ""
 
-#: gnu/packages/perl.scm:4821
+#: gnu/packages/perl.scm:4861
 msgid ""
 "@code{List::SomeUtils} provides some trivial but commonly\n"
 "needed functionality on lists which is not going to go into @code{List::Util}.\n"
@@ -14228,11 +13974,11 @@ msgid ""
 "portions of this module couldn't be compiled on this machine."
 msgstr ""
 
-#: gnu/packages/perl.scm:4850
+#: gnu/packages/perl.scm:4890
 msgid "Bundle of ancient email modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:4851
+#: gnu/packages/perl.scm:4891
 msgid ""
 "MailTools contains the following modules:\n"
 "@table @asis\n"
@@ -14259,85 +14005,85 @@ msgid ""
 "@end table"
 msgstr ""
 
-#: gnu/packages/perl.scm:4890
+#: gnu/packages/perl.scm:4930
 msgid "Solution of bezier curves"
 msgstr ""
 
-#: gnu/packages/perl.scm:4891
+#: gnu/packages/perl.scm:4931
 msgid ""
 "This module implements the algorithm for the solution of Bezier\n"
 "curves as presented by Robert D Miller in Graphics Gems V, \"Quick and Simple\n"
 "Bezier Curve Drawing\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:4910
+#: gnu/packages/perl.scm:4950
 msgid "Perl extension for rounding numbers"
 msgstr "Extension Perl pour arrondir des nombres"
 
-#: gnu/packages/perl.scm:4911
+#: gnu/packages/perl.scm:4951
 msgid ""
 "@code{Math::Round} provides functions to round numbers,\n"
 "both positive and negative, in various ways."
 msgstr ""
 
-#: gnu/packages/perl.scm:4929
+#: gnu/packages/perl.scm:4969
 msgid "Make functions faster by trading space for time"
 msgstr ""
 
-#: gnu/packages/perl.scm:4930
+#: gnu/packages/perl.scm:4970
 msgid ""
 "This package transparently speeds up functions by caching\n"
 "return values, trading space for time."
 msgstr ""
 
-#: gnu/packages/perl.scm:4948
+#: gnu/packages/perl.scm:4988
 msgid "Expiry plug-in for Memoize that adds LRU cache expiration"
 msgstr ""
 
-#: gnu/packages/perl.scm:4949
+#: gnu/packages/perl.scm:4989
 msgid ""
 "This module implements an expiry policy for Memoize that\n"
 "follows LRU semantics, that is, the last n results, where n is specified as\n"
 "the argument to the CACHESIZE parameter, will be cached."
 msgstr ""
 
-#: gnu/packages/perl.scm:4967
+#: gnu/packages/perl.scm:5007
 msgid "Charset information for MIME messages"
 msgstr ""
 
-#: gnu/packages/perl.scm:4969
+#: gnu/packages/perl.scm:5009
 msgid ""
 "@code{MIME::Charset} provides information about character sets used for\n"
 "MIME messages on Internet."
 msgstr ""
 
-#: gnu/packages/perl.scm:4996
+#: gnu/packages/perl.scm:5036
 msgid "Tools to manipulate MIME messages"
 msgstr "Outils de manipulation des messages MIME"
 
-#: gnu/packages/perl.scm:4998
+#: gnu/packages/perl.scm:5038
 msgid ""
 "MIME-tools is a collection of Perl5 MIME:: modules for parsing,\n"
 "decoding, and generating single- or multipart (even nested multipart) MIME\n"
 "messages."
 msgstr ""
 
-#: gnu/packages/perl.scm:5017
+#: gnu/packages/perl.scm:5057
 msgid "Definition of MIME types"
 msgstr ""
 
-#: gnu/packages/perl.scm:5018
+#: gnu/packages/perl.scm:5058
 msgid ""
 "This module provides a list of known mime-types, combined\n"
 "from various sources.  For instance, it contains all IANA types and the\n"
 "knowledge of Apache."
 msgstr ""
 
-#: gnu/packages/perl.scm:5040
+#: gnu/packages/perl.scm:5080
 msgid "Write your linewise code for handles; this does the rest"
 msgstr ""
 
-#: gnu/packages/perl.scm:5041
+#: gnu/packages/perl.scm:5081
 msgid ""
 "It's boring to deal with opening files for IO, converting\n"
 "strings to handle-like objects, and all that.  With\n"
@@ -14346,21 +14092,21 @@ msgid ""
 "file names are added for you."
 msgstr ""
 
-#: gnu/packages/perl.scm:5067
+#: gnu/packages/perl.scm:5106
 msgid "Enable all of the features of Modern Perl with one import"
 msgstr ""
 
-#: gnu/packages/perl.scm:5068
+#: gnu/packages/perl.scm:5107
 msgid ""
 "@code{Modern::Perl} provides a simple way to enable\n"
 "multiple, by now, standard libraries in a Perl program."
 msgstr ""
 
-#: gnu/packages/perl.scm:5096
+#: gnu/packages/perl.scm:5135
 msgid "Tiny replacement for Module::Build"
 msgstr ""
 
-#: gnu/packages/perl.scm:5097
+#: gnu/packages/perl.scm:5136
 msgid ""
 "Many Perl distributions use a Build.PL file instead of a\n"
 "Makefile.PL file to drive distribution configuration, build, test and\n"
@@ -14370,11 +14116,11 @@ msgid ""
 "has less than 120, yet supports the features needed by most distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:5125
+#: gnu/packages/perl.scm:5164
 msgid "Module::Build class for building XS modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:5127
+#: gnu/packages/perl.scm:5166
 msgid ""
 "@code{Module::Build::XSUtil} is subclass of @code{Module::Build}\n"
 "for support building XS modules.\n"
@@ -14398,11 +14144,11 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/perl.scm:5163
+#: gnu/packages/perl.scm:5202
 msgid "Find and use installed modules in a (sub)category"
 msgstr ""
 
-#: gnu/packages/perl.scm:5164
+#: gnu/packages/perl.scm:5203
 msgid ""
 "Module::Find lets you find and use modules in categories.\n"
 "This can be useful for auto-detecting driver or plugin modules.  You can\n"
@@ -14410,11 +14156,11 @@ msgid ""
 "subcategories."
 msgstr ""
 
-#: gnu/packages/perl.scm:5190
+#: gnu/packages/perl.scm:5229
 msgid "Loads alternate underlying implementations for a module"
 msgstr ""
 
-#: gnu/packages/perl.scm:5191
+#: gnu/packages/perl.scm:5230
 msgid ""
 "This module abstracts out the process of choosing one of\n"
 "several underlying implementations for a module.  This can be used to provide\n"
@@ -14423,11 +14169,11 @@ msgid ""
 "implementations."
 msgstr ""
 
-#: gnu/packages/perl.scm:5229
+#: gnu/packages/perl.scm:5268
 msgid "Standalone, extensible Perl module installer"
 msgstr ""
 
-#: gnu/packages/perl.scm:5230
+#: gnu/packages/perl.scm:5269
 msgid ""
 "Module::Install is a package for writing installers for\n"
 "CPAN (or CPAN-like) distributions that are clean, simple, minimalist, act in a\n"
@@ -14435,11 +14181,11 @@ msgid ""
 "installation version 5.005 or newer."
 msgstr ""
 
-#: gnu/packages/perl.scm:5256
+#: gnu/packages/perl.scm:5295
 msgid "Parse and examine a Perl distribution @file{MANIFEST} file"
 msgstr ""
 
-#: gnu/packages/perl.scm:5258
+#: gnu/packages/perl.scm:5297
 msgid ""
 "@code{Module::Manifest} is a simple utility module created originally for\n"
 "use in @code{Module::Inspector}.\n"
@@ -14449,52 +14195,52 @@ msgid ""
 "@file{MANIFEST.SKIP} file and check that."
 msgstr ""
 
-#: gnu/packages/perl.scm:5281
+#: gnu/packages/perl.scm:5320
 msgid "Give your Perl module the ability to have plugins"
 msgstr ""
 
-#: gnu/packages/perl.scm:5282
+#: gnu/packages/perl.scm:5321
 msgid ""
 "This module provides a simple but extensible way of having\n"
-"'plugins' for your Perl module."
+"@code{plugins} for your Perl module."
 msgstr ""
 
-#: gnu/packages/perl.scm:5301
+#: gnu/packages/perl.scm:5340
 msgid "Perl runtime module handling"
 msgstr ""
 
-#: gnu/packages/perl.scm:5302
+#: gnu/packages/perl.scm:5341
 msgid ""
 "The functions exported by this module deal with runtime\n"
 "handling of Perl modules, which are normally handled at compile time."
 msgstr ""
 
-#: gnu/packages/perl.scm:5325
+#: gnu/packages/perl.scm:5364
 msgid "Provide information on conflicts for Module::Runtime"
 msgstr ""
 
-#: gnu/packages/perl.scm:5326
+#: gnu/packages/perl.scm:5365
 msgid ""
 "This module provides conflicts checking for Module::Runtime,\n"
 "which had a recent release that broke some versions of Moose.  It is called\n"
 "from Moose::Conflicts and moose-outdated."
 msgstr ""
 
-#: gnu/packages/perl.scm:5347
+#: gnu/packages/perl.scm:5386
 msgid "Recursively scan Perl code for dependencies"
 msgstr ""
 
-#: gnu/packages/perl.scm:5348
+#: gnu/packages/perl.scm:5387
 msgid ""
 "Module::ScanDeps is a module to recursively scan Perl\n"
 "programs for dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:5368
+#: gnu/packages/perl.scm:5407
 msgid "Module name tools and transformations"
 msgstr ""
 
-#: gnu/packages/perl.scm:5369
+#: gnu/packages/perl.scm:5408
 msgid ""
 "This module provides a few useful functions for manipulating\n"
 "module names.  Its main aim is to centralise some of the functions commonly\n"
@@ -14502,11 +14248,11 @@ msgid ""
 "module names to relative paths."
 msgstr ""
 
-#: gnu/packages/perl.scm:5399
+#: gnu/packages/perl.scm:5438
 msgid "Minimalist Object Orientation (with Moose compatibility)"
 msgstr ""
 
-#: gnu/packages/perl.scm:5400
+#: gnu/packages/perl.scm:5439
 msgid ""
 "Moo is an extremely light-weight Object Orientation system.\n"
 "It allows one to concisely define objects and roles with a convenient syntax\n"
@@ -14514,11 +14260,11 @@ msgid ""
 "Moose and is optimised for rapid startup."
 msgstr ""
 
-#: gnu/packages/perl.scm:5507
+#: gnu/packages/perl.scm:5546
 msgid "Postmodern object system for Perl 5"
 msgstr ""
 
-#: gnu/packages/perl.scm:5509
+#: gnu/packages/perl.scm:5548
 msgid ""
 "Moose is a complete object system for Perl 5.  It provides keywords for\n"
 "attribute declaration, object construction, inheritance, and maybe more.  With\n"
@@ -14529,11 +14275,11 @@ msgid ""
 "sentences."
 msgstr ""
 
-#: gnu/packages/perl.scm:5538
+#: gnu/packages/perl.scm:5576
 msgid "Emulate Class::Accessor::Fast behavior using Moose attributes"
 msgstr ""
 
-#: gnu/packages/perl.scm:5539
+#: gnu/packages/perl.scm:5577
 msgid ""
 "This module attempts to emulate the behavior of\n"
 "Class::Accessor::Fast as accurately as possible using the Moose attribute\n"
@@ -14541,21 +14287,21 @@ msgid ""
 "private methods are not."
 msgstr ""
 
-#: gnu/packages/perl.scm:5574
+#: gnu/packages/perl.scm:5611
 msgid "Moose role for processing command line options"
 msgstr ""
 
-#: gnu/packages/perl.scm:5575
+#: gnu/packages/perl.scm:5612
 msgid ""
 "This is a Moose role which provides an alternate constructor\n"
 "for creating objects using parameters passed in from the command line."
 msgstr ""
 
-#: gnu/packages/perl.scm:5596
+#: gnu/packages/perl.scm:5633
 msgid "Mark overload code symbols as methods"
 msgstr ""
 
-#: gnu/packages/perl.scm:5597
+#: gnu/packages/perl.scm:5634
 msgid ""
 "MooseX::MarkAsMethods allows one to easily mark certain\n"
 "functions as Moose methods.  This will allow other packages such as\n"
@@ -14565,21 +14311,21 @@ msgid ""
 "overloads will \"just work\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:5627
+#: gnu/packages/perl.scm:5664
 msgid "Code attribute introspection"
 msgstr ""
 
-#: gnu/packages/perl.scm:5628
+#: gnu/packages/perl.scm:5665
 msgid ""
 "This module allows code attributes of methods to be\n"
 "introspected using Moose meta method objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:5654
+#: gnu/packages/perl.scm:5691
 msgid "Subclassing of non-Moose classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:5655
+#: gnu/packages/perl.scm:5692
 msgid ""
 "MooseX::NonMoose allows for easily subclassing non-Moose\n"
 "classes with Moose, taking care of the details connected with doing this, such\n"
@@ -14588,31 +14334,31 @@ msgid ""
 "BUILD methods are called.  It tries to be as non-intrusive as possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:5684
+#: gnu/packages/perl.scm:5720
 msgid "Extension of Params::Validate using Moose's types"
 msgstr ""
 
-#: gnu/packages/perl.scm:5685
+#: gnu/packages/perl.scm:5721
 msgid ""
 "This module fills a gap in Moose by adding method parameter\n"
 "validation to Moose."
 msgstr ""
 
-#: gnu/packages/perl.scm:5706
+#: gnu/packages/perl.scm:5742
 msgid "Apply roles to a related Perl class"
 msgstr ""
 
-#: gnu/packages/perl.scm:5707
+#: gnu/packages/perl.scm:5743
 msgid ""
 "This module applies roles to make a subclass instead of\n"
 "manually setting up a subclass."
 msgstr ""
 
-#: gnu/packages/perl.scm:5734
+#: gnu/packages/perl.scm:5769
 msgid "Moose roles with composition parameters"
 msgstr ""
 
-#: gnu/packages/perl.scm:5735
+#: gnu/packages/perl.scm:5770
 msgid ""
 "Because Moose roles serve many different masters, they\n"
 "usually provide only the least common denominator of functionality.  To\n"
@@ -14622,11 +14368,11 @@ msgid ""
 "Parameterized roles offer a solution to these (and other) kinds of problems."
 msgstr ""
 
-#: gnu/packages/perl.scm:5761
+#: gnu/packages/perl.scm:5796
 msgid "Roles which support overloading"
 msgstr ""
 
-#: gnu/packages/perl.scm:5762
+#: gnu/packages/perl.scm:5797
 msgid ""
 "MooseX::Role::WithOverloading allows you to write a\n"
 "Moose::Role which defines overloaded operators and allows those overload\n"
@@ -14634,11 +14380,11 @@ msgid ""
 "where plain Moose::Roles would lose the overloading."
 msgstr ""
 
-#: gnu/packages/perl.scm:5784
+#: gnu/packages/perl.scm:5819
 msgid "Name your accessors foo() and set_foo()"
 msgstr ""
 
-#: gnu/packages/perl.scm:5785
+#: gnu/packages/perl.scm:5820
 msgid ""
 "This module does not provide any methods.  Simply loading it\n"
 "changes the default naming policy for the loading class so that accessors are\n"
@@ -14646,82 +14392,82 @@ msgid ""
 "accessor, while set methods are prefixed with \"_set_\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:5811
+#: gnu/packages/perl.scm:5846
 msgid "Strict object constructors for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:5812
+#: gnu/packages/perl.scm:5847
 msgid ""
 "Simply loading this module makes your constructors\n"
 "\"strict\".  If your constructor is called with an attribute init argument\n"
 "that your class does not declare, then it calls Moose->throw_error()."
 msgstr ""
 
-#: gnu/packages/perl.scm:5840
+#: gnu/packages/perl.scm:5875
 msgid "Trait loading and resolution for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:5841
+#: gnu/packages/perl.scm:5876
 msgid ""
 "Adds support on top of MooseX::Traits for class precedence\n"
 "search for traits and some extra attributes."
 msgstr ""
 
-#: gnu/packages/perl.scm:5867
+#: gnu/packages/perl.scm:5902
 msgid "Organise your Moose types in libraries"
 msgstr ""
 
-#: gnu/packages/perl.scm:5868
+#: gnu/packages/perl.scm:5903
 msgid ""
 "This package lets you declare types using short names, but\n"
 "behind the scenes it namespaces all your type declarations, effectively\n"
 "prevent name clashes between packages."
 msgstr ""
 
-#: gnu/packages/perl.scm:5899
+#: gnu/packages/perl.scm:5934
 msgid "DateTime related constraints and coercions for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:5900
+#: gnu/packages/perl.scm:5935
 msgid ""
 "This module packages several Moose::Util::TypeConstraints\n"
 "with coercions, designed to work with the DateTime suite of objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:5932
+#: gnu/packages/perl.scm:5966
 msgid "Extensions to MooseX::Types::DateTime"
 msgstr ""
 
-#: gnu/packages/perl.scm:5933
+#: gnu/packages/perl.scm:5967
 msgid ""
 "This module builds on MooseX::Types::DateTime to add\n"
 "additional custom types and coercions.  Since it builds on an existing type,\n"
 "all coercions and constraints are inherited."
 msgstr ""
 
-#: gnu/packages/perl.scm:5962
+#: gnu/packages/perl.scm:5995
 msgid "ClassName type constraints for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:5963
+#: gnu/packages/perl.scm:5996
 msgid ""
 "MooseX::Types::LoadableClass provides a ClassName type\n"
 "constraint with coercion to load the class."
 msgstr ""
 
-#: gnu/packages/perl.scm:5989
+#: gnu/packages/perl.scm:6022
 msgid "Using Moo and MooX:: packages the most lazy way"
 msgstr ""
 
-#: gnu/packages/perl.scm:5990
+#: gnu/packages/perl.scm:6023
 msgid "Contains the MooX and MooX::Role packages."
 msgstr ""
 
-#: gnu/packages/perl.scm:6017
+#: gnu/packages/perl.scm:6049
 msgid "Giving an easy Moo style way to make command organized CLI apps"
 msgstr ""
 
-#: gnu/packages/perl.scm:6018
+#: gnu/packages/perl.scm:6050
 msgid ""
 "This package eases the writing of command line utilities,\n"
 "accepting commands and subcommands and so on.  These commands can form a tree,\n"
@@ -14730,11 +14476,11 @@ msgid ""
 "most specific one) is instantiated."
 msgstr ""
 
-#: gnu/packages/perl.scm:6051
+#: gnu/packages/perl.scm:6083
 msgid "Moo eXtension for initializing objects from config file"
 msgstr ""
 
-#: gnu/packages/perl.scm:6052
+#: gnu/packages/perl.scm:6084
 msgid ""
 "This module is intended to easily load initialization values\n"
 "for attributes on object construction from an appropriate config file.  The\n"
@@ -14742,33 +14488,33 @@ msgid ""
 "@code{MooX::ConfigFromFile} ensures that the role is applied."
 msgstr ""
 
-#: gnu/packages/perl.scm:6076
+#: gnu/packages/perl.scm:6108
 msgid "Moo eXtension for @code{File::ConfigDir}"
 msgstr ""
 
-#: gnu/packages/perl.scm:6077
+#: gnu/packages/perl.scm:6109
 msgid ""
 "This module is a helper for easily finding configuration\n"
 "file locations.  This information can be used to find a suitable place for\n"
 "installing configuration files or for finding any piece of settings."
 msgstr ""
 
-#: gnu/packages/perl.scm:6112
+#: gnu/packages/perl.scm:6144
 msgid "NativeTrait-like behavior for Moo"
 msgstr ""
 
-#: gnu/packages/perl.scm:6114
+#: gnu/packages/perl.scm:6146
 msgid ""
 "@code{MooX::HandlesVia} is an extension of Moo's @code{handles}\n"
 "attribute functionality.  It provides a means of proxying functionality from\n"
 "an external class to the given atttribute."
 msgstr ""
 
-#: gnu/packages/perl.scm:6145
+#: gnu/packages/perl.scm:6177
 msgid "Easily translate Moose code to Moo"
 msgstr ""
 
-#: gnu/packages/perl.scm:6147
+#: gnu/packages/perl.scm:6179
 msgid ""
 "MooX::late does the following:\n"
 "@enumerate\n"
@@ -14782,11 +14528,11 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/perl.scm:6202
+#: gnu/packages/perl.scm:6234
 msgid "Explicit Options eXtension for Object Class"
 msgstr ""
 
-#: gnu/packages/perl.scm:6203
+#: gnu/packages/perl.scm:6235
 msgid ""
 "Create a command line tool with your Mo, Moo, Moose objects.\n"
 "You have an @code{option} keyword to replace the usual @code{has} to\n"
@@ -14795,32 +14541,32 @@ msgid ""
 "generate a command line tool."
 msgstr ""
 
-#: gnu/packages/perl.scm:6230
+#: gnu/packages/perl.scm:6261
 msgid "Moosish types and type builder"
 msgstr ""
 
-#: gnu/packages/perl.scm:6231
+#: gnu/packages/perl.scm:6262
 msgid ""
 "MooX::Types::MooseLike provides a possibility to build your\n"
 "own set of Moose-like types.  These custom types can then be used to describe\n"
 "fields in Moo-based classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:6260
+#: gnu/packages/perl.scm:6291
 msgid "Fast Moose-compatible object system for perl5"
 msgstr ""
 
-#: gnu/packages/perl.scm:6262
+#: gnu/packages/perl.scm:6293
 msgid ""
 "Mouse is a @code{Moose} compatible object system that implements a\n"
 "subset of the functionality for reduced startup time."
 msgstr ""
 
-#: gnu/packages/perl.scm:6285
+#: gnu/packages/perl.scm:6316
 msgid "Extend attribute interfaces for Mouse"
 msgstr "Interfaces d'attribut étendu pour Mouse"
 
-#: gnu/packages/perl.scm:6287
+#: gnu/packages/perl.scm:6318
 msgid ""
 "While @code{Mouse} attributes provide a way to name your accessors,\n"
 "readers, writers, clearers and predicates, @code{MouseX::NativeTraits}\n"
@@ -14828,30 +14574,30 @@ msgid ""
 "of data."
 msgstr ""
 
-#: gnu/packages/perl.scm:6307
+#: gnu/packages/perl.scm:6338
 msgid "Mozilla's CA cert bundle in PEM format"
 msgstr ""
 
-#: gnu/packages/perl.scm:6308
+#: gnu/packages/perl.scm:6339
 msgid ""
 "@code{Mozilla::CA} provides a copy of Mozilla's bundle of\n"
 "Certificate Authority certificates in a form that can be consumed by modules\n"
 "and libraries based on OpenSSL."
 msgstr ""
 
-#: gnu/packages/perl.scm:6334
+#: gnu/packages/perl.scm:6365
 msgid "Disable multidimensional array emulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:6336
+#: gnu/packages/perl.scm:6367
 msgid "Multidimensional disables multidimensional array emulation."
 msgstr ""
 
-#: gnu/packages/perl.scm:6353
+#: gnu/packages/perl.scm:6384
 msgid "MRO interface compatibility for Perls < 5.9.5"
 msgstr ""
 
-#: gnu/packages/perl.scm:6354
+#: gnu/packages/perl.scm:6385
 msgid ""
 "The \"mro\" namespace provides several utilities for dealing\n"
 "with method resolution order and method caching in general in Perl 5.9.5 and\n"
@@ -14859,11 +14605,11 @@ msgid ""
 "Perl (back to 5.6.0)."
 msgstr ""
 
-#: gnu/packages/perl.scm:6381
+#: gnu/packages/perl.scm:6412
 msgid "Keep imports out of your namespace"
 msgstr ""
 
-#: gnu/packages/perl.scm:6382
+#: gnu/packages/perl.scm:6413
 msgid ""
 "The namespace::autoclean pragma will remove all imported\n"
 "symbols at the end of the current package's compile cycle.  Functions called\n"
@@ -14874,11 +14620,11 @@ msgid ""
 "anything that looks like a method."
 msgstr ""
 
-#: gnu/packages/perl.scm:6408
+#: gnu/packages/perl.scm:6439
 msgid "Keep imports and functions out of your namespace"
 msgstr ""
 
-#: gnu/packages/perl.scm:6409
+#: gnu/packages/perl.scm:6440
 msgid ""
 "The namespace::clean pragma will remove all previously\n"
 "declared or imported symbols at the end of the current package's compile\n"
@@ -14886,11 +14632,11 @@ msgid ""
 "name, but they won't show up as methods on your class or instances."
 msgstr ""
 
-#: gnu/packages/perl.scm:6429
+#: gnu/packages/perl.scm:6460
 msgid "Non-blocking system DNS resolver"
 msgstr ""
 
-#: gnu/packages/perl.scm:6431
+#: gnu/packages/perl.scm:6462
 msgid ""
 "This class provides several methods for host name resolution.  It is\n"
 "designed to be used with event loops.  Names are resolved by your system's\n"
@@ -14899,11 +14645,11 @@ msgid ""
 "system threads instead of Perl threads."
 msgstr ""
 
-#: gnu/packages/perl.scm:6459
+#: gnu/packages/perl.scm:6485
 msgid "Internationalizing Domain Names in Applications (IDNA)"
 msgstr ""
 
-#: gnu/packages/perl.scm:6461
+#: gnu/packages/perl.scm:6487
 msgid ""
 "Internationalized Domain Names (IDNs) use characters drawn from a large\n"
 "repertoire (Unicode), but IDNA allows the non-ASCII characters to be\n"
@@ -14914,31 +14660,31 @@ msgid ""
 "using whatever IDNA standard is the best choice at the moment."
 msgstr ""
 
-#: gnu/packages/perl.scm:6487
+#: gnu/packages/perl.scm:6513
 msgid "Perl client for Etsy's statsd daemon"
 msgstr ""
 
-#: gnu/packages/perl.scm:6488
+#: gnu/packages/perl.scm:6514
 msgid ""
 "This module implement a UDP client for the statsd statistics\n"
 "collector daemon in use at Etsy.com."
 msgstr ""
 
-#: gnu/packages/perl.scm:6506
+#: gnu/packages/perl.scm:6532
 msgid "Numeric comparisons"
 msgstr ""
 
-#: gnu/packages/perl.scm:6507
+#: gnu/packages/perl.scm:6533
 msgid ""
 "Number::Compare compiles a simple comparison to an anonymous\n"
 "subroutine, which you can call with a value to be tested against."
 msgstr ""
 
-#: gnu/packages/perl.scm:6525
+#: gnu/packages/perl.scm:6551
 msgid "Convert numbers to strings with pretty formatting"
 msgstr ""
 
-#: gnu/packages/perl.scm:6526
+#: gnu/packages/perl.scm:6552
 msgid ""
 "@code{Number::Format} is a library for formatting numbers.\n"
 "Functions are provided for converting numbers to strings in a variety of ways,\n"
@@ -14949,32 +14695,32 @@ msgid ""
 "the locale information or can be specified by the user."
 msgstr ""
 
-#: gnu/packages/perl.scm:6550
+#: gnu/packages/perl.scm:6576
 msgid "Perl extension defining ranges of numbers"
 msgstr "Extension Perl pour définir des intervalles de nombres"
 
-#: gnu/packages/perl.scm:6551
+#: gnu/packages/perl.scm:6577
 msgid ""
 "Number::Range is an object-oriented interface to test if a\n"
 "number exists in a given range, and to be able to manipulate the range."
 msgstr ""
 
-#: gnu/packages/perl.scm:6571
+#: gnu/packages/perl.scm:6596
 msgid "Generate cryptographic signatures for objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:6572
+#: gnu/packages/perl.scm:6597
 msgid ""
 "Object::Signature is an abstract base class that you can\n"
 "inherit from in order to allow your objects to generate unique cryptographic\n"
 "signatures."
 msgstr ""
 
-#: gnu/packages/perl.scm:6593
+#: gnu/packages/perl.scm:6618
 msgid "Read and write OLE storage files"
 msgstr ""
 
-#: gnu/packages/perl.scm:6594
+#: gnu/packages/perl.scm:6619
 msgid ""
 "This module allows you to read and write\n"
 "an OLE-Structured file.  @dfn{OLE} (Object Linking and Embedding) is a\n"
@@ -14982,43 +14728,43 @@ msgid ""
 "documents within a single file."
 msgstr ""
 
-#: gnu/packages/perl.scm:6617
+#: gnu/packages/perl.scm:6642
 msgid "Anonymous packages"
 msgstr ""
 
-#: gnu/packages/perl.scm:6618
+#: gnu/packages/perl.scm:6643
 msgid ""
 "This module allows for anonymous packages that are\n"
 "independent of the main namespace and only available through an object\n"
 "instance, not by name."
 msgstr ""
 
-#: gnu/packages/perl.scm:6646
+#: gnu/packages/perl.scm:6671
 msgid "Manage deprecation warnings for your distribution"
 msgstr ""
 
-#: gnu/packages/perl.scm:6647
+#: gnu/packages/perl.scm:6672
 msgid ""
 "This module allows you to manage a set of deprecations for\n"
 "one or more modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:6674
+#: gnu/packages/perl.scm:6698
 msgid "Routines for manipulating stashes"
 msgstr ""
 
-#: gnu/packages/perl.scm:6675
+#: gnu/packages/perl.scm:6699
 msgid ""
 "Manipulating stashes (Perl's symbol tables) is occasionally\n"
 "necessary, but incredibly messy, and easy to get wrong.  This module hides all\n"
 "of that behind a simple API."
 msgstr ""
 
-#: gnu/packages/perl.scm:6698
+#: gnu/packages/perl.scm:6721
 msgid "Faster implementation of the Package::Stash API"
 msgstr ""
 
-#: gnu/packages/perl.scm:6699
+#: gnu/packages/perl.scm:6722
 msgid ""
 "This is a backend for Package::Stash, which provides the\n"
 "functionality in a way that's less buggy and much faster.  It will be used by\n"
@@ -15026,11 +14772,11 @@ msgid ""
 "compiler."
 msgstr ""
 
-#: gnu/packages/perl.scm:6719
+#: gnu/packages/perl.scm:6741
 msgid "Play with other peoples' lexical variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:6720
+#: gnu/packages/perl.scm:6742
 msgid ""
 "PadWalker is a module which allows you to inspect (and even\n"
 "change) lexical variables in any subroutine which called you.  It will only\n"
@@ -15038,42 +14784,42 @@ msgid ""
 "is particularly useful for debugging."
 msgstr ""
 
-#: gnu/packages/perl.scm:6744
+#: gnu/packages/perl.scm:6766
 msgid "Simple parallel processing fork manager"
 msgstr ""
 
-#: gnu/packages/perl.scm:6745
+#: gnu/packages/perl.scm:6767
 msgid ""
 "@code{Parallel::ForkManager} is intended for use in\n"
 "operations that can be done in parallel where the number of\n"
 "processes to be forked off should be limited."
 msgstr ""
 
-#: gnu/packages/perl.scm:6765
+#: gnu/packages/perl.scm:6787
 msgid "Simple, compact and correct param-checking functions"
 msgstr ""
 
-#: gnu/packages/perl.scm:6767
+#: gnu/packages/perl.scm:6789
 msgid ""
 "Params::Util provides a basic set of importable functions that makes\n"
 "checking parameters easier."
 msgstr ""
 
-#: gnu/packages/perl.scm:6791
+#: gnu/packages/perl.scm:6813
 msgid "Validate method/function parameters"
 msgstr ""
 
-#: gnu/packages/perl.scm:6792
+#: gnu/packages/perl.scm:6814
 msgid ""
 "The Params::Validate module allows you to validate method or\n"
 "function call parameters to an arbitrary level of specificity."
 msgstr ""
 
-#: gnu/packages/perl.scm:6820
+#: gnu/packages/perl.scm:6841
 msgid "Build an optimized subroutine parameter validator"
 msgstr ""
 
-#: gnu/packages/perl.scm:6821
+#: gnu/packages/perl.scm:6842
 msgid ""
 "This module creates a customized, highly efficient\n"
 "parameter checking subroutine.  It can handle named or positional\n"
@@ -15082,37 +14828,37 @@ msgid ""
 "defaults, optional parameters, and extra \"slurpy\" parameters."
 msgstr ""
 
-#: gnu/packages/perl.scm:6842
+#: gnu/packages/perl.scm:6863
 msgid "Create and manipulate PAR distributions"
 msgstr ""
 
-#: gnu/packages/perl.scm:6843
+#: gnu/packages/perl.scm:6864
 msgid ""
 "PAR::Dist is a toolkit to create and manipulate PAR\n"
 "distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:6862
+#: gnu/packages/perl.scm:6882
 msgid ""
 "Allows you to both load one or more modules, while setting\n"
 "up inheritance from those modules at the same time."
 msgstr ""
 
-#: gnu/packages/perl.scm:6881
+#: gnu/packages/perl.scm:6901
 msgid "Path specification manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:6882
+#: gnu/packages/perl.scm:6902
 msgid ""
 "Path::Class is a module for manipulation of file and\n"
 "directory specifications in a cross-platform manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:6911
+#: gnu/packages/perl.scm:6932
 msgid "Tools for working with directory and file names"
 msgstr "Outils pour travailler avec des noms de répertoires et de fichiers"
 
-#: gnu/packages/perl.scm:6912
+#: gnu/packages/perl.scm:6933
 msgid ""
 "This package provides functions to work with directory and\n"
 "file names."
@@ -15120,32 +14866,32 @@ msgstr ""
 "Ce paquet fournit des fonctions pour travailler avec des noms\n"
 "de répertoires et de fichiers."
 
-#: gnu/packages/perl.scm:6936
+#: gnu/packages/perl.scm:6957
 msgid "File path utility"
 msgstr ""
 
-#: gnu/packages/perl.scm:6937
+#: gnu/packages/perl.scm:6958
 msgid ""
 "This module provides a small, fast utility for working\n"
 "with file paths."
 msgstr ""
 
-#: gnu/packages/perl.scm:6958
+#: gnu/packages/perl.scm:6979
 msgid "Fast and correct UTF-8 IO"
 msgstr ""
 
-#: gnu/packages/perl.scm:6959
+#: gnu/packages/perl.scm:6980
 msgid ""
 "@code{PerlIO::utf8_strict} provides a fast and correct UTF-8\n"
 "PerlIO layer.  Unlike Perl's default @code{:utf8} layer it checks the input\n"
 "for correctness."
 msgstr ""
 
-#: gnu/packages/perl.scm:6982
+#: gnu/packages/perl.scm:7003
 msgid "Acmeist PEG Parser Framework"
 msgstr ""
 
-#: gnu/packages/perl.scm:6983
+#: gnu/packages/perl.scm:7004
 msgid ""
 "Pegex is an Acmeist parser framework.  It allows you to easily\n"
 "create parsers that will work equivalently in lots of programming languages.\n"
@@ -15155,32 +14901,32 @@ msgid ""
 "available."
 msgstr ""
 
-#: gnu/packages/perl.scm:7007
+#: gnu/packages/perl.scm:7028
 msgid "Check for comprehensive documentation of a module"
 msgstr ""
 
-#: gnu/packages/perl.scm:7008
+#: gnu/packages/perl.scm:7029
 msgid ""
 "This module provides a mechanism for determining if the pod\n"
 "for a given module is comprehensive."
 msgstr ""
 
-#: gnu/packages/perl.scm:7025
+#: gnu/packages/perl.scm:7046
 msgid "Parsing library for text in Pod format"
 msgstr ""
 
-#: gnu/packages/perl.scm:7026
+#: gnu/packages/perl.scm:7047
 msgid ""
 "@code{Pod::Simple} is a Perl library for parsing text in\n"
 "the @dfn{Pod} (plain old documentation) markup language that is typically\n"
 "used for writing documentation for Perl and for Perl modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:7047
+#: gnu/packages/perl.scm:7068
 msgid "GNU C library compatible strftime for loggers and servers"
 msgstr ""
 
-#: gnu/packages/perl.scm:7048
+#: gnu/packages/perl.scm:7069
 msgid ""
 "POSIX::strftime::Compiler provides GNU C library compatible\n"
 "strftime(3).  But this module is not affected by the system locale.  This\n"
@@ -15188,32 +14934,32 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/perl.scm:7066
+#: gnu/packages/perl.scm:7087
 msgid "Information about the currently running perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:7068
+#: gnu/packages/perl.scm:7089
 msgid ""
 "Probe::Perl provides methods for obtaining information about the\n"
 "currently running perl interpreter.  It originally began life as code in the\n"
 "Module::Build project, but has been externalized here for general use."
 msgstr ""
 
-#: gnu/packages/perl.scm:7095
+#: gnu/packages/perl.scm:7116
 msgid "Interface to external editor from Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:7096
+#: gnu/packages/perl.scm:7117
 msgid ""
 "This module provides the ability to supply some text to an\n"
 "external text editor, have it edited by the user, and retrieve the results."
 msgstr ""
 
-#: gnu/packages/perl.scm:7115
+#: gnu/packages/perl.scm:7136
 msgid "Create read-only scalars, arrays, hashes"
 msgstr ""
 
-#: gnu/packages/perl.scm:7116
+#: gnu/packages/perl.scm:7137
 msgid ""
 "This module provides a facility for creating non-modifiable\n"
 "variables in Perl.  This is useful for configuration files, headers, etc.  It\n"
@@ -15221,11 +14967,11 @@ msgid ""
 "variables that should not be changed."
 msgstr ""
 
-#: gnu/packages/perl.scm:7136
+#: gnu/packages/perl.scm:7157
 msgid "XS implementation for Ref::Util"
 msgstr ""
 
-#: gnu/packages/perl.scm:7137
+#: gnu/packages/perl.scm:7158
 msgid ""
 "@code{Ref::Util::XS} is the XS implementation of\n"
 "@code{Ref::Util}, which provides several functions to help identify references\n"
@@ -15233,13 +14979,13 @@ msgid ""
 "of @code{ref}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7155
+#: gnu/packages/perl.scm:7176
 msgid "Provide commonly requested regular expressions"
 msgstr ""
 
-#: gnu/packages/perl.scm:7157
+#: gnu/packages/perl.scm:7178
 msgid ""
-"This module exports a single hash (`%RE') that stores or generates\n"
+"This module exports a single hash (@code{%RE}) that stores or generates\n"
 "commonly needed regular expressions.  Patterns currently provided include:\n"
 "balanced parentheses and brackets, delimited text (with escapes), integers and\n"
 "floating-point numbers in any base (up to 36), comments in 44 languages,\n"
@@ -15247,11 +14993,11 @@ msgid ""
 "codes."
 msgstr ""
 
-#: gnu/packages/perl.scm:7181
+#: gnu/packages/perl.scm:7202
 msgid "Selection of general-utility regexp subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:7182
+#: gnu/packages/perl.scm:7203
 msgid ""
 "This package provides a selection of regular expression\n"
 "subroutines including @code{is_regexp}, @code{regexp_seen_evals},\n"
@@ -15259,29 +15005,29 @@ msgid ""
 "and @code{deserialize_regexp}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7207
+#: gnu/packages/perl.scm:7228
 msgid "Roles, as a slice of Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:7208
+#: gnu/packages/perl.scm:7229
 msgid "Role::Tiny is a minimalist role composition tool."
 msgstr ""
 
-#: gnu/packages/perl.scm:7239
+#: gnu/packages/perl.scm:7260
 msgid "Call isa, can, does, and DOES safely"
 msgstr ""
 
-#: gnu/packages/perl.scm:7240
+#: gnu/packages/perl.scm:7261
 msgid ""
 "This module allows you to call isa, can, does, and DOES\n"
 "safely on things that may not be objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:7258
+#: gnu/packages/perl.scm:7279
 msgid "Lexically-scoped resource management"
 msgstr "Gestion de ressources à portée lexicale"
 
-#: gnu/packages/perl.scm:7259
+#: gnu/packages/perl.scm:7280
 msgid ""
 "This module provides a convenient way to perform cleanup or\n"
 "other forms of resource management at the end of a scope.  It is particularly\n"
@@ -15292,39 +15038,39 @@ msgid ""
 "collector."
 msgstr ""
 
-#: gnu/packages/perl.scm:7282
+#: gnu/packages/perl.scm:7303
 msgid "Infinite sets"
 msgstr ""
 
-#: gnu/packages/perl.scm:7283
+#: gnu/packages/perl.scm:7304
 msgid "Set::Infinite is a set theory module for infinite sets."
 msgstr ""
 
-#: gnu/packages/perl.scm:7300
+#: gnu/packages/perl.scm:7321
 msgid "Manage sets of integers"
 msgstr ""
 
-#: gnu/packages/perl.scm:7301
+#: gnu/packages/perl.scm:7322
 msgid ""
 "@code{Set::IntSpan} manages sets of integers.  It is\n"
 "optimized for sets that have long runs of consecutive integers."
 msgstr ""
 
-#: gnu/packages/perl.scm:7322
+#: gnu/packages/perl.scm:7342
 msgid "Unordered collections of Perl Objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:7323
+#: gnu/packages/perl.scm:7343
 msgid ""
 "Set::Object provides efficient sets, unordered collections\n"
 "of Perl objects without duplicates for scalars and references."
 msgstr ""
 
-#: gnu/packages/perl.scm:7341
+#: gnu/packages/perl.scm:7361
 msgid "Set operations for Perl"
 msgstr "Opération ensemblistes pour Perl"
 
-#: gnu/packages/perl.scm:7342
+#: gnu/packages/perl.scm:7362
 msgid ""
 "The first priority of Set::Scalar is to be a convenient\n"
 "interface to sets (as in: unordered collections of Perl scalars).  While not\n"
@@ -15332,21 +15078,21 @@ msgid ""
 "compact."
 msgstr ""
 
-#: gnu/packages/perl.scm:7362
+#: gnu/packages/perl.scm:7382
 msgid "Sort arrays by one or multiple calculated keys"
 msgstr ""
 
-#: gnu/packages/perl.scm:7363
+#: gnu/packages/perl.scm:7383
 msgid ""
 "This Perl module provides various functions to quickly sort\n"
 "arrays by one or multiple calculated keys."
 msgstr ""
 
-#: gnu/packages/perl.scm:7381
+#: gnu/packages/perl.scm:7401
 msgid "Sort lexically, but sort numeral parts numerically"
 msgstr ""
 
-#: gnu/packages/perl.scm:7382
+#: gnu/packages/perl.scm:7402
 msgid ""
 "This module exports two functions, @code{nsort} and\n"
 "@code{ncmp}; they are used in implementing a \"natural sorting\" algorithm.\n"
@@ -15354,11 +15100,11 @@ msgid ""
 "word-characters are compared lexically."
 msgstr ""
 
-#: gnu/packages/perl.scm:7410
+#: gnu/packages/perl.scm:7430
 msgid "Classes for representing type constraints and coercion"
 msgstr ""
 
-#: gnu/packages/perl.scm:7411
+#: gnu/packages/perl.scm:7431
 msgid ""
 "The Specio distribution provides classes for representing type\n"
 "constraints and coercion, along with syntax sugar for declaring them.  Note that\n"
@@ -15369,11 +15115,11 @@ msgid ""
 "coerce values to that type."
 msgstr ""
 
-#: gnu/packages/perl.scm:7434
+#: gnu/packages/perl.scm:7454
 msgid "Spiffy Perl Interface Framework For You"
 msgstr ""
 
-#: gnu/packages/perl.scm:7435
+#: gnu/packages/perl.scm:7455
 msgid ""
 "Spiffy is a framework and methodology for doing object\n"
 "oriented (OO) programming in Perl.  Spiffy combines the best parts of\n"
@@ -15383,21 +15129,21 @@ msgid ""
 "other OO languages like Python, Ruby, Java and Perl 6."
 msgstr ""
 
-#: gnu/packages/perl.scm:7459
+#: gnu/packages/perl.scm:7479
 msgid "Collection of very basic statistics modules"
 msgstr "Collection de modules de statistiques très basiques"
 
-#: gnu/packages/perl.scm:7460
+#: gnu/packages/perl.scm:7480
 msgid ""
 "This package provides basic statistics functions like\n"
 "@code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7478
+#: gnu/packages/perl.scm:7498
 msgid "Temporary buffer to save bytes"
 msgstr ""
 
-#: gnu/packages/perl.scm:7479
+#: gnu/packages/perl.scm:7499
 msgid ""
 "Stream::Buffered is a buffer class to store arbitrary length\n"
 "of byte strings and then get a seekable filehandle once everything is\n"
@@ -15405,31 +15151,31 @@ msgid ""
 "on the length of the size."
 msgstr ""
 
-#: gnu/packages/perl.scm:7499
+#: gnu/packages/perl.scm:7519
 msgid "Turn on strict and make all warnings fatal"
 msgstr ""
 
-#: gnu/packages/perl.scm:7500
+#: gnu/packages/perl.scm:7520
 msgid ""
 "Strictures turns on strict and make all warnings fatal when\n"
 "run from within a source-controlled directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:7542
+#: gnu/packages/perl.scm:7560
 msgid "Camelcase and de-camelcase"
 msgstr ""
 
-#: gnu/packages/perl.scm:7543
+#: gnu/packages/perl.scm:7561
 msgid ""
 "This module may be used to convert from under_score text to\n"
 "CamelCase and back again."
 msgstr ""
 
-#: gnu/packages/perl.scm:7562
+#: gnu/packages/perl.scm:7580
 msgid "Backslash escapes, quoted phrase, word elision, etc."
 msgstr ""
 
-#: gnu/packages/perl.scm:7563
+#: gnu/packages/perl.scm:7581
 msgid ""
 "This module provides a flexible calling interface to some\n"
 "frequently-performed string conversion functions, including applying and\n"
@@ -15438,42 +15184,42 @@ msgid ""
 "removing double-quotes, and truncating to fit within a desired length."
 msgstr ""
 
-#: gnu/packages/perl.scm:7585
+#: gnu/packages/perl.scm:7603
 msgid "Rewrite strings based on a set of known prefixes"
 msgstr ""
 
-#: gnu/packages/perl.scm:7586
+#: gnu/packages/perl.scm:7604
 msgid ""
 "This module allows you to rewrite strings based on a set of\n"
 "known prefixes."
 msgstr ""
 
-#: gnu/packages/perl.scm:7605
+#: gnu/packages/perl.scm:7623
 msgid "String printing alternatives to printf"
 msgstr ""
 
-#: gnu/packages/perl.scm:7607
+#: gnu/packages/perl.scm:7625
 msgid ""
 "This module inserts values into (translated) strings.  It provides\n"
 "@code{printf} and @code{sprintf} alternatives via both an object-oriented and\n"
 "a functional interface."
 msgstr ""
 
-#: gnu/packages/perl.scm:7630
+#: gnu/packages/perl.scm:7648
 msgid "Sophisticated exporter for custom-built routines"
 msgstr ""
 
-#: gnu/packages/perl.scm:7632
+#: gnu/packages/perl.scm:7650
 msgid ""
 "Sub::Exporter provides a sophisticated alternative to Exporter.pm for\n"
 "custom-built routines."
 msgstr ""
 
-#: gnu/packages/perl.scm:7651
+#: gnu/packages/perl.scm:7669
 msgid "Only use Sub::Exporter if you need it"
 msgstr ""
 
-#: gnu/packages/perl.scm:7652
+#: gnu/packages/perl.scm:7670
 msgid ""
 "Sub::Exporter is an incredibly powerful module, but with\n"
 "that power comes great responsibility, as well as some runtime penalties.\n"
@@ -15483,21 +15229,21 @@ msgid ""
 "renaming exports, if they try to use them."
 msgstr ""
 
-#: gnu/packages/perl.scm:7674
+#: gnu/packages/perl.scm:7692
 msgid "Retrieve names of code references"
 msgstr ""
 
-#: gnu/packages/perl.scm:7675
+#: gnu/packages/perl.scm:7693
 msgid ""
 "Sub::Identify allows you to retrieve the real name of code\n"
 "references."
 msgstr ""
 
-#: gnu/packages/perl.scm:7695
+#: gnu/packages/perl.scm:7713
 msgid "Tool to inspect subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:7696
+#: gnu/packages/perl.scm:7714
 msgid ""
 "This package provides tools for inspecting subroutines\n"
 "in Perl."
@@ -15505,54 +15251,54 @@ msgstr ""
 "Ce paquet fournit des outils pour inspecter les sous-routines\n"
 "en Perl."
 
-#: gnu/packages/perl.scm:7715
+#: gnu/packages/perl.scm:7733
 msgid "Install subroutines into packages easily"
 msgstr ""
 
-#: gnu/packages/perl.scm:7717
+#: gnu/packages/perl.scm:7735
 msgid ""
 "Sub::Install makes it easy to install subroutines into packages without\n"
 "the unsightly mess of C<no strict> or typeglobs lying about where just anyone\n"
 "can see them."
 msgstr ""
 
-#: gnu/packages/perl.scm:7738
+#: gnu/packages/perl.scm:7756
 msgid "(Re)name a sub"
 msgstr ""
 
-#: gnu/packages/perl.scm:7739
+#: gnu/packages/perl.scm:7757
 msgid ""
 "Assigns a new name to referenced sub.  If package\n"
 "specification is omitted in the name, then the current package is used.  The\n"
 "return value is the sub."
 msgstr ""
 
-#: gnu/packages/perl.scm:7763
+#: gnu/packages/perl.scm:7780
 msgid "Efficient generation of subroutines via string eval"
 msgstr ""
 
-#: gnu/packages/perl.scm:7764
+#: gnu/packages/perl.scm:7781
 msgid ""
 "Sub::Quote provides an efficient generation of subroutines\n"
 "via string eval."
 msgstr ""
 
-#: gnu/packages/perl.scm:7782
+#: gnu/packages/perl.scm:7799
 msgid "Apparently run a function in a higher stack frame"
 msgstr ""
 
-#: gnu/packages/perl.scm:7783
+#: gnu/packages/perl.scm:7800
 msgid ""
 "Like Tcl's uplevel() function, but not quite so dangerous.\n"
 "The idea is just to fool caller().  All the really naughty bits of Tcl's\n"
 "uplevel() are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:7805
+#: gnu/packages/perl.scm:7822
 msgid "Control superclass method dispatching"
 msgstr ""
 
-#: gnu/packages/perl.scm:7807
+#: gnu/packages/perl.scm:7824
 msgid ""
 "When subclassing a class, you may occasionally want to dispatch control to\n"
 "the superclass---at least conditionally and temporarily.  This module provides\n"
@@ -15561,11 +15307,11 @@ msgid ""
 "support for run-time mix-ins and roles."
 msgstr ""
 
-#: gnu/packages/perl.scm:7828
+#: gnu/packages/perl.scm:7844
 msgid "Perl extension for generating SVG documents"
 msgstr ""
 
-#: gnu/packages/perl.scm:7829
+#: gnu/packages/perl.scm:7845
 msgid ""
 "SVG is a Perl module which generates a nested data structure\n"
 "containing the DOM representation of an SVG (Scalable Vector Graphics) image.\n"
@@ -15574,42 +15320,53 @@ msgid ""
 "animation content."
 msgstr ""
 
-#: gnu/packages/perl.scm:7850
+#: gnu/packages/perl.scm:7866
 msgid "Switch statement for Perl"
 msgstr "Commande switch pour Perl"
 
-#: gnu/packages/perl.scm:7851
+#: gnu/packages/perl.scm:7867
 msgid ""
 "Switch is a Perl module which implements a generalized case\n"
 "mechanism.  The module augments the standard Perl syntax with two new\n"
 "statements: @code{switch} and @code{case}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7898
+#: gnu/packages/perl.scm:7914
 msgid "Perl extension for getting CPU information"
 msgstr ""
 
-#: gnu/packages/perl.scm:7900
+#: gnu/packages/perl.scm:7916
 msgid ""
 "Sys::CPU is a module for counting the number of CPUs on a system, and\n"
 "determining their type and clock speed."
 msgstr ""
 
-#: gnu/packages/perl.scm:7920
+#: gnu/packages/perl.scm:7936
 msgid "Get full hostname in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:7921
+#: gnu/packages/perl.scm:7937
 msgid ""
 "Sys::Hostname::Long tries very hard to get the full hostname\n"
 "of a system."
 msgstr ""
 
-#: gnu/packages/perl.scm:7948
+#: gnu/packages/perl.scm:7956
+msgid "Access system calls that Perl doesn't normally provide access to"
+msgstr ""
+
+#: gnu/packages/perl.scm:7958
+msgid ""
+"Sys::Syscall allows one to use epoll and sendfile system calls from\n"
+"Perl.  Support is mostly Linux-only for now, but other syscalls/OSes are\n"
+"planned for the future."
+msgstr ""
+
+#: gnu/packages/perl.scm:7986
 msgid "Ensure that a platform has weaken support"
 msgstr ""
 
-#: gnu/packages/perl.scm:7949
+#: gnu/packages/perl.scm:7987
 msgid ""
 "One recurring problem in modules that use Scalar::Util's\n"
 "weaken function is that it is not present in the pure-perl variant.  If\n"
@@ -15619,11 +15376,11 @@ msgid ""
 "error encouraging the user to seek support."
 msgstr ""
 
-#: gnu/packages/perl.scm:7974
+#: gnu/packages/perl.scm:8012
 msgid "Template processing system for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:7975
+#: gnu/packages/perl.scm:8013
 msgid ""
 "The Template Toolkit is a collection of modules which\n"
 "implement an extensible template processing system.  It was originally\n"
@@ -15632,42 +15389,42 @@ msgid ""
 "documents: HTML, XML, POD, PostScript, LaTeX, and so on."
 msgstr ""
 
-#: gnu/packages/perl.scm:7998
+#: gnu/packages/perl.scm:8036
 msgid "Profiling for Template Toolkit"
 msgstr ""
 
-#: gnu/packages/perl.scm:7999
+#: gnu/packages/perl.scm:8037
 msgid ""
 "Template::Timer provides inline profiling of the template\n"
 "processing in Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:8019
+#: gnu/packages/perl.scm:8057
 msgid "Detect encoding of the current terminal"
 msgstr ""
 
-#: gnu/packages/perl.scm:8020
+#: gnu/packages/perl.scm:8058
 msgid ""
 "Term::Encoding is a simple module to detect the encoding of\n"
 "the current terminal expects in various ways."
 msgstr ""
 
-#: gnu/packages/perl.scm:8044
+#: gnu/packages/perl.scm:8082
 msgid "Progress meter on a standard terminal"
 msgstr ""
 
-#: gnu/packages/perl.scm:8045
+#: gnu/packages/perl.scm:8083
 msgid ""
 "Term::ProgressBar provides a simple progress bar on the\n"
 "terminal, to let the user know that something is happening, roughly how much\n"
 "stuff has been done, and maybe an estimate at how long remains."
 msgstr ""
 
-#: gnu/packages/perl.scm:8068
+#: gnu/packages/perl.scm:8106
 msgid "Progress meter if run interactively"
 msgstr ""
 
-#: gnu/packages/perl.scm:8069
+#: gnu/packages/perl.scm:8107
 msgid ""
 "Term::ProgressBar is a wonderful module for showing progress\n"
 "bars on the terminal.  This module acts very much like that module when it is\n"
@@ -15675,21 +15432,21 @@ msgid ""
 "a cron job) then it does not show the progress bar."
 msgstr ""
 
-#: gnu/packages/perl.scm:8091
+#: gnu/packages/perl.scm:8129
 msgid "Simple progress bars"
 msgstr ""
 
-#: gnu/packages/perl.scm:8092
+#: gnu/packages/perl.scm:8130
 msgid ""
 "Term::ProgressBar::Simple tells you how much work has been\n"
 "done, how much is left to do, and estimate how long it will take."
 msgstr ""
 
-#: gnu/packages/perl.scm:8110
+#: gnu/packages/perl.scm:8148
 msgid "Simple terminal control"
 msgstr "Contrôle de terminal simple"
 
-#: gnu/packages/perl.scm:8111
+#: gnu/packages/perl.scm:8149
 msgid ""
 "This module, ReadKey, provides ioctl control for terminals\n"
 "so the input modes can be changed (thus allowing reads of a single character\n"
@@ -15698,11 +15455,11 @@ msgid ""
 "screen size, and retrieval/modification of the control characters."
 msgstr ""
 
-#: gnu/packages/perl.scm:8136
+#: gnu/packages/perl.scm:8174
 msgid "Retrieve terminal size"
 msgstr ""
 
-#: gnu/packages/perl.scm:8137
+#: gnu/packages/perl.scm:8175
 msgid ""
 "This is a unified interface to retrieve terminal size.  It\n"
 "loads one module of a list of known alternatives, each implementing some way\n"
@@ -15710,62 +15467,62 @@ msgid ""
 "the job on behalf of @code{Term::Size::Any}."
 msgstr ""
 
-#: gnu/packages/perl.scm:8157
+#: gnu/packages/perl.scm:8194
 msgid "Perl extension for retrieving terminal size (Perl version)"
 msgstr ""
 
-#: gnu/packages/perl.scm:8158
+#: gnu/packages/perl.scm:8195
 msgid ""
 "This is yet another implementation of @code{Term::Size}.\n"
 "Now in pure Perl, with the exception of a C probe run at build time."
 msgstr ""
 
-#: gnu/packages/perl.scm:8178
+#: gnu/packages/perl.scm:8215
 msgid "Format a header and rows into a table"
 msgstr ""
 
-#: gnu/packages/perl.scm:8179
+#: gnu/packages/perl.scm:8216
 msgid ""
 "This module is able to generically format rows of data\n"
 "into tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:8198
+#: gnu/packages/perl.scm:8234
 msgid "Align text"
 msgstr ""
 
-#: gnu/packages/perl.scm:8199
+#: gnu/packages/perl.scm:8235
 msgid ""
 "Text::Aligner exports a single function, align(), which is\n"
 "used to justify strings to various alignment styles."
 msgstr ""
 
-#: gnu/packages/perl.scm:8217
+#: gnu/packages/perl.scm:8253
 msgid "Extract delimited text sequences from strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:8218
+#: gnu/packages/perl.scm:8254
 msgid ""
 "The Text::Balanced module can be used to extract delimited\n"
 "text sequences from strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:8236
+#: gnu/packages/perl.scm:8271
 msgid "Manipulate comma-separated values"
 msgstr ""
 
-#: gnu/packages/perl.scm:8237
+#: gnu/packages/perl.scm:8272
 msgid ""
 "Text::CSV provides facilities for the composition and\n"
 "decomposition of comma-separated values.  An instance of the Text::CSV class\n"
 "can combine fields into a CSV string and parse a CSV string into fields."
 msgstr ""
 
-#: gnu/packages/perl.scm:8256
+#: gnu/packages/perl.scm:8290
 msgid "Rountines for manipulating CSV files"
 msgstr ""
 
-#: gnu/packages/perl.scm:8257
+#: gnu/packages/perl.scm:8291
 msgid ""
 "@code{Text::CSV_XS} provides facilities for the composition\n"
 "and decomposition of comma-separated values.  An instance of the\n"
@@ -15775,11 +15532,11 @@ msgid ""
 "and escapes."
 msgstr ""
 
-#: gnu/packages/perl.scm:8281
+#: gnu/packages/perl.scm:8315
 msgid "Perform diffs on files and record sets"
 msgstr ""
 
-#: gnu/packages/perl.scm:8282
+#: gnu/packages/perl.scm:8316
 msgid ""
 "Text::Diff provides a basic set of services akin to the GNU\n"
 "diff utility.  It is not anywhere near as feature complete as GNU diff, but it\n"
@@ -15788,44 +15545,44 @@ msgid ""
 "generally slower on larger files."
 msgstr ""
 
-#: gnu/packages/perl.scm:8307
+#: gnu/packages/perl.scm:8341
 msgid "Various subroutines to format text"
 msgstr ""
 
-#: gnu/packages/perl.scm:8308
+#: gnu/packages/perl.scm:8342
 msgid ""
 "This package provides functions to format text in various\n"
 "ways like centering, paragraphing, and converting tabs to spaces and spaces\n"
 "to tabs."
 msgstr ""
 
-#: gnu/packages/perl.scm:8328
+#: gnu/packages/perl.scm:8362
 msgid "Match globbing patterns against text"
 msgstr ""
 
-#: gnu/packages/perl.scm:8329
+#: gnu/packages/perl.scm:8363
 msgid ""
 "Text::Glob implements glob(3) style matching that can be\n"
 "used to match against text, rather than fetching names from a file system.  If\n"
 "you want to do full file globbing use the File::Glob module instead."
 msgstr ""
 
-#: gnu/packages/perl.scm:8352
+#: gnu/packages/perl.scm:8386
 msgid "Fast, middleweight template engine"
 msgstr ""
 
-#: gnu/packages/perl.scm:8354
+#: gnu/packages/perl.scm:8388
 msgid ""
 "Text::NeatTemplate provides a simple, middleweight but fast\n"
 "template engine, for when you need speed rather than complex features,\n"
 "yet need more features than simple variable substitution."
 msgstr ""
 
-#: gnu/packages/perl.scm:8373
+#: gnu/packages/perl.scm:8407
 msgid "Convert between Roman and Arabic algorisms"
 msgstr ""
 
-#: gnu/packages/perl.scm:8374
+#: gnu/packages/perl.scm:8408
 msgid ""
 "This package provides functions to convert between Roman and\n"
 "Arabic algorisms.  It supports both conventional Roman algorisms (which range\n"
@@ -15833,27 +15590,27 @@ msgid ""
 "algorism to indicate multiplication by 1000."
 msgstr ""
 
-#: gnu/packages/perl.scm:8394
+#: gnu/packages/perl.scm:8427
 msgid "Simple ASCII tables"
 msgstr ""
 
-#: gnu/packages/perl.scm:8395
+#: gnu/packages/perl.scm:8428
 msgid "Text::SimpleTable draws simple ASCII tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:8416
+#: gnu/packages/perl.scm:8449
 msgid "Organize Data in Tables"
 msgstr ""
 
-#: gnu/packages/perl.scm:8417
+#: gnu/packages/perl.scm:8450
 msgid "Text::Table renders plaintext tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:8438
+#: gnu/packages/perl.scm:8474
 msgid "Expand template text with embedded Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:8440
+#: gnu/packages/perl.scm:8476
 msgid ""
 "This is a library for generating letters, building HTML pages, or\n"
 "filling in templates generally.  A template is a piece of text that has little\n"
@@ -15861,11 +15618,11 @@ msgid ""
 "evaluate the little programs and replace them with their values."
 msgstr ""
 
-#: gnu/packages/perl.scm:8460
+#: gnu/packages/perl.scm:8495
 msgid "Provide plain ASCII transliterations of Unicode text"
 msgstr ""
 
-#: gnu/packages/perl.scm:8461
+#: gnu/packages/perl.scm:8496
 msgid ""
 "Text::Unidecode provides a function, unidecode(...) that\n"
 "takes Unicode data and tries to represent it in US-ASCII characters (i.e., the\n"
@@ -15875,29 +15632,29 @@ msgid ""
 "system."
 msgstr ""
 
-#: gnu/packages/perl.scm:8482
+#: gnu/packages/perl.scm:8517
 msgid "Perl interpreter-based threads"
 msgstr ""
 
-#: gnu/packages/perl.scm:8483
+#: gnu/packages/perl.scm:8518
 msgid "This module exposes interpreter threads to the Perl level."
 msgstr ""
 
-#: gnu/packages/perl.scm:8506
+#: gnu/packages/perl.scm:8541
 msgid "Role for classes that can be thrown"
 msgstr ""
 
-#: gnu/packages/perl.scm:8507
+#: gnu/packages/perl.scm:8542
 msgid ""
 "Throwable is a role for classes that are meant to be thrown\n"
 "as exceptions to standard program flow."
 msgstr ""
 
-#: gnu/packages/perl.scm:8524
+#: gnu/packages/perl.scm:8559
 msgid "Perl script tidier"
 msgstr ""
 
-#: gnu/packages/perl.scm:8525
+#: gnu/packages/perl.scm:8560
 msgid ""
 "This package contains a Perl script which indents and\n"
 "reformats Perl scripts to make them easier to read.   The formatting can be\n"
@@ -15905,21 +15662,21 @@ msgid ""
 "approximately follow the suggestions in the Perl Style Guide."
 msgstr ""
 
-#: gnu/packages/perl.scm:8545
+#: gnu/packages/perl.scm:8580
 msgid "Cycle through a list of values"
 msgstr ""
 
-#: gnu/packages/perl.scm:8546
+#: gnu/packages/perl.scm:8581
 msgid ""
 "You use @code{Tie::Cycle} to go through a list over and over\n"
 "again.  Once you get to the end of the list, you go back to the beginning."
 msgstr ""
 
-#: gnu/packages/perl.scm:8565
+#: gnu/packages/perl.scm:8600
 msgid "Ordered associative arrays for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:8566
+#: gnu/packages/perl.scm:8601
 msgid ""
 "This Perl module implements Perl hashes that preserve the\n"
 "order in which the hash elements were added.  The order is not affected when\n"
@@ -15928,53 +15685,53 @@ msgid ""
 "operations can also be performed on the IxHash."
 msgstr ""
 
-#: gnu/packages/perl.scm:8589
+#: gnu/packages/perl.scm:8624
 msgid "Tie to an existing Perl object"
 msgstr ""
 
-#: gnu/packages/perl.scm:8590
+#: gnu/packages/perl.scm:8625
 msgid ""
 "This class provides a tie constructor that returns the\n"
 "object it was given as it's first argument.  This way side effects of calling\n"
 "$object->TIEHASH are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:8613
+#: gnu/packages/perl.scm:8648
 msgid "English expression of durations"
 msgstr ""
 
-#: gnu/packages/perl.scm:8614
+#: gnu/packages/perl.scm:8649
 msgid ""
 "This module provides functions for expressing durations in\n"
 "rounded or exact terms."
 msgstr ""
 
-#: gnu/packages/perl.scm:8636
+#: gnu/packages/perl.scm:8670
 msgid "Parse time duration strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:8637
+#: gnu/packages/perl.scm:8671
 msgid ""
 "Time::Duration::Parse is a module to parse human readable\n"
 "duration strings like \"2 minutes\" and \"3 seconds\" to seconds."
 msgstr ""
 
-#: gnu/packages/perl.scm:8655
+#: gnu/packages/perl.scm:8689
 msgid "High resolution alarm, sleep, gettimeofday, interval timers"
 msgstr ""
 
-#: gnu/packages/perl.scm:8656
+#: gnu/packages/perl.scm:8690
 msgid ""
 "This package implements @code{usleep}, @code{ualarm}, and\n"
 "@code{gettimeofday} for Perl, as well as wrappers to implement @code{time},\n"
 "@code{sleep}, and @code{alarm} that know about non-integral seconds."
 msgstr ""
 
-#: gnu/packages/perl.scm:8675
+#: gnu/packages/perl.scm:8709
 msgid "Efficiently compute time from local and GMT time"
 msgstr ""
 
-#: gnu/packages/perl.scm:8676
+#: gnu/packages/perl.scm:8710
 msgid ""
 "This module provides functions that are the inverse of\n"
 "built-in perl functions localtime() and gmtime().  They accept a date as a\n"
@@ -15982,11 +15739,11 @@ msgid ""
 "the system epoch."
 msgstr ""
 
-#: gnu/packages/perl.scm:8696
+#: gnu/packages/perl.scm:8730
 msgid "Object-Oriented time objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:8698
+#: gnu/packages/perl.scm:8732
 msgid ""
 "This module replaces the standard @code{localtime} and @code{gmtime}\n"
 "functions with implementations that return objects.  It does so in a\n"
@@ -15994,62 +15751,62 @@ msgid ""
 "still work as expected."
 msgstr ""
 
-#: gnu/packages/perl.scm:8718
+#: gnu/packages/perl.scm:8752
 msgid "Date parsing/formatting subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:8719
+#: gnu/packages/perl.scm:8753
 msgid ""
 "This module provides routines for parsing date string into\n"
 "time values and formatting dates into ASCII strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:8741
+#: gnu/packages/perl.scm:8775
 msgid "Shift and scale time"
 msgstr ""
 
-#: gnu/packages/perl.scm:8742
+#: gnu/packages/perl.scm:8776
 msgid ""
 "This module allows you to speed up your sleep(), alarm(),\n"
 "and time() calls."
 msgstr ""
 
-#: gnu/packages/perl.scm:8765
+#: gnu/packages/perl.scm:8798
 msgid "Simple tree object"
 msgstr ""
 
-#: gnu/packages/perl.scm:8766
+#: gnu/packages/perl.scm:8799
 msgid ""
 "This module in a fully object-oriented implementation of a\n"
 "simple n-ary tree."
 msgstr ""
 
-#: gnu/packages/perl.scm:8790
+#: gnu/packages/perl.scm:8822
 msgid "Factory object for dispensing Visitor objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:8791
+#: gnu/packages/perl.scm:8823
 msgid ""
 "This module is a factory for dispensing\n"
 "Tree::Simple::Visitor::* objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:8809
+#: gnu/packages/perl.scm:8841
 msgid "Minimal try/catch with proper preservation of $@@"
 msgstr ""
 
-#: gnu/packages/perl.scm:8810
+#: gnu/packages/perl.scm:8842
 msgid ""
 "This module provides bare bones try/catch/finally statements\n"
 "that are designed to minimize common mistakes with eval blocks, and nothing\n"
 "else."
 msgstr ""
 
-#: gnu/packages/perl.scm:8835
+#: gnu/packages/perl.scm:8866
 msgid "Tie a variable to a type constraint"
 msgstr ""
 
-#: gnu/packages/perl.scm:8836
+#: gnu/packages/perl.scm:8867
 msgid ""
 "This module exports a single function: @code{ttie}.  It ties\n"
 "a variable to a type constraint, ensuring that whatever values stored in the\n"
@@ -16058,11 +15815,11 @@ msgid ""
 "variable conform."
 msgstr ""
 
-#: gnu/packages/perl.scm:8869
+#: gnu/packages/perl.scm:8899
 msgid "Tiny, yet Moo(se)-compatible type constraint"
 msgstr ""
 
-#: gnu/packages/perl.scm:8870
+#: gnu/packages/perl.scm:8900
 msgid ""
 "@code{Type::Tiny} is a small class for writing type\n"
 "constraints, inspired by Moose's type constraint API.  It has only one\n"
@@ -16071,11 +15828,11 @@ msgid ""
 "be used with Moose, Mouse and Moo (or none of the above)."
 msgstr ""
 
-#: gnu/packages/perl.scm:8891
+#: gnu/packages/perl.scm:8920
 msgid "Provides an XS boost for some of Type::Tiny's built-in type constraints"
 msgstr ""
 
-#: gnu/packages/perl.scm:8892
+#: gnu/packages/perl.scm:8921
 msgid ""
 "This module is optionally used by @code{Type::Tiny} to\n"
 "provide faster, C-based implementations of some type constraints.  This\n"
@@ -16083,11 +15840,11 @@ msgid ""
 "so other data validation frameworks might also consider using it."
 msgstr ""
 
-#: gnu/packages/perl.scm:8917
+#: gnu/packages/perl.scm:8945
 msgid "Types and coercions for Moose and Moo"
 msgstr ""
 
-#: gnu/packages/perl.scm:8918
+#: gnu/packages/perl.scm:8946
 msgid ""
 "This module provides @code{Path::Tiny} types for Moose, Moo,\n"
 "etc.  It handles two important types of coercion: coercing objects with\n"
@@ -16095,29 +15852,29 @@ msgid ""
 "to ensure that files or directories exist."
 msgstr ""
 
-#: gnu/packages/perl.scm:8940
+#: gnu/packages/perl.scm:8968
 msgid "Data types for common serialisation formats"
 msgstr ""
 
-#: gnu/packages/perl.scm:8941
+#: gnu/packages/perl.scm:8969
 msgid ""
 "This module provides some extra datatypes that are used by\n"
 "common serialisation formats such as JSON or CBOR."
 msgstr ""
 
-#: gnu/packages/perl.scm:8968
+#: gnu/packages/perl.scm:8996
 msgid "Unicode normalization forms"
 msgstr ""
 
-#: gnu/packages/perl.scm:8969
+#: gnu/packages/perl.scm:8997
 msgid "This Perl module provides Unicode normalization forms."
 msgstr ""
 
-#: gnu/packages/perl.scm:8998
+#: gnu/packages/perl.scm:9025
 msgid "Unicode collation algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:8999
+#: gnu/packages/perl.scm:9026
 msgid ""
 "This package provides tools for sorting and comparing\n"
 "Unicode data."
@@ -16125,63 +15882,63 @@ msgstr ""
 "Ce paquet fournit des outils pour trier et comparer des\n"
 "données Unicode."
 
-#: gnu/packages/perl.scm:9020
+#: gnu/packages/perl.scm:9047
 msgid "Unicode line breaking algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:9022
+#: gnu/packages/perl.scm:9049
 msgid ""
 "@code{Unicode::LineBreak} implements the line breaking algorithm\n"
 "described in Unicode Standard Annex #14.  The @code{East_Asian_Width} property\n"
 "defined by Annex #11 is used to determine breaking positions."
 msgstr ""
 
-#: gnu/packages/perl.scm:9045
+#: gnu/packages/perl.scm:9075
 msgid "Encoding and decoding of UTF-8 encoding form"
 msgstr ""
 
-#: gnu/packages/perl.scm:9047
+#: gnu/packages/perl.scm:9077
 msgid ""
 "This module provides functions to encode and decode UTF-8 encoding form\n"
 "as specified by Unicode and ISO/IEC 10646:2011."
 msgstr ""
 
-#: gnu/packages/perl.scm:9065
+#: gnu/packages/perl.scm:9095
 msgid "UNIVERSAL::can() reimplementation"
 msgstr ""
 
-#: gnu/packages/perl.scm:9066
+#: gnu/packages/perl.scm:9096
 msgid ""
 "This module attempts to work around people calling\n"
 "UNIVERSAL::can() as a function, which it is not."
 msgstr ""
 
-#: gnu/packages/perl.scm:9086
+#: gnu/packages/perl.scm:9116
 msgid "UNIVERSAL::isa() reimplementation"
 msgstr ""
 
-#: gnu/packages/perl.scm:9087
+#: gnu/packages/perl.scm:9117
 msgid ""
 "This module attempts to recover from people calling\n"
 "UNIVERSAL::isa as a function."
 msgstr ""
 
-#: gnu/packages/perl.scm:9106
+#: gnu/packages/perl.scm:9136
 msgid "Require modules from a variable"
 msgstr ""
 
-#: gnu/packages/perl.scm:9107
+#: gnu/packages/perl.scm:9137
 msgid ""
 "This module lets you require other modules where the module\n"
 "name is in a variable, something you can't do with the @code{require}\n"
 "built-in."
 msgstr ""
 
-#: gnu/packages/perl.scm:9126
+#: gnu/packages/perl.scm:9156
 msgid "Associate user-defined magic to variables from Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:9127
+#: gnu/packages/perl.scm:9157
 msgid ""
 "Magic is Perl's way of enhancing variables.  This mechanism\n"
 "lets the user add extra data to any variable and hook syntactical\n"
@@ -16190,11 +15947,11 @@ msgid ""
 "having to write a single line of XS."
 msgstr ""
 
-#: gnu/packages/perl.scm:9150
+#: gnu/packages/perl.scm:9180
 msgid "Easily generate well-formed, namespace-aware XML"
 msgstr ""
 
-#: gnu/packages/perl.scm:9151
+#: gnu/packages/perl.scm:9181
 msgid ""
 "@code{XML::Writer} is a simple Perl module for writing XML\n"
 "documents: it takes care of constructing markup and escaping data correctly.\n"
@@ -16204,11 +15961,11 @@ msgid ""
 "attribute names."
 msgstr ""
 
-#: gnu/packages/perl.scm:9178
+#: gnu/packages/perl.scm:9208
 msgid "Opaque, extensible XS pointer backed objects using sv_magic"
 msgstr ""
 
-#: gnu/packages/perl.scm:9180
+#: gnu/packages/perl.scm:9210
 msgid ""
 "This way of associating structs with Perl space objects is designed to\n"
 "supersede Perl's builtin @code{T_PTROBJ} with something that is extensible\n"
@@ -16216,62 +15973,62 @@ msgid ""
 "neither visible nor modifiable from Perl space)."
 msgstr ""
 
-#: gnu/packages/perl.scm:9202
+#: gnu/packages/perl.scm:9232
 msgid "YAML for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:9203
+#: gnu/packages/perl.scm:9233
 msgid ""
 "The YAML.pm module implements a YAML Loader and Dumper based\n"
 "on the YAML 1.0 specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:9225
+#: gnu/packages/perl.scm:9254
 msgid "Perl YAML Serialization using XS and libyaml"
 msgstr ""
 
-#: gnu/packages/perl.scm:9227
+#: gnu/packages/perl.scm:9256
 msgid ""
 "@code{YAML::XS} is a Perl XS binding to libyaml which offers Perl the\n"
 "best YAML support to date."
 msgstr ""
 
-#: gnu/packages/perl.scm:9250
+#: gnu/packages/perl.scm:9279
 msgid "Read/Write YAML files"
 msgstr ""
 
-#: gnu/packages/perl.scm:9251
+#: gnu/packages/perl.scm:9280
 msgid ""
 "YAML::Tiny is a perl class for reading and writing\n"
 "YAML-style files, written with as little code as possible, reducing load time\n"
 "and memory overhead."
 msgstr ""
 
-#: gnu/packages/perl.scm:9275
+#: gnu/packages/perl.scm:9304
 msgid "Generate recursive-descent parsers"
 msgstr ""
 
-#: gnu/packages/perl.scm:9277
+#: gnu/packages/perl.scm:9306
 msgid ""
 "@code{Parse::RecDescent} can incrementally generate top-down\n"
 "recursive-descent text parsers from simple yacc-like grammar specifications."
 msgstr ""
 
-#: gnu/packages/perl.scm:9297
+#: gnu/packages/perl.scm:9326
 msgid "Generate and use LALR parsers"
 msgstr ""
 
-#: gnu/packages/perl.scm:9298
+#: gnu/packages/perl.scm:9327
 msgid ""
 "This package compiles yacc-like @dfn{Look Ahead LR} (LALR)\n"
 "grammars to generate Perl object oriented parser modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:9324
+#: gnu/packages/perl.scm:9353
 msgid "Distribution metadata for a CPAN dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:9325
+#: gnu/packages/perl.scm:9354
 msgid ""
 "Software distributions released to the CPAN include a\n"
 "META.json or, for older distributions, META.yml, which describes the\n"
@@ -16282,11 +16039,11 @@ msgid ""
 "methods for interrogating that data."
 msgstr ""
 
-#: gnu/packages/perl.scm:9348
+#: gnu/packages/perl.scm:9377
 msgid "Set of version requirements for a CPAN dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:9349
+#: gnu/packages/perl.scm:9378
 msgid ""
 "A CPAN::Meta::Requirements object models a set of version\n"
 "constraints like those specified in the META.yml or META.json files in CPAN\n"
@@ -16295,22 +16052,22 @@ msgid ""
 "representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:9372
+#: gnu/packages/perl.scm:9401
 msgid "Read and write a subset of YAML for CPAN Meta files"
 msgstr ""
 
-#: gnu/packages/perl.scm:9373
+#: gnu/packages/perl.scm:9402
 msgid ""
 "This module implements a subset of the YAML specification\n"
 "for use in reading and writing CPAN metadata files like META.yml and\n"
 "MYMETA.yml."
 msgstr ""
 
-#: gnu/packages/perl.scm:9394
+#: gnu/packages/perl.scm:9423
 msgid "Build and install Perl modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:9395
+#: gnu/packages/perl.scm:9424
 msgid ""
 "@code{Module::Build} is a system for building, testing, and\n"
 "installing Perl modules; it used to be part of Perl itself until version 5.22,\n"
@@ -16321,21 +16078,21 @@ msgid ""
 "system---most of the @code{Module::Build} code is pure-Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:9421
+#: gnu/packages/perl.scm:9450
 msgid "Parse META.yml and META.json CPAN metadata files"
 msgstr ""
 
-#: gnu/packages/perl.scm:9422
+#: gnu/packages/perl.scm:9451
 msgid ""
 "Parse::CPAN::Meta is a parser for META.json and META.yml\n"
 "files, using JSON::PP and/or CPAN::Meta::YAML."
 msgstr ""
 
-#: gnu/packages/perl.scm:9440
+#: gnu/packages/perl.scm:9469
 msgid "Common Scalar and List utility subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:9441
+#: gnu/packages/perl.scm:9470
 msgid ""
 "This package contains a selection of subroutines that people\n"
 "have expressed would be nice to have in the perl core, but the usage would not\n"
@@ -16343,39 +16100,39 @@ msgid ""
 "such that being individual extensions would be wasteful."
 msgstr ""
 
-#: gnu/packages/perl.scm:9465
+#: gnu/packages/perl.scm:9494
 msgid "Cross-platform functions emulating common shell commands"
 msgstr ""
 
-#: gnu/packages/perl.scm:9467
+#: gnu/packages/perl.scm:9496
 msgid "Shell::Command is a thin wrapper around ExtUtils::Command."
 msgstr ""
 
-#: gnu/packages/perl.scm:9494
+#: gnu/packages/perl.scm:9523
 msgid "Object-oriented File::Find replacement in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:9495
+#: gnu/packages/perl.scm:9524
 msgid ""
 "File::Find::Object is an object-oriented\n"
 "File::Find replacement in Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:9524
+#: gnu/packages/perl.scm:9552
 msgid "Alternative interface to File::Find::Object"
 msgstr ""
 
-#: gnu/packages/perl.scm:9525
+#: gnu/packages/perl.scm:9553
 msgid ""
 "File::Find::Object::Rule is an alternative Perl\n"
 "interface to File::Find::Object."
 msgstr ""
 
-#: gnu/packages/perl.scm:9546
+#: gnu/packages/perl.scm:9574
 msgid "Wrapper for @code{File::Find} ala @code{find(1)}"
 msgstr ""
 
-#: gnu/packages/perl.scm:9548
+#: gnu/packages/perl.scm:9576
 msgid ""
 "@code{File::Find} is great, but constructing the wanted routine can\n"
 "sometimes be a pain.  @code{File::Finder} provides a wanted-writer, using\n"
@@ -16390,11 +16147,11 @@ msgid ""
 "used as the head of many different sequences."
 msgstr ""
 
-#: gnu/packages/perl.scm:9577
+#: gnu/packages/perl.scm:9605
 msgid "TTF font support for Perl"
 msgstr "Support des polices TTF pour Perl"
 
-#: gnu/packages/perl.scm:9578
+#: gnu/packages/perl.scm:9606
 msgid ""
 "This package provides a Perl module for TrueType/OpenType\n"
 "font hacking.  It supports reading, processing and writing of the following\n"
@@ -16403,22 +16160,22 @@ msgid ""
 "prop, vhea, vmtx and the reading and writing of all other table types."
 msgstr ""
 
-#: gnu/packages/perl.scm:9616
+#: gnu/packages/perl.scm:9644
 msgid "Collection of Perl modules for time/date manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:9617
+#: gnu/packages/perl.scm:9645
 msgid ""
 "Provides several perl modules for date/time manipulation:\n"
 "@code{Time::CTime.pm}, @code{Time::JulianDay.pm}, @code{Time::ParseDate.pm},\n"
 "@code{Time::Timezone.pm}, and @code{Time::DaysInMonth.pm}."
 msgstr ""
 
-#: gnu/packages/perl.scm:9646
+#: gnu/packages/perl.scm:9674
 msgid "Perl library for testing if a time() is in a specific period"
 msgstr ""
 
-#: gnu/packages/perl.scm:9647
+#: gnu/packages/perl.scm:9675
 msgid ""
 "This Perl library provides a function which tells whether a\n"
 "specific time falls within a specified time period.  Its syntax for specifying\n"
@@ -16428,11 +16185,11 @@ msgid ""
 "1998\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:9679
+#: gnu/packages/perl.scm:9706
 msgid "Iterative, recursive file finder"
 msgstr ""
 
-#: gnu/packages/perl.scm:9680
+#: gnu/packages/perl.scm:9707
 msgid ""
 "Path::Iterator::Rule iterates over files and directories to\n"
 "identify ones matching a user-defined set of rules.  The API is based heavily\n"
@@ -16459,11 +16216,11 @@ msgid ""
 "arduous to type for one-liners."
 msgstr ""
 
-#: gnu/packages/perl.scm:9720
+#: gnu/packages/perl.scm:9747
 msgid "Include constants from POD"
 msgstr ""
 
-#: gnu/packages/perl.scm:9721
+#: gnu/packages/perl.scm:9748
 msgid ""
 "This module allows you to specify those constants that\n"
 "should be documented in your POD, and pull them out a run time in a fairly\n"
@@ -16475,96 +16232,106 @@ msgid ""
 "(or it can't find %INC{caller()})."
 msgstr ""
 
-#: gnu/packages/perl.scm:9748
+#: gnu/packages/perl.scm:9774
 msgid "Collection of regexp patterns"
 msgstr ""
 
-#: gnu/packages/perl.scm:9749
+#: gnu/packages/perl.scm:9775
 msgid ""
 "Regexp::Pattern is a convention for organizing reusable\n"
 "regexp patterns in modules."
 msgstr ""
 
-#: gnu/packages/photo.scm:88
+#: gnu/packages/perl.scm:9799
+msgid "Parse Lisp S-Expressions into Perl data structures"
+msgstr ""
+
+#: gnu/packages/perl.scm:9800
+msgid ""
+"Data::SExpression parses Lisp S-Expressions into Perl data\n"
+"structures."
+msgstr ""
+
+#: gnu/packages/photo.scm:89
 msgid "Raw image decoder"
 msgstr ""
 
-#: gnu/packages/photo.scm:90
+#: gnu/packages/photo.scm:91
 msgid ""
 "LibRaw is a library for reading RAW files obtained from digital photo\n"
 "cameras (CRW/CR2, NEF, RAF, DNG, and others)."
 msgstr ""
 
-#: gnu/packages/photo.scm:125
+#: gnu/packages/photo.scm:126
 msgid "Read and manipulate EXIF data in digital photographs"
 msgstr ""
 
-#: gnu/packages/photo.scm:127
+#: gnu/packages/photo.scm:128
 msgid ""
 "The libexif C library allows applications to read, edit, and save EXIF\n"
 "data as produced by digital cameras."
 msgstr ""
 
-#: gnu/packages/photo.scm:153
+#: gnu/packages/photo.scm:154
 msgid "Accessing digital cameras"
 msgstr ""
 
-#: gnu/packages/photo.scm:155
+#: gnu/packages/photo.scm:156
 msgid ""
 "This is the library backend for gphoto2.  It contains the code for PTP,\n"
 "MTP, and other vendor specific protocols for controlling and transferring data\n"
 "from digital cameras."
 msgstr ""
 
-#: gnu/packages/photo.scm:197
+#: gnu/packages/photo.scm:198
 msgid "Command-line tools to access digital cameras"
 msgstr ""
 
-#: gnu/packages/photo.scm:199
+#: gnu/packages/photo.scm:200
 msgid ""
 "Gphoto2 is a set of command line utilities for manipulating a large\n"
 "number of different digital cameras.  Through libgphoto2, it supports PTP,\n"
 "MTP, and much more."
 msgstr ""
 
-#: gnu/packages/photo.scm:232
+#: gnu/packages/photo.scm:240
 msgid "Program and Perl library to manipulate EXIF and other metadata"
 msgstr ""
 
-#: gnu/packages/photo.scm:233
+#: gnu/packages/photo.scm:241
 msgid ""
 "This package provides the @code{exiftool} command and the\n"
 "@code{Image::ExifTool} Perl library to manipulate EXIF tags of digital images\n"
 "and a wide variety of other metadata."
 msgstr ""
 
-#: gnu/packages/photo.scm:257
+#: gnu/packages/photo.scm:265
 msgid "Library for panoramic images"
 msgstr "Bibliothèque de d'images panoramiques"
 
-#: gnu/packages/photo.scm:259
+#: gnu/packages/photo.scm:267
 msgid ""
 "The libpano13 package contains the backend library written by the\n"
 "Panorama Tools project for building panoramic images from a set of\n"
 "overlapping images, as well as some command line tools."
 msgstr ""
 
-#: gnu/packages/photo.scm:303
+#: gnu/packages/photo.scm:311
 msgid "Tools for combining and blending images"
 msgstr "Outils de combinaison et mélange d'images"
 
-#: gnu/packages/photo.scm:305
+#: gnu/packages/photo.scm:313
 msgid ""
 "Enblend blends away the seams in a panoramic image mosaic using a\n"
 "multi-resolution spline.  Enfuse merges different exposures of the same\n"
 "scene to produce an image that looks much like a tone-mapped image."
 msgstr ""
 
-#: gnu/packages/photo.scm:336
+#: gnu/packages/photo.scm:344
 msgid "Library to correct optical lens defects with a lens database"
 msgstr ""
 
-#: gnu/packages/photo.scm:337
+#: gnu/packages/photo.scm:345
 msgid ""
 "Digital photographs are not ideal.  Of course, the better is\n"
 "your camera, the better the results will be, but in any case if you look\n"
@@ -16578,11 +16345,11 @@ msgid ""
 "photographic equipment."
 msgstr ""
 
-#: gnu/packages/photo.scm:413
+#: gnu/packages/photo.scm:420
 msgid "Virtual lighttable and darkroom for photographers"
 msgstr ""
 
-#: gnu/packages/photo.scm:414
+#: gnu/packages/photo.scm:421
 msgid ""
 "Darktable is a photography workflow application and RAW\n"
 "developer.  It manages your digital negatives in a database, lets you view\n"
@@ -16590,22 +16357,22 @@ msgid ""
 "and enhance them."
 msgstr ""
 
-#: gnu/packages/photo.scm:485
+#: gnu/packages/photo.scm:492
 msgid "Panorama photo stitcher"
 msgstr ""
 
-#: gnu/packages/photo.scm:487
+#: gnu/packages/photo.scm:494
 msgid ""
 "Hugin is an easy to use panoramic imaging toolchain with a graphical\n"
 "user interface.  It can be used to assemble a mosaic of photographs into\n"
 "a complete panorama and stitch any series of overlapping pictures."
 msgstr ""
 
-#: gnu/packages/photo.scm:538
+#: gnu/packages/photo.scm:545
 msgid "Raw image developing and processing"
 msgstr ""
 
-#: gnu/packages/photo.scm:539
+#: gnu/packages/photo.scm:546
 msgid ""
 "RawTherapee is a raw image processing suite.  It comprises a\n"
 "subset of image editing operations specifically aimed at non-destructive raw\n"
@@ -16615,11 +16382,11 @@ msgid ""
 "from Foveon and X-Trans sensors."
 msgstr ""
 
-#: gnu/packages/ratpoison.scm:86
+#: gnu/packages/ratpoison.scm:85
 msgid "Simple mouse-free tiling window manager"
 msgstr ""
 
-#: gnu/packages/ratpoison.scm:88
+#: gnu/packages/ratpoison.scm:87
 msgid ""
 "Ratpoison is a simple window manager with no fat library\n"
 "dependencies, no fancy graphics, no window decorations, and no\n"
@@ -16635,11 +16402,11 @@ msgid ""
 "cripples Emacs and other quality pieces of software."
 msgstr ""
 
-#: gnu/packages/readline.scm:92
+#: gnu/packages/readline.scm:94
 msgid "Edit command lines while typing, with history support"
 msgstr ""
 
-#: gnu/packages/readline.scm:94
+#: gnu/packages/readline.scm:96
 msgid ""
 "The GNU readline library allows users to edit command lines as they\n"
 "are typed in.  It can maintain a searchable history of previously entered\n"
@@ -16648,11 +16415,11 @@ msgid ""
 "comfortable for anyone."
 msgstr ""
 
-#: gnu/packages/readline.scm:133
+#: gnu/packages/readline.scm:135
 msgid "Wrapper to allow the editing of keyboard commands"
 msgstr ""
 
-#: gnu/packages/readline.scm:135
+#: gnu/packages/readline.scm:137
 msgid ""
 "Rlwrap is a 'readline wrapper', a small utility that uses the GNU\n"
 "readline library to allow the editing of keyboard input for any command.  You\n"
@@ -16661,11 +16428,11 @@ msgid ""
 "'special effects' using the filter mechanism."
 msgstr ""
 
-#: gnu/packages/scanner.scm:91
+#: gnu/packages/scanner.scm:100
 msgid "Raster image scanner library and drivers, without scanner support"
 msgstr ""
 
-#: gnu/packages/scanner.scm:92
+#: gnu/packages/scanner.scm:101
 msgid ""
 "SANE stands for \"Scanner Access Now Easy\" and is an API\n"
 "proving access to any raster image scanner hardware (flatbed scanner,\n"
@@ -16673,11 +16440,11 @@ msgid ""
 "package contains the library, but no drivers."
 msgstr ""
 
-#: gnu/packages/scanner.scm:130
+#: gnu/packages/scanner.scm:140
 msgid "Raster image scanner library and drivers, with scanner support"
 msgstr ""
 
-#: gnu/packages/scanner.scm:131
+#: gnu/packages/scanner.scm:141
 msgid ""
 "SANE stands for \"Scanner Access Now Easy\" and is an API\n"
 "proving access to any raster image scanner hardware (flatbed scanner,\n"
@@ -16685,11 +16452,11 @@ msgid ""
 "package contains the library and drivers."
 msgstr ""
 
-#: gnu/packages/scheme.scm:200
+#: gnu/packages/scheme.scm:216
 msgid "A Scheme implementation with integrated editor and debugger"
 msgstr "Une implantation de Scheme avec éditeur et débogueur intégrés"
 
-#: gnu/packages/scheme.scm:202
+#: gnu/packages/scheme.scm:218
 msgid ""
 "GNU/MIT Scheme is an implementation of the Scheme programming\n"
 "language.  It provides an interpreter, a compiler and a debugger.  It also\n"
@@ -16699,36 +16466,35 @@ msgstr ""
 "Il fournit un interpréteur, un compilateur et un débogueur. Il intègre\n"
 "également un éditeur sur le modèle d'Emacs et une librairie d'exécution complète."
 
-#: gnu/packages/scheme.scm:290
+#: gnu/packages/scheme.scm:311
 msgid "Efficient Scheme compiler"
 msgstr "Compilateur Scheme efficace"
 
-#: gnu/packages/scheme.scm:292
+#: gnu/packages/scheme.scm:313
 msgid ""
-"Bigloo is a Scheme implementation devoted to one goal: enabling\n"
-"Scheme based programming style where C(++) is usually\n"
-"required.  Bigloo attempts to make Scheme practical by offering\n"
-"features usually presented by traditional programming languages\n"
-"but not offered by Scheme and functional programming.  Bigloo\n"
-"compiles Scheme modules.  It delivers small and fast stand alone\n"
-"binary executables.  Bigloo enables full connections between\n"
-"Scheme and C programs and between Scheme and Java programs."
+"Bigloo is a Scheme implementation devoted to one goal: enabling Scheme\n"
+"based programming style where C(++) is usually required.  Bigloo attempts to\n"
+"make Scheme practical by offering features usually presented by traditional\n"
+"programming languages but not offered by Scheme and functional programming.\n"
+"Bigloo compiles Scheme modules.  It delivers small and fast stand alone binary\n"
+"executables.  Bigloo enables full connections between Scheme and C programs\n"
+"and between Scheme and Java programs."
 msgstr ""
-"Bigloo est une implantation de Scheme tournée vers un seul but: \n"
+"Bigloo est une implantation de Scheme tournée vers un seul but : \n"
 "permettre un style de programmation basé sur Scheme là où C(++)\n"
 "est généralement requis. Bigloo essaye de rendre Scheme pratique\n"
-"en offrant des fonctionnalité traditionnellement présentes dans les\n"
+"en offrant des fonctionnalités traditionnellement présentes dans les\n"
 "langages de programmation traditionnels mais pas offertes par\n"
 "Scheme et la programmation fonctionnelle. Bigloo compile des modules\n"
 "Scheme. Il produit des exécutables indépendants, rapides et petits.\n"
 "Bigloo permet de connecter complètement des programmes Scheme et C\n"
 "et des programmes Scheme et Java."
 
-#: gnu/packages/scheme.scm:340
+#: gnu/packages/scheme.scm:364
 msgid "Multi-tier programming language for the Web 2.0"
 msgstr ""
 
-#: gnu/packages/scheme.scm:342
+#: gnu/packages/scheme.scm:366
 msgid ""
 "HOP is a multi-tier programming language for the Web 2.0 and the\n"
 "so-called diffuse Web.  It is designed for programming interactive web\n"
@@ -16737,11 +16503,11 @@ msgid ""
 "mashups, office (web agendas, mail clients, ...), etc."
 msgstr ""
 
-#: gnu/packages/scheme.scm:383
+#: gnu/packages/scheme.scm:407
 msgid "R5RS Scheme implementation that compiles native code via C"
 msgstr ""
 
-#: gnu/packages/scheme.scm:385
+#: gnu/packages/scheme.scm:409
 msgid ""
 "CHICKEN is a compiler for the Scheme programming language.  CHICKEN\n"
 "produces portable and efficient C, supports almost all of the R5RS Scheme\n"
@@ -16751,11 +16517,11 @@ msgstr ""
 "produit du C portable et efficace, supporte l'essentiel du standard R5RS et\n"
 "incult de nombreuses améliorations et extensions."
 
-#: gnu/packages/scheme.scm:404
+#: gnu/packages/scheme.scm:428
 msgid "Scheme implementation using a bytecode interpreter"
 msgstr "Implantation de Scheme utilisanat un interpréteur pour bytecode"
 
-#: gnu/packages/scheme.scm:406
+#: gnu/packages/scheme.scm:430
 msgid ""
 "Scheme 48 is an implementation of Scheme based on a byte-code\n"
 "interpreter and is designed to be used as a testbed for experiments in\n"
@@ -16765,11 +16531,11 @@ msgstr ""
 "destinée à être utilisée comme un banc d'essai pour des expérimentations\n"
 "portant sur des techniques d'implantation et comme un outil d'exposition."
 
-#: gnu/packages/scheme.scm:525
+#: gnu/packages/scheme.scm:549
 msgid "Implementation of Scheme and related languages"
 msgstr "Implantation de Scheme et d'autres langages associés"
 
-#: gnu/packages/scheme.scm:527
+#: gnu/packages/scheme.scm:551
 msgid ""
 "Racket is an implementation of the Scheme programming language (R5RS and\n"
 "R6RS) and related languages, such as Typed Racket.  It features a compiler and\n"
@@ -16781,11 +16547,11 @@ msgstr ""
 "une machine virtuelle avec compilation à la volée ainsi qu'un ensemble de\n"
 "bibliothèques."
 
-#: gnu/packages/scheme.scm:554
+#: gnu/packages/scheme.scm:578
 msgid "Efficient Scheme interpreter and compiler"
 msgstr "Compilateur et interpréteur Scheme efficace"
 
-#: gnu/packages/scheme.scm:556
+#: gnu/packages/scheme.scm:580
 msgid ""
 "Gambit consists of two main programs: gsi, the Gambit Scheme\n"
 "interpreter, and gsc, the Gambit Scheme compiler.  The interpreter contains\n"
@@ -16796,11 +16562,11 @@ msgid ""
 "mixed."
 msgstr ""
 
-#: gnu/packages/scheme.scm:590
+#: gnu/packages/scheme.scm:614
 msgid "Small embeddable Scheme implementation"
 msgstr ""
 
-#: gnu/packages/scheme.scm:592
+#: gnu/packages/scheme.scm:616
 msgid ""
 "Chibi-Scheme is a very small library with no external dependencies\n"
 "intended for use as an extension and scripting language in C programs.  In\n"
@@ -16809,11 +16575,11 @@ msgid ""
 "threads."
 msgstr ""
 
-#: gnu/packages/scheme.scm:764
+#: gnu/packages/scheme.scm:788
 msgid "Scmutils library for MIT Scheme"
 msgstr ""
 
-#: gnu/packages/scheme.scm:765
+#: gnu/packages/scheme.scm:789
 msgid ""
 "The Scmutils system is an integrated library of\n"
 "procedures, embedded in the programming language Scheme, and intended to\n"
@@ -16821,11 +16587,11 @@ msgid ""
 "engineering."
 msgstr ""
 
-#: gnu/packages/scheme.scm:814
+#: gnu/packages/scheme.scm:838
 msgid "Structure and Interpretation of Computer Programs"
 msgstr ""
 
-#: gnu/packages/scheme.scm:815
+#: gnu/packages/scheme.scm:839
 msgid ""
 "Structure and Interpretation of Computer Programs (SICP) is\n"
 "a textbook aiming to teach the principles of computer programming.\n"
@@ -16835,31 +16601,31 @@ msgid ""
 "metalinguistic abstraction, recursion, interpreters, and modular programming."
 msgstr ""
 
-#: gnu/packages/scheme.scm:857
+#: gnu/packages/scheme.scm:881
 msgid "SRE String pattern-matching library for scheme48"
 msgstr ""
 
-#: gnu/packages/scheme.scm:859
+#: gnu/packages/scheme.scm:883
 msgid ""
 "String pattern-matching library for scheme48 based on the SRE\n"
 "regular-expression notation."
 msgstr ""
 
-#: gnu/packages/scheme.scm:892
+#: gnu/packages/scheme.scm:916
 msgid "Compatibility and utility library for Scheme"
 msgstr ""
 
-#: gnu/packages/scheme.scm:893
+#: gnu/packages/scheme.scm:917
 msgid ""
 "SLIB is a portable Scheme library providing compatibility and\n"
 "utility functions for all standard Scheme implementations."
 msgstr ""
 
-#: gnu/packages/scheme.scm:949
+#: gnu/packages/scheme.scm:973
 msgid "Scheme implementation conforming to R5RS and IEEE P1178"
 msgstr ""
 
-#: gnu/packages/scheme.scm:950
+#: gnu/packages/scheme.scm:974
 msgid ""
 "GNU SCM is an implementation of Scheme.  This\n"
 "implementation includes Hobbit, a Scheme-to-C compiler, which can\n"
@@ -16867,11 +16633,11 @@ msgid ""
 "linked with a SCM executable."
 msgstr ""
 
-#: gnu/packages/scheme.scm:1007
+#: gnu/packages/scheme.scm:1031
 msgid "Light-weight interpreter for the Scheme programming language"
 msgstr "Interpréteur léger pour le langage de programmation Scheme"
 
-#: gnu/packages/scheme.scm:1009
+#: gnu/packages/scheme.scm:1033
 msgid ""
 "TinyScheme is a light-weight Scheme interpreter that implements as large a\n"
 "subset of R5RS as was possible without getting very large and complicated.\n"
@@ -16887,11 +16653,11 @@ msgid ""
 "small program, it is easy to comprehend, get to grips with, and use."
 msgstr ""
 
-#: gnu/packages/scheme.scm:1088
+#: gnu/packages/scheme.scm:1112
 msgid "Brutally efficient Scheme compiler"
 msgstr "Compilateur Scheme extrêmement efficace"
 
-#: gnu/packages/scheme.scm:1090
+#: gnu/packages/scheme.scm:1114
 msgid ""
 "Stalin is an aggressively optimizing whole-program compiler\n"
 "for Scheme that does polyvariant interprocedural flow analysis,\n"
@@ -16903,22 +16669,36 @@ msgid ""
 "generation."
 msgstr ""
 
-#: gnu/packages/scheme.scm:1142
+#: gnu/packages/scheme.scm:1167
 msgid "Scheme-like lisp implementation"
 msgstr "Implémentation lisp proche de Scheme"
 
-#: gnu/packages/scheme.scm:1144
+#: gnu/packages/scheme.scm:1169
 msgid ""
 "@code{femtolisp} is a scheme-like lisp implementation with a\n"
 "simple, elegant Scheme dialect.  It is a lisp-1 with lexical scope.\n"
 "The core is 12 builtin special forms and 33 builtin functions."
 msgstr ""
 
-#: gnu/packages/search.scm:75
-msgid "Search Engine Library"
+#: gnu/packages/scheme.scm:1240
+msgid "Scheme scripting engine"
+msgstr ""
+
+#: gnu/packages/scheme.scm:1241
+msgid ""
+"Gauche is a R7RS Scheme scripting engine aiming at being a\n"
+"handy tool that helps programmers and system administrators to write small to\n"
+"large scripts quickly.  Quick startup, built-in system interface, native\n"
+"multilingual support are some of the goals.  Gauche comes with a package\n"
+"manager/installer @code{gauche-package} which can download, compile, install\n"
+"and list gauche extension packages."
 msgstr ""
 
 #: gnu/packages/search.scm:77
+msgid "Search Engine Library"
+msgstr ""
+
+#: gnu/packages/search.scm:79
 msgid ""
 "Xapian is a highly adaptable toolkit which allows developers to easily\n"
 "add advanced indexing and search facilities to their own applications.  It\n"
@@ -16926,15 +16706,26 @@ msgid ""
 "rich set of boolean query operators."
 msgstr ""
 
-#: gnu/packages/search.scm:109
+#: gnu/packages/search.scm:111
 msgid "Python bindings for the Xapian search engine library"
 msgstr "Liaisons python pour la bibliothèque de moteur de recherche Xapian"
 
-#: gnu/packages/search.scm:148
+#: gnu/packages/search.scm:132
+msgid "Perl XS frontend to the Xapian C++ search library"
+msgstr "Liaisons Perl XS pour la bibliothèque de recherche Xapian"
+
+#: gnu/packages/search.scm:134
+msgid ""
+"Search::Xapian wraps most methods of most Xapian classes.  The missing\n"
+"classes and methods should be added in the future.  It also provides a\n"
+"simplified, more 'perlish' interface to some common operations."
+msgstr ""
+
+#: gnu/packages/search.scm:175
 msgid "Tool for Obsessive Compulsive Classifiers"
 msgstr ""
 
-#: gnu/packages/search.scm:150
+#: gnu/packages/search.scm:177
 msgid ""
 "libtocc is the engine of the Tocc project, a tag-based file management\n"
 "system.  The goal of Tocc is to provide a better system for classifying files\n"
@@ -16942,21 +16733,21 @@ msgid ""
 "files and directories."
 msgstr ""
 
-#: gnu/packages/search.scm:172
+#: gnu/packages/search.scm:199
 msgid "Command-line interface to libtocc"
 msgstr ""
 
-#: gnu/packages/search.scm:174
+#: gnu/packages/search.scm:201
 msgid ""
 "Tocc is a tag-based file management system.  This package contains the\n"
 "command line tool for interacting with libtocc."
 msgstr ""
 
-#: gnu/packages/search.scm:192
+#: gnu/packages/search.scm:219
 msgid "Finding text and HTML files that match boolean expressions"
 msgstr ""
 
-#: gnu/packages/search.scm:194
+#: gnu/packages/search.scm:221
 msgid ""
 "GNU Bool is a utility to perform text searches on files using Boolean\n"
 "expressions.  For example, a search for \"hello AND world\" would return a\n"
@@ -16967,24 +16758,24 @@ msgid ""
 "for parsing HTML files."
 msgstr ""
 
-#: gnu/packages/search.scm:224
+#: gnu/packages/search.scm:251
 msgid "Full-text search system"
 msgstr ""
 
-#: gnu/packages/search.scm:225
+#: gnu/packages/search.scm:252
 msgid ""
 "Hyper Estraier can be used to integrate full-text\n"
 "search into applications, using either the provided command line and CGI\n"
 "interfaces, or a C API."
 msgstr ""
 
-#: gnu/packages/search.scm:243
+#: gnu/packages/search.scm:270
 msgid "Locate files on the file system"
 msgstr ""
 
-#: gnu/packages/search.scm:245
+#: gnu/packages/search.scm:272
 msgid ""
-"mlocate is a locate/updatedb implementation.  The 'm' stands for\n"
+"mlocate is a locate/updatedb implementation.  The @code{m} stands for\n"
 "\"merging\": @code{updatedb} reuses the existing database to avoid rereading\n"
 "most of the file system, which makes it faster and does not trash the system\n"
 "caches as much.  The locate(1) utility is intended to be completely compatible\n"
@@ -16992,22 +16783,22 @@ msgid ""
 "conflict with slocate compatibility."
 msgstr ""
 
-#: gnu/packages/search.scm:310
+#: gnu/packages/search.scm:337
 msgid "Web indexing system"
 msgstr ""
 
-#: gnu/packages/search.scm:312
+#: gnu/packages/search.scm:339
 msgid ""
 "Swish-e is Simple Web Indexing System for Humans - Enhanced.  Swish-e\n"
 "can quickly and easily index directories of files or remote web sites and\n"
 "search the generated indexes."
 msgstr ""
 
-#: gnu/packages/search.scm:379
+#: gnu/packages/search.scm:406
 msgid "Personal document indexing system"
 msgstr ""
 
-#: gnu/packages/search.scm:381
+#: gnu/packages/search.scm:408
 msgid ""
 "Xapers is a personal document indexing system,\n"
 "geared towards academic journal articles build on the Xapian search engine.\n"
@@ -17031,11 +16822,11 @@ msgid ""
 "server and an IRC server."
 msgstr ""
 
-#: gnu/packages/shells.scm:79
+#: gnu/packages/shells.scm:82
 msgid "POSIX-compliant shell optimised for size"
 msgstr ""
 
-#: gnu/packages/shells.scm:81
+#: gnu/packages/shells.scm:84
 msgid ""
 "dash is a POSIX-compliant @command{/bin/sh} implementation that aims to be\n"
 "as small as possible, often without sacrificing speed.  It is faster than the\n"
@@ -17043,11 +16834,11 @@ msgid ""
 "direct descendant of NetBSD's Almquist Shell (@command{ash})."
 msgstr ""
 
-#: gnu/packages/shells.scm:137
+#: gnu/packages/shells.scm:194
 msgid "The friendly interactive shell"
 msgstr ""
 
-#: gnu/packages/shells.scm:139
+#: gnu/packages/shells.scm:196
 msgid ""
 "Fish (friendly interactive shell) is a shell focused on interactive use,\n"
 "discoverability, and friendliness.  Fish has very user-friendly and powerful\n"
@@ -17059,21 +16850,32 @@ msgid ""
 "and syntax highlighting."
 msgstr ""
 
-#: gnu/packages/shells.scm:183
+#: gnu/packages/shells.scm:249
+msgid "Foreign environment interface for fish shell"
+msgstr "Interface d'environnement externe pour le shell fish"
+
+#: gnu/packages/shells.scm:250
+msgid ""
+"@code{fish-foreign-env} wraps bash script execution in a way\n"
+"that environment variables that are exported or modified get imported back\n"
+"into fish."
+msgstr ""
+
+#: gnu/packages/shells.scm:288
 msgid "Alternative implementation of the rc shell by Byron Rakitzis"
 msgstr ""
 
-#: gnu/packages/shells.scm:185
+#: gnu/packages/shells.scm:290
 msgid ""
 "This is a reimplementation by Byron Rakitzis of the Plan 9 shell.  It\n"
 "has a small feature set similar to a traditional Bourne shell."
 msgstr ""
 
-#: gnu/packages/shells.scm:216
+#: gnu/packages/shells.scm:321
 msgid "Extensible shell with higher-order functions"
 msgstr ""
 
-#: gnu/packages/shells.scm:218
+#: gnu/packages/shells.scm:323
 msgid ""
 "Es is an extensible shell.  The language was derived from the Plan 9\n"
 "shell, rc, and was influenced by functional programming languages, such as\n"
@@ -17082,11 +16884,11 @@ msgid ""
 "written by Paul Haahr and Byron Rakitzis."
 msgstr ""
 
-#: gnu/packages/shells.scm:278
+#: gnu/packages/shells.scm:383
 msgid "Unix shell based on csh"
 msgstr ""
 
-#: gnu/packages/shells.scm:280
+#: gnu/packages/shells.scm:385
 msgid ""
 "Tcsh is an enhanced, but completely compatible version of the Berkeley\n"
 "UNIX C shell (csh).  It is a command language interpreter usable both as an\n"
@@ -17095,11 +16897,11 @@ msgid ""
 "history mechanism, job control and a C-like syntax."
 msgstr ""
 
-#: gnu/packages/shells.scm:339
+#: gnu/packages/shells.scm:444
 msgid "Powerful shell for interactive use and scripting"
 msgstr "Shell puissant pour un usage interactif et l'écriture de scripts"
 
-#: gnu/packages/shells.scm:340
+#: gnu/packages/shells.scm:445
 msgid ""
 "The Z shell (zsh) is a Unix shell that can be used\n"
 "as an interactive login shell and as a powerful command interpreter\n"
@@ -17112,11 +16914,11 @@ msgstr ""
 "shell. Zsh peut être vu comme un Bourn shell étendu doté de nombreuses améliorations\n"
 "et incluant certaines fonctionnalités de bash, ksh et tcsh."
 
-#: gnu/packages/shells.scm:379
+#: gnu/packages/shells.scm:484
 msgid "Python-ish shell"
 msgstr ""
 
-#: gnu/packages/shells.scm:381
+#: gnu/packages/shells.scm:486
 msgid ""
 "Xonsh is a Python-ish, BASHwards-looking shell language and command\n"
 "prompt.  The language is a superset of Python 3.4+ with additional shell\n"
@@ -17125,11 +16927,11 @@ msgid ""
 "use of experts and novices alike."
 msgstr ""
 
-#: gnu/packages/shells.scm:425
+#: gnu/packages/shells.scm:530
 msgid "Unix shell embedded in Scheme"
 msgstr ""
 
-#: gnu/packages/shells.scm:427
+#: gnu/packages/shells.scm:532
 msgid ""
 "Scsh is a Unix shell embedded in Scheme.  Scsh has two main\n"
 "components: a process notation for running programs and setting up pipelines\n"
@@ -17137,11 +16939,11 @@ msgid ""
 "operating system."
 msgstr ""
 
-#: gnu/packages/shells.scm:466
+#: gnu/packages/shells.scm:571
 msgid "Minimal zero-config readline replacement"
 msgstr ""
 
-#: gnu/packages/shells.scm:468
+#: gnu/packages/shells.scm:573
 msgid ""
 "Linenoise is a minimal, zero-config, readline replacement.\n"
 "Its features include:\n"
@@ -17155,11 +16957,11 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/shells.scm:530
+#: gnu/packages/shells.scm:635
 msgid "Extremely minimal shell with the simplest syntax possible"
 msgstr ""
 
-#: gnu/packages/shells.scm:532
+#: gnu/packages/shells.scm:637
 msgid ""
 "S is a new shell that aims to be extremely simple.\n"
 "S does not implemnt the POSIX shell standard.\n"
@@ -17172,42 +16974,42 @@ msgid ""
 "A @code{andglob} program is also provided along with s."
 msgstr ""
 
-#: gnu/packages/shells.scm:560
+#: gnu/packages/shells.scm:665
 msgid "Port of OpenBSD Korn Shell"
 msgstr ""
 
-#: gnu/packages/shells.scm:562
+#: gnu/packages/shells.scm:667
 msgid ""
 "Oksh is a port of the OpenBSD Korn Shell.\n"
 "The OpenBSD Korn Shell is a cleaned up and enhanced ksh."
 msgstr ""
 
-#: gnu/packages/shells.scm:594
+#: gnu/packages/shells.scm:699
 msgid "Korn Shell from OpenBSD"
 msgstr ""
 
-#: gnu/packages/shells.scm:596
+#: gnu/packages/shells.scm:701
 msgid ""
 "loksh is a Linux port of OpenBSD's @command{ksh}.  It is a small,\n"
 "interactive POSIX shell targeted at resource-constrained systems."
 msgstr ""
 
-#: gnu/packages/shells.scm:635
+#: gnu/packages/shells.scm:740
 msgid "Korn Shell from MirBSD"
 msgstr ""
 
-#: gnu/packages/shells.scm:636
+#: gnu/packages/shells.scm:741
 msgid ""
 "mksh is an actively developed free implementation of the\n"
 "Korn Shell programming language and a successor to the Public Domain Korn\n"
 "Shell (pdksh)."
 msgstr ""
 
-#: gnu/packages/shells.scm:678
+#: gnu/packages/shells.scm:783
 msgid "Bash-compatible Unix shell"
 msgstr "Shell Unix compatible avec Bash"
 
-#: gnu/packages/shells.scm:679
+#: gnu/packages/shells.scm:784
 msgid ""
 "Oil is a Unix / POSIX shell, compatible with Bash.  It\n"
 "implements the Oil language, which is a new shell language to which Bash can be\n"
@@ -17216,11 +17018,11 @@ msgid ""
 "is commonly written."
 msgstr ""
 
-#: gnu/packages/telephony.scm:77
+#: gnu/packages/telephony.scm:100
 msgid "(u)Common C++ framework for threaded applications"
 msgstr ""
 
-#: gnu/packages/telephony.scm:78
+#: gnu/packages/telephony.scm:101
 msgid ""
 "GNU Common C++ is an portable, optimized class framework for\n"
 "threaded applications, supporting concurrent synchronization, inter-process\n"
@@ -17229,11 +17031,11 @@ msgid ""
 "reimplementation."
 msgstr ""
 
-#: gnu/packages/telephony.scm:98
+#: gnu/packages/telephony.scm:121
 msgid "Common C++ framework for threaded applications"
 msgstr ""
 
-#: gnu/packages/telephony.scm:99
+#: gnu/packages/telephony.scm:122
 msgid ""
 "GNU uCommon C++ is meant as a very light-weight C++ library\n"
 "to facilitate using C++ design patterns even for very deeply embedded\n"
@@ -17241,11 +17043,11 @@ msgid ""
 "support."
 msgstr ""
 
-#: gnu/packages/telephony.scm:121
+#: gnu/packages/telephony.scm:144
 msgid "Implementation of RTP (real-time transport protocol)"
 msgstr ""
 
-#: gnu/packages/telephony.scm:122
+#: gnu/packages/telephony.scm:145
 msgid ""
 "GNU ccRTP is an implementation of RTP, the real-time transport\n"
 "protocol from the IETF.  It is suitable both for high capacity servers and\n"
@@ -17254,22 +17056,22 @@ msgid ""
 "packet-manipulation library."
 msgstr ""
 
-#: gnu/packages/telephony.scm:144
+#: gnu/packages/telephony.scm:167
 msgid "Library implementing SIP (RFC-3261)"
 msgstr ""
 
-#: gnu/packages/telephony.scm:145
+#: gnu/packages/telephony.scm:168
 msgid ""
 "GNU oSIP is an implementation of the SIP protocol.  It is\n"
 "used to provide multimedia and telecom software developers with an interface\n"
 "to initiate and control SIP sessions."
 msgstr ""
 
-#: gnu/packages/telephony.scm:164
+#: gnu/packages/telephony.scm:187
 msgid "Sip abstraction library"
 msgstr "Bibliothèque d'abstraction de Sip"
 
-#: gnu/packages/telephony.scm:165
+#: gnu/packages/telephony.scm:188
 msgid ""
 "EXosip is a library that hides the complexity of using the\n"
 "SIP protocol for multimedia session establishment.  This protocol is mainly to\n"
@@ -17278,11 +17080,11 @@ msgid ""
 "multiplayer games."
 msgstr ""
 
-#: gnu/packages/telephony.scm:208
+#: gnu/packages/telephony.scm:231
 msgid "Secure peer-to-peer VoIP server for the SIP protocol"
 msgstr ""
 
-#: gnu/packages/telephony.scm:209
+#: gnu/packages/telephony.scm:232
 msgid ""
 "GNU SIP Witch is a peer-to-peer Voice-over-IP server that\n"
 "uses the SIP protocol.  Calls can be made from behind NAT firewalls and\n"
@@ -17292,52 +17094,52 @@ msgid ""
 "internet."
 msgstr ""
 
-#: gnu/packages/telephony.scm:236
+#: gnu/packages/telephony.scm:259
 msgid "Secure RTP (SRTP) Reference Implementation"
 msgstr ""
 
-#: gnu/packages/telephony.scm:238
+#: gnu/packages/telephony.scm:261
 msgid ""
 "This package provides an implementation of the Secure Real-time Transport\n"
 "Protocol (@dfn{SRTP}), the Universal Security Transform (@dfn{UST}), and a\n"
 "supporting cryptographic kernel."
 msgstr ""
 
-#: gnu/packages/telephony.scm:262
+#: gnu/packages/telephony.scm:285
 msgid "Utilities library for linphone software"
 msgstr ""
 
-#: gnu/packages/telephony.scm:263
+#: gnu/packages/telephony.scm:286
 msgid ""
 "BCtoolbox is a utilities library used by Belledonne\n"
 "Communications softwares like linphone."
 msgstr ""
 
-#: gnu/packages/telephony.scm:285
+#: gnu/packages/telephony.scm:308
 msgid "Implementation of the Real-time transport protocol"
 msgstr "Implémentation du protocole de transport en temps réel (RTTP)"
 
-#: gnu/packages/telephony.scm:286
+#: gnu/packages/telephony.scm:309
 msgid ""
 "oRTP is a library implementing the Real-time transport\n"
 "protocol (RFC 3550)."
 msgstr ""
 
-#: gnu/packages/telephony.scm:312
+#: gnu/packages/telephony.scm:335
 msgid "Inter-Asterisk-Protocol library"
 msgstr "Bibliothèque pour le protocole Inter-Asterisk"
 
-#: gnu/packages/telephony.scm:313
+#: gnu/packages/telephony.scm:336
 msgid ""
 "LibIAX2 implements the Inter-Asterisk-Protocol for relaying\n"
 "Voice-over-IP (VoIP) communications."
 msgstr ""
 
-#: gnu/packages/telephony.scm:344
+#: gnu/packages/telephony.scm:367
 msgid "Simple VoIP program to create conferences from the terminal"
 msgstr ""
 
-#: gnu/packages/telephony.scm:346
+#: gnu/packages/telephony.scm:369
 msgid ""
 "Seren is a simple VoIP program based on the Opus codec that allows you\n"
 "to create a voice conference from the terminal, with up to 10 participants,\n"
@@ -17346,11 +17148,11 @@ msgid ""
 "address of one of the participants."
 msgstr ""
 
-#: gnu/packages/telephony.scm:459
+#: gnu/packages/telephony.scm:482
 msgid "Low-latency, high quality voice chat software"
 msgstr ""
 
-#: gnu/packages/telephony.scm:461
+#: gnu/packages/telephony.scm:484
 msgid ""
 "Mumble is an low-latency, high quality voice chat\n"
 "software primarily intended for use while gaming.\n"
@@ -17358,11 +17160,11 @@ msgid ""
 "@code{mumble} for the client, and @code{murmur} for the server."
 msgstr ""
 
-#: gnu/packages/telephony.scm:526
+#: gnu/packages/telephony.scm:549
 msgid "Softphone for voice over IP and instant messaging"
 msgstr ""
 
-#: gnu/packages/telephony.scm:527
+#: gnu/packages/telephony.scm:550
 msgid ""
 "Twinkle is a softphone for your voice over IP and instant\n"
 "messaging communcations using the SIP protocol.  You can use it for direct IP\n"
@@ -17370,12 +17172,58 @@ msgid ""
 "calls and messages"
 msgstr ""
 
-#: gnu/packages/tex.scm:219 gnu/packages/tex.scm:4056
-#: gnu/packages/tex.scm:4119
+#: gnu/packages/telephony.scm:632
+msgid "Session Initiation Protocol (SIP) stack"
+msgstr ""
+
+#: gnu/packages/telephony.scm:633
+msgid ""
+"PJProject provides an implementation of the Session\n"
+"Initiation Protocol (SIP) and a multimedia framework."
+msgstr ""
+
+#: gnu/packages/telephony.scm:803 gnu/packages/telephony.scm:840
+#: gnu/packages/telephony.scm:900
+msgid "Distributed multimedia communications platform"
+msgstr ""
+
+#: gnu/packages/telephony.scm:804
+msgid ""
+"Jami (formerly GNU Ring) is a secure and distributed voice,\n"
+"video and chat communication platform that requires no centralized server and\n"
+"leaves the power of privacy in the hands of the user.  It supports the SIP and\n"
+"IAX protocols, as well as decentralized calling using P2P-DHT.\n"
+"\n"
+"This package provides a library and daemon implementing the Jami core\n"
+"functionality."
+msgstr ""
+
+#: gnu/packages/telephony.scm:841
+msgid ""
+"Jami (formerly GNU Ring) is a secure and distributed voice,\n"
+"video and chat communication platform that requires no centralized server and\n"
+"leaves the power of privacy in the hands of the user.  It supports the SIP and\n"
+"IAX protocols, as well as decentralized calling using P2P-DHT.\n"
+"\n"
+"This package provides a library common to all Jami clients."
+msgstr ""
+
+#: gnu/packages/telephony.scm:901
+msgid ""
+"Jami (formerly GNU Ring) is a secure and distributed voice,\n"
+"video and chat communication platform that requires no centralized server and\n"
+"leaves the power of privacy in the hands of the user.  It supports the SIP and\n"
+"IAX protocols, as well as decentralized calling using P2P-DHT.\n"
+"\n"
+"This package provides the Jami client for the GNOME desktop."
+msgstr ""
+
+#: gnu/packages/tex.scm:253 gnu/packages/tex.scm:5227
+#: gnu/packages/tex.scm:5290
 msgid "TeX Live, a package of the TeX typesetting system"
 msgstr ""
 
-#: gnu/packages/tex.scm:221
+#: gnu/packages/tex.scm:255
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -17385,11 +17233,11 @@ msgid ""
 "This package contains the binaries."
 msgstr ""
 
-#: gnu/packages/tex.scm:289
+#: gnu/packages/tex.scm:323
 msgid "DVI to PostScript drivers"
 msgstr ""
 
-#: gnu/packages/tex.scm:290
+#: gnu/packages/tex.scm:324
 msgid ""
 "This package provides files needed for converting DVI files\n"
 "to PostScript."
@@ -17397,11 +17245,11 @@ msgstr ""
 "Ce paquet fournit des outils requis pour convertir des fichiers\n"
 "DVI en PostScript."
 
-#: gnu/packages/tex.scm:324
+#: gnu/packages/tex.scm:358
 msgid "Unicode data and loaders for TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:325
+#: gnu/packages/tex.scm:359
 msgid ""
 "This bundle provides generic access to Unicode Consortium\n"
 "data for TeX use.  It contains a set of text files provided by the Unicode\n"
@@ -17414,11 +17262,11 @@ msgid ""
 "out to date by @code{unicode-letters.tex}. "
 msgstr ""
 
-#: gnu/packages/tex.scm:363
+#: gnu/packages/tex.scm:397
 msgid "Hyphenation patterns for German"
 msgstr ""
 
-#: gnu/packages/tex.scm:364
+#: gnu/packages/tex.scm:398
 msgid ""
 "The package provides experimental hyphenation patterns for\n"
 "the German language, covering both traditional and reformed orthography.  The\n"
@@ -17426,11 +17274,11 @@ msgid ""
 "bundle."
 msgstr ""
 
-#: gnu/packages/tex.scm:399
+#: gnu/packages/tex.scm:433
 msgid "Files for creating TeX formats"
 msgstr ""
 
-#: gnu/packages/tex.scm:400
+#: gnu/packages/tex.scm:434
 msgid ""
 "This bundle provides a collection of model \".ini\" files\n"
 "for creating TeX formats.  These files are commonly used to introduced\n"
@@ -17439,11 +17287,11 @@ msgid ""
 "to adapt the plain e-TeX source file to work with XeTeX and LuaTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:434
+#: gnu/packages/tex.scm:468
 msgid "Hyphenation patterns expressed in UTF-8"
 msgstr ""
 
-#: gnu/packages/tex.scm:435
+#: gnu/packages/tex.scm:469
 msgid ""
 "Modern native UTF-8 engines such as XeTeX and LuaTeX need\n"
 "hyphenation patterns in UTF-8 format, whereas older systems require\n"
@@ -17456,21 +17304,35 @@ msgid ""
 "converters, will completely supplant the older patterns."
 msgstr ""
 
-#: gnu/packages/tex.scm:511
+#: gnu/packages/tex.scm:545
 msgid "Metafont base files"
 msgstr ""
 
-#: gnu/packages/tex.scm:512
+#: gnu/packages/tex.scm:546
 msgid ""
 "This package provides the Metafont base files needed to\n"
 "build fonts using the Metafont system."
 msgstr ""
 
-#: gnu/packages/tex.scm:543
+#: gnu/packages/tex.scm:577
+msgid "Tools for converting and installing fonts for TeX and LaTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:578
+msgid ""
+"This package provides TeX macros for converting Adobe Font\n"
+"Metric files to TeX metric and virtual font format.  Fontinst helps mainly\n"
+"with the number crunching and shovelling parts of font installation.  This\n"
+"means in practice that it creates a number of files which give the TeX\n"
+"metrics (and related information) for a font family that TeX needs to do any\n"
+"typesetting in these fonts."
+msgstr ""
+
+#: gnu/packages/tex.scm:613
 msgid "Scheme for naming fonts in TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:544
+#: gnu/packages/tex.scm:614
 msgid ""
 "This is Fontname, a naming scheme for (the base part of)\n"
 "external TeX font filenames.  This makes at most eight-character names\n"
@@ -17478,11 +17340,11 @@ msgid ""
 "documents."
 msgstr ""
 
-#: gnu/packages/tex.scm:613
+#: gnu/packages/tex.scm:705
 msgid "Computer Modern fonts for TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:614
+#: gnu/packages/tex.scm:706
 msgid ""
 "This package provides the Computer Modern fonts by Donald\n"
 "Knuth.  The Computer Modern font family is a large collection of text,\n"
@@ -17490,22 +17352,47 @@ msgid ""
 "8A."
 msgstr ""
 
-#: gnu/packages/tex.scm:678
+#: gnu/packages/tex.scm:813
+msgid "Computer Modern Super family of fonts"
+msgstr ""
+
+#: gnu/packages/tex.scm:814
+msgid ""
+"The CM-Super family provides Adobe Type 1 fonts that replace\n"
+"the T1/TS1-encoded Computer Modern (EC/TC), T1/TS1-encoded Concrete,\n"
+"T1/TS1-encoded CM bright and LH Cyrillic fonts (thus supporting all European\n"
+"languages except Greek), and bringing many ameliorations in typesetting\n"
+"quality.  The fonts exhibit the same metrics as the METAFONT-encoded\n"
+"originals."
+msgstr ""
+
+#: gnu/packages/tex.scm:851
+msgid "Latin Modern family of fonts"
+msgstr ""
+
+#: gnu/packages/tex.scm:852
+msgid ""
+"The Latin Modern fonts are derived from the famous Computer\n"
+"Modern fonts designed by Donald E. Knuth and described in Volume E of his\n"
+"Computers & Typesetting series."
+msgstr ""
+
+#: gnu/packages/tex.scm:922
 msgid "Small library of METAFONT sources"
 msgstr ""
 
-#: gnu/packages/tex.scm:679
+#: gnu/packages/tex.scm:923
 msgid ""
 "This is a collection of core TeX and METAFONT macro files\n"
 "from Donald Knuth, including the plain format, plain base, and the MF logo\n"
 "fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:753
+#: gnu/packages/tex.scm:997
 msgid "Collection of fonts used in LaTeX distributions"
 msgstr ""
 
-#: gnu/packages/tex.scm:754
+#: gnu/packages/tex.scm:998
 msgid ""
 "This is a collection of fonts for use with standard LaTeX\n"
 "packages and classes. It includes invisible fonts (for use with the slides\n"
@@ -17513,11 +17400,35 @@ msgid ""
 "symbol fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:835 gnu/packages/tex.scm:866
+#: gnu/packages/tex.scm:1018
+msgid "LaTeX support for Metafont logo fonts"
+msgstr ""
+
+#: gnu/packages/tex.scm:1020
+msgid ""
+"This package provides LaTeX and font definition files to access the\n"
+"Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont\n"
+"logos in LaTeX documents."
+msgstr ""
+
+#: gnu/packages/tex.scm:1087
+msgid "Metafont logo font"
+msgstr ""
+
+#: gnu/packages/tex.scm:1089
+msgid ""
+"These fonts were created in METAFONT by Knuth, for his own publications.\n"
+"At some stage, the letters P and S were added, so that the METAPOST logo could\n"
+"also be expressed.  The fonts were originally issued (of course) as METAFONT\n"
+"source; they have since been autotraced and reissued in Adobe Type 1 format by\n"
+"Taco Hoekwater."
+msgstr ""
+
+#: gnu/packages/tex.scm:1285 gnu/packages/tex.scm:1316
 msgid "TeX fonts from the American Mathematical Society"
 msgstr ""
 
-#: gnu/packages/tex.scm:837
+#: gnu/packages/tex.scm:1287
 msgid ""
 "This package provides an extended set of fonts for use in mathematics,\n"
 "including: extra mathematical symbols; blackboard bold letters (uppercase\n"
@@ -17531,29 +17442,29 @@ msgid ""
 "details can be found in the documentation."
 msgstr ""
 
-#: gnu/packages/tex.scm:868
+#: gnu/packages/tex.scm:1318
 msgid ""
 "This package provides basic LaTeX support for the symbol fonts provides\n"
 "by the amsfonts package.  It provides @code{amsfonts.sty}, with names of\n"
 "individual symbols defined in @code{amssymb.sty}."
 msgstr ""
 
-#: gnu/packages/tex.scm:902
+#: gnu/packages/tex.scm:1352
 msgid "Plain TeX format and supporting files"
 msgstr ""
 
-#: gnu/packages/tex.scm:904
+#: gnu/packages/tex.scm:1354
 msgid ""
 "Contains files used to build the Plain TeX format, as described in the\n"
 "TeXbook, together with various supporting files (some also discussed in the\n"
 "book)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1073
+#: gnu/packages/tex.scm:1533
 msgid "Base sources of LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1075
+#: gnu/packages/tex.scm:1535
 msgid ""
 "This bundle comprises the source of LaTeX itself, together with several\n"
 "packages which are considered \"part of the kernel\".  This bundle, together\n"
@@ -17561,11 +17472,11 @@ msgid ""
 "contain."
 msgstr ""
 
-#: gnu/packages/tex.scm:1095
+#: gnu/packages/tex.scm:1555
 msgid "Extended filecontents and filecontents* environments"
 msgstr ""
 
-#: gnu/packages/tex.scm:1097
+#: gnu/packages/tex.scm:1557
 msgid ""
 "LaTeX2e's @code{filecontents} and @code{filecontents*} environments\n"
 "enable a LaTeX source file to generate external files as it runs through\n"
@@ -17576,22 +17487,22 @@ msgid ""
 "@code{filecontents*} anywhere."
 msgstr ""
 
-#: gnu/packages/tex.scm:1124
+#: gnu/packages/tex.scm:1584
 msgid "Am I running under XeTeX?"
 msgstr ""
 
-#: gnu/packages/tex.scm:1126
+#: gnu/packages/tex.scm:1586
 msgid ""
 "This is a simple package which provides an @code{\\ifxetex} conditional,\n"
 "so that other code can determine that it is running under XeTeX.  The package\n"
 "requires the e-TeX extensions to the TeX primitive set."
 msgstr ""
 
-#: gnu/packages/tex.scm:1158
+#: gnu/packages/tex.scm:1618
 msgid "Simple macros for EPS inclusion"
 msgstr ""
 
-#: gnu/packages/tex.scm:1160
+#: gnu/packages/tex.scm:1620
 msgid ""
 "This package provides the original (and now obsolescent) graphics\n"
 "inclusion macros for use with dvips, still widely used by Plain TeX users (in\n"
@@ -17601,11 +17512,11 @@ msgid ""
 "users, via its Plain TeX version.)"
 msgstr ""
 
-#: gnu/packages/tex.scm:1186
+#: gnu/packages/tex.scm:1644
 msgid "Sophisticated verbatim text"
 msgstr ""
 
-#: gnu/packages/tex.scm:1188
+#: gnu/packages/tex.scm:1646
 msgid ""
 "This package provides tools for the flexible handling of verbatim text\n"
 "including: verbatim commands in footnotes; a variety of verbatim environments\n"
@@ -17615,11 +17526,11 @@ msgid ""
 "verbatim source)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1257
+#: gnu/packages/tex.scm:1715
 msgid "LaTeX standard graphics bundle"
 msgstr ""
 
-#: gnu/packages/tex.scm:1259
+#: gnu/packages/tex.scm:1717
 msgid ""
 "This is a collection of LaTeX packages for producing color, including\n"
 "graphics (e.g. PostScript) files, and rotation and scaling of text in LaTeX\n"
@@ -17627,11 +17538,11 @@ msgid ""
 "keyval, and lscape."
 msgstr ""
 
-#: gnu/packages/tex.scm:1281
+#: gnu/packages/tex.scm:1739
 msgid "Driver-independent color extensions for LaTeX and pdfLaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1283
+#: gnu/packages/tex.scm:1741
 msgid ""
 "The package starts from the basic facilities of the colorcolor package,\n"
 "and provides easy driver-independent access to several kinds of color tints,\n"
@@ -17642,11 +17553,11 @@ msgid ""
 "tables."
 msgstr ""
 
-#: gnu/packages/tex.scm:1309
+#: gnu/packages/tex.scm:1770
 msgid "Extensive support for hypertext in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1311
+#: gnu/packages/tex.scm:1772
 msgid ""
 "The @code{hyperref} package is used to handle cross-referencing commands\n"
 "in LaTeX to produce hypertext links in the document.  The package provides\n"
@@ -17658,22 +17569,22 @@ msgid ""
 "@code{nameref} packages, which make use of the facilities of @code{hyperref}."
 msgstr ""
 
-#: gnu/packages/tex.scm:1345
+#: gnu/packages/tex.scm:1808
 msgid "Bundle of packages submitted by Heiko Oberdiek"
 msgstr ""
 
-#: gnu/packages/tex.scm:1347
+#: gnu/packages/tex.scm:1810
 msgid ""
 "The bundle comprises various LaTeX packages, providing among others:\n"
 "better accessibility support for PDF files; extensible chemists reaction\n"
 "arrows; record information about document class(es) used; and many more."
 msgstr ""
 
-#: gnu/packages/tex.scm:1368
+#: gnu/packages/tex.scm:1831
 msgid "LaTeX standard tools bundle"
 msgstr ""
 
-#: gnu/packages/tex.scm:1370
+#: gnu/packages/tex.scm:1833
 msgid ""
 "This package is a collection of (variously) simple tools provided as\n"
 "part of the LaTeX required tools distribution, comprising the following\n"
@@ -17683,11 +17594,11 @@ msgid ""
 "xr, and xspace."
 msgstr ""
 
-#: gnu/packages/tex.scm:1405
+#: gnu/packages/tex.scm:1868
 msgid "Verbatim with URL-sensitive line breaks"
 msgstr ""
 
-#: gnu/packages/tex.scm:1406
+#: gnu/packages/tex.scm:1869
 msgid ""
 "The command @code{\\url} is a form of verbatim command that\n"
 "allows linebreaks at certain characters or combinations of characters, accepts\n"
@@ -17699,11 +17610,11 @@ msgid ""
 "of file names."
 msgstr ""
 
-#: gnu/packages/tex.scm:1433
+#: gnu/packages/tex.scm:1896
 msgid "LaTeX3 programmers’ interface"
 msgstr ""
 
-#: gnu/packages/tex.scm:1435
+#: gnu/packages/tex.scm:1898
 msgid ""
 "The l3kernel bundle provides an implementation of the LaTeX3\n"
 "programmers’ interface, as a set of packages that run under LaTeX 2e.  The\n"
@@ -17712,11 +17623,11 @@ msgid ""
 "that the LaTeX3 conventions can be used with regular LaTeX 2e packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1480
+#: gnu/packages/tex.scm:1943
 msgid "High-level LaTeX3 concepts"
 msgstr ""
 
-#: gnu/packages/tex.scm:1482
+#: gnu/packages/tex.scm:1945
 msgid ""
 "This bundle holds prototype implementations of concepts for a LaTeX\n"
 "designer interface, to be used with the experimental LaTeX kernel as\n"
@@ -17733,11 +17644,11 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/tex.scm:1515
+#: gnu/packages/tex.scm:2005
 msgid "Advanced font selection in XeLaTeX and LuaLaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1517
+#: gnu/packages/tex.scm:2007
 msgid ""
 "Fontspec is a package for XeLaTeX and LuaLaTeX.  It provides an\n"
 "automatic and unified interface to feature-rich AAT and OpenType fonts through\n"
@@ -17745,22 +17656,35 @@ msgid ""
 "the l3kernel and xparse bundles from the LaTeX 3 development team."
 msgstr ""
 
-#: gnu/packages/tex.scm:1553
+#: gnu/packages/tex.scm:2043
 msgid "Lua modules for general programming (in the (La)TeX world)"
 msgstr ""
 
-#: gnu/packages/tex.scm:1555
+#: gnu/packages/tex.scm:2045
 msgid ""
 "Lualibs is a collection of Lua modules useful for general programming.\n"
 "The bundle is based on Lua modules shipped with ConTeXt, and made available in\n"
 "this bundle for use independent of ConTeXt."
 msgstr ""
 
-#: gnu/packages/tex.scm:1575
+#: gnu/packages/tex.scm:2133
+msgid "OpenType font loader for LuaTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:2135
+msgid ""
+"Luaotfload is an adaptation of the ConTeXt font loading system for the\n"
+"Plain and LaTeX formats.  It allows OpenType fonts to be loaded with font\n"
+"features accessible using an extended font request syntax while providing\n"
+"compatibilitywith XeTeX.  By indexing metadata in a database it facilitates\n"
+"loading fonts by their proper names instead of file names."
+msgstr ""
+
+#: gnu/packages/tex.scm:2157
 msgid "AMS mathematical facilities for LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1577
+#: gnu/packages/tex.scm:2159
 msgid ""
 "This is the principal package in the AMS-LaTeX distribution.  It adapts\n"
 "for use in LaTeX most of the mathematical features found in AMS-TeX; it is\n"
@@ -17775,11 +17699,11 @@ msgid ""
 "definitions."
 msgstr ""
 
-#: gnu/packages/tex.scm:1605
+#: gnu/packages/tex.scm:2187
 msgid "AMS document classes for LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1607
+#: gnu/packages/tex.scm:2189
 msgid ""
 "This bundle contains three AMS classes: @code{amsartamsart} (for writing\n"
 "articles for the AMS), @code{amsbookamsbook} (for books) and\n"
@@ -17788,11 +17712,11 @@ msgid ""
 "distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:1638
+#: gnu/packages/tex.scm:2220
 msgid "Multilingual support for Plain TeX or LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1640
+#: gnu/packages/tex.scm:2222
 msgid ""
 "The package manages culturally-determined typographical (and other)\n"
 "rules, and hyphenation patterns for a wide range of languages.  A document may\n"
@@ -17803,11 +17727,11 @@ msgid ""
 "polyglossia package rather than Babel."
 msgstr ""
 
-#: gnu/packages/tex.scm:1663
+#: gnu/packages/tex.scm:2245
 msgid "Babel support for English"
 msgstr ""
 
-#: gnu/packages/tex.scm:1665
+#: gnu/packages/tex.scm:2247
 msgid ""
 "This package provides the language definition file for support of\n"
 "English in @code{babel}.  Care is taken to select British hyphenation patterns\n"
@@ -17815,11 +17739,24 @@ msgid ""
 "for Canadian and USA text."
 msgstr ""
 
-#: gnu/packages/tex.scm:1686
+#: gnu/packages/tex.scm:2267
+msgid "Babel support for German"
+msgstr "Prise en charge de l'allemand dans Babel"
+
+#: gnu/packages/tex.scm:2269
+msgid ""
+"This package provides the language definition file for support of German\n"
+"in @code{babel}.  It provides all the necessary macros, definitions and\n"
+"settings to typeset German documents.  The bundle includes support for the\n"
+"traditional and reformed German orthography as well as for the Austrian and\n"
+"Swiss varieties of German."
+msgstr ""
+
+#: gnu/packages/tex.scm:2291
 msgid "Support for Cyrillic fonts in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1688
+#: gnu/packages/tex.scm:2293
 msgid ""
 "This bundle of macros files provides macro support (including font\n"
 "encoding macros) for the use of Cyrillic characters in fonts encoded under the\n"
@@ -17827,11 +17764,11 @@ msgid ""
 "language that is written in a Cyrillic alphabet."
 msgstr ""
 
-#: gnu/packages/tex.scm:1708
+#: gnu/packages/tex.scm:2313
 msgid "Font support for common PostScript fonts"
 msgstr ""
 
-#: gnu/packages/tex.scm:1710
+#: gnu/packages/tex.scm:2315
 msgid ""
 "The PSNFSS collection includes a set of files that provide a complete\n"
 "working setup of the LaTeX font selection scheme (NFSS2) for use with common\n"
@@ -17842,27 +17779,31 @@ msgid ""
 "packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1795
+#: gnu/packages/tex.scm:2356
+msgid "TeX Live base packages"
+msgstr ""
+
+#: gnu/packages/tex.scm:2357 gnu/packages/tex.scm:2445
+msgid ""
+"This is a very limited subset of the TeX Live distribution.\n"
+"It includes little more than the required set of LaTeX packages."
+msgstr ""
+
+#: gnu/packages/tex.scm:2428
 msgid "Union of TeX Live packages"
 msgstr ""
 
-#: gnu/packages/tex.scm:1796
+#: gnu/packages/tex.scm:2429
 msgid ""
 "This package provides a subset of the TeX Live\n"
 "distribution."
 msgstr "Ce paquet fournit un sous-ensemble de la distribution TeX Live."
 
-#: gnu/packages/tex.scm:1811
-msgid ""
-"This is a very limited subset of the TeX Live distribution.\n"
-"It includes little more than the required set of LaTeX packages."
-msgstr ""
-
-#: gnu/packages/tex.scm:1828
+#: gnu/packages/tex.scm:2462
 msgid "LaTeX-based replacement for BibTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1830
+#: gnu/packages/tex.scm:2464
 msgid ""
 "Amsrefs is a LaTeX package for bibliographies that provides an archival\n"
 "data format similar to the format of BibTeX database files, but adapted to\n"
@@ -17870,11 +17811,11 @@ msgid ""
 "conjunction with BibTeX or as a replacement for BibTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:1857
+#: gnu/packages/tex.scm:2491
 msgid "Footnotes for critical editions"
 msgstr ""
 
-#: gnu/packages/tex.scm:1859
+#: gnu/packages/tex.scm:2493
 msgid ""
 "This package aims to provide a one-stop solution to requirements for\n"
 "footnotes.  It offers: Multiple footnote apparatus superior to that of\n"
@@ -17888,11 +17829,11 @@ msgid ""
 "@code{suffix} packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1885
+#: gnu/packages/tex.scm:2519
 msgid "Producing 'blind' text for testing"
 msgstr ""
 
-#: gnu/packages/tex.scm:1887
+#: gnu/packages/tex.scm:2521
 msgid ""
 "The package provides the commands @code{\\blindtext} and\n"
 "@code{\\Blindtext} for creating \"blind\" text useful in testing new classes\n"
@@ -17903,11 +17844,11 @@ msgid ""
 "ipsum\" text, see the @code{lipsum} package)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1917
+#: gnu/packages/tex.scm:2558
 msgid "German letter DIN style"
 msgstr ""
 
-#: gnu/packages/tex.scm:1919
+#: gnu/packages/tex.scm:2560
 msgid ""
 "This package implements a document layout for writing letters according\n"
 "to the rules of DIN (Deutsches Institut für Normung, German standardisation\n"
@@ -17919,11 +17860,11 @@ msgid ""
 "package."
 msgstr ""
 
-#: gnu/packages/tex.scm:1943
+#: gnu/packages/tex.scm:2584
 msgid "Put a grey textual watermark on document pages"
 msgstr ""
 
-#: gnu/packages/tex.scm:1945
+#: gnu/packages/tex.scm:2586
 msgid ""
 "This package provides a means to add a textual, light grey watermark on\n"
 "every page or on the first page of a document.  Typical usage may consist in\n"
@@ -17933,11 +17874,11 @@ msgid ""
 "on everypage."
 msgstr ""
 
-#: gnu/packages/tex.scm:1967
+#: gnu/packages/tex.scm:2608
 msgid "New interface for environments in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:1969
+#: gnu/packages/tex.scm:2610
 msgid ""
 "This package provides the @code{\\collect@@body} command (as in\n"
 "@code{amsmath}), as well as a @code{\\long} version @code{\\Collect@@Body},\n"
@@ -17945,11 +17886,11 @@ msgid ""
 "define a new author interface to creating new environments."
 msgstr ""
 
-#: gnu/packages/tex.scm:1989
+#: gnu/packages/tex.scm:2630
 msgid "Create equal-widthed parboxes"
 msgstr ""
 
-#: gnu/packages/tex.scm:1991
+#: gnu/packages/tex.scm:2632
 msgid ""
 "LaTeX users sometimes need to ensure that two or more blocks of text\n"
 "occupy the same amount of horizontal space on the page.  To that end, the\n"
@@ -17963,11 +17904,11 @@ msgid ""
 "also provided."
 msgstr ""
 
-#: gnu/packages/tex.scm:2025
+#: gnu/packages/tex.scm:2666
 msgid "Expanded description environments"
 msgstr ""
 
-#: gnu/packages/tex.scm:2027
+#: gnu/packages/tex.scm:2668
 msgid ""
 "The package provides additional features for the LaTeX\n"
 "@code{description} environment, including adjustable left margin.  The package\n"
@@ -17976,11 +17917,11 @@ msgid ""
 "@code{enumerate} lists, and numbered lists remain in sequence)."
 msgstr ""
 
-#: gnu/packages/tex.scm:2061
+#: gnu/packages/tex.scm:2702
 msgid "Provide file modification times, and compare them"
 msgstr ""
 
-#: gnu/packages/tex.scm:2063
+#: gnu/packages/tex.scm:2704
 msgid ""
 "This package provides macros to read and compare the modification dates\n"
 "of files.  The files may be @code{.tex} files, images or other files (as long\n"
@@ -17992,11 +17933,11 @@ msgid ""
 "but non-expandable ones."
 msgstr ""
 
-#: gnu/packages/tex.scm:2087
+#: gnu/packages/tex.scm:2728
 msgid "Conditionals to test which platform is being used"
 msgstr ""
 
-#: gnu/packages/tex.scm:2089
+#: gnu/packages/tex.scm:2730
 msgid ""
 "This package uses the (La)TeX extension @code{-shell-escape} to\n"
 "establish whether the document is being processed on a Windows or on a\n"
@@ -18007,11 +17948,11 @@ msgid ""
 "classes of systems."
 msgstr ""
 
-#: gnu/packages/tex.scm:2112
+#: gnu/packages/tex.scm:2753
 msgid "Flexible bibliography support"
 msgstr ""
 
-#: gnu/packages/tex.scm:2114
+#: gnu/packages/tex.scm:2755
 msgid ""
 "This bundle provides a package that implements both author-year and\n"
 "numbered references, as well as much detailed of support for other\n"
@@ -18021,11 +17962,11 @@ msgid ""
 "designed from the start to be compatible with @code{natbib}."
 msgstr ""
 
-#: gnu/packages/tex.scm:2136
+#: gnu/packages/tex.scm:2777
 msgid "Replace strings in encapsulated PostScript figures"
 msgstr ""
 
-#: gnu/packages/tex.scm:2138
+#: gnu/packages/tex.scm:2779
 msgid ""
 "This package allows LaTeX constructions (equations, picture\n"
 "environments, etc.) to be precisely superimposed over Encapsulated PostScript\n"
@@ -18036,11 +17977,26 @@ msgid ""
 "rotated."
 msgstr ""
 
-#: gnu/packages/tex.scm:2174
-msgid "Process PostScript graphisc within pdfLaTeX documents"
+#: gnu/packages/tex.scm:2802
+msgid "Macros for defining and setting keys"
+msgstr "Macros pour définir et utiliser des touches"
+
+#: gnu/packages/tex.scm:2804
+msgid ""
+"This package is an extension of the @code{keyval} package and offers\n"
+"more flexible macros for defining and setting keys.  The package provides a\n"
+"pointer and a preset system.  Furthermore, it supplies macros to allow class\n"
+"and package options to contain options of the @code{key=value} form.  A LaTeX\n"
+"kernel patch is provided to avoid premature expansions of macros in class or\n"
+"package options.  A specialized system for setting @code{PSTricks} keys is\n"
+"provided by the @code{pst-xkey} package."
 msgstr ""
 
-#: gnu/packages/tex.scm:2176
+#: gnu/packages/tex.scm:2851
+msgid "Process PostScript graphics within pdfLaTeX documents"
+msgstr ""
+
+#: gnu/packages/tex.scm:2853
 msgid ""
 "This is a package for processing PostScript graphics with @code{psfrag}\n"
 "labels within pdfLaTeX documents.  Every graphic is compiled individually,\n"
@@ -18048,11 +18004,11 @@ msgid ""
 "re-processing."
 msgstr ""
 
-#: gnu/packages/tex.scm:2200
+#: gnu/packages/tex.scm:2886
 msgid "Make overhead slides"
 msgstr ""
 
-#: gnu/packages/tex.scm:2203
+#: gnu/packages/tex.scm:2889
 msgid ""
 "This package provides a class that produces overhead\n"
 "slides (transparencies), with many facilities.  Seminar is not nowadays\n"
@@ -18061,11 +18017,11 @@ msgid ""
 "21st-century presentation styles."
 msgstr ""
 
-#: gnu/packages/tex.scm:2236
+#: gnu/packages/tex.scm:2922
 msgid "Trim spaces around an argument or within a macro"
 msgstr ""
 
-#: gnu/packages/tex.scm:2238
+#: gnu/packages/tex.scm:2924
 msgid ""
 "This very short package allows you to expandably remove spaces around a\n"
 "token list (commands are provided to remove spaces before, spaces after, or\n"
@@ -18073,21 +18029,21 @@ msgid ""
 "space-stripped macros."
 msgstr ""
 
-#: gnu/packages/tex.scm:2271
+#: gnu/packages/tex.scm:2957
 msgid "Captions on more than floats"
 msgstr ""
 
-#: gnu/packages/tex.scm:2273
+#: gnu/packages/tex.scm:2959
 msgid ""
 "This package defines a command @code{\\captionof} for putting a caption\n"
 "to something that's not a float."
 msgstr ""
 
-#: gnu/packages/tex.scm:2304
+#: gnu/packages/tex.scm:2990
 msgid "Create correct hyperlinks for DOI numbers"
 msgstr ""
 
-#: gnu/packages/tex.scm:2306
+#: gnu/packages/tex.scm:2992
 msgid ""
 "You can hyperlink DOI numbers to doi.org.  However, some publishers have\n"
 "elected to use nasty characters in their DOI numbering scheme (@code{<},\n"
@@ -18097,11 +18053,11 @@ msgid ""
 "hyperlink to the target of the DOI."
 msgstr ""
 
-#: gnu/packages/tex.scm:2342
+#: gnu/packages/tex.scm:3028
 msgid "e-TeX tools for LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:2344
+#: gnu/packages/tex.scm:3030
 msgid ""
 "This package is a toolbox of programming facilities geared primarily\n"
 "towards LaTeX class and package authors.  It provides LaTeX frontends to some\n"
@@ -18112,11 +18068,11 @@ msgid ""
 "of the LaTeX kernel."
 msgstr ""
 
-#: gnu/packages/tex.scm:2380
+#: gnu/packages/tex.scm:3066
 msgid "Seven predefined chapter heading styles"
 msgstr ""
 
-#: gnu/packages/tex.scm:2382
+#: gnu/packages/tex.scm:3068
 msgid ""
 "This package provides seven predefined chapter heading styles.  Each\n"
 "style can be modified using a set of simple commands.  Optionally one can\n"
@@ -18124,11 +18080,11 @@ msgid ""
 "headings."
 msgstr ""
 
-#: gnu/packages/tex.scm:2415
+#: gnu/packages/tex.scm:3101
 msgid "Framed or shaded regions that can break across pages"
 msgstr ""
 
-#: gnu/packages/tex.scm:2417
+#: gnu/packages/tex.scm:3103
 msgid ""
 "The package creates three environments: @code{framed}, which puts an\n"
 "ordinary frame box around the region, @code{shaded}, which shades the region,\n"
@@ -18139,11 +18095,11 @@ msgid ""
 "@code{\\MakeFramed} to make your own framed-style environments."
 msgstr ""
 
-#: gnu/packages/tex.scm:2449
+#: gnu/packages/tex.scm:3135
 msgid "Letter document class"
 msgstr ""
 
-#: gnu/packages/tex.scm:2451
+#: gnu/packages/tex.scm:3137
 msgid ""
 "This package is designed for formatting formless letters in German; it\n"
 "can also be used for English (by those who can read the documentation).  There\n"
@@ -18151,21 +18107,21 @@ msgid ""
 "\"old\" and a \"new\" version of g-brief."
 msgstr ""
 
-#: gnu/packages/tex.scm:2471
+#: gnu/packages/tex.scm:3157
 msgid "Typeset Galois connections"
 msgstr ""
 
-#: gnu/packages/tex.scm:2473
+#: gnu/packages/tex.scm:3159
 msgid ""
 "The package deals with connections in two-dimensional style, optionally\n"
 "in colour."
 msgstr ""
 
-#: gnu/packages/tex.scm:2491
+#: gnu/packages/tex.scm:3177
 msgid "Citations in a reader-friendly style"
 msgstr ""
 
-#: gnu/packages/tex.scm:2493
+#: gnu/packages/tex.scm:3179
 msgid ""
 "The package allows citations in the German style, which is considered by\n"
 "many to be particularly reader-friendly.  The citation provides a small amount\n"
@@ -18175,11 +18131,11 @@ msgid ""
 "BibLaTeX, and is considered experimental."
 msgstr ""
 
-#: gnu/packages/tex.scm:2515
+#: gnu/packages/tex.scm:3203
 msgid "Flexible and complete interface to document dimensions"
 msgstr ""
 
-#: gnu/packages/tex.scm:2517
+#: gnu/packages/tex.scm:3205
 msgid ""
 "This package provides an easy and flexible user interface to customize\n"
 "page layout, implementing auto-centering and auto-balancing mechanisms so that\n"
@@ -18190,11 +18146,11 @@ msgid ""
 "ability to communicate the paper size it's set up to the output."
 msgstr ""
 
-#: gnu/packages/tex.scm:2540
+#: gnu/packages/tex.scm:3228
 msgid "Miscellaneous tools by Mark Wooding"
 msgstr ""
 
-#: gnu/packages/tex.scm:2542
+#: gnu/packages/tex.scm:3230
 msgid ""
 "This collection of tools includes: @code{atsupport} for short commands\n"
 "starting with @code{@@}, macros to sanitize the OT1 encoding of the\n"
@@ -18204,21 +18160,21 @@ msgid ""
 "array environments; verbatim handling; and syntax diagrams."
 msgstr ""
 
-#: gnu/packages/tex.scm:2564
+#: gnu/packages/tex.scm:3252
 msgid "Alternative to babel for XeLaTeX and LuaLaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:2566
+#: gnu/packages/tex.scm:3254
 msgid ""
 "This package provides a complete Babel replacement for users of LuaLaTeX\n"
 "and XeLaTeX; it relies on the @code{fontspec} package, version 2.0 at least."
 msgstr ""
 
-#: gnu/packages/tex.scm:2584
+#: gnu/packages/tex.scm:3272
 msgid "Multi-page tables package"
 msgstr ""
 
-#: gnu/packages/tex.scm:2586
+#: gnu/packages/tex.scm:3274
 msgid ""
 "This package was a predecessor of @code{longtable}; the newer\n"
 "package (designed on quite different principles) is easier to use and more\n"
@@ -18226,11 +18182,11 @@ msgid ""
 "situations where longtable has problems."
 msgstr ""
 
-#: gnu/packages/tex.scm:2619
+#: gnu/packages/tex.scm:3307
 msgid "TeX macros to handle Texinfo files"
 msgstr ""
 
-#: gnu/packages/tex.scm:2621
+#: gnu/packages/tex.scm:3309
 msgid ""
 "Texinfo is the preferred format for documentation in the GNU project;\n"
 "the format may be used to produce online or printed output from a single\n"
@@ -18239,11 +18195,11 @@ msgid ""
 "hypertext linkages in some cases)."
 msgstr ""
 
-#: gnu/packages/tex.scm:2642
+#: gnu/packages/tex.scm:3330
 msgid "Show \"realistic\" quotes in verbatim"
 msgstr ""
 
-#: gnu/packages/tex.scm:2644
+#: gnu/packages/tex.scm:3332
 msgid ""
 "Typewriter-style fonts are best for program listings, but Computer\n"
 "Modern Typewriter prints @code{`} and @code{'} as bent opening and closing\n"
@@ -18257,22 +18213,22 @@ msgid ""
 "does not affect @code{\\tt}, @code{\\texttt}, etc."
 msgstr ""
 
-#: gnu/packages/tex.scm:2683
+#: gnu/packages/tex.scm:3371
 msgid "Simple package to set up document margins"
 msgstr ""
 
-#: gnu/packages/tex.scm:2685
+#: gnu/packages/tex.scm:3373
 msgid ""
 "This is a simple package to set up document margins.  This package is\n"
 "considered obsolete; alternatives are the @code{typearea} package from the\n"
 "@code{koma-script} bundle, or the @code{geometry} package."
 msgstr ""
 
-#: gnu/packages/tex.scm:2704
+#: gnu/packages/tex.scm:3392
 msgid "Extra control of appendices"
 msgstr ""
 
-#: gnu/packages/tex.scm:2706
+#: gnu/packages/tex.scm:3394
 msgid ""
 "The appendix package provides various ways of formatting the titles of\n"
 "appendices.  Also (sub)appendices environments are provided that can be used,\n"
@@ -18281,44 +18237,44 @@ msgid ""
 "command."
 msgstr ""
 
-#: gnu/packages/tex.scm:2727
+#: gnu/packages/tex.scm:3415
 msgid "Generate changebars in LaTeX documents"
 msgstr ""
 
-#: gnu/packages/tex.scm:2729
+#: gnu/packages/tex.scm:3417
 msgid ""
 "Identify areas of text to be marked with changebars with the\n"
 "@code{\\cbstart} and @code{\\cbend} commands; the bars may be coloured.  The\n"
-"package uses 'drivers' to place the bars; the available drivers can work with\n"
-"@code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI\n"
+"package uses @code{drivers} to place the bars; the available drivers can work\n"
+"with @code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI\n"
 "drivers, and VTeX and pdfTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:2764
+#: gnu/packages/tex.scm:3452
 msgid "CMap support for PDF files"
 msgstr ""
 
-#: gnu/packages/tex.scm:2766
+#: gnu/packages/tex.scm:3454
 msgid ""
 "This package embeds CMap tables into PDF files to make search and\n"
 "copy-and-paste functions work properly."
 msgstr ""
 
-#: gnu/packages/tex.scm:2784
+#: gnu/packages/tex.scm:3472
 msgid "Add colour to LaTeX tables"
 msgstr ""
 
-#: gnu/packages/tex.scm:2786
+#: gnu/packages/tex.scm:3474
 msgid ""
 "This package allows rows, columns, and even individual cells in LaTeX\n"
 "tables to be coloured."
 msgstr ""
 
-#: gnu/packages/tex.scm:2817
+#: gnu/packages/tex.scm:3505
 msgid "Variants of \\fbox and other games with boxes"
 msgstr ""
 
-#: gnu/packages/tex.scm:2819
+#: gnu/packages/tex.scm:3507
 msgid ""
 "This package provides variants of @code{\\fbox}: @code{\\shadowbox},\n"
 "@code{\\doublebox}, @code{\\ovalbox}, @code{\\Ovalbox}, with helpful tools for\n"
@@ -18326,22 +18282,22 @@ msgid ""
 "floats, center, flushleft, and flushright, lists, and pages."
 msgstr ""
 
-#: gnu/packages/tex.scm:2852
+#: gnu/packages/tex.scm:3540
 msgid "Extensive control of page headers and footers in LaTeX2e"
 msgstr ""
 
-#: gnu/packages/tex.scm:2854
+#: gnu/packages/tex.scm:3542
 msgid ""
 "The package provides extensive facilities, both for constructing headers\n"
 "and footers, and for controlling their use (for example, at times when LaTeX\n"
 "would automatically change the heading style in use)."
 msgstr ""
 
-#: gnu/packages/tex.scm:2873
+#: gnu/packages/tex.scm:3561
 msgid "Improved interface for floating objects"
 msgstr ""
 
-#: gnu/packages/tex.scm:2875
+#: gnu/packages/tex.scm:3563
 msgid ""
 "This package improves the interface for defining floating objects such\n"
 "as figures and tables.  It introduces the boxed float, the ruled float and the\n"
@@ -18351,11 +18307,11 @@ msgid ""
 "with @code{\\floatplacement{figure}{H}}."
 msgstr ""
 
-#: gnu/packages/tex.scm:2897
+#: gnu/packages/tex.scm:3585
 msgid "Range of footnote options"
 msgstr ""
 
-#: gnu/packages/tex.scm:2899
+#: gnu/packages/tex.scm:3587
 msgid ""
 "This is a collection of ways to change the typesetting of footnotes.\n"
 "The package provides means of changing the layout of the footnotes themselves,\n"
@@ -18365,11 +18321,11 @@ msgid ""
 "footnotes with symbols rather than numbers."
 msgstr ""
 
-#: gnu/packages/tex.scm:2923
+#: gnu/packages/tex.scm:3611
 msgid "Typeset source code listings using LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:2925
+#: gnu/packages/tex.scm:3613
 msgid ""
 "The package enables the user to typeset programs (programming code)\n"
 "within LaTeX; the source code is read directly by TeX---no front-end processor\n"
@@ -18377,11 +18333,11 @@ msgid ""
 "styles.  Support for @code{hyperref} is provided."
 msgstr ""
 
-#: gnu/packages/tex.scm:2958
+#: gnu/packages/tex.scm:3646
 msgid "Miscellaneous packages by Joerg Knappen"
 msgstr ""
 
-#: gnu/packages/tex.scm:2960
+#: gnu/packages/tex.scm:3648
 msgid ""
 "This package provides miscellaneous macros by Joerg Knappen, including:\n"
 "represent counters in greek; Maxwell's non-commutative division;\n"
@@ -18393,11 +18349,11 @@ msgid ""
 "in SGML; use maths minus in text as appropriate; simple Young tableaux."
 msgstr ""
 
-#: gnu/packages/tex.scm:3035
+#: gnu/packages/tex.scm:3723
 msgid "Computer modern fonts in T1 and TS1 encodings"
 msgstr ""
 
-#: gnu/packages/tex.scm:3037
+#: gnu/packages/tex.scm:3725
 msgid ""
 "The EC fonts are European Computer Modern Fonts, supporting the complete\n"
 "LaTeX T1 encoding defined at the 1990 TUG conference hold at Cork/Ireland.\n"
@@ -18414,11 +18370,40 @@ msgid ""
 "differs from the EC in a number of particulars."
 msgstr ""
 
-#: gnu/packages/tex.scm:3118
+#: gnu/packages/tex.scm:3897 gnu/packages/tex.scm:4060
+#: gnu/packages/tex.scm:4195
+msgid "URW Base 35 font pack for LaTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:3899
+msgid ""
+"This package provides a drop-in replacements for the Times font from\n"
+"Adobe's basic set."
+msgstr ""
+"Ce paquet fournit un remplaçant direct aux polices Times de\n"
+"l'ensemble Adobe de base."
+
+#: gnu/packages/tex.scm:4062
+msgid ""
+"This package provides a drop-in replacements for the Palatino font from\n"
+"Adobe's basic set."
+msgstr ""
+"Ce paquet fournit un remplaçant direct aux polices Palatino de\n"
+"l'ensemble Adobe de base."
+
+#: gnu/packages/tex.scm:4197
+msgid ""
+"This package provides a drop-in replacements for the Zapfding font from\n"
+"Adobe's basic set."
+msgstr ""
+"Ce paquet fournit un remplaçant direct aux polices Zapfding de\n"
+"l'ensemble Adobe de base."
+
+#: gnu/packages/tex.scm:4267
 msgid "Ralph Smith's Formal Script font"
 msgstr ""
 
-#: gnu/packages/tex.scm:3120
+#: gnu/packages/tex.scm:4269
 msgid ""
 "The fonts provide uppercase formal script letters for use as symbols in\n"
 "scientific and mathematical typesetting (in contrast to the informal script\n"
@@ -18428,22 +18413,22 @@ msgid ""
 "one of the packages @code{calrsfs} and @code{mathrsfs}."
 msgstr ""
 
-#: gnu/packages/tex.scm:3142
+#: gnu/packages/tex.scm:4291
 msgid "Add picture commands (or backgrounds) to every page"
 msgstr ""
 
-#: gnu/packages/tex.scm:3144
+#: gnu/packages/tex.scm:4293
 msgid ""
 "The package adds one or more user commands to LaTeX's @code{shipout}\n"
 "routine, which may be used to place the output at fixed positions.  The\n"
 "@code{grid} option may be used to find the correct places."
 msgstr ""
 
-#: gnu/packages/tex.scm:3176
+#: gnu/packages/tex.scm:4325
 msgid "Extensions to epic and the LaTeX drawing tools"
 msgstr ""
 
-#: gnu/packages/tex.scm:3178
+#: gnu/packages/tex.scm:4327
 msgid ""
 "Extensions to @code{epic} and the LaTeX picture drawing environment,\n"
 "include the drawing of lines at any slope, the drawing of circles in any\n"
@@ -18453,11 +18438,11 @@ msgid ""
 "@code{\\special} commands."
 msgstr ""
 
-#: gnu/packages/tex.scm:3213
+#: gnu/packages/tex.scm:4362
 msgid "Customize basic list environments"
 msgstr ""
 
-#: gnu/packages/tex.scm:3215
+#: gnu/packages/tex.scm:4364
 msgid ""
 "This package is intended to ease customizing the three basic list\n"
 "environments: @code{enumerate}, @code{itemize} and @code{description}.  It\n"
@@ -18466,22 +18451,22 @@ msgid ""
 "@code{\\begin{itemize}[itemsep=1ex,leftmargin=1cm]}."
 msgstr ""
 
-#: gnu/packages/tex.scm:3236
+#: gnu/packages/tex.scm:4385
 msgid "Create tabular cells spanning multiple rows"
 msgstr ""
 
-#: gnu/packages/tex.scm:3238
+#: gnu/packages/tex.scm:4387
 msgid ""
 "The package provides tools for creating tabular cells spanning multiple\n"
 "rows.  It has a lot of flexibility, including an option for specifying an\n"
 "entry at the \"natural\" width of its text."
 msgstr ""
 
-#: gnu/packages/tex.scm:3270
+#: gnu/packages/tex.scm:4419
 msgid "Combine LaTeX commands over included graphics"
 msgstr ""
 
-#: gnu/packages/tex.scm:3272
+#: gnu/packages/tex.scm:4421
 msgid ""
 "The @code{overpic} environment is a cross between the LaTeX\n"
 "@code{picture} environment and the @code{\\includegraphics} command of\n"
@@ -18490,22 +18475,22 @@ msgid ""
 "positions; a grid for orientation is available."
 msgstr ""
 
-#: gnu/packages/tex.scm:3306
+#: gnu/packages/tex.scm:4455
 msgid "Layout with zero \\parindent, non-zero \\parskip"
 msgstr ""
 
-#: gnu/packages/tex.scm:3308
+#: gnu/packages/tex.scm:4457
 msgid ""
 "Simply changing @code{\\parskip} and @code{\\parindent} leaves a layout\n"
 "that is untidy; this package (though it is no substitute for a properly\n"
 "designed class) helps alleviate this untidiness."
 msgstr ""
 
-#: gnu/packages/tex.scm:3327
+#: gnu/packages/tex.scm:4476
 msgid "Include PDF documents in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:3329
+#: gnu/packages/tex.scm:4478
 msgid ""
 "This package simplifies the inclusion of external multi-page PDF\n"
 "documents in LaTeX documents.  Pages may be freely selected and it is possible\n"
@@ -18515,11 +18500,11 @@ msgid ""
 "use this package to insert PostScript files, in addition to PDF files."
 msgstr ""
 
-#: gnu/packages/tex.scm:3361
+#: gnu/packages/tex.scm:4510
 msgid "St Mary Road symbols for theoretical computer science"
 msgstr ""
 
-#: gnu/packages/tex.scm:3363
+#: gnu/packages/tex.scm:4512
 msgid ""
 "The fonts were originally distributed as Metafont sources only, but\n"
 "Adobe Type 1 versions are also now available.  Macro support is provided for\n"
@@ -18528,11 +18513,11 @@ msgid ""
 "the whole font."
 msgstr ""
 
-#: gnu/packages/tex.scm:3384
+#: gnu/packages/tex.scm:4533
 msgid "Figures divided into subfigures"
 msgstr ""
 
-#: gnu/packages/tex.scm:3386
+#: gnu/packages/tex.scm:4535
 msgid ""
 "This (deprecated) package provides support for the manipulation and\n"
 "reference of small or \"sub\" figures and tables within a single figure or\n"
@@ -18545,11 +18530,11 @@ msgid ""
 "the more recent @code{subcaption} package more satisfactory."
 msgstr ""
 
-#: gnu/packages/tex.scm:3411
+#: gnu/packages/tex.scm:4560
 msgid "Tabular with variable width columns balanced"
 msgstr ""
 
-#: gnu/packages/tex.scm:3413
+#: gnu/packages/tex.scm:4562
 msgid ""
 "The package defines a @code{tabular*}-like environment, @code{tabulary},\n"
 "taking a \"total width\" argument as well as the column specifications.  The\n"
@@ -18560,11 +18545,11 @@ msgid ""
 "according to the natural width of the widest cell in the column."
 msgstr ""
 
-#: gnu/packages/tex.scm:3449
+#: gnu/packages/tex.scm:4598
 msgid "Tables with captions and notes all the same width"
 msgstr ""
 
-#: gnu/packages/tex.scm:3451
+#: gnu/packages/tex.scm:4600
 msgid ""
 "This package facilitates tables with titles (captions) and notes.  The\n"
 "title and notes are given a width equal to the body of the table (a\n"
@@ -18573,11 +18558,11 @@ msgid ""
 "environment."
 msgstr ""
 
-#: gnu/packages/tex.scm:3572
+#: gnu/packages/tex.scm:4721
 msgid "Times-like fonts in support of mathematics"
 msgstr ""
 
-#: gnu/packages/tex.scm:3574
+#: gnu/packages/tex.scm:4723
 msgid ""
 "Txfonts supplies virtual text roman fonts using Adobe Times (or URW\n"
 "NimbusRomNo9L) with some modified and additional text symbols in the OT1, T1,\n"
@@ -18593,11 +18578,11 @@ msgid ""
 "TeX metrics (VF and TFM files) and macros for use with LaTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:3621
+#: gnu/packages/tex.scm:4770
 msgid "Sans-serif typeface for TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:3622
+#: gnu/packages/tex.scm:4771
 msgid ""
 "Iwona is a two-element sans-serif typeface. It was created\n"
 "as an alternative version of the Kurier typeface, which was designed in 1975\n"
@@ -18608,11 +18593,11 @@ msgid ""
 "of ink traps which typify the Kurier font."
 msgstr ""
 
-#: gnu/packages/tex.scm:3658
+#: gnu/packages/tex.scm:4807
 msgid "Select alternative section titles"
 msgstr ""
 
-#: gnu/packages/tex.scm:3660
+#: gnu/packages/tex.scm:4809
 msgid ""
 "This package provides an interface to sectioning commands for selection\n"
 "from various title styles, e.g. for marginal titles and to change the font of\n"
@@ -18621,11 +18606,11 @@ msgid ""
 "floats in a page.  You may assign headers/footers to individual floats, too."
 msgstr ""
 
-#: gnu/packages/tex.scm:3681
+#: gnu/packages/tex.scm:4830
 msgid "Arbitrary size font selection in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:3683
+#: gnu/packages/tex.scm:4832
 msgid ""
 "LaTeX, by default, restricts the sizes at which you can use its default\n"
 "computer modern fonts, to a fixed set of discrete sizes (effectively, a set\n"
@@ -18640,11 +18625,11 @@ msgid ""
 "@code{ec} fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:3710
+#: gnu/packages/tex.scm:4859
 msgid "Cyrillic fonts that support LaTeX standard encodings"
 msgstr ""
 
-#: gnu/packages/tex.scm:3712
+#: gnu/packages/tex.scm:4861
 msgid ""
 "The LH fonts address the problem of the wide variety of alphabets that\n"
 "are written with Cyrillic-style characters.  The fonts are the original basis\n"
@@ -18657,43 +18642,43 @@ msgid ""
 "OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:3750
+#: gnu/packages/tex.scm:4899
 msgid "Create scalable illustrations"
 msgstr ""
 
-#: gnu/packages/tex.scm:3752
+#: gnu/packages/tex.scm:4901
 msgid ""
 "MetaPost uses a language based on that of Metafont to produce precise\n"
 "technical illustrations.  Its output is scalable PostScript or SVG, rather\n"
 "than the bitmaps Metafont creates."
 msgstr ""
 
-#: gnu/packages/tex.scm:3771
+#: gnu/packages/tex.scm:4920
 msgid "Class for typesetting publications of ACM"
 msgstr ""
 
-#: gnu/packages/tex.scm:3773
+#: gnu/packages/tex.scm:4922
 msgid ""
 "This package provides a class for typesetting publications of the\n"
 "Association for Computing Machinery (ACM)."
 msgstr ""
 
-#: gnu/packages/tex.scm:3804
+#: gnu/packages/tex.scm:4953
 msgid "Variable-width minipage"
 msgstr ""
 
-#: gnu/packages/tex.scm:3806
+#: gnu/packages/tex.scm:4955
 msgid ""
 "The @code{varwidth} environment is superficially similar to\n"
 "@code{minipage}, but the specified width is just a maximum value — the box may\n"
 "get a narrower “natural” width."
 msgstr ""
 
-#: gnu/packages/tex.scm:3825
+#: gnu/packages/tex.scm:4974
 msgid "LaTeX support file to use the WASY2 fonts"
 msgstr ""
 
-#: gnu/packages/tex.scm:3827
+#: gnu/packages/tex.scm:4976
 msgid ""
 "The wasy2WASY2 (Waldi Symbol) font by Roland Waldi provides many glyphs\n"
 "like male and female symbols and astronomical symbols, as well as the complete\n"
@@ -18701,22 +18686,22 @@ msgid ""
 "to use interface for these symbols."
 msgstr ""
 
-#: gnu/packages/tex.scm:3860
+#: gnu/packages/tex.scm:5009
 msgid "Produces figures which text can flow around"
 msgstr ""
 
-#: gnu/packages/tex.scm:3862
+#: gnu/packages/tex.scm:5011
 msgid ""
 "This package allows figures or tables to have text wrapped around them.\n"
 "It does not work in combination with list environments, but can be used in a\n"
 "@code{parbox} or @code{minipage}, and in two-column format."
 msgstr ""
 
-#: gnu/packages/tex.scm:3894
+#: gnu/packages/tex.scm:5043
 msgid "Extended UTF-8 input encoding support for LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:3896
+#: gnu/packages/tex.scm:5045
 msgid ""
 "The bundle provides the @code{ucs} package, and @code{utf8x.def},\n"
 "together with a large number of support files.  The @code{utf8x.def}\n"
@@ -18729,11 +18714,11 @@ msgid ""
 "package of that name now exists."
 msgstr ""
 
-#: gnu/packages/tex.scm:3928
+#: gnu/packages/tex.scm:5077
 msgid "Extract bits of a LaTeX source for output"
 msgstr ""
 
-#: gnu/packages/tex.scm:3930
+#: gnu/packages/tex.scm:5079
 msgid ""
 "The main purpose of the preview package is the extraction of selected\n"
 "elements from a LaTeX source, like formulas or graphics, into separate\n"
@@ -18744,11 +18729,11 @@ msgid ""
 "files."
 msgstr ""
 
-#: gnu/packages/tex.scm:3953
+#: gnu/packages/tex.scm:5102
 msgid "Expand acronyms at least once"
 msgstr ""
 
-#: gnu/packages/tex.scm:3955
+#: gnu/packages/tex.scm:5104
 msgid ""
 "This package ensures that all acronyms used in the text are spelled out\n"
 "in full at least once.  It also provides an environment to build a list of\n"
@@ -18757,17 +18742,17 @@ msgid ""
 "e-TeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:3989
+#: gnu/packages/tex.scm:5155
 msgid "TeX extension for direct creation of PDF"
 msgstr ""
 
-#: gnu/packages/tex.scm:3991
+#: gnu/packages/tex.scm:5157
 msgid ""
 "This package provides an extension of TeX which can be configured to\n"
 "directly generate PDF documents instead of DVI."
 msgstr ""
 
-#: gnu/packages/tex.scm:4058
+#: gnu/packages/tex.scm:5229
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -18777,7 +18762,7 @@ msgid ""
 "This package contains the complete tree of texmf-dist data."
 msgstr ""
 
-#: gnu/packages/tex.scm:4121
+#: gnu/packages/tex.scm:5292
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -18787,11 +18772,11 @@ msgid ""
 "This package contains the complete TeX Live distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:4164
+#: gnu/packages/tex.scm:5335
 msgid "Interface to read and parse BibTeX files"
 msgstr ""
 
-#: gnu/packages/tex.scm:4165
+#: gnu/packages/tex.scm:5336
 msgid ""
 "@code{Text::BibTeX} is a Perl library for reading, parsing,\n"
 "and processing BibTeX files.  @code{Text::BibTeX} gives you access to the data\n"
@@ -18800,21 +18785,21 @@ msgid ""
 "values (strings, macros, or numbers) pasted together."
 msgstr ""
 
-#: gnu/packages/tex.scm:4247
+#: gnu/packages/tex.scm:5422
 msgid "Backend for the BibLaTeX citation management tool"
 msgstr ""
 
-#: gnu/packages/tex.scm:4248
+#: gnu/packages/tex.scm:5423
 msgid ""
 "Biber is a BibTeX replacement for users of biblatex.  Among\n"
 "other things it comes with full Unicode support."
 msgstr ""
 
-#: gnu/packages/tex.scm:4272
+#: gnu/packages/tex.scm:5447
 msgid "Wrapper for LaTeX and friends"
 msgstr ""
 
-#: gnu/packages/tex.scm:4274
+#: gnu/packages/tex.scm:5449
 msgid ""
 "Rubber is a program whose purpose is to handle all tasks related to the\n"
 "compilation of LaTeX documents.  This includes compiling the document itself,\n"
@@ -18824,32 +18809,32 @@ msgid ""
 "PDF documents."
 msgstr ""
 
-#: gnu/packages/tex.scm:4316
+#: gnu/packages/tex.scm:5491
 msgid "LaTeX editor"
 msgstr "Éditeur de LaTeX"
 
-#: gnu/packages/tex.scm:4317
+#: gnu/packages/tex.scm:5492
 msgid ""
 "Texmaker is a program that integrates many tools needed to\n"
 "develop documents with LaTeX, in a single application."
 msgstr ""
 
-#: gnu/packages/tex.scm:4356
+#: gnu/packages/tex.scm:5533
 msgid "Book on TeX, plain TeX and Eplain"
 msgstr ""
 
-#: gnu/packages/tex.scm:4357
+#: gnu/packages/tex.scm:5534
 msgid ""
 "@i{TeX for the Impatient} is a ~350 page book on TeX,\n"
 "plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves,\n"
 "and Karl Berry."
 msgstr ""
 
-#: gnu/packages/tex.scm:4441
+#: gnu/packages/tex.scm:5630
 msgid "Document preparation system with GUI"
 msgstr ""
 
-#: gnu/packages/tex.scm:4442
+#: gnu/packages/tex.scm:5631
 msgid ""
 "LyX is a document preparation system.  It excels at letting\n"
 "you create complex technical and scientific articles with mathematics,\n"
@@ -18858,11 +18843,11 @@ msgid ""
 "required: automatic sectioning and pagination, spell checking and so forth."
 msgstr ""
 
-#: gnu/packages/tex.scm:4476
+#: gnu/packages/tex.scm:5665
 msgid "Multimedia inclusion package with Adobe Reader-9/X compatibility"
 msgstr ""
 
-#: gnu/packages/tex.scm:4478
+#: gnu/packages/tex.scm:5667
 msgid ""
 "The package provides an interface to embed interactive Flash (SWF) and 3D\n"
 "objects (Adobe U3D & PRC), as well as video and sound files or streams in the\n"
@@ -18875,11 +18860,11 @@ msgid ""
 "specification.  It replaces the now obsolete @code{movie15} package."
 msgstr ""
 
-#: gnu/packages/tex.scm:4516
+#: gnu/packages/tex.scm:5705
 msgid "Provide OCG (Optional Content Groups) support within a PDF document"
 msgstr ""
 
-#: gnu/packages/tex.scm:4518
+#: gnu/packages/tex.scm:5707
 msgid ""
 "This package provides OCG (Optional Content Groups) support within a PDF\n"
 "document.\n"
@@ -18897,11 +18882,11 @@ msgid ""
 "It also ensures compatibility with the @code{media9} and @code{animate} packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:4550
+#: gnu/packages/tex.scm:5739
 msgid "Various LATEX packages by Martin Schröder"
 msgstr ""
 
-#: gnu/packages/tex.scm:4552
+#: gnu/packages/tex.scm:5741
 msgid ""
 "A bundle of LATEX packages by Martin Schröder; the collection comprises:\n"
 "\n"
@@ -18915,22 +18900,34 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/tex.scm:4582
+#: gnu/packages/tex.scm:5771
 msgid "Insert pagebreak if not enough space"
 msgstr ""
 
-#: gnu/packages/tex.scm:4584
+#: gnu/packages/tex.scm:5773
 msgid ""
 "Provides commands to disable pagebreaking within a given vertical\n"
 "space.  If there is not enough space between the command and the bottom of the\n"
 "page, a new page will be started."
 msgstr ""
 
-#: gnu/packages/tex.scm:4617
+#: gnu/packages/tex.scm:5796
+msgid "Margin adjustment and detection of odd/even pages"
+msgstr ""
+
+#: gnu/packages/tex.scm:5798
+msgid ""
+"The package provides commands to change the page layout in the middle of\n"
+"a document, and to robustly check for typesetting on odd or even pages.\n"
+"Instructions for use are at the end of the file.  The package is an extraction\n"
+"of code from the @code{memoir} class, whose user interface it shares."
+msgstr ""
+
+#: gnu/packages/tex.scm:5832
 msgid "UK format dates, with weekday"
 msgstr ""
 
-#: gnu/packages/tex.scm:4619
+#: gnu/packages/tex.scm:5834
 msgid ""
 "The package is used to change the format of @code{\\today}’s date,\n"
 "including the weekday, e.g., \"Saturday, 26 June 2008\", the 'UK format', which\n"
@@ -18938,11 +18935,11 @@ msgid ""
 "@code{\\maketitle} of the article class, \"June 26, 2008\", the 'US format'."
 msgstr ""
 
-#: gnu/packages/tex.scm:4653
+#: gnu/packages/tex.scm:5868
 msgid "Underline text in TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:4655
+#: gnu/packages/tex.scm:5870
 msgid ""
 "The package provides an @code{\\ul} (underline) command which will break\n"
 "over line ends; this technique may be used to replace @code{\\em} (both in that\n"
@@ -18951,11 +18948,11 @@ msgid ""
 "striking out (line through words) and crossing out (/// over words)."
 msgstr ""
 
-#: gnu/packages/tex.scm:4707
+#: gnu/packages/tex.scm:5924
 msgid "Create PostScript and PDF graphics in TeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:4709
+#: gnu/packages/tex.scm:5926
 msgid ""
 "PGF is a macro package for creating graphics.  It is platform- and\n"
 "format-independent and works together with the most important TeX backend\n"
@@ -18967,11 +18964,11 @@ msgid ""
 "produce either PostScript or PDF output."
 msgstr ""
 
-#: gnu/packages/tex.scm:4754
+#: gnu/packages/tex.scm:5971
 msgid "Bundle of versatile classes and packages"
 msgstr ""
 
-#: gnu/packages/tex.scm:4756
+#: gnu/packages/tex.scm:5973
 msgid ""
 "The KOMA-Script bundle provides replacements for the article, report, and\n"
 "book classes with emphasis on typography and versatility.  There is also a\n"
@@ -18996,22 +18993,22 @@ msgid ""
 "typearea (which are the main parts of the bundle)."
 msgstr ""
 
-#: gnu/packages/tex.scm:4806
+#: gnu/packages/tex.scm:6023
 msgid "Grab items in lists using user-specified seperation character"
 msgstr ""
 
-#: gnu/packages/tex.scm:4808
+#: gnu/packages/tex.scm:6025
 msgid ""
 "This package allows one to capture all the items of a list, for which\n"
 "the parsing character has been selected by the user, and to access any of\n"
 "these items with a simple syntax."
 msgstr ""
 
-#: gnu/packages/tex.scm:4842
+#: gnu/packages/tex.scm:6059
 msgid "Read, store and recall array-formatted data"
 msgstr ""
 
-#: gnu/packages/tex.scm:4844
+#: gnu/packages/tex.scm:6061
 msgid ""
 "This package allows the user to input formatted data into elements of a\n"
 "2-D or 3-D array and to recall that data at will by individual cell number.\n"
@@ -19019,11 +19016,11 @@ msgid ""
 "formatted text."
 msgstr ""
 
-#: gnu/packages/tex.scm:4879
+#: gnu/packages/tex.scm:6096
 msgid "Deposit verbatim text in a box"
 msgstr ""
 
-#: gnu/packages/tex.scm:4881
+#: gnu/packages/tex.scm:6098
 msgid ""
 "The package provides a @code{verbbox} environment to place its contents\n"
 "into a globally available box, or into a box specified by the user.  The\n"
@@ -19033,11 +19030,11 @@ msgid ""
 "@code{trivlist}) may not appear."
 msgstr ""
 
-#: gnu/packages/tex.scm:4916
+#: gnu/packages/tex.scm:6133
 msgid "Verbatim phrases and listings in LaTeX"
 msgstr ""
 
-#: gnu/packages/tex.scm:4918
+#: gnu/packages/tex.scm:6135
 msgid ""
 "Examplep provides sophisticated features for typesetting verbatim source\n"
 "code listings, including the display of the source code and its compiled LaTeX\n"
@@ -19050,11 +19047,103 @@ msgid ""
 "titles."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:54
+#: gnu/packages/tex.scm:6175
+msgid "Flexible diagramming macros for TeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6177
+msgid ""
+"A package for typesetting a variety of graphs and diagrams with TeX.\n"
+"Xy-pic works with most formats (including LaTeX, AMS-LaTeX, AMS-TeX, and plain\n"
+"TeX)."
+msgstr ""
+
+#: gnu/packages/tex.scm:6257
+msgid "Fonts for XY-pic"
+msgstr ""
+
+#: gnu/packages/tex.scm:6258
+msgid "This package provides the XY-pic fonts."
+msgstr "Ce paquet fournit les polices XY-pic."
+
+#: gnu/packages/tex.scm:6289
+msgid "Process bibliographies for LaTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6291
+msgid ""
+"BibTeX allows the user to store his citation data in generic form, while\n"
+"printing citations in a document in the form specified by a BibTeX style, to\n"
+"be specified in the document itself (one often needs a LaTeX citation-style\n"
+"package, such as @command{natbib} as well)."
+msgstr ""
+
+#: gnu/packages/tex.scm:6359
+msgid "Charter fonts for TeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6360
+msgid ""
+"A commercial text font donated for the common good.  Support\n"
+"for use with LaTeX is available in @code{freenfss}, part of\n"
+"@command{psnfss}. "
+msgstr ""
+
+#: gnu/packages/tex.scm:6393
+msgid "Full featured, parameter driven macro package for TeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6394
+msgid ""
+"A full featured, parameter driven macro package, which fully\n"
+"supports advanced interactive documents.  See the ConTeXt garden for a wealth\n"
+"of support information."
+msgstr ""
+
+#: gnu/packages/tex.scm:6450
+msgid "LaTeX class for producing presentations and slides"
+msgstr ""
+
+#: gnu/packages/tex.scm:6451
+msgid ""
+"The beamer LaTeX class can be used for producing slides.\n"
+"The class works in both PostScript and direct PDF output modes, using the\n"
+"@code{pgf} graphics system for visual effects.  Content is created in the\n"
+"@code{frame} environment, and each frame can be made up of a number of slides\n"
+"using a simple notation for specifying material to appear on each slide within\n"
+"a frame.  Short versions of title, authors, institute can also be specified as\n"
+"optional parameters.  Whole frame graphics are supported by plain frames.  The\n"
+"class supports @code{figure} and @code{table} environments, transparency\n"
+"effects, varying slide transitions and animations."
+msgstr ""
+
+#: gnu/packages/tex.scm:6478
+msgid "Include eXtensible Metadata Platform data in pdfLaTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6480
+msgid ""
+"The XMP (eXtensible Metadata platform) is a framework to add metadata to\n"
+"digital material to enhance the workflow in publication.  The essence is that\n"
+"the metadata is stored in an XML file, and this XML stream is then embedded in\n"
+"the file to which it applies."
+msgstr ""
+
+#: gnu/packages/tex.scm:6532
+msgid "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX"
+msgstr ""
+
+#: gnu/packages/tex.scm:6534
+msgid ""
+"This package helps LaTeX users to create PDF/X, PFD/A and other\n"
+"standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX."
+msgstr ""
+
+#: gnu/packages/texinfo.scm:55
 msgid "The GNU documentation format"
 msgstr "Le format de documentation de GNU"
 
-#: gnu/packages/texinfo.scm:56
+#: gnu/packages/texinfo.scm:57
 msgid ""
 "Texinfo is the official documentation format of the GNU project.  It\n"
 "uses a single source file using explicit commands to produce a final document\n"
@@ -19064,15 +19153,15 @@ msgid ""
 "is on expressing the content semantically, avoiding physical markup commands."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:124
+#: gnu/packages/texinfo.scm:126
 msgid "Standalone Info documentation reader"
 msgstr ""
 
-#: gnu/packages/texinfo.scm:156
+#: gnu/packages/texinfo.scm:158
 msgid "Convert Texinfo to HTML"
 msgstr ""
 
-#: gnu/packages/texinfo.scm:158
+#: gnu/packages/texinfo.scm:160
 msgid ""
 "Texi2HTML is a Perl script which converts Texinfo source files to HTML\n"
 "output.  It now supports many advanced features, such as internationalization\n"
@@ -19087,21 +19176,21 @@ msgid ""
 "Texi2HTML."
 msgstr ""
 
-#: gnu/packages/textutils.scm:79
+#: gnu/packages/textutils.scm:82
 msgid "DOS/Mac to Unix and vice versa text file format converter"
 msgstr ""
 
-#: gnu/packages/textutils.scm:81
+#: gnu/packages/textutils.scm:84
 msgid ""
 "dos2unix is a tool to convert line breaks in a text file from Unix format\n"
 "to DOS format and vice versa."
 msgstr ""
 
-#: gnu/packages/textutils.scm:106
+#: gnu/packages/textutils.scm:109
 msgid "Text encoding converter"
 msgstr ""
 
-#: gnu/packages/textutils.scm:107
+#: gnu/packages/textutils.scm:110
 msgid ""
 "The Recode library converts files between character sets and\n"
 "usages.  It recognises or produces over 200 different character sets (or about\n"
@@ -19111,61 +19200,74 @@ msgid ""
 "handy front-end to the library."
 msgstr ""
 
-#: gnu/packages/textutils.scm:131
+#: gnu/packages/textutils.scm:134
 msgid "Text encoding detection tool"
 msgstr ""
 
-#: gnu/packages/textutils.scm:132
+#: gnu/packages/textutils.scm:135
 msgid ""
 "Enca (Extremely Naive Charset Analyser) consists of libenca,\n"
 "an encoding detection library, and enca, a command line frontend, integrating\n"
 "libenca and several charset conversion libraries and tools."
 msgstr ""
 
-#: gnu/packages/textutils.scm:182
+#: gnu/packages/textutils.scm:185
 msgid "C library for processing UTF-8 Unicode data"
 msgstr ""
 
-#: gnu/packages/textutils.scm:183
+#: gnu/packages/textutils.scm:186
 msgid ""
 "utf8proc is a small C library that provides Unicode\n"
 "normalization, case-folding, and other operations for data in the UTF-8\n"
 "encoding, supporting Unicode version 9.0.0."
 msgstr ""
 
+#: gnu/packages/textutils.scm:205 gnu/packages/textutils.scm:616
+msgid "Configuration file parser library"
+msgstr ""
+
 #: gnu/packages/textutils.scm:206
+msgid ""
+"libconfuse is a configuration file parser library.  It\n"
+"supports sections and (lists of) values (strings, integers, floats, booleans\n"
+"or other sections), as well as some other features (such as\n"
+"single/double-quoted strings, environment variable expansion, functions and\n"
+"nested include statements)."
+msgstr ""
+
+#: gnu/packages/textutils.scm:236
 msgid "Gordon's text utils library"
 msgstr ""
 
-#: gnu/packages/textutils.scm:208
+#: gnu/packages/textutils.scm:238
 msgid ""
 "libgtextutils is a text utilities library used by the fastx toolkit from\n"
 "the Hannon Lab."
 msgstr ""
 
-#: gnu/packages/textutils.scm:240
+#: gnu/packages/textutils.scm:270
 msgid "C++ hash functions for strings"
 msgstr ""
 
-#: gnu/packages/textutils.scm:242
+#: gnu/packages/textutils.scm:272
 msgid ""
 "CityHash provides hash functions for strings.  The functions mix the\n"
 "input bits thoroughly but are not suitable for cryptography."
 msgstr ""
 
-#: gnu/packages/textutils.scm:280
+#: gnu/packages/textutils.scm:310
 msgid "String library with very low memory overhead"
 msgstr ""
 
-#: gnu/packages/textutils.scm:282
+#: gnu/packages/textutils.scm:312
 msgid "Ustr is a string library for C with very low memory overhead."
 msgstr ""
 
-#: gnu/packages/textutils.scm:303
+#: gnu/packages/textutils.scm:333
 msgid "C/C++ configuration file library"
 msgstr ""
 
-#: gnu/packages/textutils.scm:305
+#: gnu/packages/textutils.scm:335
 msgid ""
 "Libconfig is a simple library for manipulating structured configuration\n"
 "files.  This file format is more compact and more readable than XML.  And\n"
@@ -19173,11 +19275,11 @@ msgid ""
 "application code."
 msgstr ""
 
-#: gnu/packages/textutils.scm:325
+#: gnu/packages/textutils.scm:355
 msgid "Probabilistic fast file fingerprinting tool"
 msgstr ""
 
-#: gnu/packages/textutils.scm:327
+#: gnu/packages/textutils.scm:357
 msgid ""
 "pfff is a tool for calculating a compact digital fingerprint of a file\n"
 "by sampling randomly from the file instead of reading it in full.\n"
@@ -19186,22 +19288,22 @@ msgid ""
 "as existing hashing techniques, with provably negligible risk of collisions."
 msgstr ""
 
-#: gnu/packages/textutils.scm:348
+#: gnu/packages/textutils.scm:378
 msgid "Regular expression library"
 msgstr "Bibliothèque d'expressions régulières"
 
-#: gnu/packages/textutils.scm:349
+#: gnu/packages/textutils.scm:379
 msgid ""
 "Oniguruma is a regular expressions library.  The special\n"
 "characteristic of this library is that different character encoding for every\n"
 "regular expression object can be specified."
 msgstr ""
 
-#: gnu/packages/textutils.scm:403
+#: gnu/packages/textutils.scm:433
 msgid "Microsoft Word document reader"
 msgstr ""
 
-#: gnu/packages/textutils.scm:404
+#: gnu/packages/textutils.scm:434
 msgid ""
 "Antiword is an application for displaying Microsoft Word\n"
 "documents.  It can also convert the document to PostScript or XML.  Only\n"
@@ -19211,11 +19313,11 @@ msgid ""
 "runs Word\"."
 msgstr ""
 
-#: gnu/packages/textutils.scm:437
+#: gnu/packages/textutils.scm:467
 msgid "MS-Word to TeX or plain text converter"
 msgstr ""
 
-#: gnu/packages/textutils.scm:438
+#: gnu/packages/textutils.scm:468
 msgid ""
 "@command{catdoc} extracts text from MS-Word files, trying to\n"
 "preserve as many special printable characters as possible.  It supports\n"
@@ -19231,21 +19333,21 @@ msgid ""
 "@command{catppt}, which extracts data from PowerPoint presentations."
 msgstr ""
 
-#: gnu/packages/textutils.scm:479
+#: gnu/packages/textutils.scm:509
 msgid "Portable C++ library for handling UTF-8"
 msgstr ""
 
-#: gnu/packages/textutils.scm:480
+#: gnu/packages/textutils.scm:510
 msgid ""
 "UTF8-CPP is a C++ library for handling UTF-8 encoded text\n"
 "in a portable way."
 msgstr ""
 
-#: gnu/packages/textutils.scm:548
+#: gnu/packages/textutils.scm:578
 msgid "Bayesian text and email classifier"
 msgstr ""
 
-#: gnu/packages/textutils.scm:550
+#: gnu/packages/textutils.scm:580
 msgid ""
 "dbacl is a fast Bayesian text and email classifier.  It builds a variety\n"
 "of language models using maximum entropy (minimum divergence) principles, and\n"
@@ -19253,19 +19355,15 @@ msgid ""
 "categories."
 msgstr ""
 
-#: gnu/packages/textutils.scm:586
-msgid "Configuration file parser library"
-msgstr ""
-
-#: gnu/packages/textutils.scm:588
+#: gnu/packages/textutils.scm:618
 msgid "C library for creating and parsing configuration files."
 msgstr ""
 
-#: gnu/packages/textutils.scm:616
+#: gnu/packages/textutils.scm:646
 msgid "Syntax highlighting text component for Java Swing"
 msgstr ""
 
-#: gnu/packages/textutils.scm:617
+#: gnu/packages/textutils.scm:647
 msgid ""
 "RSyntaxTextArea is a syntax highlighting, code folding text\n"
 "component for Java Swing.  It extends @code{JTextComponent} so it integrates\n"
@@ -19274,31 +19372,31 @@ msgid ""
 "source code."
 msgstr ""
 
-#: gnu/packages/textutils.scm:655
+#: gnu/packages/textutils.scm:685
 msgid "Fast implementation of the edit distance (Levenshtein distance)"
 msgstr ""
 
-#: gnu/packages/textutils.scm:657
+#: gnu/packages/textutils.scm:687
 msgid ""
 "This library simply implements Levenshtein distance algorithm with C++\n"
 "and Cython."
 msgstr ""
 
-#: gnu/packages/textutils.scm:677
+#: gnu/packages/textutils.scm:707
 msgid "@code{runewidth} provides Go functions to work with string widths"
 msgstr ""
 
-#: gnu/packages/textutils.scm:679
+#: gnu/packages/textutils.scm:709
 msgid ""
 "The @code{runewidth} library provides Go functions for padding,\n"
 "measuring and checking the width of strings, with support east asian text."
 msgstr ""
 
-#: gnu/packages/textutils.scm:730
+#: gnu/packages/textutils.scm:760
 msgid "Recover text from @file{.docx} files, with good formatting"
 msgstr ""
 
-#: gnu/packages/textutils.scm:732
+#: gnu/packages/textutils.scm:762
 msgid ""
 "@command{docx2txt} is a Perl based command line utility to convert\n"
 "Microsoft Office @file{.docx} documents to equivalent text documents.  Latest\n"
@@ -19317,11 +19415,11 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/textutils.scm:766
+#: gnu/packages/textutils.scm:814
 msgid "Convert between Traditional Chinese and Simplified Chinese"
 msgstr ""
 
-#: gnu/packages/textutils.scm:767
+#: gnu/packages/textutils.scm:815
 msgid ""
 "Open Chinese Convert (OpenCC) converts between Traditional\n"
 "Chinese and Simplified Chinese, supporting character-level conversion,\n"
@@ -19329,43 +19427,54 @@ msgid ""
 "Mainland China, Taiwan, and Hong-Kong."
 msgstr ""
 
-#: gnu/packages/version-control.scm:137
+#: gnu/packages/textutils.scm:849
+msgid "Network Kanji Filter"
+msgstr ""
+
+#: gnu/packages/textutils.scm:850
+msgid ""
+"Nkf is yet another kanji code converter among networks,\n"
+"hosts and terminals.  It converts input kanji code to designated kanji code\n"
+"such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8, UTF-16 or UTF-32."
+msgstr ""
+
+#: gnu/packages/version-control.scm:133
 msgid "Version control system supporting both distributed and centralized workflows"
 msgstr ""
 
-#: gnu/packages/version-control.scm:139
+#: gnu/packages/version-control.scm:135
 msgid ""
 "GNU Bazaar is a version control system that allows you to record\n"
 "changes to project files over time.  It supports both a distributed workflow\n"
 "as well as the classic centralized workflow."
 msgstr ""
 
-#: gnu/packages/version-control.scm:453
+#: gnu/packages/version-control.scm:449
 msgid "Distributed version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:455
+#: gnu/packages/version-control.scm:451
 msgid ""
 "Git is a free distributed version control system designed to handle\n"
 "everything from small to very large projects with speed and efficiency."
 msgstr ""
 
-#: gnu/packages/version-control.scm:572
+#: gnu/packages/version-control.scm:568
 msgid "Library providing Git core methods"
 msgstr ""
 
-#: gnu/packages/version-control.scm:574
+#: gnu/packages/version-control.scm:570
 msgid ""
 "Libgit2 is a portable, pure C implementation of the Git core methods\n"
 "provided as a re-entrant linkable library with a solid API, allowing you to\n"
 "write native speed custom Git applications in any language with bindings."
 msgstr ""
 
-#: gnu/packages/version-control.scm:610
+#: gnu/packages/version-control.scm:607
 msgid "Transparent encryption of files in a git repository"
 msgstr ""
 
-#: gnu/packages/version-control.scm:611
+#: gnu/packages/version-control.scm:608
 msgid ""
 "git-crypt enables transparent encryption and decryption of\n"
 "files in a git repository.  Files which you choose to protect are encrypted when\n"
@@ -19377,11 +19486,11 @@ msgid ""
 "to lock down your entire repository."
 msgstr ""
 
-#: gnu/packages/version-control.scm:646
+#: gnu/packages/version-control.scm:643
 msgid "Whole remote repository encryption"
 msgstr ""
 
-#: gnu/packages/version-control.scm:647
+#: gnu/packages/version-control.scm:644
 msgid ""
 "git-remote-gcrypt is a Git remote helper to push and pull from\n"
 "repositories encrypted with GnuPG.  It works with the standard Git transports,\n"
@@ -19400,31 +19509,31 @@ msgid ""
 "collaboration using typical untrusted file hosts or services."
 msgstr ""
 
-#: gnu/packages/version-control.scm:766
+#: gnu/packages/version-control.scm:763
 msgid "Web frontend for git repositories"
 msgstr ""
 
-#: gnu/packages/version-control.scm:768
+#: gnu/packages/version-control.scm:765
 msgid ""
 "CGit is an attempt to create a fast web interface for the Git SCM, using\n"
 "a built-in cache to decrease server I/O pressure."
 msgstr ""
 
-#: gnu/packages/version-control.scm:797
+#: gnu/packages/version-control.scm:793
 msgid "Copy directory to the gh-pages branch"
 msgstr ""
 
-#: gnu/packages/version-control.scm:798
+#: gnu/packages/version-control.scm:794
 msgid ""
 "Script that copies a directory to the gh-pages branch (by\n"
 "default) of the repository."
 msgstr ""
 
-#: gnu/packages/version-control.scm:856
+#: gnu/packages/version-control.scm:852
 msgid "Python implementation of the Git object database"
 msgstr "Implémentation Python de la base de données d'objets Git"
 
-#: gnu/packages/version-control.scm:858
+#: gnu/packages/version-control.scm:854
 msgid ""
 "GitDB allows you to access @dfn{bare} Git repositories for reading and\n"
 "writing.  It aims at allowing full access to loose objects as well as packs\n"
@@ -19432,11 +19541,11 @@ msgid ""
 "allowing to handle large objects with a small memory footprint."
 msgstr ""
 
-#: gnu/packages/version-control.scm:897
+#: gnu/packages/version-control.scm:893
 msgid "Python library for interacting with Git repositories"
 msgstr "Bibliothèque Python pour interagir avec des dépôts Git"
 
-#: gnu/packages/version-control.scm:899
+#: gnu/packages/version-control.scm:895
 msgid ""
 "GitPython is a python library used to interact with Git repositories,\n"
 "high-level like git-porcelain, or low-level like git-plumbing.\n"
@@ -19447,11 +19556,11 @@ msgid ""
 "@command{git} command implementation."
 msgstr ""
 
-#: gnu/packages/version-control.scm:939
+#: gnu/packages/version-control.scm:934
 msgid "Command-line flags library for shell scripts"
 msgstr ""
 
-#: gnu/packages/version-control.scm:941
+#: gnu/packages/version-control.scm:936
 msgid ""
 "Shell Flags (shFlags) is a library written to greatly simplify the\n"
 "handling of command-line flags in Bourne based Unix shell scripts (bash, dash,\n"
@@ -19462,11 +19571,11 @@ msgid ""
 "will work."
 msgstr ""
 
-#: gnu/packages/version-control.scm:985
+#: gnu/packages/version-control.scm:980
 msgid "Git extensions for Vincent Driessen's branching model"
 msgstr ""
 
-#: gnu/packages/version-control.scm:987
+#: gnu/packages/version-control.scm:982
 msgid ""
 "Vincent Driessen's branching model is a git branching and release\n"
 "management strategy that helps developers keep track of features, hotfixes,\n"
@@ -19475,11 +19584,11 @@ msgid ""
 "lot easier."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1020
+#: gnu/packages/version-control.scm:1016
 msgid "Stacked Git"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1022
+#: gnu/packages/version-control.scm:1018
 msgid ""
 "StGit is a command-line application that provides functionality similar\n"
 "to Quilt (i.e., pushing/popping patches to/from a stack), but using Git\n"
@@ -19488,11 +19597,11 @@ msgid ""
 "manipulate them in various ways."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1058
+#: gnu/packages/version-control.scm:1055
 msgid "Version control system for @code{$HOME}"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1060
+#: gnu/packages/version-control.scm:1057
 msgid ""
 "vcsh version-controls configuration files in several Git repositories,\n"
 "all in one single directory.  They all maintain their working trees without\n"
@@ -19501,43 +19610,43 @@ msgid ""
 "though this can be overridden."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1096
+#: gnu/packages/version-control.scm:1093
 msgid "Run a command over a sequence of commits"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1098
+#: gnu/packages/version-control.scm:1095
 msgid ""
 "git-test-sequence is similar to an automated git bisect except it’s\n"
 "linear.  It will test every change between two points in the DAG.  It will\n"
 "also walk each side of a merge and test those changes individually."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1211
+#: gnu/packages/version-control.scm:1208
 msgid "Git access control layer"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1213
+#: gnu/packages/version-control.scm:1210
 msgid ""
 "Gitolite is an access control layer on top of Git, providing fine access\n"
 "control to Git repositories."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1237
+#: gnu/packages/version-control.scm:1234
 msgid "Decentralized version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1239
+#: gnu/packages/version-control.scm:1236
 msgid ""
 "Mercurial is a free, distributed source control management tool.\n"
 "It efficiently handles projects of any size\n"
 "and offers an easy and intuitive interface."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1273
+#: gnu/packages/version-control.scm:1270
 msgid "HTTP and WebDAV client library"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1275
+#: gnu/packages/version-control.scm:1272
 msgid ""
 "Neon is an HTTP and WebDAV client library, with a C interface and the\n"
 "following features:\n"
@@ -19559,24 +19668,24 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1364
+#: gnu/packages/version-control.scm:1361
 msgid "Revision control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1366
+#: gnu/packages/version-control.scm:1363
 msgid ""
-"Subversion exists to be universally recognized and adopted as a\n"
+"@dfn{Subversion} (svn) exists to be recognized and adopted as a\n"
 "centralized version control system characterized by its\n"
 "reliability as a safe haven for valuable data; the simplicity of its model and\n"
 "usage; and its ability to support the needs of a wide variety of users and\n"
 "projects, from individuals to large-scale enterprise operations."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1388
+#: gnu/packages/version-control.scm:1385
 msgid "Per-file local revision control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1390
+#: gnu/packages/version-control.scm:1387
 msgid ""
 "RCS is the original Revision Control System.  It works on a\n"
 "file-by-file basis, in contrast to subsequent version control systems such as\n"
@@ -19585,11 +19694,11 @@ msgid ""
 "machine."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1418
+#: gnu/packages/version-control.scm:1415
 msgid "Historical centralized version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1420
+#: gnu/packages/version-control.scm:1417
 msgid ""
 "CVS is a version control system, an important component of Source\n"
 "Configuration Management (SCM).  Using it, you can record the history of\n"
@@ -19597,11 +19706,11 @@ msgid ""
 "RCS, PRCS, and Aegis packages."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1466
+#: gnu/packages/version-control.scm:1455
 msgid "Export an RCS or CVS history as a fast-import stream"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1467
+#: gnu/packages/version-control.scm:1456
 msgid ""
 "This program analyzes a collection of RCS files in a CVS\n"
 "repository (or outside of one) and, when possible, emits an equivalent history\n"
@@ -19614,11 +19723,11 @@ msgid ""
 "masters from remote CVS hosts."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1494
+#: gnu/packages/version-control.scm:1483
 msgid "Version-control-agnostic ChangeLog diff and commit tool"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1496
+#: gnu/packages/version-control.scm:1485
 msgid ""
 "The vc-dwim package contains two tools, \"vc-dwim\" and \"vc-chlog\".\n"
 "vc-dwim is a tool that simplifies the task of maintaining a ChangeLog and\n"
@@ -19628,33 +19737,33 @@ msgid ""
 "standards-compliant ChangeLog entries based on the changes that it detects."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1521
+#: gnu/packages/version-control.scm:1510
 msgid "Make histograms from the output of @command{diff}"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1523
+#: gnu/packages/version-control.scm:1512
 msgid ""
 "Diffstat reads the output of @command{diff} and displays a histogram of\n"
 "the insertions, deletions, and modifications per file.  It is useful for\n"
 "reviewing large, complex patch files."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1562
+#: gnu/packages/version-control.scm:1551
 msgid "File-based version control like SCCS"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1563
+#: gnu/packages/version-control.scm:1552
 msgid ""
 "GNU CSSC provides a replacement for the legacy Unix source\n"
 "code control system SCCS.  This allows old code still under that system to be\n"
 "accessed and migrated on modern systems."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1651
+#: gnu/packages/version-control.scm:1640
 msgid "Project change supervisor"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1652
+#: gnu/packages/version-control.scm:1641
 msgid ""
 "Aegis is a project change supervisor, and performs some of\n"
 "the Software Configuration Management needed in a CASE environment.  Aegis\n"
@@ -19665,11 +19774,11 @@ msgid ""
 "any project with more than one developer, is one of Aegis's major functions."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1726
+#: gnu/packages/version-control.scm:1715
 msgid "Edit version-control repository history"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1727
+#: gnu/packages/version-control.scm:1716
 msgid ""
 "Reposurgeon enables risky operations that version-control\n"
 "systems don't want to let you do, such as editing past comments and metadata\n"
@@ -19680,32 +19789,32 @@ msgid ""
 "from Subversion to any supported Distributed Version Control System (DVCS)."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1766
+#: gnu/packages/version-control.scm:1755
 msgid "Ncurses-based text user interface for Git"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1768
+#: gnu/packages/version-control.scm:1757
 msgid ""
 "Tig is an ncurses text user interface for Git, primarily intended as\n"
 "a history browser.  It can also stage hunks for commit, or colorize the\n"
 "output of the @code{git} command."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1789
+#: gnu/packages/version-control.scm:1779
 msgid "Print the modification time of the latest file"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1791
+#: gnu/packages/version-control.scm:1781
 msgid ""
 "Recursively find the newest file in a file tree and print its\n"
 "modification time."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1836
+#: gnu/packages/version-control.scm:1826
 msgid "Multiple repository management tool"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1838
+#: gnu/packages/version-control.scm:1828
 msgid ""
 "Myrepos provides the @code{mr} command, which maps an operation (e.g.,\n"
 "fetching updates) over a collection of version control repositories.  It\n"
@@ -19713,74 +19822,42 @@ msgid ""
 "Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1868
+#: gnu/packages/version-control.scm:1858
 msgid "Use hubic as a git-annex remote"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1870
+#: gnu/packages/version-control.scm:1860
 msgid ""
 "This package allows you to use your hubic account as a \"special\n"
 "repository\" with git-annex."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1923
+#: gnu/packages/version-control.scm:1922
 msgid "Software configuration management system"
 msgstr "Système de gestion de configuration logicielle"
 
-#: gnu/packages/version-control.scm:1925
+#: gnu/packages/version-control.scm:1924
 msgid ""
 "Fossil is a distributed source control management system which supports\n"
 "access and administration over HTTP CGI or via a built-in HTTP server.  It has\n"
 "a built-in wiki, built-in file browsing, built-in tickets system, etc."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1953
+#: gnu/packages/version-control.scm:1952
 msgid "Static git page generator"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1954
+#: gnu/packages/version-control.scm:1953
 msgid ""
 "Stagit creates static pages for git repositories, the results can\n"
 "be served with a HTTP file server of your choice."
 msgstr ""
 
-#: gnu/packages/version-control.scm:2040
-msgid "Distributed Revision Control System"
-msgstr ""
-
-#: gnu/packages/version-control.scm:2042
-msgid ""
-"Darcs is a revision control system.  It is:\n"
-"\n"
-"@enumerate\n"
-"@item Distributed: Every user has access to the full command set, removing boundaries\n"
-"between server and client or committer and non-committers.\n"
-"@item Interactive: Darcs is easy to learn and efficient to use because it asks you\n"
-"questions in response to simple commands, giving you choices in your work flow.\n"
-"You can choose to record one change in a file, while ignoring another.  As you update\n"
-"from upstream, you can review each patch name, even the full diff for interesting\n"
-"patches.\n"
-"@item Smart: Originally developed by physicist David Roundy, darcs is based on a\n"
-"unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.\n"
-"@end enumerate"
-msgstr ""
-
-#: gnu/packages/version-control.scm:2095
-msgid "Java library implementing the Git version control system"
-msgstr ""
-
-#: gnu/packages/version-control.scm:2096
-msgid ""
-"JGit is a lightweight, pure Java library implementing the\n"
-"Git version control system, providing repository access routines, support for\n"
-"network protocols, and core version control algorithms."
-msgstr ""
-
-#: gnu/packages/version-control.scm:2163
+#: gnu/packages/version-control.scm:1988
 msgid "3D visualisation tool for source control repositories"
 msgstr ""
 
-#: gnu/packages/version-control.scm:2164
+#: gnu/packages/version-control.scm:1989
 msgid ""
 "@code{gource} provides a software version control\n"
 "visualization.  The repository is displayed as a tree where the root of the\n"
@@ -19789,11 +19866,11 @@ msgid ""
 "specific files and directories."
 msgstr ""
 
-#: gnu/packages/version-control.scm:2210
+#: gnu/packages/version-control.scm:2035
 msgid "Simple revision control"
 msgstr "Contrôle de version simple"
 
-#: gnu/packages/version-control.scm:2213
+#: gnu/packages/version-control.scm:2038
 #, scheme-format
 msgid ""
 "SRC (or src) is simple revision control, a version-control system for\n"
@@ -19803,23 +19880,11 @@ msgid ""
 "directory full of HOWTOs."
 msgstr ""
 
-#: gnu/packages/version-control.scm:2338
-msgid "Manage files with Git, without checking in their contents"
-msgstr ""
-
-#: gnu/packages/version-control.scm:2339
-msgid ""
-"This package allows managing files with Git, without\n"
-"checking the file contents into Git.  It can store files in many places,\n"
-"such as local hard drives and cloud storage services.  It can also be\n"
-"used to keep a folder in sync between computers."
-msgstr ""
-
-#: gnu/packages/version-control.scm:2392
+#: gnu/packages/version-control.scm:2090
 msgid "Determine when a commit was merged into a Git branch"
 msgstr ""
 
-#: gnu/packages/version-control.scm:2393
+#: gnu/packages/version-control.scm:2091
 msgid ""
 "This Git extension defines a subcommand,\n"
 "@code{when-merged}, whose core operation is to find the merge that brought a\n"
@@ -19827,11 +19892,24 @@ msgid ""
 "how information about the merge is displayed."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:214
+#: gnu/packages/version-control.scm:2135
+msgid "Incremental merge for Git"
+msgstr ""
+
+#: gnu/packages/version-control.scm:2136
+msgid ""
+"This Git extension defines a subcommand, @code{imerge},\n"
+"which performs an incremental merge between two branches.  Its two primary\n"
+"design goals are to reduce the pain of resolving merge conflicts by finding\n"
+"the smallest possible conflicts and to allow a merge to be saved, tested,\n"
+"interrupted, published, and collaborated on while in progress."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:227
 msgid "Machine emulator and virtualizer"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:216
+#: gnu/packages/virtualization.scm:229
 msgid ""
 "QEMU is a generic machine emulator and virtualizer.\n"
 "\n"
@@ -19846,15 +19924,15 @@ msgid ""
 "server and embedded PowerPC, and S390 guests."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:238
+#: gnu/packages/virtualization.scm:251
 msgid "Machine emulator and virtualizer (without GUI)"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:330
+#: gnu/packages/virtualization.scm:343
 msgid "Operating system information database"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:331
+#: gnu/packages/virtualization.scm:344
 msgid ""
 "libosinfo is a GObject based library API for managing\n"
 "information about operating systems, hypervisors and the (virtual) hardware\n"
@@ -19864,22 +19942,22 @@ msgid ""
 "all common programming languages.  Vala bindings are also provided."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:378
+#: gnu/packages/virtualization.scm:393
 msgid "Linux container tools"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:381
+#: gnu/packages/virtualization.scm:396
 msgid ""
 "LXC is a userspace interface for the Linux kernel containment features.\n"
 "Through a powerful API and simple tools, it lets Linux users easily create and\n"
 "manage system or application containers."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:464
+#: gnu/packages/virtualization.scm:481
 msgid "Simple API for virtualization"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:465
+#: gnu/packages/virtualization.scm:482
 msgid ""
 "Libvirt is a C toolkit to interact with the virtualization\n"
 "capabilities of recent versions of Linux.  The library aims at providing long\n"
@@ -19887,11 +19965,11 @@ msgid ""
 "to integrate other virtualization mechanisms if needed."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:506
+#: gnu/packages/virtualization.scm:523
 msgid "GLib wrapper around libvirt"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:507
+#: gnu/packages/virtualization.scm:524
 msgid ""
 "libvirt-glib wraps the libvirt library to provide a\n"
 "high-level object-oriented API better suited for glib-based applications, via\n"
@@ -19904,21 +19982,21 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:549
+#: gnu/packages/virtualization.scm:566
 msgid "Python bindings to libvirt"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:550
+#: gnu/packages/virtualization.scm:567
 msgid ""
 "This package provides Python bindings to the libvirt\n"
 "virtualization library."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:645
+#: gnu/packages/virtualization.scm:661
 msgid "Manage virtual machines"
 msgstr "Gestion de machines virtuelles"
 
-#: gnu/packages/virtualization.scm:647
+#: gnu/packages/virtualization.scm:663
 msgid ""
 "The virt-manager application is a desktop user interface for managing\n"
 "virtual machines through libvirt.  It primarily targets KVM VMs, but also\n"
@@ -19926,11 +20004,11 @@ msgid ""
 "domains, their live performance and resource utilization statistics."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:737
+#: gnu/packages/virtualization.scm:769
 msgid "Checkpoint and restore in user space"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:738
+#: gnu/packages/virtualization.scm:770
 msgid ""
 "Using this tool, you can freeze a running application (or\n"
 "part of it) and checkpoint it to a hard drive as a collection of files.  You\n"
@@ -19939,22 +20017,22 @@ msgid ""
 "mainly implemented in user space."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:763
+#: gnu/packages/virtualization.scm:795
 msgid "Backup and restore QEMU machines"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:764
+#: gnu/packages/virtualization.scm:796
 msgid ""
 "qmpbackup is designed to create and restore full and\n"
 "incremental backups of running QEMU virtual machines via QMP, the QEMU\n"
 "Machine Protocol."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:808
+#: gnu/packages/virtualization.scm:843
 msgid "KVM Frame Relay (KVMFR) implementation"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:809
+#: gnu/packages/virtualization.scm:844
 msgid ""
 "Looking Glass allows the use of a KVM (Kernel-based Virtual\n"
 "Machine) configured for VGA PCI Pass-through without an attached physical\n"
@@ -19962,11 +20040,11 @@ msgid ""
 "monitor/GPU."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:864
+#: gnu/packages/virtualization.scm:904
 msgid "Open container initiative runtime"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:867
+#: gnu/packages/virtualization.scm:907
 msgid ""
 "@command{runc} is a command line client for running applications\n"
 "packaged according to the\n"
@@ -19975,21 +20053,21 @@ msgid ""
 "Open Container Initiative specification."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:913
+#: gnu/packages/virtualization.scm:953
 msgid "Tool for modifying Open Container images"
 msgstr "Outil de modification d'image Open Container"
 
-#: gnu/packages/virtualization.scm:915
+#: gnu/packages/virtualization.scm:955
 msgid ""
 "@command{umoci} is a tool that allows for high-level modification of an\n"
 "Open Container Initiative (OCI) image layout and its tagged images."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:960
+#: gnu/packages/virtualization.scm:1001
 msgid "Interact with container images and container image registries"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:962
+#: gnu/packages/virtualization.scm:1003
 msgid ""
 "@command{skopeo} is a command line utility providing various operations\n"
 "with container images and container image registries.  It can:\n"
@@ -20010,22 +20088,22 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:996
+#: gnu/packages/virtualization.scm:1037
 msgid "Python bindings for Vagrant"
 msgstr "Liaisons python pour Vagrant"
 
-#: gnu/packages/virtualization.scm:998
+#: gnu/packages/virtualization.scm:1039
 msgid ""
 "Python-vagrant is a Python module that provides a thin wrapper around the\n"
 "@code{vagrant} command line executable, allowing programmatic control of Vagrant\n"
 "virtual machines."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:1049
+#: gnu/packages/virtualization.scm:1090
 msgid "Unprivileged sandboxing tool"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:1050
+#: gnu/packages/virtualization.scm:1091
 msgid ""
 "Bubblewrap is aimed at running applications in a sandbox,\n"
 "where it has restricted access to parts of the operating system or user data\n"
@@ -20035,6 +20113,31 @@ msgid ""
 "and can be made readonly."
 msgstr ""
 
+#: gnu/packages/virtualization.scm:1117
+msgid "Emulator for x86 PC"
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1119
+msgid ""
+"Bochs is an emulator which can emulate Intel x86 CPU, common I/O\n"
+"devices, and a custom BIOS.  It can also be compiled to emulate many different\n"
+"x86 CPUs, from early 386 to the most recent x86-64 Intel and AMD processors.\n"
+"Bochs can run most Operating Systems inside the emulation including Linux,\n"
+"DOS or Microsoft Windows."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1322
+msgid "Xen Virtual Machine Monitor"
+msgstr "Xen Virtual Machine Monitor"
+
+#: gnu/packages/virtualization.scm:1323
+msgid ""
+"This package provides the Xen Virtual Machine Monitor\n"
+"which is a hypervisor."
+msgstr ""
+"Ce paquet fournit le moniteur de machines virtuelles Xen\n"
+"qui est un hyperviseur."
+
 #: gnu/packages/webkit.scm:152
 msgid "Web content engine for GTK+"
 msgstr ""
@@ -20071,95 +20174,95 @@ msgid ""
 "Interface} specification."
 msgstr ""
 
-#: gnu/packages/web.scm:275
+#: gnu/packages/web.scm:277
 msgid "HTTP and reverse proxy server"
 msgstr ""
 
-#: gnu/packages/web.scm:277
+#: gnu/packages/web.scm:279
 msgid ""
 "Nginx (\"engine X\") is a high-performance web and reverse proxy server\n"
 "created by Igor Sysoev.  It can be used both as a stand-alone web server\n"
 "and as a proxy to reduce the load on back-end HTTP or mail servers."
 msgstr ""
 
-#: gnu/packages/web.scm:322
+#: gnu/packages/web.scm:324
 msgid "XSLScript with NGinx specific modifications"
 msgstr ""
 
-#: gnu/packages/web.scm:324
+#: gnu/packages/web.scm:326
 msgid ""
 "XSLScript is a terse notation for writing complex XSLT stylesheets.\n"
 "This is modified version, specifically intended for use with the NGinx\n"
 "documentation."
 msgstr ""
 
-#: gnu/packages/web.scm:378
+#: gnu/packages/web.scm:379
 msgid "Documentation for the nginx web server"
 msgstr "Documentation du serveur web nginx"
 
-#: gnu/packages/web.scm:380
+#: gnu/packages/web.scm:381
 msgid "This package provides HTML documentation for the nginx web server."
 msgstr "Ce paquet fournit la documentation HTML du serveur web nginx."
 
-#: gnu/packages/web.scm:403
+#: gnu/packages/web.scm:404
 msgid "Language-independent, high-performant extension to CGI"
 msgstr ""
 
-#: gnu/packages/web.scm:404
+#: gnu/packages/web.scm:405
 msgid ""
 "FastCGI is a language-independent, scalable extension to CGI\n"
 "that provides high performance without the limitations of server specific\n"
 "APIs."
 msgstr ""
 
-#: gnu/packages/web.scm:435
+#: gnu/packages/web.scm:436
 msgid "Simple server for running CGI applications over FastCGI"
 msgstr ""
 
-#: gnu/packages/web.scm:436
+#: gnu/packages/web.scm:437
 msgid ""
 "Fcgiwrap is a simple server for running CGI applications\n"
 "over FastCGI.  It hopes to provide clean CGI support to Nginx (and other web\n"
 "servers that may need it)."
 msgstr ""
 
-#: gnu/packages/web.scm:467
+#: gnu/packages/web.scm:468
 msgid "PSGI/Plack web server"
 msgstr ""
 
-#: gnu/packages/web.scm:468
+#: gnu/packages/web.scm:469
 msgid ""
 "Starman is a PSGI perl web server that has unique features\n"
 "such as high performance, preforking, signal support, superdaemon awareness,\n"
 "and UNIX socket support."
 msgstr ""
 
-#: gnu/packages/web.scm:500
+#: gnu/packages/web.scm:501
 msgid "Java Web Start"
 msgstr ""
 
-#: gnu/packages/web.scm:502
+#: gnu/packages/web.scm:503
 msgid ""
 "IcedTea-Web is an implementation of the @dfn{Java Network Launching\n"
 "Protocol}, also known as Java Web Start.  This package provides tools and\n"
 "libraries for working with JNLP applets."
 msgstr ""
 
-#: gnu/packages/web.scm:523
+#: gnu/packages/web.scm:526
 msgid "JSON C library"
 msgstr "La bibliothèque C JSON"
 
-#: gnu/packages/web.scm:525
+#: gnu/packages/web.scm:528
 msgid ""
 "Jansson is a C library for encoding, decoding and manipulating JSON\n"
 "data."
 msgstr ""
 
-#: gnu/packages/web.scm:552
+#: gnu/packages/web.scm:555
 msgid "JSON implementation in C"
 msgstr ""
 
-#: gnu/packages/web.scm:554
+#: gnu/packages/web.scm:557
 msgid ""
 "JSON-C implements a reference counting object model that allows you to\n"
 "easily construct JSON objects in C, output them as JSON-formatted strings and\n"
@@ -20167,11 +20270,11 @@ msgid ""
 "It aims to conform to RFC 7159."
 msgstr ""
 
-#: gnu/packages/web.scm:605
+#: gnu/packages/web.scm:608
 msgid "JSON parser written in ANSI C"
 msgstr ""
 
-#: gnu/packages/web.scm:606
+#: gnu/packages/web.scm:609
 msgid ""
 "This package provides a very low footprint JSON parser\n"
 "written in portable ANSI C.\n"
@@ -20184,22 +20287,22 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/web.scm:650
+#: gnu/packages/web.scm:653
 msgid "Library that maps JSON data to QVariant objects"
 msgstr ""
 
-#: gnu/packages/web.scm:651
+#: gnu/packages/web.scm:654
 msgid ""
 "QJson is a Qt-based library that maps JSON data to\n"
 "@code{QVariant} objects.  JSON arrays will be mapped to @code{QVariantList}\n"
 "instances, while JSON's objects will be mapped to @code{QVariantMap}."
 msgstr ""
 
-#: gnu/packages/web.scm:735
+#: gnu/packages/web.scm:738
 msgid "Hierarchical data exploration with zoomable HTML5 pie charts"
 msgstr ""
 
-#: gnu/packages/web.scm:737
+#: gnu/packages/web.scm:740
 msgid ""
 "Krona is a flexible tool for exploring the relative proportions of\n"
 "hierarchical data, such as metagenomic classifications, using a radial,\n"
@@ -20208,42 +20311,42 @@ msgid ""
 "current version of any major web browser."
 msgstr ""
 
-#: gnu/packages/web.scm:777
+#: gnu/packages/web.scm:781
 msgid "JSON parser/generator for C++ with both SAX/DOM style API"
 msgstr ""
 
-#: gnu/packages/web.scm:779
+#: gnu/packages/web.scm:783
 msgid ""
 "RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM\n"
 "style API."
 msgstr ""
 
-#: gnu/packages/web.scm:805
+#: gnu/packages/web.scm:810
 msgid "C library for parsing JSON"
 msgstr ""
 
-#: gnu/packages/web.scm:807
+#: gnu/packages/web.scm:812
 msgid ""
 "Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON\n"
 "parser written in ANSI C and a small validating JSON generator."
 msgstr ""
 
-#: gnu/packages/web.scm:837
+#: gnu/packages/web.scm:842
 msgid "WebSockets library written in C"
 msgstr ""
 
-#: gnu/packages/web.scm:839
+#: gnu/packages/web.scm:844
 msgid ""
 "Libwebsockets is a library that allows C programs to establish client\n"
 "and server WebSockets connections---a protocol layered above HTTP that allows\n"
 "for efficient socket-like bidirectional reliable communication channels."
 msgstr ""
 
-#: gnu/packages/web.scm:867
+#: gnu/packages/web.scm:872
 msgid "C library for the Publix Suffix List"
 msgstr ""
 
-#: gnu/packages/web.scm:869
+#: gnu/packages/web.scm:874
 msgid ""
 "A \"public suffix\" is a domain name under which Internet users can\n"
 "directly register own names.\n"
@@ -20261,21 +20364,21 @@ msgid ""
 "UTS#46."
 msgstr ""
 
-#: gnu/packages/web.scm:915
+#: gnu/packages/web.scm:920
 msgid "HTML validator and tidier"
 msgstr ""
 
-#: gnu/packages/web.scm:916
+#: gnu/packages/web.scm:921
 msgid ""
 "HTML Tidy is a command-line tool and C library that can be\n"
 "used to validate and fix HTML data."
 msgstr ""
 
-#: gnu/packages/web.scm:948
+#: gnu/packages/web.scm:953
 msgid "Light-weight HTTP/HTTPS proxy daemon"
 msgstr ""
 
-#: gnu/packages/web.scm:949
+#: gnu/packages/web.scm:954
 msgid ""
 "Tinyproxy is a light-weight HTTP/HTTPS proxy\n"
 "daemon.  Designed from the ground up to be fast and yet small, it is an ideal\n"
@@ -20284,22 +20387,22 @@ msgid ""
 "unavailable."
 msgstr ""
 
-#: gnu/packages/web.scm:982
+#: gnu/packages/web.scm:987
 msgid "Small caching web proxy"
 msgstr ""
 
-#: gnu/packages/web.scm:984
+#: gnu/packages/web.scm:989
 msgid ""
 "Polipo is a small caching web proxy (web cache, HTTP proxy, and proxy\n"
 "server).  It was primarily designed to be used by one person or a small group\n"
 "of people."
 msgstr ""
 
-#: gnu/packages/web.scm:1011
+#: gnu/packages/web.scm:1017
 msgid "WebSockets support for any application/server"
 msgstr ""
 
-#: gnu/packages/web.scm:1012
+#: gnu/packages/web.scm:1018
 msgid ""
 "Websockify translates WebSockets traffic to normal socket\n"
 "traffic.  Websockify accepts the WebSockets handshake, parses it, and then\n"
@@ -20307,11 +20410,11 @@ msgid ""
 "directions."
 msgstr ""
 
-#: gnu/packages/web.scm:1038
+#: gnu/packages/web.scm:1044
 msgid "Caching web proxy optimized for intermittent internet links"
 msgstr ""
 
-#: gnu/packages/web.scm:1039
+#: gnu/packages/web.scm:1045
 msgid ""
 "WWWOFFLE is a proxy web server that is especially good for\n"
 "intermittent internet links.  It can cache HTTP, HTTPS, FTP, and finger\n"
@@ -20320,11 +20423,11 @@ msgid ""
 "changes, and much more."
 msgstr ""
 
-#: gnu/packages/web.scm:1064
+#: gnu/packages/web.scm:1070
 msgid "C library implementing the OAuth API"
 msgstr "Bibliothèque C implémentant l'API OAuth"
 
-#: gnu/packages/web.scm:1066
+#: gnu/packages/web.scm:1072
 msgid ""
 "liboauth is a collection of C functions implementing the OAuth API.\n"
 "liboauth provides functions to escape and encode strings according to OAuth\n"
@@ -20333,42 +20436,42 @@ msgid ""
 "hash/signatures."
 msgstr ""
 
-#: gnu/packages/web.scm:1089
+#: gnu/packages/web.scm:1095
 msgid "YAML 1.1 parser and emitter written in C"
 msgstr ""
 
-#: gnu/packages/web.scm:1091
+#: gnu/packages/web.scm:1097
 msgid "LibYAML is a YAML 1.1 parser and emitter written in C."
 msgstr ""
 
-#: gnu/packages/web.scm:1108 gnu/packages/web.scm:1142
-#: gnu/packages/web.scm:1165
+#: gnu/packages/web.scm:1114 gnu/packages/web.scm:1148
+#: gnu/packages/web.scm:1171
 msgid "Media stream URL parser"
 msgstr ""
 
-#: gnu/packages/web.scm:1109
+#: gnu/packages/web.scm:1115
 msgid ""
 "This package contains support scripts called by libquvi to\n"
 "parse media stream properties."
 msgstr ""
 
-#: gnu/packages/web.scm:1143
+#: gnu/packages/web.scm:1149
 msgid ""
 "libquvi is a library with a C API for parsing media stream\n"
 "URLs and extracting their actual media files."
 msgstr ""
 
-#: gnu/packages/web.scm:1166
+#: gnu/packages/web.scm:1172
 msgid ""
 "quvi is a command-line-tool suite to extract media files\n"
 "from streaming URLs.  It is a command-line wrapper for the libquvi library."
 msgstr ""
 
-#: gnu/packages/web.scm:1238
+#: gnu/packages/web.scm:1244
 msgid "High-performance asynchronous HTTP client library"
 msgstr ""
 
-#: gnu/packages/web.scm:1240
+#: gnu/packages/web.scm:1246
 msgid ""
 "serf is a C-based HTTP client library built upon the Apache Portable\n"
 "Runtime (APR) library.  It multiplexes connections, running the read/write\n"
@@ -20376,49 +20479,61 @@ msgid ""
 "minimum to provide high performance operation."
 msgstr ""
 
-#: gnu/packages/web.scm:1292
+#: gnu/packages/web.scm:1280
+msgid "SASS Compiler, implemented as a C/C++ library"
+msgstr ""
+
+#: gnu/packages/web.scm:1282
+msgid ""
+"LibSass is a @acronym{SASS,Syntactically awesome style sheets} compiler\n"
+"library designed for portability and efficiency.  To actually compile SASS\n"
+"stylesheets, you'll need to use another program that uses this library,\n"
+"@var{sassc} for example."
+msgstr ""
+
+#: gnu/packages/web.scm:1331
 msgid "CSS pre-processor"
 msgstr ""
 
-#: gnu/packages/web.scm:1293
+#: gnu/packages/web.scm:1332
 msgid ""
 "SassC is a compiler written in C for the CSS pre-processor\n"
 "language known as SASS."
 msgstr ""
 
-#: gnu/packages/web.scm:1322
+#: gnu/packages/web.scm:1360
 msgid "Compile a log format string to perl-code"
 msgstr ""
 
-#: gnu/packages/web.scm:1323
+#: gnu/packages/web.scm:1361
 msgid ""
 "This module provides methods to compile a log format string\n"
 "to perl-code, for faster generation of access_log lines."
 msgstr ""
 
-#: gnu/packages/web.scm:1351
+#: gnu/packages/web.scm:1389
 msgid "SASL authentication framework"
 msgstr ""
 
-#: gnu/packages/web.scm:1352
+#: gnu/packages/web.scm:1390
 msgid "Authen::SASL provides an SASL authentication framework."
 msgstr ""
 
-#: gnu/packages/web.scm:1377
+#: gnu/packages/web.scm:1415
 msgid "Sensible default Catalyst action"
 msgstr ""
 
-#: gnu/packages/web.scm:1378
+#: gnu/packages/web.scm:1416
 msgid ""
 "This Catalyst action implements a sensible default end\n"
 "action, which will forward to the first available view."
 msgstr ""
 
-#: gnu/packages/web.scm:1410
+#: gnu/packages/web.scm:1448
 msgid "Automated REST Method Dispatching"
 msgstr ""
 
-#: gnu/packages/web.scm:1411
+#: gnu/packages/web.scm:1449
 msgid ""
 "This Action handles doing automatic method dispatching for\n"
 "REST requests.  It takes a normal Catalyst action, and changes the dispatch to\n"
@@ -20427,32 +20542,32 @@ msgid ""
 "regular method."
 msgstr ""
 
-#: gnu/packages/web.scm:1448
+#: gnu/packages/web.scm:1486
 msgid "Storage class for Catalyst authentication using DBIx::Class"
 msgstr ""
 
-#: gnu/packages/web.scm:1449
+#: gnu/packages/web.scm:1487
 msgid ""
 "The Catalyst::Authentication::Store::DBIx::Class class\n"
 "provides access to authentication information stored in a database via\n"
 "DBIx::Class."
 msgstr ""
 
-#: gnu/packages/web.scm:1475
+#: gnu/packages/web.scm:1513
 msgid "Create only one instance of Moose component per context"
 msgstr ""
 
-#: gnu/packages/web.scm:1476
+#: gnu/packages/web.scm:1514
 msgid ""
 "Catalyst::Component::InstancePerContext returns a new\n"
 "instance of a component on each request."
 msgstr ""
 
-#: gnu/packages/web.scm:1513
+#: gnu/packages/web.scm:1551
 msgid "Catalyst Development Tools"
 msgstr ""
 
-#: gnu/packages/web.scm:1514
+#: gnu/packages/web.scm:1552
 msgid ""
 "The Catalyst-Devel distribution includes a variety of\n"
 "modules useful for the development of Catalyst applications, but not required\n"
@@ -20462,11 +20577,11 @@ msgid ""
 "modules."
 msgstr ""
 
-#: gnu/packages/web.scm:1543
+#: gnu/packages/web.scm:1581
 msgid "Regex DispatchType for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1544
+#: gnu/packages/web.scm:1582
 msgid ""
 "Dispatch type managing path-matching behaviour using\n"
 "regexes.  Regex dispatch types have been deprecated and removed from Catalyst\n"
@@ -20476,32 +20591,32 @@ msgid ""
 "when the dispatch type is first seen in your application."
 msgstr ""
 
-#: gnu/packages/web.scm:1593
+#: gnu/packages/web.scm:1631
 msgid "DBIx::Class::Schema Model Class"
 msgstr ""
 
-#: gnu/packages/web.scm:1594
+#: gnu/packages/web.scm:1632
 msgid ""
 "This is a Catalyst Model for DBIx::Class::Schema-based\n"
 "Models."
 msgstr ""
 
-#: gnu/packages/web.scm:1617
+#: gnu/packages/web.scm:1655
 msgid "Request logging from within Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1618
+#: gnu/packages/web.scm:1656
 msgid ""
 "This Catalyst plugin enables you to create \"access logs\"\n"
 "from within a Catalyst application instead of requiring a webserver to do it\n"
 "for you.  It will work even with Catalyst debug logging turned off."
 msgstr ""
 
-#: gnu/packages/web.scm:1652
+#: gnu/packages/web.scm:1690
 msgid "Infrastructure plugin for the Catalyst authentication framework"
 msgstr ""
 
-#: gnu/packages/web.scm:1653
+#: gnu/packages/web.scm:1691
 msgid ""
 "The authentication plugin provides generic user support for\n"
 "Catalyst apps.  It is the basis for both authentication (checking the user is\n"
@@ -20509,52 +20624,52 @@ msgid ""
 "system authorises them to do)."
 msgstr ""
 
-#: gnu/packages/web.scm:1684
+#: gnu/packages/web.scm:1722
 msgid "Role-based authorization for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1685
+#: gnu/packages/web.scm:1723
 msgid ""
 "Catalyst::Plugin::Authorization::Roles provides role-based\n"
 "authorization for Catalyst based on Catalyst::Plugin::Authentication."
 msgstr ""
 
-#: gnu/packages/web.scm:1708
+#: gnu/packages/web.scm:1746
 msgid "Captchas for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1709
+#: gnu/packages/web.scm:1747
 msgid ""
 "This plugin creates and validates Captcha images for\n"
 "Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1736
+#: gnu/packages/web.scm:1774
 msgid "Load config files of various types"
 msgstr ""
 
-#: gnu/packages/web.scm:1737
+#: gnu/packages/web.scm:1775
 msgid ""
 "This module will attempt to load find and load configuration\n"
 "files of various types.  Currently it supports YAML, JSON, XML, INI and Perl\n"
 "formats."
 msgstr ""
 
-#: gnu/packages/web.scm:1769
+#: gnu/packages/web.scm:1806
 msgid "Catalyst generic session plugin"
 msgstr ""
 
-#: gnu/packages/web.scm:1770
+#: gnu/packages/web.scm:1807
 msgid ""
 "This plugin links the two pieces required for session\n"
 "management in web applications together: the state, and the store."
 msgstr ""
 
-#: gnu/packages/web.scm:1798
+#: gnu/packages/web.scm:1835
 msgid "Maintain session IDs using cookies"
 msgstr ""
 
-#: gnu/packages/web.scm:1799
+#: gnu/packages/web.scm:1836
 msgid ""
 "In order for Catalyst::Plugin::Session to work, the session\n"
 "ID needs to be stored on the client, and the session data needs to be stored\n"
@@ -20562,22 +20677,22 @@ msgid ""
 "cookie mechanism."
 msgstr ""
 
-#: gnu/packages/web.scm:1829
+#: gnu/packages/web.scm:1866
 msgid "FastMmap session storage backend"
 msgstr ""
 
-#: gnu/packages/web.scm:1830
+#: gnu/packages/web.scm:1867
 msgid ""
 "Catalyst::Plugin::Session::Store::FastMmap is a fast session\n"
 "storage plugin for Catalyst that uses an mmap'ed file to act as a shared\n"
 "memory interprocess cache.  It is based on Cache::FastMmap."
 msgstr ""
 
-#: gnu/packages/web.scm:1855
+#: gnu/packages/web.scm:1892
 msgid "Stack trace on the Catalyst debug screen"
 msgstr ""
 
-#: gnu/packages/web.scm:1856
+#: gnu/packages/web.scm:1893
 msgid ""
 "This plugin enhances the standard Catalyst debug screen by\n"
 "including a stack trace of your application up to the point where the error\n"
@@ -20585,11 +20700,11 @@ msgid ""
 "number, file name, and code context surrounding the line number."
 msgstr ""
 
-#: gnu/packages/web.scm:1884
+#: gnu/packages/web.scm:1921
 msgid "Simple serving of static pages"
 msgstr ""
 
-#: gnu/packages/web.scm:1885
+#: gnu/packages/web.scm:1922
 msgid ""
 "The Static::Simple plugin is designed to make serving static\n"
 "content in your application during development quick and easy, without\n"
@@ -20600,11 +20715,11 @@ msgid ""
 "MIME type directly to the browser, without being processed through Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1947
+#: gnu/packages/web.scm:1984
 msgid "The Catalyst Framework Runtime"
 msgstr ""
 
-#: gnu/packages/web.scm:1948
+#: gnu/packages/web.scm:1985
 msgid ""
 "Catalyst is a modern framework for making web applications.\n"
 "It is designed to make it easy to manage the various tasks you need to do to\n"
@@ -20612,11 +20727,11 @@ msgid ""
 "\"plug in\" existing Perl modules that do what you need."
 msgstr ""
 
-#: gnu/packages/web.scm:1979
+#: gnu/packages/web.scm:2016
 msgid "Replace request base with value passed by HTTP proxy"
 msgstr ""
 
-#: gnu/packages/web.scm:1980
+#: gnu/packages/web.scm:2017
 msgid ""
 "This module is a Moose::Role which allows you more\n"
 "flexibility in your application's deployment configurations when deployed\n"
@@ -20624,42 +20739,42 @@ msgid ""
 "replaced with the contents of the X-Request-Base header."
 msgstr ""
 
-#: gnu/packages/web.scm:2007
+#: gnu/packages/web.scm:2044
 msgid "Download data in many formats"
 msgstr ""
 
-#: gnu/packages/web.scm:2008
+#: gnu/packages/web.scm:2045
 msgid ""
 "The purpose of this module is to provide a method for\n"
 "downloading data into many supportable formats.  For example, downloading a\n"
 "table based report in a variety of formats (CSV, HTML, etc.)."
 msgstr ""
 
-#: gnu/packages/web.scm:2034
+#: gnu/packages/web.scm:2071
 msgid "Catalyst JSON view"
 msgstr ""
 
-#: gnu/packages/web.scm:2035
+#: gnu/packages/web.scm:2072
 msgid ""
 "Catalyst::View::JSON is a Catalyst View handler that returns\n"
 "stash data in JSON format."
 msgstr ""
 
-#: gnu/packages/web.scm:2061
+#: gnu/packages/web.scm:2098
 msgid "Template View Class"
 msgstr ""
 
-#: gnu/packages/web.scm:2062
+#: gnu/packages/web.scm:2099
 msgid ""
 "This module is a Catalyst view class for the Template\n"
 "Toolkit."
 msgstr ""
 
-#: gnu/packages/web.scm:2091
+#: gnu/packages/web.scm:2128
 msgid "Trait Loading and Resolution for Catalyst Components"
 msgstr ""
 
-#: gnu/packages/web.scm:2092
+#: gnu/packages/web.scm:2129
 msgid ""
 "Adds a \"COMPONENT\" in Catalyst::Component method to your\n"
 "Catalyst component base class that reads the optional \"traits\" parameter\n"
@@ -20668,31 +20783,31 @@ msgid ""
 "MooseX::Traits::Pluggable."
 msgstr ""
 
-#: gnu/packages/web.scm:2117
+#: gnu/packages/web.scm:2154
 msgid "Apply roles to Catalyst classes"
 msgstr ""
 
-#: gnu/packages/web.scm:2118
+#: gnu/packages/web.scm:2155
 msgid ""
 "CatalystX::RoleApplicator applies roles to Catalyst\n"
 "application classes."
 msgstr ""
 
-#: gnu/packages/web.scm:2145
+#: gnu/packages/web.scm:2182
 msgid "Catalyst development server with Starman"
 msgstr ""
 
-#: gnu/packages/web.scm:2146
+#: gnu/packages/web.scm:2183
 msgid ""
 "This module provides a Catalyst extension to replace the\n"
 "development server with Starman."
 msgstr ""
 
-#: gnu/packages/web.scm:2170
+#: gnu/packages/web.scm:2207
 msgid "Handle Common Gateway Interface requests and responses"
 msgstr ""
 
-#: gnu/packages/web.scm:2171
+#: gnu/packages/web.scm:2208
 msgid ""
 "CGI.pm is a stable, complete and mature solution for\n"
 "processing and preparing HTTP requests and responses.  Major features include\n"
@@ -20701,72 +20816,72 @@ msgid ""
 "headers."
 msgstr ""
 
-#: gnu/packages/web.scm:2196
+#: gnu/packages/web.scm:2233
 msgid "Generate and process stateful forms"
 msgstr ""
 
-#: gnu/packages/web.scm:2198
+#: gnu/packages/web.scm:2235
 msgid ""
 "@code{CGI::FormBuilder} provides an easy way to generate and process CGI\n"
 "form-based applications."
 msgstr ""
 
-#: gnu/packages/web.scm:2223
+#: gnu/packages/web.scm:2260
 msgid "Persistent session data in CGI applications"
 msgstr ""
 
-#: gnu/packages/web.scm:2225
+#: gnu/packages/web.scm:2262
 msgid ""
 "@code{CGI::Session} provides modular session management system across\n"
 "HTTP requests."
 msgstr ""
 
-#: gnu/packages/web.scm:2248
+#: gnu/packages/web.scm:2284
 msgid "CGI interface that is CGI.pm compliant"
 msgstr ""
 
-#: gnu/packages/web.scm:2249
+#: gnu/packages/web.scm:2285
 msgid ""
 "CGI::Simple provides a relatively lightweight drop in\n"
 "replacement for CGI.pm.  It shares an identical OO interface to CGI.pm for\n"
 "parameter parsing, file upload, cookie handling and header generation."
 msgstr ""
 
-#: gnu/packages/web.scm:2270
+#: gnu/packages/web.scm:2306
 msgid "Build structures from CGI data"
 msgstr ""
 
-#: gnu/packages/web.scm:2271
+#: gnu/packages/web.scm:2307
 msgid ""
 "This is a module for building structured data from CGI\n"
 "inputs, in a manner reminiscent of how PHP does."
 msgstr ""
 
-#: gnu/packages/web.scm:2294
+#: gnu/packages/web.scm:2330
 msgid "Date conversion routines"
 msgstr ""
 
-#: gnu/packages/web.scm:2295
+#: gnu/packages/web.scm:2331
 msgid ""
 "This module provides functions that deal with the date\n"
 "formats used by the HTTP protocol."
 msgstr ""
 
-#: gnu/packages/web.scm:2315
+#: gnu/packages/web.scm:2351
 msgid "MD5 sums for files and urls"
 msgstr ""
 
-#: gnu/packages/web.scm:2316
+#: gnu/packages/web.scm:2352
 msgid ""
 "Digest::MD5::File is a Perl extension for getting MD5 sums\n"
 "for files and urls."
 msgstr ""
 
-#: gnu/packages/web.scm:2334
+#: gnu/packages/web.scm:2370
 msgid "Perl locale encoding determination"
 msgstr ""
 
-#: gnu/packages/web.scm:2336
+#: gnu/packages/web.scm:2372
 msgid ""
 "The POSIX locale system is used to specify both the language\n"
 "conventions requested by the user and the preferred character set to\n"
@@ -20778,110 +20893,110 @@ msgid ""
 "with Encode::decode(locale => $string)."
 msgstr ""
 
-#: gnu/packages/web.scm:2371
+#: gnu/packages/web.scm:2407
 msgid "Syndication feed auto-discovery"
 msgstr ""
 
-#: gnu/packages/web.scm:2372
+#: gnu/packages/web.scm:2408
 msgid ""
 "@code{Feed::Find} implements feed auto-discovery for finding\n"
 "syndication feeds, given a URI.  It will discover the following feed formats:\n"
 "RSS 0.91, RSS 1.0, RSS 2.0, Atom."
 msgstr ""
 
-#: gnu/packages/web.scm:2393
+#: gnu/packages/web.scm:2429
 msgid "Perl directory listing parser"
 msgstr ""
 
-#: gnu/packages/web.scm:2395
+#: gnu/packages/web.scm:2431
 msgid ""
 "The File::Listing module exports a single function called parse_dir(),\n"
 "which can be used to parse directory listings."
 msgstr ""
 
-#: gnu/packages/web.scm:2427
+#: gnu/packages/web.scm:2462
 msgid "Stock and mutual fund quotes"
 msgstr ""
 
-#: gnu/packages/web.scm:2429
+#: gnu/packages/web.scm:2464
 msgid ""
 "Finance::Quote gets stock quotes from various internet sources, including\n"
 "Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange."
 msgstr ""
 
-#: gnu/packages/web.scm:2451
+#: gnu/packages/web.scm:2486
 msgid "Perl extension providing access to the GSSAPIv2 library"
 msgstr ""
 
-#: gnu/packages/web.scm:2452
+#: gnu/packages/web.scm:2487
 msgid ""
 "This is a Perl extension for using GSSAPI C bindings as\n"
 "described in RFC 2744."
 msgstr ""
 
-#: gnu/packages/web.scm:2472
+#: gnu/packages/web.scm:2507
 msgid "Manipulate tables of HTML::Element"
 msgstr ""
 
-#: gnu/packages/web.scm:2474
+#: gnu/packages/web.scm:2509
 msgid ""
 "HTML::Element::Extended is a Perl extension for manipulating a table\n"
 "composed of HTML::Element style components."
 msgstr ""
 
-#: gnu/packages/web.scm:2498
+#: gnu/packages/web.scm:2533
 msgid "Perl class representing an HTML form element"
 msgstr ""
 
-#: gnu/packages/web.scm:2499
+#: gnu/packages/web.scm:2534
 msgid ""
 "Objects of the HTML::Form class represents a single HTML\n"
 "<form> ... </form> instance."
 msgstr ""
 
-#: gnu/packages/web.scm:2530
+#: gnu/packages/web.scm:2565
 msgid "Perl extension for scrubbing/sanitizing html"
 msgstr ""
 
-#: gnu/packages/web.scm:2532
+#: gnu/packages/web.scm:2567
 msgid "@code{HTML::Scrubber} Perl extension for scrubbing/sanitizing HTML."
 msgstr ""
 
-#: gnu/packages/web.scm:2553
+#: gnu/packages/web.scm:2587
 msgid "Check for HTML errors in a string or file"
 msgstr ""
 
-#: gnu/packages/web.scm:2554
+#: gnu/packages/web.scm:2588
 msgid ""
 "HTML::Lint is a pure-Perl HTML parser and checker for\n"
 "syntactic legitmacy."
 msgstr ""
 
-#: gnu/packages/web.scm:2575
+#: gnu/packages/web.scm:2609
 msgid "Extract contents from HTML tables"
 msgstr ""
 
-#: gnu/packages/web.scm:2577
+#: gnu/packages/web.scm:2611
 msgid ""
 "HTML::TableExtract is a Perl module for extracting the content contained\n"
 "in tables within an HTML document, either as text or encoded element trees."
 msgstr ""
 
-#: gnu/packages/web.scm:2602
+#: gnu/packages/web.scm:2636
 msgid "Work with HTML in a DOM-like tree structure"
 msgstr ""
 
-#: gnu/packages/web.scm:2603
+#: gnu/packages/web.scm:2637
 msgid ""
 "This distribution contains a suite of modules for\n"
 "representing, creating, and extracting information from HTML syntax trees."
 msgstr ""
 
-#: gnu/packages/web.scm:2624
+#: gnu/packages/web.scm:2658
 msgid "Perl HTML parser class"
 msgstr ""
 
-#: gnu/packages/web.scm:2626
+#: gnu/packages/web.scm:2660
 msgid ""
 "Objects of the HTML::Parser class will recognize markup and separate\n"
 "it from plain text (alias data content) in HTML documents.  As different\n"
@@ -20889,21 +21004,21 @@ msgid ""
 "are invoked."
 msgstr ""
 
-#: gnu/packages/web.scm:2646
+#: gnu/packages/web.scm:2680
 msgid "Perl data tables useful in parsing HTML"
 msgstr ""
 
-#: gnu/packages/web.scm:2648
+#: gnu/packages/web.scm:2682
 msgid ""
 "The HTML::Tagset module contains several data tables useful in various\n"
 "kinds of HTML parsing operations."
 msgstr ""
 
-#: gnu/packages/web.scm:2667
+#: gnu/packages/web.scm:2701
 msgid "HTML-like templates"
 msgstr ""
 
-#: gnu/packages/web.scm:2669
+#: gnu/packages/web.scm:2703
 msgid ""
 "This module attempts to make using HTML templates simple and natural.\n"
 "It extends standard HTML with a few new HTML-esque tags: @code{<TMPL_VAR>},\n"
@@ -20914,72 +21029,72 @@ msgid ""
 "you to separate design from the data."
 msgstr ""
 
-#: gnu/packages/web.scm:2697
+#: gnu/packages/web.scm:2731
 msgid "HTTP Body Parser"
 msgstr ""
 
-#: gnu/packages/web.scm:2698
+#: gnu/packages/web.scm:2732
 msgid ""
 "HTTP::Body parses chunks of HTTP POST data and supports\n"
 "application/octet-stream, application/json, application/x-www-form-urlencoded,\n"
 "and multipart/form-data."
 msgstr ""
 
-#: gnu/packages/web.scm:2725
+#: gnu/packages/web.scm:2759
 msgid "Minimalist HTTP user agent cookie jar"
 msgstr ""
 
-#: gnu/packages/web.scm:2726
+#: gnu/packages/web.scm:2760
 msgid ""
 "This module implements a minimalist HTTP user agent cookie\n"
 "jar in conformance with RFC 6265 <http://tools.ietf.org/html/rfc6265>."
 msgstr ""
 
-#: gnu/packages/web.scm:2746
+#: gnu/packages/web.scm:2780
 msgid "Perl HTTP cookie jars"
 msgstr ""
 
-#: gnu/packages/web.scm:2748
+#: gnu/packages/web.scm:2782
 msgid ""
 "The HTTP::Cookies class is for objects that represent a cookie jar,\n"
 "that is, a database of all the HTTP cookies that a given LWP::UserAgent\n"
 "object knows about."
 msgstr ""
 
-#: gnu/packages/web.scm:2770
+#: gnu/packages/web.scm:2804
 msgid "Perl simple http server class"
 msgstr ""
 
-#: gnu/packages/web.scm:2772
+#: gnu/packages/web.scm:2806
 msgid ""
 "Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen\n"
 "on a socket for incoming requests.  The HTTP::Daemon is a subclass of\n"
 "IO::Socket::INET, so you can perform socket operations directly on it too."
 msgstr ""
 
-#: gnu/packages/web.scm:2791
+#: gnu/packages/web.scm:2825
 msgid "Perl date conversion routines"
 msgstr ""
 
-#: gnu/packages/web.scm:2793
+#: gnu/packages/web.scm:2827
 msgid ""
 "The HTTP::Date module provides functions that deal with date formats\n"
 "used by the HTTP protocol (and then some more)."
 msgstr ""
 
-#: gnu/packages/web.scm:2819
+#: gnu/packages/web.scm:2853
 msgid "Perl HTTP style message"
 msgstr ""
 
-#: gnu/packages/web.scm:2821
+#: gnu/packages/web.scm:2855
 msgid "An HTTP::Message object contains some headers and a content body."
 msgstr ""
 
-#: gnu/packages/web.scm:2840
+#: gnu/packages/web.scm:2874
 msgid "Perl http content negotiation"
 msgstr ""
 
-#: gnu/packages/web.scm:2842
+#: gnu/packages/web.scm:2876
 msgid ""
 "The HTTP::Negotiate module provides a complete implementation of the\n"
 "HTTP content negotiation algorithm specified in\n"
@@ -20989,86 +21104,86 @@ msgid ""
 "fields in the request."
 msgstr ""
 
-#: gnu/packages/web.scm:2867
+#: gnu/packages/web.scm:2901
 msgid "Parse HTTP/1.1 requests"
 msgstr ""
 
-#: gnu/packages/web.scm:2868
+#: gnu/packages/web.scm:2902
 msgid ""
 "This is an HTTP request parser.  It takes chunks of text as\n"
-"received and returns a 'hint' as to what is required, or returns the\n"
+"received and returns a @code{hint} as to what is required, or returns the\n"
 "HTTP::Request when a complete request has been read.  HTTP/1.1 chunking is\n"
 "supported."
 msgstr ""
 
-#: gnu/packages/web.scm:2890
+#: gnu/packages/web.scm:2924
 msgid "Fast HTTP request parser"
 msgstr ""
 
-#: gnu/packages/web.scm:2891
+#: gnu/packages/web.scm:2925
 msgid ""
 "HTTP::Parser::XS is a fast, primitive HTTP request/response\n"
 "parser."
 msgstr ""
 
-#: gnu/packages/web.scm:2912
+#: gnu/packages/web.scm:2946
 msgid "Set up a CGI environment from an HTTP::Request"
 msgstr ""
 
-#: gnu/packages/web.scm:2913
+#: gnu/packages/web.scm:2947
 msgid ""
 "This module provides a convenient way to set up a CGI\n"
 "environment from an HTTP::Request."
 msgstr ""
 
-#: gnu/packages/web.scm:2946
+#: gnu/packages/web.scm:2980
 msgid "Lightweight HTTP server"
 msgstr ""
 
-#: gnu/packages/web.scm:2947
+#: gnu/packages/web.scm:2981
 msgid ""
 "HTTP::Server::Simple is a simple standalone HTTP daemon with\n"
 "no non-core module dependencies.  It can be used for building a standalone\n"
 "http-based UI to your existing tools."
 msgstr ""
 
-#: gnu/packages/web.scm:2972
+#: gnu/packages/web.scm:3006
 msgid "HTTP/1.1 client"
 msgstr ""
 
-#: gnu/packages/web.scm:2973
+#: gnu/packages/web.scm:3007
 msgid ""
 "This is a very simple HTTP/1.1 client, designed for doing\n"
 "simple requests without the overhead of a large framework like LWP::UserAgent.\n"
 "It supports proxies and redirection.  It also correctly resumes after EINTR."
 msgstr ""
 
-#: gnu/packages/web.scm:2992
+#: gnu/packages/web.scm:3026
 msgid "Perl module to open an HTML file with automatic charset detection"
 msgstr ""
 
-#: gnu/packages/web.scm:2994
+#: gnu/packages/web.scm:3028
 msgid ""
 "IO::HTML provides an easy way to open a file containing HTML while\n"
 "automatically determining its encoding.  It uses the HTML5 encoding sniffing\n"
 "algorithm specified in section 8.2.2.1 of the draft standard."
 msgstr ""
 
-#: gnu/packages/web.scm:3014
+#: gnu/packages/web.scm:3048
 msgid "Family-neutral IP socket supporting both IPv4 and IPv6"
 msgstr ""
 
-#: gnu/packages/web.scm:3015
+#: gnu/packages/web.scm:3049
 msgid ""
 "This module provides a protocol-independent way to use IPv4\n"
 "and IPv6 sockets, intended as a replacement for IO::Socket::INET."
 msgstr ""
 
-#: gnu/packages/web.scm:3037
+#: gnu/packages/web.scm:3071
 msgid "Nearly transparent SSL encapsulation for IO::Socket::INET"
 msgstr ""
 
-#: gnu/packages/web.scm:3039
+#: gnu/packages/web.scm:3073
 msgid ""
 "IO::Socket::SSL makes using SSL/TLS much easier by wrapping the\n"
 "necessary functionality into the familiar IO::Socket interface and providing\n"
@@ -21077,11 +21192,11 @@ msgid ""
 "select or poll."
 msgstr ""
 
-#: gnu/packages/web.scm:3078
+#: gnu/packages/web.scm:3112
 msgid "Perl modules for the WWW"
 msgstr ""
 
-#: gnu/packages/web.scm:3080
+#: gnu/packages/web.scm:3114
 msgid ""
 "The libwww-perl collection is a set of Perl modules which provides a\n"
 "simple and consistent application programming interface to the\n"
@@ -21091,11 +21206,11 @@ msgid ""
 "help you implement simple HTTP servers."
 msgstr ""
 
-#: gnu/packages/web.scm:3108
+#: gnu/packages/web.scm:3142
 msgid "Checks whether your process has access to the web"
 msgstr ""
 
-#: gnu/packages/web.scm:3109
+#: gnu/packages/web.scm:3143
 msgid ""
 "This module attempts to answer, as accurately as it can, one\n"
 "of the nastiest technical questions there is: am I on the internet?\n"
@@ -21105,11 +21220,11 @@ msgid ""
 "not have DNS.  We might not have a network card at all!"
 msgstr ""
 
-#: gnu/packages/web.scm:3131
+#: gnu/packages/web.scm:3165
 msgid "Perl module to guess the media type for a file or a URL"
 msgstr ""
 
-#: gnu/packages/web.scm:3133
+#: gnu/packages/web.scm:3167
 #, scheme-format
 msgid ""
 "The LWP::MediaTypes module provides functions for handling media (also\n"
@@ -21118,21 +21233,21 @@ msgid ""
 "exists it is used instead."
 msgstr ""
 
-#: gnu/packages/web.scm:3162
+#: gnu/packages/web.scm:3196
 msgid "HTTPS support for LWP::UserAgent"
 msgstr ""
 
-#: gnu/packages/web.scm:3163
+#: gnu/packages/web.scm:3197
 msgid ""
 "The LWP::Protocol::https module provides support for using\n"
 "https schemed URLs with LWP."
 msgstr ""
 
-#: gnu/packages/web.scm:3183
+#: gnu/packages/web.scm:3217
 msgid "Virtual browser that retries errors"
 msgstr ""
 
-#: gnu/packages/web.scm:3184
+#: gnu/packages/web.scm:3218
 msgid ""
 "LWP::UserAgent::Determined works just like LWP::UserAgent,\n"
 "except that when you use it to get a web page but run into a\n"
@@ -21140,19 +21255,19 @@ msgid ""
 "and retry a few times."
 msgstr ""
 
-#: gnu/packages/web.scm:3229
+#: gnu/packages/web.scm:3263
 msgid "Perl interface to Amazon S3"
 msgstr ""
 
-#: gnu/packages/web.scm:3230
+#: gnu/packages/web.scm:3264
 msgid "This module provides a Perlish interface to Amazon S3."
 msgstr "Ce paquet fournit une interface de type Perl pour Amazon S3."
 
-#: gnu/packages/web.scm:3250
+#: gnu/packages/web.scm:3284
 msgid "Perl low-level HTTP connection (client)"
 msgstr ""
 
-#: gnu/packages/web.scm:3252
+#: gnu/packages/web.scm:3286
 msgid ""
 "The Net::HTTP class is a low-level HTTP client.  An instance of the\n"
 "Net::HTTP class represents a connection to an HTTP server.  The HTTP protocol\n"
@@ -21160,11 +21275,11 @@ msgid ""
 "HTTP/1.1."
 msgstr ""
 
-#: gnu/packages/web.scm:3272
+#: gnu/packages/web.scm:3306
 msgid "Extensible Perl server engine"
 msgstr ""
 
-#: gnu/packages/web.scm:3273
+#: gnu/packages/web.scm:3307
 msgid ""
 "Net::Server is an extensible, generic Perl server engine.\n"
 "It attempts to be a generic server as in Net::Daemon and NetServer::Generic.\n"
@@ -21178,19 +21293,19 @@ msgid ""
 "or to multiple server ports."
 msgstr ""
 
-#: gnu/packages/web.scm:3301
+#: gnu/packages/web.scm:3335
 msgid "SSL support for Net::SMTP"
 msgstr ""
 
-#: gnu/packages/web.scm:3302
+#: gnu/packages/web.scm:3336
 msgid "SSL support for Net::SMTP."
 msgstr ""
 
-#: gnu/packages/web.scm:3336
+#: gnu/packages/web.scm:3370
 msgid "Perl Superglue for Web frameworks and servers (PSGI toolkit)"
 msgstr ""
 
-#: gnu/packages/web.scm:3337
+#: gnu/packages/web.scm:3371
 msgid ""
 "Plack is a set of tools for using the PSGI stack.  It\n"
 "contains middleware components, a reference server, and utilities for Web\n"
@@ -21198,21 +21313,34 @@ msgid ""
 "WSGI."
 msgstr ""
 
-#: gnu/packages/web.scm:3363
+#: gnu/packages/web.scm:3397
+msgid "Compress response body with Gzip or Deflate"
+msgstr ""
+
+#: gnu/packages/web.scm:3399
+msgid ""
+"Plack::Middleware::Deflater is a middleware to encode your response body\n"
+"in gzip or deflate, based on \"Accept-Encoding\" HTTP request header.  It\n"
+"would save the bandwidth a little bit but should increase the Plack server\n"
+"load, so ideally you should handle this on the frontend reverse proxy\n"
+"servers."
+msgstr ""
+
+#: gnu/packages/web.scm:3426
 msgid "Plack::Middleware which sets body for redirect response"
 msgstr ""
 
-#: gnu/packages/web.scm:3364
+#: gnu/packages/web.scm:3427
 msgid ""
 "This module sets the body in redirect response, if it's not\n"
 "already set."
 msgstr ""
 
-#: gnu/packages/web.scm:3387
+#: gnu/packages/web.scm:3449
 msgid "Override REST methods to Plack apps via POST"
 msgstr ""
 
-#: gnu/packages/web.scm:3388
+#: gnu/packages/web.scm:3450
 msgid ""
 "This middleware allows for POST requests that pretend to be\n"
 "something else: by adding either a header named X-HTTP-Method-Override to the\n"
@@ -21220,72 +21348,72 @@ msgid ""
 "can say what method it actually meant."
 msgstr ""
 
-#: gnu/packages/web.scm:3412
+#: gnu/packages/web.scm:3473
 msgid "Plack::Middleware which removes body for HTTP response"
 msgstr ""
 
-#: gnu/packages/web.scm:3413
+#: gnu/packages/web.scm:3474
 msgid ""
 "This module removes the body in an HTTP response if it's not\n"
 "required."
 msgstr ""
 
-#: gnu/packages/web.scm:3436
+#: gnu/packages/web.scm:3496
 msgid "Supports app to run as a reverse proxy backend"
 msgstr ""
 
-#: gnu/packages/web.scm:3437
+#: gnu/packages/web.scm:3497
 msgid ""
 "Plack::Middleware::ReverseProxy resets some HTTP headers,\n"
 "which are changed by reverse-proxy.  You can specify the reverse proxy address\n"
-"and stop fake requests using 'enable_if' directive in your app.psgi."
+"and stop fake requests using @code{enable_if} directive in your app.psgi."
 msgstr ""
 
-#: gnu/packages/web.scm:3458
+#: gnu/packages/web.scm:3517
 msgid "Run HTTP tests on external live servers"
 msgstr ""
 
-#: gnu/packages/web.scm:3459
+#: gnu/packages/web.scm:3518
 msgid ""
 "This module allows your to run your Plack::Test tests\n"
 "against an external server instead of just against a local application through\n"
 "either mocked HTTP or a locally spawned server."
 msgstr ""
 
-#: gnu/packages/web.scm:3481
+#: gnu/packages/web.scm:3539
 msgid "Testing TCP programs"
 msgstr ""
 
-#: gnu/packages/web.scm:3482
+#: gnu/packages/web.scm:3540
 msgid "Test::TCP is test utilities for TCP/IP programs."
 msgstr ""
 
-#: gnu/packages/web.scm:3507
+#: gnu/packages/web.scm:3564
 msgid "Testing-specific WWW::Mechanize subclass"
 msgstr ""
 
-#: gnu/packages/web.scm:3508
+#: gnu/packages/web.scm:3565
 msgid ""
 "Test::WWW::Mechanize is a subclass of the Perl module\n"
 "WWW::Mechanize that incorporates features for web application testing."
 msgstr ""
 
-#: gnu/packages/web.scm:3542
+#: gnu/packages/web.scm:3598
 msgid "Test::WWW::Mechanize for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:3543
+#: gnu/packages/web.scm:3599
 msgid ""
 "The Test::WWW::Mechanize::Catalyst module meshes the\n"
 "Test::WWW:Mechanize module and the Catalyst web application framework to allow\n"
 "testing of Catalyst applications without needing to start up a web server."
 msgstr ""
 
-#: gnu/packages/web.scm:3567
+#: gnu/packages/web.scm:3623
 msgid "Test PSGI programs using WWW::Mechanize"
 msgstr ""
 
-#: gnu/packages/web.scm:3568
+#: gnu/packages/web.scm:3624
 msgid ""
 "PSGI is a specification to decouple web server environments\n"
 "from web application framework code.  Test::WWW::Mechanize is a subclass of\n"
@@ -21294,33 +21422,33 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/web.scm:3591
+#: gnu/packages/web.scm:3647
 msgid "Perl Uniform Resource Identifiers (absolute and relative)"
 msgstr ""
 
-#: gnu/packages/web.scm:3593
+#: gnu/packages/web.scm:3649
 msgid ""
 "The URI module implements the URI class.  Objects of this class\n"
 "represent \"Uniform Resource Identifier references\" as specified in RFC 2396\n"
 "and updated by RFC 2732."
 msgstr ""
 
-#: gnu/packages/web.scm:3617
+#: gnu/packages/web.scm:3673
 msgid "Smart URI fetching/caching"
 msgstr ""
 
-#: gnu/packages/web.scm:3618
+#: gnu/packages/web.scm:3674
 msgid ""
 "@code{URI::Fetch} is a smart client for fetching HTTP pages,\n"
 "notably syndication feeds (RSS, Atom, and others), in an intelligent, bandwidth-\n"
 "and time-saving way."
 msgstr ""
 
-#: gnu/packages/web.scm:3641
+#: gnu/packages/web.scm:3697
 msgid "Find URIs in arbitrary text"
 msgstr ""
 
-#: gnu/packages/web.scm:3642
+#: gnu/packages/web.scm:3698
 msgid ""
 "This module finds URIs and URLs (according to what URI.pm\n"
 "considers a URI) in plain text.  It only finds URIs which include a\n"
@@ -21328,61 +21456,61 @@ msgid ""
 "URI::Find::Schemeless.  For a command-line interface, urifind is provided."
 msgstr ""
 
-#: gnu/packages/web.scm:3664
+#: gnu/packages/web.scm:3720
 msgid "WebSocket support for URI package"
 msgstr ""
 
-#: gnu/packages/web.scm:3665
+#: gnu/packages/web.scm:3721
 msgid ""
 "With this module, the URI package provides the same set of\n"
 "methods for WebSocket URIs as it does for HTTP URIs."
 msgstr ""
 
-#: gnu/packages/web.scm:3689
+#: gnu/packages/web.scm:3745
 msgid "Object for handling URI templates"
 msgstr ""
 
-#: gnu/packages/web.scm:3690
+#: gnu/packages/web.scm:3746
 msgid ""
 "This perl module provides a wrapper around URI templates as described in\n"
 "RFC 6570."
 msgstr ""
 
-#: gnu/packages/web.scm:3722
+#: gnu/packages/web.scm:3778
 msgid "Perl extension interface for libcurl"
 msgstr "Interface d'extension Perl pour libcurl"
 
-#: gnu/packages/web.scm:3724
+#: gnu/packages/web.scm:3780
 msgid ""
 "This is a Perl extension interface for the libcurl file downloading\n"
 "library."
 msgstr ""
 
-#: gnu/packages/web.scm:3758
+#: gnu/packages/web.scm:3813
 msgid "Web browsing in a Perl object"
 msgstr ""
 
-#: gnu/packages/web.scm:3759
+#: gnu/packages/web.scm:3814
 msgid ""
 "WWW::Mechanize is a Perl module for stateful programmatic\n"
 "web browsing, used for automating interaction with websites."
 msgstr ""
 
-#: gnu/packages/web.scm:3795
+#: gnu/packages/web.scm:3850
 msgid "Search A9 OpenSearch compatible engines"
 msgstr ""
 
-#: gnu/packages/web.scm:3797
+#: gnu/packages/web.scm:3852
 msgid ""
 "@code{WWW::OpenSearch} is a module to search @url{A9's OpenSearch,\n"
 "http://opensearch.a9.com} compatible search engines."
 msgstr ""
 
-#: gnu/packages/web.scm:3817
+#: gnu/packages/web.scm:3872
 msgid "Perl database of robots.txt-derived permissions"
 msgstr ""
 
-#: gnu/packages/web.scm:3819
+#: gnu/packages/web.scm:3874
 msgid ""
 "The WWW::RobotRules module parses /robots.txt files as specified in\n"
 "\"A Standard for Robot Exclusion\", at\n"
@@ -21391,150 +21519,42 @@ msgid ""
 "their web site."
 msgstr ""
 
-#: gnu/packages/web.scm:3842
+#: gnu/packages/web.scm:3897
 msgid "Parse feeds in Python"
 msgstr ""
 
-#: gnu/packages/web.scm:3844
+#: gnu/packages/web.scm:3899
 msgid ""
 "Universal feed parser which handles RSS 0.9x, RSS 1.0, RSS 2.0,\n"
 "CDF, Atom 0.3, and Atom 1.0 feeds."
 msgstr ""
 
-#: gnu/packages/web.scm:3871
-msgid "HTTP and WebSocket server library for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3873
-msgid ""
-"The httpuv package provides low-level socket and protocol support for\n"
-"handling HTTP and WebSocket requests directly from within R.  It is primarily\n"
-"intended as a building block for other packages, rather than making it\n"
-"particularly easy to create complete web applications using httpuv alone."
-msgstr ""
-
-#: gnu/packages/web.scm:3894
-msgid "Robust, high performance JSON parser and generator for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3896
-msgid ""
-"The jsonlite package provides a fast JSON parser and generator optimized\n"
-"for statistical data and the web.  It offers flexible, robust, high\n"
-"performance tools for working with JSON in R and is particularly powerful for\n"
-"building pipelines and interacting with a web API.  In addition to converting\n"
-"JSON data from/to R objects, jsonlite contains functions to stream, validate,\n"
-"and prettify JSON data.  The unit tests included with the package verify that\n"
-"all edge cases are encoded and decoded consistently for use with dynamic data\n"
-"in systems and applications."
-msgstr ""
-
-#: gnu/packages/web.scm:3923
-msgid "Simple HTTP server to serve static files or dynamic documents"
-msgstr ""
-
-#: gnu/packages/web.scm:3925
-msgid ""
-"Servr provides an HTTP server in R to serve static files, or dynamic\n"
-"documents that can be converted to HTML files (e.g., R Markdown) under a given\n"
-"directory."
-msgstr ""
-
-#: gnu/packages/web.scm:3959
-msgid "R tools for HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:3961
-msgid "This package provides tools for HTML generation and output in R."
-msgstr "Ce paquet fournit des outils pour générer du HTML en R."
-
-#: gnu/packages/web.scm:3980
-msgid "HTML Widgets for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3982
-msgid ""
-"HTML widgets is a framework for creating HTML widgets that render in\n"
-"various contexts including the R console, R Markdown documents, and Shiny web\n"
-"applications."
-msgstr ""
-
-#: gnu/packages/web.scm:4009
-msgid "Advanced tables for Markdown/HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:4011
-msgid ""
-"This package provides functions to build tables with advanced layout\n"
-"elements such as row spanners, column spanners, table spanners, zebra\n"
-"striping, and more.  While allowing advanced layout, the underlying\n"
-"CSS-structure is simple in order to maximize compatibility with word\n"
-"processors such as LibreOffice.  The package also contains a few text\n"
-"formatting functions that help outputting text compatible with HTML or\n"
-"LaTeX."
-msgstr ""
-
-#: gnu/packages/web.scm:4048
-msgid "HTTP client for R"
-msgstr ""
-
-#: gnu/packages/web.scm:4050
-msgid ""
-"The @code{curl()} and @code{curl_download()} functions provide highly\n"
-"configurable drop-in replacements for base @code{url()} and\n"
-"@code{download.file()} with better performance, support for encryption, gzip\n"
-"compression, authentication, and other @code{libcurl} goodies.  The core of\n"
-"the package implements a framework for performing fully customized requests\n"
-"where data can be processed either in memory, on disk, or streaming via the\n"
-"callback or connection interfaces."
-msgstr ""
-
-#: gnu/packages/web.scm:4072
-msgid "Output R objects in HTML format"
-msgstr ""
-
-#: gnu/packages/web.scm:4074
-msgid ""
-"This package provides easy-to-use and versatile functions to output R\n"
-"objects in HTML format."
-msgstr ""
-
-#: gnu/packages/web.scm:4091
-msgid "JSON library for R"
-msgstr ""
-
-#: gnu/packages/web.scm:4093
-msgid ""
-"This package provides functions to convert R objects into JSON objects\n"
-"and vice-versa."
-msgstr ""
-
-#: gnu/packages/web.scm:4118
+#: gnu/packages/web.scm:3928
 msgid "HTML5 parsing library"
 msgstr "Bibliothèque d'analyse d'HTML5"
 
-#: gnu/packages/web.scm:4120
+#: gnu/packages/web.scm:3930
 msgid ""
 "Gumbo is an implementation of the HTML5 parsing algorithm implemented as\n"
 "a pure C99 library."
 msgstr ""
 
-#: gnu/packages/web.scm:4191
+#: gnu/packages/web.scm:4001
 msgid "Application container server"
 msgstr ""
 
-#: gnu/packages/web.scm:4193
+#: gnu/packages/web.scm:4003
 msgid ""
 "uWSGI presents a complete stack for networked/clustered web applications,\n"
 "implementing message/object passing, caching, RPC and process management.\n"
 "It uses the uwsgi protocol for all the networking/interprocess communications."
 msgstr ""
 
-#: gnu/packages/web.scm:4219
+#: gnu/packages/web.scm:4029
 msgid "Command-line JSON processor"
 msgstr ""
 
-#: gnu/packages/web.scm:4220
+#: gnu/packages/web.scm:4030
 msgid ""
 "jq is like sed for JSON data – you can use it to slice and\n"
 "filter and map and transform structured data with the same ease that sed, awk,\n"
@@ -21544,106 +21564,106 @@ msgid ""
 "you'd expect."
 msgstr ""
 
-#: gnu/packages/web.scm:4259
+#: gnu/packages/web.scm:4060
 msgid "Library for mocking web service APIs which use HTTP or HTTPS"
 msgstr ""
 
-#: gnu/packages/web.scm:4261
+#: gnu/packages/web.scm:4062
 msgid ""
 "Uhttpmock is a project for mocking web service APIs which use HTTP or\n"
 "HTTPS.  It provides a library, libuhttpmock, which implements recording and\n"
 "playback of HTTP request/response traces."
 msgstr ""
 
-#: gnu/packages/web.scm:4296
+#: gnu/packages/web.scm:4097
 msgid "Single file web server"
 msgstr ""
 
-#: gnu/packages/web.scm:4297
+#: gnu/packages/web.scm:4098
 msgid ""
 "Woof (Web Offer One File) is a small simple web server that\n"
 "can easily be invoked on a single file.  Your partner can access the file with\n"
 "tools they trust (e.g. wget)."
 msgstr ""
 
-#: gnu/packages/web.scm:4323
+#: gnu/packages/web.scm:4124
 msgid "Build system for the Netsurf project"
 msgstr ""
 
-#: gnu/packages/web.scm:4325
+#: gnu/packages/web.scm:4126
 msgid ""
 "This package provides the shared build system for Netsurf project\n"
 "libraries."
 msgstr ""
 
-#: gnu/packages/web.scm:4360
+#: gnu/packages/web.scm:4161
 msgid "Parser building library"
 msgstr "Bibliothèque de construction d'analyseur"
 
-#: gnu/packages/web.scm:4362
+#: gnu/packages/web.scm:4163
 msgid ""
 "LibParserUtils is a library for building efficient parsers, written in\n"
 "C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4390
+#: gnu/packages/web.scm:4191
 msgid "HTML5 compliant parsing library"
 msgstr ""
 
-#: gnu/packages/web.scm:4392
+#: gnu/packages/web.scm:4193
 msgid ""
 "Hubbub is an HTML5 compliant parsing library, written in C, which can\n"
 "parse both valid and invalid web content.  It is developed as part of the\n"
 "NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4473
+#: gnu/packages/web.scm:4274
 msgid "Wiki compiler, capable of generating HTML"
 msgstr ""
 
-#: gnu/packages/web.scm:4475
+#: gnu/packages/web.scm:4276
 msgid ""
 "Ikiwiki is a wiki compiler, capable of generating a static set of web\n"
 "pages, but also incorporating dynamic features like a web based editor and\n"
 "commenting."
 msgstr ""
 
-#: gnu/packages/web.scm:4499
+#: gnu/packages/web.scm:4300
 msgid "String internment library"
 msgstr ""
 
-#: gnu/packages/web.scm:4501
+#: gnu/packages/web.scm:4302
 msgid ""
 "LibWapcaplet provides a reference counted string internment system\n"
 "designed to store small strings and allow rapid comparison of them.  It is\n"
 "developed as part of the Netsurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4528
+#: gnu/packages/web.scm:4329
 msgid "CSS parser and selection library"
 msgstr "Bibliothèque d'analyse et de sélection de CSS"
 
-#: gnu/packages/web.scm:4530
+#: gnu/packages/web.scm:4331
 msgid ""
 "LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,\n"
 "written in C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4564
+#: gnu/packages/web.scm:4365
 msgid "Implementation of the W3C DOM"
 msgstr ""
 
-#: gnu/packages/web.scm:4566
+#: gnu/packages/web.scm:4367
 msgid ""
 "LibDOM is an implementation of the W3C DOM, written in C.  It is\n"
 "developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4593
+#: gnu/packages/web.scm:4394
 msgid "Library for parsing SVG files"
 msgstr "Bibliothèque pour analyser des fichiers SVG"
 
-#: gnu/packages/web.scm:4595
+#: gnu/packages/web.scm:4396
 msgid ""
 "Libsvgtiny takes some SVG as input and returns a list of paths and texts\n"
 "which can be rendered easily, as defined in\n"
@@ -21651,94 +21671,94 @@ msgid ""
 "project."
 msgstr ""
 
-#: gnu/packages/web.scm:4618
+#: gnu/packages/web.scm:4419
 msgid "Decoding library for BMP and ICO files"
 msgstr ""
 
-#: gnu/packages/web.scm:4620
+#: gnu/packages/web.scm:4421
 msgid ""
 "Libnsbmp is a decoding library for BMP and ICO image file formats,\n"
 "written in C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4641
+#: gnu/packages/web.scm:4442
 msgid "Decoding library for GIF files"
 msgstr ""
 
-#: gnu/packages/web.scm:4643
+#: gnu/packages/web.scm:4444
 msgid ""
 "Libnsgif is a decoding library for the GIF image file format, written in\n"
 "C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4664
+#: gnu/packages/web.scm:4465
 msgid "Utility library for NetSurf"
 msgstr ""
 
-#: gnu/packages/web.scm:4666
+#: gnu/packages/web.scm:4467
 msgid ""
 "Libnsutils provides a small number of useful utility routines.  It is\n"
 "developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4687
+#: gnu/packages/web.scm:4488
 msgid "Library to generate a static Public Suffix List"
 msgstr ""
 
-#: gnu/packages/web.scm:4689
+#: gnu/packages/web.scm:4490
 msgid ""
 "Libnspsl is a library to generate a static code representation of the\n"
 "Public Suffix List.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4715
+#: gnu/packages/web.scm:4516
 msgid "Generate JavaScript to DOM bindings"
 msgstr ""
 
-#: gnu/packages/web.scm:4717
+#: gnu/packages/web.scm:4518
 msgid ""
 "@code{nsgenbind} is a tool to generate JavaScript to DOM bindings from\n"
 "w3c webidl files and a binding configuration file."
 msgstr ""
 
-#: gnu/packages/web.scm:4829
+#: gnu/packages/web.scm:4630
 msgid "Web browser"
 msgstr ""
 
-#: gnu/packages/web.scm:4831
+#: gnu/packages/web.scm:4632
 msgid ""
 "NetSurf is a lightweight web browser that has its own layout and\n"
 "rendering engine entirely written from scratch.  It is small and capable of\n"
 "handling many of the web standards in use today."
 msgstr ""
 
-#: gnu/packages/web.scm:4871
+#: gnu/packages/web.scm:4672
 msgid "Unix command line interface to the www"
 msgstr ""
 
-#: gnu/packages/web.scm:4872
+#: gnu/packages/web.scm:4673
 msgid ""
 "Surfraw (Shell Users' Revolutionary Front Rage Against the Web)\n"
 "provides a unix command line interface to a variety of popular www search engines\n"
 "and similar services."
 msgstr ""
 
-#: gnu/packages/web.scm:4903
+#: gnu/packages/web.scm:4704
 msgid "Simple static web server"
 msgstr ""
 
-#: gnu/packages/web.scm:4904
+#: gnu/packages/web.scm:4705
 msgid ""
 "darkhttpd is a simple static web server.  It is\n"
 "standalone and does not need inetd or ucspi-tcp.  It does not need any\n"
 "config files---you only have to specify the www root."
 msgstr ""
 
-#: gnu/packages/web.scm:4935
+#: gnu/packages/web.scm:4736
 msgid "Analyze Web server logs in real time"
 msgstr ""
 
-#: gnu/packages/web.scm:4937
+#: gnu/packages/web.scm:4738
 msgid ""
 "GoAccess is a real-time web log analyzer and interactive viewer that\n"
 "runs in a terminal or through your browser.  It provides fast and valuable\n"
@@ -21746,11 +21766,11 @@ msgid ""
 "on the fly."
 msgstr ""
 
-#: gnu/packages/web.scm:4973
+#: gnu/packages/web.scm:4774
 msgid "Tunnel data connections through HTTP requests"
 msgstr ""
 
-#: gnu/packages/web.scm:4974
+#: gnu/packages/web.scm:4775
 msgid ""
 "httptunnel creates a bidirectional virtual data connection\n"
 "tunnelled through HTTP (HyperText Transfer Protocol) requests.  This can be\n"
@@ -21759,11 +21779,11 @@ msgid ""
 "tools like SSH (Secure Shell) to reach the outside world."
 msgstr ""
 
-#: gnu/packages/web.scm:5021
+#: gnu/packages/web.scm:4821
 msgid "TLS proxy for clients or servers"
 msgstr ""
 
-#: gnu/packages/web.scm:5022
+#: gnu/packages/web.scm:4822
 msgid ""
 "Stunnel is a proxy designed to add TLS encryption\n"
 "functionality to existing clients and servers without any changes in the\n"
@@ -21772,11 +21792,11 @@ msgid ""
 "deployments."
 msgstr ""
 
-#: gnu/packages/web.scm:5088
+#: gnu/packages/web.scm:4891
 msgid "Web application accelerator"
 msgstr ""
 
-#: gnu/packages/web.scm:5090
+#: gnu/packages/web.scm:4893
 msgid ""
 "Varnish is a high-performance HTTP accelerator.  It acts as a caching\n"
 "reverse proxy and load balancer.  You install it in front of any server that\n"
@@ -21784,22 +21804,22 @@ msgid ""
 "configuration language."
 msgstr ""
 
-#: gnu/packages/web.scm:5118
+#: gnu/packages/web.scm:4921
 msgid "Collection of Varnish modules"
 msgstr "Collection de modules Varnish"
 
-#: gnu/packages/web.scm:5120
+#: gnu/packages/web.scm:4923
 msgid ""
 "This package provides a collection of modules (@dfn{vmods}) for the Varnish\n"
 "cache server, extending the @dfn{Varnish Configuration Language} (VCL) with\n"
 "additional capabilities."
 msgstr ""
 
-#: gnu/packages/web.scm:5145
+#: gnu/packages/web.scm:4950
 msgid "Internet services daemon"
 msgstr ""
 
-#: gnu/packages/web.scm:5146
+#: gnu/packages/web.scm:4951
 msgid ""
 "@code{xinetd}, a more secure replacement for @code{inetd},\n"
 "listens for incoming requests over a network and launches the appropriate\n"
@@ -21808,11 +21828,11 @@ msgid ""
 "used to start services with both privileged and non-privileged port numbers."
 msgstr ""
 
-#: gnu/packages/web.scm:5190
+#: gnu/packages/web.scm:4995
 msgid "HTML Tidy with HTML5 support"
 msgstr ""
 
-#: gnu/packages/web.scm:5192
+#: gnu/packages/web.scm:4997
 msgid ""
 "Tidy is a console application which corrects and cleans up\n"
 "HTML and XML documents by fixing markup errors and upgrading\n"
@@ -21823,22 +21843,22 @@ msgid ""
 "functions of Tidy."
 msgstr ""
 
-#: gnu/packages/web.scm:5256
+#: gnu/packages/web.scm:5060
 msgid "Webserver with focus on security"
 msgstr ""
 
-#: gnu/packages/web.scm:5258
+#: gnu/packages/web.scm:5062
 msgid ""
 "Hiawatha has been written with security in mind.\n"
 "Features include the ability to stop SQL injections, XSS and CSRF attacks and\n"
 "exploit attempts."
 msgstr ""
 
-#: gnu/packages/web.scm:5282
+#: gnu/packages/web.scm:5086
 msgid "HTTP request and response service"
 msgstr ""
 
-#: gnu/packages/web.scm:5283
+#: gnu/packages/web.scm:5087
 msgid ""
 "Testing an HTTP Library can become difficult sometimes.\n"
 "@code{RequestBin} is fantastic for testing POST requests, but doesn't let you control the\n"
@@ -21846,22 +21866,22 @@ msgid ""
 "JSON-encoded."
 msgstr ""
 
-#: gnu/packages/web.scm:5311
+#: gnu/packages/web.scm:5115
 msgid "Test your HTTP library against a local copy of httpbin"
 msgstr ""
 
-#: gnu/packages/web.scm:5313
+#: gnu/packages/web.scm:5117
 msgid ""
 "@code{Pytest-httpbin} creates a @code{pytest} fixture that is dependency-injected\n"
 "into your tests.  It automatically starts up a HTTP server in a separate thread running\n"
 "@code{httpbin} and provides your test with the URL in the fixture."
 msgstr ""
 
-#: gnu/packages/web.scm:5344
+#: gnu/packages/web.scm:5148
 msgid "HTTP request/response parser for C"
 msgstr ""
 
-#: gnu/packages/web.scm:5345
+#: gnu/packages/web.scm:5149
 msgid ""
 "This is a parser for HTTP messages written in C.  It parses\n"
 "both requests and responses.  The parser is designed to be used in\n"
@@ -21871,123 +21891,64 @@ msgid ""
 "message stream (in a web server that is per connection)."
 msgstr ""
 
-#: gnu/packages/web.scm:5397
+#: gnu/packages/web.scm:5201
 msgid "HTTP client mock for Python"
 msgstr ""
 
-#: gnu/packages/web.scm:5398
+#: gnu/packages/web.scm:5202
 msgid ""
 "@code{httpretty} is a helper for faking web requests,\n"
 "inspired by Ruby's @code{fakeweb}."
 msgstr ""
 
-#: gnu/packages/web.scm:5416
+#: gnu/packages/web.scm:5220
 msgid "Output JSON from a shell"
 msgstr ""
 
-#: gnu/packages/web.scm:5417
+#: gnu/packages/web.scm:5221
 msgid ""
 "jo is a command-line utility to create JSON objects or\n"
 "arrays.  It creates a JSON string on stdout from words provided as\n"
 "command-line arguments or read from stdin."
 msgstr ""
 
-#: gnu/packages/web.scm:5465
+#: gnu/packages/web.scm:5269
 msgid "Command-line interface to archive.org"
 msgstr "Interface en ligne de commande pour archive.org"
 
-#: gnu/packages/web.scm:5466
+#: gnu/packages/web.scm:5270
 msgid ""
 "@code{ia} is a command-line tool for using\n"
 "@url{archive.org} from the command-line.  It also emplements the\n"
 "internetarchive python module for programatic access to archive.org."
 msgstr ""
 
-#: gnu/packages/web.scm:5522
+#: gnu/packages/web.scm:5326
 msgid "Search code snippets on @url{https://commandlinefu.com}"
 msgstr ""
 
-#: gnu/packages/web.scm:5523
+#: gnu/packages/web.scm:5327
 msgid ""
 "@code{clf} is a command line tool for searching code\n"
 "snippets on @url{https://commandlinefu.com}."
 msgstr ""
 
-#: gnu/packages/web.scm:5627
-msgid "Easy interactive web applications with R"
-msgstr ""
-
-#: gnu/packages/web.scm:5629
-msgid ""
-"Makes it incredibly easy to build interactive web applications\n"
-"with R.  Automatic \"reactive\" binding between inputs and outputs and\n"
-"extensive prebuilt widgets make it possible to build beautiful,\n"
-"responsive, and powerful applications with minimal effort."
-msgstr ""
-
-#: gnu/packages/web.scm:5669
-msgid "Create dashboards with shiny"
-msgstr ""
-
-#: gnu/packages/web.scm:5670
-msgid ""
-"This package provides an extension to the Shiny web\n"
-"application framework for R, making it easy to create attractive dashboards."
-msgstr ""
-
-#: gnu/packages/web.scm:5697
-msgid "Server-side file system viewer for Shiny"
-msgstr ""
-
-#: gnu/packages/web.scm:5699
-msgid ""
-"This package provides functionality for client-side navigation of the\n"
-"server side file system in shiny apps.  In case the app is running locally\n"
-"this gives the user direct access to the file system without the need to\n"
-"\"download\" files to a temporary location.  Both file and folder selection as\n"
-"well as file saving is available."
-msgstr ""
-
-#: gnu/packages/web.scm:5726
-msgid "Inter-widget interactivity for HTML widgets"
-msgstr ""
-
-#: gnu/packages/web.scm:5728
-msgid ""
-"This package provides building blocks for allowing HTML widgets to\n"
-"communicate with each other, with Shiny or without (i.e.  static @code{.html}\n"
-"files).  It currently supports linked brushing and filtering."
-msgstr ""
-
-#: gnu/packages/web.scm:5748
-msgid "Web server interface for R"
-msgstr "Serveur web d'interface pour R"
-
-#: gnu/packages/web.scm:5750
-msgid ""
-"This package contains the Rook specification and convenience software\n"
-"for building and running Rook applications.  A Rook application is an R\n"
-"reference class object that implements a @code{call} method or an R closure\n"
-"that takes exactly one argument, an environment, and returns a list with three\n"
-"named elements: the @code{status}, the @code{headers}, and the @code{body}."
-msgstr ""
-
-#: gnu/packages/web.scm:5789
+#: gnu/packages/web.scm:5361
 msgid "Generate Atom feeds for social networking websites"
 msgstr ""
 
-#: gnu/packages/web.scm:5790
+#: gnu/packages/web.scm:5362
 msgid ""
 "rss-bridge generates Atom feeds for social networking\n"
 "websites lacking feeds.  Supported websites include Facebook, Twitter,\n"
 "Instagram and YouTube."
 msgstr ""
 
-#: gnu/packages/web.scm:5817
+#: gnu/packages/web.scm:5417
 msgid "Check websites for broken links"
 msgstr ""
 
-#: gnu/packages/web.scm:5818
+#: gnu/packages/web.scm:5418
 msgid ""
 "LinkChecker is a website validator.  It checks for broken\n"
 "links in websites.  It is recursive and multithreaded providing output in\n"
@@ -21996,99 +21957,99 @@ msgid ""
 "file links."
 msgstr ""
 
-#: gnu/packages/web.scm:5854
+#: gnu/packages/web.scm:5454
 msgid "Command-line WebDAV client"
 msgstr ""
 
-#: gnu/packages/web.scm:5856
+#: gnu/packages/web.scm:5456
 msgid ""
 "Cadaver is a command-line WebDAV client for Unix. It supports\n"
 "file upload, download, on-screen display, namespace operations (move/copy),\n"
 "collection creation and deletion, and locking operations."
 msgstr ""
 
-#: gnu/packages/web.scm:5874
+#: gnu/packages/web.scm:5474
 msgid "Universal Binary JSON encoder/decoder"
 msgstr ""
 
-#: gnu/packages/web.scm:5876
+#: gnu/packages/web.scm:5476
 msgid ""
 "Py-ubjson is a Python module providing an Universal Binary JSON\n"
 "encoder/decoder based on the draft-12 specification for UBJSON."
 msgstr ""
 
-#: gnu/packages/web.scm:5938
+#: gnu/packages/web.scm:5538
 msgid ""
 "Java Servlet, JavaServer Pages, Java Expression Language and Java\n"
 "WebSocket"
 msgstr ""
 
-#: gnu/packages/web.scm:5940
+#: gnu/packages/web.scm:5540
 msgid ""
 "Apache Tomcat is a free implementation of the Java\n"
 "Servlet, JavaServer Pages, Java Expression Language and Java WebSocket\n"
 "technologies."
 msgstr ""
 
-#: gnu/packages/web.scm:5990
+#: gnu/packages/web.scm:5591
 msgid "Helper classes for jetty tests"
 msgstr ""
 
-#: gnu/packages/web.scm:5991
+#: gnu/packages/web.scm:5592
 msgid ""
 "This packages contains helper classes for testing the Jetty\n"
 "Web Server."
 msgstr ""
 
-#: gnu/packages/web.scm:6053
+#: gnu/packages/web.scm:5654
 msgid "Utility classes for Jetty"
 msgstr ""
 
-#: gnu/packages/web.scm:6054
+#: gnu/packages/web.scm:5655
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:6125
+#: gnu/packages/web.scm:5726
 msgid "Jetty :: IO Utility"
 msgstr ""
 
-#: gnu/packages/web.scm:6126
+#: gnu/packages/web.scm:5727
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides IO-related utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:6169
+#: gnu/packages/web.scm:5770
 msgid "Jetty :: Http Utility"
 msgstr ""
 
-#: gnu/packages/web.scm:6170
+#: gnu/packages/web.scm:5771
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides HTTP-related utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:6203
+#: gnu/packages/web.scm:5804
 msgid "Jetty :: JMX Management"
 msgstr ""
 
-#: gnu/packages/web.scm:6204
+#: gnu/packages/web.scm:5805
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides the JMX management."
 msgstr ""
 
-#: gnu/packages/web.scm:6290
+#: gnu/packages/web.scm:5892
 msgid "Core jetty server artifact"
 msgstr ""
 
-#: gnu/packages/web.scm:6291
+#: gnu/packages/web.scm:5893
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -22096,11 +22057,11 @@ msgid ""
 "artifact."
 msgstr ""
 
-#: gnu/packages/web.scm:6335
+#: gnu/packages/web.scm:5937
 msgid "Jetty security infrastructure"
 msgstr ""
 
-#: gnu/packages/web.scm:6336
+#: gnu/packages/web.scm:5938
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -22108,11 +22069,11 @@ msgid ""
 "infrastructure"
 msgstr ""
 
-#: gnu/packages/web.scm:6379
+#: gnu/packages/web.scm:5981
 msgid "Jetty Servlet Container"
 msgstr ""
 
-#: gnu/packages/web.scm:6380
+#: gnu/packages/web.scm:5982
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -22120,22 +22081,22 @@ msgid ""
 "container."
 msgstr ""
 
-#: gnu/packages/web.scm:6544
+#: gnu/packages/web.scm:6146
 msgid "HTML parser"
 msgstr "Analyse d'HTML"
 
-#: gnu/packages/web.scm:6545
+#: gnu/packages/web.scm:6147
 msgid ""
 "Jsoup is a Java library for working with real-world HTML.  It\n"
 "provides a very convenient API for extracting and manipulating data, using the\n"
 "best of DOM, CSS, and jQuery-like methods."
 msgstr ""
 
-#: gnu/packages/web.scm:6566
+#: gnu/packages/web.scm:6168
 msgid "Validate HTML"
 msgstr ""
 
-#: gnu/packages/web.scm:6567
+#: gnu/packages/web.scm:6169
 msgid ""
 "Tidyp is a program that can validate your HTML, as well as\n"
 "modify it to be more clean and standard.  tidyp does not validate HTML 5.\n"
@@ -22145,22 +22106,22 @@ msgid ""
 "based on this library, allowing Perl programmers to easily validate HTML."
 msgstr ""
 
-#: gnu/packages/web.scm:6608
+#: gnu/packages/web.scm:6210
 msgid "(X)HTML validation in a Perl object"
 msgstr ""
 
-#: gnu/packages/web.scm:6609
+#: gnu/packages/web.scm:6211
 msgid ""
 "@code{HTML::Tidy} is an HTML checker in a handy dandy\n"
 "object.  It's meant as a replacement for @code{HTML::Lint}, which is written\n"
 "in Perl but is not nearly as capable as @code{HTML::Tidy}."
 msgstr ""
 
-#: gnu/packages/web.scm:6635
+#: gnu/packages/web.scm:6238
 msgid "Small Gopher server"
 msgstr ""
 
-#: gnu/packages/web.scm:6637
+#: gnu/packages/web.scm:6240
 msgid ""
 "Geomyidae is a server for distributed hypertext protocol Gopher.  Its\n"
 "features include:\n"
@@ -22174,22 +22135,22 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/web.scm:6685
+#: gnu/packages/web.scm:6288
 msgid "Random avatar generator"
 msgstr ""
 
-#: gnu/packages/web.scm:6686
+#: gnu/packages/web.scm:6289
 msgid ""
 "Cat avatar generator is a generator of cat pictures optimised\n"
 "to generate random avatars, or defined avatar from a \"seed\".  This is a\n"
 "derivation by David Revoy from the original MonsterID by Andreas Gohr."
 msgstr ""
 
-#: gnu/packages/web.scm:6748
+#: gnu/packages/web.scm:6355
 msgid "HTTP/2 protocol client, proxy, server, and library"
 msgstr ""
 
-#: gnu/packages/web.scm:6750
+#: gnu/packages/web.scm:6357
 msgid ""
 "nghttp2 implements the Hypertext Transfer Protocol, version\n"
 "2 (@dfn{HTTP/2}).\n"
@@ -22215,27 +22176,17 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/web.scm:6850
+#: gnu/packages/web.scm:6457
 msgid "Web interface for cluster deployments of Guix"
 msgstr ""
 
-#: gnu/packages/web.scm:6851
+#: gnu/packages/web.scm:6458
 msgid ""
 "Hpcguix-web provides a web interface to the list of packages\n"
 "provided by Guix.  The list of packages is searchable and provides\n"
 "instructions on how to use Guix in a shared HPC environment."
 msgstr ""
 
-#: gnu/packages/web.scm:6873
-msgid "Shiny UI widgets for small screens"
-msgstr ""
-
-#: gnu/packages/web.scm:6875
-msgid ""
-"This package provides UI widget and layout functions for writing Shiny apps that\n"
-"work well on small screens."
-msgstr ""
-
 #: gnu/packages/wordnet.scm:92
 msgid "Lexical database for the English language"
 msgstr "Base de données lexicale pour la langue anglaise"
@@ -22349,21 +22300,21 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/xiph.scm:251
+#: gnu/packages/xiph.scm:252
 msgid "Free lossless audio codec"
 msgstr ""
 
-#: gnu/packages/xiph.scm:253
+#: gnu/packages/xiph.scm:254
 msgid ""
 "FLAC stands for Free Lossless Audio Codec, an audio format that is lossless,\n"
 "meaning that audio is compressed in FLAC without any loss in quality."
 msgstr ""
 
-#: gnu/packages/xiph.scm:279
+#: gnu/packages/xiph.scm:288
 msgid "Karaoke and text codec for embedding in ogg"
 msgstr ""
 
-#: gnu/packages/xiph.scm:281
+#: gnu/packages/xiph.scm:290
 msgid ""
 "Kate is an overlay codec, originally designed for karaoke and text,\n"
 "that can be multiplixed in Ogg.  Text and images can be carried by a Kate\n"
@@ -22378,11 +22329,11 @@ msgid ""
 "Kate stream."
 msgstr ""
 
-#: gnu/packages/xiph.scm:319
+#: gnu/packages/xiph.scm:328
 msgid "Ogg vorbis tools"
 msgstr "Outils pour Ogg vorbis"
 
-#: gnu/packages/xiph.scm:321
+#: gnu/packages/xiph.scm:330
 msgid ""
 "Ogg vorbis is a non-proprietary, patent-and-royalty-free,\n"
 "general-purpose compressed audio format.\n"
@@ -22404,11 +22355,11 @@ msgstr ""
 "ogginfo, pour obtenir des informations (tags, débit, longueur, etc) à propos\n"
 "         d'un fichier ogg vorbis."
 
-#: gnu/packages/xiph.scm:345 gnu/packages/xiph.scm:411
+#: gnu/packages/xiph.scm:354 gnu/packages/xiph.scm:420
 msgid "Versatile audio codec"
 msgstr "Codec audio polyvalent"
 
-#: gnu/packages/xiph.scm:347
+#: gnu/packages/xiph.scm:356
 msgid ""
 "Opus is a totally open, royalty-free, highly versatile audio codec.  Opus\n"
 "is unmatched for interactive speech and music transmission over the Internet,\n"
@@ -22423,11 +22374,11 @@ msgstr ""
 "qui contient les technologies du codec SILK de Skype et du code CELT de\n"
 "Xiph.Org."
 
-#: gnu/packages/xiph.scm:384
+#: gnu/packages/xiph.scm:393
 msgid "Command line utilities to encode, inspect, and decode .opus files"
 msgstr "Utilitaires en ligne de commande pour encoder, inspecter et décoder des fichiers .opus"
 
-#: gnu/packages/xiph.scm:385
+#: gnu/packages/xiph.scm:394
 msgid ""
 "Opus is a royalty-free, highly versatile audio codec.\n"
 "Opus-tools provide command line utilities for creating, inspecting and\n"
@@ -22437,7 +22388,7 @@ msgstr ""
 "Opus-tools fournit des utilitaires en ligne de commande pour créer, inspecter\n"
 "et décoder des fichiers .opus."
 
-#: gnu/packages/xiph.scm:413
+#: gnu/packages/xiph.scm:422
 msgid ""
 "The opusfile library provides seeking, decode, and playback of Opus\n"
 "streams in the Ogg container (.opus files) including over http(s) on posix and\n"
@@ -22447,21 +22398,21 @@ msgstr ""
 "flux Opus dans le conteneur Ogg (fichiers .opus) notamment par http(s) sur les\n"
 "systèmes posix et windows."
 
-#: gnu/packages/xiph.scm:435
+#: gnu/packages/xiph.scm:444
 msgid "Library for encoding Opus audio files and streams "
 msgstr "Bibliothèque pour encoder des des fichiers audios et des flux Opus"
 
-#: gnu/packages/xiph.scm:436
+#: gnu/packages/xiph.scm:445
 msgid ""
 "The libopusenc libraries provide a high-level API for\n"
 "encoding Opus files and streams."
 msgstr ""
 
-#: gnu/packages/xiph.scm:465
+#: gnu/packages/xiph.scm:474
 msgid "Streaming media server"
 msgstr "Serveur de flux multimédia"
 
-#: gnu/packages/xiph.scm:466
+#: gnu/packages/xiph.scm:475
 msgid ""
 "Icecast is a streaming media server which currently supports\n"
 "Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams.  It can be used to\n"
@@ -22473,11 +22424,11 @@ msgstr ""
 "utilisé pour créer une station radio internet ou un jukebox privé et bien\n"
 "d'autres choses."
 
-#: gnu/packages/xiph.scm:494
+#: gnu/packages/xiph.scm:503
 msgid "Audio streaming library for icecast encoders"
 msgstr "Bibliothèque de streaming audio pour les encodeurs icecast"
 
-#: gnu/packages/xiph.scm:496
+#: gnu/packages/xiph.scm:505
 msgid ""
 "Libshout is a library for communicating with and sending data to an\n"
 "icecast server.  It handles the socket connection, the timing of the data,\n"
@@ -22487,7 +22438,7 @@ msgstr ""
 "un serveur icecast.  Il prend en charge la connexion, la synchronisation des\n"
 "données et évite que de mauvaises données n'atteignent le serveur icecast."
 
-#: gnu/services/base.scm:294
+#: gnu/services/base.scm:298
 msgid ""
 "The @code{user-processes} service is responsible for\n"
 "terminating all the processes so that the root file system can be re-mounted\n"
@@ -22501,7 +22452,7 @@ msgstr ""
 "tournent toujours quelques secondes après qu'un @code{SIGTERM} leur ait été\n"
 "envoyé sont terminés avec @code{SIGKILL}."
 
-#: gnu/services/base.scm:346
+#: gnu/services/base.scm:350
 msgid ""
 "Populate the @file{/etc/fstab} based on the given file\n"
 "system objects."
@@ -22509,7 +22460,7 @@ msgstr ""
 "Rempli @file{/etc/fstab} en fonction des objets de systèmes de\n"
 "fichiers donnés."
 
-#: gnu/services/base.scm:523
+#: gnu/services/base.scm:527
 msgid ""
 "Provide Shepherd services to mount and unmount the given\n"
 "file systems, as well as corresponding @file{/etc/fstab} entries."
@@ -22517,7 +22468,7 @@ msgstr ""
 "Fournit des services Shepherd pour monter et démonter les systèmes\n"
 "de fichiers donnés, ainsi que les entrées @file{/etc/fstab} correspondantes."
 
-#: gnu/services/base.scm:613
+#: gnu/services/base.scm:617
 msgid ""
 "Seed the @file{/dev/urandom} pseudo-random number\n"
 "generator (RNG) with the value recorded when the system was last shut\n"
@@ -22526,7 +22477,7 @@ msgstr ""
 "Initialise le générateur de nombres pseudo-aléatoires (PRNG) @file{/dev/urandom}\n"
 "avec la valeur enregistrée lors de la dernière extinction du système."
 
-#: gnu/services/base.scm:777
+#: gnu/services/base.scm:783
 msgid ""
 "Install the given fonts on the specified ttys (fonts are per\n"
 "virtual console on GNU/Linux).  The value of this service is a list of\n"
@@ -22544,7 +22495,7 @@ msgstr ""
 "'((\"tty1\" . \"LatGrkCyr-8x16\"))\n"
 "@end example\n"
 
-#: gnu/services/base.scm:820
+#: gnu/services/base.scm:827
 msgid ""
 "Provide a console log-in service as specified by its\n"
 "configuration value, a @code{login-configuration} object."
@@ -22552,19 +22503,19 @@ msgstr ""
 "Fournit un service de connexion en console tel que spécifié par sa\n"
 "valeur de configuration, un objet @code{login-configuration}."
 
-#: gnu/services/base.scm:1083
+#: gnu/services/base.scm:1090
 msgid ""
 "Provide console login using the @command{agetty}\n"
 "program."
 msgstr "Fournit la connexion en console avec le programme @command{agetty}."
 
-#: gnu/services/base.scm:1144
+#: gnu/services/base.scm:1151
 msgid ""
 "Provide console login using the @command{mingetty}\n"
 "program."
 msgstr "Fournit la connexion en console avec le programme @command{mingetty}."
 
-#: gnu/services/base.scm:1360
+#: gnu/services/base.scm:1368
 msgid ""
 "Runs libc's @dfn{name service cache daemon} (nscd) with the\n"
 "given configuration---an @code{<nscd-configuration>} object.  @xref{Name\n"
@@ -22574,7 +22525,7 @@ msgstr ""
 "configuration donnée — un objet @code{<nscd-configuration>}.  @xref{Name\n"
 "Service Switch}, pour un exemple."
 
-#: gnu/services/base.scm:1460
+#: gnu/services/base.scm:1468
 msgid ""
 "Install the specified resource usage limits by populating\n"
 "@file{/etc/security/limits.conf} and using the @code{pam_limits}\n"
@@ -22584,11 +22535,11 @@ msgstr ""
 "en remplissant @file{/etc/security/limits.conf} et en utilisant le module\n"
 "d'authentification @code{pam_limits}."
 
-#: gnu/services/base.scm:1679
+#: gnu/services/base.scm:1714
 msgid "Run the build daemon of GNU@tie{}Guix, aka. @command{guix-daemon}."
 msgstr "Lance le démon de construction de GNU@tie{}Guix, c'est à dire @command{guix-daemon}."
 
-#: gnu/services/base.scm:1779
+#: gnu/services/base.scm:1816
 msgid ""
 "Add a Shepherd service running @command{guix publish}, a\n"
 "command that allows you to share pre-built binaries with others over HTTP."
@@ -22596,7 +22547,7 @@ msgstr ""
 "Ajout un service Shepher qui lance @command{guix publish}, une\n"
 "commande qui vous permet de partager les binaires préconstruits sur HTTP."
 
-#: gnu/services/base.scm:1978
+#: gnu/services/base.scm:2026
 msgid ""
 "Run @command{udev}, which populates the @file{/dev}\n"
 "directory dynamically.  Get extra rules from the packages listed in the\n"
@@ -22606,7 +22557,7 @@ msgstr ""
 "dynamiquement.  Il prend des règles supplémentaires des paquets listés\n"
 "dans le champ @code{rules} de sa valeur, un objet @code{udev-configuration}."
 
-#: gnu/services/base.scm:2060
+#: gnu/services/base.scm:2108
 msgid ""
 "Run GPM, the general-purpose mouse daemon, with the given\n"
 "command-line options.  GPM allows users to use the mouse in the console,\n"
@@ -22619,7 +22570,7 @@ msgstr ""
 "par défaut utilisent le protocole @code{ps2} qui fonctionne aussi bien pour les\n"
 "souris USB que PS/2."
 
-#: gnu/services/base.scm:2243
+#: gnu/services/base.scm:2292
 msgid ""
 "Turn up the specified network interfaces upon startup,\n"
 "with the given IP address, gateway, netmask, and so on.  The value for\n"
@@ -22641,7 +22592,7 @@ msgstr ""
 "Encrypt} en ajustant la configuration du serveur web nginx et en invoquant\n"
 "périodiquement @command{certbot}."
 
-#: gnu/services/networking.scm:372
+#: gnu/services/networking.scm:374
 msgid ""
 "Run the @command{ntpd}, the Network Time Protocol (NTP)\n"
 "daemon of the @uref{http://www.ntp.org, Network Time Foundation}.  The daemon\n"
@@ -22651,7 +22602,7 @@ msgstr ""
 "(NTP) de la @uref{http://www.ntp.org, Network Time Foundation}.  Le démon gardera\n"
 "l'horloge du système synchronisée avec celle du serveur donné."
 
-#: gnu/services/networking.scm:485
+#: gnu/services/networking.scm:488
 msgid ""
 "Run the @command{ntpd}, the Network Time Protocol (NTP)\n"
 "daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The\n"
@@ -22661,7 +22612,7 @@ msgstr ""
 "(NTP) implémenté par @uref{http://www.openntpd.org, OpenNTPD}.  Le démon gardera\n"
 "l'horloge du système synchronisée avec celle du serveur donné."
 
-#: gnu/services/networking.scm:573
+#: gnu/services/networking.scm:576
 msgid ""
 "Start @command{inetd}, the @dfn{Internet superserver}.  It is responsible\n"
 "for listening on Internet sockets and spawning the corresponding services on\n"
@@ -22671,7 +22622,7 @@ msgstr ""
 "de l'écoute sur des sockets Internet et du démarrage des services correspondants\n"
 "à la demande."
 
-#: gnu/services/networking.scm:752
+#: gnu/services/networking.scm:755
 msgid ""
 "Run the @uref{https://torproject.org, Tor} anonymous\n"
 "networking daemon."
@@ -22679,11 +22630,11 @@ msgstr ""
 "Lance le démon de navigation anonyme\n"
 "@uref{https://torproject.org, Tor}."
 
-#: gnu/services/networking.scm:775
+#: gnu/services/networking.scm:779
 msgid "Define a new Tor @dfn{hidden service}."
 msgstr "Définie un nouveau @dfn{service caché} Tor."
 
-#: gnu/services/networking.scm:843
+#: gnu/services/networking.scm:847
 msgid ""
 "Run @url{https://launchpad.net/wicd,Wicd}, a network\n"
 "management daemon that aims to simplify wired and wireless networking."
@@ -22691,7 +22642,7 @@ msgstr ""
 "Lance @url{https://launchpad.net/wicd,Wicd}, un démon de gestion\n"
 "de réseau qui veut simplifier les connexions filaires et sans-fil."
 
-#: gnu/services/networking.scm:943
+#: gnu/services/networking.scm:947
 msgid ""
 "Run @uref{https://wiki.gnome.org/Projects/NetworkManager,\n"
 "NetworkManager}, a network management daemon that aims to simplify wired and\n"
@@ -22701,7 +22652,7 @@ msgstr ""
 "NetworkManager}, une démon de gestion de réseau qui veut simplifier\n"
 "les connexions filaires et sans-fil."
 
-#: gnu/services/networking.scm:1004
+#: gnu/services/networking.scm:1008
 msgid ""
 "Run @url{https://01.org/connman,Connman},\n"
 "a network connection manager."
@@ -22709,7 +22660,7 @@ msgstr ""
 "Lance @url{https://01.org/connman,Connman}, un\n"
 "gestionnaire de connexion réseau."
 
-#: gnu/services/networking.scm:1027
+#: gnu/services/networking.scm:1031
 msgid ""
 "Run @uref{https://wiki.gnome.org/Projects/ModemManager,\n"
 "ModemManager}, a modem management daemon that aims to simplify dialup\n"
@@ -22719,13 +22670,13 @@ msgstr ""
 "ModemManager}, un démon de gestion de modem qui veut simplifier les\n"
 "connexions par ligne téléphonique."
 
-#: gnu/services/networking.scm:1089
+#: gnu/services/networking.scm:1094
 msgid ""
 "Run the WPA Supplicant daemon, a service that\n"
 "implements authentication, key negotiation and more for wireless networks."
 msgstr ""
 
-#: gnu/services/networking.scm:1151
+#: gnu/services/networking.scm:1156
 msgid ""
 "Run @uref{http://www.openvswitch.org, Open vSwitch}, a multilayer virtual\n"
 "switch designed to enable massive network automation through programmatic\n"
@@ -22735,7 +22686,7 @@ msgstr ""
 "multi-niveau conçu pour permettre une automatisation massive du réseau via des\n"
 "extensions programmables."
 
-#: gnu/services/networking.scm:1196
+#: gnu/services/networking.scm:1202
 msgid "Run @command{iptables-restore}, setting up the specified rules."
 msgstr ""
 
@@ -22753,6 +22704,150 @@ msgid ""
 "provide a web interface to view selected repositories."
 msgstr ""
 
+#~ msgid "The GNU C Library (GNU Hurd variant)"
+#~ msgstr "La bibliothèque GNU C (variante GNU Hurd)"
+
+#~ msgid "Python bindings for the LZO data compression library"
+#~ msgstr "Liaisons python pour la bibliothèque de compression LZO"
+
+#~ msgid "LZ4 bindings for Python"
+#~ msgstr "Liaisons LZ4 pour Python"
+
+#~ msgid "Java bzip2 compression/decompression library"
+#~ msgstr "Bibliothèque de compression et décompression bzip2 pour Java"
+
+#~ msgid "Provides an interface to Zip archive files"
+#~ msgstr "Fournit une interface pour les fichiers d'archives ZIP"
+
+#~ msgid ""
+#~ "The @code{Archive::Zip} module allows a Perl program to\n"
+#~ "create, manipulate, read, and write Zip archive files."
+#~ msgstr ""
+#~ "Le module @code{Archive::Zip} permet à un programme Perl de créer,\n"
+#~ "manipuler, lire et écrire des fichiers d'archives Zip."
+
+#~ msgid "Berkeley database"
+#~ msgstr "Base de données Berkeley"
+
+#~ msgid ""
+#~ "Berkeley DB is an embeddable database allowing developers the choice of\n"
+#~ "SQL, Key/Value, XML/XQuery or Java Object storage for their data model."
+#~ msgstr ""
+#~ "Berkeley DB est une base de données embarquée proposant aux développeurs\n"
+#~ "le choix de SQL, clé/valeur, XML/XQuery ou Java Object Storage pour leur\n"
+#~ "modèle de données."
+
+#~ msgid "The SQLite database management system"
+#~ msgstr "Le système de gestion de bases de données SQLite"
+
+#~ msgid ""
+#~ "SQLite is a software library that implements a self-contained, serverless,\n"
+#~ "zero-configuration, transactional SQL database engine.  SQLite is the most\n"
+#~ "widely deployed SQL database engine in the world.  The source code for SQLite\n"
+#~ "is in the public domain."
+#~ msgstr ""
+#~ "SQLite est une bibliothèque logicielle implémantant un moteur de bases\n"
+#~ "de données SQL indépendant, sans serveur, sans configuration et transactionnel.\n"
+#~ "SQLite est le moteur de bases de données SQL le plus déployé de part le monde.\n"
+#~ "Le code source de SQLite est dans le domaine public."
+
+#~ msgid "Database interface and MySQL driver for R"
+#~ msgstr "Interface de base de données et pilote MySQL pour R"
+
+#~ msgid "Framework for building readers for GNU Guile"
+#~ msgstr "Framework pour la construction de lecteurs GNU Guile"
+
+#~ msgid ""
+#~ "Guile-Reader is a simple framework for building readers for GNU Guile.\n"
+#~ "\n"
+#~ "The idea is to make it easy to build procedures that extend Guile’s read\n"
+#~ "procedure.  Readers supporting various syntax variants can easily be written,\n"
+#~ "possibly by re-using existing “token readers” of a standard Scheme\n"
+#~ "readers.  For example, it is used to implement Skribilo’s R5RS-derived\n"
+#~ "document syntax.\n"
+#~ "\n"
+#~ "Guile-Reader’s approach is similar to Common Lisp’s “read table”, but\n"
+#~ "hopefully more powerful and flexible (for instance, one may instantiate as\n"
+#~ "many readers as needed)."
+#~ msgstr ""
+#~ "Guile-Reader est un framework permettant de construire des lecteurs pour\n"
+#~ "GNU Guile. L'idée est de rendre facile la construction de procédures étendant\n"
+#~ "la procédure de lecture de Guile. Il est possible d'écrire facilement des lecteurs\n"
+#~ "supportant de nombreuses syntaxes. Par exemple, Guile-Reader est utilisé pour\n"
+#~ "implanter la syntaxe de documents basés sur R5RS de Skribilo.\n"
+#~ "\n"
+#~ "L'approche de Guile-Reader est similaire à la table de lecture de Lisp, mais\n"
+#~ "plus puissante et plus flexible (il est par exemple possible d'instancier autant\n"
+#~ "de lecteurs que nécessaires)."
+
+#~ msgid "Guile bindings to ncurses"
+#~ msgstr "Bindings Guile pour ncurses"
+
+#~ msgid ""
+#~ "guile-ncurses provides Guile language bindings for the ncurses\n"
+#~ "library."
+#~ msgstr "guile-ncurses fournit un binding Guile pour la biliothèque ncurses."
+
+#~ msgid "Run jobs at scheduled times"
+#~ msgstr "Plannification de tâches"
+
+#~ msgid ""
+#~ "GNU Mcron is a complete replacement for Vixie cron.  It is used to run\n"
+#~ "tasks on a schedule, such as every hour or every Monday.  Mcron is written in\n"
+#~ "Guile, so its configuration can be written in Scheme; the original cron\n"
+#~ "format is also supported."
+#~ msgstr ""
+#~ "GNU Mcron est un remplaçant à Vixie cron. Il est utilisé pour la planification\n"
+#~ "de tâches à intervalles réguliers (toutes les heures, tous les lundi, etc...).\n"
+#~ "Mcron est écrit en Guile et peut donc être configuré en Scheme ; le format cron\n"
+#~ "original est aussi supporté."
+
+#~ msgid "Collection of useful Guile Scheme modules"
+#~ msgstr "Collection de modules Scheme utiles pour Guile"
+
+#~ msgid ""
+#~ "Guile-Lib is intended as an accumulation place for pure-scheme Guile\n"
+#~ "modules, allowing for people to cooperate integrating their generic Guile\n"
+#~ "modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN\n"
+#~ "for Guile\"."
+#~ msgstr ""
+#~ "Guile-Lib est conçue comme une collection de modules Scheme pour Guile permettant\n"
+#~ "aux utilisateurs d'intégrer leurs modules Guile au sein d'une bilbiothéque commune\n"
+#~ "et cohérente. Voyez Guile-Lib comme une version plus simple de CPAN limitée à Guile."
+
+#~ msgid "Generate C bindings for Guile"
+#~ msgstr "Génère des liaisons C pour Guile"
+
+#~ msgid "Guile database abstraction layer"
+#~ msgstr "Couche d'abstraction de base de données pour Guile"
+
+#~ msgid "DSV module for Guile"
+#~ msgstr "Module DSV pour Guile"
+
+#~ msgid ""
+#~ "This package provides a Guile programming interface to the ZeroMQ\n"
+#~ "messaging library."
+#~ msgstr ""
+#~ "Ce paquet fournit une interface de programmation Guile pour la bibliothèque\n"
+#~ "de messages ZeroMQ."
+
+#~ msgid "SPARQL module for Guile"
+#~ msgstr "Module SPARQL pour Guile"
+
+#~ msgid ""
+#~ "This package provides an email parser written in pure\n"
+#~ "Guile."
+#~ msgstr "Ce paquet fournit un analyseur de courriels en pur Guile."
+
+#~ msgid "Guile bindings to Newt"
+#~ msgstr "Liaisons Guile pour Newt"
+
+#~ msgid "This package provides tools for HTML generation and output in R."
+#~ msgstr "Ce paquet fournit des outils pour générer du HTML en R."
+
+#~ msgid "Web server interface for R"
+#~ msgstr "Serveur web d'interface pour R"
+
 #~ msgid "Easy and secure backup program"
 #~ msgstr "Programme de sauvegarde sécurisées et faciles"
 
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 66bf6be8d0..d479296ef1 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -183,6 +183,13 @@ then false; else true; fi
 
 rm -f "$result"
 
+# Check relative file name canonicalization: <https://bugs.gnu.org/35271>.
+mkdir "$result"
+guix build -r "$result/x" -e '(@@ (gnu packages bootstrap) %bootstrap-guile)'
+test -x "$result/x/bin/guile"
+rm "$result/x"
+rmdir "$result"
+
 # Cross building.
 guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes
 
diff --git a/tests/guix-gc.sh b/tests/guix-gc.sh
index ef2d9543b7..8284287730 100644
--- a/tests/guix-gc.sh
+++ b/tests/guix-gc.sh
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -34,7 +34,7 @@ unset drv
 unset out
 
 # For some operations, passing extra arguments is an error.
-for option in "" "-C 500M" "--verify" "--optimize"
+for option in "" "-C 500M" "--verify" "--optimize" "--list-roots"
 do
     if guix gc $option whatever; then false; else true; fi
 done
@@ -69,6 +69,8 @@ guix gc --delete "$drv"
 drv="`guix build --root=guix-gc-root lsh -d`"
 test -f "$drv" && test -L guix-gc-root
 
+guix gc --list-roots | grep "$PWD/guix-gc-root"
+
 guix gc --list-live | grep "$drv"
 if guix gc --delete "$drv";
 then false; else true; fi
diff --git a/tests/store-roots.scm b/tests/store-roots.scm
new file mode 100644
index 0000000000..5bcf1bc87e
--- /dev/null
+++ b/tests/store-roots.scm
@@ -0,0 +1,53 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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 (test-store-deduplication)
+  #:use-module (guix tests)
+  #:use-module (guix store)
+  #:use-module (guix store roots)
+  #:use-module ((guix utils) #:select (call-with-temporary-directory))
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-64))
+
+(define %store
+  (open-connection))
+
+(test-begin "store-roots")
+
+(test-assert "gc-roots, regular root"
+  (let* ((item (add-text-to-store %store "something"
+                                  (random-text)))
+         (root (string-append %gc-roots-directory "/test-gc-root")))
+    (symlink item root)
+    (let ((result (member root (gc-roots))))
+      (delete-file root)
+      result)))
+
+(test-assert "gc-roots, indirect root"
+  (call-with-temporary-directory
+   (lambda (directory)
+     (let* ((item (add-text-to-store %store "something"
+                                     (random-text)))
+            (root (string-append directory "/gc-root")))
+       (symlink item root)
+       (add-indirect-root %store root)
+       (let ((result (member root (gc-roots))))
+         (delete-file root)
+         result)))))
+
+(test-end "store-roots")
diff --git a/tests/zlib.scm b/tests/zlib.scm
index 5455240a71..7c595a422c 100644
--- a/tests/zlib.scm
+++ b/tests/zlib.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,11 +26,10 @@
 
 ;; Test the (guix zlib) module.
 
-(unless (zlib-available?)
-  (exit 77))
-
 (test-begin "zlib")
 
+(unless (zlib-available?)
+  (test-skip 1))
 (test-assert "compression/decompression pipe"
   (let ((data (random-bytevector (+ (random 10000)
                                     (* 20 1024)))))