gnu: python-geventhttpclient: Update to 2.3.9.

* gnu/packages/python-web.scm (python-geventhttpclient): Update to 2.3.9. Change-Id: I83ff865b8ae052d24f9920b3d5c029e7c91373cc
gnu: openssl: Switch to openssl-3.5 as the default.
2026-07-11 01:24:05 +02:00 · 2026-04-16 11:37:55 +02:00 · 2026-04-16 11:37:55 +02:00 · 2026-04-16 11:37:55 +02:00 · 2026-04-16 11:37:54 +02:00 · 2026-04-16 11:37:54 +02:00
68 changed files with 2226 additions and 3196 deletions
@@ -53508,9 +53508,6 @@ 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,10 +81,7 @@ 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}.")
-  (shepherd-requirement
-   (list-of-symbols '())
-   "List of services that should be started before this service."))
+   "Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))

 (define (home-gpg-agent-configuration-file config)
  "Return the @file{gpg-agent.conf} file for @var{config}."
@@ -107,7 +104,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? shepherd-requirement)
+    (gnupg ssh-support?)
    ;; '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").
@@ -122,21 +119,15 @@ 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
-                  #~(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)))
+                 (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"))))
                 (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-8-runtime-keymap-switch.patch	\
+  %D%/packages/patches/kmscon-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,7 +2258,6 @@ 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)
-    (propagated-inputs (list python-requests python-argcomplete python-urllib3
+    (inputs (list python-requests python-argcomplete python-urllib3
                  python-looseversion gnupg))
    (native-inputs (list python-setuptools python-wheel python-requests-cache
                         python-defusedxml))
@@ -773,7 +773,8 @@ file system.")
     (list $SSL_CERT_FILE))
    (arguments
     (list
-      #:test-backend #~'unittest
+      #:test-flags
+      #~(list "-k" "test_*")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-tests
@@ -792,7 +793,11 @@ file system.")
            (lambda _
              (substitute* "sdkmanager.py"
                (("gpgv")
-                 (string-append #$(this-package-input "gnupg") "/bin/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)))))))
    (home-page "https://gitlab.com/fdroid/sdkmanager")
    (synopsis "Replacement for Android sdkmanager written in Python")
    (description
@@ -1177,16 +1182,14 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
  (package
    (name "fdroidserver")
-    (version "2.4.3")
+    (version "2.4.2")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/fdroid/fdroidserver")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "fdroidserver" version))
       (sha256
-        (base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
+        (base32
+         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -1197,17 +1200,22 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (propagated-inputs
-     (list python-platformdirs
-           python-androguard
+     (list 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
@@ -396,7 +396,6 @@ displays a histogram of the roundtrip time jitter.")
                                  "webrtc-audio-processing-x86-no-sse.patch"))))))
               #~%standard-phases)))
    (native-inputs (list pkg-config))
-    (propagated-inputs (list abseil-cpp))
    (inputs (list abseil-cpp))
    (synopsis "WebRTC's Audio Processing Library")
    (description "WebRTC-Audio-Processing library based on Google's
@@ -547,17 +546,15 @@ synth (like DX7) or FM chip.")
 (define-public libgme
  (package
    (name "libgme")
-    (version "0.6.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-         (url "https://github.com/libgme/game-music-emu")
-         (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "093pz3avnj6a230bqbwwzqlzcjxnxidfxipnn7zirwp3h396szff"))))
+    (version "0.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/"
+                                  "downloads/game-music-emu-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f                                ;no check target
@@ -566,7 +563,7 @@ synth (like DX7) or FM chip.")
       ;; header file names in libgme.so, meaning that libgme retains a
       ;; reference to GCC.  Disable UBSAN to avoid that.
       #:configure-flags '("-DENABLE_UBSAN=OFF")))
-    (home-page "https://github.com/libgme/game-music-emu/wiki")
+    (home-page "https://bitbucket.org/mpyne/game-music-emu")
    (synopsis "Video game music file playback library")
    (description
     "Game-music-emu is a collection of video game music file emulators that
@@ -276,18 +276,17 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
 (define-public libsodium
  (package
    (name "libsodium")
-    (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"))))
+    (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"))))
    (build-system gnu-build-system)
    (synopsis "Portable NaCl-based crypto library")
    (description
@@ -69,7 +69,6 @@
 ;;; 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.
 ;;;
@@ -3097,64 +3096,6 @@ 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,8 +77,6 @@
  #: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)
@@ -95,8 +93,6 @@
  #: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)
@@ -307,58 +303,6 @@ 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")
@@ -554,39 +498,6 @@ 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.1")
+    (version "10.0.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1077,7 +1077,7 @@ characterization result in a liberty library file.")
                    (commit version)))
              (sha256
               (base32
-                "1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
+                "1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -1185,9 +1185,7 @@ 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.  To use
-SQLite-backed database libraries, install the optional @code{sqliteodbc}
-package.")
+electrical diagrams), gerbview (viewing Gerber files) and others.")
    (license license:gpl3+)))

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

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

@@ -164,8 +164,7 @@ Mix.CLI.main()"
                       '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
                   programs))))))))
    (outputs '("out" "src"))
-    (inputs (list bash-minimal erlang rebar3))
-    (native-inputs (list git-minimal))
+    (inputs (list bash-minimal erlang rebar3 git))
    (native-search-paths
     (list (search-path-specification
            (variable "GUIX_ELIXIR_LIBS")
@@ -264,7 +264,6 @@
  #: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)
@@ -4329,39 +4328,25 @@ perform static analysis of Perl code.")
    (license license:gpl3+)))

 (define-public emacs-flymake-flycheck
-  (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
+  (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
 Flymake diagnostic backend.  The effect is that Flymake will control when the
 checker runs, and Flymake will receive its errors.")
-      (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)))))
+    (license license:gpl3+)))

 (define-public emacs-flymake-quickdef
  ;; This particular commit includes bug fixes on top of 1.0.0 release.
@@ -8493,36 +8478,23 @@ 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
-    (inherit emacs-keyfreq)
+    (name "emacs-keyfreq")
    (version "20160516.716")
-    (properties (list (cons 'superseded emacs-keyfreq)))))
+    (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+)))

 (define-public emacs-khalel
  (package
@@ -13834,28 +13806,6 @@ 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")
@@ -15280,39 +15230,25 @@ markdown features.")
    (license license:gpl3)))

 (define-public emacs-2048-game
-  ;; 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.
+  (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.
 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+))))
-
-(define-public emacs-2048-game-superseded-version
-  (package
-    (inherit emacs-2048-game)
-    (version "20151026.1233")
-    (properties (list (cons 'superseded emacs-2048-game)))))
+    (license license:gpl3+)))

 (define-public emacs-chess
  (package
@@ -16880,32 +16816,6 @@ 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"))
@@ -25792,52 +25702,6 @@ 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.
@@ -41420,7 +41284,7 @@ time.")
 (define-public emacs-mastodon
  (package
    (name "emacs-mastodon")
-    (version "2.0.16")
+    (version "2.0.12")
    (source
     (origin
       (method git-fetch)
@@ -41429,7 +41293,7 @@ time.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1z8qwnc01d9hx5m1xj3acpdzllfh4rxmypzcr3jl4ipp6dybzbx6"))))
+        (base32 "0q02v1vizzj1r35b7b6cw185jjibhc6izj9ih4sm6c83l9yb99yh"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -41542,17 +41406,7 @@ Lisp's (relatively new) EIEIO object oriented libraries.")
       (sha256
        (base32 "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l"))))
    (build-system emacs-build-system)
-    (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))
+    (arguments (list #:tests? #f))      ;depends on exemplify-ert
    (propagated-inputs (list emacs-fedi emacs-magit emacs-tp emacs-transient))
    (home-page "https://codeberg.org/martianh/fj.el")
    (synopsis "Client for Forgejo instances")
@@ -45245,57 +45099,6 @@ 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.1")
+    (version "1.1.0")
    (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 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
+        (base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
       (snippet
        #~(begin
            (use-modules (guix build utils))
@@ -148,11 +148,6 @@ 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,39 +5559,6 @@ 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,74 +1335,6 @@ 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,6 +10628,7 @@ playing media, scanning, and much more.")
           cheese
           decibels
           epiphany
+           evince
           file-roller
           gnome-calculator
           gnome-calendar
@@ -10647,7 +10648,6 @@ playing media, scanning, and much more.")
           localsearch
           loupe
           nautilus
-           papers
           simple-scan
           showtime
           xdg-desktop-portal-gnome
@@ -517,19 +517,22 @@ functions which were removed.")
                "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
    (build-system waf-build-system)
    (arguments
-     (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")))))))
+     `(#: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)))
    (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
@@ -1457,9 +1460,10 @@ exceptions, macros, and a dynamic programming environment.")
    (inherit guile-cairo)
    (name "guile2.2-cairo")
    (inputs
-     (modify-inputs inputs
-       (delete "guile" "guile-lib")
-       (append guile-2.2 guile2.2-lib)))))
+     `(("guile" ,guile-2.2)
+       ("guile-lib" ,guile2.2-lib)
+       ,@(fold alist-delete (package-inputs guile-cairo)
+               '("guile" "guile-lib"))))))

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

 (define-public guile-present
  (package
@@ -1644,7 +1649,9 @@ documents.")
    (name "guile2.2-present")
    (inputs (list guile-2.2))
    (propagated-inputs
-     (list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))
+     `(("guile-lib" ,guile2.2-lib)
+       ("guile-cairo" ,guile2.2-cairo)
+       ("guile-rsvg" ,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 "f767eca066495e6582e89ba1b91907c0c5657878")
-        (revision "34"))
+  (let ((commit "d79284b4715efc347b22d510c3e3134a0c584b17")
+        (revision "32"))
    (package
    (name "guile-knots")
-    (version (git-version "0.1" revision commit))
+    (version (git-version "0" 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
-                "18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
+                "0i87jc3dznw6pdib0yy49d8066c1jvwp2m01xi92amx45dkl8ixc"))
              (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -7938,16 +7938,14 @@ This module implements this interface by use of Guile's dynamic FFI.")
 (define-public guile-bstructs
  (package
    (name "guile-bstructs")
-    (version "0.2.0")
+    (version "0.1.0")
    (source
-       (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"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://files.dthompson.us/releases"
+                           "/guile-bstructs/guile-bstructs-" version ".tar.gz"))
+       (sha256
+        (base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
    (inputs (list guile-3.0))
@@ -37,7 +37,6 @@
  #: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)
@@ -190,17 +189,16 @@ 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
@@ -211,18 +209,10 @@ 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")))
-           (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)))))))))
+               (setenv "HOME" "/tmp"))))))
    (native-inputs (list extra-cmake-modules
                         pkg-config))
-    (inputs (list bash-minimal
-                  gst-plugins-good-qt
-                  gstreamer
+    (inputs (list gstreamer
                  icu4c
                  kcrash
                  kdsingleapplication
@@ -1853,9 +1853,6 @@ 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,7 +33,6 @@
  #: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))

@@ -96,7 +95,7 @@
                                                 "/html"))))))
      #:tests? #f))                     ; tests fail without access to USB
    (native-inputs
-     (list doxygen graphviz pkg-config python python-setuptools swig))
+     (list doxygen graphviz pkg-config python swig-4.0))
    (inputs
     (list boost libconfuse))
    (propagated-inputs
@@ -4266,16 +4266,15 @@ intercept and print the system calls executed by the program.")
 (define-public alsa-ucm-conf
  (package
    (name "alsa-ucm-conf")
-    (version "1.2.15.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-ucm-conf")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mlvzvz7npdvprlq1ff9pg3awsdvv3czv7wchfm96jflhks3pnsm"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.alsa-project.org/pub/lib/" name "-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "10dfzvrmpp9swflw47nxf35an6gj3ilb4wlggdnng8g2637h2z1q"))))
    (build-system copy-build-system)
    (arguments
     '(#:install-plan
@@ -4284,24 +4283,23 @@ intercept and print the system calls executed by the program.")
    (home-page "https://www.alsa-project.org/wiki/Main_Page")
    (synopsis "The Advanced Linux Sound Architecture Use Case Manager")
    (description
-     "This package contains @acronym{ALSA, Advanced Linux Sound Architecture}
-@acronym{UCM, Use Case Manager} configuration of audio input/output names and
-routing for specific audio hardware.")
+     "This package contains Advanced Linux Sound Architecture Use Case Manager
+configuration of audio input/output names and routing for specific audio
+hardware.")
    (license license:bsd-3)))

 (define-public alsa-topology-conf
  (package
    (name "alsa-topology-conf")
-    (version "1.2.5.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-topology-conf")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "150065nc5ksrxcay0ia0f8ad2s0gpp3xgn7gc5xsyf0k5dwdby49"))))
+    (version "1.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.alsa-project.org/pub/lib/" name "-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "01zdg6q4s6d01k39z96wi4vbhrfw1i2g4yi5dijwfk6a5vjfdq2m"))))
    (build-system copy-build-system)
    (arguments
     '(#:install-plan
@@ -4309,23 +4307,22 @@ routing for specific audio hardware.")
    (home-page "https://www.alsa-project.org/wiki/Main_Page")
    (synopsis "The Advanced Linux Sound Architecture libraries")
    (description
-     "This package contains @acronym{ALSA, Advanced Linux Sound Architecture}
-topology configuration files that can be used for specific audio hardware.")
+     "This package contains Advanced Linux Sound Architecture topology
+configuration files that can be used for specific audio hardware.")
    (license license:bsd-3)))

 (define-public alsa-lib
  (package
    (name "alsa-lib")
-    (version "1.2.15.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-lib")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "03h35rhyzks0m96zy94vipwbjbpp323bj7hhhh28qfs8jpbl3c7i"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.alsa-project.org/files/pub/lib/"
+                    name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0kdvjlknc50fwfdkxj0z12xbz21skb3gnwlh6lvsvycmp5ljygwz"))))
    (build-system gnu-build-system)
    (arguments
     '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
@@ -4357,24 +4354,22 @@ topology configuration files that can be used for specific audio hardware.")
    (home-page "https://www.alsa-project.org/wiki/Main_Page")
    (synopsis "The Advanced Linux Sound Architecture libraries")
    (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.")
    (license license:lgpl2.1+)))

 (define-public alsa-utils
  (package
    (name "alsa-utils")
-    (version "1.2.15.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-utils")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mlvzvz7npdvprlq1ff9pg3awsdvv3czv7wchfm96jflhks3pnsm"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.alsa-project.org/files/pub/utils/"
+                    name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "19r8qi6b7sd2p1mhxfqrp18wrgjw5s6rp5ygimb1w59zi0xcmils"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -4398,9 +4393,8 @@ Linux-based operating system.")
    (home-page "http://www.alsa-project.org/")
    (synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)")
    (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.")

    ;; This is mostly GPLv2+ but a few files such as 'alsactl.c' are
    ;; GPLv2-only.
@@ -4409,16 +4403,14 @@ Linux-based operating system.")
 (define-public alsa-plugins
  (package
    (name "alsa-plugins")
-    (version "1.2.12")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-plugins")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0izvzdvw3nj69l4a968p9d9xjxfxs7i3bdpj1r4cvm6b8w7j33z8"))))
+    (version "1.2.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
+                                 name "-" version ".tar.bz2"))
+             (sha256
+              (base32
+               "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"))))
    (build-system gnu-build-system)
    ;; TODO: Split libavcodec and speex if possible. It looks like they can not
    ;; be split, there are references to both in files.
@@ -4470,12 +4462,11 @@ Linux-based operating system.")
    (home-page "http://www.alsa-project.org/")
    (synopsis "Plugins for the Advanced Linux Sound Architecture (ALSA)")
    (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.  This package enhances @acronym{ALSA} by
-providing additional plugins which include: upmixing, downmixing, jackd and
-pulseaudio support for native alsa applications, format conversion (s16 to
-a52), and external rate conversion.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.  This package enhances ALSA
+by providing additional plugins which include: upmixing, downmixing, jackd and
+pulseaudio support for native alsa applications, format conversion (s16 to a52), and
+external rate conversion.")
    (license (list license:gpl2+
                   ;; `rate/rate_samplerate.c': LGPL v2.1 or later.
                   license:lgpl2.1+))))
@@ -57,7 +57,7 @@
 (define-public luanti
  (package
    (name "luanti")
-    (version "5.15.2")
+    (version "5.15.1")
    (source
     (origin
       (method git-fetch)
@@ -66,7 +66,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1mcbsgf549y2jg9qds95wwgd1699mkk4byv9ls4lpg43bd829dhk"))
+        (base32 "07g41ljv117pmw6402mqznccwl1hd9jp2l8wkb4l211cbm4c6vv9"))
       (modules '((guix build utils)
                  (srfi srfi-26)
                  (ice-9 ftw)))
@@ -3437,14 +3437,14 @@ notifications.")
 (define-public pounce
  (package
    (name "pounce")
-    (version "3.2")
+    (version "3.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
                           version ".tar.gz"))
       (sha256
-        (base32 "1i0s76mip9kfmi85bfk10p4k1kg5wkq1gm4l9gadnq9ssxnvzvjs"))
+        (base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))
       (patches (search-patches "pounce-readable-checks.patch"))))
    (outputs '("out" "debug"))
    (build-system gnu-build-system)
@@ -171,7 +171,6 @@
  #: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)
@@ -594,38 +593,6 @@ 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>.
@@ -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 converter")
+    (synopsis "Runtime library used by ocaml PPX yojson convertor")
    (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 requirement of PIP.
+                ;; Relax hard requirment of PIP.
                ((".*pip>=18.0.*") ""))))
          (add-before 'check 'pre-check
            (lambda _
@@ -32,7 +32,6 @@
 ;;; 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.
 ;;;
@@ -1499,7 +1498,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
-                    ;; environment, assertion failed; review if they may be
+                    ;; environemnt, assertion failed; review if they may be
                    ;; fixed.
                    ;;
                    ;; test_info_all: Fails due to parallel test interference.
@@ -2134,8 +2133,8 @@ environments.")
                  "153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq")))))))

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

 (define-public nar-herder
-  (let ((commit "44ca801e2352b64e19921c72177b35b2e49a7a09")
-        (revision "53"))
+  (let ((commit "cc1e9052785de0a08b05f85a7c7c400d95e339e7")
+        (revision "52"))
    (package
      (name "nar-herder")
      (version (git-version "0" revision commit))
@@ -2401,7 +2400,7 @@ in an isolated environment, in separate namespaces.")
                      (commit commit)))
                (sha256
                 (base32
-                  "15sc9rgna1fxsns1q9q1xlrqfqc4r5lcmmddw0af2lhll75kj7v2"))
+                  "0qsyvmxr5kkayvvda8f5lmamz098vcjrfgpbwd5519fcw8xbnk8q"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
      (arguments
@@ -2468,7 +2467,6 @@ 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
@@ -2483,8 +2481,7 @@ in an isolated environment, in separate namespaces.")
       (list bash-minimal
             guile-next))
      (propagated-inputs
-       (list guile-aws
-             guile-json-4
+       (list guile-json-4
             guile-gcrypt
             guix
             guile-fibers-next
@@ -2745,8 +2742,6 @@ 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 configurable charset.")
+per-position configureable charset.")
    (license (list license:expat))))

 (define-public fpm2
@@ -1,14 +0,0 @@
-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 latest release.
+  ;; Fails to build in lastest 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 that are going to use
+It will of course also be needed in classes thar 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"))

-              ;; Accommodate two extra openssl errors flanking the expected one:
+              ;; Accomodate 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 generated
+         ;; Configure requires these, but we do not use the genenerated
         ;; 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.38")
+    (version "2.92.30")
    (source
     (origin
       (method git-fetch)
@@ -246,7 +246,7 @@ it.")
          (url "https://github.com/trealla-prolog/trealla")
          (commit (string-append "v" version))))
       (sha256
-        (base32 "12nv54j7rgh784lszgynw50k9h3la8b0d2si2bskfvydmpyk45pm"))
+        (base32 "1vbjv2nf3c2npf349i9y0zknc2g0hizksv0yhgscdpwzvzfp6n9m"))
       (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
-         ;; Skip, as it requires
+         ;; Skipp, 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")
-              ;; Mimic extra/poetry/poetry_build.sh.
+              ;; Mimick 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 additional test
+              ;; It tries to download hatchling and install aditional 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 cycle.
+  ;; to update and drop python-six from closure in the next update cyle.
  (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 flakiness.")
+times and detect flakyness.")
    (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 requiring python-factory-boy, python-faker,
+              ;; Skip tests requireing 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 require extra packaging
+    (arguments (list #:tests? #f))       ;TODO: Tests requrie 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 fails with error: AssertionError: KeyboardInterrupt not raised.
+      ;; Test failes 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 implementers to provide a common,
+specification that encourages OpenPGP implementors 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
-       "This package implements a functionality for mean-preserving
+       "Thi 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 deterministic and fails with
+                                  ;; Test is not determenistic 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 required.
+                    ;; Network access is requied.
                    (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 possible
+                ;; See: <.github/workflows/linux.yml> for any other posible
                ;; 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 available in Python 3.10 but in
+          ;; "datetime.UTC" is not availalbe 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"
-              ;; Network access is required.
+              ;; Nework 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 group XFAIL or fail.
+                          ;; The most of the tests from this goup 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 bootstrapping.
+      ;; implement bootsrapping.
      #:tests? #f
      #:phases
      #~(modify-phases %standard-phases
@@ -5223,7 +5223,7 @@ objects.")
                             python-numba
                             python-numpy
                             python-scipy
-                             ;; [optional]
+                             ;; [optinal]
                             ;; 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 interfaces for DICOMweb RESTful
+     "@code{dicomweb_client} provides client intefaces 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
-recursively from Google Drive with option to filter them by file
+recursivly 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 archive
+       (method git-fetch)        ;no tests in PyPI archvie
       (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 incompatible with the more recent
+      ;; XXX: The last commit's tests are uncompatible 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 require Rust
+    (version "1.8.6") ; XXX: The latest version which does not requrie Rust
    (source
     (origin
       (method git-fetch)
@@ -4393,7 +4393,7 @@ storage.")
        (base32 "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))))
    (build-system pyproject-build-system)
    (arguments
-     '(#:tests? #f))    ;tests depend on dated pytest-expect
+     '(#:tests? #f))    ;tests depent 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 with twisted, use the latest commit from trunk branch.
+  ;; compatibility wit 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 archive
+       (method git-fetch)       ;no tests in PyPI archvie
       (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 associated with
+  ;; PyPI lacks a fresh release, use the latest commit assosiated 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 compatibility changes on
+  ;; 1.1.0 was released in 2019, there a lot of compatability 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 fails
+              (method git-fetch) ; PyPI missing test failes
              (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 functionality for document parameters, class
+     "This package implements a funtionality 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 palette for Python
+    (description "Catppuccin for Python is a soothing pastel pallete 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 helpful functions for Python's testing and
+     "This package provide helpfull 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 compatibility with Pytest and Python
+  ;; XXX: Use the latest commit containing compatability 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 existence of /bin/ping, but
+                      ;; test_no_new_privs assumes existance 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))        ;require dated inputs
+     (list #:tests? #f))        ;requir 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 requires additional modules for integration tests.
+     ;; It requres 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 failed and took near 30min to
-                ;; complete: 6765 tests, 6745 passed, 20 failed; find out how
+                ;; TODO: Some acceptance faile and took near 30min to
+                ;; complete: 6765 tests, 6745 passed, 20 failed; findout 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 crashes on Python 3.10.
+  ;; The latest release (0.2.0) is old and its test suite crashs 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 require network access to get FFmpeg data
+      #:tests? #f       ;XXX: tests requrie 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 integer modulo.
+in a non-succsessive, yet deterministic way based on interger 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      ;optional, tests fail when added
-           ;; python-wavedrom      ;optional, not packaged
-           ;; python-latex2mathml  ;optional, not packaged
+     (list ;; python-pygments      ;optinal, tests fail when added
+           ;; python-wavedrom      ;optinal, not packaged
+           ;; python-latex2mathml  ;optinal, 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 integrated
+           python-six))         ;still hard itegrated
    (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 incompatibility with pyparsing,
+                    ;; range.  It may be some incompatability wit 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 archive
+    (arguments (list #:tests? #f)) ;no tests in PyPI archvie
    (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 archive, there are in Git
+    (arguments (list #:tests? #f)) ;XXX: not tests in PyPI archvie, there are in Git
    (native-inputs
     (list python-setuptools
           python-wheel))
@@ -23055,21 +23055,16 @@ completes.")
 (define-public python-asyncinject
  (package
    (name "python-asyncinject")
-    (version "0.6.1")
+    (version "0.6")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/simonw/asyncinject")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "asyncinject" version))
       (sha256
-        (base32 "127ahb32x2qqjk17a667adrvrl63ima8khifq6dfm0q3vlfslxnn"))))
+        (base32 "0x57idiy19lzyn32klgm06r223z8gr2aqqk91gysbshq7jg8g3pf"))))
    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest
-           python-pytest-asyncio
-           python-setuptools))
+    (native-inputs (list python-pytest python-pytest-asyncio
+                         python-setuptools python-wheel))
    (home-page "https://github.com/simonw/asyncinject")
    (synopsis
     "Run async workflows using pytest-fixtures-style dependency injection")
@@ -23971,7 +23966,7 @@ protocols written in pure Python.")
      #~(list "-k" "not test__version__from_git__shallow")
      #:phases
      #~(modify-phases %standard-phases
-          ;; These steps are taken from NixOS package definition:
+          ;; These steps are taked from NixOS package definition:
          ;; nixpkgs/pkgs/development/python-modules/dunamai/default.nix
          (add-before 'check 'pre-check
            (lambda _
@@ -25553,7 +25548,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 remove when nothing depends on it.
+;; read-only.  Consider to remvoe when nothing depends on it.
 (define-public python-ratelimiter
  ;; From https://github.com/RazerM/ratelimiter/pull/11
  (let ((commit "59a0827c434706d62b89e16a220e4ae12e618858")
@@ -25718,7 +25713,7 @@ Git.")
        (base32 "1h3nbg1nlshzrqy7vz4q4g9wbz85dqkn6385p0ad7kjj48ww9avx"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;tests require Cargo
+     (list #:tests? #f))        ;tests rquire Cargo
    (propagated-inputs
     (list python-semantic-version
           python-setuptools))
@@ -27371,7 +27366,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 inflexible relationship.
+;; python-numba.  They have a very unflexible relationship.
 (define-public python-numba
  (package
    (name "python-numba")
@@ -27836,7 +27831,7 @@ values.  Partd excels at shuffling operations.")
      #:test-flags
      #~(list "--ignore=fsspec/implementations/tests/test_github.py"
              "-k" (string-join
-                    ;; Test requires nentwork access
+                    ;; Test requirs nentwork access
                    (list "not test_async_cat_file_ranges"
                          "test_gist_public_all_files"
                          "test_gist_public_missing_file"
@@ -32230,7 +32225,7 @@ syllables, and sentences.")
     (list python-chardet
           python-cssselect
           python-lxml
-           python-lxml-html-clean))    ;XXX: it should be part of python-lxml lib
+           python-lxml-html-clean))    ;XXX: it sould be part of python-lxml lib
    (home-page "http://github.com/buriy/python-readability")
    (synopsis "HTML to text parser")
    (description
@@ -33682,7 +33677,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 repetitive boilerplate code in Python classes.")
+      (description "Avoid repetetive boilerplate code in Python classes.")
      (license license:bsd-3))))

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

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

 (define-public python-timeout-decorator
-  ;; TODO: Remove when python-requests-caches releases a fresh version dropping
+  ;; TODO: Remove when python-requests-caches releses a fresh version dropping
  ;; it, see, <https://github.com/requests-cache/requests-cache/pull/1111>.
  (package
    (name "python-timeout-decorator")
@@ -39645,7 +39640,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 otherwise some tests fail
+  ;; zulip-term@0.7.0 requires exact 2.1.2 version otherewise some tests fail
  ;; to pass, remove when no longer required.
  (hidden-package
   (package
@@ -39979,7 +39974,7 @@ store, forked from redis-py.")
         "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"))))
    (build-system pyproject-build-system)
    (arguments
-     (list #:tests? #f))        ;no tests in PyPI archive
+     (list #:tests? #f))        ;no tests in PyPI archvie
    (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 keyboard layouts.
+              ;; Patch the location of the X11 keywoard 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
-    ;; against Qt6 to reduce closure size..
+    ;; agains 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 will elide text
+@item Label that willl 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
-;; convenience targets for developing Racket, and it cooperates with the
+;; convienience 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
-;;     version, although it can be the Racket BC implementation (instead of
+;;     verson, 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
-;; convenience.) As of Zuo 1.8, Zuo has tagged releases in its own repository
+;; convienience.) 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 output profile.
+         ;; the ouput 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, although it's clear from
+  ;; XXX: No tags for the last release, altough 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 hardware, with library support for in-process/in-memory
+on AMD harware, 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 nonexistent relative llvm/lib path.
+          ;; involving a nonexistant 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 build from Git
+      #:tests? #f       ;XXX: no tests in PyPI, try to bulid 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 software on your servers and can use any configuration management
+agent softwares 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: Implement #:test-flags in ruby-build-system and figure out
+          ;; TODO: Impliment #: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 while not interfering
+module based on a @code{Version::VERSION} constant string wile 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 indefinitely
+                ;; due to something causing them to hang indefinately
                (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.5.0")
+    (version "0.4.1")
    (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 "1x3v56my22lckrpkcnpmf90vrn8m45ysdn0k12dfssldr8cjxapa"))))
+        (base32 "1279cvdbgvl8yaqrxm8mg1swqn623xdfqjx13s9clrxp923zjrmm"))))
    (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 available in PATH, but Guix does not
+              ;; Tests assume `cc' is avaliable 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 bootstrap Rust; it's designed
+;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
 ;;; to be used in source form.
 (define %mrustc-commit "06b87d1af49d2db3bd850fdee8888055dd540dd1")
 (define %mrustc-source
@@ -1273,8 +1273,7 @@ contactless (RFID) and contact USB chipcard readers.")
       (sha256
        (base32 "1by4jnr3sx4s8sxv1iw8ja9iln3aw6k583kdl3r92cbcdfasm7xj"))
       (patches (search-patches "qdigidoc-bundle-config-files.patch"
-                                "qdigidoc-bundle-tsl-files.patch"
-                                "qdigidoc-fix-icon.patch"))))
+                                "qdigidoc-bundle-tsl-files.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.25.0")
+    (version "1.24.2")
    (source
     (origin
       (method url-fetch)
       (uri (crate-uri "starship" version))
       (file-name (string-append name "-" version ".tar.gz"))
       (sha256
-        (base32 "0l0104a7f0ad636fzhybssjl76c5axkx241qq0f7f051kg34l5nj"))))
+        (base32 "0q57nb66fww6c8kwfyl5dpv9c2gr721nbbqcpsrh9c6wd6c26339"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -573,14 +573,22 @@ POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and
           '())
       (list git-minimal)))
    (home-page "https://starship.rs")
-    (synopsis "Fast and customizable shell prompt")
+    (synopsis
+     "The minimal, blazing-fast, and infinitely customizable prompt for any shell!")
    (description
-     "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.
+     "This package provides The minimal, blazing-fast, and infinitely customizable
+prompt for any shell!

-Note: Users must have a nerd font installed and enabled in their terminal.")
+@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")
    (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, 2025 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024-2026 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.2p1")
+   (version "10.3p1")
   (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 "1clqyxh6mrbwjg964df0hjwmd361mxnx3nx17wk5jyck3422ri6c"))))
+       (base32 "1x25iv8yfcfpf3b1ap72indbfna0wz48xz8ny2sg9p4jpcv2ls2n"))))
   (build-system gnu-build-system)
   (arguments
    (list
@@ -536,7 +536,7 @@ applications.")
 (define-public garage
  (package
    (name "garage")
-    (version "2.3.0")
+    (version "2.2.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 "12zigcvnv662lk31gh30hg37ljnclkgmrfxaivivyp50a5lxr88a"))
+        (base32 "0nqda782by02ybqv44lpjagn3aqsgpaszvqbicg9iz3lymj8g9ai"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 (delete-file-recursively "doc")))))
@@ -566,10 +566,6 @@ 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
@@ -596,31 +592,10 @@ applications.")
                           "--features" (string-join features)))
                 (if (null? cargo-install-paths)
                     '(".")
-                     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)))
+                     cargo-install-paths)))))))
+    (native-inputs (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:
-                ;; Assertion `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
+                ;; Assertio n `pj_strcmp2(&pkt->q[0].name, "_sip._udp."
                ;; "domain2.com")==0' failed.
                ((" pjlib_util_test ") ""))
              (substitute* "pjsip/src/test/test.h"
@@ -405,69 +405,6 @@ 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")
@@ -105,7 +105,7 @@ counts forward or for just showing the current time.")
 (define-public time
  (package
    (name "time")
-    (version "1.10")
+    (version "1.9")
    (source
     (origin
       (method url-fetch)
@@ -113,7 +113,7 @@ counts forward or for just showing the current time.")
                           version ".tar.gz"))
       (sha256
        (base32
-         "1hq9vvam1bi8xz9d09xgj2fdxbmq1psii1hywiw897armfs9zhp8"))))
+         "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"))))
    (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 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2015, 2026 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.20.0")
+    (version "4.21.0")
    (source
     (origin
      (method url-fetch)
@@ -106,7 +106,7 @@
                          version ".tar.gz"))
      (sha256
       (base32
-        "0v57hwsv4wijb0fvfp6s9jx35izhhgfjssq3fvpaxm029jyy7q4j"))))
+        "11ywcy8n115c8b3vmf7hmgkdhlfy4phlcwvp8114di9w495492hx"))))
    (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.1u")
+    (version "1.1.1w")
    (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
-                "1ipbcdlqyxbj5lagasrq2p6gn0036wq6hqp7gdnd1v1ya95xiy72"))))
+                "1j3anw4554lk3m9cvjngvh1c2gbdkhgiz160jnnm7n5l1jarhc6g"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"        ;6.8 MiB of man3 pages and full HTML documentation
@@ -452,14 +452,11 @@ OpenSSL for TARGET."
    (arguments
     (list
      #:make-flags
-      ;; '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")))
+      (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"
      ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
      ;; so we explicitly disallow it here.
@@ -550,10 +547,11 @@ OpenSSL for TARGET."
    (license license:openssl)
    (home-page "https://www.openssl.org/")))

-(define-public openssl-3.0
+(define-public openssl-3.5
+  ;; LTS series with EOL 2030-04-08
  (package
-    (inherit openssl-1.1)
-    (version "3.0.8")
+    (name "openssl")
+    (version "3.5.5")
    (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -566,38 +564,136 @@ OpenSSL for TARGET."
              (patches (search-patches "openssl-3.0-c-rehash-in.patch"))
              (sha256
               (base32
-                "0gjb7qjl2jnzs1liz3rrccrddxbk6q3lg8z27jn1xwzx72zx44vc"))))
+                "129aphl9yy5xd67cwacf000llkhpi1s8phmlhgws2rcb599r335j"))))
+    (build-system gnu-build-system)
+    (outputs '("out"
+               "doc"
+               "static"))
    (arguments
-     (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))))
+     (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.")
    (license license:asl2.0)))

-(define-public openssl openssl-3.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 bearssl
  (package
@@ -821,7 +917,7 @@ certificates for free.")
                "0pfrpi77964cg15dm6y0w03l64xs0k2nqc15qh2xmv8vdnjyhywx"))
              (patches (search-patches "perl-net-ssleay-colon-parsing.patch"))))
    (build-system perl-build-system)
-    (inputs (list openssl))
+    (inputs (list openssl-3.0))
    (arguments
     `(#:phases
       (modify-phases %standard-phases
@@ -93,7 +93,7 @@
 (define-public vim
  (package
    (name "vim")
-    (version "9.2.0333")
+    (version "9.2.0232")
    (source
     (origin
       (method git-fetch)
@@ -102,7 +102,7 @@
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "15qmligkgrzsp8c88i8cmji6vjvq5wmf3hjw2g8lz7dh9i901xdx"))))
+        (base32 "0z5b77qq5rmddf42f8sqd4sbf81y1r8d9i9f0naczb9bz762wx0r"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -169,7 +169,6 @@
                             "sh_15.sh"
                             "sh_bash.bash"
                             "sh_bash_alias.sh"
-                             "sh_functions_bash.sh"
                             "sh_sundrous.bash")))))
           (add-before 'install 'fix-installman.sh
             (lambda _
@@ -76,7 +76,6 @@
 ;;; 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.
 ;;;
@@ -3200,7 +3199,7 @@ introspection files (Python, Vala, etc, see using the library below).")
 (define-public wl-color-picker
  (package
    (name "wl-color-picker")
-    (version "1.4")
+    (version "1.3")
    (home-page "https://github.com/jgmdev/wl-color-picker")
    (source (origin
              (method git-fetch)
@@ -3210,7 +3209,7 @@ introspection files (Python, Vala, etc, see using the library below).")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0z0pmfk99zicny9308zf4b4aygrb6r6c6zc8296l080zjhxiwkmv"))))
+                "0h5b8qfwri7a1invk8dran3436ac37x6r8fic3l5cxqj5rgnky4n"))))
    (build-system copy-build-system)
    (arguments
     `(#:install-plan '(("wl-color-picker.sh" "bin/wl-color-picker")
@@ -3219,25 +3218,17 @@ 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-program
+                  (add-after 'install 'wrap-script
                    (lambda* (#:key outputs #:allow-other-keys)
                      (wrap-program (string-append (assoc-ref outputs "out")
                                                   "/bin/wl-color-picker")
                                    `("PATH" =
-                                      (,(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
+                                      (,(getenv "PATH")))))))))
+    (inputs (list coreutils-minimal
+                  bash-minimal
                  grim
                  hicolor-icon-theme
                  imagemagick
-                  libnotify
                  slurp
                  wl-clipboard
                  zenity))
@@ -303,6 +303,9 @@
                      (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
@@ -1139,6 +1142,9 @@ 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))

@@ -63,7 +63,6 @@
  #: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)
@@ -465,7 +464,6 @@ 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" ".jj" ".svn" "CVS"))
+  (list ".bzr" ".git" ".hg" ".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.10	# PASS, version found
+guix build -n time@1.9		# PASS, version found
 guix build -n time@3.2 && false	# FAIL, version not found
 guix build -n something-that-will-never-exist && false	# FAIL
Author	SHA1	Message	Date
Andreas Enge	689c0c1ce5	gnu: python-geventhttpclient: Update to 2.3.9. * gnu/packages/python-web.scm (python-geventhttpclient): Update to 2.3.9. Change-Id: I83ff865b8ae052d24f9920b3d5c029e7c91373cc	2026-04-16 11:37:55 +02:00
Andreas Enge	02473f2995	gnu: openssl: Switch to openssl-3.5 as the default. * gnu/packages/tls.scm (openssl): Define as openssl-3.5. (perl-net-ssleay)[inputs]: Replace openssl by openssl-3.0. Change-Id: Ia13ea615a5265fc7012e881e516b98066cad8e3f	2026-04-16 11:37:55 +02:00
Cayetano Santos	99e64e1c39	gnu: libsodium: Update to 1.0.21. * gnu/packages/crypto.scm (libsodium): Update to 1.0.21. [source]: Switch to git-fetch. Change-Id: Iaaefe80eec5e82fa3c7a81712389894d37faa5c2 Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-16 11:37:55 +02:00
Ashish SHUKLA	4c41f5d235	gnu: openssh: Update to 10.3p1 [security-fixes]. Release notes since 10.2p1 (2025-10-10): - 10.3p1 (2026-04-02) <https://www.openssh.org/txt/release-10.3>. Contains fixes for: CVE-2026-35385: A file downloaded by scp may be installed setuid or setgid, an outcome contrary to some users' expectations, if the download is performed as root with -O (legacy scp protocol) and without -p (preserve mode). CVE-2026-35386: Command execution can occur via shell metacharacters in a username within a command line. This requires a scenario where the username on the command line is untrusted, and also requires a non-default configurations of % in ssh_config. CVE-2026-35387: OpenSSH can use unintended ECDSA algorithms. Listing of any ECDSA algorithm in PubkeyAcceptedAlgorithms or HostbasedAcceptedAlgorithms is misinterpreted to mean all ECDSA algorithms. CVE-2026-35388: OpenSSH before omits connection multiplexing confirmation for proxy-mode multiplexing sessions. CVE-2026-35414: OpenSSH mishandles the authorized_keys principals option in uncommon scenarios involving a principals list in conjunction with a Certificate Authority that makes certain use of comma characters. * gnu/packages/ssh.scm (openssh): Update to 10.3p1. Merges: https://codeberg.org/guix/guix/pulls/7695 Change-Id: I9e90c3ef02f567d0f5b2485c4e0bcfaa1a1f31c8 Reviewed-by: Nguyễn Gia Phong <cnx@loang.net> Reviewed-by: Jonas Meeuws <jonas.meeuws@gmail.com> Reviewed-by: Cayetano Santos <csantosb@inventati.org> Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>	2026-04-16 11:37:54 +02:00
Andy Tai	d1b1111917	gnu: libtasn1: Update to 4.21.0. * gnu/packages/tls.scm (libtasn1): Update to 4.21.0. Change-Id: I8a33a95def0d22e9df5ec592abb9c6728dce2ccb Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-16 11:37:54 +02:00
Andreas Enge	599636b65f	gnu: openssl-3.0: Change inheritance. * gnu/packages/tls.scm (openssl-3.0)[inherit]: Use openssl-3.5 instead of openssl-1.1. [source]: Add hurd patch. Fixes: guix/guix#4062 Change-Id: Id03fdd9532855bd66fbd9da9eb64768f8b9fb780	2026-04-16 11:37:54 +02:00
Andreas Enge	1aefb0656f	gnu: Add openssl-3.5. * gnu/packages/tls.scm (openssl-3.5): New variable. Change-Id: I0636a3455cec5636e926a51eddb96d3bdec7adeb	2026-04-16 11:37:54 +02:00
Andreas Enge	6ca437dbae	gnu: openssl-1.1: Re-enable tls_ssl_new test. * gnu/packages/tls.scm (openssl-1.1)[make-flags]: Do not disable tls_ssl_new. Change-Id: I95e6ef5906f7477f0ac6bfcd685a69229eb1a54d	2026-04-16 11:37:54 +02:00
Andreas Enge	1ef32d265f	gnu: openssl-3.0: Update to 3.0.19. * gnu/packages/tls.scm (openssl-3.0): Update to 3.0.19. Change-Id: Iebfaeb06b6a9dd270a9fca69c67fa9c32eaa4962	2026-04-16 11:37:54 +02:00
Andreas Enge	53f2f75fb1	gnu: openssl-1.1: Update to 1.1.1w. * gnu/packages/tls.scm (openssl-1.1): Update to 1.1.1w. Change-Id: Ibb7efac450bf942088a5332fa4a4b0a041ba2283	2026-04-16 11:37:46 +02:00