Merge branch 'staging' into core-updates

1 files changed, 47 insertions, 171 deletions

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 15ac34959c..00782ce8b2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -107,8 +107,6 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xdisorg))
 
-
-
 ;; When cross-compiling certain packages, "--disable-malloc0returnsnull"
 ;; needs to be passed.  Otherwise, the configure script will try to run a
 ;; binary for the host on the build machine.
@@ -448,7 +446,6 @@ specification editres will append the resource string to the user's X
 Resources file.")
     (license license:x11)))
 
-
 (define-public encodings
   (package
     (name "encodings")
@@ -514,7 +511,6 @@ Resources file.")
     (description "Xorg adobe-100dpi fonts.")
     (license license:x11)))
 
-
 (define-public font-adobe75dpi
   (package
     (name "font-adobe75dpi")
@@ -535,13 +531,11 @@ Resources file.")
     (description "Xorg adobe-75dpi fonts.")
     (license license:x11)))
 
-
 ;; non-free license
 ;; (define-public font-adobe-utopia100dpi
 ;; (define-public font-adobe-utopia75dpi
 ;; (define-public font-adobe-utopia-type1
 
-
 (define-public font-alias
   (package
     (name "font-alias")
@@ -575,7 +569,6 @@ Resources file.")
 For example: @code{6x10}, @code{9x15bold}, etc.")
     (license license:x11)))
 
-
 (define-public font-arabic-misc
   (package
     (name "font-arabic-misc")
@@ -593,7 +586,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg arabic-misc font.")
     (license license:x11)))
 
-
 ;; non-free license
 ;; (define-public font-bh100dpi
 ;; (define-public font-bh75dpi
@@ -604,7 +596,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
 ;; (define-public font-bitstream100dpi
 ;; (define-public font-bitstream75dpi
 
-
 (define-public font-cronyx-cyrillic
   (package
     (name "font-cronyx-cyrillic")
@@ -622,14 +613,12 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg cronyx-cyrillic font.")
     (license license:x11)))
 
-
 ;; no license
 ;; (define-public font-cursor-misc
 
 ;; non-free license
 ;; (define-public font-daewoo-misc
 
-
 (define-public font-dec-misc
   (package
     (name "font-dec-misc")
@@ -647,7 +636,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg dec-misc font.")
     (license license:x11)))
 
-
 ;; non-free license
 ;; (define-public font-ibm-type1
 
@@ -668,11 +656,9 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg isas-misc font.")
     (license license:x11)))
 
-
 ;; non-free license
 ;; (define-public font-jis-misc
 
-
 (define-public font-micro-misc
   (package
     (name "font-micro-misc")
@@ -690,7 +676,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg micro-misc font.")
     (license license:public-domain)))
 
-
 (define-public font-misc-cyrillic
   (package
     (name "font-misc-cyrillic")
@@ -708,7 +693,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg misc-cyrillic fonts.")
     (license license:x11)))
 
-
 (define-public font-misc-ethiopic
   (package
     (name "font-misc-ethiopic")
@@ -726,11 +710,9 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg misc-ethiopic fonts.")
     (license license:x11)))
 
-
 ;; non-free license
 ;; (define-public font-misc-meltho
 
-
 (define-public font-misc-misc
   (package
     (name "font-misc-misc")
@@ -751,7 +733,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg misc-misc fixed fonts.")
     (license license:public-domain)))
 
-
 (define-public font-mutt-misc
   (package
     (name "font-mutt-misc")
@@ -769,7 +750,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg mutt-misc fonts.")
     (license license:x11)))
 
-
 (define-public font-schumacher-misc
   (package
     (name "font-schumacher-misc")
@@ -790,7 +770,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg schumacher-misc fonts.")
     (license license:x11)))
 
-
 (define-public font-screen-cyrillic
   (package
     (name "font-screen-cyrillic")
@@ -808,7 +787,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg screen-cyrillic fonts.")
     (license license:x11)))
 
-
 (define-public font-sony-misc
   (package
     (name "font-sony-misc")
@@ -826,7 +804,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg sony-misc fonts.")
     (license license:x11)))
 
-
 (define-public font-sun-misc
   (package
     (name "font-sun-misc")
@@ -844,7 +821,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg sun-misc fonts.")
     (license license:x11)))
 
-
 (define-public font-util
   (package
     (name "font-util")
@@ -866,7 +842,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
      "Xorg font package creation/installation utilities.")
     (license license:x11)))
 
-
 (define-public font-winitzki-cyrillic
   (package
     (name "font-winitzki-cyrillic")
@@ -884,7 +859,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg winitzki-cyrillic font.")
     (license license:public-domain)))
 
-
 (define-public font-xfree86-type1
   (package
     (name "font-xfree86-type1")
@@ -902,7 +876,6 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
     (description "Xorg xfree86-type1 font.")
     (license license:x11)))
 
-
 (define-public fontsproto
   (package
     (name "fontsproto")
@@ -978,7 +951,6 @@ operates very much like the xauth program for X11 connection
 authentication records.")
     (license license:x11)))
 
-
 (define-public inputproto
   (package
     (name "inputproto")
@@ -1030,7 +1002,6 @@ of new capabilities and controls for text keyboards.")
 ;; requires applewmproto, which compiles only on macos
 ;; (define-public libapplewm
 
-
 (define-public libdmx
   (package
     (name "libdmx")
@@ -1058,7 +1029,6 @@ of new capabilities and controls for text keyboards.")
      "DMX (Distributed Multihead X) extension library.")
     (license license:x11)))
 
-
 (define-public libxshmfence
   (package
     (name "libxshmfence")
@@ -1085,7 +1055,6 @@ synchronization between the X server and direct-rendering clients.")
     ;; Same license as libevdev.
     (license (license:x11-style "file://COPYING"))))
 
-
 (define-public libfontenc
   (package
     (name "libfontenc")
@@ -1112,7 +1081,6 @@ synchronization between the X server and direct-rendering clients.")
     (description "Xorg font encoding library.")
     (license license:x11)))
 
-
 (define-public libfs
   (package
     (name "libfs")
@@ -1139,7 +1107,6 @@ Servers (xfs), such as xfsinfo, fslsfonts, and the X servers
 themselves.")
     (license license:x11)))
 
-
 (define-public libpciaccess
   (package
     (name "libpciaccess")
@@ -1184,7 +1151,6 @@ themselves.")
     (description "Xorg Generic PCI access library.")
     (license license:x11)))
 
-
 (define-public libpthread-stubs
   (package
     (name "libpthread-stubs")
@@ -1211,7 +1177,6 @@ thread-safe when linked to libpthread, while avoiding any performance
 hit when running single-threaded.")
     (license license:x11)))
 
-
 (define-public libsm
   (package
     (name "libsm")
@@ -1241,7 +1206,6 @@ hit when running single-threaded.")
     (description "Xorg Session Management library.")
     (license license:x11)))
 
-
 (define-public libwindowswm
   (package
     (name "libwindowswm")
@@ -1270,7 +1234,6 @@ extension.  This extension allows X window managers to better interact
 with the Cygwin XWin server when running X11 in a rootless mode.")
     (license license:x11)))
 
-
 (define-public libxcomposite
   (package
     (name "libxcomposite")
@@ -1299,7 +1262,6 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
      "Client library for the Composite extension to the X11 protocol.")
     (license license:x11)))
 
-
 (define-public libxdmcp
   (package
     (name "libxdmcp")
@@ -1326,7 +1288,6 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
     (description "Xorg Display Manager Control Protocol library.")
     (license license:x11)))
 
-
 (define-public libxft
   (package
     (name "libxft")
@@ -1361,7 +1322,6 @@ rasterization library.  Xft uses fontconfig to locate fonts so it has no
 configuration files.")
     (license license:x11)))
 
-
 (define-public libxkbfile
   (package
     (name "libxkbfile")
@@ -1389,7 +1349,6 @@ configuration files.")
     (description "Xorg XKB file handling library.")
     (license license:x11)))
 
-
 (define-public libxmu
   (package
     (name "libxmu")
@@ -1421,7 +1380,6 @@ applications developers who depend on this library should be prepared to
 treat it as part of their software base when porting.")
     (license license:x11)))
 
-
 (define-public libxpm
   (package
     (name "libxpm")
@@ -1449,7 +1407,6 @@ treat it as part of their software base when porting.")
     (description "XPM (X Pixmap) image file format library.")
     (license license:x11)))
 
-
 (define-public libxres
   (package
     (name "libxres")
@@ -1476,7 +1433,6 @@ treat it as part of their software base when porting.")
     (description "X Resource extension library.")
     (license license:x11)))
 
-
 (define-public libxscrnsaver
   (package
     (name "libxscrnsaver")
@@ -1503,7 +1459,6 @@ treat it as part of their software base when porting.")
     (description "X11 Screen Saver extension client library.")
     (license license:x11)))
 
-
 (define-public libxxf86dga
   (package
     (name "libxxf86dga")
@@ -1529,29 +1484,34 @@ treat it as part of their software base when porting.")
     (description "Client library for the XFree86-DGA extension.")
     (license license:x11)))
 
-
 (define-public luit
   (package
     (name "luit")
     (version "1.1.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/individual/app/luit-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))
-        ;; See https://bugs.freedesktop.org/show_bug.cgi?id=47792;
-        ;; should become obsolete with the next release.
-        (patches (search-patches "luit-posix.patch"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://xorg/individual/app/luit-"
+             version
+             ".tar.bz2"))
+       (sha256
+        (base32
+         "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))
+       ;; See https://bugs.freedesktop.org/show_bug.cgi?id=47792;
+       ;; should become obsolete with the next release.
+       (patches (search-patches "luit-posix.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "--with-localealiasfile="
+                             (search-input-file
+                              %build-inputs "share/X11/locale/locale.alias")))))
     (inputs
-      (list libfontenc))
+     (list libfontenc libx11))
     (native-inputs
-       (list pkg-config))
+     (list pkg-config))
     (home-page "https://www.x.org/wiki/")
     (synopsis "Convert terminal I/O from legacy encodings to UTF-8")
     (description
@@ -1561,7 +1521,6 @@ output from the locale's encoding into UTF-8, and convert terminal
 input from UTF-8 into the locale's encoding.")
     (license license:x11)))
 
-
 (define-public makedepend
   (package
     (name "makedepend")
@@ -1586,7 +1545,6 @@ input from UTF-8 into the locale's encoding.")
      "Makedepend is an utility for creating dependencies in makefiles.")
     (license license:x11)))
 
-
 (define-public mkfontscale
   (package
     (name "mkfontscale")
@@ -1612,7 +1570,6 @@ input from UTF-8 into the locale's encoding.")
 files used by the legacy X11 font system.")
     (license license:x11)))
 
-
 (define-public presentproto
   (package
     (name "presentproto")
@@ -1662,7 +1619,6 @@ mechanism than copying the contents of the source pixmap.")
 network-transparent printing system.")
     (license license:x11)))
 
-
 (define-public randrproto
   (package
     (name "randrproto")
@@ -1688,7 +1644,6 @@ window of a screen.")
     (license license:x11)
     (properties `((superseded . ,xorgproto)))))
 
-
 (define-public recordproto
   (package
     (name "recordproto")
@@ -1809,7 +1764,6 @@ sessions.  It was originally written for use with xdm, but may also be
 used with other display managers such as gdm or kdm.")
     (license license:x11)))
 
-
 (define-public setxkbmap
   (package
     (name "setxkbmap")
@@ -1842,7 +1796,6 @@ for a specified keyboard to use the layout determined by the options
 listed on the command line.")
     (license license:x11)))
 
-
 (define-public smproxy
   (package
     (name "smproxy")
@@ -1869,7 +1822,6 @@ listed on the command line.")
 management to participate in an X11R6 session.")
     (license license:x11)))
 
-
 (define-public util-macros
   (package
     (name "util-macros")
@@ -1911,7 +1863,6 @@ configure.ac scripts in other Xorg modular packages, and is needed to
 generate new versions of their configure scripts with autoconf.")
     (license license:x11)))
 
-
 (define-public videoproto
   (package
     (name "videoproto")
@@ -1987,7 +1938,6 @@ server.")
      "X11Perf is a simple performance benchmarker for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xauth
   (package
     (name "xauth")
@@ -2011,7 +1961,6 @@ server.")
 information used in connecting to the X server.")
     (license license:x11)))
 
-
 (define-public xbacklight
   (package
     (name "xbacklight")
@@ -2040,7 +1989,6 @@ server supporting backlight brightness control and changes them all in
 the same way.")
     (license license:x11)))
 
-
 (define-public xbitmaps
   (package
     (name "xbitmaps")
@@ -2095,7 +2043,6 @@ legacy X clients.")
 emulate a TI-30 or an HP-10C.")
     (license license:x11)))
 
-
 (define-public xcb-proto
   (package
     (name "xcb-proto")
@@ -2126,7 +2073,6 @@ used to parse an XML description and create objects used by Python code
 generators in individual language bindings.")
     (license license:x11)))
 
-
 (define-public xcmiscproto
   (package
     (name "xcmiscproto")
@@ -2154,17 +2100,17 @@ to query the server for available resource IDs.")
 (define-public xcmsdb
   (package
     (name "xcmsdb")
-    (version "1.0.5")
+    (version "1.0.6")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/app/xcmsdb-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-            "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"))))
+            "0magrza0i5qwpf0zlpqjychp3bzxgdw3p5v616xl4nbxag2fwxrw"))))
     (build-system gnu-build-system)
     (inputs
       (list libx11))
@@ -2179,7 +2125,6 @@ screen as specified in section 7, Device Color Characterization, of the
 X11 Inter-Client Communication Conventions Manual (ICCCM).")
     (license license:x11)))
 
-
 (define-public xcursor-themes
   (package
     (name "xcursor-themes")
@@ -2254,7 +2199,7 @@ X server: @code{handhelds}, @code{redglass} and @code{whiteglass}.")
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke `("make" "install" ,@make-flags
                              "THEME_NAME=Hackneyed-Dark")))))))
-    (native-inputs (list imagemagick inkscape xcursorgen))
+    (native-inputs (list imagemagick inkscape/stable xcursorgen))
     (home-page "https://gitlab.com/Enthymeme/hackneyed-x11-cursors")
     (synopsis "Classic cursor theme for X11")
     (description "Hackneyed is a scalable cursor theme mildly resembling old
@@ -2287,7 +2232,6 @@ left-handed version of the cursors is also included.")
      "XCursorGen prepares X11 cursor sets for use with libXcursor.")
     (license license:x11)))
 
-
 (define-public xdpyinfo
   (package
     (name "xdpyinfo")
@@ -2326,7 +2270,6 @@ types of screens, visuals, and X11 protocol extensions that are
 available.")
     (license license:x11)))
 
-
 (define-public xdriinfo
   (package
     (name "xdriinfo")
@@ -2353,7 +2296,6 @@ available.")
 DRI (Direct Rendering Infrastructure) drivers.")
     (license license:x11)))
 
-
 (define-public xev
   (package
     (name "xev")
@@ -2386,7 +2328,6 @@ debugging and development tool, and should not be needed in normal
 usage.")
     (license license:x11)))
 
-
 (define-public xextproto
   (package
     (name "xextproto")
@@ -2440,7 +2381,6 @@ The eventual goal is that libevdev wraps all ioctls available to evdev
 devices, thus making direct access unnecessary.")
     (license (license:x11-style "file://COPYING"))))
 
-
 (define-public xf86-input-evdev
   (package
     (name "xf86-input-evdev")
@@ -2535,7 +2475,6 @@ provide all features that libinput supports it does little beyond.")
 It is used to control the pointer with a joystick device.")
     (license license:x11)))
 
-
 (define-public xf86-input-keyboard
   (package
     (name "xf86-input-keyboard")
@@ -2559,7 +2498,6 @@ It is used to control the pointer with a joystick device.")
      "xf86-input-keyboard is a keyboard input driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-input-mouse
   (package
     (name "xf86-input-mouse")
@@ -2591,21 +2529,20 @@ and additional mouse types supported by specific operating systems, such
 as USB mice.")
     (license license:x11)))
 
-
 (define-public xf86-input-synaptics
   (package
     (name "xf86-input-synaptics")
-    (version "1.9.1")
+    (version "1.9.2")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/driver/xf86-input-synaptics-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-            "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"))))
+            "0f1cjs9haxhjybfh2lh579s15i2q0q19whynpda3giizj6mlmymq"))))
     (build-system gnu-build-system)
     (inputs (list libx11 libxi libevdev mtdev xorg-server))
     (native-inputs (list pkg-config))
