gnu: ant/java8: Rename to ant.

* gnu/packages/java.scm (ant): Rename to... (ant/java7): ...this. (ant/java8): Rename to... (ant): ...this. (java-qdox-1.12, java-jarjar, java-hamcrest-core, java-hamcrest-parent-pom) (java-junit, java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Rename inputs accordingly. * gnu/packages/axoloti.scm: Rename accordingly. * gnu/packages/bioinformatics.scm: idem. * gnu/packages/groovy.scm: idem. * gnu/packages/java-maths.scm: idem. * guix/build-system/ant.scm: idem. Change-Id: I9d79ce8e351862747420fc2a58301b7f61212293
gnu: ant/java8: Wrap binary.
2026-04-20 08:31:21 +02:00 · 2026-04-20 08:31:17 +02:00 · 2026-04-20 08:31:15 +02:00 · 2026-04-20 08:31:13 +02:00 · 2026-04-20 08:31:10 +02:00 · 2026-04-20 08:31:06 +02:00
75 changed files with 3352 additions and 2436 deletions
@@ -53508,6 +53508,9 @@ Maximum time a cache entry for SSH keys is valid, in seconds.
@item @code{extra-content} (default: @code{""}) (type: raw-configuration-string)
 Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.

+@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols)
+List of services that should be started before this service.
+
@end table

