Add Graal

Change-Id: I0350197af84ac351031e70a63fd0d483d022bad9
2026-01-01 18:33:49 +01:00
193 changed files with 9961 additions and 7668 deletions
@@ -47,7 +47,7 @@
  (;; primary: "220F 98D9 5E86 204C 0036  DA7B 6DEC 4360 408B 4185"
   "F4C2 D1DF 3FDE EA63 D1D3  0776 ACC6 6D09 CA52 8292"
   (name "hako"))
-  ("3D58 BE78 5C1B E400 E214  0755 43F4 B499 3A1F 9D20"
+  ("B943 509D 633E 80DD 27FC  4EED 634A 8DFF D3F6 31DF"
   (name "htgoebel"))
  ( ;; primary: "FECD 9EBA FAAD 1831 7E05  DAC0 E55F 4198 D2A7 0CD7"
   "6980 A9B9 5202 AA11 EB1D  8922 8499 AC88 F1A7 1CF2"
@@ -170,8 +170,6 @@ gnu/packages/game-development\.scm                 @guix/games
 gnu/packages/luanti\.scm                           @guix/games
 gnu/packages/esolangs\.scm                         @guix/games
 gnu/packages/motti\.scm                            @guix/games
-gnu/services/games\.scm                            @guix/games
-gnu/tests/games\.scm                               @guix/games
 guix/build/luanti-build-system\.scm                @guix/games

 etc/teams/gnome                                    @guix/gnome
@@ -218,7 +216,6 @@ tests/home-services\.scm                           @guix/home

 gnu/packages/mpi\.scm                              @guix/hpc
 gnu/packages/oneapi\.scm                           @guix/hpc
-gnu/packages/parallel\.scm                         @guix/hpc
 gnu/packages/rocm\.scm                             @guix/hpc
 gnu/packages/sycl\.scm                             @guix/hpc
 gnu/packages/tbb\.scm                              @guix/hpc
@@ -273,8 +270,6 @@ gnu/packages/ibus\.scm                             @guix/localization

 gnu/packages/lxqt\.scm                             @guix/lxqt

-gnu/packages/mate\.scm                             @guix/mate
-

 gnu/build/icecat-extension\.scm                    @guix/mozilla
 gnu/packages/browser-extensions\.scm               @guix/mozilla
@@ -327,7 +322,7 @@ etc/manifests/release-desktop\.scm                 @guix/release

 gnu/packages/diffoscope\.scm                       @guix/reproduciblebuilds

-gnu/packages/(ruby)(-.+|)\.scm$                    @guix/ruby
+gnu/packages/ruby\.scm                             @guix/ruby
 guix/build/ruby-build-system\.scm                  @guix/ruby
 guix/build-system/ruby\.scm                        @guix/ruby
 guix/import/gem\.scm                               @guix/ruby
@@ -142,7 +142,6 @@ Guix Consensus Document 003}.}:

@example
 git clone https://git.guix.gnu.org/guix.git
-cd guix
@end example

@cindex authentication, of a Guix checkout
@@ -182,7 +181,6 @@ guix shell -D guix -CPW
 or even, from within a Git worktree for Guix:

@example
-echo $(pwd) >> ~/.config/guix/shell-authorized-directories
 guix shell -CPW
@end example

@@ -190,10 +188,6 @@ If @option{-C} (short for @option{--container}) is not supported on your
 system, try @command{--pure} instead of @option{-CPW}.
@xref{Invoking guix shell}, for more information on that command.

-Most of the test suite runs without an internet connection. The @option{-N}
-(short for @option{--network}) can be added to the @code{guix shell} command
-to run the tests that require internet access.
-
 If you are unable to use Guix when building Guix from a checkout, the
 following are the required packages in addition to those mentioned in the
 installation instructions (@pxref{Requirements}).
@@ -207,11 +201,11 @@ installation instructions (@pxref{Requirements}).
@item @url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
@end itemize

-On Guix, other development tools, like @code{strace}, can be included by
-giving them as extra arguments to @command{guix shell}:
+On Guix, extra dependencies can be added by instead running @command{guix
+shell}:

@example
-guix shell -D guix -CPW strace
+guix shell -D guix help2man git strace --pure
@end example

 From there you can generate the build system infrastructure
@@ -8737,7 +8737,6 @@ The example below denotes a version of gnu-standards to fetch:
@section Defining Package Variants

@cindex customizing packages
-@cindex package variants
@cindex variants, of packages
 One of the nice things with Guix is that, given a package definition,
 you can easily @emph{derive} variants of that package---for a different
@@ -13582,8 +13581,7 @@ the parsed command-line options.
@node Package Transformation Options
@subsection Package Transformation Options

-@cindex package tranformation
-@cindex package variants, transformation
+@cindex package variants
 Another set of command-line options supported by @command{guix build}
 and also @command{guix package} are @dfn{package transformation
 options}.  These are options that make it possible to define @dfn{package
@@ -24877,6 +24875,7 @@ example the @code{windowmaker} or @code{openbox} packages---preferably
 by adding it to the @code{packages} field of your operating system
 definition (@pxref{operating-system Reference, system-wide packages}).

+@anchor{wayland-gdm}
 GDM also supports Wayland: it can itself use Wayland instead of X11 for
 its user interface, and it can also start Wayland sessions.  Wayland
 support is enabled by default.  To disable it, set @code{wayland?} to
@@ -26389,6 +26388,16 @@ special-purpose system interfaces and programs.  This allows backlight
 adjustment helpers, power management utilities, screen lockers, and
 other integrated functionality to work as expected.

+The desktop environments in Guix use the Xorg display server by
+default.  If you'd like to use the newer display server protocol
+called Wayland, you need to enable Wayland support in GDM
+(@pxref{wayland-gdm}).  Another solution is to use the
+@code{sddm-service} instead of GDM as the graphical login manager.
+You should then select the ``GNOME (Wayland)'' session in SDDM@.
+Alternatively you can also try starting GNOME on Wayland manually from a
+TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session
+gnome-session``.  Currently only GNOME has support for Wayland.
+
@defvar gnome-desktop-service-type
 This is the type of the service that adds the @uref{https://www.gnome.org,
 GNOME} desktop environment.  Its value is a @code{gnome-desktop-configuration}
@@ -43200,91 +43209,6 @@ the @code{joycond-configuration} configuration), so that joycond
 controllers can be detected and used by an unprivileged user.
@end defvar

-@subsubheading Luanti service
-@cindex luanti
-@cindex voxel-based games
-@uref{https://www.luanti.org/en/, Luanti} is a voxel game engine that
-powers many games.  This service is for hosting a Luanti server.  The
-various options can be configured via the @code{luanti-configuration}
-record, documented below:
-
-@c %start of fragment
-
-@deftp {Data Type} luanti-configuration
-Available @code{luanti-configuration} fields are:
-
-@table @asis
-@item @code{luanti} (default: @code{luanti-server}) (type: file-like)
-The Luanti package to use.
-
-@item @code{game} (default: @code{luanti-mineclonia}) (type: file-like)
-The Luanti game package to serve.
-
-@item @code{game-configuration} (type: maybe-file-like)
-A configuration file to use for the selected Luanti game, which
-corresponds to the @file{minetest.conf} file.
-
-@item @code{mods} (type: maybe-list-of-file-likes)
-A list of Luanti mod packages to use.  Note that using mods is
-complicated by the requirements of Luanti to 1) manually enable the mod
-and any of its dependent mods in the @file{world.rt} file of the world
-used and 2) to register the mod names and those of its dependents via a
-@samp{secure.trusted_mods} @code{game-configuration} directive.  Consult
-the example below for more precise directions.
-
-@item @code{log-file} (default: @code{"/var/log/luanti.log"}) (type: maybe-string)
-The log file to log to.  To disable logging, set this to
-@code{%unset-value}.
-
-@item @code{verbose?} (default: @code{#f}) (type: boolean)
-Print more detailed information.
-
-@item @code{port} (default: @code{30000}) (type: port)
-The UDP port the server should listen to.
-
-@item @code{world} (type: maybe-string)
-An existing Luanti world directory to serve.  If omitted, a new world is
-created under the @file{/var/lib/luanti/.minetest/worlds/world}
-directory.  If an absolute file name is provided, it is used directly.
-Otherwise, it is expected to be a directory under
-@file{/var/lib/luanti/.minetest/worlds/}.
-
-@end table
-
-@end deftp
-
-
-@c %end of fragment
-
-Here's the simplest example of a Luanti server, which in its default
-configuration serves the @code{luanti-mineclonia} game.
-
-@lisp
-(service luanti-service-type)
-@end lisp
-
-Here's a slightly more elaborate one, which adds the
-@code{luanti-whitelist} mod.  Embedded are comments explaining extra
-needed steps when using mods.  Failing to do these steps will cause the
-service to fail to start.
-
-@lisp
-(service luanti-service-type
-         (luanti-configuration
-          (game luanti-mineclonia)
-          (game-configuration
-           (plain-file
-            "minetest.conf"
-            ;; lib_chatcmdbuilder is a dependency of the whitelist mod
-            "secure.trusted_mods = whitelist,lib_chatcmdbuilder\n"))
-          ;; The
-          ;; '/var/lib/luanti/.minetest/worlds/world/world.mt'
-          ;; file needs to be hand-edited to add:
-          ;; load_mod_whitelist = true
-          ;; load_mod_lib_chatcmdbuilder = true
-          (mods (list luanti-whitelist))))
-@end lisp
-
@subsubheading The Battle for Wesnoth Service
@cindex wesnothd
@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn
@@ -46283,127 +46207,6 @@ Mode for filter.

@c End of auto-generated fail2ban documentation.

-@cindex OpenSnitch
-@subsubheading OpenSnitch Service
-
-@uref{https://github.com/evilsocket/opensnitch, OpenSnitch} is an
-application-level firewall that monitors outbound connections and prompts
-users to allow or deny them on a per-application basis.
-
-@code{opensnitch-service-type} is provided by the @code{(gnu services
-opensnitch)} module.
-
-@defvar opensnitch-service-type
-This is the service type for the OpenSnitch application firewall daemon.
-Its value must be an @code{opensnitch-configuration} record.
-
-Below is an example configuration:
-
-@lisp
-(service opensnitch-service-type)
-@end lisp
-
-This service depends on the @code{networking} service.
-@end defvar
-
-@deftp {Data Type} opensnitch-configuration
-Available @code{opensnitch-configuration} fields are:
-
-@table @asis
-@item @code{opensnitch} (default: @code{opensnitch-daemon}) (type: package)
-The @code{opensnitch-daemon} package to use.
-
-@item @code{server-address} (default: @code{"unix:///tmp/osui.sock"}) (type: string)
-Address for the UI to connect to the daemon.
-
-@item @code{server-log-file} (default: @code{"/var/log/opensnitchd.log"}) (type: string)
-Path to the daemon log file.
-
-@item @code{authentication-type} (default: @code{"simple"}) (type: string)
-Authentication type for UI-daemon communication.
-
-@item @code{tls-ca-cert} (default: @code{""}) (type: string)
-Path to TLS CA certificate.
-
-@item @code{tls-server-cert} (default: @code{""}) (type: string)
-Path to TLS server certificate.
-
-@item @code{tls-client-cert} (default: @code{""}) (type: string)
-Path to TLS client certificate.
-
-@item @code{tls-client-key} (default: @code{""}) (type: string)
-Path to TLS client key.
-
-@item @code{tls-skip-verify?} (default: @code{#f}) (type: boolean)
-Whether to skip TLS verification.
-
-@item @code{tls-client-auth-type} (default: @code{"no-client-cert"}) (type: string)
-TLS client authentication type.
-
-@item @code{default-action} (default: @code{"allow"}) (type: string)
-Default action for connections: @code{"allow"} or @code{"deny"}.
-
-@item @code{default-duration} (default: @code{"once"}) (type: string)
-Default duration for rules: @code{"once"}, @code{"until-restart"},
-@code{"always"}, etc.
-
-@item @code{intercept-unknown?} (default: @code{#f}) (type: boolean)
-Whether to intercept connections from unknown processes.
-
-@item @code{proc-monitor-method} (default: @code{"ebpf"}) (type: string)
-Method for monitoring processes: @code{"ebpf"}, @code{"proc"}, or
-@code{"audit"}.
-
-@item @code{log-level} (default: @code{2}) (type: integer)
-Log level: 0=silent, 1=error, 2=warning, 3=important, 4=debug.
-
-@item @code{log-utc?} (default: @code{#t}) (type: boolean)
-Whether to log timestamps in UTC.
-
-@item @code{log-micro?} (default: @code{#f}) (type: boolean)
-Whether to include microseconds in log timestamps.
-
-@item @code{firewall} (default: @code{"nftables"}) (type: string)
-Firewall backend: @code{"nftables"} or @code{"iptables"}.
-
-@item @code{fw-config-path} (default: @code{"/etc/opensnitchd/system-fw.json"}) (type: string)
-Path to the system firewall configuration file.
-
-@item @code{fw-monitor-interval} (default: @code{"15s"}) (type: string)
-Interval for monitoring firewall rules.
-
-@item @code{fw-queue-bypass?} (default: @code{#t}) (type: boolean)
-Whether to bypass the queue when the daemon is not running.
-
-@item @code{rules-path} (default: @code{"/etc/opensnitchd/rules/"}) (type: string)
-Directory where firewall rules are stored.
-
-@item @code{rules-enable-checksums?} (default: @code{#f}) (type: boolean)
-Whether to enable checksums for rules.
-
-@item @code{ebpf-events-workers} (default: @code{8}) (type: integer)
-Number of eBPF event worker threads.
-
-@item @code{ebpf-queue-events-size} (default: @code{0}) (type: integer)
-Size of the eBPF events queue (0 = default).
-
-@item @code{stats-max-events} (default: @code{250}) (type: integer)
-Maximum number of events to keep in statistics.
-
-@item @code{stats-max-stats} (default: @code{25}) (type: integer)
-Maximum number of statistics entries.
-
-@item @code{stats-workers} (default: @code{6}) (type: integer)
-Number of statistics worker threads.
-
-@item @code{internal-gc-percent} (default: @code{100}) (type: integer)
-Go garbage collector percentage.
-
-@item @code{internal-flush-conns-on-start?} (default: @code{#t}) (type: boolean)
-Whether to flush existing connections on daemon start.
-@end table
-@end deftp
-
@cindex resize-file-system
@subsubheading Resize File System Service

@@ -777,7 +777,7 @@ sys_create_init_profile()
    cat <<"EOF" > /etc/profile.d/zzz-guix.sh
 # Explicitly initialize XDG base directory variables to ease compatibility
 # with Guix System: see <https://issues.guix.gnu.org/56050#3>.
-export XCURSOR_PATH="${XCURSOR_PATH:-$HOME/.local/share/icons:$HOME/.icons:/usr/local/share/icons:/usr/share/icons}"
+export XCURSOR_PATH="${XCURSOR_PATH:-/usr/local/share/icons:/usr/share/icons}"
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
@@ -793,8 +793,8 @@ export PATH="$GUIX_PROFILE/bin${PATH:+:}$PATH"
 # info and man readers.  When INFOPATH is unset, add a trailing colon so Emacs
 # searches 'Info-default-directory-list'.  When MANPATH is unset, add a
 # trailing colon so the system default search path is used.
-export INFOPATH="$GUIX_PROFILE/share/info:${INFOPATH:-}"
-export MANPATH="$GUIX_PROFILE/share/man:${MANPATH:-}"
+export INFOPATH="$GUIX_PROFILE/share/info:$INFOPATH"
+export MANPATH="$GUIX_PROFILE/share/man:$MANPATH"

 # User's default profile, if it exists
 GUIX_PROFILE="$HOME/.guix-profile"
@@ -68,6 +68,7 @@
  "hexchat"
  "hyprland"
  "icecat"
+  "idris"
  "imagemagick"
  "imapfilter"
  "jami"
@@ -92,7 +92,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
  (email   person-email)
  (account person-codeberg-account))

-(define (person name email account)
+(define* (person name #:optional email account)
  (make-person name email account))

 (define* (team id #:key name description (members '())
@@ -666,8 +666,6 @@ ecosystem."
                      "gnu/packages/luanti.scm"
                      "gnu/packages/esolangs.scm" ; granted, rather niche
                      "gnu/packages/motti.scm"
-                      "gnu/services/games.scm"
-                      "gnu/tests/games.scm"
                      "guix/build/luanti-build-system.scm")))

 (define-team gnome
@@ -741,7 +739,6 @@ the haskell-build-system."
        #:description "High-performance computing (HPC) related packages."
        #:scope (list "gnu/packages/mpi.scm"
                      "gnu/packages/oneapi.scm"
-                      "gnu/packages/parallel.scm"
                      "gnu/packages/rocm.scm"
                      "gnu/packages/sycl.scm"
                      "gnu/packages/tbb.scm"
@@ -846,12 +843,6 @@ asdf-build-system."
        #:description "LXQt desktop environment."
        #:scope (list "gnu/packages/lxqt.scm")))

-(define-team mate
-  (team 'mate
-        #:name "MATE team"
-        #:description "MATE desktop environment"
-        #:scope (list "gnu/packages/mate.scm")))
-
 (define-team mentors
  (team 'mentors
        #:name "Mentors"
@@ -961,7 +952,7 @@ release."
 (define-team ruby
  (team 'ruby
        #:name "Ruby team"
-        #:scope (list (make-regexp* "^gnu/packages/(ruby)(-.+|)\\.scm$")
+        #:scope (list "gnu/packages/ruby.scm"
                      "guix/build/ruby-build-system.scm"
                      "guix/build-system/ruby.scm"
                      "guix/import/gem.scm"
@@ -1207,6 +1198,10 @@ the \"texlive\" importer."
                       "jpoiret")
  installer)

+(define-member (person "("
+                       "paren@disroot.org")
+  )
+
 (define-member (person "Simon Tournier"
                       "zimon.toutoune@gmail.com"
                       "zimoun")
@@ -1267,11 +1262,19 @@ the \"texlive\" importer."
                       "Hellseher")
  go julia python science sysadmin)

+(define-member (person "Vivien Kraus"
+                       "vivien@planete-kraus.eu")
+  gnome)
+
 (define-member (person "Mark H Weaver"
                       "mhw@netris.org"
                       "mhw")
  mozilla)

+(define-member (person "Adam Faiz"
+                       "adam.faiz@disroot.org")
+  games)
+
 (define-member (person "Laurent Gatto"
                       "lgatto@protonmail.ch"
                       "lgatto")
@@ -1336,6 +1339,10 @@ the \"texlive\" importer."
                       "Ashvith")
  games go javascript sysadmin xfce)

+(define-member (person "Trevor Richards"
+                       "trev@trevdev.ca")
+  lisp emacs)
+
 (define-member (person "Konrad Hinsen"
                       "guix@khinsen.fastmail.net"
                       "khinsen")
@@ -1411,10 +1418,6 @@ the \"texlive\" importer."
                       "tinystar")
  hare)

-(define-member (person "FuncProgLinux"
-                       "softwarelibre@urutau-ltd.org"
-                       "FuncProgLinux")
-  mate)

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -1,34 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 FuncProgLinux <softwarelibre@urutau-ltd.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (gnu packages mate)
-             (ice-9 match)
-             (srfi srfi-1))
-
-(define (propagated-inputs package)
-  (map
-   (match-lambda
-     ((_ (? package? pkg)) pkg)
-     ((_ (? package? pkg) output) (list pkg output)))
-   (package-propagated-inputs package)))
-
-(packages->manifest
- (append-map propagated-inputs
-             (list mate)))
@@ -8,7 +8,6 @@
 ;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 dan <i@dan.games>
-;;; Copyright © 2026 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,12 +64,7 @@
            ((? string?)
             (list #~(install-file (string-append bootloader #$file)
                                   install-dir)))
-            ((? file-like?)
-             (list #~(mkdir-p install-dir)
-                   #~(copy-file #$file
-                                (string-append install-dir
-                                               "/"
-                                               #$(plain-file-name file)))))
+            ((? file-like?) (list #~(install-file #$file install-dir)))
            (#f '()))))
    #~(lambda (bootloader device mount-point)
        (let ((install-dir (string-append mount-point "/boot")))
@@ -138,12 +132,7 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
    ;; starfive_visionfive2.dtb.  We cannot guarantee that users will
    ;; update this U-Boot, so set the FDT explicitly.
    (plain-file "uEnv.txt"
-                (string-join
-                 (list
-                  "boot_targets=mmc1 nvme0 mmc0 dhcp"
-                  "bootcmd_mmc1=bootflow scan"
-                  "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb")
-                 "\n"))))
+      "fdtfile=starfive/jh7110-starfive-visionfive-2-v1.3b.dtb~%")))


 ;;;
@@ -83,8 +83,7 @@ turn doesn't take any constant overhead into account, force a 1-MiB minimum."
        (label (partition-label partition))
        (uuid (partition-uuid partition)))
    (apply invoke
-           `("unshare" "--map-root-user" "mkfs.btrfs"
-             "-r" ,root
+           `("fakeroot" "mkfs.btrfs" "-r" ,root
             "-L" ,label
             ,@(if uuid
                   `("-U" ,(uuid->string uuid))
@@ -129,6 +129,9 @@
 (define (list-of-string-ish? lst)
  (every string-ish? lst))

+(define (list-of-packages? lst)
+  (every package? lst))
+
 (define (bar-position? p)
  (member p '(top bottom)))

@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2024,2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -168,10 +168,8 @@ or #f.  Return #t on success and #f on failure."
                            (const '())))
         (install-command (append `( "guix" "system" "init"
                                     "--fallback"
-                                     ,@(if (%current-target-system)
-                                           `(,(string-append
-                                               "--target="
-                                               (%current-target-system)))
+                                     ,@(if (target-hurd?)
+                                           '("--target=i586-pc-gnu")
                                           '()))
                                  options
                                  (list (%installer-configuration-file)
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,7 +27,7 @@
  str)

 (define (kernel->configuration kernel dry-run?)
-  (if (string-prefix? "Hurd" kernel)
+  (if (equal? kernel "Hurd")
      `((kernel %hurd-default-operating-system-kernel)
        ,(comment (G_ ";; \"noide\" disables the gnumach IDE driver, enabling rumpdisk.\n"))
        (kernel-arguments '("noide"))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,46 +23,23 @@
  #:export (run-kernel-page))

 (define (run-kernel-page)
-  ;; TRANSLATORS: "Hurd" is a proper noun and must not be translated.
-  (let* ((hurd-x86 (G_ "Hurd 32-bit (experimental)"))
-         (hurd-x86_64 (G_ "Hurd 64-bit (highly experimental!)"))
-         (linux-libre "Linux Libre")
-         (kernels (parameterize ((%current-target-system #f))
-                    `(,linux-libre
-                      ,@(cond ((target-x86-64?)
-                               (list hurd-x86 hurd-x86_64))
-                              ((target-x86?)
-                               (list hurd-x86))
-                              (else
-                               '())))))
-         (default (cond ((equal? (%current-target-system) "i586-pc-gnu")
-                         hurd-x86)
-                        ((equal? (%current-target-system) "x86_64-pc-gnu")
-                         hurd-x86_64)
-                        (else
-                         linux-libre)))
+  (let* ((kernels `(,@(if (target-x86?) '("Hurd") '())
+                    "Linux Libre"))
         (result
          (run-listbox-selection-page
           #:title (G_ "Kernel")
           #:info-text
-           ;; TRANSLATORS: "Hurd" is a proper noun and must not be translated.
-           ;; TRANSLATORS: "Linux Libre" is a literal and must not be translated.
           (G_ "Please select a kernel.  When in doubt, choose \"Linux Libre\".
 The Hurd is offered as a technology preview and development aid; many packages \
-are not yet available in Guix, such as a desktop environment or even a \
-windowing system (X, Wayland).")
+are not yet available in Guix, such as a desktop environment or even a windowing \
+system (X, Wayland).")
           #:listbox-items kernels
           #:listbox-item->text identity
-           #:listbox-default-item default
+           #:listbox-default-item "Linux Libre"
           #:button-text (G_ "Back")
           #:button-callback-procedure
           (lambda _
             (abort-to-prompt 'installer-step 'abort)))))
-    (let ((target (cond ((equal? result hurd-x86)
-                         "i586-pc-gnu")
-                        ((equal? result hurd-x86_64)
-                         "x86_64-pc-gnu")
-                        (else
-                         #f))))
-      (%current-target-system target))
+    (when (equal? result "Hurd")
+      (%current-target-system "i586-pc-gnu"))
    result))
@@ -19,7 +19,7 @@
 # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 # Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
-# Copyright © 2018, 2020-2026 Maxim Cournoyer <maxim@guixotic.coop>
+# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
 # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net>
 # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
 # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
@@ -343,6 +343,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/gperf.scm			\
  %D%/packages/gpodder.scm			\
  %D%/packages/gps.scm				\
+  %D%/packages/graal.scm			\
  %D%/packages/graph.scm			\
  %D%/packages/graphics.scm			\
  %D%/packages/graphviz.scm			\
@@ -376,6 +377,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/i2p.scm				\
  %D%/packages/ibus.scm				\
  %D%/packages/icu4c.scm			\
+  %D%/packages/idris.scm			\
  %D%/packages/idutils.scm			\
  %D%/packages/image.scm			\
  %D%/packages/image-processing.scm	\
@@ -758,7 +760,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/services/networking.scm			\
  %D%/services/nix.scm				\
  %D%/services/nfs.scm			\
-  %D%/services/opensnitch.scm			\
  %D%/services/pam-mount.scm			\
  %D%/services/power.scm			\
  %D%/services/science.scm			\
@@ -994,6 +995,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/amd-smi-python.patch			\
  %D%/packages/patches/ibus-anthy-fix-tests.patch		\
  %D%/packages/patches/ibus-table-paths.patch			\
+  %D%/packages/patches/anki-mpv-args.patch			\
  %D%/packages/patches/antiword-CVE-2014-8123.patch			\
  %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch	\
  %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch	\
@@ -1141,8 +1143,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/crc32c-unbundle-googletest.patch		\
  %D%/packages/patches/crda-optional-gcrypt.patch		\
  %D%/packages/patches/clucene-contribs-lib.patch               \
-  %D%/packages/patches/cryfs-boost-1.88-fix.patch		\
-  %D%/packages/patches/cryfs-boost-1.89-fix.patch		\
  %D%/packages/patches/csvkit-set-locale-for-tests.patch			\
  %D%/packages/patches/ctranslate2-local-build.patch		\
  %D%/packages/patches/ctune-cmake-disable-git-clone.patch		\
@@ -1217,7 +1217,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch	\
  %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
  %D%/packages/patches/emacs-disable-jit-compilation.patch			\
-  %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
  %D%/packages/patches/emacs-elisp-autofmt-fix-region-send.patch	\
  %D%/packages/patches/emacs-exec-path.patch			\
  %D%/packages/patches/emacs-fix-scheme-indent-function.patch	\
@@ -1325,6 +1324,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/freeimage-unbundle.patch		\
  %D%/packages/patches/freeimage-CVE-2020-21428.patch		\
  %D%/packages/patches/freeimage-CVE-2020-22524.patch		\
+  %D%/packages/patches/freerdp-3.16.0-rpath.patch		\
  %D%/packages/patches/freesolid-automake.patch			\
  %D%/packages/patches/freesolid-autotools.patch		\
  %D%/packages/patches/freesolid-configure.patch		\
@@ -1524,6 +1524,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/gpaste-fix-paths.patch			\
  %D%/packages/patches/gpm-glibc-2.26.patch			\
  %D%/packages/patches/gpodder-disable-updater.patch		\
+  %D%/packages/patches/graalvm-mx-check-failed-after-join.patch	\
  %D%/packages/patches/grantlee-fix-i586-precision.patch	\
  %D%/packages/patches/grantlee-register-metaenumvariable.patch	\
  %D%/packages/patches/grep-timing-sensitive-test.patch		\
@@ -1544,6 +1545,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/guile-ac-d-bus-fix-tests.patch		\
  %D%/packages/patches/guile-lib-fix-tests-for-guile2.2.patch		\
  %D%/packages/patches/guile-fibers-cross-build-fix.patch 	\
+  %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \
  %D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
  %D%/packages/patches/guile-fibers-fd-finalizer-leak.patch	\
  %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
@@ -1611,19 +1613,12 @@ dist_patch_DATA =						\
  %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch	\
  %D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch	\
  %D%/packages/patches/icu4c-icu-22132-fix-vtimezone.patch	\
-  %D%/packages/patches/icu4c-20548-dateinterval-timezone.patch  \
-  %D%/packages/patches/icu4c-22132-standardize-vtzone-output.patch      \
-  %D%/packages/patches/icu4c-23069-rosh-hashanah-postponement.patch     \
-  %D%/packages/patches/icu4c-dayperiod-fractional-seconds.patch \
-  %D%/packages/patches/icu4c-double-conversion.patch            \
-  %D%/packages/patches/icu4c-dtitvfmt-adopt-calendar.patch      \
  %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch	\
-  %D%/packages/patches/icu4c-wasi-workaround.patch              \
  %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
  %D%/packages/patches/id3lib-UTF16-writing-bug.patch			\
+  %D%/packages/patches/idris-test-ffi008.patch			\
  %D%/packages/patches/ilmbase-fix-tests.patch			\
  %D%/packages/patches/inferno-fix-crash.patch		\
-  %D%/packages/patches/iniparser-remove-fetchcontent-usage.patch		\
  %D%/packages/patches/inkscape-libxml2.patch		\
  %D%/packages/patches/instead-use-games-path.patch		\
  %D%/packages/patches/intltool-perl-compatibility.patch	\
@@ -1633,9 +1628,11 @@ dist_patch_DATA =						\
  %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
  %D%/packages/patches/isl-0.11.1-aarch64-support.patch		\
  %D%/packages/patches/ispell-for-linphone-cmake.patch		\
-  %D%/packages/patches/jami-allow-system-zxing-cpp.patch        \
-  %D%/packages/patches/jami-avutil-link.patch   		\
+  %D%/packages/patches/jami-find-package-avutil.patch		\
+  %D%/packages/patches/jami-libjami-headers-search.patch	\
  %D%/packages/patches/jami-qwindowkit.patch			\
+  %D%/packages/patches/jami-skip-tests-requiring-internet.patch	\
+  %D%/packages/patches/jami-unbundle-dependencies.patch		\
  %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch	\
  %D%/packages/patches/jamvm-1.5.1-armv7-support.patch	\
  %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch	\
@@ -1645,6 +1642,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/java-tunnelvisionlabs-antlr-code-too-large.patch	\
  %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch	\
  %D%/packages/patches/java-commons-collections-fix-java8.patch \
+  %D%/packages/patches/java-commons-lang-fix-dependency.patch \
  %D%/packages/patches/java-guava-remove-annotation-deps.patch \
  %D%/packages/patches/java-jeromq-fix-tests.patch		\
  %D%/packages/patches/java-openjfx-build-jdk_version.patch     \
@@ -1681,8 +1679,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch	\
  %D%/packages/patches/libguestfs-syms.patch            	\
  %D%/packages/patches/libinfinity-renew-test-certificate.patch \
-  %D%/packages/patches/libjami-pkgconf.patch                    \
-  %D%/packages/patches/libjami-simdutf.patch                    \
  %D%/packages/patches/libretro-dolphin-emu-data.patch		\
  %D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch  \
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
@@ -1975,8 +1971,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/openboardview-use-system-mpc.patch	\
  %D%/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch \
  %D%/packages/patches/openbox-python3.patch			\
-  %D%/packages/patches/opendht-meson-install-headers.patch	\
-  %D%/packages/patches/opendht-meson-liburing.patch     	\
+  %D%/packages/patches/opendht-nanosleep.patch			\
  %D%/packages/patches/openexr-2-gcc-14.patch			\
  %D%/packages/patches/openfst-for-vosk-fix-unique-ptr.patch	\
  %D%/packages/patches/openjdk-currency-time-bomb.patch		\
@@ -2017,6 +2012,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/opentaxsolver-file-browser-fix.patch     \
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
+  %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch	\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\
@@ -2225,8 +2221,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
  %D%/packages/patches/qtscript-disable-tests.patch		\
  %D%/packages/patches/quagga-reproducible-build.patch          \
-  %D%/packages/patches/quickjs-ng-64-bits-precision-on-i686.patch	\
-  %D%/packages/patches/quickjs-ng-fix-atomics.pause-on-32-bit.patch	\
  %D%/packages/patches/quilt-grep-compat.patch 			\
  %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch 	\
  %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch	\
@@ -2318,6 +2312,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/seq24-rename-mutex.patch			\
  %D%/packages/patches/libsequoia-fix-ffi-Makefile.patch	\
  %D%/packages/patches/libsequoia-remove-store.patch		\
+  %D%/packages/patches/shaderc-for-pcsx2-changes.patch		\
  %D%/packages/patches/shakespeare-spl-fix-grammar.patch		\
  %D%/packages/patches/shared-mime-info-xdgmime-path.patch	\
  %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
@@ -2414,7 +2409,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/ucx-tcp-iface-ioctl.patch		\
  %D%/packages/patches/uftrace-fix-tests.patch			\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
-  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
@@ -235,6 +235,50 @@ incorporated.")
    (home-page "https://brltty.app/")
    (license license:lgpl2.1+)))

+(define-public florence
+  (package
+    (name "florence")
+    (version "0.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/florence/florence/" version
+                           "/florence-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "07h9qm22krlwayhzvc391lr23vicw81s48g7rirvx1fj0zyr4aa2"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:configure-flags (list "--with-xtst"
+                               "--without-docs"
+                               "--with-notification")))
+    (inputs
+     (list libxml2
+           libglade
+           (librsvg-for-system)
+           gstreamer
+           cairo
+           gtk+
+           libxtst
+           libxcomposite
+           libnotify))
+    (native-inputs
+     (list gettext-minimal intltool pkg-config))
+    (home-page "https://florence.sourceforge.net/")
+    (synopsis "Extensible, scalable virtual keyboard for X11")
+    (description
+     "Florence is an extensible scalable virtual keyboard for X11.
+It is useful for people who can't use a real hardware keyboard (for
+example for people with disabilities), but you must be able to use
+a pointing device (as a mouse, a trackball, a touchscreen or opengazer).
+
+Florence stays out of your way when you don't need it: it appears on the
+screen only when you need it.  A timer-based auto-click input method is
+available to help to click.")
+    ;; The documentation is under FDL1.2, but we do not install the
+    ;; documentation.
+    (license license:gpl2+)))
+
 (define-public footswitch
  (let ((commit "e455d6752221b9e9c3818cc304c873b9c2792490")
        (revision "0"))
@@ -48,7 +48,7 @@
 ;;; Copyright © 2021, 2025 muradm <mail@muradm.net>
 ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2021-2026 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2021-2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -138,7 +138,6 @@
  #:use-module (gnu packages dns)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages file)
-  #:use-module (gnu packages file-systems)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
@@ -1075,7 +1074,7 @@ console.")
 (define-public btop
  (package
    (name "btop")
-    (version "1.4.6")
+    (version "1.4.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1084,7 +1083,7 @@ console.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1nj58dbv3c0rj8fngldkyrmdmacmjnbg8ch1c07ik97kqnnzd3l7"))))
+                "03dchclmbjphirzqii4m0vyqfd0vw1k8mgpchmr13g3brlfzxd34"))))
    (build-system gnu-build-system)
    (native-inputs (list lowdown))
    (arguments
@@ -2526,7 +2525,7 @@ system administrator.")
    (inputs
     (append (list coreutils zlib)
             (if (target-hurd?)
-                 (list libxcrypt)
+                 '()
                 (list linux-pam))))
    (home-page "https://www.sudo.ws/")
    (synopsis "Run commands as root")
@@ -3414,7 +3413,7 @@ modules and plugins that extend Ansible.")
 (define-public debops
  (package
    (name "debops")
-    (version "3.2.5")
+    (version "3.2.4")
    (source
     (origin
       (method git-fetch)
@@ -3423,14 +3422,13 @@ modules and plugins that extend Ansible.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "15wfhha2b315i15l40j3sylyvs3mdrfw5awzq4cix51l5jppx8z5"))
+        (base32 "0y7bmrnynbw0hz88shfv301a9fsank2cx86fvb7jx6g6kkbsa9pz"))
       (patches
        (search-patches "debops-setup-py-avoid-git.patch"))))
    (build-system pyproject-build-system)
    (native-inputs (list python-setuptools))
    (inputs
     (list ansible
-           bash-minimal
           encfs
           fuse-2
           util-linux ;; for umount
@@ -4499,7 +4497,7 @@ you are running, what theme or icon set you are using, etc.")
 (define-public hyfetch
  (package
    (name "hyfetch")
-    (version "2.0.5")
+    (version "2.0.2")
    (source
     (origin
       (method git-fetch)
@@ -4508,11 +4506,12 @@ you are running, what theme or icon set you are using, etc.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xb0m7mna6mm3gc823c40rfdhnw39afdr3g7kb4cqrc21s7fdd5y"))))
+        (base32 "1h3s8m6csmxj815cpzh30m59132n8drxya0s2lh5ngjkpazgdnv3"))))
    (build-system pyproject-build-system)
    (native-inputs
-     (list python-hatchling
-           python-pytest))
+     (list python-pytest
+           python-setuptools
+           python-wheel))
    (inputs
     (list python-typing-extensions))
    (home-page "https://github.com/hykilpikonna/HyFetch")
@@ -4718,7 +4717,7 @@ information tool.")
 (define-public fastfetch-minimal
  (package
    (name "fastfetch-minimal")
-    (version "2.56.1")
+    (version "2.55.1")
    (source
     (origin
       (method git-fetch)
@@ -4727,7 +4726,7 @@ information tool.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "065hqlw9vjs12vb4rqnwmjg8llpqw5ian0jnxldlv16gs5lw914n"))
+        (base32 "0a2a8rp75nx16gvq0918999hifr2lph8dagpfipmyflaa5awlw54"))
       (modules '((guix build utils)))
       (snippet '(begin
                   (delete-file-recursively "src/3rdparty")))))
@@ -4774,8 +4773,7 @@ system distribution, akin to many similar tools.")
               libxcb
               mesa
               wayland
-               zlib ;for imagemagick and an #ifdef
-               zfs)))))
+               zlib))))) ;for imagemagick and an #ifdef

 (define-public nnn
  (package
@@ -4981,7 +4979,7 @@ launch daemons into the relevant nodes.")
                                     ;; Fails to build as c++17.
                                     "CXXFLAGS=-std=c++14 -O2 -g")))
    (inputs
-     (list openmpi munge launchmon libgcrypt zlib))
+     (list openmpi munge launchmon libgcrypt))
    (synopsis "Scalable library loading in HPC environments")
    (description
     "Spindle is a tool for improving the performance of dynamic library and
@@ -5203,7 +5201,7 @@ cache of unix and unix-like systems.")
 (define-public solaar
  (package
    (name "solaar")
-    (version "1.1.18")
+    (version "1.1.16")
    (source
     (origin
       (method git-fetch)
@@ -5212,7 +5210,7 @@ cache of unix and unix-like systems.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0wf8rkm9anxr9iw51yxaav9cifpfkf1m4cw7i9rfsq8xb3aa2n9b"))))
+        (base32 "1q05pcrl1pr6ls92m5k690qrwqb4nz1lganxvbj9b40w3c6nh5iy"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
@@ -5589,7 +5587,7 @@ entries, providing commands to add, remove, comment, and search.")
 (define-public nmrpflash
  (package
    (name "nmrpflash")
-    (version "0.9.26")
+    (version "0.9.25")
    (source
     (origin
       (method git-fetch)
@@ -5598,7 +5596,7 @@ entries, providing commands to add, remove, comment, and search.")
         (url "https://github.com/jclehner/nmrpflash")
         (commit (string-append "v" version))))
       (sha256
-        (base32 "19dna96qg32nscvsalgd0xslp3da84aj196cczdm0ixhv1k9pvi3"))
+        (base32 "0xqvj52m6rk0gma8saqvp8b4jms9hca8i1v2kb5hcd6miaqgx276"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -6956,7 +6954,7 @@ network, which causes enabled computers to power on.")
 (define-public witr
  (package
    (name "witr")
-    (version "0.1.7")
+    (version "0.1.1")
    (source
     (origin
       (method git-fetch)
@@ -6965,7 +6963,7 @@ network, which causes enabled computers to power on.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "18xx01lxd5j019gy9jmpms3awv4snlr028w01bfkyfid6hlwxbq2"))))
+        (base32 "016yiwn0b00ynllka6h2w6gk2yjzj5nx2xf26shb0cz4crdwww0d"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -6991,7 +6989,7 @@ working directory, user, pid, command, and so on.")
 (define-public xfel
  (package
    (name "xfel")
-    (version "1.3.5")
+    (version "1.3.3")
    (source
     (origin
       (method git-fetch)
@@ -6999,7 +6997,7 @@ working directory, user, pid, command, and so on.")
              (url "https://github.com/xboot/xfel")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1vmb3dr3vplxdxn9i8i4chdnfihb429rakvkqsfccb885ivkkn3b"))
+        (base32 "15xlqkj7lf3xszgfyci32lrwdjhqmmm9clmwlp1qn6hywal3d2p4"))
       (file-name (git-file-name name version))))
    (native-inputs
     (list pkg-config))
@@ -983,7 +983,7 @@ The standard for the ETC1 texture format can be found at
 (define-public git-repo
  (package
    (name "git-repo")
-    (version "2.60.1")
+    (version "2.4.1")
    (source
     (origin
       (method git-fetch)
@@ -992,90 +992,88 @@ The standard for the ETC1 texture format can be found at
             (commit (string-append "v" version))))
       (file-name (string-append "git-repo-" version "-checkout"))
       (sha256
-        (base32 "1cx1b0zmvnmglyn6kbdifcy6w3gm89z2icw4pykxm0wyasy7sc1c"))))
-    (build-system pyproject-build-system)
+        (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      #~(list
-         ;; XXX: Requires GnuPG.
-         "--deselect=tests/test_wrapper.py::SetupGnuPG::test_full"
-         ;; This is expected, as the package is patched for this.
-         "-k" "not test_fetches_when_stale")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-executable-paths
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (substitute* '("repo" "git_command.py")
-                (("^GIT = 'git'")
-                 (format #f "GIT = '~a'"
-                         (search-input-file inputs "/bin/git"))))
-              (substitute* "git_config.py"
-                ((" command_base = \\['ssh',")
-                 (format #f " command_base = ['~a',"
-                         (search-input-file inputs "/bin/ssh"))))))
-          (add-before 'build 'do-not-self-update
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; Setting the REPO_MAIN variable to an absolute file name is
-              ;; enough to have _FindRepo return the store main.py file.  The
-              ;; self update mechanism is activated with the call to _Init() in
-              ;; main(), so we bypass it.
-              
-              ;; Ticket requesting upstream to provide a mean to disable the
-              ;; self update mechanism:
-              ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407.
-              (let ((repo-main (string-append #$output
-                                              "/share/git-repo/main.py")))
-                (substitute* "repo"
-                  (("^REPO_MAIN = .*")
-                   (format #f "REPO_MAIN = ~s~%" repo-main))
-                  ((" _Init\\(args, gitc_init=\\(cmd ==.*" all)
-                   (string-append "True #" all)))
-                ;; Prevent repo from trying to git describe its version from
-                ;; the (disabled) self updated copy.
-                (substitute* "git_command.py"
-                  (("ver = getattr\\(RepoSourceVersion.*")
-                   (format #f "ver = ~s~%" #$version)))
-                (substitute* "subcmds/version.py"
-                  (("rp_ver = .*")
-                   (format #f "rp_ver = ~s~%" #$version)))
-                ;; Prevent repo from adding its (disabled) self update copy to
-                ;; the list of projects to fetch when using 'repo sync'.
-                (substitute* "subcmds/sync.py"
-                  (("to_fetch\\.extend\\(all_projects\\).*" all)
-                   (string-append "#" all))
-                  (("self\\._Fetch\\(to_fetch")
-                   "self._Fetch(all_projects")
-                  (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all)
-                   (string-append "pass #" all))))))
-          (delete 'build) ;nothing to build
-          (add-before 'check 'configure-git
-            (lambda _
-              (setenv "HOME" (getcwd))
-              ;; XXX: pytest needs this for conftest to import local modules.
-              (setenv "PYTHONPATH" (getcwd))
-              (invoke "git" "config" "--global" "user.email" "you@example.com")
-              (invoke "git" "config" "--global" "user.name" "Your Name")))
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((bin-dir (string-append #$output "/bin"))
-                     (repo-dir (string-append #$output "/share/"
-                                              #$name)))
-                (mkdir-p bin-dir)
-                (mkdir-p repo-dir)
-                (copy-recursively "." repo-dir)
-                (delete-file-recursively (string-append repo-dir "/tests"))
-                (symlink (string-append repo-dir "/repo")
-                         (string-append bin-dir "/repo"))))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-executable-paths
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (git (assoc-ref inputs "git"))
+                    (ssh (assoc-ref inputs "ssh")))
+               (substitute* '("repo" "git_command.py")
+                 (("^GIT = 'git'")
+                  (string-append "GIT = '" git "/bin/git'")))
+               (substitute* "git_config.py"
+                 ((" command_base = \\['ssh',")
+                  (string-append " command_base = ['" ssh "/bin/ssh',")))
+               #t)))
+         (add-before 'build 'do-not-self-update
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Setting the REPO_MAIN variable to an absolute file name is
+             ;; enough to have _FindRepo return the store main.py file.  The
+             ;; self update mechanism is activated with the call to _Init() in
+             ;; main(), so we bypass it.
+
+             ;; Ticket requesting upstream to provide a mean to disable the
+             ;; self update mechanism:
+             ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407.
+             (let* ((out (assoc-ref outputs "out"))
+                    (repo-main (string-append out "/share/git-repo/main.py")))
+               (substitute* "repo"
+                 (("^REPO_MAIN = .*")
+                  (format #f "REPO_MAIN = ~s~%" repo-main))
+                 ((" _Init\\(args, gitc_init=\\(cmd ==.*" all)
+                  (string-append "True #" all)))
+               ;; Prevent repo from trying to git describe its version from
+               ;; the (disabled) self updated copy.
+               (substitute* "git_command.py"
+                 (("ver = getattr\\(RepoSourceVersion.*")
+                  (format #f "ver = ~s~%" ,version)))
+               (substitute* "subcmds/version.py"
+                 (("rp_ver = .*")
+                  (format #f "rp_ver = ~s~%" ,version)))
+               ;; Prevent repo from adding its (disabled) self update copy to
+               ;; the list of projects to fetch when using 'repo sync'.
+               (substitute* "subcmds/sync.py"
+                 (("to_fetch\\.extend\\(all_projects\\).*" all)
+                  (string-append "#" all))
+                 (("self\\._Fetch\\(to_fetch")
+                  "self._Fetch(all_projects")
+                 (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all)
+                  (string-append "#" all))))))
+         (delete 'build) ; nothing to build
+         (add-before 'check 'configure-git
+           (lambda _
+             (setenv "HOME" (getcwd))
+             (invoke "git" "config" "--global" "user.email" "you@example.com")
+             (invoke "git" "config" "--global" "user.name" "Your Name")))
+         (replace 'check
+           (lambda _
+             (invoke "./run_tests")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin-dir (string-append out "/bin"))
+                    (repo-dir (string-append out "/share/" ,name)))
+               (mkdir-p bin-dir)
+               (mkdir-p repo-dir)
+               (copy-recursively "." repo-dir)
+               (delete-file-recursively (string-append repo-dir "/tests"))
+               (symlink (string-append repo-dir "/repo")
+                        (string-append bin-dir "/repo"))
+               #t))))))
    (inputs
     ;; TODO: Add git-remote-persistent-https once it is available in guix
-     (list git openssh))
-    (native-inputs (list python-pytest python-setuptools))
+     `(("git" ,git)
+       ("ssh" ,openssh)))
+    (native-inputs
+     `(("pytest" ,python-pytest)))
    (home-page "https://code.google.com/p/git-repo/")
    (synopsis "Helps to manage many Git repositories")
-    (description
-     "Repo is a tool built on top of Git.  Repo helps manage many Git
-repositories, does the uploads to revision control systems, and automates
+    (description "Repo is a tool built on top of Git.  Repo helps manage many
+Git repositories, does the uploads to revision control systems, and automates
 parts of the development workflow.  Repo is not meant to replace Git, only to
 make it easier to work with Git.  The repo command is an executable Python
 script that you can put anywhere in your path.")
@@ -3635,31 +3635,27 @@ cross-platform audio input/output stream library.")
 (define-public python-pulsectl
  (package
    (name "python-pulsectl")
-    (version "24.12.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/mk-fg/python-pulse-control")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1f15w2312j2yc9bs689dvdgq891sjrp5x3q1vf08743px70gxc1m"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;tests try to communicate with PulseAudio
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "pulsectl/_pulsectl.py"
-                (("libpulse.so.0")
-                 (search-input-file inputs "/lib/libpulse.so.0"))))))))
-    (native-inputs (list python-setuptools))
+    (version "24.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pulsectl" version))
+              (sha256
+               (base32
+                "0r9igs365cqgrn1m55a8qjz0hc446nwjm3p3i9kphbj5gl7dazk9"))))
+    (build-system python-build-system)
    (inputs (list pulseaudio))
+    (arguments
+     `(#:tests? #f                      ; tests try to communicate with PulseAudio
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "pulsectl/_pulsectl.py"
+               (("libpulse.so.0")
+                (string-append (search-input-file inputs "/lib/libpulse.so.0")))))))))
    (home-page "https://github.com/mk-fg/python-pulse-control")
-    (synopsis "Python bindings for mixer-like controls in PulseAudio")
+    (synopsis
+     "Python bindings for mixer-like controls in PulseAudio")
    (description
     "This package provides a Python high-level interface and ctypes-based
 bindings for PulseAudio (libpulse), to use in simple synchronous code.
@@ -3824,21 +3820,16 @@ one-dimensional sample-rate conversion library.")
    (version "0.2.5")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/NFJones/python3-midi")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "python3_midi" version))
       (sha256
-        (base32 "1zihn7n9dr9jjgkjlpad515hhwh22k94irb21ji793sr5crh5s15"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f))         ; XXX: midi module has not been packaged yet.
-    (native-inputs (list python-setuptools))
+        (base32
+         "1z9j1w7mpn3xhkcpxmqm5rvmj6nffb5rf14bv7n3sdh07nf6n7sf"))))
+    (build-system python-build-system)
    (home-page "https://github.com/NFJones/python3-midi")
    (synopsis "Python MIDI API")
-    (description
-     "This package provides a python API to read and write MIDI files.")
+    (description "This package provides a python API to read and write MIDI
+files.")
    (license license:expat)))

 (define-public python-wavefile
@@ -2039,7 +2039,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
-CONFIG_SCSI_VIRTIO=m
+# CONFIG_SCSI_VIRTIO is not set
 # CONFIG_SCSI_DH is not set
 # end of SCSI device support

@@ -21,7 +21,7 @@
 ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
-;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 Feng Shu <tumashu@163.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
@@ -357,62 +357,6 @@ random access nor for in-place modification.  This package provides the
@command{bsdcat}, @command{bsdcpio} and @command{bsdtar} commands.")
    (license license:bsd-2)))

-;;; TODO: core update (20k rebuilds).
-(define-public libarchive-next
-  (package
-    (inherit libarchive)
-    (name "libarchive")
-    (version "3.8.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "https://libarchive.org/downloads/libarchive-"
-                                 version ".tar.xz")
-                  (string-append "https://github.com/libarchive/libarchive"
-                                 "/releases/download/v" version "/libarchive-"
-                                 version ".tar.xz")))
-       (sha256
-        (base32
-         "0wxdr7qws1z1b1gp5jsm7n2ccnjlmrnds52d5wc5xkzagyslgf67"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments libarchive)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (delete 'patch-pwd)
-            (add-before 'build 'patch-commands
-              (lambda _
-                (substitute* "Makefile"
-                  (("/bin/pwd") (which "pwd")))
-                (substitute* "test_utils/test_main.c"
-                  (("/bin/sh") (which "sh")))))
-            (replace 'check
-              (lambda* (#:key parallel-build? tests? #:allow-other-keys)
-                (if tests?
-                    (begin
-                      ;; These environment variables are taken from
-                      ;; <https://raw.githubusercontent.com/libarchive/libarchive/refs/heads/master/.github/workflows/ci.yml>
-                      (setenv "SKIP_OPEN_FD_ERR_TEST" "1")
-                      (setenv "IGNORE_TRAVERSALS_TEST4" "1")
-
-		      ;; XXX: The test_owner_parse, test_read_disk, and
-		      ;; test_write_disk_lookup tests expect user 'root' to
-		      ;; exist, but the chroot's /etc/passwd doesn't have it
-		      ;; (see:
-		      ;; <https://github.com/libarchive/libarchive/issues/2794>).
-		      (invoke "make" "-j" (number->string
-                                           (if parallel-build?
-                                               (parallel-job-count)
-                                               1))
-			      "libarchive_test"
-			      "bsdcpio_test"
-			      "bsdtar_test")
-		      ;; XXX: This glob disables too much.
-		      (invoke "./libarchive_test" "^test_*_disk*")
-		      (invoke "./bsdcpio_test" "^test_owner_parse")
-		      (invoke "./bsdtar_test"))
-                    ;; Tests may be disabled if cross-compiling.
-                    (format #t "Test suite not run.~%"))))))))))
-
 (define-public rdup
  (package
    (name "rdup")
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2017, 2021, 2022, 2024–2026 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017, 2021, 2022, 2024, 2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2018-2024 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
@@ -8448,7 +8448,7 @@ FLASH is used to merge RNA-seq data.")
 (define-public flexbar
  (package
    (name "flexbar")
-    (version "3.5.0")
+    (version "3.4.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8457,24 +8457,25 @@ FLASH is used to merge RNA-seq data.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1w0c592wmi3xin2wlb9vmxp7f8f3s9nhl3y9ih4djrlfqyim70h9"))))
+                "1pq9sxvdnldl14libk234m72dqhwgzs3acgl943wchwdqlcsi5r2"))))
    (build-system cmake-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'do-not-tune-to-CPU
-            (lambda _
-              (substitute* "src/CMakeLists.txt"
-                ((" -march=native") ""))))
-          (replace 'check
-            (lambda _
-              (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
-              (with-directory-excursion "../source/test"
-                (invoke "bash" "flexbar_test.sh"))))
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (install-file "flexbar" (string-append #$output "/bin/")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'do-not-tune-to-CPU
+           (lambda _
+             (substitute* "src/CMakeLists.txt"
+               ((" -march=native") ""))))
+         (replace 'check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH")))
+             (with-directory-excursion "../source/test"
+               (invoke "bash" "flexbar_test.sh"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (string-append (assoc-ref outputs "out")))
+                    (bin (string-append out "/bin/")))
+               (install-file "flexbar" bin)))))))
    (inputs
     (list tbb-2020 zlib))
    (native-inputs
@@ -9741,6 +9742,86 @@ command, or queried for specific k-mers with @code{jellyfish query}.")
    ;; One of these licenses may be picked
    (license (list license:gpl3+ license:bsd-3))))

+(define-public khmer
+  (package
+    (name "khmer")
+    (version "3.0.0a3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dib-lab/khmer")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "01l4jczglkl7yfhgvzx8j0df7k54bk1r8sli9ll16i1mis0d8f37"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete bundled libraries.  We do not replace the bundled seqan
+           ;; as it is a modified subset of the old version 1.4.1.
+           ;;
+           ;; We do not replace the bundled MurmurHash as the canonical
+           ;; repository for this code 'SMHasher' is unsuitable for providing
+           ;; a library.  See
+           ;; https://lists.gnu.org/archive/html/guix-devel/2016-06/msg00977.html
+           (delete-file-recursively "third-party/zlib")
+           (delete-file-recursively "third-party/bzip2")
+           (delete-file-recursively "third-party/seqan")
+           (substitute* "setup.cfg"
+             (("# libraries = z,bz2")
+              "libraries = z,bz2")
+             (("include:third-party/zlib:third-party/bzip2")
+              "include:"))
+           ;; Delete generated Cython CPP files.
+           (for-each delete-file (find-files "khmer/_oxli/" "\\.cpp$"))))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-cc
+           (lambda _ (setenv "CC" "gcc")))
+         (add-after 'unpack 'python-3.8-compatibility
+           (lambda _
+             ;; Python 3.8 removed time.clock().
+             (substitute* "sandbox/sweep-reads.py"
+               (("time\\.clock")
+                "time.process_time"))))
+         (add-after 'unpack 'do-use-cython
+           (lambda _
+             (substitute* "setup.py"
+               (("from setuptools import Extension as CyExtension")
+                "from Cython.Distutils import Extension as CyExtension")
+               (("from setuptools.command.build_ext import build_ext as _build_ext")
+                "from Cython.Distutils import build_ext as _build_ext")
+               (("HAS_CYTHON = False") "HAS_CYTHON = True")
+               (("cy_ext = 'cpp'") "cy_ext = 'pyx'"))))
+         (add-before 'build 'build-extensions
+           (lambda _
+             ;; Cython extensions have to be built before running the tests.
+             (invoke "python" "setup.py" "build_ext" "--inplace")))
+         (replace 'check
+           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "pytest" "-v")))))))
+    (native-inputs
+     (list python-cython python-pytest python-pytest-runner))
+    (inputs
+     (list zlib bzip2 seqan-1 python-screed python-bz2file))
+    (home-page "https://khmer.readthedocs.org/")
+    (synopsis "K-mer counting, filtering and graph traversal library")
+    (description "The khmer software is a set of command-line tools for
+working with DNA shotgun sequencing data from genomes, transcriptomes,
+metagenomes and single cells.  Khmer can make de novo assemblies faster, and
+sometimes better.  Khmer can also identify and fix problems with shotgun
+data.")
+    ;; When building on i686, armhf and mips64el, we get the following error:
+    ;; error: ['khmer', 'khmer.tests', 'oxli'] require 64-bit operating system
+    (supported-systems '("x86_64-linux" "aarch64-linux"))
+    (license license:bsd-3)))
+
 (define-public kaiju
  (package
    (name "kaiju")
@@ -16037,7 +16118,6 @@ programs for inferring phylogenies (evolutionary trees).")
                    "DEFAULT_VECTOR_FLAG=\"-march=athlon64-sse3\"\n"))))
             (add-after 'build 'build-manual
               (lambda _
-                 (setenv "HOME" "/tmp/")
                 (with-directory-excursion "doc"
                   (invoke "make" "phyml-manual.pdf"))))
             (add-after 'build-manual 'install-manual
@@ -16059,7 +16139,6 @@ programs for inferring phylogenies (evolutionary trees).")
           (texlive-local-tree
            (list texlive-caption
                  texlive-cite
-                  texlive-ec
                  texlive-fancyvrb
                  texlive-infwarerr
                  texlive-kvoptions
@@ -21144,8 +21223,7 @@ to an artifact/contaminant file.")
    (build-system gnu-build-system)
    (arguments
     (list
-      #:make-flags #~(list "OPENMP=t"
-                           "CFLAGS=-Wall -Wno-error=incompatible-pointer-types")
+      #:make-flags #~(list "OPENMP=t")
      #:test-target "test"
      #:phases
      #~(modify-phases %standard-phases
@@ -21154,11 +21232,6 @@ to an artifact/contaminant file.")
            (lambda _
              (substitute* "src/binarySequences.c"
                (("../third-party/zlib-1.2.3/zlib.h") "zlib.h"))))
-          (add-before 'build 'set-home-env
-            (lambda _
-              ;; TeXLive requires HOME to be set.
-              ;;  Permission denied: '/homeless-shelter'
-              (setenv "HOME" "/tmp")))
          (replace 'install
            (lambda _
              (let ((bin (string-append #$output "/bin"))
@@ -21173,8 +21246,7 @@ to an artifact/contaminant file.")
     (list openmpi zlib))
    (native-inputs
     (list (texlive-local-tree
-            (list texlive-ec
-                  texlive-infwarerr
+            (list texlive-infwarerr
                  texlive-kvoptions
                  texlive-pdftexcmds))))
    (home-page "https://www.ebi.ac.uk/~zerbino/velvet/")
@@ -24735,7 +24807,7 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
 (define-public ccwl
  (package
    (name "ccwl")
-    (version "0.5.0")
+    (version "0.4.0")
    (source
     (origin
       (method url-fetch)
@@ -24743,7 +24815,7 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
                           version ".tar.lz"))
       (sha256
        (base32
-         "1pna61cqhhg69qpa682x911x85nlin1wpp29naqzq3r0s951qxi6"))))
+         "1vnkj34400kj77xavdr0cry0vm2fmk40vf7cwca61q3jl3h7hl2c"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
@@ -24778,7 +24850,6 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
    (native-inputs
     (list pkg-config
           lzip
-           guile-run64
           ;; To build documentation
           cwltool
           graphviz
@@ -24810,17 +24881,7 @@ language.")
       (snippet
        '(delete-file-recursively "lib/simde"))))
    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #false ;no test target
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-gcc-14
-            (lambda _
-              (substitute* "src/a3m_compress.h"
-                (("#include <climits>")
-                 "#include <climits>
-#include <cstdint>")))))))
+    (arguments '(#:tests? #false)) ;no test target
    (inputs
     (list openmpi simde))
    (native-inputs
@@ -949,16 +949,8 @@ Info manual.")))
           (modify-inputs (package-native-inputs u-boot)
                          (prepend python-filelock
                                   python-pycryptodomex))))
-    (inputs (list gnutls ncurses/tinfo))
    (arguments
-     `(#:make-flags '("HOSTCC=gcc"
-                      ,@(if (%current-target-system)
-                            (list "CROSS_BUILD_TOOLS=y"
-                                  (string-append
-                                   "CROSS_COMPILE="
-                                   (%current-target-system)
-                                   "-"))
-                            '()))
+     `(#:make-flags '("HOSTCC=gcc")
       #:test-target "tcheck"
       #:phases
       (modify-phases %standard-phases
@@ -9,7 +9,7 @@
 ;;; Copyright © 2020, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
-;;; Copyright © 2020, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2021 David Dashyan <mail@davie.li>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -1466,8 +1466,8 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
 ;;; The package is named orangeduck-mpc to differentiate it from GNU mpc.
 (define-public orangeduck-mpc
  ;; The last release lacks an 'install' target.
-  (let ((commit "1049534fc56b1971345c7aaa792dea55d6f9b7bc")
-        (revision "1"))
+  (let ((commit "7c910e9303833c349f7432188ff77f2745254df2")
+        (revision "0"))
    (package
      (name "orangeduck-mpc")
      (version (git-version "0.9.0" revision commit))
@@ -1479,7 +1479,9 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1wpxchbjxsyksr8il9pvg195nvqzsjdshzyzwikxda0fss0p7aap"))))
+                  "01a4vcxdnz0fbn90c9zc3jzklyqqvp9sfjpjwpq0f5r0l2pp37ad"))
+                (patches
+                 (search-patches "orangeduck-mpc-fix-pkg-config.patch"))))
      (build-system gnu-build-system)
      (arguments
       (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
@@ -1706,7 +1708,7 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
 (define-public simdutf
  (package
    (name "simdutf")
-    (version "7.7.1")
+    (version "7.2.0")
    (source
     (origin
       (method git-fetch)
@@ -1715,9 +1717,8 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0kw4j4qqcfjaii667xa745pklj50m70nqq8cj5agj714acczbk7y"))))
+        (base32 "1kw4k3mhkj3bcmfmwwzq76hs2ypg5lrjl4vnp2dfg73vas9v9w35"))))
    (build-system cmake-build-system)
-    (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
    (synopsis "SIMD Unicode validation and transcoding")
    (description
     "simdutf is a C++ library providing Unicode routines (UTF8, UTF16,
@@ -58,7 +58,6 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 nomike Postmann <nomike@nomike.com>
 ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
-;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -110,7 +109,6 @@
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages python-science)
-  #:use-module (gnu packages ruby)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages time)
@@ -3433,50 +3431,6 @@ of advanced library and language features, which means it should be easily
 portable to just about any platform.")
    (license license:expat)))

-(define-public unity-test
-  (package
-    (name "unity-test")
-    (version "2.6.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/ThrowTheSwitch/Unity")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "1s0jj9f2zav49mn9ib90idcmb6hq93aczbqysn5hj6binjmrnjw3"))
-              (patches (search-patches "unity-test-set-subdir-correctly.patch"))))
-    (build-system meson-build-system)
-    (arguments
-      (list #:configure-flags
-            #~(list "-Dsupport_double=true")
-            #:phases
-            #~(modify-phases %standard-phases
-                (add-after 'patch-source-shebangs 'patch-more-shebangs
-                  (lambda _
-                    (substitute* '("auto/unity_test_summary.rb")
-                      (("/usr/bin/ruby")
-                       (string-append #$(this-package-input "ruby")
-                                      "/bin/ruby")))
-                    (substitute* '("auto/stylize_as_junit.py"
-                                   "auto/unity_test_summary.py")
-                      (("#! python3")
-                       (string-append #$(this-package-input "python")
-                                      "/bin/python3")))))
-                (add-after 'install 'install-extra
-                  (lambda _
-                    (for-each (lambda (x)
-                                (install-file x
-                                  (string-append #$output "/share/unity-test")))
-                              (find-files "../source/auto")))))))
-    (native-inputs (list pkg-config))
-    (inputs (list python ruby))
-    (home-page "https://github.com/ThrowTheSwitch/Unity")
-    (synopsis "Simple unit testing for C")
-    (description "This package provides a unit testing framework built for C,
-with a focus on working with embedded toolchains.")
-    (license license:expat)))
-
 (define-public libfaketime
  (package
    (name "libfaketime")
@@ -31,7 +31,7 @@
 (define-public clifm
  (package
    (name "clifm")
-    (version "1.26.3")
+    (version "1.26")
    (source
     (origin
       (method git-fetch)
@@ -40,7 +40,7 @@
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xzpkiid5c51jkmxx4f9iyc6qsir7byp7zyjlskr6hnyah99i1wm"))))
+        (base32 "0mdh24qjx4cghghrl6sbp49a6kv8birxa5vxrsmj8ddnya2j1n3q"))))
    (build-system gnu-build-system)
    (arguments
     `(#:make-flags (list (string-append "CC="
@@ -855,6 +855,7 @@ dependency graph expansion and the creation of classpaths.")
       #:doc-dirs '()
       ;; FIXME: Could not initialize class org.eclipse.aether.transport.http.SslSocketFactory
       #:tests? #f
+       #:jdk ,openjdk11
       #:phases
       (modify-phases %standard-phases
         ;; FIXME: Currently, the S3 transporter depends on ClojureScript,
@@ -599,6 +599,21 @@ than gzip and 15 % smaller output than bzip2.")
   (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
   (home-page "https://tukaani.org/xz/")))

+(define-public xz-for-graal-truffle
+  (package
+   (inherit xz)
+   (name "xz-for-graal-truffle")
+   (version "5.6.2")
+   (source (origin
+            (method url-fetch)
+            (uri (list (string-append "http://tukaani.org/xz/xz-" version
+                                      ".tar.gz")
+                       (string-append "http://multiprecision.org/guix/xz-"
+                                      version ".tar.gz")))
+            (sha256
+             (base32
+              "06a585qzn2qlwdv44w7x6p6x8qmbqrqzlz29y8108vyqw7021zcb"))))))
+
 (define-public heatshrink
  (package
    (name "heatshrink")
@@ -50,7 +50,6 @@
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
-;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -103,7 +102,6 @@
  #:use-module (gnu packages disk)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages gl)
  #:use-module (gnu packages glib)
@@ -127,7 +125,6 @@
  #:use-module (gnu packages popt)
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages samba)
  #:use-module (gnu packages sdl)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages tex)
@@ -950,7 +947,7 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.")
 (define-public hyprgraphics
  (package
    (name "hyprgraphics")
-    (version "0.5.0")
+    (version "0.4.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -961,7 +958,7 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.")
              (snippet #~(substitute* "CMakeLists.txt" (("libjxl_cms") "")))
              (sha256
               (base32
-                "1l8yfnv1vs6iqnh7r73yyfkbl8l61mqpmpyhri65sqwvplkgw41i"))))
+                "1jii9l9qbksp6x1vwbm84a985hy9q9xcpl703bliprd5rkpi6w96"))))
    (build-system cmake-build-system)
    (native-inputs (list gcc-15 pkg-config))
    (inputs (list cairo
@@ -1019,7 +1016,7 @@ language used in Hyprland.")
 (define-public hyprutils
  (package
    (name "hyprutils")
-    (version "0.11.0")
+    (version "0.10.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1028,7 +1025,7 @@ language used in Hyprland.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1ymiqzncppdik8lw3ad7xaqig6c7bjcy7crcwbq3rjfk2hrc8rmc"))))
+                "08b65pssaci780rgb5qgqc61zvbxmb9qda4gb58j8nh9yi3ya0jx"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -1051,102 +1048,6 @@ language used in Hyprland.")
 ecosystem.")
    (license license:bsd-3)))

-(define-public hyprtoolkit
-  (package
-    (name "hyprtoolkit")
-    (version "0.5.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/hyprwm/hyprtoolkit")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1lyc5mmk7i83q3rq11yyggwxpcx3kmav3hg3ss1xl723v27cnj80"))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f)) ; No tests in Release build type
-    (native-inputs (list pkg-config hyprwayland-scanner))
-    (inputs
-      (list aquamarine
-            cairo
-            googletest
-            hyprgraphics
-            hyprlang
-            hyprutils
-            iniparser
-            mesa
-            libglvnd
-            libxkbcommon
-            pango
-            pixman
-            wayland
-            wayland-protocols))
-    (home-page "https://github.com/hyprwm/hyprtoolkit")
-    (synopsis "Modern C++ Wayland-native GUI toolkit")
-    (description "This package provides a C++ toolkit for making wayland GUI
-apps.")
-    (license license:bsd-3)))
-
-(define-public hyprwire
-  (package
-    (name "hyprwire")
-    (version "0.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/hyprwm/hyprwire")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0rzclhk42x9im9n6fz2bj98l9lb7jhl3vijvck4rj6yhb80kvli0"))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f)) ; There are no tests
-    (native-inputs (list pkg-config gcc-15))
-    (inputs
-      (list hyprutils
-            libffi
-            pugixml))
-    (home-page "https://github.com/hyprwm/hyprwire")
-    (synopsis "Fast and consistent wire protocol for IPC")
-    (description "This package provides a fast and consistent wire protocol,
-and its implementation.  This is essentially a method for processes to talk to
-each other.")
-    (license license:bsd-3)))
-
-(define-public hyprland-guiutils
-  (package
-    (name "hyprland-guiutils")
-    (version "0.2.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/hyprwm/hyprland-guiutils")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0x5757ch8rvgbph66fkf5cg39r37isvfy450429746xmajsy0qa7"))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f)) ; There are no tests
-    (native-inputs (list pkg-config gcc-15))
-    (inputs
-      (list aquamarine
-            cairo
-            hyprgraphics
-            hyprlang
-            hyprtoolkit
-            hyprutils
-            mesa
-            libxkbcommon
-            pixman))
-    (home-page "https://github.com/hyprwm/hyprland-guiutils")
-    (synopsis "Hyprland GUI utilities")
-    (description "This package provides GUI utilities for hyprland.  It is the
-successor of hyprland-qtutils.")
-    (license license:bsd-3)))
-
 (define-public xsimd-benchmark
  (package
    (inherit xsimd)
@@ -21,7 +21,7 @@
 ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 Ellis Kenyő <me@elken.dev>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2021, 2022, 2025 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2022 Allan Adair <allan@adair.no>
 ;;; Copyright © 2022, 2024-2025 Maxim Cournoyer <maxim@guixoic.coop>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -1581,7 +1581,7 @@ non-encrypted files.")
 (define-public cryfs
  (package
    (name "cryfs")
-    (version "1.0.1")
+    (version "0.11.4")
    (source
     (origin
       (method url-fetch)
@@ -1589,53 +1589,52 @@ non-encrypted files.")
             "https://github.com/cryfs/cryfs/releases/download/"
             version "/cryfs-" version ".tar.xz"))
       (sha256
-        (base32 "1va8l8yfyi895604i8npq2b5ha0ixiqydlrq2nck2106w52wrm3s"))
-       (patches (search-patches
-                 ;; https://github.com/cryfs/cryfs/pull/494
-                 "cryfs-boost-1.88-fix.patch"
-                 ;; https://github.com/cryfs/cryfs/pull/500
-                 "cryfs-boost-1.89-fix.patch"))))
+        (base32 "0a48qijfrd02ianp19x3kz24w1pgigmlxdr5nks0gag7z5b2s7m7"))))
    (build-system cmake-build-system)
    (arguments
     '(#:modules ((guix build cmake-build-system)
                  (guix build utils)
                  (srfi srfi-1))
       #:configure-flags
-       ;; Note: This also disables checking for security issues.
-       '("-DCRYFS_UPDATE_CHECKS=OFF"
-         "-DBUILD_TESTING=ON")
-       ;; crypto++ is still bundled: https://github.com/cryfs/cryfs/issues/369
+        ;; Note: This also disables checking for security issues.
+       `("-DCRYFS_UPDATE_CHECKS=OFF"
+         ;; This helps us use some dependencies from Guix instead of conan.
+         ;; crypto++ is still bundled: https://github.com/cryfs/cryfs/issues/369
+         ;; Googletest is also since I wasn't sure how to unbundle that.
+         ,(string-append "-DDEPENDENCY_CONFIG=" (getcwd)
+                         "/cmake-utils/DependenciesFromLocalSystem.cmake"))
       #:phases
       (modify-phases %standard-phases
         (add-before 'configure 'fix-up
           (lambda* (#:key tests? #:allow-other-keys)
-             (chdir "..") ; We end up in .github somehow
+             ;; Remove junk directory that breaks the build
+             (chdir "..") (delete-file-recursively ".circleci")
             ;; Install documentation with Guix defaults.
             (substitute* "doc/CMakeLists.txt"
               (("CONFIGURATIONS Release")
                "CONFIGURATIONS Release RelWithDebInfo"))
-             ;; Disable Fuse tests.
-             (substitute* "test/cryfs-cli/CMakeLists.txt"
-               (("CliTest_IntegrityCheck.cpp") "")
-               (("CliTest_Setup.cpp") "")
-               (("CliTest_WrongEnvironment.cpp") "")
-               (("CryfsUnmountTest.cpp") ""))))
+             (when tests?
+               (substitute* "CMakeLists.txt"
+                 (("option.BUILD_TESTING .build test cases. OFF.")
+                  "option(BUILD_TESTING \"build test cases\" ON)")))))
         (replace 'check
           (lambda* (#:key tests? #:allow-other-keys)
             (when tests?
-               (setenv "HOME" "/tmp")
-               (let ((tests (find-files "test/" "-test$")))
-                 ;; SignalHandler/SignalCatcher tests fails
-                 ;; Fuse tests can't run in build env.
+               (let ((tests (find-files "." "-test$")))
+                 ;; XXX: Disable failing tests. Unfortunately there are a
+                 ;; few. Some only fail in the build environment due to
+                 ;; FUSE not being available.
                 (for-each invoke
                           (lset-difference string-contains
                                            tests
                                            '("cpp-utils-test"
+                                              "cryfs-cli-test"
+                                              "blobstore-test"
                                              "fspp-test"))))))))))
    (native-inputs
-     (list googletest pkg-config python-wrapper))
+     (list pkg-config python-wrapper))
    (inputs
-     (list boost curl fuse-2 range-v3 spdlog))
+     (list boost-1.83 curl fuse-2 range-v3 spdlog))
    (home-page "https://www.cryfs.org/")
    (synopsis "Encrypted FUSE filesystem for the cloud")
    (description "CryFS encrypts your files, so you can safely store them anywhere.
@@ -1644,8 +1643,7 @@ others.  CryFS creates an encrypted userspace filesystem that can be mounted
 via FUSE without root permissions.  It is similar to EncFS, but provides
 additional security and privacy measures such as hiding file sizes and directory
 structure.  However CryFS is not considered stable yet by the developers.")
-    (license license:lgpl3+)
-    (properties `((tunable? . #t)))))
+    (license license:lgpl3+)))

 (define-public b3sum
  (package
@@ -1714,27 +1712,6 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.")
    (home-page "https://github.com/besser82/libxcrypt")
    (license license:lgpl2.1)))

-(define-public libxcrypt-without-failure-tokens
-  ;; This version of libxcrypt is used for guile-2.2.4, which is used in Guix
-  ;; v1.0.0 and thus needs to be supported for guix time-machine.
-  ;;
-  ;; Guile uses the 'crypt' hashing function that used to be provided by glibc,
-  ;; but was moved to libxcrypt around glibc 2.39.  However, the crypt function
-  ;; in libxcrypt works differently for invalid salt values: libxcrypt returnns
-  ;; the failure token "*0" for (crypt "pass" "$X$abc"), where glibc raised
-  ;; "Invalid argument" (EINVAL).  The --disable-failure-tokens flag lets
-  ;; libxcrypt behave in the same way as glibc.
-  ;;
-  ;; Guile 2.2.4 explicitly checks for the glibc behavior of crypt, and thus
-  ;; needs libxcrypt to be compiled with --disable-failure-tokens.
-  (hidden-package
-   (package/inherit libxcrypt
-     (name "libxcrypt-without-failure-tokens")
-     (arguments
-      (substitute-keyword-arguments (package-arguments libxcrypt)
-        ((#:configure-flags flags #~'())
-         #~(cons* "--disable-failure-tokens" #$flags)))))))
-
 (define-public keychain
  (package
    (name "keychain")
@@ -5224,13 +5224,13 @@ is designed to have a low barrier to entry.")
 (define-public python-sqlparse
  (package
    (name "python-sqlparse")
-    (version "0.5.5")
+    (version "0.5.3")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "sqlparse" version))
       (sha256
-        (base32 "13pj7ylwm8w35nd8hz64grx5sk69qxk01lqh7gvgv1c51fdll3g2"))))
+        (base32 "0wljxh3lh2zndy7amziwd3572cwwbmzzq6yyvgn1c2vayn3pgxh9"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list python-pytest
@@ -5498,6 +5498,138 @@ language-bindings for structure manipulation.  It also provides IPC and common
 algorithm implementations.")
    (license license:asl2.0)))

+(define-public apache-arrow-for-ceph
+  (package
+    (name "apache-arrow")
+    (version "6.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/apache/arrow")
+             (commit (string-append "apache-arrow-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mcw361akqw4sxnnpnr9c9v1zk4hphk6gcq763pcb19yzljh88ig"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'enter-source-directory
+           (lambda _ (chdir "cpp")))
+         (add-after 'unpack 'set-env
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "cpp/src/parquet/parquet.pc.in"
+               (("includedir=\\$\\{prefix\\}/")
+                "includedir="))
+             (substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake"
+               (("set\\(xsimd_SOURCE.*") ""))
+             (setenv "BOOST_ROOT" (assoc-ref inputs "boost"))
+             (setenv "BROTLI_HOME" (assoc-ref inputs "brotli"))
+             (setenv "FLATBUFFERS_HOME" (assoc-ref inputs "flatbuffers"))
+             (setenv "RAPIDJSON_HOME" (assoc-ref inputs "rapidjson")))))
+       #:build-type "Release"
+       #:configure-flags
+       (list "-DARROW_PYTHON=ON"
+             "-DARROW_GLOG=ON"
+             ;; Parquet options
+             "-DARROW_PARQUET=ON"
+             "-DPARQUET_BUILD_EXECUTABLES=ON"
+             ;; The maintainers disallow using system versions of
+             ;; jemalloc:
+             ;; https://issues.apache.org/jira/browse/ARROW-3507. This
+             ;; is unfortunate because jemalloc increases performance:
+             ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/.
+             "-DARROW_JEMALLOC=OFF"
+
+             ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global
+             ;; option that instructs the build system how to resolve
+             ;; each dependency. SYSTEM = Finding the dependency in
+             ;; system paths using CMake's built-in find_package
+             ;; function, or using pkg-config for packages that do not
+             ;; have this feature
+             "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
+             "-Dxsimd_SOURCE=SYSTEM"
+
+             "-DARROW_RUNTIME_SIMD_LEVEL=NONE"
+             "-DARROW_SIMD_LEVEL=NONE"
+             "-DARROW_PACKAGE_KIND=Guix"
+
+             ;; Split output into its component packages.
+             (string-append "-DCMAKE_INSTALL_PREFIX="
+                            (assoc-ref %outputs "lib"))
+             (string-append "-DCMAKE_INSTALL_RPATH="
+                            (assoc-ref %outputs "lib")
+                            "/lib")
+             (string-append "-DCMAKE_INSTALL_BINDIR="
+                            (assoc-ref %outputs "out")
+                            "/bin")
+             (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
+                            (assoc-ref %outputs "include")
+                            "/share/include")
+
+             "-DARROW_WITH_SNAPPY=ON"
+             "-DARROW_WITH_ZLIB=ON"
+             "-DARROW_WITH_ZSTD=ON"
+             "-DARROW_WITH_LZ4=ON"
+             "-DARROW_COMPUTE=ON"
+             "-DARROW_CSV=ON"
+             "-DARROW_DATASET=ON"
+             "-DARROW_FILESYSTEM=ON"
+             "-DARROW_HDFS=ON"
+             "-DARROW_JSON=ON"
+             ;; Arrow Python C++ integration library (required for
+             ;; building pyarrow). This library must be built against
+             ;; the same Python version for which you are building
+             ;; pyarrow. NumPy must also be installed. Enabling this
+             ;; option also enables ARROW_COMPUTE, ARROW_CSV,
+             ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and
+             ;; ARROW_JSON.
+             "-DARROW_PYTHON=ON"
+
+             ;; Building the tests forces on all the
+             ;; optional features and the use of static
+             ;; libraries.
+             "-DARROW_BUILD_TESTS=OFF"
+             "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF"
+             ;;"-DBENCHMARK_ENABLE_TESTING=OFF"
+             "-DARROW_BUILD_STATIC=OFF")))
+    (inputs
+     (list boost
+           brotli
+           bzip2
+           double-conversion
+           gflags
+           glog
+           grpc
+           protobuf
+           python
+           python-numpy
+           rapidjson
+           re2
+           snappy
+           xsimd))
+    ;; These are all listed under Requires.private in arrow.pc
+    (propagated-inputs
+     (list (list apache-thrift "lib")
+           lz4
+           utf8proc
+           zlib
+           (list zstd "lib")))
+    (native-inputs
+     (list pkg-config))
+    (outputs '("out" "lib" "include"))
+    (home-page "https://arrow.apache.org/")
+    (synopsis "Columnar in-memory analytics")
+    (description "Apache Arrow is a columnar in-memory analytics layer
+designed to accelerate big data.  It houses a set of canonical in-memory
+representations of flat and hierarchical data along with multiple
+language-bindings for structure manipulation.  It also provides IPC and common
+algorithm implementations.")
+    (license license:asl2.0)))
+
 (define-public python-pyarrow
  (package
    (inherit apache-arrow)
@@ -5985,7 +6117,6 @@ a Gtk.Grid Widget.")
           qhexedit
           qscintilla
           qtbase-5
-           qtwayland-5
           sqlite))
    (native-inputs (list qttools-5))
    (home-page "https://sqlitebrowser.org/")
@@ -6000,7 +6131,7 @@ compatible with SQLite using a graphical user interface.")
 (define-public sqlitestudio
  (package
    (name "sqlitestudio")
-    (version "3.4.19")
+    (version "3.4.18")
    (source
     (origin
       (method git-fetch)
@@ -6009,7 +6140,7 @@ compatible with SQLite using a graphical user interface.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1fvyd2l1pbpl4jgn7vp8j2gsmw0sbfzidyv3k87xm6a2d7i680yc"))))
+        (base32 "1chsm4hxy483hz569ywacysg4dh9ijis060s4rgydkgk49bbb2si"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -7,7 +7,6 @@
 ;;; Copyright © 2022, 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
-;;; Copyright © 2026 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -130,22 +129,6 @@ clients.")
      #:test-backend #~'unittest
      #:phases
      #~(modify-phases %standard-phases
-          (replace 'create-entrypoints
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let ((sitedir (site-packages inputs outputs))
-                    (interpreter (which "python"))
-                    (file-path (string-append #$output "/bin/xandikos")))
-                (mkdir-p (string-append #$output "/bin"))
-                (call-with-output-file file-path
-                  (lambda (port)
-                    (format port "#!~a -sP
-# Auto-generated entry point script.
-import sys
-import asyncio
-from xandikos.__main__ import main
-if __name__ == '__main__':
-    sys.exit(asyncio.run(main(sys.argv[1:])))~%" interpreter)))
-                (chmod file-path #o755))))
          (add-before 'check 'check-setup
            (lambda _
              (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2020-2026 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2020-2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2023, 2024 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -607,7 +607,7 @@ unpacking them into a directory which can eventually be chrooted into.")
                "0hw407fm5ylsf28b0vrwz7rm2r2rsgfwzajbkbn6n2b6kqhdjyy9"))))
    (build-system gnu-build-system)
    (native-inputs
-     (list autoconf automake gettext-minimal po4a-minimal))
+     (list autoconf automake gettext-minimal po4a))
    (home-page "https://packages.debian.org/unstable/debianutils")
    (synopsis "Miscellaneous shell utilities")
    (description
@@ -2061,12 +2061,6 @@ image files already supported by it.")
       (sha256
        (base32 "06h4g50qy1h77b4n28xbyzl2wvsblzs9qi63d7kvvm9x8n8whz92"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; Skip test that fails on later Python versions; code itself seems fine.
-      ;; See: <https://github.com/joke2k/django-environ/issues/574>.
-      #:test-flags
-      #~(list "-k" "not test_db_parsing")))
    (native-inputs (list python-pytest
                         python-setuptools
                         python-wheel))
@@ -441,8 +441,6 @@ accessing and converting various ebook file formats.")
          (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
    (native-inputs
     (list qtbase-5))
-    (inputs
-     (list qtwayland-5))
    (synopsis "EBook reader")
    (description "This package provides InkBox eBook reader.")
    (license license:gpl3)))
@@ -295,7 +295,7 @@ frequently used words in American English.")
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase    ;qtbase 6
                     #:tests? #f))      ;packages has no tests
-    (inputs (list qtbase qtmultimedia qtwayland))
+    (inputs (list qtbase qtmultimedia))
    (home-page "https://www.tipp10.com/en/")
    (synopsis "Touch typing tutor")
    (description "Tipp10 is a touch typing tutor.  The ingenious thing about
@@ -603,6 +603,231 @@ about drilling time and correctness ratio is displayed.  The results are
 stored and user can review his performance in any time.")
      (license license:gpl2+))))

+(define-public anki
+  (package
+    (name "anki")
+    ;; Later versions have dependencies on npm packages not yet in Guix.
+    (version "2.1.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://apps.ankiweb.net/downloads/archive/anki-"
+                           version "-source.tgz"))
+       (sha256
+        (base32 "1gfr51rnllkyzli73p4r51h5ypzfa3m7lic3m3rzpywmqwrxs07k"))
+       (modules '((guix build utils)))
+       ;; Fix preferences error: <https://issues.guix.gnu.org/65506>.
+       (snippet '(substitute* "aqt/preferences.py"
+                   (("qc\\['collapseTime']/60\\.0" x)
+                    (format #f "int(~a)" x))
+                   (("qc\\['timeLim']/60\\.0" x)
+                    (format #f "int(~a)" x))))
+       (patches (search-patches "anki-mpv-args.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags (list (string-append "PREFIX=" %output))
+       #:tests? #f                      ;no check target
+       #:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (ice-9 match))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-update-check
+           ;; Don't ‘phone home’ unasked to check for updates.
+           (lambda _
+             (substitute* "aqt/update.py"
+               (("requests\\.post")
+                "throw.an.exception.instead"))
+             #t))
+         (delete 'configure)            ;no configure script
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
+                   ;; List of paths to the site-packages directories of Python
+                   ;; library inputs.
+                   (site-packages
+                    (map (lambda (pyinput)
+                           (string-append
+                            (cdr pyinput)
+                            "/lib/python"
+                            ;; Calculate the python version to avoid breaking
+                            ;; with future 3.X releases.
+                            ,(version-major+minor
+                              (package-version python-wrapper))
+                            "/site-packages"))
+                         (filter (match-lambda
+                                   ((label . _)
+                                    (string-prefix? "python-" label)))
+                                 inputs))))
+               ;; PYTHONPATH is wrapped to avoid declaring Python libraries as
+               ;; propagated inputs.
+               (for-each (lambda (program)
+                           (wrap-program program
+                             `("PATH" prefix (,(string-append
+                                                (assoc-ref inputs "mpv")
+                                                "/bin")))
+                             `("GUIX_PYTHONPATH" = ,site-packages)))
+                         (find-files bin ".")))
+             #t)))))
+    (native-inputs
+     (list xdg-utils))
+    (inputs
+     `(("lame" ,lame)
+       ("mpv" ,mpv)
+       ("python" ,python-wrapper)
+       ("python-beautifulsoup4" ,python-beautifulsoup4)
+       ("python-decorator" ,python-decorator)
+       ("python-distro" ,python-distro)
+       ("python-jsonschema" ,python-jsonschema)
+       ("python-markdown" ,python-markdown)
+       ("python-pyaudio" ,python-pyaudio)
+       ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH.
+       ("python-pyqtwebengine" ,python-pyqtwebengine)
+       ("python-pyqt" ,python-pyqt)
+       ("python-requests" ,python-requests)
+       ("python-send2trash" ,python-send2trash)
+       ("python-sip" ,python-sip)
+       ;; `qtwebengine-5' is included in `pyqtwebengine', included here for easy
+       ;; wrapping.
+       ("qtwebengine-5" ,qtwebengine-5)))
+    (home-page "https://apps.ankiweb.net/")
+    (synopsis "Powerful, intelligent flash cards")
+    (description "Anki is a program which makes remembering things
+easy.  Because it's a lot more efficient than traditional study
+methods, you can either greatly decrease your time spent studying, or
+greatly increase the amount you learn.
+
+Anyone who needs to remember things in their daily life can benefit
+from Anki.  Since it is content-agnostic and supports images, audio,
+videos and scientific markup (via LaTeX), the possibilities are
+endless.  For example:
+@itemize
+@item Learning a language
+@item Studying for medical and law exams
+@item Memorizing people's names and faces
+@item Brushing up on geography
+@item Mastering long poems
+@item Even practicing guitar chords!
+@end itemize")
+    (license license:agpl3+)))
+
+(define-public t4k-common
+  (package
+    (name "t4k-common")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tux4kids/t4kcommon")
+             (commit (string-append "upstream/" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "13q02xpmps9qg8zrzzy2gzv4a6afgi28lxk4z242j780v0gphchp"))
+       (patches (search-patches "t4k-common-libpng16.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        `(begin
+           (substitute* "src/t4k_common.h"
+             (("char wrapped_lines") "extern char wrapped_lines"))
+           #t))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f                      ;FIXME: cannot find how to run tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'set-paths 'set-sdl-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "CPATH"
+                     (string-append
+                      (search-input-directory inputs "/include/SDL")
+                      ":" (or (getenv "CPATH") "")))))
+         (add-after 'unpack 'fix-andika-font-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "src/t4k_sdl.c"
+               (("(/usr/share/.*?)/AndikaDesRevG\\.ttf")
+                (string-append (assoc-ref inputs "font-andika")
+                               "/share/fonts/truetype")))
+             #t)))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     `(("font-andika" ,font-sil-andika)
+       ("libpng" ,libpng)
+       ("librsvg" ,(librsvg-for-system))
+       ("libxml2" ,libxml2)
+       ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))))
+    (home-page "https://github.com/tux4kids/t4kcommon")
+    (synopsis "Library of code shared between TuxMath and TuxType")
+    (description "Tux4Kids-Common is a library of code shared between
+TuxMath and TuxType.")
+    (license license:gpl3+)))
+
+(define-public tuxmath
+  (package
+    (name "tuxmath")
+    (version "2.0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tux4kids/tuxmath")
+             (commit (string-append "upstream/" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1f1pz83w6d3mbik2h6xavfxmk5apxlngxbkh80x0m55lhniwkdxv"))
+       (modules '((guix build utils)))
+       ;; Unbundle fonts.
+       (snippet
+        `(begin
+           ;; Remove duplicate definition.
+           (substitute* "src/menu_lan.c"
+             (("lan_player_type.*MAX_CLIENTS\\];") ""))
+           (for-each delete-file (find-files "data/fonts" "\\.ttf$"))
+           #t))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ;no test
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'set-paths 'set-sdl-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "CPATH"
+                     (string-append
+                      (search-input-directory inputs "/include/SDL")
+                      ":"
+                      (or (getenv "CPATH") "")))))
+         (add-after 'install 'install-desktop-file
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (apps (string-append out "/share/applications"))
+                    (pixmaps (string-append out "/share/pixmaps")))
+               (install-file "tuxmath.desktop" apps)
+               (for-each (lambda (f) (install-file f pixmaps))
+                         (find-files "data/images/icons/"
+                                     "tuxmath\\.(png|ico|svg)$"))
+               #t))))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     `(("librsvg" ,(librsvg-for-system))
+       ("libxml2" ,libxml2)
+       ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-net sdl-pango)))
+       ("t4k-common" ,t4k-common)))
+    (home-page "https://github.com/tux4kids/tuxmath")
+    (synopsis "Educational math tutorial game")
+    (description "@emph{Tux, of Math Command} is an educational math
+tutorial game starring Tux, the Linux penguin, in which you play the
+part of Commander Tux, as he defends his friends from an attack of
+math equations.  Comets are crashing towards the friendly penguins in
+their igloos, and you must destroy the comets by solving their
+equations.
+
+TuxMath also includes Factoroids, a game that gives practice in
+factoring numbers and simplifying fractions, as well as zapping rocks
+floating through space.")
+    (license license:gpl3+)))
+
 (define-public libeb
  (package
    (name "libeb")
@@ -655,7 +880,6 @@ formats.")
           qtmultimedia-5
           qtquickcontrols2-5
           qtdeclarative-5
-           qtwayland-5
           qtwebchannel-5
           qtwebengine-5
           zlib))
@@ -2,12 +2,11 @@
 ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2024 Juliana Sims <juli@incana.org>
-;;; Copyright © 2025, 2026 Cayetano Santos <csantosb@inventati.org>
+;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
 ;;; Copyright © 2015-2025 Ricardo Wurmus <rekado@elephly.net>
@@ -27,8 +26,6 @@
 ;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2025, 2026 Gabriel Wicki <gabriel@erlikon.ch>
-;;; Copyright © 2026 Thomas Kramer <thomas@f-si.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -73,7 +70,6 @@
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages curl)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages elf)
  #:use-module (gnu packages engineering)
@@ -93,8 +89,6 @@
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages graphviz)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages java)
  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libftdi)
@@ -213,8 +207,8 @@ are also taken from the original.")
      (license license:gpl3+))))

 (define-public abc
-  (let ((commit "c18b9a24de46d3b0209afa416511b7a1127344f9")
-        (revision "9"))
+  (let ((commit "ee04349aee0a11d5ce0ad39b0de80e3cb366087e")
+        (revision "8"))
    (package
      (name "abc")
      (version (git-version "0.0" revision commit))
@@ -226,7 +220,7 @@ are also taken from the original.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "12fjhlr9r34l6kw2jyaalh53fs783r1h2zx0ldzaxxrbcslb0bxh"))))
+                  "0y00c9h54dkcnidgyw45czxrkxb7yg5pbw9hhipgjw7qswjh8yb2"))))
      (build-system gnu-build-system)
      (inputs
       (list readline))
@@ -251,7 +245,7 @@ formal verification.")
  (package
    (inherit abc)
    (name "abc-yosyshq")
-    (version "0.61")
+    (version "0.60")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -260,7 +254,7 @@ formal verification.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0x6662719qdybkd46vh9aq3p20xngwn9g81155j96a4r6jdqm1js"))))
+                "0yays5yznwm1mngda78w465l9djw4128hgn24lf76gzripkpsz92"))))
    (home-page "https://github.com/YosysHQ/abc/")
    (description "ABC is a program for sequential logic synthesis and
 formal verification.  This is the Yosyshq fork of ABC.")
@@ -523,62 +517,6 @@ as well as pick-place files.")
    (properties '((lint-hidden-cve . ("CVE-2023-4508"))))
    (license license:gpl2+)))

-(define-public gnucap
-  (package
-    (name "gnucap")
-    (version "20171003")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-"
-             version ".tar.gz"))
-       (sha256
-        (base32
-         "16m09xa685qhj5fqq3bcgakrwnb74xhf5f7rpqkkf9fg8plzbb1g"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            (lambda _
-              ;; Set correct rpath so that gnucap finds libgnucap.so.
-              (substitute* (list "apps/configure" "lib/configure"
-                                 "main/configure" "modelgen/configure")
-                (("LDFLAGS =")
-                 (string-append "LDFLAGS = -Wl,-rpath=" #$output "/lib")))
-              ;; gnucap uses a hand-written configure script that expects the
-              ;; --prefix argument to be the first argument passed to it.
-              (invoke "./configure" (string-append "--prefix=" #$output))))
-          (replace 'check
-            ;; Attention: As discussed, a failing test in gnucap does not mean
-            ;; the build process has failed.  Therefor we ignore, but still
-            ;; display the result of gnucap's test evaluation.
-            ;; https://codeberg.org/guix/guix/issues/5469#issuecomment-9695825
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (let ((libpath "../lib/O:../apps/O"))
-                  (with-directory-excursion "tests"
-                    ;; Fix expected plugin search path for test c_attach.1.gc
-                    (substitute* "==out/c_attach.1.gc.out"
-                      (("/usr/local/lib/gnucap")
-                       (string-append libpath ":" #$output "/lib/gnucap")))
-                    ;; Set library path so that gnucap can find libgnucap.so
-                    ;; while running the tests.
-                    (setenv "LD_LIBRARY_PATH" libpath)
-                    (invoke "./test"
-                            "../main/O/gnucap" "" "test-output"
-                            "==out")))))))))
-    (inputs (list readline))
-    (home-page "https://www.gnu.org/software/gnucap/")
-    (synopsis "Mixed analog and digital circuit simulator")
-    (description "GNUcap is a circuit analysis package used for @acronym{EDA,
-Electronic Design Automation}.  It offers a general purpose circuit simulator
-and can perform DC and transient analyses, fourier analysis and AC analysis.
-The engine is designed to do true mixed-mode simulation.")
-    (license license:gpl3+)))
-
 (define-public gtkwave
  ;; The last release is more than 2 years old, and there are improvements in
  ;; the master branch, such as GTK 4 support: pick the latest commit that
@@ -903,54 +841,6 @@ chip cross-sections basked on mask data.")
    ;; The license version will be clarified with the next version bump.
    (license license:gpl3+)))

-(define-public lctime
-  (package
-    (name "lctime")
-    (version "0.0.28")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/librecell/lctime")
-             (commit version)))
-       (sha256
-        (base32 "18s7by4ndxxha1yr6sns389smgrz9df5sgqwvvxcw8wwv8v7mpjd"))
-       (file-name (git-file-name name version))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-ngspice-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "src/lctime/characterization/ngspice_subprocess.py"
-                (("= 'ngspice'")
-                 (format #f "= ~s"
-                         (search-input-file inputs "bin/ngspice"))))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "bash" "./run_tests.sh")))))))
-    (inputs (list ngspice
-                  pyspice
-                  python-joblib
-                  python-klayout
-                  python-liberty-parser
-                  python-networkx
-                  python-numpy
-                  python-ply
-                  python-requests
-                  python-scipy
-                  python-sympy))
-    (native-inputs (list bash-minimal python-pytest python-setuptools))
-    (home-page "https://codeberg.org/librecell/lctime")
-    (synopsis "CMOS standard-cell characterization tool")
-    (description
-     "lctime extracts timing and power characteristics of CMOS standard-cells.
-It simulates the netlists of the cells with ngspice and writes the
-characterization result in a liberty library file.")
-    (license license:agpl3+)))
-
 (define-public libngspice
  ;; Note: The ngspice's build system does not allow us to build both the
  ;; library and the executables in one go.  Thus, we have two packages.
@@ -1604,7 +1494,7 @@ understand and improve testbench coverage.")
 (define-public openboardview
  (package
    (name "openboardview")
-    (version "9.95.2")
+    (version "9.95.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1626,7 +1516,7 @@ understand and improve testbench coverage.")
                               "openboardview-use-system-mpc.patch"))
              (sha256
               (base32
-                "1gkl91rcbwiapllxw5chwgzjq2p076h9bpp3nbh13mb2v3wc6qwa"))))
+                "1safjd729a7591rigkiy3c678bivrj5q1qwg1f18sijhlsfkf5b3"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -1665,14 +1555,16 @@ understand and improve testbench coverage.")
            (assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap)))))
    (native-inputs
     (list pkg-config
-           python-minimal-wrapper
+           python
           glad-0.1
           stb-image
           utf8-h))
    (inputs
     (list fontconfig
           gtk+
-           imgui
+           ;; OpenBoardView can build with Dear ImGui 1.88, but there are some
+           ;; usability problems such as the difficulty to register clicks.
+           imgui-1.87
           orangeduck-mpc
           sdl2
           sqlite
@@ -1963,40 +1855,33 @@ GUI for sigrok.")
       (sha256
        (base32 "1dq56h51ydfpffd00qz9qkcg6sddlqixiixls9vvxczfkp9l21ws"))))
    (outputs
-     '("out" "osvvm"))
+     '("out" "common" "scripts" "uart" "axi4"))
    (properties
-     `((output-synopsis "out" "Instance this design library as work")
-       (output-synopsis "osvvm" "Instance this design library as osvvm")))
+     `((output-synopsis "out" "Verification Utility Library")
+       (output-synopsis "common" "Common library")
+       (output-synopsis "scripts" "Simulator script library")
+       (output-synopsis "uart" "UART Verification Component Library")
+       (output-synopsis "axi4" "AXI4 Verification Component Library")))
    (build-system copy-build-system)
    (arguments
     (list
      #:install-plan
-      #~'(;; Library work.
-          ("osvvm" "share/osvvm/work/osvvm/"
-           #:include ("vhd" "pro" "md"))
-          ("Common" "share/osvvm/work/Common/"
-           #:include ("vhd" "pro" "md"))
-          ("Scripts" "share/osvvm/work/Scripts/"
-           #:include ("tcl" "md"))
-          ("UART" "share/osvvm/work/UART"
+      #~'(("osvvm" "share/osvvm/osvvm/"
           #:include ("vhd" "pro" "md")
-           #:exclude-regexp ("GHDL_Debug"))
-          ("AXI4" "share/osvvm/work/AXI4"
-           #:include ("vhd" "pro" "md"))
-          ;; Library osvvm.
-          ("osvvm" "share/osvvm/osvvm/osvvm/"
-           #:include ("vhd" "pro" "md") #:output "osvvm")
-          ("Common" "share/osvvm/osvvm/Common/"
-           #:include ("vhd" "pro" "md") #:output "osvvm")
-          ("Scripts" "share/osvvm/osvvm/Scripts/"
-           #:include ("tcl" "md") #:output "osvvm")
-          ("UART" "share/osvvm/osvvm/UART"
+           #:output "out")
+          ("Common" "share/osvvm/Common/"
+           #:include ("vhd" "pro" "md")
+           #:output "common")
+          ("Scripts" "share/osvvm/Scripts/"
+           #:include ("tcl" "md")
+           #:output "scripts")
+          ("UART" "share/osvvm/UART"
           #:include ("vhd" "pro" "md")
           #:exclude-regexp ("GHDL_Debug")
-           #:output "osvvm")
-          ("AXI4" "share/osvvm/osvvm/AXI4"
+           #:output "uart")
+          ("AXI4" "share/osvvm/AXI4"
           #:include ("vhd" "pro" "md")
-           #:output "osvvm"))
+           #:output "axi4"))
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'install 'fix-scripts
@@ -2017,7 +1902,7 @@ GUI for sigrok.")
     (list nvc tcl tcllib which))
    (native-search-paths
     (list (search-path-specification
-             (variable "FW_OSVVM")
+             (variable "OSVVM")
             (separator #f)
             (files (list "share/osvvm")))))
    (home-page "https://osvvm.github.io/Overview/Osvvm1About.html/")
@@ -2045,22 +1930,18 @@ verification.")
        (base32
         "1792a6i9jq2yawipmk0nr01z092kx3kkav9v5sjf34khk3biav6q"))))
    (outputs
-     '("out" "olo"))
+     '("out" "test"))
    (properties
-     `((output-synopsis "out" "Instance this design library as work")
-       (output-synopsis "olo" "Instance this design library as olo")))
+     `((output-synopsis "test" "Testing code")
+       (output-synopsis "out" "Source code")))
    (build-system copy-build-system)
    (arguments
     (list
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'install 'check
-            (lambda* (#:key tests? inputs #:allow-other-keys)
+            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-                (with-directory-excursion "3rdParty/en_cl_fix/sim"
-                  (invoke "python3" "run.py" "--simulator" "nvc"
-                          "--simulator-path"
-                          (dirname (search-input-file inputs "bin/nvc"))))
                (with-directory-excursion "sim"
                  (substitute* "run.py"
                    ;; This is required to comply with current VUnit, see:
@@ -2069,21 +1950,14 @@ verification.")
                     ""))
                  (invoke "python3" "run.py" "--nvc" "-v"))))))
      #:install-plan
-      #~'(;; Library work.
-          ("src" "share/open-logic/work/src"
-           #:include ("vhd"))
-          ("3rdParty" "share/open-logic/work/3rdParty"
-           #:include ("vhd"))
-          ;; Library olo.
-          ("src" "share/open-logic/olo/src"
-           #:include ("vhd") #:output "olo")
-          ("3rdParty" "share/open-logic/olo/3rdParty"
-           #:include ("vhd") #:output "olo"))))
+      #~'(("src" "share/open-logic/src" #:exclude-regexp ("core"))
+          ("3rdParty" "share/open-logic/3rdParty")
+          ("test" "share/open-logic/test" #:output "test"))))
    (native-inputs
     (list nvc python-matplotlib python-minimal python-vunit))
    (native-search-paths
     (list (search-path-specification
-             (variable "FW_OPEN_LOGIC")
+             (variable "OPEN_LOGIC")
             (separator #f)
             (files (list "share/open-logic")))))
    (home-page "https://github.com/open-logic/open-logic/")
@@ -2203,228 +2077,6 @@ programming language, as well as evaluation board definitions and a System on
 Chip toolkit.")
    (license license:bsd-3)))

-(define-public python-klayout
-  (package
-    (name "python-klayout")
-    (version "0.30.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/klayout/klayout")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1ixl8wzpiaw6frb28x9y9jy3fvhjclmn4xl77i72rs37rf4i2a2s"))
-       (file-name (git-file-name name version))))
-    (build-system pyproject-build-system)
-    (arguments
-     '(#:tests? #f))
-    (native-inputs (list curl expat libpng python-setuptools python-tomli))
-    (home-page "https://klayout.de")
-    (synopsis "Mask layout library for Python")
-    (description
-     "python-klayout is a standalone Python API of KLayout.
-This library supports OASIS and GDS2 file formats,
-editing of mask layouts, and verification such as
-@acronym{DRC, Design rule checking} and @acronym{LVS, Layout Versus Schematic}.")
-    (license license:gpl3+)))
-
-(define-public python-liberty-parser
-  (package
-    (name "python-liberty-parser")
-    (version "0.0.27")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/tok/liberty-parser")
-             (commit version)))
-       (sha256
-        (base32 "0x8spiy4sxjma3dxvynax8hbzyxl90bgws00cqxazy95wyfbngar"))
-       (file-name (git-file-name name version))))
-    (build-system pyproject-build-system)
-    (propagated-inputs (list python-lark python-numpy python-sympy))
-    (native-inputs (list python-pytest python-setuptools))
-    (home-page "https://codeberg.org/tok/liberty-parser")
-    (synopsis "Parser for Liberty timing libraries")
-    (description
-     "The @code{liberty-parser} Python library provides a parser
-and data structures for the Liberty format,
-a standard file format used in @acronym{EDA, Electronic Design Automation}
-for example for timing information of digital circuits.")
-    (license license:gpl3+)))
-
-(define-public python-hdlconvertorast
-  (package
-    (name "python-hdlconvertorast")
-    (version "1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Nic30/hdlConvertorAst")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zv067imbdihyqwy7f0j80x9a2857vifhky60vc91dffjl1zjg1i"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
-    (home-page "https://github.com/Nic30/hdlConvertorAst")
-    (synopsis "@acronym{AST, Abstract Syntax Tree} library for VHDL and
-SystemVerilog")
-    (description
-     "This package provides a library of @acronym{AST, Abstract Syntax Tree} nodes
-for @acronym{VHDL, Very high speed integrated circuit Hardware Description Language},
-SystemVerilog, and SystemC, with conversion between languages and to JSON.")
-    (license license:expat)))
-
-;; Yosys source pinned to hdlConvertor v2.3 submodule commit for parsing tests.
-(define yosys-src-for-hdlconvertor-tests
-  (origin
-    (method git-fetch)
-    (uri (git-reference
-           (url "https://github.com/YosysHQ/yosys")
-           (commit "a299e606f864942c7edf90c4ad3998f4f4a346cf")))
-    (file-name "yosys-src-for-hdlconvertor-tests")
-    (sha256
-     (base32 "106bzlljn6843740r8rbaqf5ivkyfcgp25dgzds97j48ypmv6fih"))))
-
-(define-public python-hdlconvertor
-  (package
-    (name "python-hdlconvertor")
-    (version "2.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Nic30/hdlConvertor")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0xa7wm324dwp4wks8l9njpd2bz4gn7dfygdc3a78lxy1prvzbyyz"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; Ignore tests inside yosys source tree (they're unrelated yosys tests).
-      #~(list "--ignore=tests/yosys")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'setup-antlr
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Build classpath from input jars.
-              (let* ((st4 (search-input-file inputs
-                            "share/java/java-stringtemplate-4.0.8.jar"))
-                     (antlr4 (search-input-file inputs
-                               "share/java/antlr4.jar"))
-                     (antlr4-rt (search-input-file inputs
-                                  "share/java/java-antlr4-runtime.jar"))
-                     (antlr3 (search-input-file inputs
-                               "share/java/antlr3-3.5.2.jar"))
-                     (treelayout (search-input-file inputs
-                                   "share/java/java-treelayout-1.0.3.jar"))
-                     (classpath (string-join (list st4 antlr4 antlr4-rt
-                                                   antlr3 treelayout)
-                                             ":"))
-                     (antlr4cpp-include (search-input-directory
-                                          inputs "include/antlr4-runtime"))
-                     (antlr4cpp-lib (search-input-file
-                                      inputs "lib/libantlr4-runtime.so"))
-                     (python-include (search-input-directory
-                                       inputs "include/python3.11")))
-                ;; Patch CMake to use our paths directly.
-                (substitute* "src/CMake_antlr4.txt"
-                  (("set\\(ANTLR_CLASSPATH \"\"\\)")
-                   (string-append "set(ANTLR_CLASSPATH \"" classpath "\")"))
-                  ;; Skip the jar search loop.
-                  (("FOREACH\\(antlr_jar \\$\\{ANTLR_JARS\\}\\)")
-                   "FOREACH(antlr_jar )")
-                  ;; Set C++ runtime paths before find commands.
-                  (("# search for antlr4 include dir and library")
-                   (string-append
-                    "# search for antlr4 include dir and library\n"
-                    "set(ANTLR4CPP_INCLUDE_DIRS \"" antlr4cpp-include "\")\n"
-                    "set(ANTLR4CPP_LIBRARIES \"" antlr4cpp-lib "\")\n")))
-                ;; hdlConvertor/CMakeLists.txt is a sibling subdirectory to src/
-                ;; so variables set in src/CMake_antlr4.txt aren't visible here;
-                ;; inject both ANTLR and Python include paths before
-                ;; include_directories.
-                (substitute* "hdlConvertor/CMakeLists.txt"
-                  (("include_directories\\(")
-                   (string-append
-                    "set(ANTLR4CPP_INCLUDE_DIRS \"" antlr4cpp-include "\")\n"
-                    "set(PYTHON_INCLUDE_DIRS \"" python-include "\")\n"
-                    "include_directories(")))
-                ;; ANTLR4 4.10+ changed from .as<T>() to std::any_cast<T>().
-                ;; Upstream fixed this in commit 8b07c10 using preprocessor
-                ;; conditionals to support both old and new APIs, but that
-                ;; commit also includes unrelated changes (Block statement
-                ;; support).  We apply a simplified fix for ANTLR 4.10+
-                ;; only.
-                (substitute* "src/verilogPreproc/verilogPreproc.cpp"
-                  (("visitMacro_call\\(mc, false\\)\\.as<string>\\(\\)")
-                   "std::any_cast<string>(visitMacro_call(mc, false))")
-                  (("params = visitDefine_args\\(da\\);")
-                   (string-append "params = std::any_cast<"
-                                  "vector<MacroDefVerilog::param_info_t>*"
-                                  ">(visitDefine_args(da));"))))))
-          (add-before 'check 'prepare-tests
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Symlink yosys source for yosys testsuite.
-              (delete-file-recursively "tests/yosys")
-              (symlink (assoc-ref inputs "yosys-src-for-hdlconvertor-tests")
-                       "tests/yosys")
-              ;; Remove source hdlConvertor/ which shadows the installed package.
-              (delete-file-recursively "hdlConvertor")
-              ;; Replace tests/__init__.py which imports all.py that requires
-              ;; git submodules; also delete tests requiring external tools.
-              (call-with-output-file "tests/__init__.py"
-                (lambda (port)
-                  (display "" port)))
-              (delete-file "tests/all.py")
-              (for-each delete-file
-                        (find-files "tests" "test_ghdl"))
-              (for-each delete-file
-                        (find-files "tests" "test_icarus"))
-              (for-each delete-file
-                        (find-files "tests" "test_verilator"))
-              (for-each delete-file
-                        (find-files "tests" "test_uvvm"))
-              (for-each delete-file
-                        (find-files "tests" "test_vunit"))
-              (for-each delete-file
-                        (find-files "tests" "test_notebook"))
-              (for-each delete-file
-                        (find-files "tests" "test_basic_hdl_sim")))))))
-    (native-inputs
-     (list antlr4                  ; parser generator tool (antlr4.jar)
-           antlr3                  ; antlr3-runtime.jar required by hdlConvertor build
-           java-antlr4-runtime     ; antlr4-runtime.jar required by hdlConvertor build
-           java-stringtemplate     ; stringtemplate4.jar required by hdlConvertor build
-           java-treelayout         ; treelayout.jar required by hdlConvertor build
-           (list openjdk "jdk")    ; Java runtime to execute ANTLR4
-           ;;; Python build dependencies:
-           python-cython           ; compiles .pyx extension files to C++
-           python-scikit-build     ; CMake-based Python build system
-           python-setuptools
-           python-wrapper          ; Python interpreter for build scripts
-           python                  ; Python headers for C extension building
-           python-pytest
-           ;; Yosys source for parsing tests.
-           yosys-src-for-hdlconvertor-tests))
-    (inputs
-     (list java-antlr4-runtime-cpp))
-    (propagated-inputs
-     (list python-hdlconvertorast))
-    (home-page "https://github.com/Nic30/hdlConvertor")
-    (synopsis "VHDL and System Verilog parser")
-    (description "This package provides a @acronym{VHDL, Very high speed
-integrated circuit Hardware Description Language} and SystemVerilog
-parser library for Python.")
-    (license license:expat)))
-
 (define-public python-pyucis
  (package
    (name "python-pyucis")
@@ -2867,7 +2519,7 @@ to enforce it.")
 (define-public python-vunit
  (package
    (name "python-vunit")
-    (version "5.0.0-dev.7") ;v4.7.0 dates back from 2 years ago.
+    (version "5.0.0-dev.6") ;v4.7.0 dates back from 2 years ago.
    (source
     (origin
       (method git-fetch)
@@ -2876,7 +2528,7 @@ to enforce it.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12xkjc98913zyb271k9qfl86wdj2fsbcjl0lv1lb4492j5iqfcgj"))))
+        (base32 "1si542jrrvibiigaridg2vds5smbiass7g5pdfk5z26xqgbh0fxc"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -2905,7 +2557,7 @@ to enforce it.")
                 (search-input-directory inputs "share/json-for-vhdl")
                 (string-append site-packages "JSON-for-VHDL/src"))
                (symlink
-                 (search-input-directory inputs "share/osvvm/work/osvvm")
+                 (search-input-directory inputs "share/osvvm/osvvm")
                 (string-append site-packages "osvvm")))))
          (add-after 'check 'run-examples
            ;; Run examples as an extra check.
@@ -2943,7 +2595,8 @@ to enforce it.")
     (list nvc
           python-pytest
           python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
    (inputs
     (list json-for-vhdl-for-vunit osvvm-2023.04))
    (propagated-inputs
@@ -3707,7 +3360,7 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.61")
+    (version "0.60")
    (source
     (origin
       (method git-fetch)
@@ -3715,7 +3368,7 @@ parallel computing platforms.  It also supports serial execution.")
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1z96wvgm12vcsp88xkdljvhrrx9b8wc9y2gwjsff83jsp2q0q2wp"))
+        (base32 "13ygzsx81a32nmqqs5rn8w419dcx7s822bh9l2zc82jphy54nc3s"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -16,7 +16,7 @@
 ;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2016-2022, 2024–2026 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016-2022, 2024–2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Clément Lassieur <clement@lassieur.org>
@@ -97,7 +97,7 @@
 ;;; Copyright © 2021, 2022 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org>
-;;; Copyright © 2021, 2024, 2025 Zheng Junjie <z572@z572.online>
+;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021 David Dashyan <mail@davie.li>
 ;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev>
 ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
@@ -154,7 +154,7 @@
 ;;; Copyright © 2025 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2025 Skylar Hill <stellarskylark@posteo.net>
-;;; Copyright © 2025, 2026 Cayetano Santos <csantosb@inventati.org>
+;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025 Lee Thompson <lee.p.thomp@gmail.com>
 ;;; Copyright @ 2025 Amy Pillow <amypillow@lavache.com>
 ;;; Copyright © 2025 Kurome <hunt31999@gmail.org>
@@ -164,7 +164,6 @@
 ;;; Copyright @ 2025 Nik Gaffney <nik@fo.am>
 ;;; Copyright © 2025 Untrusem <mysticmoksh@riseup.net>
 ;;; Copyright © 2025 case_lambda <case_lambda@disroot.org>
-;;; Copyright © 2026 Kenny Ballou <kb@devnulllabs.io>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -229,11 +228,11 @@
  #:use-module (gnu packages haskell)
  #:use-module (gnu packages haskell-apps)
  #:use-module (gnu packages ibus)
+  #:use-module (gnu packages idris)
  #:use-module (gnu packages java)
  #:use-module (gnu packages julia-xyz)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
-  #:use-module (gnu packages ocr)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages python-check)
@@ -2544,7 +2543,7 @@ Forgejo-based (e.g. Codeberg) repositories.")
 (define-public emacs-magit
  (package
    (name "emacs-magit")
-    (version "4.5.0")
+    (version "4.4.2")
    (source
     (origin
       (method git-fetch)
@@ -2553,7 +2552,7 @@ Forgejo-based (e.g. Codeberg) repositories.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "04yxjkv5h3arcj1s0nq9kyh3l1z4c9wml35vb67jvv1h7mslwz55"))))
+        (base32 "0lsxldyjv2h69657pgrblhkxq8fvc0xdwlwpfmd09pb8zawygh2g"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -2566,9 +2565,7 @@ Forgejo-based (e.g. Codeberg) repositories.")
              (invoke "make" "-C" ".." "info")
              ;; Copy info files to the lisp directory, which acts as
              ;; the root of the project for the emacs-build-system.
-              (for-each (lambda (file)
-                          (install-file file "../lisp"))
-                        (find-files "../docs" "\\.info"))))
+              (rename-file "../docs/magit.info" "../lisp/magit.info")))
          (add-after 'unpack 'patch-version-executables
            (lambda* (#:key inputs #:allow-other-keys)
              (emacs-substitute-variables "magit.el"
@@ -3076,25 +3073,6 @@ mode line as @samp{[ status | name (primary) secondary ]}.  It can be
 displayed at the bottom or at the top.")
      (license license:gpl3+))))

-(define-public emacs-nftables-mode
-  (package
-    (name "emacs-nftables-mode")
-    (version "1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/nftables-mode-"
-                           version ".tar"))
-       (sha256
-        (base32 "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv"))))
-    (build-system emacs-build-system)
-    (arguments (list #:tests? #f))
-    (home-page "https://elpa.gnu.org/packages/nftables-mode.html")
-    (synopsis "Major mode for editing netfilter rules")
-    (description "This major mode offers basic highlighting and primitive
-indentation for @acronym{NFT, netfilter rule files}.")
-    (license license:gpl3+)))
-
 (define-public emacs-moody
  (package
    (name "emacs-moody")
@@ -6365,7 +6343,7 @@ Emacs buffer.")
 (define-public emacs-varuga
  (package
    (name "emacs-varuga")
-    (version "0.2.0")
+    (version "0.1.0")
    (source
     (origin
       (method git-fetch)
@@ -6375,7 +6353,7 @@ Emacs buffer.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1x7jzvg1dxv381qlqdsa3knj3i4xcv6gy16834wzpfkfz6jb0240"))))
+         "01hlnhqhys8qzfwhza1ypc436zg5lhlkx5yy71bhmrbmyfzfh0fr"))))
    (build-system emacs-build-system)
    (home-page "https://git.systemreboot.net/varuga/about/")
    (synopsis "Send iCal calendar invites by email")
@@ -6537,44 +6515,38 @@ Its features are:
    (license (list license:unlicense license:wtfpl2))))

 (define-public emacs-citeproc
-  ;; A more recent commit is necessary for compatibility with the
-  ;; built-in emacs-org.
-  (let ((commit "a3d62ab8e40a75fcfc6e4c0c107e3137b4db6db8")
-        (revision "0"))
-    (package
-      (name "emacs-citeproc")
-      (version (git-version "0.9.4" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/andras-simonyi/citeproc-el")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1ffxh22xhzg582hbpsxr6cyjfyvvv5yqn3k39qxmkxbxk0g6hair"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f                     ;tests require missing data
-        #:emacs emacs-no-x              ;needs libxml support
-        #:test-command #~(list "make" "test_internals" "CASK_EXEC=")))
-      (native-inputs (list emacs-ert-runner emacs-ht emacs-yaml))
-      (propagated-inputs (list emacs-compat
-                               emacs-dash
-                               emacs-f
-                               emacs-parsebib
-                               emacs-queue
-                               emacs-s
-                               emacs-string-inflection))
-      (home-page "https://github.com/andras-simonyi/citeproc-el")
-      (synopsis "@acronym{CSL, Citation Style Language} processor for Emacs")
-      (description
-       "Citeproc is an Emacs Lisp library for rendering citations and
-bibliographies in styles described in the @acronym{CSL, Citation Style
-Language}, an XML-based, open format to describe the formatting of
-bibliographic references.")
-      (license license:gpl3+))))
+  (package
+    (name "emacs-citeproc")
+    (version "0.9.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/andras-simonyi/citeproc-el")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1l74c2f2xjzsp3i331sw3db4fhbvdbwyd856j1ygldwrh4rli9ml"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:emacs emacs ;need libxml support
+      #:tests? #f)) ;tests require missing data
+    (propagated-inputs (list emacs-compat
+                             emacs-dash
+                             emacs-f
+                             emacs-parsebib
+                             emacs-queue
+                             emacs-s
+                             emacs-string-inflection))
+    (home-page "https://github.com/andras-simonyi/citeproc-el")
+    (synopsis "Citation Style Language (CSL) processor for Emacs")
+    (description
+     "Citeproc-el is an Emacs Lisp library for rendering citations
+and bibliographies in styles described in the Citation Style
+Language (CSL), an XML-based, open format to describe the formatting
+of bibliographic references.")
+    (license license:gpl3+)))

 (define-deprecated-package emacs-citeproc-el
  emacs-citeproc)
@@ -6582,7 +6554,7 @@ bibliographic references.")
 (define-public emacs-corfu
  (package
    (name "emacs-corfu")
-    (version "2.7")
+    (version "2.6")
    (source
     (origin
       (method git-fetch)
@@ -6591,7 +6563,7 @@ bibliographic references.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1x4jaf234x3scq7lq43pgnyn3qz3p441nc5whx4azb2v4chmrpym"))))
+        (base32 "0psy7ximwnansy9pppcw1l2fryr15v2vqgj81q649743py6nd60l"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -7626,7 +7598,7 @@ during idle time, while Emacs is doing nothing else.")
 (define-public emacs-pdf-tools
  (package
    (name "emacs-pdf-tools")
-    (version "1.3.0")
+    (version "1.1.0")
    (source
     (origin
       (method git-fetch)
@@ -7635,57 +7607,57 @@ during idle time, while Emacs is doing nothing else.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0lf6ksly7w27n00ymrgxn1xyzpx9bmld4dzn90ki07yph6js7h8x"))))
+        (base32 "1v861fpzck3ky21m4g42h6a6y0cbhc4sjzpzqx0zxd7sfi7rn768"))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:tests? #f                       ;TODO: Run the tests.
-      #:modules '((guix build gnu-build-system)
+     `(#:tests? #f                      ; there are no tests
+       #:modules ((guix build gnu-build-system)
                  ((guix build emacs-build-system) #:prefix emacs:)
                  (guix build utils)
                  (guix build emacs-utils))
-      #:imported-modules `(,@%default-gnu-imported-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                           (guix build emacs-build-system)
                           (guix build emacs-utils))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; Build server side using 'gnu-build-system'.
-          (add-after 'unpack 'enter-server-dir
-            (lambda _ (chdir "server")))
-          (add-after 'enter-server-dir 'autogen
-            (lambda _
-              (invoke "bash" "autogen.sh")))
-          ;; Build emacs side using 'emacs-build-system'.
-          (add-after 'compress-documentation 'enter-lisp-dir
-            (lambda _ (chdir "../lisp")))
-          (add-after 'enter-lisp-dir 'emacs-patch-variables
-            (lambda _
-              (for-each make-file-writable (find-files "."))
+       #:phases
+       (modify-phases %standard-phases
+         ;; Build server side using 'gnu-build-system'.
+         (add-after 'unpack 'enter-server-dir
+           (lambda _ (chdir "server")))
+         (add-after 'enter-server-dir 'autogen
+           (lambda _
+             (invoke "bash" "autogen.sh")))
+         ;; Build emacs side using 'emacs-build-system'.
+         (add-after 'compress-documentation 'enter-lisp-dir
+           (lambda _ (chdir "../lisp")))
+         (add-after 'enter-lisp-dir 'emacs-patch-variables
+           (lambda* (#:key outputs #:allow-other-keys)
+             (for-each make-file-writable (find-files "."))

-              ;; Set path to epdfinfo program.
-              (emacs-substitute-variables "pdf-info.el"
-                ("pdf-info-epdfinfo-program"
-                 (string-append #$output "/bin/epdfinfo")))
-              ;; Set 'pdf-tools-handle-upgrades' to nil to avoid "auto
-              ;; upgrading" that pdf-tools tries to perform.
-              (emacs-substitute-variables "pdf-tools.el"
-                ("pdf-tools-handle-upgrades" '()))))
-          (add-after 'enter-lisp-dir 'emacs-make-autoloads
-            (assoc-ref emacs:%standard-phases 'make-autoloads))
-          (add-after 'emacs-patch-variables 'emacs-expand-load-path
-            (assoc-ref emacs:%standard-phases 'expand-load-path))
-          (add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path
-            (assoc-ref emacs:%standard-phases 'add-install-to-native-load-path))
-          (add-after 'emacs-add-install-to-native-load-path 'emacs-install
-            (assoc-ref emacs:%standard-phases 'install))
-          (add-after 'emacs-install 'emacs-build
-            (assoc-ref emacs:%standard-phases 'build)))))
+             ;; Set path to epdfinfo program.
+             (emacs-substitute-variables "pdf-info.el"
+               ("pdf-info-epdfinfo-program"
+                (string-append (assoc-ref outputs "out")
+                               "/bin/epdfinfo")))
+             ;; Set 'pdf-tools-handle-upgrades' to nil to avoid "auto
+             ;; upgrading" that pdf-tools tries to perform.
+             (emacs-substitute-variables "pdf-tools.el"
+               ("pdf-tools-handle-upgrades" '()))))
+         (add-after 'enter-lisp-dir 'emacs-make-autoloads
+           (assoc-ref emacs:%standard-phases 'make-autoloads))
+         (add-after 'emacs-patch-variables 'emacs-expand-load-path
+           (assoc-ref emacs:%standard-phases 'expand-load-path))
+         (add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path
+           (assoc-ref emacs:%standard-phases 'add-install-to-native-load-path))
+         (add-after 'emacs-add-install-to-native-load-path 'emacs-install
+           (assoc-ref emacs:%standard-phases 'install))
+         (add-after 'emacs-install 'emacs-build
+           (assoc-ref emacs:%standard-phases 'build)))))
    (native-inputs
     (list autoconf automake emacs-minimal pkg-config))
    (inputs
     (list cairo glib libpng poppler zlib))
    (propagated-inputs
-     (list emacs-let-alist emacs-tablist))
+     (list emacs-tablist))
    (home-page "https://github.com/vedang/pdf-tools")
    (synopsis "Emacs support library for PDF files")
    (description
@@ -7753,54 +7725,6 @@ with more precise location control.")
      (home-page "https://github.com/fuxialexander/org-pdftools/")
      (license license:gpl3+))))

-(define-public emacs-doc-toc
-  (package
-    (name "emacs-doc-toc")
-    (version "1.02")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/dalanicolai/doc-tools-toc")
-                    (commit "4a179fbacd7bc9efbd6cfcdc8772d42935e6de29")))
-              (sha256
-               (base32
-                "10w0gybhmx9g7qs5kmg7gsz156kndwzzpfhyb7l0p1cghgqii7l4"))
-              (patches
-                 (search-patches "emacs-doc-toc-shell-commands.patch"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ; no tests
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-exec-paths
-            (lambda* (#:key inputs #:allow-other-keys)
-              (emacs-substitute-variables "doc-toc.el"
-                ("doc-toc--ddjvu-program" (search-input-file inputs "/bin/ddjvu"))
-                ("doc-toc--djvused-program" (search-input-file inputs "/bin/djvused"))
-                ("doc-toc--djvutxt-program" (search-input-file inputs "/bin/djvutxt"))
-                ("doc-toc--mutool-program" (search-input-file inputs "/bin/mutool"))
-                ("doc-toc--pdftocgen-program" (search-input-file inputs "/bin/pdftocgen"))
-                ("doc-toc--pdftocio-program" (search-input-file inputs "/bin/pdftocio"))
-                ("doc-toc--pdftotext-program" (search-input-file inputs "/bin/pdftotext"))
-                ("doc-toc--pdfxmeta-program" (search-input-file inputs "/bin/pdfxmeta"))
-                ("doc-toc--tesseract-program" (search-input-file inputs "/bin/tesseract"))))))))
-    (inputs
-     (list djvulibre
-           fntsample                    ; for pdfoutline
-           mupdf
-           pdf-tocgen
-           poppler
-           tesseract-ocr))
-    (home-page "https://github.com/dalanicolai/doc-tools-toc")
-    (synopsis "Manage outlines/table of contents of pdf and djvu documents")
-    (description "This package provides a multistep process to infer or
-manually enter an outline for a given pdf or djvu document and to add it to
-said document, or to edit a pre-existing outline.  Outlines can be created
-manually, automatically generated from a textual table of contents, or
-generated from typesetting metadata.")
-    (license license:gpl3+)))
-
 (define-public emacs-sage-shell-mode
  (let ((commit "4291700e981a2105d55fa56382ba25046d3d268d")
        (revision "1"))
@@ -7935,9 +7859,8 @@ type, for example: packages, buffers, files, etc.")
    (license license:gpl3+)))

 (define-public emacs-guix
-  ;; No releases, nor tags.
-  (let ((commit "bccba0c1e6446f10075d8eaebae9eef6e67159a3")
-        (revision "10"))
+  (let ((commit "324987fb4a3e67c6f0f565b6605b8fce559f60ee")
+        (revision "9"))
    (package
      (name "emacs-guix")
      (version (git-version "0.5.2" revision commit))
@@ -7949,7 +7872,7 @@ type, for example: packages, buffers, files, etc.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "02p342vqcadbc6kqrpxsispy2dx46ypsp43s4p7llyajxvgk8zks"))))
+                  "1bg8sy20rdpdv1vzim494jwrmd63rd1mn8v94rkdijs9a2cakdkq"))))
      (build-system gnu-build-system)
      (arguments
       (list
@@ -14154,33 +14077,6 @@ It also prettifies Org plain list bullets by:
 Features degrade gracefully when viewed from terminal.")
    (license license:gpl3+)))

-(define-public emacs-org-supertag
-  ;; No tags or releases.
-  (let ((commit "2b17051c3d7e2e35db5b5fa66df0b6e67fa8d011")
-        (revision "0"))
-    (package
-      (name "emacs-org-supertag")
-      (version (git-version "5.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/yibie/org-supertag/")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "159aqyah89nw0ar2y68rs5s4ja5hhy4j5yx3slhagzdklcpimpq8"))))
-      (build-system emacs-build-system)
-      (arguments (list #:tests? #f))    ;no tests
-      (propagated-inputs
-       (list emacs-ht emacs-gptel))
-      (home-page "https://github.com/yibie/org-supertag/")
-      (synopsis "Note taking application on top of Org mode")
-      (description
-       "This package implements a knowledge manage engine as an extension to
-Org mode, upgrading its tagging system.")
-      (license license:gpl3+))))
-
 (define-public emacs-org-pandoc-import
  (let ((commit "db308f1a05be26ce5b287633637ce554599b1377")
        (revision "0"))
@@ -19984,8 +19880,8 @@ using package inferred style.")
      (license license:gpl3+))))

 (define-public emacs-lua-mode
-  (let ((commit "2f6b8d7a6317e42c953c5119b0119ddb337e0a5f")
-        (revision "2"))
+  (let ((commit "d074e4134b1beae9ed4c9b512af741ca0d852ba3")
+        (revision "1"))
    (package
      (name "emacs-lua-mode")
      (version (git-version "20221027" revision commit))
@@ -19997,7 +19893,7 @@ using package inferred style.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0sy33yx2a1kclg6w9j2h259j11kyz3ar2z8bp6d9ipsrn32yn0y0"))))
+          (base32 "00gvrmw8pll0cl7srygh2kmbf0g44sk9asj5sm77qvhr8jz4xkkq"))))
      (build-system emacs-build-system)
      (arguments
       (list
@@ -24799,26 +24695,26 @@ formatting, and utility methods for jsonnet files.")
    (license license:gpl3+)))

 (define-public emacs-restclient
-  ;; Upstream doesn't have official releases.
-  (let ((commit "1800a4e367c250051617d0b8c16a7cbd7f47da69")
-        (revision "0"))               ;Guix package revision,
+  (let ((commit "1fb570643b08ba66eb70831b6f874f52546917f1")
+        (version "0")
+        (revision "4"))               ;Guix package revision,
+                                        ;upstream doesn't have official releases
    (package
      (name "emacs-restclient")
-      (version (git-version "1.0" revision commit))
+      (version (git-version version revision commit))
      (source (origin
                (method git-fetch)
                (uri (git-reference
-                      (url "https://github.com/emacsorphanage/restclient.el")
+                      (url "https://github.com/pashky/restclient.el")
                      (commit commit)))
                (sha256
                 (base32
-                  "02yphcli11j0p6144rwh7l5whx4ahxm3y15nz0b7r3y04fm25w6g"))
+                  "0npij1p1yw4p1f1yrx6bl8q18nav5p2xvbp7qhzhn7lb2fdn5jqv"))
                (file-name (git-file-name name version))))
      (build-system emacs-build-system)
-      (arguments (list #:tests? #f))    ;no actual tests
      (propagated-inputs
       (list emacs-helm emacs-jq-mode))
-      (home-page "https://github.com/emacsorphanage/restclient.el")
+      (home-page "https://github.com/pashky/restclient.el")
      (synopsis "Explore and test HTTP REST webservices")
      (description
       "This tool allows for testing and exploration of HTTP REST Web services
@@ -25765,50 +25661,47 @@ from within Elisp using a DSL similar to CSS selectors.")
    (license license:gpl3+)))

 (define-public emacs-envrc
-  ;; Last tag is 2 years old.
-  (let ((commit "06d72d141ac2e2990d80cdb8bb84f6cb54c628a5")
-        (revision "0"))
-    (package
-      (name "emacs-envrc")
-      (version (git-version "0.12" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/purcell/envrc")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "00zyj46j1n250kcj0mz3j9radh5cv4jnbhy4sq4c9f0m1ypmazyk"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #false                   ;FIXME: 9 out of 11 tests fail
-        #:test-command #~(list "emacs" "-Q" "--batch"
-                               "-l" "envrc-tests.el"
-                               "-f" "ert-run-tests-batch-and-exit")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'set-direnv-location
-              (lambda* (#:key inputs #:allow-other-keys)
-                (emacs-substitute-variables "envrc.el"
-                  ("envrc-direnv-executable"
-                   (search-input-file inputs "/bin/direnv"))))))))
-      (inputs
-       (list direnv))
-      (propagated-inputs
-       (list emacs-inheritenv))
-      (home-page "https://github.com/purcell/envrc")
-      (synopsis "Support for Direnv which operates buffer-locally")
-      (description
-       "This is library which uses Direnv to set environment variables on
+  (package
+    (name "emacs-envrc")
+    (version "0.12")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/purcell/envrc")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:tests? #false                   ;FIXME: 8 out of 11 tests fail
+      #:test-command #~(list "emacs" "-Q" "--batch"
+                             "-l" "envrc-tests.el"
+                             "-f" "ert-run-tests-batch-and-exit")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-direnv-location
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-variables "envrc.el"
+                ("envrc-direnv-executable"
+                 (search-input-file inputs "/bin/direnv"))))))))
+    (inputs
+     (list direnv))
+    (propagated-inputs
+     (list emacs-inheritenv))
+    (home-page "https://github.com/purcell/envrc")
+    (synopsis "Support for Direnv which operates buffer-locally")
+    (description
+     "This is library which uses Direnv to set environment variables on
 a per-buffer basis.  This means that when you work across multiple projects
 which have @file{.envrc} files, all processes launched from the buffers ``in''
 those projects will be executed with the environment variables specified in
 those files.  This allows different versions of linters and other tools to be
 used in each project if desired.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))

 (define-public emacs-prop-menu
  (package
@@ -25845,6 +25738,55 @@ key.  Optionally, a mouse pop-up can be added by binding
@code{prop-menu-show-menu} to a mouse event.")
    (license license:gpl3+)))

+(define-public emacs-idris-mode
+  (let ((commit "9bc7697406f719258d93835df3c1761efbfecaa7")
+        (revision "1"))
+    (package
+      (name "emacs-idris-mode")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/idris-hackers/idris-mode")
+               (commit commit)))
+         (file-name (git-file-name name commit))
+         (sha256
+          (base32
+           "1d1f7kx0fw632js7qd1sra5wbpwyamcqs5wpzhyynmr5ybb0vyl7"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (add-after 'unpack 'patch-tests
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("^test(|2|3): getdeps build" all n)
+                        (string-append "test" n ":" )))))
+                 (replace 'check
+                   (lambda* (#:key tests? #:allow-other-keys)
+                     (if tests?
+                         (begin
+                           (setenv "HOME" (dirname (getcwd)))
+                           (invoke "make" "test")
+                           ;; XXX: History file not writable
+                           ;; (invoke "make" "test2")
+                           ;; XXX: Error reading from stdin
+                           ;; (invoke "make" "test3")
+                           )
+                         (format #t "test suite not run.~%")))))))
+      (native-inputs
+       (list idris))
+      (propagated-inputs
+       (list emacs-prop-menu))
+      (home-page
+       "https://github.com/idris-hackers/idris-mode")
+      (synopsis "Major mode for editing Idris code")
+      (description
+       "This is an Emacs mode for editing Idris code.  It is compatible with
+the latest versions of Idris 1.")
+      (license license:gpl3+))))
+
 (define-public emacs-browse-at-remote
  (package
    (name "emacs-browse-at-remote")
@@ -27602,7 +27544,7 @@ match and total match information in the mode-line in various search modes.")
 (define-public emacs-pg
  (package
    (name "emacs-pg")
-    (version "0.62")
+    (version "0.61")
    (source (origin
              (method git-fetch)
              (uri (git-reference (url "https://github.com/emarsden/pg-el")
@@ -27610,7 +27552,7 @@ match and total match information in the mode-line in various search modes.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0fjzrn5b4s00km71ya98vwwfyvd4rvcywxdxqzy5xfrv8crm92w6"))))
+                "09fd0rc3fwxxsc9bdvnq0fy6ikp5ml5hadd7d8y8s7p6qz0k44zr"))))
    (build-system emacs-build-system)
    (propagated-inputs (list emacs-peg))
    (home-page "https://github.com/emarsden/pg-el")
@@ -27732,7 +27674,7 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
 (define-public emacs-closql
  (package
    (name "emacs-closql")
-    (version "2.4.0")
+    (version "2.3.2")
    (source
     (origin
       (method git-fetch)
@@ -27742,11 +27684,11 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "08zxrzwpsixcc9ma7zps21krm0fn7l97aawhhacn2yf1mjja0p5s"))))
+         "110xlykmgd77z908l54kws7qcgj9hk7r33zmbk13dabl3wf8yzzk"))))
    (build-system emacs-build-system)
    (arguments (list #:tests? #f))      ; no tests
    (propagated-inputs
-     (list emacs-compat emacs-cond-let emacs-emacsql))
+     (list emacs-compat emacs-emacsql))
    (home-page "https://github.com/emacscollective/closql")
    (synopsis "Store EIEIO objects using EmacSQL")
    (description
@@ -27755,7 +27697,7 @@ database.  SQLite is used as backend.  This library imposes some restrictions
 on what kind of objects can be stored; it isn't intended to store arbitrary
 objects.  All objects have to share a common superclass and subclasses cannot
 add any additional instance slots.")
-    (license license:gpl3+)))
+    (license license:gpl3)))

 (define-public emacs-sql-indent
  (package
@@ -31268,38 +31210,6 @@ It replaces the standard completions buffer with Ido prompt.")
    (description "Makes ido-mode display prospects vertically.")
    (license license:gpl3+)))

-(define-public emacs-markov-text
-  ;; No release upstream.  Extract version from main file.
-  (let ((commit "a35c26853b368885072da21f1e2768c85944d55b")
-        (revision "0"))
-    (package
-      (name "emacs-markov-text")
-      (version (git-version "1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/skeeto/markov-text")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0clc0m3wmjym2x320d7scpz19pl3mwppwifmzcxb3mgj2p1p199x"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f                                    ;no tests
-        #:include #~(cons "^data/" %default-include))) ;default seed text
-      (home-page "https://github.com/skeeto/markov-text")
-      (synopsis "Markov-chain text generator and Lorem Ipsum inserter")
-      ;; TRANSLATORS: "Lorem Ipsum" should not be translated.
-      (description
-       "This package provides commands to produce paragraph-like output.
-@code{markov-text} generates pseudo-random text from sample input using a
-Markov chain; paragraph and sentence lengths follow the chain states and are
-not directly controlled.  It also includes a separate Lorem Ipsum generator
-with its own database and an interactive @code{lorem-ipsum-insert} command.")
-      (license license:unlicense))))
-
 (define-public emacs-wordgen
  (package
    (name "emacs-wordgen")
@@ -32687,35 +32597,6 @@ allows you to obtain translations of texts from Google Translate without any
 tracking.")
      (license license:gpl3+))))

-(define-public emacs-helm-comint
-  ;; There are no releases or tags.
-  (let ((commit "9215b2aa8f42f62cbda66a1503832abb7f491549")
-        (revision "0"))
-    (package
-      (name "emacs-helm-comint")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-            (url "https://github.com/emacs-helm/helm-comint")
-            (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "029dhxy73lhpbpsw7n3sj8z18c2syy59551pfd31k8kas98ck52j"))))
-      (build-system emacs-build-system)
-      (arguments (list #:tests? #f))    ;no tests
-      (propagated-inputs
-       (list emacs-helm))
-      (home-page "https://github.com/emacs-helm/helm-comint")
-      (synopsis "Comint prompt navigation for Helm")
-      (description
-       "@code{Helm-comint} provides access to Emacs command interpreter
-prompts through Helm.")
-      (license license:gpl3+))))
-
 (define-public emacs-helm-company
  (package
    (name "emacs-helm-company")
@@ -34206,30 +34087,31 @@ News homepage.")
    (license license:gpl3)))

 (define-public emacs-lobsters
-  (package
-    (name "emacs-lobsters")
-    (version "1.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tanrax/lobsters.el")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19nik1vaazf0w43fvksshx2c1fbby0fyafn2859jbdmvxwb5imw7"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:tests? #f))                     ;no tests
-    (propagated-inputs
-     (list emacs-request emacs-visual-fill-column))
-    (home-page "https://github.com/tanrax/lobsters.el/")
-    (synopsis "Lobsters client for Emacs")
-    (description
-     "This package provides a lobsters client for Emacs to browse stories
-and comments.")
-    (license license:gpl3+)))
+  (let ((commit "d061e1b0d4fe27c7751509da61396681d335e69f")
+        (revision "0"))
+    (package
+      (name "emacs-lobsters")
+      (version (git-version "1.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/tanrax/lobsters.el")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "042qhc3qg3lzcicq9b5z0b5650a9c3d71db5w2bnwbydph25m97h"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ; no tests
+      (propagated-inputs (list emacs-request emacs-visual-fill-column))
+      (home-page "https://github.com/tanrax/lobsters.el/")
+      (synopsis "Lobsters client for Emacs")
+      (description
+       "This package provides a lobsters client for Emacs to browse stories
+and comments")
+      (license license:gpl3+))))

 (define-public emacs-tokei
  (package
@@ -42880,24 +42762,27 @@ executes a different function (default: @code{indent-relative}).")
      (license license:gpl2+))))

 (define-public emacs-gleam-mode
-  (package
-    (name "emacs-gleam-mode")
-    (version "1.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/gleam-lang/gleam-mode")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0dd7qylvhrqlxnbvvkb3f03gz14v0sjg9fhiymfhw7p571bq8nqi"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/gleam-lang/gleam-mode")
-    (synopsis "Gleam support for Emacs")
-    (description
-     "This package provides an Emacs major mode for the Gleam language.")
-    (license (list license:asl2.0 license:gpl3+))))
+  ;; No tag, version grabbed from source .el file.
+  (let ((commit "8e981614536f0e36fb14721a9fae8bf72c287a40")
+        (revision "0"))
+    (package
+      (name "emacs-gleam-mode")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gleam-lang/gleam-mode")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0xspx3hpiw21pqcqpp82ngxzsdbc209cbp7yjl5i1j5rwj6d09r7"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/gleam-lang/gleam-mode")
+      (synopsis "Gleam support for Emacs")
+      (description
+       "This package provides an Emacs major mode for the Gleam language.")
+      (license (list license:asl2.0 license:gpl3+)))))

 (define-public emacs-glsl-mode
  ;; No tag, version grabbed from source .el file.
@@ -43597,6 +43482,48 @@ as a plug-and-play solution for anyone already using Org mode for their
 personal wiki.")
    (license license:gpl3+)))

+(define-public emacs-org-node
+  (package
+    (name "emacs-org-node")
+    (version "2.4.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/meedstrom/org-node/")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "03600cxy8dr2sd49d07v61izxpvdxgfyiangjzkbma4qdpbkmjgh"))))
+    (build-system emacs-build-system)
+    (arguments
+     '(#:tests? #f ; fails
+       #:test-command '("./makem.sh" "tests")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'dont-git
+           (lambda _
+             (substitute* "makem.sh"
+               (("^cd.*\"")
+                "")))))))
+    (propagated-inputs
+     (list emacs-el-job
+           emacs-llama
+           emacs-magit))
+    ;; tests
+    (native-inputs
+     (list emacs-buttercup
+           emacs-dash
+           util-linux
+           grep
+           sed))
+    (home-page "https://github.com/meedstrom/org-node/")
+    (synopsis "Non-hierarchical note-taking with Org-mode, faster than
+org-roam")
+    (description "This package provides a notetaking system like Roam,
+using org mode; faster than org-roam.")
+    (license license:gpl3+)))
+
 (define-public emacs-org-mem
  (package
    (name "emacs-org-mem")
@@ -43637,7 +43564,7 @@ structure of all your Org files – headings, links and so on..")
    (home-page "https://github.com/meedstrom/org-node/")
    (license license:gpl3+)))

-(define-public emacs-org-node
+(define-public emacs-org-node-3
  (package
    (name "emacs-org-node")
    (version "3.9.9")
@@ -43681,8 +43608,6 @@ different configuration options to org-node 2 so you DO have to set
 it up again.")
    (license license:gpl3+)))

-(define-deprecated-package emacs-org-node-3 emacs-org-node)
-
 (define-public emacs-org-super-links
  (package
    (name "emacs-org-super-links")
@@ -47025,31 +46950,6 @@ or `header-line-format'.  For additional documentation, see info node
 `(emacs)Window Tool Bar'.")
    (license license:gpl3+)))

-(define-public emacs-winum
-  (package
-    (name "emacs-winum")
-    (version "2.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/deb0ch/emacs-winum")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0v1qmw3svydk7dlqbcymy1g1bygkfpb2h4b97zdp12xvd8mww9ny"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-dash))
-    (home-page "https://github.com/deb0ch/emacs-winum")
-    (arguments (list #:tests? #f)) ; there are no tests
-    (synopsis
-     "Navigate windows and frames using numbers")
-    (description
-     "This package provides a major mode for navigate windows and frames using
-numbers.")
-    (license license:gpl3+)))
-
 (define-public emacs-tintin-mode
  (let ((commit "82e71e1db92ee3d94c7d0208bafc5de337193de8")
        (revision "1"))
@@ -104,7 +104,6 @@
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages networking)
  #:use-module (gnu packages ninja)
-  #:use-module (gnu packages parallel)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages pulseaudio)
@@ -1111,7 +1110,6 @@ The following systems are supported:
             ncurses
             qtbase
             qtmultimedia
-             qtwayland
             sdl2
             sqlite
             zlib))
@@ -2006,7 +2004,7 @@ libretro API, based on Mupen64Plus.  It incorporates the following projects:
 (define-public retroarch-assets
  (package
    (name "retroarch-assets")
-    (version "1.22.0")
+    (version "1.20.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2015,7 +2013,7 @@ libretro API, based on Mupen64Plus.  It incorporates the following projects:
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "04gbsn5lwc9ampyssl898v4p9myhwfqy3x7hyx9si8l1x9z60k6j"))))
+                "0ngbc2wmqgz5davan7rnvqapai5wc8j9afylff1yzlk3lgsjlv1x"))))
    (build-system gnu-build-system)
    (arguments
     (list #:tests? #f                  ;no test suite
@@ -2031,7 +2029,7 @@ generate the various User Experience (UX) environments.")
 (define-public libretro-core-info
  (package
    (name "libretro-core-info")
-    (version "1.22.2")
+    (version "1.21.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2040,7 +2038,7 @@ generate the various User Experience (UX) environments.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1csx200ajl6ncrhi20l9f9qjv73402w28lyi88lsly0j65rknz4v"))))
+                "12yramra6hd33g094krygq2a5h7mjkh0nh5d8qny4b6f61fxaxwk"))))
    (build-system copy-build-system)
    (arguments
     (list #:install-plan #~'(("." "lib/libretro/"
@@ -2058,7 +2056,7 @@ metadata about each known libretro core.  The snapshot is taken from the
 (define-public libretro-database
  (package
    (name "libretro-database")
-    (version "1.22.1")
+    (version "1.21.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2067,7 +2065,7 @@ metadata about each known libretro core.  The snapshot is taken from the
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "03jb9gr11xiphnnwdqqk8k5g8s9s026k46dv94h67cshlbl59n52"))))
+                "1grkdg6k6dclwrh286dins4k50mp0wf3bvddikaspl309dldjrgw"))))
    (build-system gnu-build-system)
    (arguments (list #:tests? #f
                     #:make-flags #~(list (string-append "PREFIX=" #$output))))
@@ -2096,7 +2094,7 @@ Various scripts that are used to maintain the database files.
 (define-public retroarch-joypad-autoconfig
  (package
    (name "retroarch-joypad-autoconfig")
-    (version "1.22.0")
+    (version "1.21.1")
    (source
     (origin
       (method git-fetch)
@@ -2106,7 +2104,7 @@ Various scripts that are used to maintain the database files.
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0fcc15j6lblngkx0n85x68x01c4qc24xc0pw05gc5pg2xgg4m3wg"))))
+         "06mii4zpkrwxiw9qhfvjzri8q8fps1b96nkxp7px2w7cgdl4kg68"))))
    (build-system gnu-build-system)
    (arguments
     (list #:tests? #f                  ;no meaningful test suite
@@ -2826,7 +2824,7 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
 (define-public retroarch-minimal
  (package
    (name "retroarch-minimal")
-    (version "1.22.2")
+    (version "1.21.0")
    (source
     (origin
       (method git-fetch)
@@ -2857,7 +2855,7 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
       (patches (search-patches "retroarch-unbundle-spirv-cross.patch"))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1xbipxg5g53f68cbki61qj86096l87x0mrwzbgrv6mcf3sif0y7v"))))
+        (base32 "17l3x77vd52g7zq62g3j1jxr51ksmdnxif1qh671qi19fsd19v1r"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -2866,8 +2864,6 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
      #~(modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "input/bsv/uint32s_index.c"
-                (("#include <xxHash/xxhash\\.h>") "#include <xxhash.h>"))
              ;; Hard-code some store file names.
              (substitute* "gfx/common/vulkan_common.c"
                (("libvulkan.so")
@@ -2908,7 +2904,6 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
               ;; These are disabled to avoid requiring the bundled
               ;; dependencies.
               "--disable-7zip"
-               "--disable-chd"
               "--disable-cheevos"
               "--disable-crtswitchres"
               "--disable-discord"
@@ -2917,8 +2912,7 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
               "--disable-stb_font"
               "--disable-stb_image"
               "--disable-stb_vorbis"
-               "--disable-xdelta"
-               "--disable-zstd"))))))
+               "--disable-xdelta"))))))
    (native-inputs
     (list pkg-config
           wayland-protocols
@@ -2951,7 +2945,6 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
           v4l-utils
           vulkan-loader
           wayland
-           xxhash
           zlib))
    (native-search-paths
     (list (search-path-specification
@@ -3606,11 +3599,11 @@ improvements.")
      (license license:gpl2+))))

 (define-public pcsx2-patches
-  (let ((commit "10239de1539668c347e8e9478a3b13913808c0b2")
+  (let ((commit "2fdc835f0725b318efcdaae84db1c73a9139b6f6")
        (revision "0"))
    (package
      (name "pcsx2-patches")
-      (version (git-version "2025.12.11" revision commit))
+      (version (git-version "2025.10.24" revision commit))
      (source
       (origin
         (method git-fetch)
@@ -3619,7 +3612,7 @@ improvements.")
 	       (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "07f18xrn60sizgjhq99rq1q69ay9pss00y8b4c3ky9i94xjfxq5x"))))
+          (base32 "0qn9jwk983hxzrf2x550wcb9l782618lm662w5fb6cw81bbrv5is"))))
      (build-system copy-build-system)
      (arguments
       (list
@@ -3651,88 +3644,27 @@ de-interlacing patches for use with PCSX2.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "0nr53cjifqwnz3icxsj01yd3aw1vfsfxga4zz5zi8aqr175mvq27"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
+       (modules '((guix build utils)))
       (snippet
        #~(begin
-            (substitute* "cmake/Pcsx2Utils.cmake"
-              (("(PCSX2_GIT_REV \")Unknown" _ prefix)
-               (string-append prefix #$version "-guix")))
-            (delete-file "3rdparty/include/Packet32.h") ;"not open source"
-            ;; XXX: 'delete-all-but' is copied from the turbovnc package.
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but
-             "3rdparty"
-             ;; asl2.0 and cc0
-             "glad"                     ;Is tailored.
-             ;; bsd-3
-             "libchdr"                  ;Not packaged in guix.
-             "vixl"                     ;Not packaged in guix.
-             "xbyak"                    ;Just includes.
-             ;; bsd-4 (pcap) and bsd-2 (xxhash)
-             "include"                  ;Just includes.
-             ;; expat
-             "ccc"                      ;Is tailored.
-             "cubeb"                    ;Is tailored.
-             "discord-rpc"              ;Not packaged in guix.
-             "imgui"                    ;Is tailored.
-             "rapidyaml"                ;Not packaged in guix.
-             "rcheevos"                 ;Does not have a linkable binary.
-             "simpleini"                ;Is tailored (GetKeyCount).
-             "zydis"                    ;Could not link.
-             ;; gpl2+
-             "freesurround"             ;Unclear what upstream is.
-             ;; lgpl2.0+
-             "demangler"                ;Is tailored.
-             ;; public-domain
-             "lzma"                     ;Does not have a linkable library.
-             ;; silofl1.1
-             "promptfont")              ;Unclear what upstream is.
-            (substitute* "CMakeLists.txt"
-              (("add_subdirectory\\(3rdparty/googletest)")
-               "find_package(GTest REQUIRED)"))
-            (substitute* "cmake/SearchForStuff.cmake"
-              (("add_subdirectory\\(3rdparty/cpuinfo EXCLUDE_FROM_ALL\\)")
-               "find_package(cpuinfo REQUIRED)")
-              (("disable_compiler_warnings_for_target\\(cpuinfo\\)") "")
-              (("add_subdirectory\\(3rdparty/fast_float EXCLUDE_FROM_ALL\\)")
-               "find_package(FastFloat REQUIRED)")
-              (("add_subdirectory\\(3rdparty/fmt EXCLUDE_FROM_ALL\\)")
-               "find_package(fmt REQUIRED)")
-              (("disable_compiler_warnings_for_target\\(fmt\\)") "")
-              (("add_subdirectory\\(3rdparty/libzip EXCLUDE_FROM_ALL\\)")
-               "find_package(libzip REQUIRED)")
-              (("add_subdirectory\\(3rdparty/rapidjson EXCLUDE_FROM_ALL\\)")
-               "find_package(RapidJSON REQUIRED)")
-              (("add_subdirectory\\(3rdparty/soundtouch EXCLUDE_FROM_ALL\\)")
-               "pkg_check_modules(SoundTouch REQUIRED soundtouch)")
-              (("add_subdirectory\\(3rdparty/vulkan EXCLUDE_FROM_ALL\\)")
-               "find_package(VulkanMemoryAllocator REQUIRED)
-find_package(VulkanHeaders REQUIRED)"))
-            ;Specifically, line 213.
-            (substitute* "common/CMakeLists.txt"
-              (("fast_float") ""))
-            (substitute* "pcsx2/CMakeLists.txt"
-              (("SoundTouch::SoundTouch") "SoundTouch")
-              (("\
-target_link_libraries\\(PCSX2_FLAGS INTERFACE vulkan-headers\\)") ""))
-            (substitute* "pcsx2/Host/AudioStream.cpp"
-              (("SoundTouch.h") "soundtouch/SoundTouch.h"))))))
+            (substitute* "pcsx2/Pcsx2Config.cpp"
+	      (("Path::Canonicalize\\(Path::GetDirectory\\(program_path\\)\\);")
+	       "Path::Canonicalize(
+((std::string)Path::GetDirectory(program_path)).append(\"/../share/\"));"))
+            (delete-file-recursively "3rdparty/d3d12memalloc")
+            (delete-file-recursively "3rdparty/winpixeventruntime")
+            (delete-file-recursively "3rdparty/winwil")))))
    (build-system cmake-build-system)
    (arguments
     (list
+      #:parallel-build? #t
      #:configure-flags
      #~(list "-DCMAKE_C_COMPILER=clang"
              "-DCMAKE_CXX_COMPILER=clang++"
-              "-GNinja"
-              "-DPACKAGE_MODE=ON"
-              "-DUSE_LINKED_FFMPEG=ON")
+              "-DCMAKE_PREFIX_PATH=\"$PWD/deps\""
+              "-GNinja")
+      #:imported-modules `((guix build copy-build-system)
+                           ,@%cmake-build-system-modules)
      #:phases
      #~(modify-phases %standard-phases
          (replace 'build
@@ -3741,52 +3673,52 @@ target_link_libraries\\(PCSX2_FLAGS INTERFACE vulkan-headers\\)") ""))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests? (invoke "ninja" "unittests"))))
+          (replace 'install
+            (lambda* args
+              (apply
+               (assoc-ref (@ (guix build copy-build-system) %standard-phases)
+                          'install)
+               #:install-plan
+               '(("bin/pcsx2-qt" "bin/")
+                 ("bin/resources" "share/")
+                 ("bin/translations" "share/")
+                 ("../source/.github/workflows/scripts/linux/pcsx2-qt.desktop"
+                  "share/applications/"))
+               args)))
          (add-after 'install 'install-patches
-            (lambda _
-              (symlink
-               (search-input-file %build-inputs "/patches.zip")
-               (string-append
-                #$output "/share/PCSX2/resources/patches.zip")))))))
+            (lambda* (#:key inputs #:allow-other-keys)
+              (install-file (search-input-file %build-inputs "/patches.zip")
+                            (string-append #$output "/share/resources")))))))
    (inputs (list (module-ref
                   (resolve-interface '(gnu packages debug)) 'libbacktrace)
                  `(,zstd-1.5.7 "lib")
-                  cpuinfo
                  curl
                  dbus
                  eudev
-                  fast-float
                  ffmpeg
                  freetype
-                  fmt-11
                  kddockwidgets
+                  libaio
                  libjpeg-turbo
                  libpcap
-                  libpng-next
+                  libpng-for-pcsx2
                  libwebp
-                  libxi
                  libxrandr
-                  libzip
                  lz4
                  pcsx2-patches
-                  plutosvg
                  plutovg
+                  plutosvg
                  qtbase
                  qtdeclarative
                  qtsvg
                  qttools
-                  rapidjson
+                  qtwayland
                  sdl3
                  shaderc
-                  soundtouch
                  vulkan-headers
-                  wayland))
-    (native-inputs
-     (list clang-17
-           extra-cmake-modules
-           googletest
-           ninja
-           pkg-config
-           vulkan-memory-allocator))
+                  wayland
+                  libxi))
+    (native-inputs (list clang-17 extra-cmake-modules ninja pkg-config))
    (home-page "https://pcsx2.net")
    (synopsis "PlayStation 2 (PS2) emulator")
    (description
@@ -3795,17 +3727,7 @@ emulator.  Its purpose is to emulate the PS2's hardware, using a combination
 of MIPS CPU interpreters, recompilers and a virtual machine which manages
 hardware states and PS2 system memory.  This allows you to play PS2 games on
 your PC, with many additional features and benefits.")
-    (license (list license:gpl3+        ;main code
-                   ;; code in 3rdparty/
-                   license:asl2.0
-                   license:bsd-2
-                   license:bsd-3
-                   license:bsd-4
-                   license:cc0
-                   license:expat
-                   license:lgpl2.0+
-                   license:public-domain
-                   license:silofl1.1))))
+    (license license:gpl3+)))

 (define-public rpcs3
  ;; NB: When updating to a new release, don't forget to check if any more
@@ -865,7 +865,7 @@ required for Fritzing app.")
    (native-inputs
     (list pkg-config qttools-5))
    (inputs
-     (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtsvg-5 qtwayland-5 sqlite))
+     (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtsvg-5 sqlite))
    (home-page "https://qelectrotech.org/")
    (synopsis "CAD/CAE editor focusing on schematics drawing features")
    (description "QElectroTech, or QET in short, is a desktop application to
@@ -2484,6 +2484,60 @@ slicing software to x3g files for standalone 3D printing on common 3D
 printers.")
    (license license:gpl2+)))

+(define-public gnucap
+  (package
+    (name "gnucap")
+    (version "20171003")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "16m09xa685qhj5fqq3bcgakrwnb74xhf5f7rpqkkf9fg8plzbb1g"))))
+    (build-system gnu-build-system)
+    (inputs
+     (list readline))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               ;; Set correct rpath so that gnucap finds libgnucap.so.
+               (substitute* (list "apps/configure" "lib/configure"
+                                  "main/configure" "modelgen/configure")
+                 (("LDFLAGS =")
+                  (string-append "LDFLAGS = -Wl,-rpath=" out "/lib")))
+               ;; gnucap uses a hand-written configure script that expects the
+               ;; --prefix argument to be the first argument passed to it.
+               (invoke "./configure" (string-append "--prefix=" out)))))
+         (replace 'check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (libpath "../lib/O:../apps/O"))
+               (with-directory-excursion "tests"
+                 ;; Make test return non-zero exit code when a test fails.
+                 (substitute* "test"
+                   (("/bin/sh") "/bin/sh -e")
+                   (("\\|\\| echo \"\\*\\*\\*\\* \\$ii fails \\*\\*\\*\\*\"") ""))
+                 ;; Fix expected plugin search path for test c_attach.1.gc
+                 (substitute* "==out/c_attach.1.gc.out"
+                   (("/usr/local/lib/gnucap")
+                    (string-append libpath ":" out "/lib/gnucap")))
+                 ;; Set library path so that gnucap can find libgnucap.so
+                 ;; while running the tests.
+                 (setenv "LD_LIBRARY_PATH" libpath)
+                 (invoke "./test" "../main/O/gnucap" "" "test-output" "==out"))))))))
+    (home-page "https://www.gnu.org/software/gnucap/")
+    (synopsis "Mixed analog and digital circuit simulator")
+    (description "GNUcap is a circuit analysis package.  It offers a general
+purpose circuit simulator and can perform DC and transient analyses, fourier
+analysis and AC analysis.  The engine is designed to do true mixed-mode
+simulation.")
+    (license license:gpl3+)))
+
 (define-public cutter
  (package
    (name "cutter")
@@ -719,34 +719,34 @@ from a mounted file system.")
    (home-page "http://www.gphoto.org/proj/gphotofs/")
    (license license:gpl2+)))

-(define (bcachefs-tools-rust-target)
+(define bcachefs-tools-rust-target
  (platform-rust-target (lookup-platform-by-target-or-system
                         (or (%current-target-system)
                             (%current-system)))))

-(define (bcachefs-tools-target/release)
-  (string-append "target/" (bcachefs-tools-rust-target) "/release"))
+(define bcachefs-tools-target/release
+  (string-append "target/" bcachefs-tools-rust-target "/release"))

-(define (bcachefs-tools-cargo-args)
+(define bcachefs-tools-cargo-args
  ;; Distinct from -MAKE-FLAGS for use with ‘cargo test’ in 'check.
  #~(list "--release"
-          (string-append "--target=" #$(bcachefs-tools-rust-target))))
+          (string-append "--target=" #$bcachefs-tools-rust-target)))

 ;; XXX We want to share common make flags across different packages & phases,
 ;; but the cargo-build-system doesn't allow #:make-flags.
-(define (bcachefs-tools-make-flags)
+(define bcachefs-tools-make-flags
  ;; These result of these flags should be as minimal as possible.
  ;; Enable any optional features in the bcachefs-tools package instead.
  #~(list (string-append "CARGO_BUILD_ARGS="
-                         (string-join #$(bcachefs-tools-cargo-args) " "))
+                         (string-join #$bcachefs-tools-cargo-args " "))
          (string-append "CC=" #$(cc-for-target))
          (string-append "PKG_CONFIG=" #$(pkg-config-for-target))))

-(define (bcachefs-tools-make-install-flags)
+(define bcachefs-tools-make-install-flags
  #~(cons* (string-append "PREFIX=" #$output)
           "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
           "PKGCONFIG_UDEVRULESDIR=$(PREFIX)/lib/udev/rules.d"
-           #$(bcachefs-tools-make-flags)))
+           #$bcachefs-tools-make-flags))

 (define bcachefs-tools-minimal
  ;; This ‘minimal’ package is not *that* minimal, and not different enough to
@@ -782,7 +782,7 @@ from a mounted file system.")
                              (number->string (parallel-job-count))
                              "1")
                     (string-append "VERSION=" #$version)
-                     #$(bcachefs-tools-make-flags))))
+                     #$bcachefs-tools-make-flags)))
          (add-before 'install 'patch-install
            ;; ‘make install’ hard-codes target/release/bcachefs, which is
            ;; incorrect when passing --target, as required to cross-compile or
@@ -790,11 +790,11 @@ from a mounted file system.")
            (lambda _
              (substitute* "Makefile"
                (("target/release")
-                 #$(bcachefs-tools-target/release)))))
+                 #$bcachefs-tools-target/release))))
          (replace 'install
            (lambda _
              (apply invoke "make" "install"
-                     #$(bcachefs-tools-make-install-flags)))))))
+                     #$bcachefs-tools-make-install-flags))))))
    (native-inputs
     (list pkg-config))
    (inputs
@@ -851,7 +851,7 @@ performance and other characteristics.")
                (define bcachefs
                  (or (false-if-exception (search-input-file native-inputs
                                                             "sbin/bcachefs"))
-                      (string-append #$(bcachefs-tools-target/release)
+                      (string-append #$bcachefs-tools-target/release
                                     "/bcachefs")))

                (define (output-completions shell file)
@@ -905,16 +905,16 @@ performance and other characteristics.")
                                "1")
                       (string-append "VERSION="
                                      #$(package-version this-package))
-                       #$(bcachefs-tools-make-flags))))
+                       #$bcachefs-tools-make-flags)))
            (replace 'check
              (lambda* (#:key tests? #:allow-other-keys)
                (when tests?
-                  (apply invoke "cargo" "test" #$(bcachefs-tools-cargo-args)))))
+                  (apply invoke "cargo" "test" #$bcachefs-tools-cargo-args))))
            (replace 'install
              (lambda _
                (apply invoke "make" "install"
                       (string-append "PREFIX=" #$output)
-                       #$(bcachefs-tools-make-install-flags))))))))
+                       #$bcachefs-tools-make-install-flags)))))))
    (inputs (modify-inputs (package-inputs bcachefs-tools-minimal)
              (prepend `(,eudev "static")
                       `(,keyutils "static")
@@ -39,7 +39,7 @@
 ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
 ;;; Copyright © 2024 Saku Laesvuori <saku@laesvuori.fi>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
-;;; Copyright © 2025-2026 Hennadii Stepanov <hebasto@gmail.com>
+;;; Copyright © 2025 Hennadii Stepanov <hebasto@gmail.com>
 ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -158,7 +158,7 @@
  ;; <https://bitcoincore.org/en/lifecycle/#schedule>.
  (package
    (name "bitcoin-core")
-    (version "30.2")
+    (version "30.0")
    (source (origin
              (method url-fetch)
              (uri
@@ -166,16 +166,14 @@
                              version "/bitcoin-" version ".tar.gz"))
              (sha256
               (base32
-                "1jw4djh22v0nih0n7irdbknfbqavlc4l3b8176b5qgc88a60pl3g"))))
+                "0x39bqd9ql7b6s7sj8ws8gw6g4nbgf6cplnys2lrmvfza56jliwv"))))
    (build-system qt-build-system)
    (arguments
-     (list #:qtbase qtbase
-           #:configure-flags
+     (list #:configure-flags
           #~(list
              "-DBUILD_GUI=ON"
              "-DBUILD_BENCH=ON"
              "-DWITH_ZMQ=ON")
-           #:qtbase qtbase
           #:phases
           #~(modify-phases %standard-phases
               (add-before 'build 'set-no-git-flag
@@ -201,7 +199,7 @@
           capnproto
           libevent
           qrencode
-           qtwayland
+           qtbase
           sqlite
           zeromq))
    (home-page "https://bitcoincore.org/")
@@ -834,7 +832,7 @@ blockchain.")
  ;; the system's dynamically linked library.
  (package
    (name "monero")
-    (version "0.18.4.5")
+    (version "0.18.4.4")
    (source
     (origin
       (method git-fetch)
@@ -852,7 +850,7 @@ blockchain.")
            delete-file-recursively
            '("external/miniupnp" "external/rapidjson"))))
       (sha256
-        (base32 "1lf3rss9y34g51hxqny8vcp8hayv0r3lsndxl85gciqxgb0ls7dz"))))
+        (base32 "0f5b8yvrfhxc86ws3nfz0v6prl9n2nq9hvwlc2wcgspp8lbl26j8"))))
    (build-system cmake-build-system)
    (native-inputs
     (list doxygen
@@ -939,7 +937,7 @@ the Monero command line client and daemon.")
 (define-public monero-gui
  (package
    (name "monero-gui")
-    (version "0.18.4.5")
+    (version "0.18.4.4")
    (source
     (origin
       (method git-fetch)
@@ -955,7 +953,7 @@ the Monero command line client and daemon.")
           ;; See the 'extract-monero-sources' phase.
           (delete-file-recursively "monero")))
       (sha256
-        (base32 "02qlm0caqscq5ms4gd3ckipsq90gvhjprqdcnpcxwdp3fa16749i"))))
+        (base32 "0bvd3mv0ahkfx2k2n6z5n7mnksd75h859ji32a4d74vaizc04igm"))))
    (build-system qt-build-system)
    (native-inputs
     `(,@(package-native-inputs monero)
@@ -1151,10 +1149,11 @@ Ledger Nano as a hardware SSH/GPG agent.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1mblx4favmw4nf7k9rfl00ivv77kgdiwghyz4xv5cp0v410kjaqc"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f))      ; No test suite.
-    (native-inputs (list python-setuptools))
-    (inputs (list (list python "tk")))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))        ; No test suite.
+    (inputs
+     `(("python-tkinter" ,python "tk")))
    (home-page "https://github.com/rendaw/trezor-gpg-pinentry-tk")
    (synopsis "GPG pinentry program for use with @code{trezor-agent}")
    (description
@@ -1337,22 +1336,23 @@ TREZOR Hardware Wallet.")
 (define-public python-keepkey
  (package
    (name "python-keepkey")
-    (version "7.2.1")
+    (version "6.0.3")
    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/keepkey/python-keepkey")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "keepkey" version))
+        (sha256
+          (base32
+            "0z3d0m6364v9dv0njs4cd5m5ai6j6v35xaaxfxl90m9vmyxy81vd"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-backend #~'custom
-      #:test-flags #~(find-files "tests/unit" "\\.py$")))
-    (native-inputs (list python-setuptools))
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'check)
+         (add-after 'install 'check
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
+             (apply invoke "python" (find-files "tests/unit" "\\.py$")))))))
    (propagated-inputs
     (list python-ecdsa python-hidapi python-libusb1 python-mnemonic
           python-protobuf))
@@ -2463,23 +2463,29 @@ analysis of financial market data.")
 (define-public python-mt-940
  (package
    (name "python-mt-940")
-    (version "4.30.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/WoLpH/mt940.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "13g5338aa8vgkx8g94vz5d8ynfq3jndvyh1nz6dlhw4axwr4x8dp"))))
+    (version "4.23.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/WoLpH/mt940.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0z9w1qalcphsck3j6vkrs7k47ah9zq2rv0lm9nmcsgwpyp59qkyf"))))
    (properties '(("upstream-name" #{.}# "mt-940")))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      #~(list "-c" "/dev/null")))       ; Remove custom --cov flags.
-    (native-inputs (list python-pytest python-pyyaml python-setuptools))
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                      (when tests?
+                        ;; Remove custom --cov flags.
+                        (delete-file "pytest.ini")
+                        (invoke "pytest" "-vv")))))))
+    (native-inputs (list python-flake8
+                         python-pytest
+                         python-pyyaml))
    (home-page "https://mt940.readthedocs.io/")
    (synopsis "Python parser for MT940-encoded SWIFT data")
    (description
@@ -767,25 +767,6 @@ font is provided in the OpenType font (OTF) format.")
    (properties '((upstream-name . "freefont")
                  (ftp-directory . "/gnu/freefont")))))

-(define-public font-great-vibes
-  (package
-    (name "font-great-vibes")
-    (version "1.103")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/googlefonts/great-vibes/")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "1bxjr41spgf0l1w2fhs6743gvp0id2hv0vsivqcflb8f631rkkq1"))))
-    (build-system font-build-system)
-    (home-page "https://fonts.google.com/specimen/Great+Vibes")
-    (synopsis "Flowing script font")
-    (description "Great Vibes is a flowing script font with casual uppercase
-letters and more formal lowercase letters.")
-    (license license:silofl1.1)))
-
 (define-public font-liberation
  (package
    (name "font-liberation")
@@ -926,26 +907,6 @@ The unified Libertinus family consists of:
 expansion of Franklin Gothic, a classic font.  It covers 105 Latin Languages.")
      (license license:silofl1.1))))

-(define-public font-playwrite
-  (package
-    (name "font-playwrite")
-    (version "1.003")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/TypeTogether/Playwrite/")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "1vjll0jdmy5liw68k1p0pry5hzjjxna9a2sccifvwckwxngg84zc"))))
-    (build-system font-build-system)
-    (home-page "https://github.com/TypeTogether/Playwrite/")
-    (synopsis "Family of primary school cursive fonts")
-    (description "Playwrite is a typeface engine for the creation of primary
-school cursive fonts.  It sports several variations of lowercase and uppercase
-letters to account for regional differences.")
-    (license license:silofl1.1)))
-
 (define-public font-terminus
  (package
    (name "font-terminus")
@@ -1591,7 +1552,7 @@ noncharacters are also represented.")
 (define-public font-google-noto
  (package
    (name "font-google-noto")
-    (version "2026.01.01")
+    (version "2025.07.01")
    (source
     (origin
       (method git-fetch)
@@ -1600,7 +1561,7 @@ noncharacters are also represented.")
             (commit (string-append "noto-monthly-release-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1rrwxr7g1gwbp0gb2kjxi0s42hijhs82fc4dbqa6spkj4d9c9qq9"))))
+        (base32 "0p27wbxdwi99r5yj33z9jadlv4rbhp5vw5c0ir15bymvdwdr8s8z"))))
    (build-system font-build-system)
    (arguments
     (list
@@ -4634,7 +4595,7 @@ Mainland China.")
 (define-public font-chiron-sung-hk
  (package
    (name "font-chiron-sung-hk")
-    (version "1.022")
+    (version "1.017")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -4643,7 +4604,7 @@ Mainland China.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1bndyr8bi9ngrba3c3n9k9k26s0irk62jhly7fj6g62k87b82z75"))))
+                "1pg0zh4gajn699am26j4ldpsa51bafn7n0jc5s4v6sslixj3ccwg"))))
    (build-system font-build-system)
    (arguments
     (list #:phases
@@ -4651,12 +4612,12 @@ Mainland China.")
               (replace 'install
                 (lambda _
                   (let ((install (assoc-ref %standard-phases 'install)))
-                     (with-directory-excursion "VAR_OTF"
+                     (with-directory-excursion "VAR"
                       (for-each delete-file (find-files "." "\\.ttf$"))
                       (install #:outputs `(("out" . ,#$output))))
-                     (with-directory-excursion "STATIC_OTF"
+                     (with-directory-excursion "OTF"
                       (install #:outputs `(("out" . ,#$output:otf))))
-                     (with-directory-excursion "STATIC_TTF"
+                     (with-directory-excursion "TTF"
                       (install #:outputs `(("out" . ,#$output:ttf))))))))))
    (outputs '("out" "otf" "ttf"))
    (home-page "https://chiron-fonts.github.io/")
@@ -4672,7 +4633,7 @@ prevalent typefaces in Traditional Chinese regions.")
  (package
    (inherit font-chiron-sung-hk)
    (name "font-chiron-hei-hk")
-    (version "2.605")
+    (version "2.524")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -4681,7 +4642,7 @@ prevalent typefaces in Traditional Chinese regions.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1g06vcrav4bd57ka4b6wrjas04rnhb35n7c7447lv2yp26z10ypp"))))
+                "077f50yjcf5slr2jzrdampwcrlaswvdnin5iwnirzsms3x9vsm69"))))
    (synopsis "Traditional Chinese Gothic typeface")
    (description
     "Chiron Hei HK is a Traditional Chinese Gothic typeface based on the Hong
@@ -2211,7 +2211,6 @@ work well with other GTK desktop environments.")
       ("freetype" ,freetype)
       ("glib" ,glib)
       ("pango" ,pango)
-       ("perl" ,perl)                   ;needed for pdfoutline
       ("perl-pdf-api2" ,perl-pdf-api2)
       ("perl-libintl-perl" ,perl-libintl-perl)
       ("unicode-blocks"
@@ -2228,10 +2227,7 @@ work well with other GTK desktop environments.")
    (synopsis "PDF and PostScript font samples generator")
    (description "This package provides a tool that can be used to make font
 samples that show coverage of the font and are similar in appearance to
-Unicode Charts.  It was developed for use with DejaVu Fonts project.
-
-This package also includes the @command{pdfoutline} script, which can be used
-to modify outlines (machine-readable tables of contents) in PDF files.")
+Unicode Charts.  It was developed for use with DejaVu Fonts project.")
    (license license:gpl3+)))

 (define-public libraqm
@@ -55,7 +55,7 @@
 (define-public gambas
  (package
    (name "gambas")
-    (version "3.21.1")
+    (version "3.21.0")
    (source
     (origin
       (method git-fetch)
@@ -64,7 +64,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0mscfpm9ldnk8dfg7ripxyqg77j8q3bliwkacqwih37151mrc07s"))))
+        (base32 "0lkm4fbxqmkqpk2f2z660m77xshhmvj4pnlv0z43zrarsij8l6gf"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -677,31 +677,22 @@ possible, and it also makes the SGE easy to learn.")
    (license license:lgpl3+)))

 (define-public python-pyscroll
-  ;; No tags, no releases, not clear which commit corresponds to which PyPI
-  ;; release. But PyPI has no tests, so need to use git.
-  (let ((commit "31e1c282d09542ec89c6c1ac3ee6a1ff991ff5c2")
-        (revision "1"))
-    (package
-      (name "python-pyscroll")
-      (version (git-version "2.31" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/bitcraft/pyscroll")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1mqi8ccxi7vk63hw7klxjzd8jp6lnnw5q70nvrzmgq0jxpp61h7y"))))
-      (build-system pyproject-build-system)
-      (native-inputs (list python-pytest python-setuptools))
-      (propagated-inputs (list python-pygame))
-      (home-page "https://github.com/bitcraft/pyscroll")
-      (synopsis "Fast scrolling maps library for pygame")
-      (description "@code{pyscroll} is a simple and fast module
+  (package
+    (name "python-pyscroll")
+    (version "2.31")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyscroll" version))
+              (sha256
+               (base32
+                "0w3c58mkkbsyvx9w9hwdizk20pbds800m7v9vg49ydw440dha0hr"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-pygame))
+    (home-page "https://github.com/bitcraft/pyscroll")
+    (synopsis "Fast scrolling maps library for pygame")
+    (description "@code{pyscroll} is a simple and fast module
 for animated scrolling maps for your new or existing game.")
-      (license license:lgpl3+))))
+    (license license:lgpl3+)))

 (define-public python-pytmx
  (package
@@ -804,11 +795,7 @@ support.")
       (uri (pypi-uri "neteria" version))
       (sha256
        (base32 "1azlix80a6vns2i3z0bdbqk32kx8s2gjh2nvshab235fd9h85yv7"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:tests? #f))                ;No tests, also not on github
-    (native-inputs
-     (list python-setuptools))
+    (build-system python-build-system)
    (propagated-inputs
     (list python-rsa))
    (home-page "https://pypi.org/project/neteria/")
@@ -2837,7 +2824,7 @@ scripted in a Python-like language.")
 (define-public ericw-tools
  (package
    (name "ericw-tools")
-    (version "0.18.2-rc1")
+    (version "0.18.1")
    (source
     (origin
       (method git-fetch)
@@ -2845,7 +2832,7 @@ scripted in a Python-like language.")
                           (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0903fn4a5mc4sdx8q36j57fp15f7z246h8jm78x9jfz7sx9xrc3m"))
+        (base32 "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp"))
       (patches
        (search-patches "ericw-tools-add-check-for-sse2-in-light.cc.patch"
                        "ericw-tools-gcc-11-pass-const-to-offsetof.patch"))))
@@ -2890,7 +2877,7 @@ scripted in a Python-like language.")
                                   #$(package-version this-package)
                                   "/README.md")))))
           #:tests? #f)) ; No tests
-    (inputs (list embree))
+    (inputs (list embree-2))
    (home-page "https://ericwa.github.io/ericw-tools/")
    (synopsis "Map compiling tools for Quake/Hexen 2")
    (description
@@ -10191,7 +10191,7 @@ via the in-game download manager.")
      (inputs
       (list alsa-lib
             eudev
-             ffmpeg
+             ffmpeg-6
             glib
             glew
             gtk+-2
@@ -10224,7 +10224,7 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
 (define-public oshu
  (package
    (name "oshu")
-    (version "2.0.3")
+    (version "2.0.1")
    (source
     (origin
       (method git-fetch)
@@ -10234,7 +10234,7 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0hk0yidmkrqj0mg6pjmwdzkaz8vvdsxxxvprj1qxjblslj2h8lvd"))))
+         "1g598incc6zlls876slgwqblwiwiszkmqa4xpzw0z7mbjmmzsizz"))))
    (build-system cmake-build-system)
    (arguments
     `(#:phases
@@ -10245,7 +10245,7 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
    (native-inputs
     (list pkg-config))
    (inputs
-     (list cairo ffmpeg-6 pango sdl2 sdl2-image))
+     (list cairo ffmpeg-4 pango sdl2 sdl2-image))
    (home-page "https://github.com/fmang/oshu/")
    (synopsis "Rhythm game in which you click on circles")
    (description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,
@@ -11560,7 +11560,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
                      (string-append "PREFIX=" #$output))))
          (replace 'build (assoc-ref gnu:%standard-phases 'build))
          (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
-    (inputs (list qtbase-5 qtsvg-5 qtwayland-5))
+    (inputs (list qtbase-5 qtsvg-5))
    (home-page "https://portnov.github.io/qcheckers/")
    (synopsis "Qt-based checkers boardgame")
    (description "QCheckers, formerly known as KCheckers, is a is a Qt version
@@ -11744,7 +11744,7 @@ and chess engines.")
    (native-inputs
     (list qttools-5))
    (inputs
-     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 qtwayland-5 zlib))
+     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
    (arguments
     (list
      #:tests? #f
@@ -11758,14 +11758,7 @@ and chess engines.")
              (substitute* "chessx.pro"
                (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
                 (search-input-file inputs "/bin/lrelease")))))
-          (add-after 'fix-paths 'fix-library-paths
-            (lambda _
-              ;; Otherwise it won't find the wayland shell integration
-              ;; or qt plugin for wayland-egl.
-              (substitute* "src/gui/main.cpp"
-                (("QApplication::setLibraryPaths\\(l\\);")
-                 "/* QApplication::setLibraryPaths(l); */"))))
-          (add-after 'fix-library-paths 'make-qt-deterministic
+          (add-after 'fix-paths 'make-qt-deterministic
            (lambda _
              (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
          (add-after 'make-qt-deterministic 'disable-versioncheck
@@ -12182,7 +12175,6 @@ game.")  ;thanks to Debian for description
           libircclient
           protobuf-2                   ;remove package when no longer needed
           qtbase-5
-           qtwayland-5
           (sdl-union (list sdl sdl-mixer))
           sqlite
           tinyxml
@@ -212,26 +212,26 @@ Polygon meshes, and Extruded polygon meshes.")
    (version "0.1.36")
    (source
     (origin
+       ;; We fetch the sources from the repository since the PyPI archive
+       ;; doesn't contain the CMakeLists.txt file which is useful for
+       ;; integration with other software, such as the openboardview package.
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/Dav1dde/glad")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n"))))
-    (build-system pyproject-build-system)
+        (base32
+         "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      ;; XXX: testing seems complex, see utility/compiletest.sh
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-cmakelists.txt
-            (lambda _
-              (let ((share (string-append #$output "/share/"
-                                          #$(package-name this-package))))
-                (install-file "CMakeLists.txt" share)))))))
-    (native-inputs (list python-setuptools))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-cmakelists.txt
+                 (lambda _
+                   (let ((share (string-append #$output "/share/"
+                                               #$(package-name this-package))))
+                     (install-file "CMakeLists.txt" share)))))))
    (home-page "https://github.com/Dav1dde/glad")
    (synopsis "Multi-language GL/GLES/EGL/GLX/WGL loader generator")
    (description "Glad uses the official Khronos XML specifications to
@@ -2733,43 +2733,30 @@ schemas for settings shared by various components of the GNOME desktop.")
    (license license:lgpl2.1+)))

 (define-public python-liblarch
-  ;; The merge request replacing nose with pytest has not been released yet.
-  ;; Temporarily use a git snapshot.
-  (let ((commit "fe06860ea6f1cd339b5b38485879ec5d9512698c")
-        (revision "0"))
  (package
    (name "python-liblarch")
-    (version (git-version "3.2.0" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/getting-things-gnome/liblarch")
-             (commit commit)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1hvwhqhanwkmavnqxbl276nncvnrhgz92pa8z417d8bk3cirmj0b"))))
-    (build-system pyproject-build-system)
+    (version "3.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/getting-things-gnome/liblarch")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "125rmrdbc84lapfh8c77zxnmwas20xdfamqmilhv1smkxn2q4sh3"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'start-xserver
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((xorg-display ":1"))
-                (system (string-join
-                         (list (search-input-file inputs "/bin/Xvfb")
-                               xorg-display "&")
-                         " "))
-                (setenv "DISPLAY" xorg-display))))
-          (replace 'check
-            (lambda* (#:key tests? test-flags #:allow-other-keys)
-              (when tests?
-                (invoke "./run-tests")))))))
-    (native-inputs (list python-pytest python-setuptools xorg-server-for-tests))
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'start-xserver
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (system (format #f "~a/bin/Xvfb :1 &"
+                                      (assoc-ref inputs "xorg-server")))
+                      (setenv "DISPLAY" ":1"))))))
+    (native-inputs (list xorg-server-for-tests))
    (inputs (list gtk+))
    (propagated-inputs (list python-pygobject))
-    (home-page "https://getting-things-gnome.github.io/liblarch")
+    (home-page "https://wiki.gnome.org/Projects/liblarch")
    (synopsis "Library to easily handle complex data structures")
    (description
     "Liblarch is a Python library built to easily handle data structures such
@@ -2779,7 +2766,7 @@ allow you to use your data structure in a @code{Gtk.Treeview}.
 Liblarch support multiple views of one data structure and complex filtering.
 That way, you have a clear separation between your data themselves (Model)
 and how they are displayed (View).")
-      (license license:lgpl3+))))
+    (license license:lgpl3+)))

 (define-public gtg
  (package
@@ -8874,7 +8861,7 @@ the available networks and allows users to easily switch between them.")
 (define-public libxml++
  (package
    (name "libxml++")
-    (version "5.6.0")
+    (version "5.4.0")
    (source
     (origin
       (method git-fetch)
@@ -8883,7 +8870,7 @@ the available networks and allows users to easily switch between them.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ckgllfgnfszri57ay41jykwblcilsyldkhiq0x5h50c5av118pj"))))
+        (base32 "0gp8irc5ny9i6bw9fp21p8djgksi1s8l5flbn5blisgfpcb2w820"))))
    (build-system gnu-build-system)
    (propagated-inputs
     (list libxml2))  ;required by .pc file
@@ -303,7 +303,7 @@ applications and libraries.  It is used by AqBanking.")
 (define-public aqbanking
  (package
    (name "aqbanking")
-    (version "6.8.5")
+    (version "6.8.2")
    (source
     (origin
       (method git-fetch)
@@ -312,7 +312,7 @@ applications and libraries.  It is used by AqBanking.")
              (commit version)))
       (sha256
        (base32
-         "1xqhhxhr1azqvdn47389h469d3srl5l3n1nx82jx2djbx9sdzdq9"))
+         "0ys5r8lbr1nvd14fr82rs6c16iqfpd1hdz5l9s8l9biy2sq8jh0z"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2014-2026 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014-2025 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016-2019, 2021, 2024, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -604,9 +604,9 @@ in the case of Firefox, it is browser/locales/all-locales."
    "zh-CN"
    "zh-TW"))

-(define %icecat-base-version "140.7.0")
+(define %icecat-base-version "140.6.0")
 (define %icecat-version (string-append %icecat-base-version "-gnu1"))
-(define %icecat-build-id "20260113000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-build-id "20251211000000") ;must be of the form YYYYMMDDhhmmss

 ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
 ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -626,9 +626,9 @@ in the case of Firefox, it is browser/locales/all-locales."
                  "firefox-" upstream-firefox-version ".source.tar.xz"))
            (sha256
             (base32
-              "0a8mrc4pja4cjhayg4af5lsfrf7161gfq03idwik0vvjf68772k0"))))
+              "1jadc0ynq49zcqd7ix9nxlrqy5gfhm61p7yliwy068bma2mwjdbc"))))

-         (gnuzilla-commit "c211e9c18a24310266543cb3c90256ef2660815c")
+         (gnuzilla-commit "f4e50b9a4d5384ce2e860133bf0beaaccbf19b46")
         (gnuzilla-source
          (origin
            (method git-fetch)
@@ -639,7 +639,7 @@ in the case of Firefox, it is browser/locales/all-locales."
                                      (string-take gnuzilla-commit 8)))
            (sha256
             (base32
-              "1grs891b5hq3xssid33jm7vzmjr23gk3f4qv1ngdlhkgs82r4s8s"))))
+              "0zjzw7blal3niyzyvw33w2cg906pnjbmvf7gsgas2in9xy3rlix6"))))

         ;; 'search-patch' returns either a valid file name or #f, so wrap it
         ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@@ -1646,7 +1646,9 @@ ca495991b7852b855"))
                      "ac_add_options --with-libclang-path="
                      #$(this-package-native-input "clang") "/lib\n"
                      "ac_add_options --with-system-bz2\n"
-                      "ac_add_options --with-system-icu\n"
+                      ;; FIXME: Causes breakage (see:
+                      ;; <https://codeberg.org/guix/guix/issues/3166>)
+                      ;; "ac_add_options --with-system-icu\n"
                      "ac_add_options --with-system-jpeg\n"
                      "ac_add_options --with-system-libevent\n"
                      "ac_add_options --with-system-nspr\n"
@@ -1744,7 +1746,9 @@ ca495991b7852b855"))
           gpgme
           gtk+
           hunspell
-           icu4c-77
+           ;; FIXME: Causes breakage (see:
+           ;; <https://codeberg.org/guix/guix/issues/3166>).
+           ;;icu4c-77
           libcanberra
           libevent
           libffi
@@ -1160,37 +1160,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                           (string-append all "\n        t.Skip(\"golang.org/issue/75720\")\n"))))))
                   '())))))))

-(define-public go-1.26
-  (package
-    (inherit go-1.24)
-    (name "go")
-    (version "1.26rc1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/golang/go")
-             (commit (string-append "go" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1a837mgsfiq3rqnp67kgw83hvq8p61j1yafhlqw4yzp78bz67sdf"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments go-1.24)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            ;; There is no real discussion on the issue among humans, a lot
-            ;; of gopherbot updates and it's closed without final resolution.
-            ;; https://github.com/golang/go/issues/73977
-            (add-after 'unpack 'skip-TestSynctest-tests
-              (lambda _
-                (substitute* "src/runtime/synctest_test.go"
-                  (("TestSynctest\\(.*" all)
-                   (string-append all "\n        t.Skip(\"golang.org/issue/73977\")\n")))))))))
-    (native-inputs
-     ;; Go 1.26 and later requires Go 1.24.6+ as the bootstrap toolchain.
-     ;; TODO: Switch this to go-1.24 when go@1.24 is updated.
-     (alist-replace "go" (list go-1.25) (package-native-inputs go-1.25)))))
-
 ;;
 ;; Default Golang version used in guix/build-system/go.scm to build packages.
 ;;
@@ -1237,7 +1206,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
 (define-public go-std-1.23 (make-go-std go-1.23))
 (define-public go-std-1.24 (make-go-std go-1.24))
 (define-public go-std-1.25 (make-go-std go-1.25))
-(define-public go-std-1.26 (make-go-std go-1.26))

 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
@@ -205,21 +205,26 @@ episode status changes.")
 (define-public python-podcastparser
  (package
    (name "python-podcastparser")
-    (version "0.6.11")
+    (version "0.6.10")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "podcastparser" version))
       (sha256
-        (base32 "12bysnajlqmsm1ns8l4j8d2dgwqyyq8jdfsm1vsksv5qj0zndhin"))))
-    (build-system pyproject-build-system)
+        (base32 "1mqkkxz928y430xx3mgw9dj78ilkgv9hjdha1hizbks6mmhcp6ib"))))
    (native-inputs
-     (list python-pytest python-setuptools))
+     (list python-pytest))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _ (invoke "pytest"))))))
+    (build-system python-build-system)
    (home-page "http://gpodder.org/podcastparser")
    (synopsis "Simplified and fast RSS parser Python library")
-    (description
-     "@code{podcastparser} is a library for the gPodder project to provide an
-easy and reliable way of parsing RSS and Atom-based podcast feeds in Python.")
+    (description "@code{podcastparser} is a library for the gPodder project to
+provide an easy and reliable way of parsing RSS and Atom-based podcast feeds
+in Python.")
    (license license:isc)))

 (define-public castget
@@ -233,8 +233,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
                               (string-append "PREFIX=" #$output))))
                   (replace 'build (assoc-ref gnu:%standard-phases 'build))
                   (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
-    (inputs
-     (list libxkbcommon qtbase qtpositioning qtserialport qtsvg qtwayland))
+    (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg))
    (native-inputs (list qttools))
    (home-page "https://www.gpxsee.org")
    (synopsis "GPS log file viewer and analyzer")
@@ -599,6 +599,30 @@ applications.")
               (base32
                "1kcvz7g6j56anv9zjyd3gidxl46vipw0gg82lns12m45cd43iwxm"))))))

+(define-public embree-2
+  (package/inherit embree
+    (version "2.17.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference (url "https://github.com/RenderKit/embree")
+                           (commit (string-append "v" version))))
+       (file-name (git-file-name (package-name embree) version))
+       (sha256
+        (base32 "19v60zdfix33c772x6dzmhsarhafsns8qy7c2ysqr7a9j16whgql"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments embree)
+       ((#:configure-flags configure-flags)
+        #~(append (list "-DEMBREE_MAX_ISA=NONE" "-DEMBREE_TUTORIALS=OFF")
+              #$configure-flags))))
+    (inputs (modify-inputs (package-inputs embree)
+              (replace "tbb" tbb-2020)))
+    ;; Embree requires SSE2 support, so build only for x86-based architectures.
+    (supported-systems (list "i686-linux" "x86_64-linux"))
+    (description (string-append (package-description embree) "
+
+Please note that this version requires a processor with SSE2 support."))))
+
 (define-public openvdb
  (package
    (name "openvdb")
@@ -2799,7 +2823,6 @@ Automated palette selection is supported.")
           qtkeychain
           qtmultimedia
           qtsvg
-           qtwayland
           qtx11extras
           vulkan-headers))
    (home-page "https://drawpile.net")
@@ -3036,29 +3036,27 @@ user interaction (e.g.  measuring distances).")
 (define-public volctl
  (package
    (name "volctl")
-    (version "0.9.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/buzz/volctl")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0113mkhvjh2asmydpvm96j1d8s6bbp5gnhfzirjb6flj6zy6dgfc"))))
-    (build-system pyproject-build-system)
+    (version "0.9.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference (url "https://github.com/buzz/volctl")
+                                  (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0anrwz8rvbliskmcgpw2zabgjj5c72hpi7cf0jg05vvmlpnbsd4g"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f                       ;No tests.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "volctl/xwrappers.py"
-                (("libXfixes.so")
-                 (search-input-file inputs "/lib/libXfixes.so"))))))))
-    (native-inputs (list python-setuptools))
-    (inputs (list libxfixes))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "volctl/xwrappers.py"
+               (("libXfixes.so")
+                (string-append (search-input-file inputs
+                                                  "/lib/libXfixes.so")))))))))
+    (inputs
+     (list libxfixes))
    (propagated-inputs
     (list python-click
           python-pycairo
@@ -3068,9 +3066,8 @@ user interaction (e.g.  measuring distances).")
           gtk+))
    (home-page "https://buzz.github.io/volctl/")
    (synopsis "Per-application volume control and on-screen display")
-    (description
-     "Volctl is a PulseAudio-enabled tray icon volume control and OSD applet
-for graphical desktops.  It's not meant to be an replacement for a
+    (description "Volctl is a PulseAudio-enabled tray icon volume control and
+OSD applet for graphical desktops.  It's not meant to be an replacement for a
 full-featured mixer application.  If you're looking for that check out the
 excellent pavucontrol.")

@@ -1030,7 +1030,7 @@ invocations."))))
 (define-public guile-dsv
  (package
    (name "guile-dsv")
-    (version "0.9.0")
+    (version "0.8.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1039,7 +1039,7 @@ invocations."))))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1dkpz0fppgqywpqq29d6gmva0gwfk61dcxbd7c8jd463dvqhryfp"))))
+                "0hpdl2x0lp0dqpx23l29a45lvn5c2qpd4bzrl8d46vm4nraqi7aa"))))
    (build-system gnu-build-system)
    (native-inputs (list autoconf
                         automake
@@ -1051,7 +1051,7 @@ invocations."))))
                         guile-lib
                         guile-smc))
    (inputs (list bash-minimal guile-3.0))
-    (propagated-inputs (list guile-fibers guile-lib guile-smc))
+    (propagated-inputs (list guile-lib guile-smc))
    (arguments
     (list #:modules `(((guix build guile-build-system)
                        #:select (target-guile-effective-version))
@@ -1248,6 +1248,59 @@ is not available for Guile 2.0.")
     ;; <https://github.com/wingo/fibers/pull/53>.
     (filter (cut string-suffix? "-linux" <>) %supported-systems))))

+(define-public guile-fibers-1.0
+  (package
+    (inherit guile-fibers-1.1)
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://wingolog.org/pub/fibers/fibers-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure"
+                    (("search=\"2\\.2\"")
+                     "search=\"3.0 2.2\""))
+
+                  ;; Explicitly include system headers rather than relying on
+                  ;; <libguile.h> to do it for us.
+                  (substitute* "epoll.c"
+                    (("#include.*libguile\\.h.*$" all)
+                     (string-append "#include <unistd.h>\n"
+                                    "#include <string.h>\n"
+                                    all "\n")))
+
+                  ;; Import (ice-9 threads) for 'current-processor-count'.
+                  (substitute* "tests/channels.scm"
+                    (("#:use-module \\(fibers\\)")
+                     (string-append "#:use-module (fibers)\n"
+                                    "#:use-module (ice-9 threads)\n")))
+                  #t))
+              (patches
+               ;; fixes a resource leak that causes crashes in the tests
+               (search-patches "guile-fibers-destroy-peer-schedulers.patch"))))
+    (arguments
+     '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0.
+       #:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'mode-guile-objects
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; .go files are installed to "lib/guile/X.Y/cache".
+                      ;; This phase moves them to "…/site-ccache".
+                      (let* ((out (assoc-ref outputs "out"))
+                             (lib (string-append out "/lib/guile"))
+                             (old (car (find-files lib "^ccache$"
+                                                   #:directories? #t)))
+                             (new (string-append (dirname old)
+                                                 "/site-ccache")))
+                        (rename-file old new)
+                        #t))))))))
+
 (define-public guile2.2-fibers
  (package
    (inherit guile-fibers)
@@ -4055,64 +4108,56 @@ store.")
                     (replace "guile" guile-2.2)))))

 (define-public guile-commonmark
-  (let ((commit "8ebb3041973ee65eed71757c97d09c63b842ac9a")
-        (revision "0"))
-    (package
-      (name "guile-commonmark")
-      (version (git-version "0.1.2" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/spritely/guile-commonmark")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0lb5gscrdjkjysvs59a9jhw2axaqk0kjxxvbp0f0n7si798030v1"))))
-      (build-system gnu-build-system)
-      ;; The tests throw exceptions with Guile 3.0.5, because they evaluate
-      ;; (exit ...).
-      ;;
-      ;; This has been fixed upstream, but there has not been a new release
-      ;; containing this change.
-      (arguments
-       '(#:make-flags '("GUILE_AUTO_COMPILE=0")
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'remove-stale-tests
-             (lambda _
-               ;; The tests are probably stale and requires update
-               ;; disable them
-               (for-each
-                (lambda (f)
-                  (delete-file f)
-                  (system* "touch" f))
-                (list
-                 "tests/inlines/entities.scm"
-                 "tests/inlines/links.scm"
-                 "tests/inlines/backslash-escape.scm"
-                 "tests/blocks/setext-headings.scm"
-                 "tests/blocks/lists.scm"
-                 "tests/blocks/list-items.scm"))))
-           (add-after 'unpack 'fix-tests-when-building-with-guile-3.0.5
-             (lambda _
-               (substitute* (find-files "tests" "\\.scm$")
-                 (("\\(exit.*") ""))
-               #t)))))
-      (inputs
-       (list guile-3.0))
-      (native-inputs
-       (list pkg-config autoconf automake texinfo))
-      (synopsis "CommonMark parser for Guile")
-      (description
-       "guile-commonmark is a library for parsing CommonMark, a fully specified
+  (package
+    (name "guile-commonmark")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/OrangeShark/" name
+                                  "/releases/download/v" version
+                                  "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "17lrsdisa3kckh24q114vfmzdc4wkqa6ccwl4hdlrng5wpn1iman"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure"
+                    (("2\\.2 2\\.0")
+                     "3.0 2.2 2.0"))
+                  ;; The 'en_US.utf8' locale is missing, but C.UTF-8 is
+                  ;; enough.
+                  (substitute* (find-files "tests/inlines" "\\.scm$")
+                    (("en_US.utf8")
+                     "C.UTF-8"))))))
+    (build-system gnu-build-system)
+    ;; The tests throw exceptions with Guile 3.0.5, because they evaluate
+    ;; (exit ...).
+    ;;
+    ;; This has been fixed upstream, but there has not been a new release
+    ;; containing this change.
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-tests-when-building-with-guile-3.0.5
+           (lambda _
+             (substitute* (find-files "tests" "\\.scm$")
+               (("\\(exit.*") ""))
+             #t)))))
+    (inputs
+     (list guile-3.0))
+    (native-inputs
+     (list pkg-config))
+    (synopsis "CommonMark parser for Guile")
+    (description
+     "guile-commonmark is a library for parsing CommonMark, a fully specified
 variant of Markdown.  The library is written in Guile Scheme and is designed
 to transform a CommonMark document to SXML.  guile-commonmark tries to closely
 follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference
 is no support for parsing block and inline level HTML.")
-      (home-page "https://codeberg.org/spritely/guile-commonmark")
-      (license license:lgpl3+))))
+    (home-page "https://github.com/OrangeShark/guile-commonmark")
+    (license license:lgpl3+)))

 (define-public guile2.2-commonmark
  (package
@@ -335,21 +335,18 @@ without requiring the source code to be rewritten.")
            (files '("lib/guile/2.2/site-ccache")))))))

 (define-public guile-2.2.4
-  ;; guile-2.2.4 has no dependents, but is used in (guix quirks).
+  ;; This has no dependencies, but is used in (guix quirks).
  ;; Do not remove!
  (package
    (inherit guile-2.2)
-    (version "2.2.4")
-    (source
-     (origin
-       (inherit (package-source guile-2.2))
-       (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz"))
-       (sha256
-        (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))
-    ;; libxcrypt-without-failure-tokens uses --disable-failure-tokens, which is
-    ;; necessary for the "crypt: glibc EINVAL"  test of guile-2.2.4.
-    (inputs (modify-inputs (package-inputs guile-2.2)
-              (replace "libxcrypt" libxcrypt-without-failure-tokens)))))
+   (version "2.2.4")
+   (source (origin
+             (inherit (package-source guile-2.2))
+             (uri (string-append "mirror://gnu/guile/guile-" version
+                                 ".tar.xz"))
+             (sha256
+              (base32
+               "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))

 (define-public guile-3.0
  ;; This is the latest Guile stable version.
@@ -36,7 +36,6 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cross-base)
-  #:use-module (gnu packages crypto)
  #:use-module (gnu packages disk)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages gawk)
@@ -595,7 +594,6 @@ exec ${system}/rc \"$@\"
    (inputs
     `(("libgcrypt" ,libgcrypt)                  ;for /hurd/random
       ("libdaemon" ,libdaemon)                  ;for /bin/console --daemonize
-       ("libxcrypt" ,libxcrypt)                  ;for password hashing
       ("unifont" ,unifont)
       ("libpciaccess" ,libpciaccess-static)

@@ -11,7 +11,6 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -180,26 +179,12 @@ C/C++ part.")
    (inherit icu4c)
    (name "icu4c")
    (version "77.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (icu4c-uri version))
-       (sha256
-        (base32
-         "0qa0yapkypywhzx8ai1p27125h9v1qy89f7v3w1kjz1jfwgl73jq"))
-       (patches
-        (search-patches
-         ;; These are the relevant patches Firefox applies (see
-         ;; <https://github.com/mozilla-firefox/firefox/tree/main/intl/icu-patches>).
-         ;; The 'intl/icu' prefix in the file names must be stripped.  These
-         ;; are necessary to ensure applications like Icedove run correctly.
-         "icu4c-22132-standardize-vtzone-output.patch"
-         "icu4c-20548-dateinterval-timezone.patch"
-         "icu4c-23069-rosh-hashanah-postponement.patch"
-         "icu4c-dayperiod-fractional-seconds.patch"
-         "icu4c-double-conversion.patch"
-         "icu4c-dtitvfmt-adopt-calendar.patch"
-         "icu4c-wasi-workaround.patch"))))))
+    (source (origin
+              (method url-fetch)
+              (uri (icu4c-uri version))
+              (sha256
+               (base32
+                "0qa0yapkypywhzx8ai1p27125h9v1qy89f7v3w1kjz1jfwgl73jq"))))))

 (define-public icu4c-build-root
  (package
@@ -275,6 +260,66 @@ globalisation support for software applications.  This package contains the
 Java part.")
    (license x11)))

+;; GraalVM Truffle 25.0.1 wants ICU4J 76.1, but ICU stopped publishing
+;; source tarballs with build.xml after 73.2. Version 74+ only provides
+;; Maven-based builds or pre-built JARs. Using 73.2 as a compromise.
+(define-public java-icu4j-for-graal-truffle
+  (package
+    (inherit java-icu4j)
+    (name "java-icu4j-for-graal-truffle")
+    (version "73.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/unicode-org/icu/releases/download/release-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+                    "/icu4j-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+                    ".tgz"))
+              (sha256
+               (base32 "0g4sxanzm5s0axjk2lm1w15gr0gx8jasir6rdjn23yx039brchjb"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments java-icu4j)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'build 'create-sources-jar
+             (lambda _
+               ;; Create a sources JAR from the core source files.
+               ;; mx shading needs .java source files, not .class files.
+               (invoke "jar" "cf" "icu4j-sources.jar"
+                       "-C" "main/classes/core/src" "com")))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((share (string-append (assoc-ref outputs "out")
+                                           "/share/java/")))
+                 (mkdir-p share)
+                 (install-file "icu4j.jar" share)
+                 (install-file "icu4j-sources.jar" share))))))))))
+
+(define-public java-icu4j-charset-for-graal-truffle
+  (package
+    (inherit java-icu4j-for-graal-truffle)
+    (name "java-icu4j-charset-for-graal-truffle")
+    (arguments
+     (substitute-keyword-arguments (package-arguments java-icu4j-for-graal-truffle)
+       ((#:build-target _) "icu4j-charset.jar")
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'create-sources-jar
+             (lambda _
+               ;; Create a sources JAR from the charset source files.
+               (invoke "jar" "cf" "icu4j-charset-sources.jar"
+                       "-C" "main/classes/charset/src" "com")))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((share (string-append (assoc-ref outputs "out")
+                                           "/share/java/")))
+                 (mkdir-p share)
+                 (install-file "icu4j-charset.jar" share)
+                 (install-file "icu4j-charset-sources.jar" share))))))))
+    (inputs (list java-icu4j-for-graal-truffle))
+    (synopsis "ICU4J charset provider for GraalVM Truffle")))
+
 (define-public icu4c-for-skia
  ;; The current version of skia needs this exact commit
  ;; for its test dependencies.
@@ -0,0 +1,283 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
+;;; Copyright © 2018 Alex ter Weele <alex.ter.weele@gmail.com>
+;;; Copyright © 2019, 2021, 2022 Eric Bavier <bavier@posteo.net>
+;;; Copyright © 2022 Attila Lendvai <attila@lendvai.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages idris)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages haskell-check)
+  #:use-module (gnu packages haskell-web)
+  #:use-module (gnu packages haskell-xyz)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system haskell)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages))
+
+(define-public idris
+  (package
+    (name "idris")
+    (version "1.3.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/idris-lang/Idris-dev.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0cd2a92323hb9a6wy8sc0cqwnisf4pv8y9y2rxvxcbyv8cs1q8g2"))
+              (patches (search-patches "idris-test-ffi008.patch"))))
+    (build-system haskell-build-system)
+    (native-inputs                      ;For tests
+     (list perl ghc-cheapskate ghc-tasty ghc-tasty-golden
+           ghc-tasty-rerun))
+    (inputs
+     (list gmp
+           ncurses
+           ghc-aeson
+           ghc-annotated-wl-pprint
+           ghc-ansi-terminal
+           ghc-ansi-wl-pprint
+           ghc-async
+           ghc-base64-bytestring
+           ghc-blaze-html
+           ghc-blaze-markup
+           ghc-cheapskate
+           ghc-code-page
+           ghc-fingertree
+           ghc-fsnotify
+           ghc-ieee754
+           ghc-libffi
+           ghc-megaparsec
+           ghc-network
+           ghc-optparse-applicative
+           ghc-regex-tdfa
+           ghc-safe
+           ghc-split
+           ghc-terminal-size
+           ghc-uniplate
+           ghc-unordered-containers
+           ghc-utf8-string
+           ghc-vector
+           ghc-vector-binary-instances
+           ghc-zip-archive))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--datasubdir="
+                            (assoc-ref %outputs "out") "/lib/idris")
+             "-fFFI" "-fGMP")
+       #:phases
+       (modify-phases %standard-phases
+         ;; This allows us to call the 'idris' binary before installing.
+         (add-after 'unpack 'set-ld-library-path
+           (lambda _
+             (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build"))))
+         (add-before 'configure 'update-constraints
+           (lambda _
+             (substitute* "idris.cabal"
+               (("(aeson|ansi-terminal|bytestring|haskeline|libffi|megaparsec|network|optparse-applicative)\\s+[<>=0-9. &|]+" all dep)
+                dep))))
+         (add-before 'configure 'set-cc-command
+           (lambda _
+             (setenv "CC" ,(cc-for-target))))
+         (add-after 'install 'fix-libs-install-location
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (lib (string-append out "/lib/idris"))
+                    (modules (string-append lib "/libs")))
+               (for-each
+                (lambda (module)
+                  (symlink (string-append modules "/" module)
+                           (string-append lib "/" module)))
+                '("prelude" "base" "contrib" "effects" "pruviloj")))))
+         (delete 'check)                ;Run check later
+         (add-after 'install 'check
+           (lambda* (#:key outputs #:allow-other-keys #:rest args)
+             (let ((out (assoc-ref outputs "out")))
+               (chmod "test/scripts/timeout" #o755) ;must be executable
+               (setenv "TASTY_NUM_THREADS" (number->string (parallel-job-count)))
+               (setenv "IDRIS_CC" ,(cc-for-target)) ;Needed for creating executables
+               (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))
+               (apply (assoc-ref %standard-phases 'check) args)))))))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "IDRIS_LIBRARY_PATH")
+            (files '("lib/idris")))))
+    (home-page "https://www.idris-lang.org")
+    (synopsis "General purpose language with full dependent types")
+    (description "Idris is a general purpose language with full dependent
+types.  It is compiled, with eager evaluation.  Dependent types allow types to
+be predicated on values, meaning that some aspects of a program's behaviour
+can be specified precisely in the type.  The language is closely related to
+Epigram and Agda.")
+    (license license:bsd-3)))
+
+;; Idris modules use the gnu-build-system so that the IDRIS_LIBRARY_PATH is set.
+(define (idris-default-arguments name)
+  `(#:modules ((guix build gnu-build-system)
+               (guix build utils)
+               (ice-9 ftw)
+               (ice-9 match))
+    #:phases
+    (modify-phases %standard-phases
+      (delete 'configure)
+      (delete 'build)
+      (delete 'check)
+      (replace 'install
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          (let* ((out (assoc-ref outputs "out"))
+                 (idris (assoc-ref inputs "idris"))
+                 (idris-bin (string-append idris "/bin/idris"))
+                 (idris-libs (string-append idris "/lib/idris/libs"))
+                 (module-name (and (string-prefix? "idris-" ,name)
+                                   (substring ,name 6)))
+                 (ibcsubdir (string-append out "/lib/idris/" module-name))
+                 (ipkg (string-append module-name ".ipkg"))
+                 (idris-library-path (getenv "IDRIS_LIBRARY_PATH"))
+                 (idris-path (string-split idris-library-path #\:))
+                 (idris-path-files (apply append
+                                          (map (lambda (path)
+                                                 (map (lambda (dir)
+                                                        (string-append path "/" dir))
+                                                      (scandir path))) idris-path)))
+                 (idris-path-subdirs (filter (lambda (path)
+                                               (and path (match (stat:type (stat path))
+                                                           ('directory #t)
+                                                           (_ #f))))
+                                                    idris-path-files))
+                 (install-cmd (cons* idris-bin
+                                     "--ibcsubdir" ibcsubdir
+                                     "--build" ipkg
+                                     ;; only trigger a build, as --ibcsubdir
+                                     ;; already installs .ibc files.
+
+                                     (apply append (map (lambda (path)
+                                                          (list "--idrispath"
+                                                                path))
+                                                        idris-path-subdirs)))))
+            ;; FIXME: Seems to be a bug in idris that causes a dubious failure.
+            (apply system* install-cmd)))))))
+
+(define-public idris-lightyear
+  (let ((commit "6d65ad111b4bed2bc131396f8385528fc6b3678a"))
+    (package
+      (name "idris-lightyear")
+      (version (git-version "0.1" "1" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/ziman/lightyear")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1pkxnn3ryr0v0cin4nasw7kgkc9dnnpja1nfbj466mf3qv5s98af"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       (list idris))
+      (arguments (idris-default-arguments name))
+      (home-page "https://github.com/ziman/lightyear")
+      (synopsis "Lightweight parser combinator library for Idris")
+      (description "Lightweight parser combinator library for Idris, inspired
+by Parsec.  This package is used (almost) the same way as Parsec, except for one
+difference: backtracking.")
+      (license license:bsd-2))))
+
+(define-public idris-wl-pprint
+  (let ((commit "1d365fcf4ba075859844dbc5eb96a90f57b9f338"))
+    (package
+      (name "idris-wl-pprint")
+      (version (git-version "0.1" "1" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/shayan-najd/wl-pprint")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0g7c3y9smifdz4sivi3qmvymhdr7v9kfq45fmfmmvkqcrix0spzn"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       (list idris))
+      (arguments (idris-default-arguments name))
+      (home-page "https://github.com/shayan-najd/wl-pprint")
+      (synopsis "Pretty printing library")
+      (description "A pretty printing library for Idris based on Phil Wadler's
+paper A Prettier Printer and on Daan Leijen's extensions in the Haskell
+wl-pprint library.")
+      (license license:bsd-2))))
+
+(define-public idris-bifunctors
+  (let ((commit "53d06a6ccfe70c49c9ae8c8a4135981dd2173202"))
+    (package
+      (name "idris-bifunctors")
+      (version (git-version "0.1" "1" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/HuwCampbell/Idris-Bifunctors")
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "02vbsd3rmgnj0l1qq787709qcxjbr9890cbad4ykn27f77jk81h4"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       (list idris))
+      (arguments (idris-default-arguments name))
+      (home-page "https://github.com/HuwCampbell/Idris-Bifunctors")
+      (synopsis "Bifunctor library")
+      (description "This is a bifunctor library for Idris based off the
+excellent Haskell Bifunctors package from Edward Kmett.")
+      (license license:bsd-3))))
+
+(define-public idris-lens
+  (let ((commit "26f012005f6849806cea630afe317e42cae97f29"))
+    (package
+      (name "idris-lens")
+      (version (git-version "0.1" "1" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/HuwCampbell/idris-lens")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "06jzfj6rad08rk92w8jk5byi79svmyg0mrcqhibgx8rkjjy6vmai"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       (list idris))
+      (propagated-inputs
+       (list idris-bifunctors))
+      (arguments (idris-default-arguments name))
+      (home-page "https://github.com/HuwCampbell/idris-lens")
+      (synopsis "Van Laarhoven lenses for Idris")
+      (description "Lenses are composable functional references.  They allow
+accessing and modifying data within a structure.")
+      (license license:bsd-3))))
@@ -1772,7 +1772,6 @@ substituted by matching images.")
         ("libtiff" ,libtiff)
         ("qtbase" ,qtbase-5)
         ("qtsvg-5" ,qtsvg-5)
-         ("qtwayland-5" ,qtwayland-5)
         ("zlib" ,zlib)))
      (arguments
       `(#:phases
@@ -862,7 +862,7 @@ Poppler-Qt5 binding, PDF documents.")
    (native-inputs
     (list qttools))
    (inputs
-     (list qtbase qtimageformats qtsvg qtwayland))
+     (list qtbase qtimageformats qtsvg))
    (home-page "https://interversehq.com/qview/")
    (synopsis "Convenient and minimal image viewer")
    (description "qView is a Qt image viewer designed with visually
@@ -97,7 +97,6 @@
  #:use-module (gnu packages popt)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-check)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages qt)
@@ -122,7 +121,6 @@
  #:use-module (guix build-system copy)
  #:use-module (guix build-system guile)
  #:use-module (guix build-system meson)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (guix build-system qt)
  #:use-module (guix build-system scons)
@@ -272,7 +270,7 @@ library.  It supports almost all PNG features and is extensible.")
   (license license:zlib)
   (home-page "http://www.libpng.org/pub/png/libpng.html")))

-(define-public libpng-next
+(define-public libpng-for-pcsx2
  (package
    (inherit libpng)
    (version "1.6.50")
@@ -1884,28 +1882,22 @@ PNG, and performs PNG integrity checks and corrections.")
 (define-public imgp
  (package
    (name "imgp")
-    ;; 2.9 was released in 2023
-    (properties '((commit . "00b2b520964f22ca5b6e0c7d7cb07ce7a755cea7")
-                  (revision . "0")))
-    (version (git-version "2.9"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "2.9")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/jarun/imgp")
-              (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "imgp" version))
       (sha256
-        (base32 "1rgm52agxrc8sirm72ksg6c2zpibjh4kvx1b2c59vx5inb33kfdh"))))
-    (build-system pyproject-build-system)
+        (base32 "0avdgr4fx643jg9wzwm65y14s56bnrn3hmkw7v0mcyvxn88vxwiq"))))
+    (build-system python-build-system)
    (arguments
-     (list #:test-backend #~'custom
-           ;; There are no actual tests, taken from project's Makefile.
-           #:test-flags #~(list "-m" "imgp" "--help")))
-    (native-inputs
-     (list python-setuptools))
+     `(#:tests? #f                      ;there are no tests
+       #:phases
+       (modify-phases %standard-phases
+         ;; setup.py expects the file to be named 'imgp'.
+         (add-after 'unpack 'rename-imgp
+           (lambda _
+             (rename-file "imgp.py" "imgp"))))))
    (inputs
     (list python-pillow))
    (home-page "https://github.com/jarun/imgp")
@@ -319,7 +319,6 @@ setting @env{LUA_PATH} and @env{LUA_CPATH} in glirc's run-time environment.")
           qtmultimedia-5
           qtscript-5
           qtsvg-5
-           qtwayland-5
           sonnet
           zlib))
    (home-page "https://quassel-irc.org/")
@@ -2,7 +2,7 @@
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2019, 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
-;;; Copyright © 2020-2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,7 +26,6 @@
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages backup)
  #:use-module (gnu packages base)
-  #:use-module (gnu packages c)
  #:use-module (gnu packages check)
  #:use-module (gnu packages crypto)
  #:use-module (gnu packages documentation)
@@ -44,7 +43,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages pulseaudio)
  #:use-module (gnu packages python)
  #:use-module (gnu packages qt)
@@ -80,9 +78,9 @@

 ;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up
 ;;; to date with those listed in
-;;; <https://git.jami.net/savoirfairelinux/jami-daemon/-/blob/master/contrib/src/ffmpeg/rules.mak>.
-(define %jami-nightly-version "20251212.0")
-(define %jami-daemon-commit "663dc3f7b625abcd05e516d819c70fd883a3c9f2")
+;;; <https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak>.
+(define %jami-nightly-version "20251003.0")
+(define %jami-daemon-commit "afe2446133eb3c9279e42b0d1dcfdd9a3c76a35f")

 (define-public libjami
  (package
@@ -96,9 +94,7 @@
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1379vq5afqgrjgwhl2qwapzrs9irjsxr2gzm35jrsg31rms5xgzb"))
-              (patches (search-patches "libjami-pkgconf.patch"
-                                       "libjami-simdutf.patch"))))
+                "05vjykg3nzf91bwzrhh95c6mndiz5n6gz204y2nrfrszx161irh9"))))
    (outputs '("out" "bin" "debug"))    ;"bin' contains jamid
    (build-system gnu-build-system)
    (arguments
@@ -106,15 +102,14 @@
      ;; XXX: The test suites reportedly takes 2 h 30 to run by upstream's CI.
      ;; Many tests also fail, within and without the containerized
      ;; environment.  Some issues have recently been fixed, so try again in
-      ;; the next release.  More problematically, it currently fails to build
-      ;; at all (see: <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1168>).
+      ;; the next release.
      #:tests? #f
      ;; The agent links the daemon binary with libguile, which enables the
      ;; execution of test plans described in Scheme.  It may be useful in
      ;; user scripts too, until more general purpose Scheme bindings are made
      ;; available (see: test/agent/README.md).
      ;; FIXME: compiling the agent currently fails (see:
-      ;; <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1139>).
+      ;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1139).
      #:configure-flags #~(list "--disable-agent" "--enable-debug")
      #:make-flags #~(list"V=1")        ;build verbosely
      #:phases
@@ -143,14 +138,6 @@
                (mkdir-p share)
                (rename-file (search-input-directory outputs "share/dbus-1")
                             (string-append share "/dbus-1"))))))))
-    (native-inputs
-     (list autoconf
-           automake
-           cppunit
-           libtool
-           perl                         ;to generate manpages with pod2man
-           pkg-config
-           which))
    (inputs
     (list alsa-lib
           asio
@@ -172,9 +159,16 @@
           sdbus-c++
           speex
           speexdsp
-           simdutf
           webrtc-audio-processing-0.3
           yaml-cpp))
+    (native-inputs
+     (list autoconf
+           automake
+           cppunit
+           libtool
+           perl                         ;to generate manpages with pod2man
+           pkg-config
+           which))
    (synopsis "Jami core library and daemon")
    (description "This package provides a library and daemon implementing the
 Jami core functionality.  Jami is a secure and distributed voice, video and
@@ -237,12 +231,13 @@ QSortFilterProxyModel conveniently exposed for QML.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "13mpv62pw4f8cb9h8qaplxkn2ydsy9d2fr4v4p54r225ynzbq04h"))
+                "1ivgs7ckc5wcjlg1p2v7nsw4skcr2hfgv7yk9kx1hd4pbiknr6hk"))
              (patches (search-patches
-                        "jami-allow-system-zxing-cpp.patch"
-                        "jami-libjami-cmake.patch"
+                        "jami-unbundle-dependencies.patch"
+                        "jami-libjami-headers-search.patch"
                        "jami-qwindowkit.patch"
-                        "jami-avutil-link.patch"))))
+                        "jami-skip-tests-requiring-internet.patch"
+                        "jami-find-package-avutil.patch"))))
    (build-system qt-build-system)
    (outputs '("out" "debug"))
    (arguments
@@ -272,7 +267,7 @@ QSortFilterProxyModel conveniently exposed for QML.")
              ;; This works around the lack of configuration for the X11
              ;; push-to-talk feature, which is auto-detected via the
              ;; XDG_SESSION_TYPE environment variable (see:
-              ;; <https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1504>).
+              ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1504).
              (setenv "XDG_SESSION_TYPE" "x11")))
          (replace 'check
            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@@ -293,9 +288,9 @@ QSortFilterProxyModel conveniently exposed for QML.")

                  ;; The QML test suite is currently disabled as it segfaults
                  ;; (see:
-                  ;; <https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1631>).
-                  ;;(display "Running functional tests...\n")
-                  ;;(apply invoke "ctest" "-R" "Qml_Tests" ctest-args)
+                  ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1631).
+                  ;; (display "Running functional tests...\n") (apply invoke
+                  ;; "ctest" "-R" "Qml_Tests" ctest-args)
                  )))))))
    (native-inputs
     (list git-minimal
@@ -316,6 +311,7 @@ QSortFilterProxyModel conveniently exposed for QML.")
           libxkbcommon
           md4c
           network-manager
+           qrencode
           qt5compat
           qtdeclarative
           qtmultimedia
@@ -323,6 +323,35 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} /
 algorithms in Java.")
    (license license:public-domain)))

+(define-public java-xz-for-graal-truffle
+  (package
+    (inherit java-xz)
+    (name "java-xz-for-graal-truffle")
+    (version "1.10")
+    (source (origin
+              (method url-fetch/zipbomb)
+              (uri (string-append "https://tukaani.org/xz/xz-java-" version ".zip"))
+              (sha256
+               (base32 "1rbzbzab8iizic4yqh2ps9hmjxxym7hghc4gkiggscpl8bd54an0"))))
+    (arguments
+     `(#:tests? #f
+       #:jdk ,openjdk
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'build 'create-sources-jar
+           (lambda _
+             ;; Create a sources JAR from the source files.
+             ;; Only include org/tukaani/xz - exclude demo files in root.
+             (invoke "jar" "cf" "build/jar/xz-sources.jar"
+                     "-C" "src" "org")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share/java")))
+               (mkdir-p share)
+               (install-file "build/jar/xz.jar" share)
+               (install-file "build/jar/xz-sources.jar" share)))))))))
+
 (define-public java-zstd
  (package
    (name "java-zstd")
@@ -338,9 +367,9 @@ algorithms in Java.")
                "0z26z04sc4j6k0g4gvq4xc86mc4wiyp1j7z5hh6wpqgmy9b6h2zb"))))
    (build-system ant-build-system)
    (arguments
-     `(#:jar-name "java-zstd.jar"
+     `(#:jar-name "zstd-jni.jar"
       #:source-dir "src/main/java"
-       #:tests? #f; Require scala
+       #:tests? #f
       #:phases
       (modify-phases %standard-phases
         (add-before 'build 'generate-version
@@ -352,7 +381,21 @@ algorithms in Java.")

 public class ZstdVersion {
  public static final String VERSION = \"~a\";
-}" ,version))))))))
+}" ,version)))))
+         (add-before 'install 'generate-pom
+           (lambda _
+             (with-output-to-file "pom.xml"
+               (lambda _
+                 (format #t "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.github.luben</groupId>
+  <artifactId>zstd-jni</artifactId>
+  <version>~a</version>
+  <packaging>jar</packaging>
+  <name>zstd-jni</name>
+</project>" ,version)))))
+         (replace 'install (install-from-pom "pom.xml")))))
    (inputs
     `(("zstd" ,zstd)))
    (home-page "https://github.com/luben/zstd-jni")
@@ -363,3 +406,47 @@ compression needs.  This package provides JNI bindings for Zstd native
 library that provides fast and high compression lossless algorithm for
 Android, Java and all JVM languages.")
    (license license:bsd-2)))
+
+(define-public java-zstd-1.5.7
+  (package
+    (inherit java-zstd)
+    (version "1.5.7")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/luben/zstd-jni")
+                     (commit (string-append "v" version "-6"))))
+              (file-name (git-file-name "java-zstd" version))
+              (sha256
+               (base32
+                "014pmfix7rd1p1kmalvxyigqyiii5q3l7qahfnp32pz886pjd41i"))))
+    (arguments
+     `(#:jar-name "zstd-jni.jar"
+       #:source-dir "src/main/java"
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'generate-version
+           (lambda _
+             (with-output-to-file
+               "src/main/java/com/github/luben/zstd/util/ZstdVersion.java"
+               (lambda _
+                 (format #t "package com.github.luben.zstd.util;
+
+public class ZstdVersion {
+  public static final String VERSION = \"~a\";
+}" ,version)))))
+         (add-before 'install 'generate-pom
+           (lambda _
+             (with-output-to-file "pom.xml"
+               (lambda _
+                 (format #t "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.github.luben</groupId>
+  <artifactId>zstd-jni</artifactId>
+  <version>~a</version>
+  <packaging>jar</packaging>
+  <name>zstd-jni</name>
+</project>" ,version)))))
+         (replace 'install (install-from-pom "pom.xml")))))))
@@ -958,13 +958,13 @@ wrappers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0mfk32zvvh6c9a9plp6ad07888g795lhdmal3jyaclyn2k5iig9i"))
-       ;; Remove these patches on next release as they will be included.
-       (patches (search-patches
-                 "quickjs-ng-64-bits-precision-on-i686.patch"
-                 "quickjs-ng-fix-atomics.pause-on-32-bit.patch"))))
+        (base32 "0mfk32zvvh6c9a9plp6ad07888g795lhdmal3jyaclyn2k5iig9i"))))
    (arguments
     (list
+      ;; Data model is ILP32 in 32bit, LP64 in 64bit
+      ;; https://docs.oracle.com/cd/E19620-01/805-3024/lp64-1/index.html
+      #:tests? (and (not (%current-target-system))
+                    (target-64bit?))
      #:configure-flags
      #~(list "-DBUILD_SHARED_LIBS:BOOL=TRUE"
              "-DQJS_BUILD_EXAMPLES:BOOL=FALSE"
@@ -1324,12 +1324,11 @@ Docker registry.")
                      "--prefix" #$output))))))
    (native-inputs (list python-flit-core))
    (inputs
-     (list bash))                       ;must be bash with readline
-    (propagated-inputs
-     (list python-filetype
+     (list bash
+           python-filetype
+           python-pexpect
           python-ipykernel
-           python-jupyter-client
-           python-pexpect))
+           python-jupyter-client))
    (home-page "https://github.com/takluyver/bash_kernel")
    (synopsis "Jupyter kernel for Bash")
    (description "A bash shell kernel for Jupyter.")
@@ -435,6 +435,32 @@ with emails through Akonadi easier.")
    (license ;; GPL for programs, LGPL for libraries
     (list license:gpl2+ license:lgpl2.0+))))

+(define-public akonadi-notes
+  (package
+    (name "akonadi-notes")
+    (version "24.08.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/" version
+                           "/src/akonadi-notes-" version ".tar.xz"))
+       (sha256
+        (base32 "1ppgdwjg9w4igwqf1b0b1xzbc1c4j3z67ha9381ncklpd227nxvq"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules))
+    (inputs
+     (list akonadi kcodecs ki18n kmime))
+    (arguments (list #:qtbase qtbase))
+    (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
+    (synopsis "Akonadi notes access library")
+    (description "Akonadi Notes is a library that effectively bridges the
+type-agnostic API of the Akonadi client libraries and the domain-specific
+KMime library.  It provides a helper class for note attachments and for
+wrapping notes into KMime::Message objects.")
+    (license ;; GPL for programs, LGPL for libraries
+     (list license:gpl2+ license:lgpl2.0+))))
+
 (define-public akonadi-search
  (package
    (name "akonadi-search")
@@ -451,7 +451,6 @@ games, and tools.")
           kitemmodels
           kservice
           libostree     ;required by flatpak
-           wayland       ;required by flatpak
           qtdeclarative
           qtsvg))
    (home-page "https://invent.kde.org/plasma/flatpak-kcm")
@@ -1476,7 +1475,7 @@ you login.")
      #:test-exclude
      (string-append "("
                     (string-join
-                         `(;; Fails on an Apple M1 (aarch64) with the following error:
+                         '(;; Fails on an Apple M1 (aarch64) with the following error:
                           ;; TestColorspaces::roundtripConversion fails
                           "kwin-testColorspaces"

@@ -1518,9 +1517,7 @@ you login.")
                           "kwin-testFractionalRepaint"
                           "kwin-testDrmLegacy"
                           "kwin-testInputCapture"
-                           "kwin-testMockDrm"
-                           "kwin-testSecurityContext"
-                           "kwin-testXwaylandSelection")
+                           "kwin-testMockDrm")
                         "|")
                     ")")
      #:phases
@@ -2190,17 +2187,11 @@ the KDE Plasma 6 desktop.")
    (arguments
     (list #:qtbase qtbase
           #:test-exclude
-           ;; The tst_calibrationtool test fails on aarch64 due to floating-point
-           ;; precision: QMatrix4x4 comparison fails with tiny differences
-           ;; (1.11759e-08 instead of exact 0).
           (string-append "("
-                          (string-join `("positionertest"
+                          (string-join '("positionertest"
                                         "kcm-keyboard-keyboard_memory_\
 persister_test"
-                                         "foldermodeltest"
-                                         ,@(if (target-aarch64?)
-                                               '("tst_calibrationtool")
-                                               '()))
+                                         "foldermodeltest")
                                       "|")
                          ")")
           #:phases
@@ -336,22 +336,22 @@ secondary errors.")
                (dirname
                 (search-input-file
                  inputs
-                  "/lib/m2/org/apache/commons/commons-lang3/3.20.0/commons-lang3-3.20.0.jar")))
+                  "/lib/m2/org/apache/commons/commons-lang3/3.17.0/commons-lang3-3.17.0.jar")))
               (("\\$\\{apache-commons-text_SOURCE_DIR\\}")
                (dirname
                 (search-input-file
                  inputs
-                  "/lib/m2/org/apache/commons/commons-text/1.15.0/commons-text-1.15.0.jar")))
+                  "/lib/m2/org/apache/commons/commons-text/1.9/commons-text-1.9.jar")))
               (("FetchContent_MakeAvailable\\(groovy\\)")
                (string-append "set(groovy_SOURCE_DIR " (assoc-ref inputs "groovy") ")"))
               (("FetchContent_MakeAvailable\\(apache-commons-lang\\)")
                (string-append "set(apache-commons-lang_SOURCE_DIR "
                               (assoc-ref inputs "java-commons-lang3")
-                               "/lib/m2/org/apache/commons/commons-lang3/3.20.0)"))
+                               "/lib/m2/org/apache/commons/commons-lang3/3.17.0)"))
               (("FetchContent_MakeAvailable\\(apache-commons-text\\)")
                (string-append "set(apache-commons-text_SOURCE_DIR "
                               (assoc-ref inputs "java-commons-text")
-                               "/lib/m2/org/apache/commons/commons-text/1.15.0)"))
+                               "/lib/m2/org/apache/commons/commons-text/1.9)"))
               (("^set\\(GROOVY_VER.*")
                (string-append "set(GROOVY_VER 3.0.5)\n")))

@@ -48,7 +48,8 @@
  #:use-module ((guix build-system python) #:select (pypi-uri
                                                     package-with-python2
                                                     python-build-system))
-  #:use-module (guix build-system ruby))
+  #:use-module (guix build-system ruby)
+  #:use-module (guix build-system trivial))

 (define-public libffi
  (package
@@ -88,6 +89,21 @@ conversions for values passed between the two languages.")
    ;; See <https://github.com/atgreen/libffi/blob/master/LICENSE>.
    (license expat)))

+(define-public libffi-for-graal-truffle
+  (package
+    (inherit libffi)
+    (name "libffi-for-graal-truffle")
+    (version "3.4.8")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "https://github.com/libffi/libffi/releases"
+                              "/download/v" version "/libffi-" version ".tar.gz"))
+              (file-name "libffi-src.tar.gz")
+              (sha256
+               (base32
+                "16qias9rs3g3lg3zs9zx76hqzry7pkzc8lhjxnqargwqi2hl565w"))))))
+
 ;; Provide a variant without static trampolines as some packages
 ;; (particularly GHC < 9) cannot handle them.  See
 ;; <https://github.com/libffi/libffi/pull/647> for a discussion.
@@ -563,7 +563,7 @@ offers them both in non-modifying and modifying versions where applicable.")
 (define-public sbcl-40ants-doc
  (package
    (name "sbcl-40ants-doc")
-    (version "0.25.0")
+    (version "0.24.1")
    (source
     (origin
       (method git-fetch)
@@ -571,7 +571,7 @@ offers them both in non-modifying and modifying versions where applicable.")
              (url "https://github.com/40ants/doc")
              (commit (string-append "v" version))))
       (sha256
-        (base32 "1h8xrnlfplk2dk6v3miwzwwqnygbhba0nvdsbij5gfac4k898n1r"))
+        (base32 "04hhf16ylv417xz2jvf6s0ybbv0pwjscarvqnpbn8by4wmchvkjl"))
       (file-name (git-file-name "cl-40ants-doc" version))))
    (build-system asdf-build-system/sbcl)
    (arguments
@@ -884,7 +884,7 @@ implementation, but they will work.")
 (define-public sbcl-adopt
  (package
    (name "sbcl-adopt")
-    (version "1.3.0")
+    (version "1.2.0")
    (source
     (origin
       (method git-fetch)
@@ -893,7 +893,7 @@ implementation, but they will work.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-adopt" version))
       (sha256
-        (base32 "01frfns7xddb785vrlksm5v0wy57bybhfijziw8mk58xpb45q0mz"))))
+        (base32 "16kzkai96qk7vmclp8wxc9aghhnisw8gg9s7hra68300bgj86wzr"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list sbcl-1am))
    (inputs (list sbcl-bobbin sbcl-split-sequence))
@@ -1432,9 +1432,8 @@ APL.")
 (define-public cl-april
  (sbcl-package->cl-source-package sbcl-april))

-;; TODO: Build fails.
-;; (define-public ecl-april
-;;   (sbcl-package->ecl-package sbcl-april))
+(define-public ecl-april
+  (sbcl-package->ecl-package sbcl-april))

 (define-public sbcl-archive
  (let ((commit "631271c091ed02994bec3980cb288a2cf32c7cdc")
@@ -4033,7 +4032,7 @@ by Ruby's @code{Chronic}.")
 (define-public sbcl-chunga
  (package
    (name "sbcl-chunga")
-    (version "1.1.9")
+    (version "1.1.7")
    (source
     (origin
       (method git-fetch)
@@ -4042,7 +4041,7 @@ by Ruby's @code{Chronic}.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "17jswsp31dh1jpg2n60nn34wxf4z6vvxjq1avy50z9fnzywvikyi"))))
+        (base32 "0jzn3nyb3f22gm983rfk99smqs3mhb9ivjmasvhq9qla5cl9pyhd"))))
    (build-system asdf-build-system/sbcl)
    (inputs
     (list sbcl-trivial-gray-streams))
@@ -5086,30 +5085,32 @@ is a library for creating graphical user interfaces.")
  (sbcl-package->ecl-package sbcl-cl-cffi-gtk))

 (define-public sbcl-cl-change-case
-  (package
-    (name "sbcl-cl-change-case")
-    (version "1.0")
-    (home-page "https://github.com/rudolfochrist/cl-change-case")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url home-page)
-              (commit version)))
-       (file-name (git-file-name "cl-change-case" version))
-       (sha256
-        (base32 "1zm34q3n3qaz06y6x3j73mnh67bw2k5xdpbflj5hhxqwakyfv50m"))))
-    (build-system asdf-build-system/sbcl)
-    (inputs
-     (list sbcl-cl-ppcre sbcl-cl-ppcre-unicode))
-    (native-inputs
-     (list sbcl-fiveam))
-    (synopsis
-     "Convert Common Lisp strings between camelCase, PascalCase and more")
-    (description
-     "@code{cl-change-case} is a library to convert strings between
+  (let ((commit "45c70b601125889689e0c1c37d7e727a3a0af022")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-change-case")
+      (version (git-version "0.2.0" revision commit))
+      (home-page "https://github.com/rudolfochrist/cl-change-case")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name "cl-change-case" version))
+         (sha256
+          (base32 "0qmk341zzcsbf8sq0w9ix3r080zg4ri6vzxym63lhdjfzwz3y8if"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       (list sbcl-cl-ppcre sbcl-cl-ppcre-unicode))
+      (native-inputs
+       (list sbcl-fiveam))
+      (synopsis
+       "Convert Common Lisp strings between camelCase, PascalCase and more")
+      (description
+       "@code{cl-change-case} is a library to convert strings between
 camelCase, PascalCase, snake_case, param-case, CONSTANT_CASE and more.")
-    (license license:llgpl)))
+      (license license:llgpl))))

 (define-public cl-change-case
  (sbcl-package->cl-source-package sbcl-cl-change-case))
@@ -5999,7 +6000,7 @@ that and not limited to a certain server or text format.")
 (define-public sbcl-cl-environments
  (package
    (name "sbcl-cl-environments")
-    (version "0.5")
+    (version "0.4")
    (source
     (origin
       (method git-fetch)
@@ -6008,7 +6009,7 @@ that and not limited to a certain server or text format.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-environments" version))
       (sha256
-        (base32 "0597q1j2scal8sx0rcx9c0nazai3p1d72wmzssb9rx0fa7vpr6ij"))))
+        (base32 "10jxj043d2dw5vc0i0lz0lsa4qszn8him5is8jdhl4nsyfcazmky"))))
    (build-system asdf-build-system/sbcl)
    (inputs
     (list sbcl-alexandria sbcl-anaphora sbcl-collectors sbcl-optima))
@@ -6101,7 +6102,7 @@ Common Lisp.")
 (define-public sbcl-cl-fast-ecs
  (package
    (name "sbcl-cl-fast-ecs")
-    (version "0.9.1")
+    (version "0.8.0")
    (source
     (origin
       (method git-fetch)
@@ -6110,7 +6111,7 @@ Common Lisp.")
             (commit version)))
       (file-name (git-file-name "cl-fast-ecs" version))
       (sha256
-        (base32 "0s2pc1ffbddjsvc92pdd4wlv1353byaar60kmn4zcnwy5g9p81nv"))))
+        (base32 "09fv58pgfa1byplzzh4mzriwwnnn5i2ib8z19dbnbl7y8zy568hi"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs
     (list graphviz-minimal
@@ -11439,7 +11440,7 @@ power of CXML is available when necessary.")
 (define-public sbcl-cl-yacc
  (package
    (name "sbcl-cl-yacc")
-    (version "0.4")
+    (version "0.3")
    (source
     (origin
       (method git-fetch)
@@ -11448,7 +11449,7 @@ power of CXML is available when necessary.")
             (commit (string-append "cl-yacc-" version))))
       (sha256
        (base32
-         "1l5nmgdmb7w0pabqc6dk09saj85a4x9ijfhhc2fjxl0gln7rncjz"))
+         "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib"))
       (file-name (string-append "cl-yacc-" version "-checkout"))))
    (build-system asdf-build-system/sbcl)
    (arguments
@@ -12077,32 +12078,34 @@ terminals.")
  (sbcl-package->ecl-package sbcl-clinenoise))

 (define-public sbcl-clingon
-  (package
-    (name "sbcl-clingon")
-    (version "0.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/dnaeon/clingon")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name "cl-clingon" version))
-       (sha256
-        (base32 "1a31xjvdgikarafhy8f11pprqgw55yv57ahd4j71k124lxrz8wfz"))))
-    (build-system asdf-build-system/sbcl)
-    (native-inputs
-     (list sbcl-rove))
-    (inputs
-     (list sbcl-bobbin
-           sbcl-cl-reexport
-           sbcl-split-sequence
-           sbcl-with-user-abort))
-    (arguments
-     (list #:tests? #f)) ; FIXME: Tests run forever
-    (home-page "https://github.com/dnaeon/clingon")
-    (synopsis "Command-line option parsing library for Common Lisp")
-    (description
-     "@code{clingon} is a command-line option parsing library for Common
+  (let ((commit "f2a730f1073e41d78557019085fbb0c662fd3189")
+        (revision "1"))
+    (package
+      (name "sbcl-clingon")
+      (version (git-version "0.5.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/dnaeon/clingon")
+               (commit commit)))
+         (file-name (git-file-name "cl-clingon" version))
+         (sha256
+          (base32 "0p8i9bkzzy4v0pg15dldrl73xri4kxyxa7si82bawh1dnnm53jgc"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       (list sbcl-rove))
+      (inputs
+       (list sbcl-bobbin
+             sbcl-cl-reexport
+             sbcl-split-sequence
+             sbcl-with-user-abort))
+      (arguments
+       (list #:tests? #f)) ; FIXME: Tests run forever
+      (home-page "https://github.com/dnaeon/clingon")
+      (synopsis "Command-line option parsing library for Common Lisp")
+      (description
+       "@code{clingon} is a command-line option parsing library for Common
 Lisp.  Its features include:
@itemize
@item Support for subcommands
@@ -12131,7 +12134,7 @@ command is executed
 by developing a new option kind, or even a new mechanism for initializing
 options, e.g., by looking up an external key/value store
@end itemize")
-    (license license:bsd-2)))
+      (license license:bsd-2))))

 (define-public cl-clingon
  (sbcl-package->cl-source-package sbcl-clingon))
@@ -13588,30 +13591,31 @@ numbers in Common Lisp.")
  (sbcl-package->ecl-package sbcl-computable-reals))

 (define-public sbcl-concrete-syntax-tree
-  (package
-    (name "sbcl-concrete-syntax-tree")
-    (version "0.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/s-expressionists/Concrete-Syntax-Tree")
-              (commit version)))
-       (file-name (git-file-name "cl-concrete-syntax-tree" version))
-       (sha256
-        (base32 "05cl83fhn4a4y492f8sq29560jgbg26c5wz5aqawz5gw3riz0n4b"))))
-    (build-system asdf-build-system/sbcl)
-    (native-inputs (list sbcl-fiveam))
-    (inputs
-     (list sbcl-acclimation))
-    (arguments
-     '(#:asd-systems '("concrete-syntax-tree"
-                       "concrete-syntax-tree-destructuring"
-                       "concrete-syntax-tree-source-info")))
-    (home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree")
-    (synopsis "Parse Common Lisp code into a concrete syntax tree")
-    (description
-     "This library is intended to solve the problem of source tracking for
+  (let ((commit "37291727196a3bc88a7be67c1427c52078d4b82c")
+        (revision "0"))
+    (package
+      (name "sbcl-concrete-syntax-tree")
+      (version (git-version "0.2.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/s-expressionists/Concrete-Syntax-Tree")
+               (commit commit)))
+         (file-name (git-file-name "cl-concrete-syntax-tree" commit))
+         (sha256
+          (base32 "15q9jyqsh2z921li9my8c840cj2ci7k217x5frfiyk0kymkx4rgv"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       (list sbcl-acclimation))
+      (arguments
+       '(#:asd-systems '("concrete-syntax-tree"
+                         "concrete-syntax-tree-destructuring"
+                         "concrete-syntax-tree-source-info")))
+      (home-page "https://github.com/s-expressionists/Concrete-Syntax-Tree")
+      (synopsis "Parse Common Lisp code into a concrete syntax tree")
+      (description
+       "This library is intended to solve the problem of source tracking for
 Common Lisp code.

 By \"source tracking\", it is meant that code elements that have a known
@@ -13624,7 +13628,7 @@ does not impose a particular structure of this information.  Instead, it
 provides utilities for manipulating source code in the form of what is called
 concrete syntax trees (CSTs for short) that preserve this information about
 the origin.")
-    (license license:bsd-2)))
+      (license license:bsd-2))))

 (define-public cl-concrete-syntax-tree
  (sbcl-package->cl-source-package sbcl-concrete-syntax-tree))
@@ -13668,7 +13672,7 @@ table.")
 (define-public sbcl-conduit-packages
  (package
   (name "sbcl-conduit-packages")
-   (version "5.0.0")
+   (version "2.0.0")
   (source
     (origin
       (method git-fetch)
@@ -13677,7 +13681,7 @@ table.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-conduit-packages" version))
       (sha256
-        (base32 "10dr3982924n37dnch6mxhqav6w5aglf5gqbs90ja6qc4kf8shhz"))))
+        (base32 "1n783in84mrk9lnc3nshwsgxhb8y0dk6ys9z6jlxkv0jpjxhpjjc"))))
   (build-system asdf-build-system/sbcl)
   (arguments '(#:asd-systems '("org.tfeb.conduit-packages")))
   (synopsis "Conduit packages for Common Lisp")
@@ -14600,7 +14604,7 @@ of a symbol.")
 (define-public sbcl-definitions-systems
  (package
    (name "sbcl-definitions-systems")
-    (version "3.0")
+    (version "2.0.1")
    (source
     (origin
       (method git-fetch)
@@ -14609,7 +14613,7 @@ of a symbol.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-definitions-systems" version))
       (sha256
-        (base32 "0wly8hr9gfxhdz4l46xsh4vj99q9aq7p3cfsglbgv19kdsvv217r"))))
+        (base32 "009392mj0qdq4jy0dw5r41schnygwj286759yvyg7xja30a0psfq"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs
     (list sbcl-parachute))
@@ -15790,7 +15794,7 @@ detect the suitable metaclass by analyzing the @code{defclass} form.")
 (define-public sbcl-enhanced-eval-when
  (package
    (name "sbcl-enhanced-eval-when")
-    (version "2.0")
+    (version "1.0")
    (source
     (origin
       (method git-fetch)
@@ -15799,9 +15803,11 @@ detect the suitable metaclass by analyzing the @code{defclass} form.")
             (commit (string-append "v" version))))
          (file-name (git-file-name "cl-enhanced-eval-when" version))
          (sha256
-           (base32 "1l7n04pzcwsxvw6m4pcksmlx525ijbgh5n28h56clpvpwlwnzjs3"))))
+           (base32 "1ws1v297plcbqmcvckg7vqzzgnrwfyx5kd7281r1wrhc26998rx2"))))
    (build-system asdf-build-system/sbcl)
-    (native-inputs (list sbcl-parachute))
+    ;; https://github.com/Hexstream/enhanced-eval-when/issues/1
+    (arguments
+     (list #:tests? #f)) ; There are no tests in version 1.0.
    (home-page "https://www.hexstreamsoft.com/libraries/enhanced-eval-when/")
    (synopsis "Shortcuts for EVAL-WHEN")
    (description
@@ -19278,40 +19284,44 @@ bound to whatever value was in the same place in the URL (as a string).")
  (sbcl-package->ecl-package sbcl-hunchensocket))

 (define-public sbcl-hunchentoot
-  (package
-    (name "sbcl-hunchentoot")
-    (version "1.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/edicl/hunchentoot")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name "cl-hunchentoot" version))
-       (sha256
-        (base32 "0g4lh26l2vd10ilk1hrfmpj6hpjb986jp191ha2j6p2q1pil3kgc"))))
-    (build-system asdf-build-system/sbcl)
-    (native-inputs
-     (list sbcl-cl-who sbcl-drakma))
-    (inputs
-     (list sbcl-chunga
-           sbcl-cl-base64
-           sbcl-cl-fad
-           sbcl-cl-ppcre
-           sbcl-flexi-streams
-           sbcl-cl+ssl
-           sbcl-md5
-           sbcl-rfc2388
-           sbcl-trivial-backtrace
-           sbcl-usocket))
-    (home-page "https://edicl.github.io/hunchentoot/")
-    (synopsis "Web server written in Common Lisp")
-    (description
-     "Hunchentoot is a web server written in Common Lisp and at the same
+  ;; NOTE: (Sharlatan-20220520T213309+0100): The latest commit fixed tests,
+  ;; switch to the version tag when release is ready.
+  (let ((commit "76862391040c20255c7275e815c2175e46bfd080")
+        (revision "1"))
+    (package
+      (name "sbcl-hunchentoot")
+      (version (git-version "1.3.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/edicl/hunchentoot")
+               (commit commit)))
+         (file-name (git-file-name "cl-hunchentoot" version))
+         (sha256
+          (base32 "1h7ggmmzvgwr4p6j3ai0dqrw30q5309l13w4c03gqrapvwrb65l0"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       (list sbcl-cl-who sbcl-drakma))
+      (inputs
+       (list sbcl-chunga
+             sbcl-cl-base64
+             sbcl-cl-fad
+             sbcl-cl-ppcre
+             sbcl-flexi-streams
+             sbcl-cl+ssl
+             sbcl-md5
+             sbcl-rfc2388
+             sbcl-trivial-backtrace
+             sbcl-usocket))
+      (home-page "https://edicl.github.io/hunchentoot/")
+      (synopsis "Web server written in Common Lisp")
+      (description
+       "Hunchentoot is a web server written in Common Lisp and at the same
 time a toolkit for building dynamic websites.  As a stand-alone web server,
 Hunchentoot is capable of HTTP/1.1 chunking (both directions), persistent
 connections (keep-alive), and SSL.")
-    (license license:bsd-2)))
+      (license license:bsd-2))))

 (define-public cl-hunchentoot
  (sbcl-package->cl-source-package sbcl-hunchentoot))
@@ -19838,45 +19848,6 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
 (define-public ecl-iolib
  (sbcl-package->ecl-package sbcl-iolib))

-(define-public sbcl-cl-iparse
-  (let ((commit "d1cc4caf25ab4c05bc96e7a7306ee3803289f13f")
-        (revision "0"))
-    (package
-      (name "sbcl-cl-iparse")
-      (version (git-version "0.1.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/atgreen/cl-iparse")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0y5x2bg7plx5famv7w0lkhvwl0ya8majzq4swilhl5w3a1mz3360"))))
-      (inputs
-       (list sbcl-alexandria
-             sbcl-cl-ppcre
-             sbcl-closer-mop
-             sbcl-fset))
-      (build-system asdf-build-system/sbcl)
-      (arguments
-       '(#:asd-systems '("iparse")))
-      (home-page "https://github.com/atgreen/cl-iparse")
-      (synopsis "Common Lisp port of Clojure's instaparse")
-      (description
-       "Common Lisp port of Clojure's instaparse parser library - GLL parsing
-with EBNF/ABNF support.")
-      (license license:epl1.0))))
-
-(define-public cl-iparse
-  (sbcl-package->cl-source-package sbcl-cl-iparse))
-
-(define-public ecl-cl-iparse
-  (sbcl-package->ecl-package sbcl-cl-iparse))
-
-(define-public clasp-cl-iparse
-  (sbcl-package->clasp-package sbcl-cl-iparse))
-
 (define-public sbcl-ironclad
  (package
    (name "sbcl-ironclad")
@@ -22292,7 +22263,7 @@ determination library using @emph{magic} numbers.")
 (define-public sbcl-magicl
  (package
    (name "sbcl-magicl")
-    (version "0.9.1")
+    (version "0.11.0")
    (source
     (origin
       (method git-fetch)
@@ -22301,7 +22272,7 @@ determination library using @emph{magic} numbers.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-magicl" version))
       (sha256
-        (base32 "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"))))
+        (base32 "10scw5qhrgjhfrlia5iqn2yy2zj1d57m45g479vg56lw849whscw"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list gfortran sbcl-fiasco))
    (inputs
@@ -23157,7 +23128,7 @@ latitude/longitude and MGRS.")
 (define-public sbcl-misc-extensions
  (package
    (name "sbcl-misc-extensions")
-    (version "4.2.3")
+    (version "4.0.3")
    (source
     (origin
       (method git-fetch)
@@ -23167,7 +23138,7 @@ latitude/longitude and MGRS.")
       (file-name (git-file-name "cl-misc-extensions" version))
       (sha256
        (base32
-         "0q46hr75kzrqwg83f05ymxfd9k6dky6mm3c05xm8b2ryywhikzf7"))))
+         "02hw5k7zfzs736dhpcii8ncvx3ia4l5byw5ngzmhydqscbi4hcvc"))))
    (build-system asdf-build-system/sbcl)
    (synopsis "Collection of small macros and extensions for Common Lisp")
    (description
@@ -24191,7 +24162,7 @@ especially in a multi-threaded context.")
 (define-public sbcl-net.didierverna.asdf-flv
  (package
    (name "sbcl-net.didierverna.asdf-flv")
-    (version "2.2")
+    (version "2.1")
    (source
     (origin
       (method git-fetch)
@@ -24200,7 +24171,7 @@ especially in a multi-threaded context.")
             (commit (string-append "version-" version))))
       (file-name (git-file-name "asdf-flv" version))
       (sha256
-        (base32 "10hfwi6jz10kvd6g82nj31qqihk1mxh95prlpmchhycirjq16ji8"))))
+        (base32 "1fi2y4baxan103jbg4idjddzihy03kwnj2mzbwrknw4d4x7xlgwj"))))
    (build-system asdf-build-system/sbcl)
    (synopsis "Common Lisp ASDF extension to provide support for file-local variables")
    (description "ASDF-FLV provides support for file-local variables through
@@ -24626,9 +24597,8 @@ ones.")
 (define-public cl-nodgui
  (sbcl-package->cl-source-package sbcl-nodgui))

-;; TODO: Build fails.
-;; (define-public ecl-nodgui
-;;   (sbcl-package->ecl-package sbcl-nodgui))
+(define-public ecl-nodgui
+  (sbcl-package->ecl-package sbcl-nodgui))

 (define-public sbcl-nontrivial-gray-streams
  (let ((commit "7ed842fe98f6ebafd472a5768e28d0c35f82114e")
@@ -25633,7 +25603,7 @@ JavaScript (ECMAScript 3).  It has basic support for ECMAScript 5.")
 (define-public sbcl-parse-number
  (package
    (name "sbcl-parse-number")
-    (version "1.8")
+    (version "1.7")
    (source
     (origin
       (method git-fetch)
@@ -25643,7 +25613,7 @@ JavaScript (ECMAScript 3).  It has basic support for ECMAScript 5.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1yh54v02i9b55bmkfkz59qd14irw8llasp48drbilkbz1az1qg2p"))))
+         "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"))))
    (build-system asdf-build-system/sbcl)
    (home-page "https://www.cliki.net/PARSE-NUMBER")
    (synopsis "Parse numbers")
@@ -29416,7 +29386,7 @@ running into parallelism problems when having to change directory.")
 (define-public sbcl-simple-matrix
  (package
    (name "sbcl-simple-matrix")
-    (version "3.10")
+    (version "3.7")
    (source
     (origin
       (method git-fetch)
@@ -29425,7 +29395,7 @@ running into parallelism problems when having to change directory.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-simple-matrix" version))
       (sha256
-        (base32 "04aysbpbwadqsk1sva9iy59mf8gwpf1zb1nmf7ha9c0db2g2hipj"))))
+        (base32 "05yk7813rba8kfwr8kcf1qm3dif7nf0rs3s0m5jfw7z0i1fg9jxf"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list sbcl-fiveam))
    (synopsis "Matrix library for Common Lisp")
@@ -29482,7 +29452,7 @@ library are feedforward neural networks trained using backpropagation.")
 (define-public sbcl-simple-optimization
  (package
    (name "sbcl-simple-optimization")
-    (version "1.2")
+    (version "1.1")
    (source
     (origin
       (method git-fetch)
@@ -29491,7 +29461,7 @@ library are feedforward neural networks trained using backpropagation.")
             (commit (string-append "v" version))))
       (file-name (git-file-name "cl-simple-optimization" version))
       (sha256
-        (base32 "197iq6b7g0zdfz6nqyx69cvp6j39ax4aijc8x3w71rmmlfps515k"))))
+        (base32 "1ljzd7j1xak54l53vjdda7w7fcx9di5536kqa4hdp1s4269zch53"))))
    (build-system asdf-build-system/sbcl)
    (native-inputs (list sbcl-fiveam))
    (inputs (list sbcl-simple-matrix))
@@ -29542,7 +29512,6 @@ forms in parallel.")
  (sbcl-package->ecl-package sbcl-simple-parallel-tasks))

 (define-public sbcl-simple-rgb
-  ;; Last versioned release is from 2008.
  (let ((commit "ba9b0689362c28aa6a91c0636796c6c372657293")
        (revision "1"))
    (package
@@ -32712,8 +32681,8 @@ implementation, for example drawing calls of GUI applications.")
  (sbcl-package->ecl-package sbcl-trivial-main-thread))

 (define-public sbcl-trivial-mimes
-  (let ((commit "8b1ea1291ef53d55730d2288332656a98068d7e5")
-        (revision "3"))
+  (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9")
+        (revision "2"))
    (package
      (name "sbcl-trivial-mimes")
      (version (git-version "1.1.0" revision commit))
@@ -32721,17 +32690,17 @@ implementation, for example drawing calls of GUI applications.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://shinmera.com/project/trivial-mimes")
+               (url "https://github.com/Shinmera/trivial-mimes")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0dhvrrjh11kcqxv6yi8y6ihcrwirviadlmb3a7m6jvbkj9zfs30v"))))
+          (base32 "00kcm17q5plpzdj1qwg83ldhxksilgpcdkf3m9azxcdr968xs9di"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
       (list sbcl-hu.dwim.stefil))
      (inputs
       (list sbcl-cl-fad))
-      (home-page "https://shinmera.com/docs/trivial-mimes/")
+      (home-page "https://shinmera.github.io/trivial-mimes/")
      (synopsis "Tiny Common Lisp library to detect mime types in files")
      (description
       "This is a teensy library that provides some functions to determine the
@@ -34897,41 +34866,42 @@ JSON interchange format.")
  (sbcl-package->clasp-package sbcl-yason))

 (define-public sbcl-yxorp
-  (package
-    (name "sbcl-yxorp")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.sr.ht/~charje/cl-yxorp")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name "cl-yxorp" version))
-       (sha256
-        (base32 "0kgam9l7gmnknhphk8xc4n09bgfkhmpns5nw41vgbm5is9ixsxw7"))))
-    (build-system asdf-build-system/sbcl)
-    (inputs
-     (list sbcl-chipz
-           sbcl-chunga
-           sbcl-cl+ssl
-           sbcl-binding-arrows
-           sbcl-cl-str
-           sbcl-usocket
-           sbcl-flexi-streams
-           sbcl-rutils
-           sbcl-salza2
-           sbcl-smart-buffer
-           sbcl-trivial-garbage))
-    (home-page "https://github.com/charje/cl-yxorp")
-    (synopsis
-     "Reverse proxy server written in and configurable in Common Lisp")
-    (description
-     "This is a reverse proxy server written in and configurable in
+  (let ((commit "c306898a467995e123a22316c9b79fcac442415b")
+        (revision "4"))
+    (package
+      (name "sbcl-yxorp")
+      (version (git-version "0.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/charJe/cl-yxorp")
+               (commit commit)))
+         (file-name (git-file-name "cl-yxorp" version))
+         (sha256
+          (base32 "0ll1s9w29yhhgqssgiw58fcapw4n040gkvpz4sxwv3q2v60rbidj"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       (list sbcl-chipz
+             sbcl-chunga
+             sbcl-cl+ssl
+             sbcl-binding-arrows
+             sbcl-cl-str
+             sbcl-usocket
+             sbcl-flexi-streams
+             sbcl-rutils
+             sbcl-salza2
+             sbcl-trivial-garbage))
+      (home-page "https://github.com/charje/cl-yxorp")
+      (synopsis
+       "Reverse proxy server written in and configurable in Common Lisp")
+      (description
+       "This is a reverse proxy server written in and configurable in
 Common Lisp.  It supports WebSocket, HTTP, HTTPS, HTTP to HTTPS
 redirecting, port and host forwarding configuration using a real programming
 language, HTTP header and body manipulation (also using a real programming
 language).")
-    (license license:agpl3)))
+      (license license:agpl3))))

 (define-public cl-yxorp
  (sbcl-package->cl-source-package sbcl-yxorp))
@@ -35190,7 +35160,7 @@ Zombie Raptor game engine project.")
 (define-public sbcl-zs3
  (package
   (name "sbcl-zs3")
-   (version "1.3.4")
+   (version "1.3.3")
   (source
    (origin
     (method git-fetch)
@@ -35200,7 +35170,7 @@ Zombie Raptor game engine project.")
       (commit (string-append "release-" version))))
     (file-name (git-file-name "zs3" version))
     (sha256
-      (base32 "1vr9l0hjjmcs24xfjz1s63jfj2261rlzhjvj5f4vblqi0yc96ir5"))))
+      (base32 "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3"))))
   (build-system asdf-build-system/sbcl)
   (inputs
    (list sbcl-drakma
@@ -35304,7 +35274,7 @@ compression/decompression using bindings to the libzstd C library.")
 (define-public sbcl-cl-transducers
  (package
    (name "sbcl-cl-transducers")
-    (version "1.5.1")
+    (version "1.3.0")
    (source
     (origin
       (method git-fetch)
@@ -35313,7 +35283,7 @@ compression/decompression using bindings to the libzstd C library.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "12zbzcmly6gb9xbhidymp966hw26a2h6wfdmi83ynwldc8wfnlwm"))))
+        (base32 "0p7fqkmv0rfi5d7mmm9600qpix003bqr7as148pk157s1d44vncg"))))
    (build-system asdf-build-system/sbcl)
    (arguments
     '(#:asd-systems '("transducers" "transducers/jzon" "transducers/fset")))
@@ -31,7 +31,6 @@
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2025 Liam Hupfer <liam@hpfr.net>
 ;;; Copyright © 2025 dan <i@dan.games>
-;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1724,15 +1723,23 @@ existing compilers together.")
  (package
    (inherit clang)
    (name "python-clang")
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (outputs '("out"))
    (arguments
     (list
-      #:test-backend #~'unittest
      #:phases #~(modify-phases %standard-phases
                   (add-before 'build 'change-directory
                     (lambda _
                       (chdir "bindings/python")))
+                   (add-before 'build 'create-setup-py
+                     (lambda _
+                       ;; Generate a basic "setup.py", enough so it can be
+                       ;; built and installed.
+                       (with-output-to-file "setup.py"
+                         (lambda ()
+                           (format #true "from setuptools import setup
+setup(name=\"clang\", version=\"~a\", packages=[\"clang\"])\n"
+                                   #$(package-version this-package))))))
                   (add-before 'build 'set-libclang-file-name
                     (lambda* (#:key inputs #:allow-other-keys)
                       ;; Record the absolute file name of libclang.so.
@@ -10,7 +10,6 @@
 ;;; Copyright © 2020, 2021, 2022, 2025 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2024 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
-;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; This file is part of GNU Guix.
 ;;;
 ;;; GNU Guix is free software; you can redistribute it and/or modify it
@@ -78,7 +77,7 @@
       ;;   but still ok for internal use." Also asked MT devs on IRC for this.
       ;; - tiniergltf is intended for Luanti and diverged from upstream.
       (snippet
-          '(let ((keep '("." ".." "lstrpack" "sha256" "tiniergltf")))
+          '(let ((keep '("." ".." "sha256" "tiniergltf")))
             (with-directory-excursion "lib"
               (for-each delete-file-recursively
                         (scandir "." (negate (cut member <> keep)))))
@@ -99,8 +98,7 @@
    (arguments
     (list
      #:configure-flags
-      #~(list "-DBUILD_DOCUMENTATION=OFF" ;not installed anyway
-              "-DENABLE_LTO=ON"
+      #~(list "-DENABLE_LTO=ON"
              "-DENABLE_UPDATE_CHECKER=FALSE")
      #:phases
      #~(modify-phases %standard-phases
@@ -218,50 +216,6 @@ new features.")
 (define-deprecated-package minetest-data
  minetest-game)

-(define-public luanti-halon
-  ;; There is no tag for this fork; find the base luanti used for the
-  ;; base-version, and otherwise use the latest commit.
-  (let ((base-version "5.14.0")
-        (commit "335545ebf64d25eea084dd46f49d8e62bcab0ada")
-        (revision "0"))
-    (package
-      (inherit luanti)
-      (name "luanti-halon")
-      (version (git-version base-version revision commit))
-      (source
-       (origin
-         (inherit (package-source luanti))
-         (uri (git-reference
-                (url "https://codeberg.org/halon/Minetest/")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1qk98kzjv748f0aak8k20nxkqa7wbxwj3qjd4ks08ab9apgwzlps"))))
-      (arguments
-       (substitute-keyword-arguments (package-arguments luanti)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'disable-development-build
-                (lambda _
-                  ;; This triggers a test that requires git.
-                  (substitute* "CMakeLists.txt"
-                    (("DEVELOPMENT_BUILD TRUE")
-                     "DEVELOPMENT_BUILD FALSE"))))
-              (add-after 'unpack 'disable-problematic-tests
-                (lambda _
-                  ;; The chunks test fails, only with this fork (see:
-                  ;; <https://codeberg.org/halon/Minetest/issues/5>).
-                  (substitute* "src/unittest/test_map_settings_manager.cpp"
-                    (("TEST\\(testChunks);" all)
-                     (string-append "// " all)))))))))
-      (synopsis "Luanti fork with extended CSM (client-side scripting) API")
-      (description "The Halon fork provides an extended client-side
-scripting (CSM) API, used for example by the @code{mcl_localplayer} CSM that
-can be used to improve the physics of the Mineclonia game and do the
-computation locally, reducing lag.  It is meant to be used with the
-@code{luanti-mineclonia-csm} game variant, which has client-side scripting
-enabled."))))
-
 (define-public (luanti-topic topic-id)
  "Return an URL (as a string) pointing to the forum topic with
 numeric identifier TOPIC-ID on the official Luanti forums."
@@ -503,31 +457,6 @@ currently permits without resorting to hacks which are too heavyweight or
 complicated to maintain.")
    (license license:gpl3+)))

-(define-public luanti-mineclonia-csm
-  (package/inherit luanti-mineclonia
-    (name "luanti-mineclonia-csm")
-    (arguments
-     (substitute-keyword-arguments (package-arguments luanti-mineclonia)
-       ((#:phases phases '%standard-phases)
-        #~(modify-phases #$phases
-            (add-after 'unpack 'enable-csm-support
-              (lambda _
-                ;; This makes it easy to benefit from client-side
-                ;; scripting mods such as the mcl_localplayer mode that
-                ;; can be used along the luanti-halon fork.
-                (substitute* '("settingtypes.txt"
-                               "mods/PLAYER/mcl_serverplayer/init.lua")
-                  (("(mcl_enable_csm.*)false" _ mcl_enable_csm)
-                   (string-append mcl_enable_csm "true")))))))))
-    (synopsis "Unofficial Minecraft-like game for Luanti with CSM enabled")
-    (description
-     (string-append (package-description luanti-mineclonia)
-                    "  This variant has CSM (client-side scripting)
- enabled, for use with the @code{luanti-halon} fork.  The CSM code makes it
-possible to replicate more closely the physics of the original Minecraft game.
-To use it, you need to add @code{enable_client_modding = true} to your
-client's @file{~/.minetest/minetest.conf} configuration file."))))
-
 (define-public luanti-voxelibre
  (package
    (name "luanti-voxelibre")
@@ -912,30 +841,6 @@ advtrains up to version 2.2.1.")
    (license (list license:cc-by-sa3.0 license:agpl3+))
    (properties `((upstream-name . "orwell/basic_trains")))))

-(define-public luanti-chatcmdbuilder
-  ;; The last tag is old and has issues.
-  (let ((commit "be3906e1fbd21f5c3149309c831b1a92769d3f93")
-        (revision "0"))
-    (package
-      (name "luanti-chatcmdbuilder")
-      (version (git-version "0.2.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/rubenwardy/ChatCmdBuilder")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0b9jl9pb5cc0rz9vv5r1kcmzch3nkbcx6xzkwii7dc7xfz9dx895"))))
-      (build-system luanti-mod-build-system)
-      (home-page "https://content.luanti.org/packages/rubenwardy/lib_chatcmdbuilder/")
-      (synopsis "Luanti library to create complex chat commands")
-      (description "ChatCmdBuilder is a Luanti library to ease
- creating complex chat commands with no pattern matching.")
-      (license license:expat)
-      (properties `((upstream-name . "rubenwardy/lib_chatcmdbuilder"))))))
-
 (define-public luanti-oneblock
  (package
    (name "luanti-oneblock")
@@ -959,30 +864,6 @@ block or item from the oneblock to expand the island!")
    (license license:gpl3+)
    (properties `((upstream-name . "NO11/oneblock")))))

-(define-public luanti-whitelist
-  (package
-    (name "luanti-whitelist")
-    (version "1.2.7")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://gitlab.com/zughy-friends-minetest/whitelist")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "18nkph1iv5awri5i4rk9m14s0wrxsg1wjjf7gnznjrma5kffpzrq"))))
-    (build-system luanti-mod-build-system)
-    (propagated-inputs (list luanti-chatcmdbuilder))
-    (home-page "https://content.luanti.org/packages/Zughy/whitelist/")
-    (synopsis "Luanti mod to manage who can join a server")
-    (description "This package provides the @code{whitelist} Luanti mod,
- which can be used to allow only specific players to join a Luanti server.")
-    ;; This should probably be agpl3+ (see:
-    ;; <https://gitlab.com/zughy-friends-minetest/whitelist/-/issues/1>).
-    (license license:agpl3)
-    (properties `((upstream-name . "Zughy/whitelist")))))
-
 (define-public luanti-wielded-light
  (package
    (name "luanti-wielded-light")
@@ -103,7 +103,7 @@ to statistics about the system on which it's run.")
 (define-public lxqt-build-tools
  (package
    (name "lxqt-build-tools")
-    (version "2.3.0")
+    (version "2.2.1")
    (source
     (origin
       (method url-fetch)
@@ -111,7 +111,7 @@ to statistics about the system on which it's run.")
                           "/download/" version
                           "/lxqt-build-tools-" version ".tar.xz"))
       (sha256
-        (base32 "0hkz8199lkji1whsjbl1z4gyzn5hm7pafhsxdzd96ag2xqn18ygr"))))
+        (base32 "0brkiq62cv5rp2knq3dbdzh4cv6l670x1bfxq1537k2mdcpdzp0k"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -151,7 +151,7 @@ itself as well as other components maintained by the LXQt project.")
 (define-public libqtxdg
  (package
    (name "libqtxdg")
-    (version "4.3.0")
+    (version "4.2.0")
    (source
     (origin
       (method url-fetch)
@@ -159,7 +159,7 @@ itself as well as other components maintained by the LXQt project.")
             "https://github.com/lxqt/libqtxdg/releases/download/"
             version "/libqtxdg-" version ".tar.xz"))
       (sha256
-        (base32 "0mgsis81dcrq6nvsydx0jpgf4ifzbyxvcq582gas6pmmbaivhv44"))))
+        (base32 "0ap81y7sbqwcdfsdlyxihs12chfv332fgg6y0sl6zmjhhlhk1m55"))))
    (build-system cmake-build-system)
    (arguments
     '(#:configure-flags
@@ -169,8 +169,6 @@ itself as well as other components maintained by the LXQt project.")
       (modify-phases %standard-phases
         (add-before 'check 'pre-check
           (lambda _
-             ;; Tests require a writable HOME.
-             (setenv "HOME" "/tmp")
             ;; Run the tests offscreen.
             (setenv "QT_QPA_PLATFORM" "offscreen")
             #t)))))
@@ -190,7 +188,7 @@ in Qt.")
 (define-public qtxdg-tools
  (package
    (name "qtxdg-tools")
-    (version "4.3.0")
+    (version "4.2.0")
    (source
     (origin
       (method url-fetch)
@@ -198,7 +196,7 @@ in Qt.")
             "https://github.com/lxqt/qtxdg-tools/releases/download/"
             version "/qtxdg-tools-" version ".tar.xz"))
       (sha256
-        (base32 "15pgcmhq968p1sdpn0xy7qrsazi6410vjrn4zfk42is62r8dr13d"))))
+        (base32 "1bv3immy1idp7jc0csnjkiw8vvqkr8g84hnnvl6k8297g4vnwfjh"))))
    (build-system cmake-build-system)
    (arguments '(#:tests? #f))          ; no tests
    (propagated-inputs (list libqtxdg))
@@ -213,7 +211,7 @@ applications.")
 (define-public liblxqt
  (package
    (name "liblxqt")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
@@ -221,7 +219,7 @@ applications.")
             "https://github.com/lxqt/" name "/releases/download/"
             version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1p74hvw6qncvj04dvzxkv22hvn0rsjx6z1csi7nmcvhn5yfn2p1b"))))
+        (base32 "1j0918fyka0kxwsn3mgnjnfc8cvdp6dsgg0i40877ysry0dqp2aa"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f                      ; no tests
@@ -279,14 +277,14 @@ and memory usage or network traffic.")
 (define-public lxqt-about
  (package
    (name "lxqt-about")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1g8jm955gggm1lh9n1dc4af88pih0k5ds6389wmx5y28x315d40r"))))
+        (base32 "0vypdk0nf2rr7riv8xp7wy1x9694i73rgk0dj9x39gh53jm4xjy5"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt))
@@ -309,14 +307,14 @@ LXQt and the system it's running on.")
 (define-public lxqt-admin
  (package
    (name "lxqt-admin")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1hmiggpfd5rhpapcx4xiszzlxpk0znlxlfarjr8hzv4dxkkc64s1"))))
+        (base32 "03gkb7gwq0gy9ihvawn38i36nkfmwyslf8wmbp4ssj129i94sphq"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt polkit-qt6))
@@ -342,14 +340,14 @@ the operating system LXQt is running on.")
 (define-public lxqt-menu-data
  (package
    (name "lxqt-menu-data")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "013fbcymy1h3arhhd7jqy498pdny63ih1wid7w3pr4j8iax48fkh"))))
+        (base32 "0nw9mr4p5ri3bk43xd871g3ni9irf6rrk8rz4d8ra9wd7bz2d855"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f))                ;no tests
@@ -366,14 +364,14 @@ LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt.")
 (define-public lxqt-config
  (package
    (name "lxqt-config")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "032bgz5lyrc0a6hr6xnir1s5wnlz7s2sszcgh31y7pxy1vssrf39"))))
+        (base32 "07ik1ycldpin21v4b29a95zb14q1s4bfbmlvyvw50r0mx0whnysj"))))
    (build-system cmake-build-system)
    (inputs
     (list eudev
@@ -411,7 +409,7 @@ configuration of both LXQt and the underlying operating system.")
 (define-public lxqt-globalkeys
  (package
    (name "lxqt-globalkeys")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
@@ -419,7 +417,7 @@ configuration of both LXQt and the underlying operating system.")
                           "releases/download/" version "/"
                           "lxqt-globalkeys-" version ".tar.xz"))
       (sha256
-        (base32 "1il912gn5lqdxy41rma8py58jzayppkaiw3n3y0rhjpbwkkqcgqs"))))
+        (base32 "16lpz4wm6iz065drmgfgfjxkd0gc5g1wqisqcgs6iff0skpdzkv6"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt))
@@ -436,14 +434,14 @@ as a whole and are not limited to distinct applications.")
 (define-public lxqt-notificationd
  (package
    (name "lxqt-notificationd")
-    (version "2.3.1")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "04sj8748li6dd6gfnydjcjwxa3cmiqy6syr2kwwz0h24fk652y74"))))
+        (base32 "1i3rly1jk3kgzl0gscsygfqr8g6147r7031j41qgdrf2w5nby8s2"))))
    (build-system cmake-build-system)
    (inputs
     (list kwindowsystem layer-shell-qt liblxqt libqtxdg))
@@ -459,14 +457,14 @@ according to the Desktop Notifications Specification.")
 (define-public lxqt-openssh-askpass
  (package
    (name "lxqt-openssh-askpass")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1n5rji6ykvglp53kwkb69jf0qwsjhmr4jr74bjk1bwq9am5ncm33"))))
+        (base32 "0g3gkfgyk7jgghslabmhlqwzafsd9i8c0sppb5hb4qllg916cadv"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt))
@@ -507,14 +505,14 @@ possible for applications to export and import their menus over DBus.")
 (define-public lxqt-panel
  (package
    (name "lxqt-panel")
-    (version "2.3.2")
+    (version "2.2.2")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1l5j5vbdw77vz7wj4r24wkxqa5n61r8nl6v2g1808rapchm0mazi"))))
+        (base32 "0s8rva0prz1mkccp5yanrm0gg63cn95pzv2fixdp26489rx0w5ax"))))
    (build-system cmake-build-system)
    (inputs
     (list alsa-lib
@@ -564,14 +562,14 @@ possible for applications to export and import their menus over DBus.")
 (define-public lxqt-policykit
  (package
    (name "lxqt-policykit")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1prc6pp1h792s8llz98kg40swf3vq2idxb0281naq3lqm93jbkvw"))))
+        (base32 "07lsfnpix9lr4nqlwipld2d02030921ssk6w77iqa81zy1c2v1yr"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt polkit polkit-qt6))
@@ -587,14 +585,14 @@ LXQt.")
 (define-public lxqt-powermanagement
  (package
    (name "lxqt-powermanagement")
-    (version "2.3.0")
+    (version "2.2.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "0xlyb41xapgkn5x9cgq2snln60scs67ja07721djq499y8c5r92p"))))
+        (base32 "1pds86s72ckkvk886ncajnl7q11814w94dfmbblmml2dmfxyhkbx"))))
    (build-system cmake-build-system)
    (inputs
     (list kidletime
@@ -614,14 +612,14 @@ when laptop batteries are low on power.")
 (define-public lxqt-qtplugin
  (package
    (name "lxqt-qtplugin")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "00n11s2zzmxqx8hygfny2i75xp4a2kcnf1sjk7waqpx25wlx9rfa"))))
+        (base32 "1w05710c9f3vzi9rsnyqiivxg1skirgrqk1dwxcw1gd4w01hyfp0"))))
    (build-system cmake-build-system)
    (inputs
     (list libdbusmenu-lxqt
@@ -648,14 +646,14 @@ Qt with LXQt.")
 (define-public lxqt-runner
  (package
    (name "lxqt-runner")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1nymi5cky6xgk2n83vp4lzw418fiamj7zlkcxkss75a3ba6xsbvd"))))
+        (base32 "1478hsi662s6cw83im710slm6mfq9vn10lq98yqrakmwr6salp71"))))
    (build-system cmake-build-system)
    (inputs
     (list kwindowsystem
@@ -676,14 +674,14 @@ allows for launching applications or shutting down the system.")
 (define-public lxqt-session
  (package
    (name "lxqt-session")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "13vjkyrxqayl1d00bf3j1k5qvs99d36xxdd5y8cg22byb1x2j4ff"))))
+        (base32 "12l9sch1lsxpj14ibrjsyv40nrgrdqhkhpzi24sm1bqnnl9jdg17"))))
    (build-system cmake-build-system)
    (inputs
     (list bash-minimal
@@ -733,14 +731,14 @@ for the LXQt desktop environment.")
 (define-public lxqt-sudo
  (package
    (name "lxqt-sudo")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "18fcn7r964m864gvvlw4xvq0cjhspa4q340y480gsqcvnd71xgvr"))))
+        (base32 "14fg8mxbkdi8sp8rdxy2zqwfgmzxrmj1xnq3h25pqnc61qf12y4f"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt sudo))
@@ -757,14 +755,14 @@ permissions of other users including root.")
 (define-public lxqt-themes
  (package
    (name "lxqt-themes")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1cyc299ybv1q6jsixzy3vqjrb6yaqdh1nyzyxvin83mm15j9bsp6"))))
+        (base32 "1wplp817pacq18x67vrqjdnaa1hn4fx2zn1clc85bjh8mpcaiicj"))))
    (build-system cmake-build-system)
    (native-inputs
     (list lxqt-build-tools))
@@ -783,14 +781,14 @@ for LXQt.")
 (define-public libfm-qt
  (package
    (name "libfm-qt")
-    (version "2.3.1")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "09cxa4z88gklqdc9skl3d9ppnmcpqsva8q6wrvixfsp8nggap0n5"))))
+        (base32 "1a8k8df38mf9bcdr6a44vjz15p84v3l33af485zlyhngrxpsi2jd"))))
    (build-system cmake-build-system)
    (arguments
     '(#:tests? #f))                    ; no tests
@@ -811,14 +809,14 @@ components to build desktop file managers which belongs to LXDE.")
 (define-public pcmanfm-qt
  (package
    (name "pcmanfm-qt")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "02bdf6cp4pg6s9lrxpg15pqj0n4agf6ldhnfaksd7vbayg04rarh"))))
+        (base32 "13xyl7xvv8qy35gfmjbq6ahqzq7xjn7j6336njhsvj82ipxfmvm5"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -848,14 +846,14 @@ LXDE.")
 (define-public lximage-qt
  (package
    (name "lximage-qt")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "0hdn6ixl1igal9rqvhql1yfzibdfysw9p9n65vpaa5srjj9d8xlk"))))
+        (base32 "1slriyvf0zz6mn5ldcd2v3i2yf0skmdf3hki9q8h2aby7bpvybnc"))))
    (build-system cmake-build-system)
    (inputs
     (list libexif libfm-qt qtsvg))
@@ -896,14 +894,14 @@ names.")
 (define-public obconf-qt
  (package
    (name "obconf-qt")
-    (version "0.16.6")
+    (version "0.16.5")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "0587kpi8snbzhkvnhmx6afasrnywzmx54i3n12i73633z8b8vk13"))))
+        (base32 "030n4jlmd79i3m1kk3jqm9s6f2fgwj78phnlvcjfmxqj15l86j03"))))
    (build-system cmake-build-system)
    (inputs
     (list imlib2
@@ -928,14 +926,14 @@ window manager OpenBox.")
 (define-public pavucontrol-qt
  (package
    (name "pavucontrol-qt")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1gbgxnhhif8qhx3arzz69spamvll6gv0d1p650fmy85m32a05kdm"))))
+        (base32 "1sdf221hq6z0haairwb4n29v7pjzgzf355r3m0iks0y1d9117lpi"))))
    (build-system cmake-build-system)
    (inputs
     (list glib qtbase pulseaudio))
@@ -952,14 +950,14 @@ window manager OpenBox.")
 (define-public qps
  (package
    (name "qps")
-    (version "2.12.0")
+    (version "2.11.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "013h8r9175cyrjkq3c86c45rzn938qmcmrwin1l6lsz5c2srisvn"))))
+        (base32 "0dk4rs2i5qxl1plnis9y2bjm148vlzb43ny29kaa5rkrv3lnq354"))))
    (build-system cmake-build-system)
    (inputs
     (list liblxqt))
@@ -976,14 +974,14 @@ processes currently in existence, much like code{top} or code{ps}.")
 (define-public qtermwidget
  (package
    (name "qtermwidget")
-    (version "2.3.0")
+    (version "2.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "0cic0aa8qc60jbx142mmcg1l8jw9rm8zzxhf7v38cfgv8ndnqdkp"))))
+        (base32 "1s8w4s7wi7sv6vx8njlcvzmywyrkz4v4jmj3cbvsymfgg6xgnkxs"))))
    (build-system cmake-build-system)
    (inputs
     (list qtbase utf8proc))
@@ -999,14 +997,14 @@ processes currently in existence, much like code{top} or code{ps}.")
 (define-public qterminal
  (package
    (name "qterminal")
-    (version "2.3.0")
+    (version "2.2.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1ibx62d8cqvm9ygdbdnp5j06l51d05ip0g2j30ivyhpi4cp1ik62"))))
+        (base32 "1lpm1065wj61x6w1w7zgy0b7g62c9gbg6v17l0vlgbxv10s8rlqc"))))
    (build-system cmake-build-system)
    (inputs
     (list layer-shell-qt qtbase qtermwidget))
@@ -1023,14 +1021,14 @@ QTermWidget.")
 (define-public screengrab
  (package
    (name "screengrab")
-    (version "3.1.0")
+    (version "3.0.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/screengrab/releases/download/"
                           version "/screengrab-" version ".tar.xz"))
       (sha256
-        (base32 "1g6kl8gxb3k9djmsr57i0dz3jikjay5w5k4bzid32nsv9bnq2cpq"))))
+        (base32 "1ryfdh7rkdrf9lf7j0p3zapw80hvpg0k6hb8r84yp5c5d0l09b9h"))))
    (build-system cmake-build-system)
    (inputs
     (list kwindowsystem
@@ -1053,14 +1051,14 @@ easily publishing them on internet image hosting services.")
 (define-public lxqt-archiver
  (package
    (name "lxqt-archiver")
-    (version "1.3.0")
+    (version "1.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/lxqt/" name "/releases/download/"
                           version "/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1vvmadfv2kxh16dw7h6ar0wkgcml6h8rpl7jax69qslfbrq5b1ll"))))
+        (base32 "1iisk5mb4xxdjimlh8inr182a1vpy8zk5qis9v3p5p73d49i5r2k"))))
    (build-system cmake-build-system)
    (inputs
     (list glib json-glib libfm-qt qtbase))
@@ -28,7 +28,7 @@
 ;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
 ;;; Copyright © 2024 Spencer King <spencer.king@geneoscopy.com>
 ;;; Copyright © 2024, 2025 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2024, 2025 Andy Tai <atai@atai.org>
+;;; Copyright © 2024 Andy Tai <atai@atai.org>
 ;;; Copyright © 2025 Lapearldot <lapearldot@disroot.org>
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
@@ -2317,13 +2317,13 @@ for scientific computing and data science (e.g. BLAS and OpenMP).")
 (define-public python-hdbscan
  (package
    (name "python-hdbscan")
-    (version "0.8.41")
+    (version "0.8.40")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "hdbscan" version))
       (sha256
-        (base32 "0ggzkm153cmgdq88jpdsvcmsipdicri24b957wbz47xjbcz847p4"))))
+        (base32 "05wask431fm78n1227dhvwsmlnys9d95vxjz0y8hbvmy2zzq7qy9"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -4322,98 +4322,6 @@ TVM works with deep learning frameworks to provide end to end compilation to
 different backends")
      (license license:asl2.0))))

-(define-public koboldcpp
-  (package
-    (name "koboldcpp")
-    (version "1.105.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/LostRuins/koboldcpp")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "13ihvqxbf1gl3bnml4cn403z9nvwwc8vfc26a18wzanbkszfjylv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no tests
-      #:imported-modules `(,@%default-gnu-imported-modules
-                           (guix build python-build-system))
-      #:modules '((guix build gnu-build-system)
-                  ((guix build python-build-system) #:prefix python:)
-                  (guix build utils))
-      #:make-flags
-      #~(list (string-append "CC=" #$(cc-for-target))
-              "LLAMA_VULKAN=1"
-              "LLAMA_PORTABLE=1"
-              "LLAMA_USE_BUNDLED_GLSLC=0")    ;; TODO: add CLBLAS
-      #:phases
-      (with-extensions (list (pyproject-guile-json))
-        #~(modify-phases %standard-phases
-            (delete 'configure)
-            (replace 'install
-              (lambda _
-                (for-each
-                 (lambda (f)
-                   (install-file f (string-append #$output "/bin")))
-                 (append (list "koboldcpp.py"
-                               "vulkan-shaders-gen"
-                               "vulkan-shaders-gen-noext")
-                         ;; koboldcpp.py expects .so's
-                         ;; to be in the same directory
-                         (find-files "." "\\.so$")))))
-            (add-after 'install 'python-wrap
-              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (wrap-program (search-input-file outputs "bin/koboldcpp.py")
-                  `("GUIX_PYTHONPATH" =
-                    (,(getenv "GUIX_PYTHONPATH")
-                     ,(python:site-packages inputs outputs))))))))))
-    (inputs
-     (list bash-minimal
-           openblas
-           python
-           python-customtkinter
-           spirv-headers
-           spirv-tools
-           vulkan-headers
-           vulkan-loader)) ;TODO: add OpenCL
-    (native-inputs
-     (list shaderc))
-    (properties '((tunable? . #t)))
-    (home-page "https://github.com/lostruins/koboldcpp")
-    (synopsis "AI text-generation software for GGML and GGUF models")
-    (description "KoboldCpp is an easy-to-use AI text-generation software for
-GGML and GGUF models, builds off llama.cpp and adds many additional features:
-
-@itemize
-@item Runs on CPU or GPU, supports full or partial offloaded
-@item LLM text generation (Supports all GGML and GGUF models, backwards
-compatibility with ALL past models)
-@item Image Generation (Stable Diffusion 1.5, SDXL, SD3, Flux)
-@item Speech-To-Text (Voice Recognition) via Whisper
-@item Text-To-Speech (Voice Generation) via OuteTTS, Kokoro, Parler and Dia
-@item Provides many compatible APIs endpoints for many popular webservices
-(KoboldCppApi OpenAiApi OllamaApi A1111ForgeApi ComfyUiApi
-WhisperTranscribeApi XttsApi OpenAiSpeechApi)
-@item Bundled KoboldAI Lite UI with editing tools, save formats, memory,
-world info, author's note, characters, scenarios
-@item Includes multiple modes (chat, adventure, instruct, storywriter)
-and UI Themes (aesthetic roleplay, classic writer, corporate assistant
-messsenger)
-@item Supports loading Tavern Character Cards, importing many different
-data formats from various sites, reading or exporting JSON savefiles
-and persistent stories
-@item Many other features including new samplers, regex support
-websearch, RAG via TextDB, image recognition/vision and more
-@end itemize
-
-All up-to-date GGUF models are supported, and KoboldCpp also includes backward
-compatibility for older versions/legacy GGML models.")
-    (license (list license:agpl3 license:expat))))
-
-
 (define-public foxi
  (let
      ((commit "c278588e34e535f0bb8f00df3880d26928038cad")
@@ -1373,9 +1373,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
                           (guix build guile-build-system)
                           (guix build emacs-utils))
      #:configure-flags
-      #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output)
-              "-Dreadline=enabled"
-              "-Dtests=enabled")
+      #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'install 'fix-ffi
@@ -12,7 +12,7 @@
 ;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016, 2018, 2020, 2021 Kei Kebreau <kkebreau@posteo.net>
-;;; Copyright © 2016-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
@@ -2099,13 +2099,13 @@ extremely large and complex data collections.")
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((simple
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar"))
                    (api
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"))
                    (nop
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-nop/1.7.25/slf4j-nop-1.7.25.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-nop/1.7.36/slf4j-nop-1.7.36.jar"))
                    (junit
                     (search-input-file
                      inputs "/lib/m2/junit/junit/4.12/junit-4.12.jar"))
@@ -8705,103 +8705,92 @@ theories} (SMT) solver.  It provides a C/C++ API, as well as Python bindings.")
 (define-public elpa
  (package
    (name "elpa")
-    (version "2025.06.001")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.mpcdf.mpg.de/elpa/elpa")
-             (commit (string-append "new_release_" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1j2mqa8g76z6xmwji99320v6q98p823glvxjsdcdpaji59wgvdql"))))
+    (version "2018.11.001")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://elpa.mpcdf.mpg.de/software/"
+                                  "tarball-archive/Releases/"
+                                  version "/elpa-" version ".tar.gz"))
+              (sha256
+               (base32
+                "05hv3v5i6xmziaizw350ff72y1c3k662r85fm3xfdrkclj5zw9yc"))))
    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags
-           #~`("--enable-openmp" "--with-mpi=no"
-               ;; ELPA unfortunately does not support runtime dispatch, so we
-               ;; can only enable the "generic" kernels.  See the "Cross
-               ;; compilation" section of INSTALL.md.
-               "--enable-generic-kernels"
-               "--disable-sse"
-               "--disable-sse-assembly"           ;Require SSE3
-               "--disable-avx"
-               "--disable-avx2"
-               "--disable-avx512"
-               #$(string-append "CFLAGS=-O3 -funsafe-loop-optimizations "
-                                "-funsafe-math-optimizations "
-                                "-ftree-vect-loop-version -ftree-vectorize "
-                                (let ((system (or (%current-target-system)
-                                                  (%current-system))))
-                                  (cond
-                                   ((or (string-prefix? "x86_64" system)
-                                        (string-prefix? "i686" system))
-                                    "-msse2")
-                                   (else "")))))
-           #:parallel-tests? #f ;tests are multi-threaded, via BLAS
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'bootstrap 'patch-shebangs-early
-                 (lambda _
-                   (patch-shebang "generate_automake_test_programs.py")))
-               (add-before 'configure 'patch-header-generation
-                 (lambda _
-                   (substitute* "configure"
-                     (("^  *make.*top_srcdir=\"\\$srcdir\"" &)
-                      (string-append & " CPP=\"$CPP\""))) #t))
-               (add-before 'check 'setup-tests
-                 (lambda _
-                   ;; Decrease test time and RAM use by computing fewer
-                   ;; eigenvalues.  The flags are (MATRIX-SIZE, EIGENVALUES,
-                   ;; BLOCK-SIZE), where the default is (500, 250, 16) for C
-                   ;; tests and (5000, 150, 16) for Fortran.  This also causes
-                   ;; several tests to pass that otherwise would otherwise
-                   ;; fail with matrix size 5000; possibly due to floating
-                   ;; point tolerances that are too tight.
-                   (setenv "TEST_FLAGS" "1500 50 16") ;from elpa.spec
-                   (setenv "OMP_NUM_THREADS"
-                           (number->string (parallel-job-count)))
-                   (substitute* "Makefile"
-                     ;; Test scripts are generated, patch the shebang
-                     (("#!/bin/bash")
-                      (string-append "#!" (which "sh")))))))))
    (native-inputs
-     (list autoconf-2.71
-           automake
-           libtool
-           gfortran
-           perl
-           python))
-    (inputs (list openblas))
+     `(("fortran" ,gfortran)
+       ("perl" ,perl)))                 ;for configure and deps
+    (inputs
+     `(("blas" ,openblas)))
+    (arguments
+     `(#:configure-flags
+       `("--enable-openmp"
+         "--with-mpi=no"
+         ;; ELPA unfortunately does not support runtime dispatch, so we can
+         ;; only enable the "generic" kernels.  See the "Cross compilation"
+         ;; section of INSTALL.md.
+         "--enable-generic"
+         "--disable-sse" "--disable-sse-assembly" ;Require SSE3
+         "--disable-avx" "--disable-avx2" "--disable-avx512"
+         ,(string-append "CFLAGS=-O3 "
+                         "-funsafe-loop-optimizations -funsafe-math-optimizations "
+                         "-ftree-vect-loop-version -ftree-vectorize "
+                         ,(let ((system (or (%current-target-system)
+                                            (%current-system))))
+                            (cond
+                             ((or (string-prefix? "x86_64" system)
+                                  (string-prefix? "i686" system))
+                              "-msse2")
+                             (else "")))))
+       #:parallel-tests? #f             ;tests are multi-threaded, via BLAS
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-header-generation
+           (lambda _
+             (substitute* "configure"
+               (("^  *make.*top_srcdir=\"\\$srcdir\"" &)
+                (string-append & " CPP=\"$CPP\"")))
+             #t))
+         (add-before 'check 'setup-tests
+           (lambda _
+             ;; Decrease test time and RAM use by computing fewer eigenvalues.
+             ;; The flags are (MATRIX-SIZE, EIGENVALUES, BLOCK-SIZE), where
+             ;; the default is (500, 250, 16) for C tests and (5000, 150, 16)
+             ;; for Fortran.  This also causes several tests to pass that
+             ;; otherwise would otherwise fail with matrix size 5000; possibly
+             ;; due to floating point tolerances that are too tight.
+             (setenv "TEST_FLAGS" "1500 50 16") ;from elpa.spec
+             (setenv "OMP_NUM_THREADS" (number->string (parallel-job-count)))
+             (substitute* "Makefile"
+               ;; Test scripts are generated, patch the shebang
+               (("#!/bin/bash") (string-append "#!" (which "sh"))))
+             #t)))))
    (home-page "https://elpa.mpcdf.mpg.de")
    (synopsis "Eigenvalue solvers for symmetric matrices")
    (description
     "The ELPA library provides efficient and scalable direct eigensolvers for
 symmetric matrices.")
-    (license license:lgpl3)
-    (properties '((tunable? . #t)))))
+    (license license:lgpl3)))

 (define-public elpa-openmpi
-  (package/inherit elpa
+  (package (inherit elpa)
    (name "elpa-openmpi")
    (inputs
-     (modify-inputs (package-inputs elpa)
-       (prepend openmpi scalapack zlib)))
+     `(("mpi" ,openmpi)
+       ("scalapack" ,scalapack)
+       ,@(package-inputs elpa)))
    (arguments
     (substitute-keyword-arguments (package-arguments elpa)
-       ((#:configure-flags cf #~())
-        #~(cons "--with-mpi=yes"
-                (delete "--with-mpi=no" #$cf)))
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (add-before 'check 'mpi-setup
-              (lambda _
-                ;; Tests use 2 mpi tasks by default, use our remaining build
-                ;; cores as OpenMP threads.
-                (setenv "OMP_NUM_THREADS"
-                        (number->string (max (quotient (parallel-job-count) 2)
-                                             1)))
-                (#$%openmpi-setup)))))))
+       ((#:configure-flags cf '())
+        `(cons "--with-mpi=yes" (delete "--with-mpi=no" ,cf)))
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-before 'check 'mpi-setup
+             (lambda _
+               ;; Tests use 2 mpi tasks by default, use our remaining build
+               ;; cores as OpenMP threads.
+               (setenv "OMP_NUM_THREADS" (number->string
+                                          (max (quotient (parallel-job-count) 2)
+                                               1)))
+               (,%openmpi-setup)))))))
    (synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)")))

 (define-public elemental
@@ -100,6 +100,18 @@
  (make-apache-parent-pom
    "29" "0fj078bgzs0r24x66ph5bbwkkc5s9d1qh57hmlpisg4mdi0l48s9"))

+(define-public apache-parent-pom-31
+  (make-apache-parent-pom
+    "31" "1sdjh664gakz5bjawrw4p4bpvkjwsk4wbd1iapl1r38zsfcp5qal"))
+
+(define-public apache-parent-pom-33
+  (make-apache-parent-pom
+    "33" "06qpsnrqf8459aficmbdhad7ldv8k48dqwxivd7r7knlssmlqsww"))
+
+(define-public apache-parent-pom-34
+  (make-apache-parent-pom
+    "34" "0jia7fxl3abvz4d70y144vghy2dq4a258jdyzcpp339hx37lnjm2"))
+
 (define* (make-apache-commons-parent-pom version hash parent
                                         #:key (tag-prefix "commons-parent-"))
  (hidden-package
@@ -131,6 +143,16 @@
      (description "This package contains the Apache Commons parent POM.")
      (license license:asl2.0))))

+(define-public apache-commons-parent-pom-28
+  (make-apache-commons-parent-pom
+    "28" "13zsm6x2cpk9j92bg5v3mg9f4d8928hh6xdx16024bz122y5nb34"
+    apache-parent-pom-13))
+
+(define-public apache-commons-parent-pom-34
+  (make-apache-commons-parent-pom
+    "34" "0r0gim683nsib2x62s1av2hr6agirqjp57vjkd3xh0qlrx36kna1"
+    apache-parent-pom-13))
+
 (define-public apache-commons-parent-pom-39
  (make-apache-commons-parent-pom
    "39" "0mjx48a55ik1h4hsxhifkli1flvkp6d05ab14p4al0fc6rhdxi46"
@@ -162,6 +184,35 @@
    apache-parent-pom-23
    #:tag-prefix "rel/commons-parent-"))

+(define-public apache-commons-parent-pom-73
+  (hidden-package
+   (package
+     (name "apache-commons-parent-pom")
+     (version "73")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/apache/commons-parent")
+                     (commit "rel/commons-parent-73")))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32 "0avlf1chqccd6f6y03l9i7p8z5a96c91nvv1rx482yjdr8ic28mf"))))
+     (build-system ant-build-system)
+     (arguments
+      `(#:tests? #f
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (delete 'build)
+          (replace 'install
+            (install-pom-file "pom.xml")))))
+     (propagated-inputs
+      `(("parent" ,apache-parent-pom-33)))
+     (home-page "https://maven.apache.org/")
+     (synopsis "Apache Commons parent pom")
+     (description "This package contains the Apache Commons parent POM.")
+     (license license:asl2.0))))
+
 (define-public java-weld-parent-pom
  (hidden-package
    (package
@@ -412,6 +463,74 @@ other projects as their parent pom.")
  (make-plexus-parent-pom
    "8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww"))

+(define-public plexus-parent-pom-10
+  (hidden-package
+   (package
+     (name "plexus-parent-pom")
+     (version "10")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/codehaus-plexus/plexus-pom")
+                     (commit "plexus-10")))
+               (file-name (git-file-name name "10"))
+               (sha256
+                (base32 "10hhmi50ns0cqjiv9xw3dlanil1psm9s1mj2wndfyvn85cz7ia9n"))))
+     (build-system ant-build-system)
+     (arguments
+      `(#:tests? #f
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (delete 'build)
+          (replace 'install
+            (install-pom-file "pom.xml")))))
+     (home-page "https://codehaus-plexus.github.io/plexus-pom")
+     (synopsis "Plexus parent pom")
+     (description "This package contains the Plexus parent POM.")
+     (license license:asl2.0))))
+
+(define-public plexus-parent-pom-15
+  (hidden-package
+   (package
+     (inherit plexus-parent-pom-10)
+     (version "15")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/codehaus-plexus/plexus-pom")
+                     (commit "plexus-15")))
+               (file-name (git-file-name "plexus-parent-pom" "15"))
+               (sha256
+                (base32 "0rjbfy7qpvxa75ak3cx6vgd0agpbgdkc95jsbk3qhm9n0nisylh1")))))))
+
+(define-public plexus-parent-pom-20
+  (hidden-package
+   (package
+     (name "plexus-parent-pom")
+     (version "20")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/codehaus-plexus/plexus-pom")
+                     (commit "plexus-20")))
+               (file-name (git-file-name name "20"))
+               (sha256
+                (base32 "1j2n06p5ylijxk2j0iwynxag6dq4bb5jdli7dsnj8hsywrj4jrpg"))))
+     (build-system ant-build-system)
+     (arguments
+      `(#:tests? #f
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (delete 'build)
+          (replace 'install
+            (install-pom-file "pom.xml")))))
+     (home-page "https://codehaus-plexus.github.io/plexus-pom")
+     (synopsis "Plexus parent pom")
+     (description "This package contains the Plexus parent POM.")
+     (license license:asl2.0))))
+
 (define* (make-maven-parent-pom version hash parent #:key replacements)
  (hidden-package
    (package
@@ -451,6 +570,86 @@ other projects as their parent pom.")
 tool.  This package contains the Maven parent POM.")
      (license license:asl2.0))))

+(define-public maven-parent-pom-44
+  (hidden-package
+    (package
+      (name "maven-parent-pom")
+      (version "44")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/apache/maven-parent")
+                       (commit "v44")))
+                (file-name (git-file-name name version))
+                (sha256 (base32 "0l54kjgi5s8n5asaf9swj96bjm26s77z3wk4x9jiljxflf9vdqgf"))))
+      (build-system ant-build-system)
+      (arguments
+       `(#:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)
+           (delete 'build)
+           (add-after 'install 'install-plugins
+             (install-pom-file "maven-plugins/pom.xml"))
+           (add-after 'install 'install-shared
+             (install-pom-file "maven-shared-components/pom.xml"))
+           (replace 'install
+             (install-pom-file "pom.xml")))))
+      (propagated-inputs
+       `(("parent" ,apache-parent-pom-33)))
+      (home-page "https://maven.apache.org/")
+      (synopsis "Maven parent pom")
+      (description "Apache Maven is a software project management and comprehension
+tool.  This package contains the Maven parent POM.")
+      (license license:asl2.0))))
+
+(define-public maven-parent-pom-43
+  (let ((base (make-maven-parent-pom
+                "43" "1f2w7nlkd97gq8bbddl9n0dgm7v5hkpjxrrhzln8szhm4d9wxrfa"
+                apache-parent-pom-33
+                #:replacements
+                (delay
+                  `(("org.codehaus.plexus"
+                     ("plexus-component-annotations" .
+                      ,(package-version java-plexus-component-annotations))))))))
+    (package
+      (inherit base)
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           `(modify-phases ,phases
+              (add-before 'install 'fix-versions
+                (lambda _
+                  ;; Use the junit-bom version we have available
+                  (substitute* "pom.xml"
+                    (("5\\.11\\.3")
+                     ,(package-version junit-bom-5.11))))))))))))
+
+(define-public maven-parent-pom-41
+  (let ((base (make-maven-parent-pom
+                "41" "0glhr3s77g80yc20ajpwmpqgqn3i2ap7mj1wqs1vnk2fp2s0lvsj"
+                apache-parent-pom-31
+                #:replacements
+                (delay
+                  `(("org.codehaus.plexus"
+                     ("plexus-component-annotations" .
+                      ,(package-version java-plexus-component-annotations))))))))
+    (package
+      (inherit base)
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           ;; FIXME: Version downgrades; upgrade sisu and plexus-utils instead.
+           `(modify-phases ,phases
+              (add-before 'install 'fix-versions
+                (lambda _
+                  (substitute* "pom.xml"
+                    (("0\\.9\\.0\\.M2")
+                     ,(package-version java-eclipse-sisu-plexus))
+                    (("version\\.plexus-utils>4\\.0\\.0")
+                     ,(string-append "version.plexus-utils>"
+                        (package-version java-plexus-utils)))))))))))))
+
 (define-public maven-parent-pom-39
  (make-maven-parent-pom
    "39" "1123nmm63nrsfy9i35zn12glswc2sy9bsj4fir2z9yh93kraky1y"
@@ -459,7 +658,9 @@ tool.  This package contains the Maven parent POM.")
    (delay
      `(("org.codehaus.plexus"
         ("plexus-component-annotations" .
-          ,(package-version java-plexus-component-annotations)))))))
+          ,(package-version java-plexus-component-annotations))
+         ("plexus-utils" .
+          ,(package-version java-plexus-utils)))))))

 (define-public maven-parent-pom-37
  (make-maven-parent-pom
@@ -2928,7 +2928,6 @@ implementation of an MQTT version client class.")
           qtkeychain
           qtmultimedia-5
           qtsvg-5
-           qtwayland-5
           qtx11extras
           usrsctp
           libx11
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
-;;; Copyright © 2020, 2021, 2026 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net>
 ;;; Copyright © 2020–2023 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2021 Noah Evans <noah@nevans.me>
@@ -392,7 +392,7 @@ interface for the Music Player Daemon.")
 (define-public sonata
  (package
    (name "sonata")
-    (version "1.7.3")
+    (version "1.7.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -401,36 +401,28 @@ interface for the Music Player Daemon.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0jipamk3gq85kxhq8vd6sw5rjyiyx5cfadafikc5k0q0fw67w83v"))))
-    (build-system pyproject-build-system)
+                "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      ;; Invalid command "test"
-      #:tests? #false
-      #:modules '((guix build gnu-build-system)
-                  (guix build pyproject-build-system)
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build python-build-system)
                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                  (guix build utils))
-      #:imported-modules `(,@%pyproject-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
+                           (guix build python-build-system)
                           (guix build glib-or-gtk-build-system))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'glib-or-gtk-wrap
-            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-          (add-after 'unpack 'fix-importlib
-            (lambda _
-              (substitute* "sonata/main.py"
-                (("importlib.resources.files\\(__name__\\)")
-                 "importlib.resources.files(\"sonata\")"))))
-          (add-after 'wrap 'wrap-sonata
-            (lambda _
-              (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
-                (wrap-program (string-append #$output "/bin/sonata")
-                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+         (add-after 'install 'wrap-sonata
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out               (assoc-ref outputs "out"))
+                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+               (wrap-program (string-append out "/bin/sonata")
+                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
    (native-inputs
-     (list gettext-minimal
-           python-setuptools
-           python-wheel))
+     (list gettext-minimal))
    (inputs
     (list bash-minimal
           python-mpd2
@@ -1118,6 +1118,81 @@ settings (aliasing, linear interpolation and cubic interpolation).")
 enable professional yet simple and intuitive pattern-based drum programming.")
    (license license:gpl2+)))

+(define-public easytag
+  (package
+    (name "easytag")
+    (version "2.4.3")
+    (source (origin
+             (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/easytag/2.4/easytag-"
+                     version ".tar.xz"))
+             (sha256
+              (base32
+               "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("glib" ,glib "bin")
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
+    (inputs
+     (list flac
+           gtk+
+           id3lib
+           libid3tag
+           libvorbis
+           opusfile
+           speex
+           taglib
+           wavpack
+           yelp))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'configure-libid3tag
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; libid3tag does not provide a .pc file and EasyTAG's configure
+             ;; script healivy relies on pkg-config.  Providing a temporary
+             ;; local .pc file is easier than patching the configure script.
+             (let* ((libid3tag (assoc-ref inputs "libid3tag")))
+               (mkdir-p "pkgconfig")
+               (with-output-to-file
+                 "pkgconfig/id3tag.pc"
+                 (lambda _
+                   (format #t
+                     "prefix=~@*~a~@
+                      libdir=${prefix}/lib~@
+                      includedir=${prefix}/include~@
+
+                      Name: libid3tag~@
+                      Description:~@
+                      Version:~@
+                      Libs: -L${libdir} -lid3tag -lz~@
+                      Cflags: -I${includedir}~%"
+                     libid3tag)))
+               (setenv "PKG_CONFIG_PATH"
+                 (string-append (getenv "PKG_CONFIG_PATH")
+                   ":" (getcwd) "/pkgconfig"))
+               #t)))
+         (add-after 'unpack 'patch-makefile
+           (lambda _
+             (substitute* "Makefile.in"
+               ;; The Makefile generates a test-desktop-file-validate.sh
+               ;; script with /bin/sh hard-coded.
+               (("/bin/sh") (which "sh"))
+               ;; Don't create 'icon-theme.cache'.
+               (("gtk-update-icon-cache") "true"))
+             #t)))))
+    (home-page "https://wiki.gnome.org/Apps/EasyTAG")
+    (synopsis "Simple application for viewing and editing tags in audio files")
+    (description
+      "EasyTAG is an application for viewing and editing tags in audio files.
+It supports MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis,
+MusePack, Monkey's Audio, and WavPack files.")
+    (license license:gpl2+)))
+
 (define-public flacon
  (package
    (name "flacon")
@@ -3985,34 +4060,33 @@ as a tool for live performances or general audio and event filtering.")
    (package
      (name "curseradio")
      (version (git-version "0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/chronitis/curseradio")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "11bf0jnj8h2fxhpdp498189r4s6b47vy4wripv0z4nx7lxajl88i"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        #:tests? #f                     ; No tests.
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'link-to-mpv
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "curseradio/curseradio.py"
-                  (("/usr/bin/mpv")
-                   (search-input-file inputs "/bin/mpv"))))))))
-      (native-inputs (list python-setuptools))
-      (propagated-inputs (list python-lxml python-requests python-pyxdg))
-      (inputs (list mpv))
-      (home-page "https://github.com/chronitis/curseradio")
-      (synopsis "Command-line Internet radio player")
-      (description "Curseradio is a Curses-based radio player that uses a
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/chronitis/curseradio")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "11bf0jnj8h2fxhpdp498189r4s6b47vy4wripv0z4nx7lxajl88i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'link-to-mpv
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "curseradio/curseradio.py"
+               (("/usr/bin/mpv")
+                (search-input-file inputs "/bin/mpv"))))))))
+    (propagated-inputs
+     (list python-lxml python-requests python-pyxdg))
+    (inputs
+     (list mpv))
+    (home-page "https://github.com/chronitis/curseradio")
+    (synopsis "Command-line Internet radio player")
+    (description "Curseradio is a Curses-based radio player that uses a
 tune-in sender list from @url{http://opml.radiotime.com}.")
-      (license license:expat))))
+    (license license:expat))))

 (define-public pianobar
  (package
@@ -4057,13 +4131,14 @@ event-based scripts for scrobbling, notifications, etc.")
              (sha256
               (base32
                "1k0zwbi9i6b60l69ccmrapls19i21h1q6h547b3l3az7napb7zb3"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
+      #:use-setuptools? #f
      #:configure-flags
-      #~'(("--root" . "/")
-          ;; Don't phone home or show ‘Check for Update…’ in the Help menu.
-          ("--disable-autoupdate" . ""))
+      #~(list "--root=/"
+              ;; Don't phone home or show ‘Check for Update…’ in the Help menu.
+              "--disable-autoupdate")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-source
@@ -4071,13 +4146,14 @@ event-based scripts for scrobbling, notifications, etc.")
              (substitute* "picard/const/__init__.py"
                (("pyfpcalc")
                 (string-append
-                  "pyfpcalc', '" (search-input-file inputs "/bin/fpcalc"))))))
+                  "pyfpcalc', '"
+                  (assoc-ref inputs "chromaprint") "/bin/fpcalc")))))
          ;; pipe tests require writable $HOME.
          (add-before 'check 'set-HOME
            (lambda _
              (setenv "HOME" "/tmp"))))))
    (native-inputs
-     (list gettext-minimal python-dateutil python-setuptools))
+     (list gettext-minimal python-dateutil))
    (inputs
     (list chromaprint
           python-charset-normalizer
@@ -4222,29 +4298,19 @@ Standard Recording Code} (ISRCs) from audio CDs and submit them to
  (package
    (name "python-pylast")
    (version "4.2.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/pylast/pylast")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1i3mgxhrr3nbfrg3ppv6qvf3py0p46wa2h36nnfjw2m5bhjd6rhx"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'set-version
-            (lambda _
-              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pylast" version))
+              (sha256
+               (base32
+                "0pzzhr4mlwpvfhy9gzq86ppz29fmf5z0w3xkl5if1fm59r1afms7"))))
+    (build-system python-build-system)
+    ;; Tests require network access.  See
+    ;; https://github.com/pylast/pylast/issues/105
+    (arguments '(#:tests? #f))
    (native-inputs
-     (list python-pytest
-           python-flaky
-           python-pyyaml
-           python-setuptools-scm
-           python-setuptools))
+     (list python-coverage python-pytest python-flaky python-pyyaml
+           python-setuptools-scm))
    (home-page "https://github.com/pylast/pylast")
    (synopsis "Python interface to Last.fm and Libre.fm")
    (description "A Python interface to Last.fm and other API-compatible
@@ -6126,26 +6192,23 @@ ISRCs and the MCN (=UPC/EAN) from disc.")
       (method url-fetch)
       (uri (pypi-uri "discid" version))
       (sha256
-        (base32 "1fgp67nhqlbvhhwrcxq5avil7alpzw4s4579hlyvxzbphdnbz8vq"))))
-    (build-system pyproject-build-system)
+        (base32
+         "1fgp67nhqlbvhhwrcxq5avil7alpzw4s4579hlyvxzbphdnbz8vq"))))
+    (build-system python-build-system)
+    (inputs
+     (list libdiscid))
    (arguments
-     (list
-      #:test-flags
-      #~(list "-k" (string-join
-                    (list "not test_read_features"
-                          "test_read_put"
-                          "test_read_simple")
-                    " and not "))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-libdiscid
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((discid (search-input-file inputs "/lib/libdiscid.so.0")))
-                (substitute* "discid/libdiscid.py"
-                  (("lib_name = (.*)$" all name)
-                   (string-append "lib_name = \"" discid "\"\n")))))))))
-    (native-inputs (list python-pytest python-setuptools))
-    (inputs (list libdiscid))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-libdiscid
+           ;; Set path of libdiscid
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((discid (assoc-ref inputs "libdiscid")))
+               (substitute* "discid/libdiscid.py"
+                 (("lib_name = (.*)$" all name)
+                  (string-append "lib_name = \"" discid
+                                 "/lib/libdiscid.so.0\"\n")))
+               #t))))))
    (home-page "https://python-discid.readthedocs.io/")
    (synopsis "Python bindings for Libdiscid")
    (description
@@ -26,7 +26,7 @@
 ;;; Copyright © 2018, 2020-2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2018, 2020, 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2019-2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2019-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
@@ -119,7 +119,6 @@
  #:use-module (gnu packages bash)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages c)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages code)
@@ -1626,8 +1625,8 @@ the IETF as @url{https://www.rfc-editor.org/rfc/rfc7252, RFC 7252}.")

 (define-public libnatpmp
  ;; Install the latest commit as it provides a pkg-config (.pc) file.
-  (let ((base-version "20250404")       ;date of last commit
-        (commit "134fc89e2781e154e40042641f4d8bcbe42579f1")
+  (let ((base-version "20230423")
+        (commit "6a850fd2bd9b08e6edc886382a1dbae2a7df55ec")
        (revision "0"))
    (package
      (name "libnatpmp")
@@ -1640,7 +1639,7 @@ the IETF as @url{https://www.rfc-editor.org/rfc/rfc7252, RFC 7252}.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1cs975a7q1v1mml8yd9x15w0pscq3192d15fpa6mgy1kgh7lzpqd"))))
+                  "18hf9a3i3mncl3w80nzi1684iac3by86bv0hgmbm1v2w8gbfjyw0"))))
      (build-system cmake-build-system)
      (arguments
       (list
@@ -4184,7 +4183,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
 (define-public opendht
    (package
      (name "opendht")
-      (version "3.6.2.3")
+      (version "3.5.4")
      (source (origin
                (method git-fetch)
                (uri (git-reference
@@ -4193,43 +4192,31 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1v8miwsslqlqlpp7p210jhxwkblqyc69cgxaq680qhg7h1sf3y2i"))
-                (patches (search-patches "opendht-meson-install-headers.patch"
-                                         "opendht-meson-liburing.patch"))))
+                  "1qy5fvz4rr480n0sa81n3rx5zskpgk7zqip12b9ly8hk43mxsycs"))))
      (outputs '("out" "python" "tools" "debug"))
-      (build-system meson-build-system)
+      (build-system gnu-build-system)
      (arguments
       (list
-        #:modules '((guix build meson-build-system)
-                    (guix build utils)
-                    (ice-9 ftw)
-                    (srfi srfi-26))
+        #:imported-modules `((guix build python-build-system) ;for site-packages
+                             ,@%default-gnu-imported-modules)
+        #:modules '(((guix build python-build-system) #:prefix python:)
+                    (guix build gnu-build-system)
+                    (guix build utils))
        #:configure-flags
-        #~(list "-Dproxy_client=enabled"
-                "-Dproxy_server=enabled"
-                "-Dpush_notifications=enabled")
+        #~(list "--disable-static"        ;to reduce size
+                "--enable-tests"
+                "--enable-proxy-server"
+                "--enable-push-notifications"
+                "--enable-proxy-server-identity"
+                "--enable-proxy-client")
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'disable-problematic-tests
              (lambda _
-                (substitute* "meson.build"
-                  ;; The 'proxy' test fails with "killed by signal 6 SIGABRT"
-                  ;; inside the build environment (see:
-                  ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701318124>)
-                  (("test\\('(DhtProxy)', test_proxy)")
-                   "")
-                  ;; The 'http' test fails due to liburing not being
-                  ;; functional inside build environment, causing
-                  ;; "io_uring_queue_init: Cannot allocate memory" errors
-                  ;; (see:
-                  ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701318124>).
-                  (("test\\('Http', test_http)")
-                   "")
-                  ;; The 'peerdiscovery' test fails even outside of the build
-                  ;; environment (see:
-                  ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701328516>).
-                  (("test\\('PeerDiscovery', test_peerdiscovery)")
-                   ""))
+                ;; The dhtrunnertester test suite includes 'testListen', which
+                ;; is sensitive to the performance/load of the machine it runs
+                ;; on, introducing nondeterminism (see:
+                ;; https://github.com/savoirfairelinux/opendht/issues/626).
                (substitute* "tests/Makefile.am"
                  (("\\bdhtrunnertester\\.(h|cpp)\\b")
                   ""))))
@@ -4241,23 +4228,60 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
                (substitute* "tests/httptester.cpp"
                  (("std::chrono::seconds\\(10)")
                   "std::chrono::seconds(30)"))))
-            (add-after 'install 'move-tools
+            (add-after 'unpack 'fix-python-installation-prefix
+              ;; Specify the installation prefix for the compiled Python module
+              ;; that would otherwise attempt to installs itself to Python's own
+              ;; site-packages directory.
+              (lambda _
+                (substitute* "python/Makefile.am"
+                  (("--root=\\$\\(DESTDIR)/")
+                   (string-append "--root=/ --single-version-externally-managed "
+                                  "--prefix=" #$output:python)))))
+            (add-after 'unpack 'specify-runpath-for-python-module
+              (lambda _
+                (substitute* "python/setup.py.in"
+                  (("extra_link_args=\\[(.*)\\]" _ args)
+                   (string-append "extra_link_args=[" args
+                                  ", '-Wl,-rpath=" #$output "/lib']")))))
+            ;; This is due to an upstream issue:
+            ;; https://git.jami.net/savoirfairelinux/opendht/-/issues/69
+            (add-after 'unpack 'fix-llhttp-lib-substitution
+              (lambda _
+                (substitute* "configure.ac"
+                  (("http_lib")
+                   "llhttp_lib")
+                  (("-lllhttp")
+                   ", libllhttp"))))
+            ;; TODO: build with liburing, requires cmake or meson.
+            (add-after 'unpack 'pkgconfig-disable-iouring
+              (lambda _
+                ;; This one causes configure error in dhtnet.
+                (substitute* "opendht.pc.in"
+                  (("@iouring_lib@")
+                   ""))))
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (invoke "tests/opendht_unit_tests"))))
+            (add-before 'bootstrap 'delete-autogen.sh
+              (lambda _
+                ;; The autogen.sh script lacks a shebang, cannot be executed
+                ;; directly.  Let the bootstrap phase invoke autoreconf itself.
+                (delete-file "autogen.sh")))
+            (add-after 'install 'move-and-wrap-tools
              (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let* ((tools #$output:tools))
+                (let* ((tools (assoc-ref outputs "tools"))
+                       (dhtcluster (string-append tools "/bin/dhtcluster"))
+                       (site-packages (python:site-packages inputs outputs)))
                  (mkdir tools)
                  (rename-file (string-append #$output "/bin")
-                               (string-append tools "/bin")))))
-            (add-after 'install 'move-python-bindings
-              (lambda _
-                (let* ((python-dir (car
-                                    (scandir (string-append #$output "/lib")
-                                             (cut string-prefix? "python" <>))))
-                       (dest (string-append #$output:python "/lib/"
-                                            python-dir)))
-                  (mkdir-p (dirname dest))
-                  (rename-file (string-append #$output "/lib/" python-dir)
-                               dest)))))))
-      (native-inputs (list cppunit pkg-config python python-cython))
+                               (string-append tools "/bin"))
+                  ;; TODO: Contribute a patch to python/Makefile.am to
+                  ;; automate this.
+                  (copy-file "python/tools/dhtcluster.py" dhtcluster)
+                  (chmod dhtcluster #o555)
+                  (wrap-program dhtcluster
+                    `("GUIX_PYTHONPATH" prefix (,site-packages)))))))))
      (inputs
       (list bash-minimal
             fmt
@@ -4265,15 +4289,23 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
      (propagated-inputs
       (list msgpack-cxx                  ;included in several installed headers
             restinio                     ;included in opendht/http.h
-             ;; The following are listed in the Requires/Requires.private
-             ;; field of opendht.pc:
+             ;; The following are listed in the 'Requires.private' field of
+             ;; opendht.pc:
             argon2
             gnutls
             jsoncpp
-             liburing
+             llhttp
             nettle
             openssl                      ;required for the DHT proxy
-             simdutf))
+             python))
+      (native-inputs
+       (list autoconf
+             automake
+             pkg-config
+             python
+             python-cython
+             libtool
+             cppunit))
      (home-page "https://github.com/savoirfairelinux/opendht/")
      (synopsis "Lightweight Distributed Hash Table (DHT) library")
      (description "OpenDHT provides an easy to use distributed in-memory data
@@ -4303,12 +4335,12 @@ A very simple IM client working over the DHT.

 (define-public dhtnet
  ;; There is no tag nor release; use the latest available commit.
-  (let ((revision "6")
-        (commit "6dd5a5e3eb15cebafa212e134ce436705c6d5fc5"))
+  (let ((revision "5")
+        (commit "f925f5200539d4e1ee6176d828ae08a8a6c3890a"))
    (package
      (name "dhtnet")
      ;; The base version is taken from the CMakeLists.txt file (see:
-      ;; <https://github.com/savoirfairelinux/dhtnet/blob/master/CMakeLists.txt#L3>)
+      ;; https://review.jami.net/plugins/gitiles/dhtnet/+/master/CMakeLists.txt#3).
      (version (git-version "0.0.1" revision commit))
      (source (origin
                (method git-fetch)
@@ -4318,7 +4350,7 @@ A very simple IM client working over the DHT.
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0nj9zpsy68lxqgip48qnsxjw9m59bghn9aj3r7chmap23a4963z7"))))
+                  "1dkxs4w6k8ajn8ndy5gp4qg7yvl2z6jf72wxx71panvgy8lrc6y3"))))
      (outputs (list "out" "debug"))
      (build-system cmake-build-system)
      (arguments
@@ -4349,7 +4381,6 @@ A very simple IM client working over the DHT.
             fmt
             msgpack-cxx
             opendht
-             libnatpmp
             libupnp
             pjproject-jami
             readline
@@ -35,7 +35,7 @@
  ;; See doc/build/build.md.
  (package
    (name "onednn")
-    (version "3.10.2")
+    (version "3.9.2")
    (source
     (origin
       (method git-fetch)
@@ -44,7 +44,7 @@
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1imwsaj4sfsr4m6szhn272f7yikg0ixif4savbzyjdn1haz7pvpx"))
+        (base32 "0ybq8zb4dcd2g139gdq4bpv20v9jgws5d7ln3x4s0ydrmbgm2qwj"))
       (modules '((guix build utils)
                  (ice-9 rdelim)))
       ;; Copyright date used by code generation script
@@ -108,7 +108,7 @@ performance library of basic building blocks for deep learning applications.")
 (define-public onetbb
  (package
    (name "onetbb")
-    (version "2022.3.0")
+    (version "2022.2.0")
    (source
     (origin
       (method git-fetch)
@@ -118,7 +118,7 @@ performance library of basic building blocks for deep learning applications.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0ibwr5cw0zw5dfcdhavr5zbmwqqf7vnsai0gh4mqw475l7lcb08w"))
+         "04hjgc0yg0kdwr5qssl4y7hqv4wgcrlmblvbiaxqlyxrd400y901"))
       (patches (search-patches "onetbb-other-arches.patch"))))
    (build-system cmake-build-system)
    (arguments
@@ -1909,12 +1909,12 @@ environments.")
    (license (list license:gpl3+ license:agpl3+ license:silofl1.1))))

 (define-public gwl/next
-  (let ((commit "343a454a427ae049cc0ac5fc5d6de94ebe5d65d2")
-        (revision "0"))
+  (let ((commit "706a0895f639ed3ed77d0fe88382f51a6638b514")
+        (revision "1"))
    (package
      (inherit gwl)
      (name "gwl-next")
-      (version (git-version "0.5.1" revision commit))
+      (version (git-version "0.5.0" revision commit))
      (source (origin
                (method git-fetch)
                (uri (git-reference
@@ -1923,7 +1923,7 @@ environments.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq")))))))
+                  "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))

 (define-public guix-build-coordinator
  (let ((commit "88b0416678771f3e47901f184e11249ff9cce845")
@@ -2431,7 +2431,6 @@ the boot loader configuration.")
      #:configure-flags
      #~(list
         "-Dsystem_helper=disabled"
-         "-Dwayland_security_context=enabled"
         "-Dlocalstatedir=/var"
         (string-append "-Dsystem_bubblewrap="
                        (assoc-ref %build-inputs "bubblewrap")
@@ -2510,8 +2509,6 @@ cp -r /tmp/locale/*/en_US.*")))
           python
           python-pyparsing
           socat
-           wayland ; wayland-scanner
-           wayland-protocols
           which))
    (inputs
     (list appstream
@@ -2529,7 +2526,6 @@ cp -r /tmp/locale/*/en_US.*")))
           p11-kit
           polkit
           util-linux
-           wayland
           xdg-dbus-proxy
           zstd))
    (propagated-inputs (list glib-networking
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
@@ -73,7 +73,6 @@
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages readline)
  #:use-module (gnu packages serialization)
-  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages web))
@@ -81,7 +80,7 @@
 (define-public parallel
  (package
    (name "parallel")
-    (version "20251222")
+    (version "20251122")
    (outputs '("out" "doc"))
    (source
     (origin
@@ -89,7 +88,7 @@
      (uri (string-append "mirror://gnu/parallel/parallel-"
                          version ".tar.bz2"))
      (sha256
-       (base32 "0xf2j9jmjba7scjdlnk6n9p53ycakzkfkikhdzzssb0gva456sxm"))
+       (base32 "0kg8y450ydblbzwyvl9dmjadyncm37k4si0frnwfpnyrry11k39n"))
      (snippet
       '(begin
          (use-modules (guix build utils))
@@ -103,56 +102,43 @@
                       "src/parallel_cheat_bw.pdf")))))
    (build-system gnu-build-system)
    (arguments
-     (list
-      #:configure-flags
-      #~(list (string-append "--docdir=" #$output:doc "/share/doc/parallel"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-bin-sh
-            (lambda _
-              (for-each
-               (lambda (file)
-                 (substitute* file
-                   ;; Patch hard coded '/bin/sh' in the line ending in:
-                   ;; $Global::shell = $ENV{'PARALLEL_SHELL'} ||
-                   ;;  parent_shell($$) || $ENV{'SHELL'} || "/bin/sh";
-                   (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n"))))
-               (list "src/parallel" "src/sem"))))
-          (add-before 'install 'add-install-to-path
-            (lambda _
-              (setenv "PATH"
-                      (string-append (getenv "PATH") ":" #$output "/bin"))))
-          (add-after 'install 'wrap-program
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/parallel")
-                `("PATH" ":" prefix
-                  ,(map (lambda (input)
-                          (string-append (assoc-ref inputs input) "/bin"))
-                        '("perl" "procps"))))))
-          (add-after 'wrap-program 'post-install-test
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke (string-append #$output "/bin/parallel")
-                        "echo"
-                        ":::" "1" "2" "3"))))
-          (add-after 'post-install-test 'replace-texi-files
-            (lambda _
-              ;; Build info files.
-              (for-each
-               (lambda (file)
-                 (let ((info-file
-                        (string-append (car (string-split file #\.)) ".info")))
-                   (invoke "makeinfo" "--no-split" "-o" info-file file)
-                   (install-file info-file
-                                 (string-append #$output:doc "/share/info"))))
-               (find-files "src" "\\.texi$"))
-              ;; Remove texi files.
-              (for-each
-               delete-file
-               (find-files (string-append #$output:doc "/share/doc/parallel")
-                           "\\.texi$")))))))
+     `(#:configure-flags
+       (list (string-append "--docdir=" (assoc-ref %outputs "doc")
+                             "/share/doc/parallel"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (for-each
+              (lambda (file)
+                (substitute* file
+                  ;; Patch hard coded '/bin/sh' in the line ending in:
+                  ;; $Global::shell = $ENV{'PARALLEL_SHELL'} ||
+                  ;;  parent_shell($$) || $ENV{'SHELL'} || "/bin/sh";
+                  (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n"))))
+              (list "src/parallel" "src/sem"))))
+         (add-before 'install 'add-install-to-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (setenv "PATH" (string-append (getenv "PATH") ":"
+                                           (assoc-ref outputs "out") "/bin"))))
+         (add-after 'install 'wrap-program
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/parallel")
+                 `("PATH" ":" prefix
+                   ,(map (lambda (input)
+                           (string-append (assoc-ref inputs input) "/bin"))
+                         '("perl"
+                           "procps")))))))
+         (add-after 'wrap-program 'post-install-test
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (invoke (string-append
+                        (assoc-ref outputs "out") "/bin/parallel")
+                       "echo"
+                       ":::" "1" "2" "3")))))))
    (native-inputs
-     (list perl pod2pdf texinfo))
+     (list perl pod2pdf))
    (inputs
     (list bash-minimal perl procps))
    (home-page "https://www.gnu.org/software/parallel/")
@@ -194,7 +180,7 @@ execution is also possible.")
 (define-public xjobs
  (package
    (name "xjobs")
-    (version "20250529")
+    (version "20200726")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -202,11 +188,11 @@ execution is also possible.")
                    version ".tgz"))
              (sha256
               (base32
-                "13hkaipl3cgr9cvama34b442n35ckr42p1f24kygkrad3ymy87hx"))))
+                "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3"))))
    (build-system gnu-build-system)
    (arguments `(#:tests? #f)) ;; No tests
    (native-inputs
-     (list flex))
+     (list flex which))
    (home-page "https://www.maier-komor.de/xjobs.html")
    (properties `((release-monitoring-url . ,home-page)))
    (synopsis
@@ -256,8 +242,8 @@ when jobs finish.")
             `(,hwloc-2 "lib")
             json-c
             linux-pam)
-       (if (supported-package? openpmix-4)
-           (list openpmix-4)
+       (if (supported-package? openpmix)
+           (list openpmix)
           '())
       (list munge
             numactl
@@ -369,9 +355,7 @@ minimal slurm package BASE-SLURM."
                    version ".tar.bz2"))
              (sha256
               (base32
-                "130pjygqk794dchknjqdsinciv2b7c7r5agqsgca7m804xp09wnl"))))
-    (inputs (modify-inputs (package-inputs slurm-minimal)
-              (replace "openpmix" openpmix)))))   ;use version 6.0.0
+                "130pjygqk794dchknjqdsinciv2b7c7r5agqsgca7m804xp09wnl"))))))

 (define-public slurm-25.05 (make-slurm slurm-minimal-25.05))

@@ -562,41 +546,39 @@ supercomputer (via, e.g., MPI or JobLib).")
    (license license:expat)))

 (define-public python-slurm-magic
-  (let ((commit "4c708cc137cb9f4bd5b44cf26837b466d9bf7b65")
+  (let ((commit "73dd1a2b85799f7dae4b3f1cd9027536eff0c4d7")
        (revision "0"))
    (package
      (name "python-slurm-magic")
-      (version (git-version "0.0.0" revision commit))
+      (version (git-version "0.0" revision commit))
      (home-page "https://github.com/NERSC/slurm-magic")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url home-page)
-               (commit commit)))
-         (sha256
-          (base32 "0s69bmiskc6i9x98z6nf9jyi0jc51jpr5599f9b2f2jznz5wr64v"))
-         (file-name (git-file-name name version))))
-      (build-system pyproject-build-system)
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page)
+                                    (commit commit)))
+                (sha256
+                 (base32
+                  "19pp2vs0wm8mx0arz9n6lw9wgyv70w9wyi4y6b91qc5j3bz5igfs"))
+                (file-name (git-file-name name version))))
+      (build-system python-build-system)
      (arguments
-       (list
-        #:tests? #f                     ; No tests.
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-before 'build 'set-slurm-path
-              (lambda* (#:key inputs #:allow-other-keys)
-                ;; The '_execute' method tries to exec 'salloc'
-                ;; etc. from $PATH.  Record the absolute file name
-                ;; instead.
-                (let ((slurm-bin (dirname
-                                  (search-input-file inputs "/bin/sinfo"))))
-                  (substitute* "slurm_magic.py"
-                    (("name = (.*)$" _ value)
-                     (string-append "name = \"" slurm-bin "/\" + "
-                                    value "\n")))))))))
-      (native-inputs (list python-setuptools))
-      (inputs (list slurm))
-      (propagated-inputs (list python-ipython python-pandas))
+       '(#:phases (modify-phases %standard-phases
+                    (add-before 'build 'set-slurm-path
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        ;; The '_execute' method tries to exec 'salloc'
+                        ;; etc. from $PATH.  Record the absolute file name
+                        ;; instead.
+                        (let ((slurm (assoc-ref inputs "slurm")))
+                          (substitute* "slurm_magic.py"
+                            (("name = (.*)$" _ value)
+                             (string-append "name = \""
+                                            slurm "/bin/\" + "
+                                            value "\n")))
+                          #t))))))
+      (inputs
+       (list slurm))
+      (propagated-inputs
+       (list python-ipython python-pandas))
      (synopsis "Control the SLURM batch scheduler from Jupyter Notebook")
      (description
       "This package implements Jupyter/IPython
@@ -641,11 +623,12 @@ features.")

 (define-public cpuinfo
  ;; There's currently no tag on this repo.
-  (let ((revision "6")
-        (commit "b3b25967b5b80406304d575321e572c5f9e5e3c4"))
+  (let ((version "0.0")
+        (revision "5")
+        (commit "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea"))
    (package
      (name "cpuinfo")
-      (version (git-version "0.0" revision commit))
+      (version (git-version version revision commit))
      (home-page "https://github.com/pytorch/cpuinfo")
      (source (origin
                (method git-fetch)
@@ -653,7 +636,7 @@ features.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "02i4sf6bgw25xsaarbialw9n9plqxqblvh7pjz2sw6cvz1r5n6c6"))))
+                  "0ibba4jssvjyd147dyj5lzijgxhmjxf0ishl1wykka1rblmxmli4"))))
      (build-system cmake-build-system)
      (arguments
       (list
@@ -662,12 +645,18 @@ features.")
        #:tests? (not (or (target-aarch64?)
                          (target-riscv64?)))
        #:configure-flags
-        #~(list "-DBUILD_SHARED_LIBS=ON"
-                "-DUSE_SYSTEM_LIBS=ON")))
+        '(list "-DBUILD_SHARED_LIBS=ON"
+               "-DUSE_SYSTEM_LIBS=ON")
+        #:phases
+        '(modify-phases %standard-phases
+           (add-after 'unpack 'skip-bad-test
+             (lambda _
+               (substitute* "test/init.cc"
+                 (("TEST\\(CORE, known_uarch\\) \\{" m)
+                  (string-append m "\
+GTEST_SKIP() << \"See https://github.com/pytorch/cpuinfo/issues/132\";"))))))))
      (inputs
       (list googletest-1.13 googlebenchmark))
-      (native-inputs
-       (list python-wrapper))
      (synopsis "C/C++ library to obtain information about the CPU")
      (description
       "The cpuinfo library provides a C/C++ and a command-line interface to
@@ -734,7 +723,7 @@ single-instruction multiple-data (SIMD) intrinsics.")
 (define-public openpmix
  (package
    (name "openpmix")
-    (version "6.0.0")
+    (version "4.2.8")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -742,16 +731,18 @@ single-instruction multiple-data (SIMD) intrinsics.")
                    version "/pmix-" version ".tar.bz2"))
              (sha256
               (base32
-                "062k2agr311j06pavmrim1savmcv4f3c5jir4w1jxs0cdnb6ksdz"))
-              (modules '((guix build utils)))
+                "1j9xlhqrrmgjdkwakamn78y5gj756adi53hn25zksgr3is3l5d09"))
              (snippet
-               ;; Remove ~5 MiB of pre-built HTML doc.
-               #~(delete-file-recursively "docs/_build/html"))))
+               '(begin (use-modules (guix build utils))
+                       ;; Remove ~5 MiB of pre-built HTML doc.
+                       (delete-file-recursively "docs/_build/html")))))
    (build-system gnu-build-system)
    (arguments
     (list
      #:configure-flags
-      #~(list "--enable-python-bindings")         ;disabled by default
+      #~(list (string-append "--with-hwloc="
+                             (ungexp (this-package-input "hwloc") "lib"))
+              "--enable-python-bindings") ;disabled by default

      ;; Don't keep a reference to GCC.
      #:disallowed-references (and (not (%current-target-system))
@@ -791,29 +782,6 @@ commonly needed services in distributed and parallel computing systems.")
    ;; The provided license is kind of BSD-style but specific.
    (license (license:fsf-free "https://github.com/openpmix/openpmix?tab=License-1-ov-file#License-1-ov-file"))))

-(define-public openpmix-4
-  (package
-    (inherit openpmix)
-    (version "4.2.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/openpmix/openpmix/releases/download/v"
-                    version "/pmix-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1j9xlhqrrmgjdkwakamn78y5gj756adi53hn25zksgr3is3l5d09"))
-              (snippet
-               '(begin (use-modules (guix build utils))
-                       ;; Remove ~5 MiB of pre-built HTML doc.
-                       (delete-file-recursively "docs/_build/html")))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments openpmix)
-       ((#:configure-flags flags #~'())
-        #~(list (string-append "--with-hwloc="
-                               (ungexp (this-package-input "hwloc") "lib"))
-                "--enable-python-bindings"))))))
-
 (define-public prrte
  (package
   (name "prrte")
@@ -829,7 +797,10 @@ commonly needed services in distributed and parallel computing systems.")
   (build-system gnu-build-system)
   (arguments
    (list #:configure-flags
-          #~(list "--disable-static")
+          #~(list (string-append "--with-hwloc="
+                                 (assoc-ref %build-inputs "hwloc"))
+                  (string-append "--with-pmix="
+                                 #$(this-package-input "openpmix")))

          #:phases
          #~(modify-phases %standard-phases
@@ -849,28 +820,13 @@ commonly needed services in distributed and parallel computing systems.")
                  (substitute* "src/runtime/prte_mca_params.c"
                    (("prte_launch_agent =.*")
                     (string-append "prte_launch_agent = \""
-                                    #$output "/bin/prted\";\n")))))
-              (add-after 'install 'adjust-pcc-link
-                (lambda* (#:key inputs #:allow-other-keys)
-                  ;; Adjust the 'pcc' symlink to its points to 'pmixcc' using
-                  ;; its absolute file name instead of just 'pmixcc'.
-                  (let* ((pcc (string-append #$output "/bin/pcc"))
-                         (target (string-append "/bin/" (readlink pcc))))
-                    (delete-file pcc)
-                    (symlink (search-input-file inputs target)
-                             pcc)))))
+                                    #$output "/bin/prted\";\n"))))))

          #:disallowed-references (list (canonical-package gcc))))
   (inputs (list libevent
                 `(,hwloc "lib")
-                 openpmix
-                 libnl))
-   (native-inputs (list pkg-config perl))
-   (outputs '("out"
-
-              ;; Move ~5 MiB of HTML docs (including CSS, JS, and fonts!) to a
-              ;; separate output.
-              "doc"))
+                 openpmix))
+   (native-inputs (list perl))
   (synopsis "PMIx Reference RunTime Environment (PRRTE)")
   (description
    "The PMIx Reference RunTime Environment is a runtime environment
@@ -0,0 +1,42 @@
+Modified from upstream commit:
+https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326
+Fixes mpv argument syntax (support for old syntax removed in mpv 0.31):
+https://anki.tenderapp.com/discussions/ankidesktop/38186-mpvprocesserror-unable-to-start-process
+Necessary because we are currently unable to upgrade anki to the
+latest version in guix (NPM dependencies currently unpackaged).
+---
+ anki/mpv.py   | 4 ++--
+ anki/sound.py | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/anki/mpv.py b/anki/mpv.py
+index f53d9d0..563fddc 100644
+--- a/anki/mpv.py
+++ b/anki/mpv.py
+@@ -104,9 +104,9 @@ class MPVBase:
+         """
+         self.argv = [self.executable]
+         self.argv += self.default_argv
+-        self.argv += ["--input-ipc-server", self._sock_filename]
+        self.argv += ["--input-ipc-server="+self._sock_filename]
+         if self.window_id is not None:
+-            self.argv += ["--wid", str(self.window_id)]
+            self.argv += ["--wid="+str(self.window_id)]
+ 
+     def _start_process(self):
+         """Start the mpv process.
+diff --git a/anki/sound.py b/anki/sound.py
+index aa3431b..a5fce44 100644
+--- a/anki/sound.py
+++ b/anki/sound.py
+@@ -124,7 +124,6 @@ class MpvManager(MPV):
+ def setMpvConfigBase(base):
+     mpvConfPath = os.path.join(base, "mpv.conf")
+     MpvManager.default_argv += [
+-        "--no-config",
+         "--include="+mpvConfPath,
+     ]
+ 
+-- 
+2.25.1
+
@@ -1,32 +0,0 @@
-From 91e2c9b8fd5f7a1b0e57ad1310534606ce70c338 Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael@michaelcho.dev>
-Date: Sun, 13 Apr 2025 10:37:29 -0400
-Subject: [PATCH] Fix building with Boost 1.88
-
---
- src/cpp-utils/process/subprocess.cpp | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/cpp-utils/process/subprocess.cpp b/src/cpp-utils/process/subprocess.cpp
-index 479bfe876..396ae09ec 100644
--- a/src/cpp-utils/process/subprocess.cpp
-+++ b/src/cpp-utils/process/subprocess.cpp
-@@ -1,7 +1,18 @@
- #include "subprocess.h"
- #include <array>
- #include <boost/asio.hpp>
-+#include <boost/version.hpp>
-+#if BOOST_VERSION < 108800
- #include <boost/process.hpp>
-+#else
-+#define BOOST_PROCESS_VERSION 1
-+#include <boost/process/v1/args.hpp>
-+#include <boost/process/v1/async_pipe.hpp>
-+#include <boost/process/v1/child.hpp>
-+#include <boost/process/v1/exe.hpp>
-+#include <boost/process/v1/io.hpp>
-+#include <boost/process/v1/search_path.hpp>
-+#endif
- #include <cerrno>
- #include <cstddef>
- #include <cstdio>
@@ -1,22 +0,0 @@
-From f2f3c19979545c4789647e648cc1480ce647f42a Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael@michaelcho.dev>
-Date: Tue, 12 Aug 2025 17:01:01 -0400
-Subject: [PATCH] Fix build with Boost 1.89.0
-
---
- cmake-utils/Dependencies.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake-utils/Dependencies.cmake b/cmake-utils/Dependencies.cmake
-index e2325e575..55edf924a 100644
--- a/cmake-utils/Dependencies.cmake
-+++ b/cmake-utils/Dependencies.cmake
-@@ -7,7 +7,7 @@ target_link_libraries(CryfsDependencies_range-v3 INTERFACE range-v3::range-v3)
- set(Boost_USE_STATIC_LIBS OFF)
- find_package(Boost 1.84.0
-         REQUIRED
-        COMPONENTS filesystem system thread chrono program_options)
-+        COMPONENTS filesystem thread chrono program_options)
- add_library(CryfsDependencies_boost INTERFACE)
- target_link_libraries(CryfsDependencies_boost INTERFACE Boost::boost Boost::filesystem Boost::thread Boost::chrono Boost::program_options)
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -1,252 +0,0 @@
-Upstream-status: https://github.com/dalanicolai/doc-tools-toc/pull/4
-
-diff --git a/doc-toc.el b/doc-toc.el
-index 8b7057c..64eca03 100644
--- a/doc-toc.el
-+++ b/doc-toc.el
-@@ -216,6 +216,7 @@
- (defvar pdf-filename)
- 
- (declare-function pdf-cache-get-image "pdf-cache")
-+(declare-function pdf-view-active-region-text "pdf-view")
- (declare-function pdf-view-goto-page "pdf-view")
- (declare-function pdf-view-next-page "pdf-view")
- (declare-function pdf-view-previous-page "pdf-view")
-@@ -262,39 +263,60 @@ URL`http://handyoutlinerfo.sourceforge.net/'."
- String (i.e. surround with double quotes)."
-   :type 'file)
- 
-+(defvar doc-toc--ddjvu-program (executable-find "ddjvu"))
-+(defvar doc-toc--djvused-program (executable-find "djvused"))
-+(defvar doc-toc--djvutxt-program (executable-find "djvutxt"))
-+(defvar doc-toc--mutool-program (executable-find "mutool"))
-+(defvar doc-toc--pdfoutline-program (executable-find "pdfoutline"))
-+(defvar doc-toc--pdftocgen-program (executable-find "pdftocgen"))
-+(defvar doc-toc--pdftocio-program (executable-find "pdftocio"))
-+(defvar doc-toc--pdftotext-program (executable-find "pdftotext"))
-+(defvar doc-toc--pdfxmeta-program (executable-find "pdfxmeta"))
-+(defvar doc-toc--tesseract-program (executable-find "tesseract"))
-+
-+(defun doc-toc--process-to-string (program &rest args)
-+  "Return the output of running PROGRAM with ARGS.
-+
-+Like `shell-command-to-string', but PROGRAM and ARGS are provided as
-+separate strings rather than a single space-separated, escaped string."
-+  (with-temp-buffer
-+         (apply #'call-process
-+                program
-+                nil
-+                (list (current-buffer) nil)
-+                nil
-+                args)
-+         (buffer-string)))
-+
- ;;;; pdf.tocgen
- ;;;###autoload
- (defun doc-toc-gen-set-level (level)
-  "Define the text properties of the heading level.
-In a pdf-view buffer select a single word in the headline of a
-certain level. Then run `doc-toc-gen-set-level' to write the text
-+  "define the text properties of the heading level.
-+in a pdf-view buffer select a single word in the headline of a
-+certain level. then run `doc-toc-gen-set-level' to write the text
- properties to the recipe.toml file that is created in the
-document's directory. You will be prompted to enter the LEVEL
-number. The highest level should have number 1, the next level
-+document's directory. you will be prompted to enter the level
-+number. the highest level should have number 1, the next level
- number 2 etc."
-  (interactive "nWhich level you are setting (number): ")
-+  (interactive "nwhich level you are setting (number): ")
-   (let* ((page (pdf-view-current-page))
-          (filename (url-filename (url-generic-parse-url buffer-file-name)))
-         (pdfxmeta-result (shell-command
-                           (format "pdfxmeta --auto %s --page %s %s \"%s\" >> recipe.toml"
-                                   level
-                                   page
-                                   (shell-quote-argument filename)
-                                   (car (pdf-view-active-region-text))))))
-         ;; (pdfxmeta-result (call-process "pdfxmeta" nil "recipe.toml" nil
-         ;;                                "--auto" (number-to-string level)
-         ;;                                "--page" (number-to-string page)
-         ;;                                (shell-quote-argument filename)
-         ;;                                (concat "\"" (car (pdf-view-active-region-text)) "\""))))
-+         (pdfxmeta-result (call-process doc-toc--pdfxmeta-program nil "recipe.toml" nil
-+                                        "--auto" (number-to-string level)
-+                                        "--page" (number-to-string page)
-+                                        (shell-quote-argument filename)
-+                                        (concat "\"" (car (pdf-view-active-region-text)) "\""))))
-     (when (eq pdfxmeta-result 1)
-      (let ((page-text (shell-command-to-string
-                        (format "mutool draw -F text %s %s"
-                                (shell-quote-argument filename)
-                                page
-                                ))))
-+      (let ((page-text (doc-toc--process-to-string
-+                        doc-toc--mutool-program
-+                        "draw"
-+                        "-f"
-+                        "text"
-+                        filename
-+                        page)))
-         (pop-to-buffer "page-text")
-         (insert
-         "COULD NOT SET HEADING LEVEL. MUPDF EXTRACTED FOLLOWING PAGE TEXT FROM PAGE:\n")
-+         "could not set heading level. mupdf extracted following page text from page:\n")
-         (add-text-properties 1 (point) '(face font-lock-warning-face))
-         (let ((beg (point)))
-           (insert "(try to select partial word)\n\n")
-@@ -312,8 +334,11 @@ be used after the headline text properties have been defined with
- the function `doc-toc-gen-set-level'"
-   (interactive)
-   (let ((filename buffer-file-name)
-        (toc (shell-command-to-string
-              (format "pdftocgen %s < recipe.toml" (shell-quote-argument buffer-file-name)))))
-+        (toc (doc-toc--process-to-string
-+              doc-toc--pdftocgen-program
-+              buffer-file-name
-+              "-r"
-+              "recipe.toml")))
-     (switch-to-buffer "toc")
-     (doc-toc-pdftocgen-mode) ;; required before setting local variable
-     (when (fboundp 'flyspell-mode)
-@@ -328,7 +353,8 @@ named output.pdf and opened in a new buffer. Don't forget to
- rename this new file."
-   (interactive)
-   (let* ((output-buf (get-buffer-create "*pdftocio-output*")))
-    (call-process-region (point-min) (point-max) "pdftocio"
-+    (call-process-region (point-min) (point-max)
-+                         doc-toc--pdftocio-program
-                          nil output-buf nil pdf-filename)
-     (kill-buffer-if-not-modified (find-file pdf-filename))
-     (when (file-exists-p (concat (file-name-base pdf-filename) "_out.pdf"))
-@@ -483,14 +509,19 @@ ARG (\\[universal-argument]) to enter different separators."
-          (default-process-coding-system
-            (cond ((string= ".pdf" ext)'(windows-1252-unix . utf-8-unix))
-                  ((string= ".djvu" ext) '(utf-8-unix . utf-8-unix))))
-         (shell-command (cond ((string= ".pdf" ext) "pdftotext -f %s -l %s -layout %s -")
-                              ((string= ".djvu" ext) "djvutxt --page=%s-%s %s")
-                              (t (error "Buffer-filename does not have pdf or djvu extension"))))
-         (text (shell-command-to-string
-                (format shell-command
-                        startpage
-                        endpage
-                        (shell-quote-argument buffer-file-name))))
-+         (text (cond ((string= ".pdf" ext)
-+                      (doc-toc--process-to-string
-+                       doc-toc--pdftotext-program
-+                       "-f" startpage
-+                       "-l" endpage
-+                       "-layout" buffer-file-name
-+                       "-"))
-+                     ((string= ".djvu" ext)
-+                      (doc-toc--process-to-string
-+                       doc-toc--djvutxt-program
-+                       (format "--page=%s-%s" startpage endpage)
-+                        buffer-file-name))
-+                     (t (error "Buffer-filename does not have pdf or djvu extension"))))
-          (buffer (get-buffer-create (file-name-sans-extension (buffer-name)))))
-     (switch-to-buffer buffer)
-     (doc-toc-cleanup-mode) ;; required before setting local variable
-@@ -522,7 +553,8 @@ For use in `doc-toc-ocr-languages'."
-   (let ((print-length nil))
-     (message (format "%s" (seq-subseq
-                          (split-string
-                          (shell-command-to-string "tesseract --list-langs"))
-+                          (doc-toc--process-to-string doc-toc--tesseract-program
-+                                                      "--list-langs"))
-                          5)))))
- 
- ;;;###autoload
-@@ -557,7 +589,8 @@ unprocessed text."
-                               ((string= ".djvu" ext)
-                                ;; new code for djvu3
-                                (let ((outfile (format "/tmp/pageimagep%s" page)))
-                                 (shell-command (format "ddjvu -page=%s '%s' %s"
-+                                 (shell-command (format "%s -page=%s '%s' %s"
-+                                                        doc-toc--ddjvu-program
-                                                         page
-                                                         buffer-file-name
-                                                         outfile))
-@@ -569,8 +602,12 @@ unprocessed text."
-               ;;                 (number-to-string page)
-               ;;                 (image-property djvu-doc-image :data))))))
-               (apply #'call-process
-                     (append (list "tesseract" nil (list buffer nil) nil file)
-                             args))
-+                     doc-toc--tesseract-program
-+                     nil
-+                     (list buffer nil)
-+                     nil
-+                     file
-+                     args)
-               (setq page (1+ page))))
-           (switch-to-buffer buffer)
-           (doc-toc-cleanup-mode) ;; required before setting local variable
-@@ -587,14 +624,20 @@ unprocessed text."
-   (interactive)
-   (let* ((source-buffer (current-buffer))
-          (ext (url-file-extension (buffer-file-name (current-buffer))))
-         (shell-command (cond ((string= ".pdf" ext) (if (executable-find "mutool")
-                                                        "mutool show %s outline"
-                                                      "mutool command is not found"))
-                              ((string= ".djvu" ext) "djvused -e 'print-outline' %s")
-                              (t (error "Buffer-filename does not have pdf or djvu extension"))))
-         (text (shell-command-to-string
-                (format shell-command
-                        (shell-quote-argument buffer-file-name))))
-+         
-+         (text (cond ((string= ".pdf" ext)
-+                      (unless doc-toc--mutool-program
-+                        (error "Command mutool is not found"))
-+                      (doc-toc--process-to-string doc-toc--mutool-program
-+                                                  "show"
-+                                                  buffer-file-name
-+                                                  "outline"))
-+                     ((string= ".djvu" ext)
-+                      (doc-toc--process-to-string doc-toc--djvused-program
-+                                                  "-e"
-+                                                  "print-outline"
-+                                                  buffer-file-name))
-+                     (t (error "Buffer-filename does not have pdf or djvu extension"))))
-          (buffer (get-buffer-create (concat (file-name-sans-extension (buffer-name)) ".txt"))))
-     (switch-to-buffer buffer)
-     (setq-local doc-buffer source-buffer)
-@@ -628,7 +671,7 @@ Prompt for startpage and endpage and print OCR output to new buffer."
-                                                nil
-                                                (number-to-string page)
-                                                (image-property djvu-doc-image :data))))))
-              (apply #'call-process "tesseract" nil (list buffer nil) nil
-+              (apply #'call-process doc-toc--tesseract-program nil (list buffer nil) nil
-                      file args)
-               (setq page (1+ page))))
-           (switch-to-buffer buffer)))))
-@@ -992,7 +1035,7 @@ to `pdfoutline' shell command."
- This command uses the shell program `pdfoutline'."
-   (interactive)
-   (save-buffer)
-  (call-process "pdfoutline" nil "*pdfoutline*" nil
-+  (call-process doc-toc--pdfoutline-program nil "*pdfoutline*" nil
-                 (concat (file-name-sans-extension (buffer-name)) ".pdf")
-                 (buffer-name)
-                 (if doc-toc-replace-original-file
-@@ -1009,12 +1052,13 @@ This command uses the shell program `djvused'."
-           (buffer-name)
-           (shell-quote-argument
-            (concat (file-name-sans-extension (buffer-name)) ".djvu"))))
-  (shell-command-to-string
-                  (format
-                   "djvused -s -e \"set-outline '%s'\" %s"
-                   (buffer-name)
-                   (shell-quote-argument
-                    (concat (file-name-sans-extension (buffer-name)) ".djvu")))))
-+  (doc-toc--process-to-string
-+   doc-toc--djvused-program
-+   "-s"
-+   "-e"
-+   (format "set-outline '%s'"
-+           (buffer-name)) ;; TODO: maybe escape?
-+   (concat (file-name-sans-extension (buffer-name)) ".djvu")))
- 
- 
- (defun doc-toc--add-to-doc ()
@@ -0,0 +1,21 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Date: 2025-07-17
+License: Apache Software License 2.0
+
+diff -ru orig/FreeRDP/cmake/ConfigureRPATH.cmake FreeRDP/cmake/ConfigureRPATH.cmake
+--- orig/FreeRDP/cmake/ConfigureRPATH.cmake	2025-07-17 10:42:17.557667810 +0200
+++ FreeRDP/cmake/ConfigureRPATH.cmake	2025-07-17 11:32:13.692935801 +0200
+@@ -15,10 +15,10 @@
+     option(WITH_ADD_PLUGIN_TO_RPATH "Add extension and plugin path to RPATH" OFF)
+     if(WITH_ADD_PLUGIN_TO_RPATH)
+       set(CFG_INSTALL_RPATH
+-          "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/.."
+          "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../.."
+       )
+     else()
+-      set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
+      set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../..")
+     endif()
+   endif()
+ endif(APPLE)
+Only in FreeRDP/: LIBS
@@ -0,0 +1,16 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Date: Sun Dec 21 04:41:14 AM CET 2025
+Subject: Fail the entire build on error.
+
+--- a/src/mx/_impl/mx.py	2025-12-19 20:15:23.140244258 +0000
+++ b/src/mx/_impl/mx.py	2025-12-19 20:15:23.142739235 +0000
+@@ -15181,6 +15181,9 @@
+             joinTasks()
+         showProgress()
+ 
+        if len(failed) > 0:
+            abort(f'{len(failed)} build tasks failed')
+
+         def dump_task_stats(f):
+             """
+             Dump task statistics CSV. Use R with following commands for visualization:
@@ -0,0 +1,24 @@
+Fibers 1.0.0 has a bug in run-fibers in which peer schedulers aren't destroyed -
+so if you had 4 cores, 1 would be destroyed when run-fibers returned, but the
+other 3 would stay around.  Each scheduler uses 3 file descriptors, so for
+machines with many cores, this resource leak adds up quickly - quickly enough
+that the test suite can even fail because of it.
+
+See https://github.com/wingo/fibers/issues/36.
+
+This fixes that.  It should be safe to destroy the peer schedulers at the given
+point because the threads that could be running them are all either dead or the
+current thread.
+
+As of May 21, 2020, this bug still existed in the 1.0.0 (latest) release and in
+git master.
+--- a/fibers.scm	2020-05-21 18:38:06.890690154 -0500
+++ b/fibers.scm	2020-05-21 18:38:56.395686693 -0500
+@@ -137,5 +137,6 @@
+              (%run-fibers scheduler hz finished? affinity))
+            (lambda ()
+              (stop-auxiliary-threads scheduler)))))
+      (for-each destroy-scheduler (scheduler-remote-peers scheduler))
+       (destroy-scheduler scheduler)
+       (apply values (atomic-box-ref ret))))))
+
@@ -1,165 +0,0 @@
-Retrieved from <https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/intl/icu-patches/bug-1856290-ICU-20548-dateinterval-timezone.diff>
-
-# Handle 'O' time zone skeleton in DateIntervalFormat.
-# Keep time zone skeleton field widths in DateIntervalFormat.
-#
-# ICU bug: https://unicode-org.atlassian.net/browse/ICU-20548
-
-diff --git a/source/i18n/dtitv_impl.h b/source/i18n/dtitv_impl.h
--- a/source/i18n/dtitv_impl.h
-+++ b/source/i18n/dtitv_impl.h
-@@ -84,16 +84,19 @@
- #define CAP_W             ((char16_t)0x0057)
- #define CAP_Y             ((char16_t)0x0059)
- #define CAP_Z             ((char16_t)0x005A)
- 
- //#define MINIMUM_SUPPORTED_CALENDAR_FIELD    UCAL_MINUTE
- 
- #define MAX_E_COUNT      5
- #define MAX_M_COUNT      5
-+#define MAX_z_COUNT      4
-+#define MAX_v_COUNT      4
-+#define MAX_O_COUNT      4
- //#define MAX_INTERVAL_INDEX 4
- #define MAX_POSITIVE_INT  56632
- 
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
- 
- #endif 
- //eof
-diff --git a/source/i18n/dtitvfmt.cpp b/source/i18n/dtitvfmt.cpp
--- a/source/i18n/dtitvfmt.cpp
-+++ b/source/i18n/dtitvfmt.cpp
-@@ -1061,16 +1061,17 @@ DateIntervalFormat::getDateTimeSkeleton(
-     // timeSkeleton follows the sequence of hm*[v|z]?
-     int32_t ECount = 0;
-     int32_t dCount = 0;
-     int32_t MCount = 0;
-     int32_t yCount = 0;
-     int32_t mCount = 0;
-     int32_t vCount = 0;
-     int32_t zCount = 0;
-+    int32_t OCount = 0;
-     char16_t hourChar = u'\0';
-     int32_t i;
- 
-     for (i = 0; i < skeleton.length(); ++i) {
-         char16_t ch = skeleton[i];
-         switch ( ch ) {
-           case CAP_E:
-             dateSkeleton.append(ch);
-@@ -1123,16 +1124,20 @@ DateIntervalFormat::getDateTimeSkeleton(
-           case LOW_Z:
-             ++zCount;
-             timeSkeleton.append(ch);
-             break;
-           case LOW_V:
-             ++vCount;
-             timeSkeleton.append(ch);
-             break;
-+          case CAP_O:
-+            ++OCount;
-+            timeSkeleton.append(ch);
-+            break;
-           case LOW_A:
-           case CAP_V:
-           case CAP_Z:
-           case LOW_J:
-           case LOW_S:
-           case CAP_S:
-           case CAP_A:
-           case LOW_B:
-@@ -1174,20 +1179,41 @@ DateIntervalFormat::getDateTimeSkeleton(
-     /* generate normalized form for time */
-     if ( hourChar != u'\0' ) {
-         normalizedTimeSkeleton.append(hourChar);
-     }
-     if ( mCount != 0 ) {
-         normalizedTimeSkeleton.append(LOW_M);
-     }
-     if ( zCount != 0 ) {
-        normalizedTimeSkeleton.append(LOW_Z);
-+        if ( zCount <= 3 ) {
-+            normalizedTimeSkeleton.append(LOW_Z);
-+        } else {
-+            for ( int32_t j = 0; j < zCount && j < MAX_z_COUNT; ++j ) {
-+                 normalizedTimeSkeleton.append(LOW_Z);
-+            }
-+        }
-     }
-     if ( vCount != 0 ) {
-        normalizedTimeSkeleton.append(LOW_V);
-+        if ( vCount <= 3 ) {
-+            normalizedTimeSkeleton.append(LOW_V);
-+        } else {
-+            for ( int32_t j = 0; j < vCount && j < MAX_v_COUNT; ++j ) {
-+                 normalizedTimeSkeleton.append(LOW_V);
-+            }
-+        }
-+    }
-+    if ( OCount != 0 ) {
-+        if ( OCount <= 3 ) {
-+            normalizedTimeSkeleton.append(CAP_O);
-+        } else {
-+            for ( int32_t j = 0; j < OCount && j < MAX_O_COUNT; ++j ) {
-+                 normalizedTimeSkeleton.append(CAP_O);
-+            }
-+        }
-     }
- }
- 
- 
- /**
-  * Generate date or time interval pattern from resource,
-  * and set them into the interval pattern locale to this formatter.
-  *
-@@ -1732,18 +1758,23 @@ DateIntervalFormat::adjustFieldWidth(con
-         findReplaceInPattern(adjustedPtn, UnicodeString(u"a\u202F",-1), UnicodeString());
-         findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString());
-         // adjust interior double spaces, remove exterior whitespace
-         findReplaceInPattern(adjustedPtn, UnicodeString("  "), UnicodeString(" "));
-         adjustedPtn.trim();
-     }
-     if ( differenceInfo == 2 ) {
-         if (inputSkeleton.indexOf(LOW_Z) != -1) {
-+             bestMatchSkeletonFieldWidth[(int)(LOW_Z - PATTERN_CHAR_BASE)] = bestMatchSkeletonFieldWidth[(int)(LOW_V - PATTERN_CHAR_BASE)];
-              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_V), UnicodeString(LOW_Z));
-          }
-+         if (inputSkeleton.indexOf(CAP_O) != -1) {
-+             bestMatchSkeletonFieldWidth[(int)(CAP_O - PATTERN_CHAR_BASE)] = bestMatchSkeletonFieldWidth[(int)(LOW_V - PATTERN_CHAR_BASE)];
-+             findReplaceInPattern(adjustedPtn, UnicodeString(LOW_V), UnicodeString(CAP_O));
-+         }
-          if (inputSkeleton.indexOf(CAP_K) != -1) {
-              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_H), UnicodeString(CAP_K));
-          }
-          if (inputSkeleton.indexOf(LOW_K) != -1) {
-              findReplaceInPattern(adjustedPtn, UnicodeString(CAP_H), UnicodeString(LOW_K));
-          }
-          if (inputSkeleton.indexOf(LOW_B) != -1) {
-              findReplaceInPattern(adjustedPtn, UnicodeString(LOW_A), UnicodeString(LOW_B));
-diff --git a/source/i18n/dtitvinf.cpp b/source/i18n/dtitvinf.cpp
--- a/source/i18n/dtitvinf.cpp
-+++ b/source/i18n/dtitvinf.cpp
-@@ -582,19 +582,20 @@ DateIntervalInfo::getBestSkeleton(const 
- 
-     // hack for certain alternate characters
-     // resource bundles only have time skeletons containing 'v', 'h', and 'H'
-     // but not time skeletons containing 'z', 'K', or 'k'
-     // the skeleton may also include 'a' or 'b', which never occur in the resource bundles, so strip them out too
-     UBool replacedAlternateChars = false;
-     const UnicodeString* inputSkeleton = &skeleton;
-     UnicodeString copySkeleton;
-    if ( skeleton.indexOf(LOW_Z) != -1 || skeleton.indexOf(LOW_K) != -1 || skeleton.indexOf(CAP_K) != -1 || skeleton.indexOf(LOW_A) != -1 || skeleton.indexOf(LOW_B) != -1 ) {
-+    if ( skeleton.indexOf(LOW_Z) != -1 || skeleton.indexOf(CAP_O) != -1 || skeleton.indexOf(LOW_K) != -1 || skeleton.indexOf(CAP_K) != -1 || skeleton.indexOf(LOW_A) != -1 || skeleton.indexOf(LOW_B) != -1 ) {
-         copySkeleton = skeleton;
-         copySkeleton.findAndReplace(UnicodeString(LOW_Z), UnicodeString(LOW_V));
-+        copySkeleton.findAndReplace(UnicodeString(CAP_O), UnicodeString(LOW_V));
-         copySkeleton.findAndReplace(UnicodeString(LOW_K), UnicodeString(CAP_H));
-         copySkeleton.findAndReplace(UnicodeString(CAP_K), UnicodeString(LOW_H));
-         copySkeleton.findAndReplace(UnicodeString(LOW_A), UnicodeString());
-         copySkeleton.findAndReplace(UnicodeString(LOW_B), UnicodeString());
-         inputSkeleton = &copySkeleton;
-         replacedAlternateChars = true;
-     }
- 
@@ -1,30 +0,0 @@
-Retrieved from: <https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff>
-
-diff --git a/source/i18n/vtzone.cpp b/source/i18n/vtzone.cpp
--- a/source/i18n/vtzone.cpp
-+++ b/source/i18n/vtzone.cpp
-@@ -1735,14 +1735,17 @@ VTimeZone::write(VTZWriter& writer, UErr
-             }
-         }
-     } else {
-        UnicodeString icutzprop;
-        UVector customProps(nullptr, uhash_compareUnicodeString, status);
-+        UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
-         if (olsonzid.length() > 0 && icutzver.length() > 0) {
-            icutzprop.append(olsonzid);
-            icutzprop.append(u'[');
-            icutzprop.append(icutzver);
-            icutzprop.append(u']');
-            customProps.addElement(&icutzprop, status);
-+            LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
-+            if (U_FAILURE(status)) {
-+                return;
-+            }
-+            icutzprop->append(olsonzid);
-+            icutzprop->append(u'[');
-+            icutzprop->append(icutzver);
-+            icutzprop->append(u']');
-+            customProps.adoptElement(icutzprop.orphan(), status);
-         }
-         writeZone(writer, *tz, &customProps, status);
-     }
--- a/Show More
+++ b/Show More