@@ -2623,7 +2560,6 @@ as USB mice.")
      "xf86-input-synaptics is a touchpad driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-input-void
   (package
     (name "xf86-input-void")
@@ -2741,21 +2677,20 @@ X server.")
 X server.")
       (license license:x11))))
 
-
 (define-public xf86-video-cirrus
   (package
     (name "xf86-video-cirrus")
-    (version "1.5.3")
+    (version "1.6.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/driver/xf86-video-cirrus-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-            "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"))))
+            "00b468w01hqjczfqz42v2vqhb14db4wazcqi1w29lgfyhc0gmwqf"))))
     (build-system gnu-build-system)
     (inputs (list xorg-server))
     (native-inputs (list pkg-config))
@@ -2811,7 +2746,6 @@ X server.")
 framebuffer device.")
     (license license:x11)))
 
-
 (define-public xf86-video-freedreno
   (let ((commit "ccba8f89995de7d5e1b216e580b789c4cda05035"))
     (package
@@ -2858,7 +2792,6 @@ framebuffer device.")
 It supports a variety of Adreno graphics chipsets.")
       (license license:x11))))
 
-
 (define-public xf86-video-geode
   (package
     (name "xf86-video-geode")
@@ -2886,7 +2819,6 @@ for graphics acceleration.  The LX component supports EXA, including
 compositing.  Both support Xv overlay and dynamic rotation with XRandR.")
     (license license:x11)))
 