@end deftp
@@ -81,7 +81,10 @@ entry will be expired even if it has been accessed recently.")
   "Maximum time a cache entry for SSH keys is valid, in seconds.")
  (extra-content
   (raw-configuration-string "")
-   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))
+   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.")
+  (shepherd-requirement
+   (list-of-symbols '())
+   "List of services that should be started before this service."))

 (define (home-gpg-agent-configuration-file config)
  "Return the @file{gpg-agent.conf} file for @var{config}."
@@ -104,7 +107,7 @@ entry will be expired even if it has been accessed recently.")
 (define (home-gpg-agent-shepherd-services config)
  "Return the possibly-empty list of Shepherd services for @var{config}."
  (match-record config <home-gpg-agent-configuration>
-    (gnupg ssh-support?)
+    (gnupg ssh-support? shepherd-requirement)
    ;; 'gpg-agent' is started on demand by GnuPG's programs, but it has to be
    ;; started explicitly when OpenSSH support is enabled (info "(gnupg) Agent
    ;; Options").
@@ -119,15 +122,21 @@ entry will be expired even if it has been accessed recently.")
                             #:socket-directory-permissions #o700))))
          (list (shepherd-service
                 (provision '(gpg-agent ssh-agent))
+                 (requirement shepherd-requirement)
                 (modules '((shepherd support)))  ;for '%user-runtime-dir'
-                 (start #~(make-systemd-constructor
-                           (list #$(file-append gnupg "/bin/gpg-agent")
-                                 "--supervised" "--enable-ssh-support")
-                           (list #$(endpoint "ssh" "S.gpg-agent.ssh")
-                                 #$(endpoint "browser" "S.gpg-agent.browser")
-                                 #$(endpoint "extra" "S.gpg-agent.extra")
-                                 ;; #$(endpoint "scdaemon" "S.scdaemon")
-                                 #$(endpoint "std" "S.gpg-agent"))))
+                 (start
+                  #~(lambda args
+                      ((make-systemd-constructor
+                        (list #$(file-append gnupg "/bin/gpg-agent")
+                              "--supervised" "--enable-ssh-support")
+                        (list #$(endpoint "ssh" "S.gpg-agent.ssh")
+                              #$(endpoint "browser" "S.gpg-agent.browser")
+                              #$(endpoint "extra" "S.gpg-agent.extra")
+                              ;; #$(endpoint "scdaemon" "S.scdaemon")
+                              #$(endpoint "std" "S.gpg-agent"))
+                        ;; Inherit graphical session environment.
+                        #:environment-variables (environ))
+                       args)))
                 (stop #~(make-systemd-destructor))
                 (documentation "Start 'gpg-agent', the GnuPG passphrase
 agent, with support for handling OpenSSH material."))))
@@ -1745,7 +1745,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/kissfft-tflite-micro.patch               \
  %D%/packages/patches/kitty-fix-wayland-protocols.patch	\
  %D%/packages/patches/kmod-module-directory.patch		\
-  %D%/packages/patches/kmscon-runtime-keymap-switch.patch	\
+  %D%/packages/patches/kmscon-8-runtime-keymap-switch.patch	\
  %D%/packages/patches/knot-remove-runtime-deps.patch		\
  %D%/packages/patches/kobodeluxe-paths.patch			\
  %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch	\
@@ -2258,6 +2258,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-werkzeug-tests.patch		\
  %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
  %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
+  %D%/packages/patches/qdigidoc-fix-icon.patch                  \
  %D%/packages/patches/qemu-build-info-manual.patch		\
  %D%/packages/patches/qemu-fix-agent-paths.patch 		\
  %D%/packages/patches/qemu-fix-test-virtio-version.patch       \
@@ -765,7 +765,7 @@ file system.")
       (sha256
        (base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
    (build-system pyproject-build-system)
-    (inputs (list python-requests python-argcomplete python-urllib3
+    (propagated-inputs (list python-requests python-argcomplete python-urllib3
                  python-looseversion gnupg))
    (native-inputs (list python-setuptools python-wheel python-requests-cache
                         python-defusedxml))
@@ -773,8 +773,7 @@ file system.")
     (list $SSL_CERT_FILE))
    (arguments
     (list
-      #:test-flags
-      #~(list "-k" "test_*")
+      #:test-backend #~'unittest
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-tests
@@ -793,11 +792,7 @@ file system.")
            (lambda _
              (substitute* "sdkmanager.py"
                (("gpgv")
-                 (string-append #$(this-package-input "gnupg") "/bin/gpgv")))))
-          (replace 'check
-            (lambda* (#:key tests? test-flags #:allow-other-keys)
-              (when tests?
-                (apply invoke "python" "-m" "unittest" test-flags)))))))
+                 (string-append #$(this-package-input "gnupg") "/bin/gpgv"))))))))
    (home-page "https://gitlab.com/fdroid/sdkmanager")
    (synopsis "Replacement for Android sdkmanager written in Python")
    (description
@@ -1182,14 +1177,16 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
  (package
    (name "fdroidserver")
-    (version "2.4.2")
+    (version "2.4.3")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "fdroidserver" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.com/fdroid/fdroidserver")
+              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
-        (base32
-         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
+        (base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1200,22 +1197,17 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (propagated-inputs
-     (list python-androguard
+     (list python-platformdirs
+           python-androguard
           python-apache-libcloud
-           python-argcomplete
           python-asn1crypto
           python-clint
           python-defusedxml
-           python-docker
           python-gitpython
-           python-mwclient
           python-oscrypto
           python-paramiko
           python-pillow
-           python-platformdirs
           python-puremagic
-           python-pyasn1
-           python-pyasn1-modules
           python-pyyaml
           python-qrcode
           python-requests
@@ -341,7 +341,7 @@ runtime.")
       ("java-jgit" ,java-jgit-4.2)
       ("axoloti-runtime" ,axoloti-runtime)))
    (native-inputs
-     (list ant zip ; for repacking the jar
+     (list ant/java7 zip ; for repacking the jar
           unzip))
    (description
     "The Axoloti patcher offers a “patcher” environment similar to Pure Data
@@ -647,7 +647,7 @@ This package provides the runtime.")
       ("java-slf4j-api" ,java-slf4j-api)
       ("ksoloti-runtime" ,ksoloti-runtime)))
    (native-inputs
-     (list ant zip                      ;for repacking the jar
+     (list ant/java7 zip                      ;for repacking the jar
           unzip))
    (description
     "Ksoloti is an environment for generating and processing digital audio.
@@ -9283,7 +9283,7 @@ VCF.")
       ;; [testng] Exception in thread "main" java.lang.NoClassDefFoundError: com/beust/jcommander/ParameterException
       #:tests? #f
       #:jdk ,icedtea-8
-       #:ant ,ant/java8
+       #:ant ,ant
       ;; This is only used for tests.
       #:make-flags
       (list "-Dsamjdk.intel_deflater_so_path=lib/jni/libIntelDeflater.so")
@@ -9353,11 +9353,10 @@ VCF.")
     (list java-snappy-1
           java-commons-jexl-2
           java-cofoja
-           ant/java8                    ;for bzip2 support at runtime
+           ant                          ;for bzip2 support at runtime
           zlib))
    (native-inputs
     `(("ant-apache-bcel" ,ant-apache-bcel)
-       ("ant-junit" ,ant-junit)
       ("java-testng" ,java-testng)
       ("java-commons-bcel" ,java-commons-bcel)
       ("java-jcommander" ,java-jcommander)
@@ -276,17 +276,18 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
 (define-public libsodium
  (package
    (name "libsodium")
-    (version "1.0.21")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/jedisct1/libsodium")
-              (commit (string-append version "-RELEASE"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1l6pc3m8zl1sip9ib91bjsb2z2zr7xa7bhblwwmyn9x4nkwqj17n"))))
+    (version "1.0.18")
+    (source (origin
+            (method url-fetch)
+            (uri (list (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/libsodium-" version ".tar.gz")
+                       (string-append
+                        "https://download.libsodium.org/libsodium/"
+                        "releases/old/libsodium-" version ".tar.gz")))
+            (sha256
+             (base32
+              "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
@@ -69,6 +69,7 @@
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3096,6 +3097,64 @@ Driver.")
   ;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
   (home-page "https://www.unixodbc.org")))

+(define-public sqliteodbc
+  (package
+    (name "sqliteodbc")
+    (version "0.99991")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.ch-werner.de/sqliteodbc/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0p4avhqxnd2l49g3vpzwrmdi8wxyqzy0vswalaagmqfdsfwav52d"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f                      ; no check target
+      #:configure-flags
+      #~(list "--disable-static"
+              (string-append "--with-sqlite3=" #$(this-package-input "sqlite"))
+              (string-append "--with-odbc=" #$(this-package-input "unixodbc")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'create-lib-directory
+            (lambda _
+              (mkdir-p (string-append #$output "/lib"))))
+          (add-after 'install 'remove-extra-sqlite-extensions
+            (lambda _
+              ;; Keep this package focused on the ODBC driver itself.
+              (for-each delete-file
+                        (find-files (string-append #$output "/lib")
+                                    "^libsqlite3_mod_.*\\.(la|so)$"))))
+          (add-after 'install 'install-odbcinst.ini
+            (lambda _
+              (let ((dir (string-append #$output "/share/sqliteodbc")))
+                (mkdir-p dir)
+                (call-with-output-file (string-append dir "/odbcinst.ini")
+                  (lambda (port)
+                    (display
+                     (string-append
+                      "[SQLite3]\n"
+                      "Description = SQLite3 ODBC Driver\n"
+                      "Driver      = " #$output "/lib/libsqlite3odbc.so\n"
+                      "Setup       = " #$output "/lib/libsqlite3odbc.so\n"
+                      "Threading   = 2\n")
+                     port)))))))))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "ODBCSYSINI")
+            (files '("share/sqliteodbc"))
+            (separator #f))))
+    (inputs (list sqlite unixodbc))
+    (home-page "http://www.ch-werner.de/sqliteodbc/")
+    (synopsis "ODBC driver for SQLite")
+    (description
+     "SQLiteODBC provides an ODBC driver for SQLite 3 databases.  It installs
+the shared library and a driver registration file so applications using
+unixODBC can resolve the @code{SQLite3} driver name from a Guix profile.")
+    (license license:tcl/tk)))
+
 (define-public nanodbc
  (package
    (name "nanodbc")
@@ -77,6 +77,8 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages ragel)
  #:use-module (gnu packages serialization)
@@ -93,6 +95,8 @@
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (guix download)
  #:use-module (guix gexp)
  #:use-module (guix git-download)
@@ -303,6 +307,58 @@ protocol.")
      (home-page "https://github.com/earlchew/cloudflare-cli")
      (license license:expat))))

+(define-public ddclient
+  (package
+    (name "ddclient")
+    (version "4.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ddclient/ddclient")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0sz4f7qx4yjg6q6ybhzilb7f0kshz46c54y3i4hq2nww2bhkc8a4"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'bootstrap 'patch-ddclient.in-shebang
+            (lambda _
+              ;; This is run in the bootstrap phase, so patch before
+              (patch-shebang "ddclient.in")))
+          (add-after 'install 'wrap-program
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-program (string-append #$output "/bin/ddclient")
+                `("PERL5LIB" ":" prefix
+                  ,(map (lambda (input-name)
+                          (string-append (assoc-ref inputs input-name)
+                                         "/lib/perl5/site_perl"))
+                        '("perl-json")))))))))
+    (native-inputs
+     (list autoconf
+           automake
+           perl-http-daemon
+           perl-plack
+           perl-test-mockmodule
+           perl-test-tcp
+           perl-test-warnings))
+    (inputs
+     (list curl
+           perl
+           perl-json
+           bash-minimal))
+    (home-page "https://github.com/ddclient/ddclient")
+    (synopsis "Dynamic DNS update client")
+    (description
+     "ddclient is used to update dynamic DNS entries for accounts on many
+dynamic DNS services.  It supports a wide range of routers and protocols,
+including Cloudflare, Namecheap, DynDNS, FreeDNS, Google Domains, and many
+more.")
+    (license license:gpl2+)))
+
 (define-public ldns
  (package
    (name "ldns")
@@ -498,6 +554,39 @@ and BOOTP/TFTP for network booting of diskless machines.")
    ;; Source files only say GPL2 and GPL3 are allowed.
    (license (list license:gpl2 license:gpl3))))

+(define-public dnsupdate
+  (package
+    (name "dnsupdate")
+    (version "0.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/lopsided98/dnsupdate")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bp6mm0yhg4hs698xdmvcfad4jqf5rgb1cab88pfzyx9w52x0ag6"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-backend #~'unittest
+           #:test-flags #~'("discover" "-p" "*_test.py")))
+    (native-inputs
+     (list python-setuptools))
+    (propagated-inputs
+     (list python-beautifulsoup4
+           python-netifaces
+           python-pyyaml
+           python-requests))
+    (home-page "https://github.com/lopsided98/dnsupdate")
+    (synopsis "Modern and flexible dynamic DNS client")
+    (description
+     "Dnsupdate is a dynamic DNS client that provides support for multiple DNS
+services, including Afraid.org FreeDNS, Cloudflare, IETF standard DNS
+updates (nsupdate), and custom HTTP-based services.  It uses YAML
+configuration files and supports multiple address detection methods.")
+    (license license:gpl3+)))
+
 ;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
 ;; different name here.
 (define-public isc-bind
@@ -1069,7 +1069,7 @@ characterization result in a liberty library file.")
 (define-public kicad
  (package
    (name "kicad")
-    (version "10.0.0")
+    (version "10.0.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1077,7 +1077,7 @@ characterization result in a liberty library file.")
                    (commit version)))
              (sha256
               (base32
-                "1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
+                "1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -1185,7 +1185,9 @@ characterization result in a liberty library file.")
     "Kicad is a program for the formation of printed circuit
 boards and electrical circuits.  The software has a number of programs that
 perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
-electrical diagrams), gerbview (viewing Gerber files) and others.")
+electrical diagrams), gerbview (viewing Gerber files) and others.  To use
+SQLite-backed database libraries, install the optional @code{sqliteodbc}
+package.")
    (license license:gpl3+)))

 (define-public kicad-doc
@@ -1200,7 +1202,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1k0ayxsy0nnv9qxkii9yrxs7jx9y3wfjpsv5yl9wql3vdg3qay69"))))
+                "1c0vn13rp0z12rlqhl321pk2gj9577dyky6xj3i6hb040i3v7zrr"))))
    (build-system cmake-build-system)
    (arguments
     `(#:configure-flags (list "-DBUILD_FORMATS=html"
@@ -1232,7 +1234,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2"))))
+                "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"))))
    (build-system cmake-build-system)
    (native-inputs (list python-wrapper))
    (arguments
@@ -1262,7 +1264,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm"))))
+                "0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"))))
    (synopsis "Official KiCad footprint libraries")
    (description "This package contains the official KiCad footprint libraries.")))

@@ -1279,7 +1281,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5"))))
+                "0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"))))
    (synopsis "Official KiCad 3D model libraries")
    (description "This package contains the official KiCad 3D model libraries.")))

@@ -164,7 +164,8 @@ Mix.CLI.main()"
                       '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
                   programs))))))))
    (outputs '("out" "src"))
-    (inputs (list bash-minimal erlang rebar3 git))
+    (inputs (list bash-minimal erlang rebar3))
+    (native-inputs (list git-minimal))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -264,6 +264,7 @@
  #:use-module (gnu packages lisp-xyz)
  #:use-module (gnu packages lsof)
  #:use-module (gnu packages lua)
+  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages music)
  #:use-module (gnu packages version-control)
@@ -4328,25 +4329,39 @@ perform static analysis of Perl code.")
    (license license:gpl3+)))

 (define-public emacs-flymake-flycheck
-  (package
-    (name "emacs-flymake-flycheck")
-    (version "20210404.2128")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://melpa.org/packages/flymake-flycheck-"
-                           version ".el"))
-       (sha256
-        (base32 "1m59ahd5gjlfwf328labwdlpcxh8ywywkwgfrlsy5jyxfc9ss4nv"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-flycheck))
-    (home-page "https://github.com/purcell/flymake-flycheck")
-    (synopsis "Use Flycheck checkers as Flymake backends")
-    (description
-     "This package provides support for running any Flycheck checker as a
+  (let ((commit "cbc0fc81bf369b36fe29a49d9e24708027f6da38")
+        (revision "0"))
+    (package
+      (name "emacs-flymake-flycheck")
+      (version (git-version "0.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/purcell/flymake-flycheck")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0fda1n8hhklbq6p1s2dlvgc9xd0qy7qzb8yvxq89idx1irjx0785"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ; There is only a lint-check
+      (propagated-inputs
+       (list emacs-flycheck))
+      (home-page "https://github.com/purcell/flymake-flycheck")
+      (synopsis "Use Flycheck checkers as Flymake backends")
+      (description
+       "This package provides support for running any Flycheck checker as a
 Flymake diagnostic backend.  The effect is that Flymake will control when the
 checker runs, and Flymake will receive its errors.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
+
+(define-public emacs-flymake-flycheck-superseded-version
+  (package
+    (inherit emacs-flymake-flycheck)
+    (version "20210404.2128")
+    (properties (list (cons 'superseded emacs-flymake-flycheck)))))

 (define-public emacs-flymake-quickdef
  ;; This particular commit includes bug fixes on top of 1.0.0 release.
@@ -8478,23 +8493,36 @@ them whenever another command is invoked.")
    (license license:gpl3+)))

 (define-public emacs-keyfreq
+  (let ((commit "c6955162307f37c2ac631d9daf118781009f8dda")
+        (revision "0"))
+    (package
+      (name "emacs-keyfreq")
+      (version (git-version "1.8" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/dacap/keyfreq")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "18iw0jwr9hmxv5vikqf28sknml0k14rvddp80s2cm6bglaz4sdc3"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ; No tests
+      (home-page "https://github.com/dacap/keyfreq")
+      (synopsis "Track Emacs command frequencies")
+      (description
+       "@code{emacs-keyfeq} tracks and shows how many times you used a command.")
+      (license license:gpl3+))))
+
+(define-public emacs-keyfreq-superseded-version
  (package
-    (name "emacs-keyfreq")
+    (inherit emacs-keyfreq)
    (version "20160516.716")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://melpa.org/packages/keyfreq-"
-                           version ".el"))
-       (sha256
-        (base32
-         "008hd7d06qskc3mx0bbdgpgy2pwxr8185fzlyqf9qjg49y74p6g8"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/dacap/keyfreq")
-    (synopsis "Track Emacs command frequencies")
-    (description "@code{emacs-keyfeq} tracks and shows how many times you used
-a command.")
-    (license license:gpl3+)))
+    (properties (list (cons 'superseded emacs-keyfreq)))))

 (define-public emacs-khalel
  (package
@@ -13806,6 +13834,28 @@ structure as input representing the HTML tree you want to generate and
 generates it as a string.  Please see the homepage for usage examples.")
      (license license:gpl3+))))

+(define-public emacs-jag
+  (package
+    (name "emacs-jag")
+    (version "0.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/martianh/jag.el")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hfv3hf0p7y5imrzb6rv90cjxd22ih2n529ggc7fwgd1n40zvgj8"))))
+    (build-system emacs-build-system)
+    (propagated-inputs (list emacs-string-inflection emacs-swagg))
+    (home-page "https://codeberg.org/martianh/jag.el")
+    (synopsis "Generate API client libraries in elisp using swagg.el")
+    (description
+     "This package provides utilities to use swagg.el to generate API client
+libraries from Swagger specs.")
+    (license license:gpl3+)))
+
 (define-public emacs-jedi
  (package
    (name "emacs-jedi")
@@ -15230,25 +15280,39 @@ markdown features.")
    (license license:gpl3)))

 (define-public emacs-2048-game
-  (package
-    (name "emacs-2048-game")
-    (version "20151026.1233")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://melpa.org/packages/2048-game-"
-                           version ".el"))
-       (sha256
-        (base32
-         "0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd"))))
-    (build-system emacs-build-system)
-    (home-page "https://hg.sr.ht/~zck/game-2048")
-    (synopsis "Implementation of the game 2048 in Emacs Lisp")
-    (description
-     "This program is an implementation of 2048 for Emacs.
+  ;; No tagged releases. Version comes from 2048-game.el
+  (let ((changeset "0e7210d05e6faf53c7bdc8be2381dc0d4c8b19f3")
+        (revision "0"))
+    (package
+      (name "emacs-2048-game")
+      (version (hg-version "2023.8.8.1" revision changeset))
+      (source
+       (origin
+         (method hg-fetch)
+         (uri (hg-reference
+                (url "https://hg.sr.ht/~zck/game-2048")
+                (changeset changeset)))
+         (file-name (hg-file-name name version))
+         (sha256
+          (base32
+           "01xzmi2613d4zwnrh9iywipxx8ml76yqik90mx4mpyar19a6ypi8"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ; No tests
+      (home-page "https://hg.sr.ht/~zck/game-2048")
+      (synopsis "Implementation of the game 2048 in Emacs Lisp")
+      (description
+       "This program is an implementation of 2048 for Emacs.
 The goal of this game is to create a tile with value 2048.  The size of the
 board and goal value can be customized.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
+
+(define-public emacs-2048-game-superseded-version
+  (package
+    (inherit emacs-2048-game)
+    (version "20151026.1233")
+    (properties (list (cons 'superseded emacs-2048-game)))))

 (define-public emacs-chess
  (package
@@ -16816,6 +16880,32 @@ The following completions are currently available:
@end itemize")
    (license license:gpl3+)))

+(define-public emacs-swagg
+  (package
+    (name "emacs-swagg")
+    (version "0.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/isamert/swagg.el")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xlknc7j5vz1sv5gwr8v6vyfginflsksjyzx6qz1svibkdwp223g"))))
+    (build-system emacs-build-system)
+    (propagated-inputs (list emacs-compat
+                             emacs-dash
+                             emacs-s
+                             emacs-request
+                             emacs-yaml))
+    (home-page "https://github.com/isamert/swagg.el")
+    (synopsis "UI to interact with OpenAPI definations")
+    (description
+     "This package provides a practical Emacs UI for OpenAPI definitions.  It
+lets you fetch and interact with OpenAPI (formerly Swagger) definitions.")
+    (license license:gpl3+)))
+
 (define-public emacs-sway
  (let ((commit "84eae5e16a643eb00b0a422ded751cceb17cc8f0")
        (revision "0"))
@@ -25702,6 +25792,52 @@ available key bindings that follow C-x (or as many as space allows given your
 settings).")
    (license license:gpl3+)))

+(define-public emacs-whisper-el
+  (let ((commit "fd9bf5787a99dd31a4bdf54d2bd9821aacf84e93")
+        (revision "0"))
+    (package
+      (name "emacs-whisper-el")
+      (version "0.4.7")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/natrys/whisper.el")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0za55s117v7sc7cj4xlxxhkaamjlggs1g319n7fz54saa2wzmdj5"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no tests
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'set-external-programs
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute* "whisper.el"
+                  (("\\(executable-find \"ffmpeg\"\\)")
+                   "t")
+                  (("\"ffmpeg\"")
+                   (string-append "\"" #$(this-package-input "ffmpeg")
+                                  "/bin/ffmpeg\""))
+                  ((",\\(whisper--find-whispercpp-main\\)")
+                   (string-append "\"" #$(this-package-input "whisper-cpp")
+                                  "/bin/whisper-cli\"")))
+                (emacs-substitute-variables "whisper.el"
+                  ("whisper-install-whispercpp" 'nil)))))))
+      (inputs
+       (list ffmpeg whisper-cpp))
+      (home-page "https://github.com/natrys/whisper.el")
+      (synopsis "Speech to text interface for Emacs")
+      (description
+       "@code{emacs-whisper-el} captures audio with an input device, and
+transcribes text inserted into current Emacs buffer, optionally after
+translating to English from your local language.  Transcription uses the
+C/C++ port whisper.cpp for inference.")
+      (license license:gpl3+))))
+
 ;; Tagged release upstream is from before the package was orphaned.
 ;; The base version is extracted from the "Version" keyword in the main file
 ;; with "-git" suffix removed.
@@ -41284,7 +41420,7 @@ time.")
 (define-public emacs-mastodon
  (package
    (name "emacs-mastodon")
-    (version "2.0.12")
+    (version "2.0.16")
    (source
     (origin
       (method git-fetch)
@@ -41293,7 +41429,7 @@ time.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0q02v1vizzj1r35b7b6cw185jjibhc6izj9ih4sm6c83l9yb99yh"))))
+        (base32 "1z8qwnc01d9hx5m1xj3acpdzllfh4rxmypzcr3jl4ipp6dybzbx6"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -41406,7 +41542,17 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
       (sha256
        (base32 "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l"))))
    (build-system emacs-build-system)
-    (arguments (list #:tests? #f))      ;depends on exemplify-ert
+    (arguments
+     (list
+      #:test-command #~(list "make" "tests")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'remove-cask
+            (lambda _
+              (substitute* "Makefile"
+                (("cask ") "")))))))
+    (native-inputs
+     (list emacs-el-mock emacs-exemplify-ert emacs-exemplify-eval))
    (propagated-inputs (list emacs-fedi emacs-magit emacs-tp emacs-transient))
    (home-page "https://codeberg.org/martianh/fj.el")
    (synopsis "Client for Forgejo instances")
@@ -45099,6 +45245,57 @@ Features:
@end itemize\n")
    (license license:gpl3+)))

+(define-public emacs-exemplify-ert
+  (package
+    (name "emacs-exemplify-ert")
+    (version "0.6.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~flandrew/exemplify-ert")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0y98pf3hq595h7vkqs1rrwhdsizi22y32mv345drvrc6xysyb7hr"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:test-command #~(list "emacs" "-Q" "--batch"
+                             "-l" "dev/examples.el"
+                             "-f" "ert-run-tests-batch-and-exit")))
+    (propagated-inputs (list emacs-dash emacs-f emacs-s))
+    (home-page "https://git.sr.ht/~flandrew/exemplify-ert")
+    (synopsis "Emacs library to implement regression tests")
+    (description
+     "This Emacs package is an extension to @code{ert}.  It aims at writing
+test cases in a simplified form.")
+    (license license:gpl3+)))
+
+(define-public emacs-exemplify-eval
+  (package
+    (name "emacs-exemplify-eval")
+    (version "0.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~flandrew/exemplify-eval")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0f2rfgjcmpw45y0ayx8ww9d9q86y0jwkb46ixp1qd7782qxpa5lg"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list #:tests? #f))                ;no tests
+    (home-page "https://git.sr.ht/~flandrew/exemplify-eval")
+    (synopsis "Create arrowified examples from sexps")
+    (description
+     "This Emacs package is an extension to @code{ert}, and creates
+@code{emacs-exemplify-ert}–like examples.  It aims at writing test cases in a
+simplified form.")
+    (license license:gpl3+)))
+
 (define-public emacs-pcmpl-args
  (package
    (name "emacs-pcmpl-args")
@@ -2730,7 +2730,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
 (define-public freecad
  (package
    (name "freecad")
-    (version "1.1.0")
+    (version "1.1.1")
    (source
     (origin
       (method git-fetch)
@@ -2740,7 +2740,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
             (recursive? #t)))          ;needed for the AddonManager
       (file-name (git-file-name name version))
       (sha256
-        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
+        (base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -148,6 +148,11 @@ client.")
     (list (search-path-specification
            (variable "FCITX_ADDON_DIRS")
            (files '("lib/fcitx5")))
+           (search-path-specification
+            (variable "GUIX_GTK2_IM_MODULE_FILE")
+            (file-type 'regular)
+            (separator #f)
+            (files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
           (search-path-specification
            (variable "GUIX_GTK3_IM_MODULE_FILE")
            (file-type 'regular)
@@ -5559,6 +5559,39 @@ technical and idiosyncratic feel—perfect for headers and pull-quotes.  Made to
 work well together with Mona Sans.")
    (license license:silofl1.1)))

+(define-public font-open-sans
+  (package
+    (name "font-open-sans")
+    (version "3.003")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/googlefonts/opensans")
+             (commit "bd7e37632246368c60fdcbd374dbf9bad11969b6")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1mlnybaci1cr8z5xzxm7l2xpwfq27x9hqv649hc2ni1cjsyhpjp8"))))
+    (build-system font-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              ;; Install the variable fonts only.
+              (let ((%install (assoc-ref %standard-phases 'install)))
+                (with-directory-excursion "fonts/variable"
+                  (%install #:outputs outputs))))))))
+    (home-page "https://github.com/googlefonts/opensans")
+    (synopsis "Humanist sans-serif typeface by Steve Matteson")
+    (description
+     "Open Sans is an open source humanist sans-serif typeface
+that was designed by Steve Matteson under commission from Google.  It was
+released in 2011 and is based on his earlier design called Droid Sans, which
+was specifically created for Android mobile devices but with slight
+modifications to its width.")
+    (license license:silofl1.1)))

 (define-public font-peppercarrot
  (package
@@ -1335,6 +1335,74 @@ animation of closing windowed applications.")
 GNOME Shell, including the top panel, dash and overview.")
    (license license:gpl3)))

+(define-public gnome-shell-extension-caffeine
+  (package
+    (name "gnome-shell-extension-caffeine")
+    (version "59")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://github.com/eonpatapon/gnome-shell-extension-caffeine")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0sv0iqfb6kjhgcg4pb59n91dyf667vax96kfhz5ik5hhx9n0z43w"))))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:install-plan
+      #~'(("caffeine@patapon.info"
+           "share/gnome-shell/extensions/caffeine@patapon.info"
+           #:include-regexp ("icons" "locale" "preferences" "schemas"
+                             "\\.js(on)?$")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'compile-schemas
+            (lambda _
+              (with-directory-excursion "caffeine@patapon.info/schemas"
+                (invoke "glib-compile-schemas" ".")))))))
+    (native-inputs (list `(,glib "bin")))
+    (synopsis "Disable screensaver and auto suspend in Gnome")
+    (description "This extension provides a quick setting toggle to enable or
+disable the Gnome auto-suspend and screensaver.")
+    (home-page "https://github.com/eonpatapon/gnome-shell-extension-caffeine")
+    (license license:gpl2+)))
+
+(define-public gnome-shell-extension-hot-edge
+  (package
+    (name "gnome-shell-extension-hot-edge")
+    (version "27")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jdoda/hotedge")
+             (commit "90e9cdd6f2a171a676a96a4e6ad0126316317e4d")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08jqz6n04yvqa77930sghgip5qfj8i4dm8wsm5cqjc4sqm4pn9yy"))))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:install-plan
+      #~'(("." "share/gnome-shell/extensions/hotedge@jonathan.jdoda.ca"
+           #:include-regexp ("\\.css$" "\\.js(on)?$" "schemas")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'compile-schemas
+            (lambda _
+              (with-directory-excursion "schemas"
+                (invoke "glib-compile-schemas" ".")))))))
+    (native-inputs (list `(,glib "bin")))
+    (synopsis "Add a hot edge to the bottom of the screen in Gnome")
+    (description
+     "Add a hot edge that activates the overview to the bottom of the screen.
+This provides a better mouse-based workflow and can be an alternative to a dock.")
+    (home-page "https://github.com/jdoda/hotedge")
+    (license license:gpl2+)))
+
 (define-public gnome-shell-extension-radio
  (let ((commit "860e55b9e704eb3dde43e6bbeccec5748242498e")
        (revision "0"))
@@ -10628,7 +10628,6 @@ playing media, scanning, and much more.")
           cheese
           decibels
           epiphany
-           evince
           file-roller
           gnome-calculator
           gnome-calendar
@@ -10648,6 +10647,7 @@ playing media, scanning, and much more.")
           localsearch
           loupe
           nautilus
+           papers
           simple-scan
           showtime
           xdg-desktop-portal-gnome
@@ -412,7 +412,7 @@ similar to javadoc."))))
      (inherit base)
      (arguments
       `(;#:tests? #f;Requires spock-framework which is a circular dependency
-         #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10
+         #:ant ,ant; ant is actually a dependency of this package, and we need 1.10
         ,@(substitute-keyword-arguments arguments
             ((#:phases phases)
              `(modify-phases ,phases
@@ -431,8 +431,7 @@ similar to javadoc."))))
         ("java-asm-analysis" ,java-asm-analysis-8)
         ,@(package-inputs base)))
      (native-inputs
-       `(("ant-junit" ,ant-junit)
-         ("groovy-bootstrap" ,groovy-bootstrap)
+       `(("groovy-bootstrap" ,groovy-bootstrap)
         ("groovy-xml" ,groovy-xml)
         ("groovy-test" ,groovy-test)
         ("groovy-tests-bootstrap" ,groovy-tests-bootstrap)
@@ -517,22 +517,19 @@ functions which were removed.")
                "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
    (build-system waf-build-system)
    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'set-flags
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Allow 'bin/ganv_bench' to find libganv-1.so.
-             (setenv "LDFLAGS"
-                     (string-append "-Wl,-rpath="
-                                    (assoc-ref outputs "out") "/lib"))
-             #t)))
-       #:tests? #f)) ; no check target
-    (inputs
-     `(("gtk" ,gtk+-2)
-       ("gtkmm" ,gtkmm-2)))
+     (list
+      #:tests? #f ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'set-flags
+            (lambda _
+              ;; Allow 'bin/ganv_bench' to find libganv-1.so.
+              (setenv "LDFLAGS"
+                      (string-append "-Wl,-rpath=" #$output "/lib")))))))
    (native-inputs
     (list `(,glib "bin") ; for glib-genmarshal, etc.
           pkg-config))
+    (inputs (list gtk+-2 gtkmm-2))
    (home-page "https://drobilla.net/software/ganv/")
    (synopsis "GTK+ widget for interactive graph-like environments")
    (description
@@ -1460,10 +1457,9 @@ exceptions, macros, and a dynamic programming environment.")
    (inherit guile-cairo)
    (name "guile2.2-cairo")
    (inputs
-     `(("guile" ,guile-2.2)
-       ("guile-lib" ,guile2.2-lib)
-       ,@(fold alist-delete (package-inputs guile-cairo)
-               '("guile" "guile-lib"))))))
+     (modify-inputs inputs
+       (delete "guile" "guile-lib")
+       (append guile-2.2 guile2.2-lib)))))

 (define-public guile-cairo-next
  ;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2
@@ -1579,11 +1575,10 @@ images onto Cairo surfaces.")
    (inherit guile-rsvg)
    (name "guile2.2-rsvg")
    (inputs
-     `(("guile" ,guile-2.2)
-       ("guile-lib" ,guile2.2-lib)
-       ,@(fold alist-delete (package-inputs guile-rsvg)
-               '("guile" "guile-lib"))))
-    (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
+     (modify-inputs inputs
+       (delete "guile" "guile-lib")
+       (append guile-2.2 guile2.2-lib)))
+    (propagated-inputs (list guile2.2-cairo))))

 (define-public guile-present
  (package
@@ -1649,9 +1644,7 @@ documents.")
    (name "guile2.2-present")
    (inputs (list guile-2.2))
    (propagated-inputs
-     `(("guile-lib" ,guile2.2-lib)
-       ("guile-cairo" ,guile2.2-cairo)
-       ("guile-rsvg" ,guile2.2-rsvg)))))
+     (list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))

 ;;;
 ;;; C++ bindings.
@@ -7691,11 +7691,11 @@ is an attempt to combine both into something useful.")
      (license license:asl2.0))))

 (define-public guile-knots
-  (let ((commit "d79284b4715efc347b22d510c3e3134a0c584b17")
-        (revision "32"))
+  (let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
+        (revision "34"))
    (package
    (name "guile-knots")
-    (version (git-version "0" revision commit))
+    (version (git-version "0.1" revision commit))
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -7703,7 +7703,7 @@ is an attempt to combine both into something useful.")
                    (commit commit)))
              (sha256
               (base32
-                "0i87jc3dznw6pdib0yy49d8066c1jvwp2m01xi92amx45dkl8ixc"))
+                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -7938,14 +7938,16 @@ This module implements this interface by use of Guile's dynamic FFI.")
 (define-public guile-bstructs
  (package
    (name "guile-bstructs")
-    (version "0.1.0")
+    (version "0.2.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://files.dthompson.us/releases"
-                           "/guile-bstructs/guile-bstructs-" version ".tar.gz"))
-       (sha256
-        (base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.dthompson.us/guile-bstructs.git")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "18dwhcsbcjix61hy32ckjyvgmg1r9smq2krp2m1yc6sinlszh0f2"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
    (inputs (list guile-3.0))
@@ -75,7 +75,7 @@
    (inputs
     (list openblas))
    (native-inputs
-     `(("ant" ,ant)
+     `(("ant" ,ant/java7)
       ("ruby" ,ruby)                   ; for configure script
       ("gfortran" ,gfortran)
       ("jdk" ,icedtea "jdk")))
@@ -1964,8 +1964,7 @@ OpenJDK.")
    (home-page "https://www.jetbrains.com/")
    (license license:gpl2+)))

-
-(define-public ant/java8
+(define-public ant
  (package
    (name "ant")
    (version "1.10.15")
@@ -1980,15 +1979,12 @@ OpenJDK.")
              (snippet
               '(begin
                  (for-each delete-file
-                            (find-files "lib/optional" "\\.jar$"))
-                  #t))))
-    (build-system gnu-build-system)
+                            (find-files "lib/optional" "\\.jar$"))))))
+    (build-system ant-build-system)
    (arguments
     (list
-      #:modules '((srfi srfi-1)
-                  (guix build gnu-build-system)
-                  (guix build utils))
-      #:tests? #f                       ;no "check" target
+      #:ant ant/java7
+      #:test-target "test"
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'remove-scripts
@@ -1998,11 +1994,100 @@ OpenJDK.")
              (for-each delete-file
                        (find-files "src/script"
                                    "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
+          (add-after 'unpack 'link-test-dependencies
+            (lambda* (#:key inputs #:allow-other-keys)
+              (for-each (lambda (file)
+                          (symlink file
+                                   (string-append "lib/optional/"
+                                                  (basename file))))
+                        (append
+                          (find-files (assoc-ref inputs "java-hamcrest-core")
+                                      "\\.jar$")
+                          (find-files (assoc-ref inputs "java-hamcrest-library")
+                                      "\\.jar$")
+                          (find-files (assoc-ref inputs "java-junit")
+                                      "\\.jar$")))))
+          (add-before 'build 'fix-test-failures
+            (lambda _
+              ;; Failure because the directory does not exist
+              (substitute* "src/etc/testcases/taskdefs/exec/exec-with-redirector.xml"
+                (("/usr/bin") (getcwd)))
+              ;; Failure because it cannot read root's name in the build
+              ;; container
+              (delete-file "src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java")
+              ;; Cause timestamp issue when trying to rollback time by a few
+              ;; seconds.
+              (for-each (lambda (file) (utime file 5000))
+                        (find-files "src/etc/testcases/taskdefs" "" #:directories? #t))))
          (delete 'bootstrap)
          (delete 'configure)
          (replace 'build
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+              (invoke "bash" "bootstrap.sh"
+                      (string-append "-Ddist.dir=" #$output))))
+          (add-after 'build 'fix-executables-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-script (string-append #$output "/bin/ant")
+                `("PATH" suffix
+                  (,(dirname (search-input-file inputs "/bin/sed"))
+                   ,(dirname (search-input-file inputs "/bin/uname"))
+                   ,(dirname (search-input-file inputs "/bin/which")))))
+              (patch-shebang
+               (string-append #$output "/bin/complete-ant-cmd.pl")
+               (list (dirname (search-input-file inputs "/bin/perl"))))))
+          (delete 'install))))
+    (inputs
+     (list coreutils-minimal
+           guile-3.0/pinned
+           java-hamcrest-core
+           java-hamcrest-library
+           java-junit
+           perl
+           sed
+           which))
+    (home-page "https://ant.apache.org")
+    (synopsis "Build tool for Java")
+    (description
+     "Ant is a platform-independent build tool for Java.  It is similar to
+make but is implemented using the Java language, requires the Java platform,
+and is best suited to building Java projects.  Ant uses XML to describe the
+build process and its dependencies, whereas Make uses Makefile format.")
+    (license license:asl2.0)))
+
+;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
+;; requires Java 8.
+(define-public ant/java7
+  (package
+    (name "ant")
+    (version "1.9.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://apache/ant/source/apache-ant-"
+                                  version "-src.tar.gz"))
+              (sha256
+               (base32
+                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
+    (build-system gnu-build-system)
+    (arguments
+      `(#:modules ((srfi srfi-1)
+                   (guix build gnu-build-system)
+                   (guix build utils))
+        #:tests? #f                  ; no "check" target
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'bootstrap)
+          (delete 'configure)
+          (add-after 'unpack 'remove-scripts
+            ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
+            ;; wrappers.
+            (lambda _
+              (for-each delete-file
+                        (find-files "src/script"
+                                    "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
+          (replace 'build
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))

              ;; Disable tests to avoid dependency on hamcrest-core, which needs
              ;; Ant to build.  This is necessary in addition to disabling the
@@ -2011,9 +2096,10 @@ OpenJDK.")
              (substitute* "build.xml"
                (("depends=\"jars,test-jar") "depends=\"jars"))
              (invoke "bash" "bootstrap.sh"
-                      (string-append "-Ddist.dir=" #$output))))
+                      (string-append "-Ddist.dir="
+                                     (assoc-ref outputs "out")))))
          (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
-            (lambda _
+            (lambda* (#:key outputs #:allow-other-keys)
              (define (repack-archive jar)
                (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
                       (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
@@ -2039,11 +2125,11 @@ OpenJDK.")
                      (apply invoke command)))))
              (for-each repack-archive
                        (find-files
-                         (string-append #$output "/lib")
+                         (string-append (assoc-ref %outputs "out") "/lib")
                         "\\.jar$"))))
          (delete 'install))))
    (native-inputs
-     `(("jdk" ,icedtea-8 "jdk")
+     `(("jdk" ,icedtea-7 "jdk")
       ("zip" ,zip)
       ("unzip" ,unzip)))
    (home-page "https://ant.apache.org")
@@ -2055,131 +2141,12 @@ and is best suited to building Java projects.  Ant uses XML to describe the
 build process and its dependencies, whereas Make uses Makefile format.")
    (license license:asl2.0)))

-;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
-;; requires Java 8.
-(define-public ant
-  (package (inherit ant/java8)
-    (version "1.9.15")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://apache/ant/source/apache-ant-"
-                                  version "-src.tar.gz"))
-              (sha256
-               (base32
-                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
-    ;; XXX: we do this to avoid a rebuild.  This mess will be cleaned up
-    ;; later.
-    (arguments
-     (substitute-keyword-arguments
-         `(#:modules ((srfi srfi-1)
-                      (guix build gnu-build-system)
-                      (guix build utils))
-           #:tests? #f                  ; no "check" target
-           #:phases
-           (modify-phases %standard-phases
-             (delete 'bootstrap)
-             (delete 'configure)
-             (add-before 'build 'define-java-environment-variables
-               (lambda* (#:key inputs #:allow-other-keys)
-                 ;; First, set environment variables (eases debugging on -K).
-                 (setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
-                 (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
-                 (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
-                 (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
-             (replace 'build
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 ;; Ant complains if this file doesn't exist.
-                 (setenv "HOME" "/tmp")
-                 (with-output-to-file "/tmp/.ant.properties"
-                   (lambda _ (display "")))
-
-                 ;; Use jikes instead of javac for <javac ...> tags in build.xml
-                 (setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
-
-                 ;; jikes produces lots of warnings, but they are not very
-                 ;; interesting, so we silence them.
-                 (setenv "$BOOTJAVAC_OPTS" "-nowarn")
-
-                 ;; Without these JamVM options the build may freeze.
-                 (substitute* "bootstrap.sh"
-                   (("^\"\\$\\{JAVACMD\\}\" " m)
-                    ,@(if (string-prefix? "armhf" (or (%current-system)
-                                                      (%current-target-system)))
-                          `((string-append m "-Xnocompact "))
-                          `((string-append m "-Xnocompact -Xnoinlining ")))))
-
-                 ;; Disable tests because we are bootstrapping and thus don't have
-                 ;; any of the dependencies required to build and run the tests.
-                 (substitute* "build.xml"
-                   (("depends=\"jars,test-jar\"") "depends=\"jars\""))
-                 (invoke "bash" "bootstrap.sh"
-                         (string-append "-Ddist.dir="
-                                        (assoc-ref outputs "out")))))
-             (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (define (repack-archive jar)
-                   (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
-                          (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
-                     (with-directory-excursion dir
-                       (invoke "unzip" jar))
-                     (delete-file jar)
-                     ;; XXX: copied from (gnu build install)
-                     (for-each (lambda (file)
-                                 (let ((s (lstat file)))
-                                   (unless (eq? (stat:type s) 'symlink)
-                                     (utime file  0 0 0 0))))
-                               (find-files dir #:directories? #t))
-                     ;; It is important that the manifest appears first.
-                     (with-directory-excursion dir
-                       (let* ((files (find-files "." ".*" #:directories? #t))
-                              ;; To ensure that the reference scanner can
-                              ;; detect all store references in the jars
-                              ;; we disable compression with the "-0" option.
-                              (command (if (file-exists? manifest)
-                                           `("zip" "-0" "-X" ,jar ,manifest
-                                             ,@files)
-                                           `("zip" "-0" "-X" ,jar ,@files))))
-                         (apply invoke command)))))
-                 (for-each repack-archive
-                           (find-files
-                            (string-append (assoc-ref %outputs "out") "/lib")
-                            "\\.jar$"))))
-             (delete 'install)))
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'define-java-environment-variables)
-           (add-after 'unpack 'remove-scripts
-             ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
-             ;; wrappers.
-             (lambda _
-               (for-each delete-file
-                         (find-files "src/script"
-                                     "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
-               #t))
-           (replace 'build
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
-
-               ;; Disable tests to avoid dependency on hamcrest-core, which needs
-               ;; Ant to build.  This is necessary in addition to disabling the
-               ;; "check" phase, because the dependency on "test-jar" would always
-               ;; result in the tests to be run.
-               (substitute* "build.xml"
-                 (("depends=\"jars,test-jar") "depends=\"jars"))
-               (invoke "bash" "bootstrap.sh"
-                       (string-append "-Ddist.dir="
-                                      (assoc-ref outputs "out")))))))))
-    (native-inputs
-     `(("jdk" ,icedtea-7 "jdk")
-       ("zip" ,zip)
-       ("unzip" ,unzip)))))
-
 (define-public ant-apache-bcel
  (package
-    (inherit ant/java8)
+    (inherit ant)
    (name "ant-apache-bcel")
    (arguments
-     (substitute-keyword-arguments (package-arguments ant/java8)
+     (substitute-keyword-arguments (package-arguments ant)
       ((#:phases phases)
        #~(modify-phases #$phases
            (add-after 'unpack 'link-bcel
@@ -2200,37 +2167,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
                  (delete-file-recursively bin)
                  (delete-file-recursively lib))))))))
    (inputs
-     (modify-inputs (package-inputs ant/java8)
+     (modify-inputs (package-inputs ant)
       (prepend java-commons-bcel)))))

-(define-public ant-junit
-  (package
-    (inherit ant/java8)
-    (name "ant-junit")
-    (arguments
-     (substitute-keyword-arguments (package-arguments ant/java8)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (add-after 'unpack 'link-junit
-              (lambda* (#:key inputs #:allow-other-keys)
-                (for-each (lambda (file)
-                            (symlink file
-                                     (string-append "lib/optional/"
-                                                    (basename file))))
-                          (find-files (assoc-ref inputs "java-junit")
-                                      "\\.jar$"))))
-            (add-after 'build 'install
-              (lambda _
-                (let ((share (string-append #$output "/share/java"))
-                      (bin   (string-append #$output "/bin"))
-                      (lib   (string-append #$output "/lib")))
-                  (mkdir-p share)
-                  (install-file (string-append lib "/ant-junit.jar") share)
-                  (delete-file-recursively bin)
-                  (delete-file-recursively lib))))))))
-    (inputs
-     (modify-inputs (package-inputs ant/java8)
-       (prepend java-junit)))))
+(define-deprecated-package ant-junit
+  ant)

 (define-public libantlr3c
  (package
@@ -3337,6 +3278,9 @@ is implemented.")
     `(;; Tests require junit
       #:tests? #f
       #:jar-name "qdox.jar"
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (replace 'unpack
@@ -3445,6 +3389,9 @@ documentation tools.")
     `(;; Tests require junit, which ultimately depends on this package.
       #:tests? #f
       #:build-target "jar"
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (add-before 'build 'do-not-use-bundled-asm
@@ -3543,6 +3490,9 @@ testing frameworks, mocking libraries and UI validation rules.")
    (build-system ant-build-system)
    (arguments
     `(#:tests? #f ; Tests require junit
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
       #:modules ((guix build ant-build-system)
                  (guix build java-utils)
                  (guix build utils)
@@ -3628,6 +3578,9 @@ testing frameworks, mocking libraries and UI validation rules.")
    (native-inputs '())
    (arguments
     `(#:tests? #f
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (delete 'configure)
@@ -3669,7 +3622,7 @@ testing frameworks, mocking libraries and UI validation rules.")
 (define-public java-junit
  (package
    (name "java-junit")
-    (version "4.12")
+    (version "4.13.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3678,7 +3631,7 @@ testing frameworks, mocking libraries and UI validation rules.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h"))
+                "1r7k4zzscc8019np3is3bzfigw8fxd6s3259cbhzzh02q6d5p9h3"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -3690,6 +3643,9 @@ testing frameworks, mocking libraries and UI validation rules.")
     `(#:jar-name "junit.jar"
       #:source-dir "src/main/java"
       #:test-dir "src/test"
+       ;; Explicitely use an ant version that includes the junit tasks, so
+       ;; we can run the tests.
+       #:ant ,ant/java7
       #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
                            "**/RuleChainTest.java" "**/TestWatchmanTest.java")
       #:phases
@@ -3730,7 +3686,13 @@ sharing common test data, and test runners for running tests.")
     `(#:jar-name "junitparams.jar"
       #:source-dir "src/main/java"
       #:test-dir "src/test"
-       #:test-exclude (list "**/SuperclassTest.java")))
+       #:test-exclude (list
+                        ;; Abstract class: no tests
+                        "**/SuperclassTest.java"
+                        ;; Incompatible tests with junit 4.13.2
+                        "**/BeforeAfterClassTest.java"
+                        "**/FilterableTest.java"
+                        "**/RulesTest.java")))
    (inputs
     (list java-junit))
    (native-inputs
@@ -5199,6 +5161,9 @@ complex transformations and code analysis tools.")
    (build-system ant-build-system)
    (arguments
     `(#:tests? #f
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
       #:phases
       (modify-phases %standard-phases
         (delete 'unpack)
@@ -5220,6 +5185,9 @@ including java-asm.")
    (properties '((hidden? . #t)))
    (arguments
     (substitute-keyword-arguments (package-arguments java-asm)
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       ((#:ant _ ant/java7) ant/java7)
       ((#:tests? _) #f)))
    (native-inputs `())))

@@ -37,6 +37,7 @@
  #:use-module (guix packages)
  #:use-module (guix utils)
  #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages crypto)
@@ -189,16 +190,17 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
  (package
    (name "kaidan")
    (version "0.15.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://kde/unstable/kaidan/" version
-                                  "/kaidan-" version ".tar.xz"))
-              (modules '((guix build utils)))
-              (snippet
-               #~(begin
-                   (delete-file-recursively "3rdparty")))
-              (sha256
-               (base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/unstable/kaidan/" version
+                           "/kaidan-" version ".tar.xz"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (delete-file-recursively "3rdparty")))
+       (sha256
+        (base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -209,10 +211,18 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
           (add-before 'check 'set-home
             (lambda _
               ;; Tests need write permission in $HOME.
-               (setenv "HOME" "/tmp"))))))
+               (setenv "HOME" "/tmp")))
+           (add-after 'install 'wrap-program
+             (lambda _
+               (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                 (wrap-program (string-append #$output "/bin/kaidan")
+                   `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
+                     (,gst-plugin-path)))))))))
    (native-inputs (list extra-cmake-modules
                         pkg-config))
-    (inputs (list gstreamer
+    (inputs (list bash-minimal
+                  gst-plugins-good-qt
+                  gstreamer
                  icu4c
                  kcrash
                  kdsingleapplication
@@ -1853,6 +1853,9 @@ for xdg-desktop-portal that is using Qt/KF5.")
                             breeze-icons ;default mouse icon
                             colord
                             discover
+                             ffmpegthumbs
+                             flatpak ;for discover
+                             flatpak-kcm ;to manage flatpak app permissions
                             kactivitymanagerd
                             kdeclarative ;required by sddm breeze theme
                             kde-cli-tools
@@ -33,6 +33,7 @@
  #:use-module (gnu packages libusb)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
  #:use-module (gnu packages swig)
  #:use-module (gnu packages textutils))

@@ -95,7 +96,7 @@
                                                 "/html"))))))
      #:tests? #f))                     ; tests fail without access to USB
    (native-inputs
-     (list doxygen graphviz pkg-config python swig-4.0))
+     (list doxygen graphviz pkg-config python python-setuptools swig))
    (inputs
     (list boost libconfuse))
    (propagated-inputs
@@ -57,7 +57,7 @@
 (define-public luanti
  (package
    (name "luanti")
-    (version "5.15.1")
+    (version "5.15.2")
    (source
     (origin
       (method git-fetch)
@@ -66,7 +66,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "07g41ljv117pmw6402mqznccwl1hd9jp2l8wkb4l211cbm4c6vv9"))
+        (base32 "1mcbsgf549y2jg9qds95wwgd1699mkk4byv9ls4lpg43bd829dhk"))
       (modules '((guix build utils)
                  (srfi srfi-26)
                  (ice-9 ftw)))
@@ -488,7 +488,7 @@ with different rules and mechanics.")
 (define-public luanti-mineclonia
  (package
    (name "luanti-mineclonia")
-    (version "0.120.1")
+    (version "0.121.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -497,7 +497,7 @@ with different rules and mechanics.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "135xllkvdravry25y1f94wqn7nxb0pnrpn7xiagh2b5vjbajhdg4"))))
+                "1c3x59iq04vfc0fa09z6g8davrr2vhdywppdbgyw64n7vk4f6br9"))))
    (build-system copy-build-system)
    (arguments
     `(#:install-plan
@@ -3437,14 +3437,14 @@ notifications.")
 (define-public pounce
  (package
    (name "pounce")
-    (version "3.1")
+    (version "3.2")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
                           version ".tar.gz"))
       (sha256
-        (base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))
+        (base32 "1i0s76mip9kfmi85bfk10p4k1kg5wkq1gm4l9gadnq9ssxnvzvjs"))
       (patches (search-patches "pounce-readable-checks.patch"))))
    (outputs '("out" "debug"))
    (build-system gnu-build-system)
@@ -171,6 +171,7 @@
  #:use-module (gnu packages lua)
  #:use-module (gnu packages machine-learning)
  #:use-module (gnu packages man)
+  #:use-module (gnu packages messaging)
  #:use-module (gnu packages mp3)
  #:use-module (gnu packages mpd)
  #:use-module (gnu packages mruby-xyz)
@@ -593,6 +594,38 @@ updates via @command{mopidy local scan} while Mopidy is running, so you can
 scan your media library periodically, for example from a cron job.")
    (license license:asl2.0)))

+(define-public mopidy-mopiqtt
+  (package
+    (name "mopidy-mopiqtt")
+    (version "1.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fmarzocca/mopiqtt")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1gaxxbpws9xshsbknq78h0c1k3ynvc466hkq4952pv00q203zqk4"))
+       ;; XXX: https://github.com/fmarzocca/Mopiqtt/issues/6
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "tests/test_smoke.py"
+             (("mqtt")
+              "mopiqtt"))
+           (substitute* "tests/conftest.py"
+             (("mqtt")
+              "mopiqtt"))))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
+    (propagated-inputs (list mopidy python-paho-mqtt python-pykka))
+    (home-page "https://github.com/fmarzocca/mopiqtt")
+    (synopsis "MQTT interface for Mopidy")
+    (description
+     "This package provides an MQTT interface extension for Mopidy music server.")
+    (license license:asl2.0)))
+
 (define-public clementine
  ;; Clementine has one automatic release per commit at
  ;; <https://github.com/clementine-player/Clementine/releases>.
@@ -1,8 +1,4 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
-;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,98 +16,8 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages nvi)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages dbm)
-  #:use-module (gnu packages ncurses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix gexp)
-  #:use-module (guix licenses)
-  #:use-module (guix utils))
+  #:use-module (gnu packages text-editors)
+  #:use-module (guix deprecation))

-(define-public nvi
-  (package
-    (name "nvi")
-    (version "1.81.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri          ;; sites.google.coma/bostic.com/keithbostic/vi is stale.
-          (string-append "http://harrier.slackbuilds.org/misc/nvi-" version
-                         ".tar.bz2"))
-        (sha256
-          (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
-        (patches (search-patches "nvi-assume-preserve-path.patch"
-                                 "nvi-dbpagesize-binpower.patch"
-                                 "nvi-add-function-prototypes.patch"
-                                 "nvi-db4.patch"))
-        (modules '((guix build utils)))
-        (snippet
-          ;; Create a wrapper for the configure script, make it executable.
-          '(let ((conf-wrap (open-output-file "configure")))
-             (display "#!/bin/sh" conf-wrap)
-             (newline conf-wrap)
-             (display
-               "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
-               conf-wrap)
-             (newline conf-wrap)
-             (close-output-port conf-wrap)
-             (chmod "configure" #o0755)
-
-             ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
-             ;; to the internal PTY allocation logic.
-             (substitute* "ex/ex_script.c"
-               (("#ifdef HAVE_SYS5_PTY")
-                "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
-             #t))))
-
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:out-of-source? #t
-      #:configure-flags
-      #~'("--enable-widechar"
-          #$@(if (%current-target-system)
-                 '("vi_cv_sprintf_count=yes")
-                 '()))
-      #:make-flags
-      #~(list
-         ;; Add CFLAGS to relax gcc-14's strictness.
-         ;; nvi's configure chokes on passing CFLAGS and ignores
-         ;; CFLAGS set in the environment.
-         (string-append "CFLAGS=-g -O2"
-                        " -Wno-error=incompatible-pointer-types"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'fix-configure
-            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-              ;; Replace outdated config.sub and config.guess:
-              (with-directory-excursion "dist"
-                (for-each
-                 (lambda (file)
-                   (chmod file #o755)
-                   (install-file
-                    (format #f "~a/share/automake-~a/~a"
-                            (assoc-ref (or native-inputs inputs)
-                                       "automake")
-                            #$(version-major+minor
-                               (package-version automake))
-                            file)
-                    "."))
-                 '("config.sub" "config.guess"))))))))
-    (inputs
-      (list bdb ncurses))
-    (native-inputs
-     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
-    (synopsis "The Berkeley Vi Editor")
-    (description
-      "Vi is the original screen based text editor for Unix systems.  It is
-considered the standard text editor, and is available on almost all Unix
-systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of the
-original BSD vi editor.  As such, it doesn't have a lot of snazzy features as
-do some of the other vi clones such as elvis and vim.  However, if all you
-want is vi, this is the one to get.")
-    (home-page "https://sites.google.com/a/bostic.com/keithbostic/vi")
-    (license bsd-3)))
+(define-deprecated/public-alias nvi
+  (@ (gnu packages text-editors) nvi))
@@ -6153,7 +6153,7 @@ serializers and deserializers from type definitions.")
    (build-system dune-build-system)
    (propagated-inputs (list ocaml-yojson))
    (properties `((upstream-name . "ppx_yojson_conv_lib")))
-    (synopsis "Runtime library used by ocaml PPX yojson convertor")
+    (synopsis "Runtime library used by ocaml PPX yojson converter")
    (description "Ppx_yojson_conv_lib is the runtime library used by
 ppx_yojson_conv, a ppx rewriter that can be used to convert ocaml types
 to a Yojson.Safe value.")
@@ -75,7 +75,7 @@
          (add-after 'unpack 'relax-requirements
            (lambda _
              (substitute* "setup.py"
-                ;; Relax hard requirment of PIP.
+                ;; Relax hard requirement of PIP.
                ((".*pip>=18.0.*") ""))))
          (add-before 'check 'pre-check
            (lambda _
@@ -32,6 +32,7 @@
 ;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
 ;;; Copyright © 2025 unwox <me@unwox.com>
+;;; Copyright © 2026 Owen T. Heisler <writer@owenh.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1498,7 +1499,7 @@ manage (install/update) them for you.")
              "--ignore=tests/trust/test_signature_verification.py"
              "-k" (string-join
                    ;; XXX: Issues salad: network access, can't detect Conda
-                    ;; environemnt, assertion failed; review if they may be
+                    ;; environment, assertion failed; review if they may be
                    ;; fixed.
                    ;;
                    ;; test_info_all: Fails due to parallel test interference.
@@ -2133,8 +2134,8 @@ environments.")
                  "153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq")))))))

 (define-public guix-build-coordinator
-  (let ((commit "bd3467e7b60f22089c4a3bf6d32caafbd03625f0")
-        (revision "137"))
+  (let ((commit "a52e17ae733de601ef3d4aa72b88ff7ed02aceb7")
+        (revision "138"))
    (package
      (name "guix-build-coordinator")
      (version (git-version "0" revision commit))
@@ -2145,7 +2146,7 @@ environments.")
                      (commit commit)))
                (sha256
                 (base32
-                  "0h9kxpijilrn9v2s8dy7sdifshri4fxvdgvxxacvvbw01fb3llmv"))
+                  "164k3ygn69h0z6bbsqpk22psnn2b1lbpidmaixf3kaj6kfjvz7xw"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -2388,8 +2389,8 @@ in an isolated environment, in separate namespaces.")
    (license license:gpl3+)))

 (define-public nar-herder
-  (let ((commit "cc1e9052785de0a08b05f85a7c7c400d95e339e7")
-        (revision "52"))
+  (let ((commit "44ca801e2352b64e19921c72177b35b2e49a7a09")
+        (revision "53"))
    (package
      (name "nar-herder")
      (version (git-version "0" revision commit))
@@ -2400,7 +2401,7 @@ in an isolated environment, in separate namespaces.")
                      (commit commit)))
                (sha256
                 (base32
-                  "0qsyvmxr5kkayvvda8f5lmamz098vcjrfgpbwd5519fcw8xbnk8q"))
+                  "15sc9rgna1fxsns1q9q1xlrqfqc4r5lcmmddw0af2lhll75kj7v2"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -2467,6 +2468,7 @@ in an isolated environment, in separate namespaces.")

             ;; Guile libraries are needed here for cross-compilation.
             guile-next
+             guile-aws
             guile-json-4
             guile-gcrypt
             guix
@@ -2481,7 +2483,8 @@ in an isolated environment, in separate namespaces.")
       (list bash-minimal
             guile-next))
      (propagated-inputs
-       (list guile-json-4
+       (list guile-aws
+             guile-json-4
             guile-gcrypt
             guix
             guile-fibers-next
@@ -2742,6 +2745,8 @@ cp -r /tmp/locale/*/en_US.*")))
    (propagated-inputs (list glib-networking
                             gnupg
                             gsettings-desktop-schemas
+                             ;; Required for flatpak-validate-icon SVG validation.
+                             (librsvg-for-system)
                             ;; The following are listed in Requires.private of
                             ;; `flatpak.pc'.
                             curl
@@ -1798,7 +1798,7 @@ is the community-enhanced, \"jumbo\" version of John the Ripper.")
    (home-page "https://github.com/hashcat/maskprocessor")
    (synopsis "High-Performance word generator")
    (description "Maskprocessor is a high-performance word generator with a
-per-position configureable charset.")
+per-position configurable charset.")
    (license (list license:expat))))

 (define-public fpm2
@@ -0,0 +1,14 @@
+Upstream-status: https://github.com/open-eid/DigiDoc4-Client/pull/1398
+
+diff --git a/client/Application.cpp b/client/Application.cpp
+index c979020..dac13d9 100644
+--- a/client/Application.cpp
+++ b/client/Application.cpp
+@@ -307,6 +307,7 @@ Application::Application( int &argc, char **argv )
+ {
+ 	setApplicationName(QStringLiteral("qdigidoc4"));
+ 	setApplicationVersion(QStringLiteral(VERSION_STR));
+	setDesktopFileName("ee.ria.qdigidoc4");
+ 	setOrganizationDomain(QStringLiteral("ria.ee"));
+ 	setOrganizationName(QStringLiteral("RIA"));
+ 	setWindowIcon(QIcon(QStringLiteral(":/images/Icon.svg")));
@@ -1892,7 +1892,7 @@ presentation.  The input files processed by pdfpc are PDF documents.")
    (license license:gpl3+)))

 (define-public paps
-  ;; Fails to build in lastest release.
+  ;; Fails to build in latest release.
  (let ((commit "199b478ca3884df4c0786948aae09c7928c6498f")
        (revision "0"))
    (package
@@ -510,7 +510,7 @@ of the same class using @code{JSON::Unmarshal}.")
@code{JSON::Unmarshal} in order to save duplication, it is intended to store a
 separate JSON name for an attribute where the name of the JSON attribute might be
 changed, either for aesthetic reasons or the name is not a valid Perl identifier.
-It will of course also be needed in classes thar are going to use
+It will of course also be needed in classes that are going to use
@code{JSON::Marshal} or @code{JSON::Unmarshal} for serialization/deserialization.")
    (license license:artistic2.0)))

@@ -311,7 +311,7 @@
                 ;; This test fails on most architectures.
                 "sapi/cli/tests/upload_2G.phpt"))

-              ;; Accomodate two extra openssl errors flanking the expected one:
+              ;; Accommodate two extra openssl errors flanking the expected one:
              ;; random number generator:RAND_{load,write}_file:Cannot open file
              ;; This is due to an invalid $HOME, but changing it in the test
              ;; still prints the first one & changing it globally is overkill.
@@ -91,7 +91,7 @@
         "--with-nologin=/run/apcupsd"
         "--with-pwrfail-dir=/run/apcupsd"

-         ;; Configure requires these, but we do not use the genenerated
+         ;; Configure requires these, but we do not use the generated
         ;; apcupsd.conf, so in order to reduce dependencies of the package,
         ;; provide fake values.
         (string-append "ac_cv_path_SHUTDOWN=/nope")
@@ -237,7 +237,7 @@ it.")
 (define-public trealla
  (package
    (name "trealla")
-    (version "2.92.30")
+    (version "2.92.41")
    (source
     (origin
       (method git-fetch)
@@ -246,7 +246,7 @@ it.")
          (url "https://github.com/trealla-prolog/trealla")
          (commit (string-append "v" version))))
       (sha256
-        (base32 "1vbjv2nf3c2npf349i9y0zknc2g0hizksv0yhgscdpwzvzfp6n9m"))
+        (base32 "0ial37h0i9zjxgxvkai2vmaafn4djprliw0nzppnhwwy3jbcd14p"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (inputs
@@ -446,7 +446,7 @@ Prometheus metrics.")
      #:import-path "github.com/prometheus/common"
      #:test-subdirs
      #~(list
-         ;; Skipp, as it requires
+         ;; Skip, as it requires
         ;; <github.com/prometheus/client_golang/prometheus>, which introduces
         ;; cycle.
         ;; "./config/..."
@@ -524,7 +524,7 @@ from protobuf specification files.")
            (lambda _
              (copy-file "extra/poetry/pyproject.toml" "pyproject.toml")
              (delete-file "build.py")
-              ;; Mimick extra/poetry/poetry_build.sh.
+              ;; Mimic extra/poetry/poetry_build.sh.
              (mkdir "nanopb")
              (copy-recursively "generator" "nanopb/generator")
              (invoke "touch" "nanopb/__init__.py"
@@ -1807,7 +1807,7 @@ HTTP @code{multipart/form-data} parsers and generators.")
     (list
      #:test-flags
      #~(list "--numprocesses" (number->string (parallel-job-count))
-              ;; It tries to download hatchling and install aditional test
+              ;; It tries to download hatchling and install additional test
              ;; dependencies.
              "--ignore=mypy/test/testpep561.py")
      #:phases
@@ -3032,7 +3032,7 @@ sub-package.")

 (define-public python-pytest-fixture-config
  ;; TODO: Master branch has removed all Python 2 support such Six, consider
-  ;; to update and drop python-six from closure in the next update cyle.
+  ;; to update and drop python-six from closure in the next update cycle.
  (package
    (name "python-pytest-fixture-config")
    (version "1.8.0")
@@ -3121,7 +3121,7 @@ compliance.")
    (home-page "https://github.com/dropbox/pytest-flakefinder")
    (synopsis "Pytest plugin for finding flaky tests")
    (description "This package provides a Pytest plugin to run tests multiple
-times and detect flakyness.")
+times and detect flakiness.")
    (license license:asl2.0)))

 (define-public python-pytest-flask
@@ -3706,7 +3706,7 @@ interaction, like key presses and mouse clicks.")
      ;; tests: 23 passed, 13 deselected
      #:test-flags
      #~(list "-p" "no:randomly"
-              ;; Skip tests requireing python-factory-boy, python-faker,
+              ;; Skip tests requiring python-factory-boy, python-faker,
              ;; python-numpy, and python-pytest-xdist to reduce closure size.
              "-k" (string-join
                    (list "not test_entrypoint_injection"
@@ -974,7 +974,7 @@ provides handling of symlinks, and exception management.")
       (sha256
        (base32 "0rj182i2d7d2bz067zrk39s19j09xsxkzprl82fqql8ji9c5fwd0"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f))       ;TODO: Tests requrie extra packaging
+    (arguments (list #:tests? #f))       ;TODO: Tests require extra packaging
    (native-inputs
     (list ;; python-big-o
           ;; python-coherent-licensed
@@ -263,7 +263,7 @@ Python interface around SSH networking concepts.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; Test failes with error: AssertionError: KeyboardInterrupt not raised.
+      ;; Test fails with error: AssertionError: KeyboardInterrupt not raised.
      #:test-flags #~(list "-k" "not test_multithreading_with_interrupts")))
    (native-inputs
     (list openssl
@@ -1840,7 +1840,7 @@ interacting with a U2F device over USB.")
    (synopsis "Stateless OpenPGP Command-Line Interface")
    (description
     "The Stateless OpenPGP Command-Line Interface (or sop) is a
-specification that encourages OpenPGP implementors to provide a common,
+specification that encourages OpenPGP implementers to provide a common,
 relatively simple command-line API for purposes of object security.

 This Python module helps implementers build such a CLI from any implementation
@@ -1862,7 +1862,7 @@ density maps, both for interactive and non-interactive use.")
      (home-page "https://github.com/jararias/mpsplines")
      (synopsis "Mean preserving interpolation with splines")
      (description
-       "Thi package implements a functionality for mean-preserving
+       "This package implements a functionality for mean-preserving
 interpolation of 1D data (for example, time series) with splines.")
      (license license:bsd-3))))

@@ -2067,7 +2067,7 @@ indices of @code{ndarrays}.")
                                  ;; AttributeError: 'Series' object has no
                                  ;; attribute 'iteritems'
                                  " and not test_kde_plot_df"
-                                  ;; Test is not determenistic and fails with
+                                  ;; Test is not deterministic and fails with
                                  ;; assertion not equal for DF array.
                                  " and not test_summary_df"))
      #:phases
@@ -3421,7 +3421,7 @@ cross-validation.")
              "--numprocesses" (number->string (min 4 (parallel-job-count)))
              "--pyargs" "scipy"
              "-k" (string-join
-                    ;; Network access is requied.
+                    ;; Network access is required.
                    (list "not test_ascent"
                          "test_electrocardiogram"
                          "test_existence_all"
@@ -3468,7 +3468,7 @@ cross-validation.")
            (lambda* (#:key test-flags tests? #:allow-other-keys)
              (when tests?
                ;; Step out of the source directory to avoid interference.
-                ;; See: <.github/workflows/linux.yml> for any other posible
+                ;; See: <.github/workflows/linux.yml> for any other possible
                ;; tests setup.
                (with-directory-excursion "/tmp"
                  (setenv "HOME" "/tmp")
@@ -3818,7 +3818,7 @@ depends on @code{scipy.sparse} for some computations.")
         "--deselect=tdda/test_tdda.py::TestPandasDataFrames::test_types_match")
      #:phases
      #~(modify-phases %standard-phases
-          ;; "datetime.UTC" is not availalbe in Python 3.10 but in
+          ;; "datetime.UTC" is not available in Python 3.10 but in
          ;; 3.11 it's present
          ;; <https://docs.python.org/3/library/datetime.html#datetime.UTC>.
          (add-after 'unpack 'fix-Python3.11-datetime.UTC
@@ -4263,7 +4263,7 @@ idea of the remaining amount of computation to be done.")
              "--ignore=tests/pyspark"
              ;; E ModuleNotFoundError: No module named 'sphinx'
              "--ignore=tests/pandas/test_docs_setting_column_widths.py"
-              ;; Nework access is required.
+              ;; Network access is required.
              "--ignore=tests/fastapi/test_app.py"
              ;; TypeError: __class__ assignment: 'GeoDataFrame' object layout
              ;; differs from 'DataFrame'
@@ -4271,7 +4271,7 @@ idea of the remaining amount of computation to be done.")
                    (list "not test_schema_model[data0-True]"
                          "test_schema_from_dataframe[data1-True]"
                          "test_schema_no_geometry"
-                          ;; The most of the tests from this goup XFAIL or fail.
+                          ;; The most of the tests from this group XFAIL or fail.
                          "test_pandas_stubs_false_positives")
                    " and not "))))
    (native-inputs
@@ -4797,7 +4797,7 @@ readable.")
    (arguments
     (list
      ;; TODO: Require vaex.server and others, which require vaex-core;
-      ;; implement bootsrapping.
+      ;; implement bootstrapping.
      #:tests? #f
      #:phases
      #~(modify-phases %standard-phases
@@ -5223,7 +5223,7 @@ objects.")
                             python-numba
                             python-numpy
                             python-scipy
-                             ;; [optinal]
+                             ;; [optional]
                             ;; python-jaxlib
                             ;; python-jax
                             #;python-llvmlite))
@@ -870,7 +870,7 @@ caching server.")
    (home-page "https://github.com/ImagingDataCommons/dicomweb-client")
    (synopsis "Python client for DICOMweb RESTful services")
    (description
-     "@code{dicomweb_client} provides client intefaces for DICOMweb RESTful
+     "@code{dicomweb_client} provides client interfaces for DICOMweb RESTful
 services QIDO-RS, WADO-RS and STOW-RS to search, retrieve and store
 DICOM objects over the web, respectively.")
    (license license:expat)))
@@ -1322,7 +1322,7 @@ Rate limits can be configured at different levels such as:
    (synopsis "Google Drive Public File/Folder Downloader")
    (description
     "This package implements a functionality to download large files
-recursivly from Google Drive with option to filter them by file
+recursively from Google Drive with option to filter them by file
 formats (PDF/XML/CSV).")
    (license license:expat)))

@@ -2653,7 +2653,7 @@ comes with a SOCKS proxy client.")
    (version "0.7.0")
    (source
     (origin
-       (method git-fetch)        ;no tests in PyPI archvie
+       (method git-fetch)        ;no tests in PyPI archive
       (uri (git-reference
              (url "https://github.com/vxgmichel/aiostream")
              (commit (string-append "v" version))))
@@ -3441,7 +3441,7 @@ classes
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; XXX: The last commit's tests are uncompatible with the more recent
+      ;; XXX: The last commit's tests are incompatible with the more recent
      ;; version of python-falcon.
      #:tests? #f))
    (native-inputs
@@ -4150,7 +4150,7 @@ Python HTTP implementation.")
 (define-public python-slixmpp
  (package
    (name "python-slixmpp")
-    (version "1.8.6") ; XXX: The latest version which does not requrie Rust
+    (version "1.8.6") ; XXX: The latest version which does not require Rust
    (source
     (origin
       (method git-fetch)
@@ -4393,7 +4393,7 @@ storage.")
        (base32 "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))))
    (build-system pyproject-build-system)
    (arguments
-     '(#:tests? #f))    ;tests depent on dated pytest-expect
+     '(#:tests? #f))    ;tests depend on dated pytest-expect
    (native-inputs
     (list python-setuptools))
    (propagated-inputs
@@ -4744,7 +4744,7 @@ the Trio framework}.")

 (define-public python-txacme
  ;; 0.9.3 tag was placed in 2020 and there a lot of changes providing
-  ;; compatibility wit twisted, use the latest commit from trunk branch.
+  ;; compatibility with twisted, use the latest commit from trunk branch.
  ;;
  ;;See: <https://github.com/twisted/txacme/issues/165>.
  (let ((commit "ac18f92f6dde971a6b38f2ecfae44665815db583")
@@ -8631,7 +8631,7 @@ this it tries to be opinion-free and very extendable.")
    (version "1.1.4")
    (source
     (origin
-       (method git-fetch)       ;no tests in PyPI archvie
+       (method git-fetch)       ;no tests in PyPI archive
       (uri (git-reference
              (url "https://github.com/Yelp/ephemeral-port-reserve")
              (commit (string-append "v" version))))
@@ -10778,7 +10778,7 @@ request/response web apps to larger, grown applications.")
    (license license:repoze)))

 (define-public python-pyramid-chameleon
-  ;; PyPI lacks a fresh release, use the latest commit assosiated with
+  ;; PyPI lacks a fresh release, use the latest commit associated with
  ;; unrleased version, see:
  ;; <https://github.com/Pylons/pyramid_chameleon/issues/27>
  (let ((commit "956c77ba37120c430e871c834d3cd4ed5ac8dccf")
@@ -10887,7 +10887,7 @@ Pyramid web framework.")
    (license license:repoze)))

 (define-public python-pyramid-mako
-  ;; 1.1.0 was released in 2019, there a lot of compatability changes on
+  ;; 1.1.0 was released in 2019, there a lot of compatibility changes on
  ;; master, us the latest commit for now.
  (let ((commit "1a6f4c00c7134530d2975f34d904b64a41b28b21")
        (revision "0"))
@@ -13486,7 +13486,7 @@ services until one succeeds.")
    (name "python-whitenoise")
    (version "6.9.0")
    (source (origin
-              (method git-fetch) ; PyPI missing test failes
+              (method git-fetch) ; PyPI missing test fails
              (uri (git-reference
                    (url "https://github.com/evansd/whitenoise")
                    (commit version)))
@@ -461,7 +461,7 @@ user.")
    (home-page "https://github.com/fastapi/annotated-doc")
    (synopsis "Annotated for some Python objects")
    (description
-     "This package implements a funtionality for document parameters, class
+     "This package implements a functionality for document parameters, class
 attributes, return types, and variables inline, with
 Annotated.")
    (license license:expat)))
@@ -704,7 +704,7 @@ line drawing algorithm}.")
           python-matplotlib python-pygments python-rich))
    (home-page "https://github.com/catppuccin/python")
    (synopsis "Pastel palette for Python libraries")
-    (description "Catppuccin for Python is a soothing pastel pallete for Python
+    (description "Catppuccin for Python is a soothing pastel palette for Python
 libraries.  It aims to be the middle ground between low and high contrast
 themes.  It also includes themes for IPython, Matplotlib, Pygments and Rich.")
    (license license:expat)))
@@ -1154,7 +1154,7 @@ implemented in pure Python, and most of them are also implemented in C.")
    (home-page "https://github.com/domdfcoding/domdf_python_tools")
    (synopsis "Helpful functions for Python")
    (description
-     "This package provide helpfull functions for Python's testing and
+     "This package provide helpful functions for Python's testing and
 packaging tasks.")
    (license license:expat)))

@@ -5560,7 +5560,7 @@ concepts.")
    (license license:bsd-3)))

 (define-public python-hdf5storage
-  ;; XXX: Use the latest commit containing compatability with Pytest and Python
+  ;; XXX: Use the latest commit containing compatibility with Pytest and Python
  ;; 3.11, see: <https://github.com/frejanordsiek/hdf5storage/issues/135>.
  ;;
  ;; This package probably is sun setting, consider to remove when stops
@@ -5618,7 +5618,7 @@ untrusted sources, pickling is avoided in this package.")
                    (substitute* "test_prctl.py"
                      ;; actual suffix used in cpython build output dir name
                      (("sys.version\\[0:3\\]") "sys.implementation.cache_tag")
-                      ;; test_no_new_privs assumes existance of /bin/ping, but
+                      ;; test_no_new_privs assumes existence of /bin/ping, but
                      ;; can never run anyway due to it requiring setuid ping.
                      ;; just short circuit it instead.
                      (("os.stat\\('/bin/ping'\\)\\.st_mode") "0")))))))
@@ -6270,7 +6270,7 @@ other machines, such as over the network.")
        (base32 "1xwqp37ii9kql49agmkipawjbndwxg6y8sxax1wc4l6kkaxvk9ap"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;requir dated inputs
+     (list #:tests? #f))        ;require dated inputs
    (native-inputs
     (list python-setuptools-scm))
    (propagated-inputs
@@ -6854,7 +6854,7 @@ files are easily readable and they work nicely with version control systems.")
         "0hi5rl17rj9gay7yw7ikrkyp5qhyw5bzp4ig1sj6ahzclsia8y1h"))))
    (build-system pyproject-build-system)
    (arguments
-     ;; It requres additional modules for integration tests.
+     ;; It requires additional modules for integration tests.
     (list #:test-flags #~(list "--ignore=tests/modules/")))
    (native-inputs
     (list python-pytest
@@ -9974,8 +9974,8 @@ naturally be used also by other projects.")
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-                ;; TODO: Some acceptance faile and took near 30min to
-                ;; complete: 6765 tests, 6745 passed, 20 failed; findout how
+                ;; TODO: Some acceptance failed and took near 30min to
+                ;; complete: 6765 tests, 6745 passed, 20 failed; find out how
                ;; to skip failing ones.
                (format #t "Running unit tests...~%")
                (invoke "utest/run.py")))))))
@@ -13582,7 +13582,7 @@ that requires its specific capabilities.")
    (license license:bsd-3)))

 (define-public python-ffmpeg-python
-  ;; The latest release (0.2.0) is old and its test suite crashs on Python 3.10.
+  ;; The latest release (0.2.0) is old and its test suite crashes on Python 3.10.
  (package
    (name "python-ffmpeg-python")
    (properties '((commit . "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6")
@@ -13643,7 +13643,7 @@ arguments.  It handles arbitrarily large (directed-acyclic) signal graphs.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:tests? #f       ;XXX: tests requrie network access to get FFmpeg data
+      #:tests? #f       ;XXX: tests require network access to get FFmpeg data
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'hardcode-ffmpeg
@@ -13730,7 +13730,7 @@ data, and scientific formats.")
      (synopsis "Generate pseudorandom numbers by using algebra")
      (description
       "The @code{pyudorandom} module lets you iterate over a list
-in a non-succsessive, yet deterministic way based on interger modulo.
+in a non-succsessive, yet deterministic way based on integer modulo.
 It comes in handy when you want to mix up the items, but don't need
 any guarantees of randomness.  It might be slow on small data,
 but shall be significantly faster than @code{random.shuffle}
@@ -16694,9 +16694,9 @@ markdown_py is also provided to convert Markdown files to HTML.")
            (lambda _
              (chdir "test"))))))
    (native-inputs
-     (list ;; python-pygments      ;optinal, tests fail when added
-           ;; python-wavedrom      ;optinal, not packaged
-           ;; python-latex2mathml  ;optinal, not packaged
+     (list ;; python-pygments      ;optional, tests fail when added
+           ;; python-wavedrom      ;optional, not packaged
+           ;; python-latex2mathml  ;optional, not packaged
           python-setuptools))
    (home-page "https://github.com/trentm/python-markdown2")
    (synopsis "Fast and complete Python implementation of Markdown")
@@ -17011,7 +17011,7 @@ It has a flexible system of @samp{authorizers} able to manage both
    (propagated-inputs
     (list python-appdirs
           python-pytz
-           python-six))         ;still hard itegrated
+           python-six))         ;still hard integrated
    (home-page "https://github.com/PyFilesystem/pyfilesystem2/")
    (synopsis "File system abstraction layer for Python")
    (description
@@ -17731,7 +17731,7 @@ implementations of ASN.1-based codecs and protocols.")
      #:test-flags
      #~(list "-k" (string-join
                    ;; Tests fail with error: IndexError: string index out of
-                    ;; range.  It may be some incompatability wit pyparsing,
+                    ;; range.  It may be some incompatibility with pyparsing,
                    ;; see <https://github.com/eerimoq/asn1tools/issues/167>.
                    (list "not test_c_source"
                          "test_command_line_generate_c_source_oer"
@@ -19391,7 +19391,7 @@ explicit subcommand name.")
       (sha256
        (base32 "03ay7j57mfh4sa8vh9qwid1ggwdc0lasyw3ycsmgv5r6z2j63an7"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ;no tests in PyPI archvie
+    (arguments (list #:tests? #f)) ;no tests in PyPI archive
    (native-inputs
     (list python-hatch-vcs
           python-hatchling))
@@ -21595,7 +21595,7 @@ and makes it easier to build concurrent applications.")
        (sha256
          (base32 "18qx113g9bi1ac4indd5phma82zcdq601lxncp3vjn43m2mc3iq0"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ;XXX: not tests in PyPI archvie, there are in Git
+    (arguments (list #:tests? #f)) ;XXX: not tests in PyPI archive, there are in Git
    (native-inputs
     (list python-setuptools
           python-wheel))
@@ -23055,16 +23055,21 @@ completes.")
 (define-public python-asyncinject
  (package
    (name "python-asyncinject")
-    (version "0.6")
+    (version "0.6.1")
    (source
     (origin
-       (method url-fetch)
-       (uri (pypi-uri "asyncinject" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/simonw/asyncinject")
+              (commit version)))
+       (file-name (git-file-name name version))
       (sha256
-        (base32 "0x57idiy19lzyn32klgm06r223z8gr2aqqk91gysbshq7jg8g3pf"))))
+        (base32 "127ahb32x2qqjk17a667adrvrl63ima8khifq6dfm0q3vlfslxnn"))))
    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-pytest-asyncio
-                         python-setuptools python-wheel))
+    (native-inputs
+     (list python-pytest
+           python-pytest-asyncio
+           python-setuptools))
    (home-page "https://github.com/simonw/asyncinject")
    (synopsis
     "Run async workflows using pytest-fixtures-style dependency injection")
@@ -23966,7 +23971,7 @@ protocols written in pure Python.")
      #~(list "-k" "not test__version__from_git__shallow")
      #:phases
      #~(modify-phases %standard-phases
-          ;; These steps are taked from NixOS package definition:
+          ;; These steps are taken from NixOS package definition:
          ;; nixpkgs/pkgs/development/python-modules/dunamai/default.nix
          (add-before 'check 'pre-check
            (lambda _
@@ -25548,7 +25553,7 @@ created by running @code{python setup.py develop}).")
    (license license:expat)))

 ;; XXX: This project was archived by the owner on Oct 4, 2023. It is now
-;; read-only.  Consider to remvoe when nothing depends on it.
+;; read-only.  Consider to remove when nothing depends on it.
 (define-public python-ratelimiter
  ;; From https://github.com/RazerM/ratelimiter/pull/11
  (let ((commit "59a0827c434706d62b89e16a220e4ae12e618858")
@@ -25713,7 +25718,7 @@ Git.")
        (base32 "1h3nbg1nlshzrqy7vz4q4g9wbz85dqkn6385p0ad7kjj48ww9avx"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;tests rquire Cargo
+     (list #:tests? #f))        ;tests require Cargo
    (propagated-inputs
     (list python-semantic-version
           python-setuptools))
@@ -27366,7 +27371,7 @@ validation testing and application logic.")
    (license license:expat)))

 ;; Make sure to upgrade python-llvmlite in (gnu packages llvm) together with
-;; python-numba.  They have a very unflexible relationship.
+;; python-numba.  They have a very inflexible relationship.
 (define-public python-numba
  (package
    (name "python-numba")
@@ -27831,7 +27836,7 @@ values.  Partd excels at shuffling operations.")
      #:test-flags
      #~(list "--ignore=fsspec/implementations/tests/test_github.py"
              "-k" (string-join
-                    ;; Test requirs nentwork access
+                    ;; Test requires nentwork access
                    (list "not test_async_cat_file_ranges"
                          "test_gist_public_all_files"
                          "test_gist_public_missing_file"
@@ -32225,7 +32230,7 @@ syllables, and sentences.")
     (list python-chardet
           python-cssselect
           python-lxml
-           python-lxml-html-clean))    ;XXX: it sould be part of python-lxml lib
+           python-lxml-html-clean))    ;XXX: it should be part of python-lxml lib
    (home-page "http://github.com/buriy/python-readability")
    (synopsis "HTML to text parser")
    (description
@@ -33677,7 +33682,7 @@ It implements advanced Python dictionaries with dot notation access.")
                           python-wheel))
      (home-page "https://python-fields.readthedocs.io/")
      (synopsis "Python container class boilerplate killer")
-      (description "Avoid repetetive boilerplate code in Python classes.")
+      (description "Avoid repetitive boilerplate code in Python classes.")
      (license license:bsd-3))))

 (define-public python-aspectlib
@@ -34836,7 +34841,7 @@ parsing.")

 (define-public python-flatten-json
  ;; The latest version was not tagged on GitHub, PyPI provides no tests, use
-  ;; the commit assosiated with 0.1.14 version.
+  ;; the commit associated with 0.1.14 version.
  (let ((commit "900c4feebcfcd831ddb6143c4b246024ecf911ec")
        (revision "0"))
    (package
@@ -35322,7 +35327,7 @@ colors.")
           #~(modify-phases %standard-phases
               ;; This package requires python-packaging~=23.1 which is not yet
               ;; updated to. As per pyproject.toml, it is required to provide
-               ;; a nice version_info opbject.
+               ;; a nice version_info object.
               ;; TODO: After updating python-packaging, fix this.
               (delete 'sanity-check))))
    (propagated-inputs (list python-importlib-metadata python-packaging))
@@ -36793,7 +36798,7 @@ as possible in order to be comprehensible and easily extensible.")
 (define-public python-tables
  (package
    (name "python-tables")
-    ;; XXX: Compatability fix for numexpr 2.13.0, see:
+    ;; XXX: Compatibility fix for numexpr 2.13.0, see:
    ;; <https://github.com/PyTables/PyTables/pull/1256>.
    (properties '((commit . "aad9079c80ce3ae7f385d00af760d171dcc10535")
                  (revision . "0")))
@@ -37720,7 +37725,7 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.")
    (license license:expat)))

 (define-public python-timeout-decorator
-  ;; TODO: Remove when python-requests-caches releses a fresh version dropping
+  ;; TODO: Remove when python-requests-caches releases a fresh version dropping
  ;; it, see, <https://github.com/requests-cache/requests-cache/pull/1111>.
  (package
    (name "python-timeout-decorator")
@@ -39640,7 +39645,7 @@ features useful for text console applications.")
  python-urwid)            ;may be removed after 2025-11-12

 (define-public python-urwid-for-zulip-term
-  ;; zulip-term@0.7.0 requires exact 2.1.2 version otherewise some tests fail
+  ;; zulip-term@0.7.0 requires exact 2.1.2 version otherwise some tests fail
  ;; to pass, remove when no longer required.
  (hidden-package
   (package
@@ -39974,7 +39979,7 @@ store, forked from redis-py.")
         "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;no tests in PyPI archvie
+     (list #:tests? #f))        ;no tests in PyPI archive
    (native-inputs
     (list python-setuptools))
    (home-page "https://github.com/habnabit/vcversioner")
@@ -4366,7 +4366,7 @@ linux/libcurl_wrapper.h"
              (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
                (("libudev.so.1")
                 (search-input-file inputs "lib/libudev.so.1")))
-              ;; Patch the location of the X11 keywoard layouts.
+              ;; Patch the location of the X11 keyboard layouts.
              (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\
 /xkb_keyboard_layout_engine.cc"
                (("/usr/share/X11/xkb")
@@ -5028,7 +5028,7 @@ top of the PyQt bindings for Qt.  PyQt-builder is used to build PyQt itself.")
                (("--cov-report=term-missing") "")
                (("--cov-report=xml") "")))))))
    ;; XXX: Do not include, even supported: Qt5, PySide2 PySide6, only test
-    ;; agains Qt6 to reduce closure size..
+    ;; against Qt6 to reduce closure size..
    (native-inputs
     (list python-pyqt-6
           python-pytest
@@ -5085,7 +5085,7 @@ bindings (PySide, PySide2, PyQt4 and PyQt5).")
@item Multi-handle slider for float values
@item Spinbox with arbitrarily large integers
@item Magnitude combined with unit dropdown
-@item Label that willl elide text
+@item Label that will elide text
@item Searchable ComboBox populated from Enum
@item Searchable List
@item Searchable Tree
@@ -103,7 +103,7 @@
 ;; development.)
 ;;
 ;; The top-level 'Makefile' is more like a directory of scripts: it has
-;; convienience targets for developing Racket, and it cooperates with the
+;; convenience targets for developing Racket, and it cooperates with the
 ;; 'distro-build' package to assemble custom Racket distributions. (Again,
 ;; the makefile just delegates to Zuo.) It is not part of Racket source
 ;; distributions: the root of a source distribution is basically 'racket/src'
@@ -178,7 +178,7 @@
 ;; README file applies to all such subsystems:
 ;;
 ;;     The Racket version must be practically the same as the current Racket
-;;     verson, although it can be the Racket BC implementation (instead of
+;;     version, although it can be the Racket BC implementation (instead of
 ;;     the Racket CS implementation).
 ;;
 ;;     Unlike Chez Scheme boot files, the files generated in "schemified"
@@ -197,7 +197,7 @@
 ;; Zuo is notably *not* a problem for bootstrapping. The implementation is a
 ;; single hand-written C file designed to build with just `cc -o zuo zuo.c`,
 ;; even with very old or limited compilers. (We use the Autoconf support for
-;; convienience.) As of Zuo 1.8, Zuo has tagged releases in its own repository
+;; convenience.) As of Zuo 1.8, Zuo has tagged releases in its own repository
 ;; independent of the Racket release cycle.
 ;;
 ;; CODE:
@@ -2013,7 +2013,7 @@ operators.")
         ;; kernel specific headers.
         "-DBUILD_DRIVERS_LIMEPCIE=false"
         ;; Specify the udev rules installation path into
-         ;; the ouput profile.
+         ;; the output profile.
         (string-append "-DUDEV_RULES_INSTALL_PATH="
                        #$output "/lib/udev/rules.d")
         ;; Do not reload udev rules after build.
@@ -256,7 +256,7 @@ Turtle/N3 and read them in SPARQL XML, RDF/XML and Turtle/N3.")
    (license license:lgpl2.1+))) ; or any choice of gpl2+ or asl2.0

 (define-public redland
-  ;; XXX: No tags for the last release, altough it's clear from
+  ;; XXX: No tags for the last release, although it's clear from
  ;; Github and logs a new release has been made.
  (let ((commit "3ec9bda623107f9b1c86c0a3f261ffd3f8a40965")
        (revision "0"))
@@ -242,7 +242,7 @@ and in-process/in-memory compilation.")
     (list rocm-comgr rocminfo))
    (synopsis "ROCm HIP Runtime")
    (description "HIP language runtime, allowing execution of HIP kernels
-on AMD harware, with library support for in-process/in-memory
+on AMD hardware, with library support for in-process/in-memory
 compilation (hipclr) of HIP kernel code, and its execution on AMD hardware.")
    (license license:expat)))

@@ -425,7 +425,7 @@ particular CPU vendor or architecture.")
                (("find_program\\(LD_LLD_PATH ld\\.lld\\)")
                 "#find_program(LD_LLD_PATH ld.lld)"))))
          ;; This is just cosmetic and removes superfluous rpath entries
-          ;; involving a nonexistant relative llvm/lib path.
+          ;; involving a nonexistent relative llvm/lib path.
          ;; XXX: RUNPATH checks are okay with $ORIGIN, but it looks like
          ;; other packages are removing it altogether -- what to do?
          (add-after 'unpack 'remove-dubious-rpath
@@ -268,7 +268,7 @@ HTTP/2-based RPC framework gRPC.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      #:tests? #f       ;XXX: no tests in PyPI, try to bulid from Git
+      #:tests? #f       ;XXX: no tests in PyPI, try to build from Git
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'configure
@@ -812,7 +812,7 @@ configured correctly.

 Serverspec tests your servers’ actual state by executing command locally, via
 SSH, via WinRM, via Docker API and so on.  So you don’t need to install any
-agent softwares on your servers and can use any configuration management
+agent software on your servers and can use any configuration management
 tools, Puppet, Ansible, CFEngine, Itamae and so on.

 But the true aim of Serverspec is to help refactoring infrastructure code.")
@@ -2888,7 +2888,7 @@ extensions.")
      #~(modify-phases %standard-phases
          ;; tests: 393 runs, 42523 assertions, 0 failures, 0 errors, 20 skips
          ;;
-          ;; TODO: Impliment #:test-flags in ruby-build-system and figure out
+          ;; TODO: Implement #:test-flags in ruby-build-system and figure out
          ;; how to skip tests more elegant.
          (add-after 'unpack 'skip-failing-tests
            (lambda _
@@ -9477,7 +9477,7 @@ variable length integers (varint) in Ruby Protocol Buffers.")
    (native-inputs (list ruby-rspec ruby-rspec-block-is-expected))
    (synopsis "Improved @code{Version} module for Ruby")
    (description "VersionGem aims to provide introspection of a @code{Version}
-module based on a @code{Version::VERSION} constant string wile not interfering
+module based on a @code{Version::VERSION} constant string while not interfering
 with gemspec parsing where the @code{VERSION} string is traditionally used.")
    (home-page "https://gitlab.com/oauth-xx/version_gem")
    (license license:expat)))
@@ -11902,7 +11902,7 @@ part of the Prawn PDF generator.")
                ;; zombie process reaping (see:
                ;; https://issues.guix.gnu.org/30948).
                ;; Many of these tests seem to only fail on the 'cli' portion
-                ;; due to something causing them to hang indefinately
+                ;; due to something causing them to hang indefinitely
                (skip-tests "test/test_plugin.rb"
                            "test_plugin")
                (skip-tests "test/test_plugin_systemd.rb"
@@ -1399,7 +1399,7 @@ defaults for 80% of the use cases.")
 (define-public forgejo-cli
  (package
    (name "forgejo-cli")
-    (version "0.4.1")
+    (version "0.5.0")
    (source
     (origin
       (method git-fetch)
@@ -1408,7 +1408,7 @@ defaults for 80% of the use cases.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1279cvdbgvl8yaqrxm8mg1swqn623xdfqjx13s9clrxp923zjrmm"))))
+        (base32 "1x3v56my22lckrpkcnpmf90vrn8m45ysdn0k12dfssldr8cjxapa"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -2863,7 +2863,7 @@ touchscreen devices.")
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'set-cc
-              ;; Tests assume `cc' is avaliable in PATH, but Guix does not
+              ;; Tests assume `cc' is available in PATH, but Guix does not
              ;; provide that with the `gcc' or `clang' packages.
              (lambda _
                (substitute* '("tests/integration/build_description_tests.rs"
@@ -132,7 +132,7 @@
       (replace "rustc-bootstrap" base-rust)
       (replace "cargo-bootstrap" (list base-rust "cargo"))))))

-;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
+;;; Note: mrustc's only purpose is to be able to bootstrap Rust; it's designed
 ;;; to be used in source form.
 (define %mrustc-commit "06b87d1af49d2db3bd850fdee8888055dd540dd1")
 (define %mrustc-source
@@ -1273,7 +1273,8 @@ contactless (RFID) and contact USB chipcard readers.")
       (sha256
        (base32 "1by4jnr3sx4s8sxv1iw8ja9iln3aw6k583kdl3r92cbcdfasm7xj"))
       (patches (search-patches "qdigidoc-bundle-config-files.patch"
-                                "qdigidoc-bundle-tsl-files.patch"))))
+                                "qdigidoc-bundle-tsl-files.patch"
+                                "qdigidoc-fix-icon.patch"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -511,14 +511,14 @@ POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and
 (define-public starship
  (package
    (name "starship")
-    (version "1.24.2")
+    (version "1.25.0")
    (source
     (origin
       (method url-fetch)
       (uri (crate-uri "starship" version))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-        (base32 "0q57nb66fww6c8kwfyl5dpv9c2gr721nbbqcpsrh9c6wd6c26339"))))
+        (base32 "0l0104a7f0ad636fzhybssjl76c5axkx241qq0f7f051kg34l5nj"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -573,22 +573,14 @@ POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and
           '())
       (list git-minimal)))
    (home-page "https://starship.rs")
-    (synopsis
-     "The minimal, blazing-fast, and infinitely customizable prompt for any shell!")
+    (synopsis "Fast and customizable shell prompt")
    (description
-     "This package provides The minimal, blazing-fast, and infinitely customizable
-prompt for any shell!
+     "Starship is a shell prompt that is fast and configurable, and works on
+most common shells. It shows information from various sources in a way easy to
+grasp at a glance, including but not limited to: the hostname/username/cwd trio,
+git, project language and runtime.

-@itemize
-@item Fast: it's fast - *really really* fast :rocket:
-@item Customizable: configure every aspect of your prompt
-@item Universal: works on any shell, on any operating system
-@item Intelligent: shows relevant information at a glance
-@item Feature rich: support for all your favorite tools
-@item Easy: quick to install - start using it in minutes
-@end itemize
-
-Note: users must have a nerd font installed and enabled in their terminal")
+Note: Users must have a nerd font installed and enabled in their terminal.")
    (license license:isc)))

 (define-public envstore
@@ -19,7 +19,7 @@
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2023 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2024-2026 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2024, 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr>
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
@@ -237,7 +237,7 @@ a server that supports the SSH-2 protocol.")
 (define-public openssh
  (package
   (name "openssh")
-   (version "10.3p1")
+   (version "10.2p1")
   (source
    (origin
      (method url-fetch)
@@ -245,7 +245,7 @@ a server that supports the SSH-2 protocol.")
                          "openssh-" version ".tar.gz"))
      (patches (search-patches "openssh-trust-guix-store-directory.patch"))
      (sha256
-       (base32 "1x25iv8yfcfpf3b1ap72indbfna0wz48xz8ny2sg9p4jpcv2ls2n"))))
+       (base32 "1clqyxh6mrbwjg964df0hjwmd361mxnx3nx17wk5jyck3422ri6c"))))
   (build-system gnu-build-system)
   (arguments
    (list
@@ -536,7 +536,7 @@ applications.")
 (define-public garage
  (package
    (name "garage")
-    (version "2.2.0")
+    (version "2.3.0")
    (source
     (origin
       (method git-fetch)
@@ -545,7 +545,7 @@ applications.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0nqda782by02ybqv44lpjagn3aqsgpaszvqbicg9iz3lymj8g9ai"))
+        (base32 "12zigcvnv662lk31gh30hg37ljnclkgmrfxaivivyp50a5lxr88a"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (delete-file-recursively "doc")))))
@@ -566,6 +566,10 @@ applications.")
                        "syslog"
                        "telemetry-otlp")
      #:install-source? #f
+      #:modules
+      '((guix build cargo-build-system)
+        (guix build utils)
+        (ice-9 match))
      #:phases
      #~(modify-phases %standard-phases
           ;; The 'check phase doesn't honor #:features
@@ -592,10 +596,31 @@ applications.")
                           "--features" (string-join features)))
                 (if (null? cargo-install-paths)
                     '(".")
-                     cargo-install-paths)))))))
-    (native-inputs (list nss-certs-for-test
-                         pkg-config
-                         protobuf))
+                     cargo-install-paths))))
+           (add-after 'install 'install-completions
+             (lambda* (#:key native-inputs #:allow-other-keys)
+               (for-each
+                (match-lambda
+                  ((shell . path)
+                   (mkdir-p (in-vicinity #$output (dirname path)))
+                   (let ((binary
+                          (if #$(%current-target-system)
+                              (search-input-file native-inputs "bin/garage")
+                              (in-vicinity #$output "bin/garage"))))
+                     (with-output-to-file (in-vicinity #$output path)
+                       (lambda _
+                         (invoke binary "completions" shell))))))
+                '(("bash"   . "share/bash-completion/completions/garage")
+                  ("elvish" . "share/elvish/lib/garage")
+                  ("fish"   . "share/fish/vendor_completions.d/garage.fish")
+                  ("zsh"    . "share/zsh/site-functions/_garage"))))))))
+    (native-inputs
+     (append (if (%current-target-system)
+                 (list this-package)
+                 '())
+             (list nss-certs-for-test
+                   pkg-config
+                   protobuf)))
    (inputs
     (cons* libsodium
            lmdb
@@ -822,7 +822,7 @@ your calls and messages.")
              (substitute* "self-test.mak"
                ;; Fails with: pjlib-util-test-x86_64-unknown-linux-gnu:
                ;; ../src/pjlib-util-test/resolver_test.c:1501: action2_1:
-                ;; Assertio n `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
+                ;; Assertion `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
                ;; "domain2.com")==0' failed.
                ((" pjlib_util_test ") ""))
              (substitute* "pjsip/src/test/test.h"
@@ -405,6 +405,69 @@ multi-seat support, a replacement for @command{mingetty}, and more.")
    (supported-systems (filter (cut string-suffix? "-linux" <>)
                               %supported-systems))))

+;;; INFO: kmscon-8 is a dependency of Guix System installer. When upgrading,
+;;; remember to test it; you can fire a VM by following the procedure below:
+;;;
+;;; 1. Manually change `(gnu system install)' module so that in procedure
+;;;    `%installation-services' the key `guix-for-system' refers to `guix'
+;;;    instead of `(current-guix)'.
+;;;    With this temporary change, you will need neither to rebuild guix
+;;;    nor to have commit rights.
+;;;
+;;; 2. Execute `./pre-inst-env guix system vm gnu/system/install.scm' in the
+;;;    development environment.
+;;;
+(define-public kmscon-8
+  (let ((commit "db868619fbb785f184f38c729cd4842012ef4478")
+        (revision "2"))
+    (package
+      (inherit kmscon)
+      (name "kmscon")
+      (version (git-version "8" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/kmscon/kmscon")
+                (commit commit)))
+         (sha256
+          (base32
+           "0rj3icrfm584pq3916div0chd9h3gxwd1qgw7inf5x508yvgrgxl"))
+         (file-name (git-file-name name version))
+         (patches
+          ;; INFO: This Guix-specific patch is useful for making keyboard
+          ;; selection in Guix System installer work as intended.
+          ;; TODO: port it to 9.x series.
+          (search-patches "kmscon-8-runtime-keymap-switch.patch"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'configure 'remove-systemd
+              ;; Use elogind instead of systemd.
+              (lambda _
+                (substitute* "configure"
+                  (("libsystemd-daemon libsystemd-login")
+                   "libelogind"))
+                (substitute* "src/uterm_systemd.c"
+                  (("#include <systemd/sd-login.h>")
+                   "#include <elogind/sd-login.h>")
+                  ;; We don't have this header.
+                  (("#include <systemd/sd-daemon\\.h>")
+                   "")
+                  ;; Replace the call to 'sd_booted' by the truth value.
+                  (("sd_booted\\(\\)")
+                   "1")))))))
+      (native-inputs
+       (list autoconf
+             automake
+             libtool
+             pkg-config
+             ;; to generate the man page
+             docbook-xsl
+             libxslt)))))
+
 (define-public libtermkey
  (package
    (name "libtermkey")
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
 ;;; Copyright © 2015-2022, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
@@ -42,6 +43,7 @@
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 benjamin wil <hey@benjaminwil.info>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Ignatius Menzies <ignatius.menzies@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -92,6 +94,7 @@
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages dbm)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages enchant)
  #:use-module (gnu packages fontutils)
@@ -987,6 +990,90 @@ justifying, auto-indentation, bracket matching, interactive search-and-replace
 (with regular expressions), and the editing of multiple files.")
    (license license:gpl3+))) ; some files are under GPLv2+

+(define-public nvi
+  (package
+    (name "nvi")
+    (version "1.81.6")
+    (source
+     (origin
+       (method url-fetch)
+       ;; The home-page does not provide the latest version.
+       (uri (string-append "http://harrier.slackbuilds.org/misc/nvi-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
+       (patches (search-patches "nvi-assume-preserve-path.patch"
+                                "nvi-dbpagesize-binpower.patch"
+                                "nvi-add-function-prototypes.patch"
+                                "nvi-db4.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Create a wrapper for the configure script, make it executable.
+        #~(let ((conf-wrap (open-output-file "configure")))
+            (display "#!/bin/sh" conf-wrap)
+            (newline conf-wrap)
+            (display
+              "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
+              conf-wrap)
+            (newline conf-wrap)
+            (close-output-port conf-wrap)
+            (chmod "configure" #o0755)
+
+            ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
+            ;; to the internal PTY allocation logic.
+            (substitute* "ex/ex_script.c"
+              (("#ifdef HAVE_SYS5_PTY")
+               "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:out-of-source? #t
+      #:configure-flags
+      #~'("--enable-widechar"
+          #$@(if (%current-target-system)
+                 '("vi_cv_sprintf_count=yes")
+                 '()))
+      #:make-flags
+      #~(list
+         ;; Add CFLAGS to relax gcc-14's strictness.
+         ;; nvi's configure chokes on passing CFLAGS and ignores
+         ;; CFLAGS set in the environment.
+         (string-append "CFLAGS=-g -O2"
+                        " -Wno-error=incompatible-pointer-types"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-configure
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              ;; Replace outdated config.sub and config.guess:
+              (with-directory-excursion "dist"
+                (for-each
+                 (lambda (file)
+                   (chmod file #o755)
+                   (install-file
+                    (format #f "~a/share/automake-~a/~a"
+                            (assoc-ref (or native-inputs inputs)
+                                       "automake")
+                            #$(version-major+minor
+                               (package-version automake))
+                            file)
+                    "."))
+                 '("config.sub" "config.guess"))))))))
+    (inputs (list bdb ncurses))
+    (native-inputs
+     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
+    (synopsis "The Berkeley Vi Editor")
+    (description
+     "Vi is the original screen based text editor for Unix systems.  It
+is considered the standard text editor, and is available on almost all
+Unix systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of
+the original BSD vi editor.  As such, it doesn't have a lot of snazzy
+features as do some of the other vi clones such as elvis and vim.
+However, if all you want is vi, this is the one to get.")
+    (home-page
+     (string-append "https://sites.google.com/a/bostic.com/keithbostic/"
+                    "the-berkeley-vi-editor-home-page"))
+    (license license:bsd-3)))
+
 (define-public qemacs
  (package
    (name "qemacs")
@@ -105,7 +105,7 @@ counts forward or for just showing the current time.")
 (define-public time
  (package
    (name "time")
-    (version "1.9")
+    (version "1.10")
    (source
     (origin
       (method url-fetch)
@@ -113,7 +113,7 @@ counts forward or for just showing the current time.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"))))
+         "1hq9vvam1bi8xz9d09xgj2fdxbmq1psii1hywiw897armfs9zhp8"))))
    (build-system gnu-build-system)
    (home-page "https://www.gnu.org/software/time/")
    (synopsis "Run a command, then display its resource usage")
@@ -562,7 +562,7 @@ time, a duration, a timezone, but not a range or interval.")
    (arguments
     (list
      ;; tests: 106 passed, 1 deselected
-      ;; 
+      ;;
      ;; TODO: Guix has lower python-pytz than required in the latest
      ;; version:  pytz.exceptions.UnknownTimeZoneError:
      ;; 'America/Ciudad_Juarez'
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012-2017, 2019-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2013, 2015, 2026 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
@@ -98,7 +98,7 @@
 (define-public libtasn1
  (package
    (name "libtasn1")
-    (version "4.21.0")
+    (version "4.20.0")
    (source
     (origin
      (method url-fetch)
@@ -106,7 +106,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "11ywcy8n115c8b3vmf7hmgkdhlfy4phlcwvp8114di9w495492hx"))))
+        "0v57hwsv4wijb0fvfp6s9jx35izhhgfjssq3fvpaxm029jyy7q4j"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--disable-static")))
@@ -430,7 +430,7 @@ OpenSSL for TARGET."
 (define-public openssl-1.1
  (package
    (name "openssl")
-    (version "1.1.1w")
+    (version "1.1.1u")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -443,7 +443,7 @@ OpenSSL for TARGET."
              (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
              (sha256
               (base32
-                "1j3anw4554lk3m9cvjngvh1c2gbdkhgiz160jnnm7n5l1jarhc6g"))))
+                "1ipbcdlqyxbj5lagasrq2p6gn0036wq6hqp7gdnd1v1ya95xiy72"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"        ;6.8 MiB of man3 pages and full HTML documentation
@@ -452,11 +452,14 @@ OpenSSL for TARGET."
    (arguments
     (list
      #:make-flags
-      (if (or (target-arm?) (target-riscv64?))
-          ;; 'test_afalg' seems to be dependent on kernel features:
-          ;; <https://github.com/openssl/openssl/issues/12242>.
-           #~(list "TESTS=-test_afalg")
-           #~(list))
+      ;; 'test_ssl_new.t' in 1.1.1n and 3.0.3 fails due to an expired
+      ;; certificate: <https://github.com/openssl/openssl/issues/18441>.  Skip
+      ;; it.
+      #~(list #$@(if (or (target-arm?) (target-riscv64?))
+                     ;; 'test_afalg' seems to be dependent on kernel features:
+                     ;; <https://github.com/openssl/openssl/issues/12242>.
+                     #~("TESTS=-test_afalg -tls_ssl_new")
+                     #~("TESTS=-test_ssl_new")))
      #:test-target "test"
      ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
      ;; so we explicitly disallow it here.
@@ -547,11 +550,10 @@ OpenSSL for TARGET."
    (license license:openssl)
    (home-page "https://www.openssl.org/")))

-(define-public openssl-3.5
-  ;; LTS series with EOL 2030-04-08
+(define-public openssl-3.0
  (package
-    (name "openssl")
-    (version "3.5.5")
+    (inherit openssl-1.1)
+    (version "3.0.8")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -564,136 +566,38 @@ OpenSSL for TARGET."
              (patches (search-patches "openssl-3.0-c-rehash-in.patch"))
              (sha256
               (base32
-                "129aphl9yy5xd67cwacf000llkhpi1s8phmlhgws2rcb599r335j"))))
-    (build-system gnu-build-system)
-    (outputs '("out"
-               "doc"
-               "static"))
+                "0gjb7qjl2jnzs1liz3rrccrddxbk6q3lg8z27jn1xwzx72zx44vc"))))
    (arguments
-     (list
-      #:parallel-tests? #f
-      #:make-flags
-      (if (or (target-arm?) (target-riscv64?))
-          ;; 'test_afalg' seems to be dependent on kernel features:
-          ;; <https://github.com/openssl/openssl/issues/12242>.
-           #~(list "TESTS=-test_afalg")
-           #~(list))
-      #:test-target "test"
-      #:configure-flags
-        (if (system-hurd?)
-            (if (target-hurd64?)
-                #~(list "hurd-x86_64")
-                #~(list "hurd-x86"))
-            #~(list))
-      ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
-      ;; so we explicitly disallow it here.
-      #:disallowed-references (list (this-package-native-input "perl"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda* (#:key configure-flags native-inputs inputs target #:allow-other-keys)
-              ;; It's not a shebang so patch-source-shebangs misses it.
-              (substitute* "config"
-                (("/usr/bin/env")
-                 (which "env")))
-              #$@(if (%current-target-system)
-                     #~((setenv "CROSS_COMPILE" (string-append target "-"))
-                        (setenv "CONFIGURE_TARGET_ARCH"
-                                #$(target->openssl-target
-                                   this-package
-                                   (%current-target-system))))
-                     #~())
-              ;; Configure PERL.
-              (setenv "HASHBANGPERL"
-                      (search-input-file (or native-inputs inputs)
-                                         "/bin/perl"))
-              (apply
-               invoke #$@(if (%current-target-system)
-                             #~("./Configure")
-                             #~("./config"))
-               "shared"                 ;build shared libraries
-               "--libdir=lib"
-
-               ;; The default for this catch-all directory is
-               ;; PREFIX/ssl.  Change that to something more
-               ;; conventional.
-               (string-append "--openssldir=" #$output
-                              "/share/openssl-"
-                              #$(package-version this-package))
-
-               (string-append "--prefix=" #$output)
-               (string-append "-Wl,-rpath," (string-append #$output "/lib"))
-               #$@(if (%current-target-system)
-                      #~((getenv "CONFIGURE_TARGET_ARCH"))
-                      #~())
-               configure-flags)
-              ;; Output the configure variables.
-              (invoke "perl" "configdata.pm" "--dump")))
-          (add-after 'install 'move-static-libraries
-            (lambda _
-              ;; Move static libraries to the "static" output.
-              (let* ((lib    (string-append #$output "/lib"))
-                     (slib   (string-append #$output:static "/lib")))
-                (for-each (lambda (file)
-                            (install-file file slib)
-                            (delete-file file))
-                          (find-files
-                           lib
-                           #$(if (target-mingw?)
-                                 '(lambda (filename _)
-                                    (and (string-suffix? ".a" filename)
-                                         (not (string-suffix? ".dll.a"
-                                                              filename))))
-                                 "\\.a$"))))))
-          (add-after 'install 'move-extra-documentation
-            (lambda _
-              ;; Move man pages and full HTML documentation to "doc".
-              (let* ((man    (string-append #$output "/share/man"))
-                     (html   (string-append #$output "/share/doc/openssl"))
-                     (man-target (string-append #$output:doc "/share/man"))
-                     (html-target (string-append
-                                   #$output:doc "/share/doc/openssl")))
-                (mkdir-p (dirname man-target))
-                (mkdir-p (dirname html-target))
-                (rename-file man man-target)
-                (rename-file html html-target))))
-          (add-after 'install 'remove-miscellany
-            (lambda _
-              ;; The 'misc' directory contains random undocumented shell and
-              ;; Perl scripts.  Remove them to avoid retaining a reference on
-              ;; Perl.
-              (delete-file-recursively
-               (string-append #$output "/share/openssl-"
-                              #$(package-version this-package) "/misc")))))))
-    (native-inputs (list perl))
-    (native-search-paths
-     (list $SSL_CERT_DIR $SSL_CERT_FILE))
-    (home-page "https://www.openssl.org/")
-    (synopsis "SSL/TLS implementation")
-    (description "OpenSSL is an implementation of SSL/TLS.")
+     (substitute-keyword-arguments (package-arguments openssl-1.1)
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            (add-before 'configure 'configure-perl
+              (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                (setenv "HASHBANGPERL"
+                        (search-input-file (or native-inputs inputs)
+                                           "/bin/perl"))))
+            #$@(if (target-hurd?)
+                   #~((delete 'patch-configure))
+                   #~())
+            #$@(if (target-hurd64?)
+                   #~((add-after 'unpack 'apply-hurd-patch
+                        (lambda _
+                          (let ((patch-file
+                                 #$(local-file
+                                    (search-patch "openssl-hurd64.patch"))))
+                            (invoke "patch" "--force" "-p1" "-i"
+                                    patch-file)))))
+                   #~())))
+       ((#:configure-flags flags #~'())
+        (if (system-hurd?)              ;must not be used when
+            #~(append #$flags           ;cross-compiling!
+                      #$(if (target-hurd64?)
+                            #~'("hurd-x86_64")
+                            #~'("hurd-x86")))
+            flags))))
    (license license:asl2.0)))

-(define-public openssl-3.0
-  ;; LTS series with EOL 2026-09-07
-  (package
-    (inherit openssl-3.5)
-    (version "3.0.19")
-    (source (origin
-              (method url-fetch)
-              (uri (list (string-append "https://www.openssl.org/source/openssl-"
-                                        version ".tar.gz")
-                         (string-append "ftp://ftp.openssl.org/source/"
-                                        "openssl-" version ".tar.gz")
-                         (string-append "ftp://ftp.openssl.org/source/old/"
-                                        (string-trim-right version char-set:letter)
-                                        "/openssl-" version ".tar.gz")))
-              (patches (search-patches "openssl-3.0-c-rehash-in.patch"
-                                       "openssl-hurd64.patch"))
-              (sha256
-               (base32
-                "0wihnr5bjdc3v0r4viwb1d1lf1rfkbrcmwzj7vjqpqdap11l2nps"))))))
-
-(define-public openssl openssl-3.5)
+(define-public openssl openssl-3.0)

 (define-public bearssl
  (package
@@ -917,7 +821,7 @@ certificates for free.")
                "0pfrpi77964cg15dm6y0w03l64xs0k2nqc15qh2xmv8vdnjyhywx"))
              (patches (search-patches "perl-net-ssleay-colon-parsing.patch"))))
    (build-system perl-build-system)
-    (inputs (list openssl-3.0))
+    (inputs (list openssl))
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -93,7 +93,7 @@
 (define-public vim
  (package
    (name "vim")
-    (version "9.2.0232")
+    (version "9.2.0333")
    (source
     (origin
       (method git-fetch)
@@ -102,7 +102,7 @@
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0z5b77qq5rmddf42f8sqd4sbf81y1r8d9i9f0naczb9bz762wx0r"))))
+        (base32 "15qmligkgrzsp8c88i8cmji6vjvq5wmf3hjw2g8lz7dh9i901xdx"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -169,6 +169,7 @@
                             "sh_15.sh"
                             "sh_bash.bash"
                             "sh_bash_alias.sh"
+                             "sh_functions_bash.sh"
                             "sh_sundrous.bash")))))
           (add-before 'install 'fix-installman.sh
             (lambda _
@@ -4535,7 +4535,7 @@ read and write, and compatible with JSON.")
 (define-public labwc
  (package
    (name "labwc")
-    (version "0.9.6")
+    (version "0.9.7")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -4544,7 +4544,7 @@ read and write, and compatible with JSON.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0v8gv539jl8qnzjh9d91gpk03gn1xkc8i8xl33gs9k2x46fx1jyy"))))
+                "12mm4w9djgh7q30lswhl1q1cxf6h0pf8xr744jkcyjcqqsavynpf"))))
    (build-system meson-build-system)
    (native-inputs
     (list pkg-config gettext-minimal scdoc))
@@ -76,6 +76,7 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Untrusem <mysticmoksh@riseup.net>
 ;;; Copyright © 2026 VnPower <vnpower@loang.net>
+;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3199,7 +3200,7 @@ introspection files (Python, Vala, etc, see using the library below).")
 (define-public wl-color-picker
  (package
    (name "wl-color-picker")
-    (version "1.3")
+    (version "1.4")
    (home-page "https://github.com/jgmdev/wl-color-picker")
    (source (origin
              (method git-fetch)
@@ -3209,7 +3210,7 @@ introspection files (Python, Vala, etc, see using the library below).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0h5b8qfwri7a1invk8dran3436ac37x6r8fic3l5cxqj5rgnky4n"))))
+                "0z0pmfk99zicny9308zf4b4aygrb6r6c6zc8296l080zjhxiwkmv"))))
    (build-system copy-build-system)
    (arguments
     `(#:install-plan '(("wl-color-picker.sh" "bin/wl-color-picker")
@@ -3218,17 +3219,25 @@ introspection files (Python, Vala, etc, see using the library below).")
                         "share/icons/hicolor/scalable/apps/")
                        ("wl-color-picker.desktop" "share/applications/"))
       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'wrap-script
+                  (add-after 'install 'wrap-program
                    (lambda* (#:key outputs #:allow-other-keys)
                      (wrap-program (string-append (assoc-ref outputs "out")
                                                   "/bin/wl-color-picker")
                                    `("PATH" =
-                                      (,(getenv "PATH")))))))))
-    (inputs (list coreutils-minimal
-                  bash-minimal
+                                      (,(dirname (which "convert"))
+                                       ,(dirname (which "cut"))
+                                       ,(dirname (which "grep"))
+                                       ,(dirname (which "grim"))
+                                       ,(dirname (which "notify-send"))
+                                       ,(dirname (which "slurp"))
+                                       ,(dirname (which "wl-copy"))
+                                       ,(dirname (which "zenity"))))))))))
+    (inputs (list bash-minimal
+                  coreutils-minimal
                  grim
                  hicolor-icon-theme
                  imagemagick
+                  libnotify
                  slurp
                  wl-clipboard
                  zenity))
@@ -303,9 +303,6 @@
                      (guix-build-coordinator build-allocator)
                      (guix-build-coordinator coordinator))

-         (setvbuf (current-output-port) 'line)
-         (setvbuf (current-error-port) 'line)
-
         (simple-format #t "starting the guix-build-coordinator:\n  ~A\n"
                        (current-filename))
         (let* ((hooks
@@ -1142,9 +1139,6 @@ ca-certificates.crt file in the system profile."
           (use-modules (bffe)
                        (bffe manage-builds))

-           (setvbuf (current-output-port) 'line)
-           (setvbuf (current-error-port) 'line)
-
           (simple-format #t "starting the bffe:\n  ~A\n"
                          (current-filename))

@@ -62,7 +62,6 @@
  #:use-module (gnu packages less)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages man)
-  #:use-module (gnu packages nvi)
  #:use-module (gnu packages package-management)
  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages texinfo)
@@ -63,6 +63,7 @@
  #:use-module (gnu packages guile)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages package-management)
+  #:use-module (gnu packages terminals)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages xorg)
  #:use-module (ice-9 match)
@@ -464,6 +465,7 @@ or by starting the installer, using `guix-system-installer` command.

         (service kmscon-service-type
                  (kmscon-configuration
+                    (kmscon kmscon-8)
                    (virtual-terminal "tty1")
                    (login-program installer)))

@@ -29,7 +29,7 @@

 (define %vcs-directories
  ;; Directory used for determining the kind of VCS.
-  (list ".bzr" ".git" ".hg" ".svn" "CVS"))
+  (list ".bzr" ".git" ".hg" ".jj" ".svn" "CVS"))

 (define* (vcs-file? file stat
                    #:optional
@@ -347,7 +347,7 @@ test "`guix build superseded -d`" = "`guix build bar -d`"

 # Parsing package names and versions.
 guix build -n time		# PASS
-guix build -n time@1.9		# PASS, version found
+guix build -n time@1.10	# PASS, version found
 guix build -n time@3.2 && false	# FAIL, version not found
 guix build -n something-that-will-never-exist && false	# FAIL