-
 ;; Driver for obsolete graphics cards, depends on libglide:
 ;; http://sourceforge.net/projects/glide/ ,
 ;; last updated in 2003, and which does not compile out of the box any more.
@@ -2913,7 +2845,6 @@ compositing.  Both support Xv overlay and dynamic rotation with XRandR.")
 ;;      "xf86-video-glide is a Glide video driver for the Xorg X server.")
 ;;     (license license:x11)))
 
-
 (define-public xf86-video-glint
   (package
     (name "xf86-video-glint")
@@ -2938,7 +2869,6 @@ compositing.  Both support Xv overlay and dynamic rotation with XRandR.")
 X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-i128
   (package
     (name "xf86-video-i128")
@@ -2963,7 +2893,6 @@ X server.")
 X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-intel
   (let ((commit "31486f40f8e8f8923ca0799aea84b58799754564")
         (revision "18"))
@@ -3003,23 +2932,20 @@ X server.")
 It supports a variety of Intel graphics chipsets.")
       (license license:x11))))
 
-
 (define-public xf86-video-mach64
   (package
     (name "xf86-video-mach64")
-    (version "6.9.6")
+    (version "6.9.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/driver/xf86-video-mach64-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-           "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"))
-        (patches (search-patches "xf86-video-mach64-glibc-2.20.patch"
-                                 "xf86-video-mach64-bool-to-boolean.patch"))))
+           "1fl1jjx0zdr9alkxw23zx6aj1bj4l8inz5w7y7k2g0kwzazqmmsh"))))
     (build-system gnu-build-system)
     (inputs (list mesa xorgproto xorg-server))
     (native-inputs
@@ -3034,21 +2960,20 @@ hardware limitations.  The driver is also intended to optionally provide
 the same level of support for generic VGA or 8514/A adapters.")
     (license license:x11)))
 
-
 (define-public xf86-video-mga
   (package
     (name "xf86-video-mga")
-    (version "2.0.0")
+    (version "2.0.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/driver/xf86-video-mga-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-           "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"))))
+           "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7"))))
     (build-system gnu-build-system)
     (inputs (list mesa xorgproto xorg-server))
     (native-inputs (list pkg-config))
@@ -3081,7 +3006,6 @@ the same level of support for generic VGA or 8514/A adapters.")
      "xf86-video-neomagic is a NeoMagic video driver for the Xorg X server.")
     (license license:x11)))
 
-
 ;; This driver depends on XAA which has been removed from xorg-server.
 
 ;; (define-public xf86-video-newport
@@ -3108,7 +3032,6 @@ the same level of support for generic VGA or 8514/A adapters.")
 ;; newport cards.")
 ;;     (license license:x11)))
 
-
 (define-public xf86-video-nv
   (package
     (name "xf86-video-nv")
@@ -3189,7 +3112,6 @@ This driver is intended for VIA chipsets featuring the VIA UniChrome,
 UniChrome Pro and Chrome9 integrated graphics processors.")
     (license license:x11)))
 
-
 (define-public xf86-video-qxl
   (package
     (name "xf86-video-qxl")
@@ -3261,7 +3183,6 @@ This driver is intended for ATI Rage 128 based cards.")
      "xf86-video-savage is an S3 Savage video driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-siliconmotion
   (package
     (name "xf86-video-siliconmotion")
@@ -3287,7 +3208,6 @@ This driver is intended for ATI Rage 128 based cards.")
 Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-sis
   (package
     (name "xf86-video-sis")
@@ -3313,7 +3233,6 @@ Xorg X server.")
 This driver supports SiS chipsets of 300/315/330/340 series.")
     (license license:bsd-3)))
 
-
 (define-public xf86-video-suncg6
   (package
     (name "xf86-video-suncg6")
@@ -3337,7 +3256,6 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
      "xf86-video-suncg6 is a GX/TurboGX video driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-sunffb
   (package
     (name "xf86-video-sunffb")
@@ -3361,7 +3279,6 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
      "xf86-video-sunffb is a SUNFFB video driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-tdfx
   (package
     (name "xf86-video-tdfx")
@@ -3385,7 +3302,6 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
      "xf86-video-tdfx is a 3Dfx video driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-tga
   (package
     (name "xf86-video-tga")
@@ -3411,7 +3327,6 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
 X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-trident
   (package
     (name "xf86-video-trident")
@@ -3435,11 +3350,9 @@ X server.")
      "xf86-video-trident is a Trident video driver for the Xorg X server.")
     (license license:x11)))
 
-
 ;; no license
 ;; (define-public xf86-video-v4l
 
-
 (define-public xf86-video-vesa
   (package
     (name "xf86-video-vesa")
@@ -3592,7 +3505,6 @@ server driver works.")
      "xf86-video-vmware is a VMware SVGA video driver for the Xorg X server.")
     (license license:x11)))
 
-
 (define-public xf86-video-voodoo
   (package
     (name "xf86-video-voodoo")
@@ -3618,11 +3530,9 @@ server driver works.")
      "xf86-video-voodoo is a Voodoo video driver for the Xorg X server.")
     (license license:x11)))
 
-
 ;; Only relevant for the frame buffer on BSD systems.
 ;; (define-public xf86-video-wsfb
 
-
 (define-public xf86bigfontproto
   (package
     (name "xf86bigfontproto")
@@ -3769,7 +3679,6 @@ monitor via the X video mode extension.")
 allowed to make connections to the X server.")
     (license license:x11)))
 
-
 (define-public xineramaproto
   (package
     (name "xineramaproto")
@@ -3831,7 +3740,6 @@ alternative implementations like XRandR or TwinView.")
      "XInput is used to configure and test XInput devices.")
     (license license:x11)))
 
-
 (define-public xkbcomp-intermediate        ;used as input for xkeyboard-config
   (package
     (name "xkbcomp-intermediate")
@@ -3882,7 +3790,6 @@ make keyboards more accessible to people with physical impairments.")
                             (assoc-ref %build-inputs "xkeyboard-config")
                             "/share/X11/xkb"))))))
 
-
 (define-public xkbevd
   (package
     (name "xkbevd")
@@ -3966,7 +3873,6 @@ extension to the X11 protocol.  It includes:
 - xkbwatch: reports changes in the XKB keyboard state.")
     (license license:x11)))
 
-
 (define-public xkeyboard-config
   (package
     (name "xkeyboard-config")
@@ -3995,7 +3901,6 @@ symbols, geometry, keycodes, compat, and types; these five components
 can be combined together using the @code{rules} component of this database.")
     (license license:x11)))
 
-
 (define-public xkill
   (package
     (name "xkill")
@@ -4023,7 +3928,6 @@ clients.  This program is very dangerous, but is useful for aborting
 programs that have displayed undesired windows on a user's screen.")
     (license license:x11)))
 
-
 (define-public xlsatoms
   (package
     (name "xlsatoms")
@@ -4049,7 +3953,6 @@ programs that have displayed undesired windows on a user's screen.")
      "XLsAtoms is used to list the interned atoms defined on X server.")
     (license license:x11)))
 
-
 (define-public xlsclients
   (package
     (name "xlsclients")
@@ -4076,7 +3979,6 @@ programs that have displayed undesired windows on a user's screen.")
 running on X server.")
     (license license:x11)))
 
-
 (define-public xlsfonts
   (package
     (name "xlsfonts")
@@ -4106,15 +4008,15 @@ protocol.")
 (define-public xfontsel
   (package
     (name "xfontsel")
-    (version "1.0.6")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "mirror://xorg/individual/app/xfontsel-"
-                    version ".tar.bz2"))
+                    version ".tar.xz"))
               (sha256
                (base32
-                "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"))))
+                "1d6ifx6sw97mmr00bhfakyx2f94w14yswxc68sw49zmvawrjq18p"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -4198,11 +4100,9 @@ session startup script to configure the keyboard according to personal
 tastes.")
     (license license:x11)))
 
-
 ;; no license
 ;; (define-public xorg-docs
 
-
 (define-public xorg-sgml-doctools
   (package
     (name "xorg-sgml-doctools")
@@ -4230,21 +4130,20 @@ those who have installed the HTML version of the documentation, which
 refers to the included common xorg.css stylesheet.")
     (license license:x11)))
 
-
 (define-public xpr
   (package
     (name "xpr")
-    (version "1.0.5")
+    (version "1.1.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/app/xpr-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-            "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"))))
+            "1iaphm96kha6bzz34cj82r2lp5hrdpqwdca04iij4rinflab3fx0"))))
     (build-system gnu-build-system)
     (inputs
       (list xorgproto libxmu libx11))
@@ -4257,7 +4156,6 @@ refers to the included common xorg.css stylesheet.")
 it for output on various types of printers.")
     (license license:x11)))
 
-
 (define-public xprop
   (package
     (name "xprop")
@@ -4282,7 +4180,6 @@ it for output on various types of printers.")
 an X server.")
     (license license:x11)))
 
-
 (define-public xrandr
   (package
     (name "xrandr")
@@ -4308,7 +4205,6 @@ an X server.")
 and Reflect (RandR) extension.")
     (license license:x11)))
 
-
 (define-public xrdb
   (package
     (name "xrdb")
@@ -4335,7 +4231,6 @@ combined.  You would normally run this program from your X startup
 file.")
     (license license:x11)))
 
-
 (define-public xrefresh
   (package
     (name "xrefresh")
@@ -4363,7 +4258,6 @@ screen to be repainted.  This is useful when system messages have messed
 up your screen.")
     (license license:x11)))
 
-
 (define-public xset
   (package
     (name "xset")
@@ -4389,7 +4283,6 @@ up your screen.")
      "XSet is used to set various user preference options of the display.")
     (license license:x11)))
 
-
 (define-public xsetroot
   (package
     (name "xsetroot")
@@ -4416,7 +4309,6 @@ up your screen.")
 a display running X server.")
     (license license:x11)))
 
-
 (define-public xtrans
   (package
     (name "xtrans")
@@ -4442,7 +4334,6 @@ place to add new transport types.  It is used by the X server, libX11,
 libICE, the X font server, and related components.")
     (license license:x11)))
 
-
 (define-public xvinfo
   (package
     (name "xvinfo")
@@ -4470,7 +4361,6 @@ associated with the display that are accessible through the X-Video
 extension.")
     (license license:x11)))
 
-
 (define-public xwd
   (package
     (name "xwd")
@@ -4498,7 +4388,6 @@ desired window.  The keyboard bell is rung once at the beginning of the
 dump and twice when the dump is completed.")
     (license license:x11)))
 
-
 (define-public xwininfo
   (package
     (name "xwininfo")
@@ -4525,21 +4414,20 @@ dump and twice when the dump is completed.")
 Various information is displayed depending on which options are selected.")
     (license license:x11)))
 
-
 (define-public xwud
   (package
     (name "xwud")
-    (version "1.0.5")
+    (version "1.0.6")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
                "mirror://xorg/individual/app/xwud-"
                version
-               ".tar.bz2"))
+               ".tar.xz"))
         (sha256
           (base32
-            "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"))))
+            "1zhsih1l3x1038fi1wi9npvfnn8j7580ca73saixjg5sbv8qq134"))))
     (build-system gnu-build-system)
     (inputs
       (list xorgproto libx11))
@@ -4632,7 +4520,6 @@ cannot be adequately worked around on the client side of the wire.")
     (description "Xorg library for the XDamage extension.")
     (license license:x11)))
 
-
 (define-public libxext
   (package
     (name "libxext")
@@ -4668,7 +4555,6 @@ cannot be adequately worked around on the client side of the wire.")
      "Library for common extensions to the X11 protocol.")
     (license license:x11)))
 
-
 (define-public libxinerama
   (package
     (name "libxinerama")
@@ -4697,7 +4583,6 @@ cannot be adequately worked around on the client side of the wire.")
     (description "API for Xinerama extension to X11 protocol.")
     (license license:x11)))
 
-
 (define-public libxp
   (package
     (name "libxp")
@@ -4724,7 +4609,6 @@ cannot be adequately worked around on the client side of the wire.")
     (description "Xorg Print Client library.")
     (license license:x11)))
 
-
 (define-public libxrender
   (package
     (name "libxrender")
@@ -4947,7 +4831,6 @@ common definitions and porting layer.")
     (description "Xorg Inter-Client Exchange library.")
     (license license:x11)))
 
-
 (define-public libxau
   (package
     (name "libxau")
@@ -5165,7 +5048,6 @@ new API's in libXft, or the legacy API's in libX11.")
 protocol.")
     (license license:x11)))
 
-
 ;; packages of height 3 in the propagated-inputs tree
 
 (define-public libxcb
@@ -5237,7 +5119,7 @@ by the Xorg server.")
 (define-public xorg-server
   (package
     (name "xorg-server")
-    (version "21.1.2")
+    (version "21.1.4")
     (source
      (origin
        (method url-fetch)
@@ -5245,7 +5127,7 @@ by the Xorg server.")
                            "/xserver/xorg-server-" version ".tar.xz"))
        (sha256
         (base32
-         "1c4dgvpv3kib8rhw37b00vc056nlb1z66c2lwzs4prz8kxmg82y2"))
+         "11y5w6z3rz3i4jyv0wc3scd2jh3bsmcklq0fm7a5invywj7bxi2w"))
        (patches
         (list
          ;; See:
@@ -5527,7 +5409,6 @@ Wayland.")
     (home-page "https://www.x.org/wiki/")
     (license license:x11)))
 
-
 ;; packages of height 4 in the propagated-inputs tree
 
 (define-public libx11
@@ -5631,7 +5512,6 @@ Wayland.")
     (description "Xorg XToolkit Intrinsics library.")
     (license license:x11)))
 
-
 (define-public libxaw
   (package
     (name "libxaw")
@@ -5724,7 +5604,6 @@ The XCB util module provides the following libraries:
 - event: Some utilities that have little to do with events any more.")
     (license license:x11)))
 
-
 (define-public xcb-util-cursor
   (package
     (name "xcb-util-cursor")
@@ -5841,7 +5720,6 @@ The XCB util-image module provides the following library:
 - image: Port of Xlib's XImage and XShmImage functions.")
     (license license:x11)))
 
-
 (define-public xcb-util-keysyms
   (package
     (name "xcb-util-keysyms")
@@ -5875,7 +5753,6 @@ The XCB util-keysyms module provides the following library:
 - keysyms: Standard X key constants and conversion to/from keycodes.")
     (license license:x11)))
 
-
 (define-public xcb-util-renderutil
   (package
     (name "xcb-util-renderutil")
@@ -5909,7 +5786,6 @@ The XCB util-renderutil module provides the following library:
 - renderutil: Convenience functions for the Render extension.")
     (license license:x11)))
 
-
 (define-public xcb-util-wm
   (package
     (name "xcb-util-wm")