gnu: gnu-make-mesboot0: Downgrade to 3.80.

* gnu/packages/commencement.scm (gnu-make-mesboot0): Downgrade to 3.80. Change-Id: I00b1f6ac934b573bf7845d78e8d4ac78dcd1d0f6
WIP: use musl path to build hello-mesboot
2026-03-02 09:29:46 +02:00 · 2026-02-16 10:22:51 +02:00 · 2026-02-16 10:20:39 +02:00 · 2026-02-16 10:17:51 +02:00 · 2026-02-16 10:16:41 +02:00 · 2026-02-16 09:08:43 +01:00
143 changed files with 16071 additions and 45045 deletions
@@ -23,7 +23,6 @@ guix/scripts/import/hexpm\.scm                     @guix/beam

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

-gnu/packages/bootstrap\.scm                        @guix/bootstrap
 gnu/packages/commencement\.scm                     @guix/bootstrap
 gnu/packages/mes\.scm                              @guix/bootstrap

@@ -35,7 +34,6 @@ gnu/packages/cpp\.scm                              @guix/cpp
 gnu/packages/ninja\.scm                            @guix/cpp
 gnu/packages/valgrind\.scm                         @guix/cpp

-etc/teams\.scm                                     @guix/core
 guix/avahi\.scm                                    @guix/core
 guix/base16\.scm                                   @guix/core
 guix/base32\.scm                                   @guix/core
@@ -96,7 +94,6 @@ guix/quirks\.scm                                   @guix/core
 guix/read-print\.scm                               @guix/core
 guix/records\.scm                                  @guix/core
 guix/remote\.scm                                   @guix/core
-guix/remote-procedures\.scm                        @guix/core
 guix/repl\.scm                                     @guix/core
 guix/search-paths\.scm                             @guix/core
 guix/self\.scm                                     @guix/core
@@ -133,7 +130,6 @@ guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages

 gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
-gnu/packages/cryptsetup\.scm                       @guix/crypto
 gnu/packages/gnupg\.scm                            @guix/crypto
 gnu/packages/nettle\.scm                           @guix/crypto
 gnu/packages/password-utils\.scm                   @guix/crypto
@@ -200,12 +196,6 @@ guix/import/go\.scm                                @guix/go
 guix/scripts/import/go\.scm                        @guix/go
 tests/import/go\.scm                               @guix/go

-gnu/packages/guile\.scm                            @guix/guile
-gnu/packages/guile-wm\.scm                         @guix/guile
-gnu/packages/guile-xyz\.scm                        @guix/guile
-guix/build-system/guile\.scm                       @guix/guile
-guix/build/guile-build-system\.scm                 @guix/guile
-
 gnu/packages/hare\.scm                             @guix/hare
 gnu/packages/hare-apps\.scm                        @guix/hare
 gnu/packages/hare-xyz\.scm                         @guix/hare
@@ -244,17 +234,13 @@ gnu/packages/hurd\.scm                             @guix/hurd

 gnu/installer(\.scm$|/)                            @guix/installer

-gnu/packages/clojure\.scm                          @guix/java
 gnu/packages/java(-.+|)\.scm$                      @guix/java
 gnu/packages/maven(-.+|)\.scm$                     @guix/java
 guix/build/ant-build-system\.scm                   @guix/java
-guix/build/clojure-build-system\.scm               @guix/java
-guix/build/clojure-utils\.scm                      @guix/java
 guix/build/java-utils\.scm                         @guix/java
 guix/build/maven-build-system\.scm                 @guix/java
 guix/build/maven/                                  @guix/java
 guix/build-system/ant\.scm                         @guix/java
-guix/build-system/clojure\.scm                     @guix/java
 guix/build-system/maven\.scm                       @guix/java

 gnu/packages/node-xyz\.scm                         @guix/javascript
@@ -455,9 +455,6 @@ AUX_FILES =						\
  gnu/packages/aux-files/findclass.php			\
  gnu/packages/aux-files/guix.vim			\
  gnu/packages/aux-files/guix-nvim.vim			\
-  gnu/packages/aux-files/linux-libre/6.18-arm64.conf	\
-  gnu/packages/aux-files/linux-libre/6.18-i686.conf	\
-  gnu/packages/aux-files/linux-libre/6.18-x86_64.conf	\
  gnu/packages/aux-files/linux-libre/6.17-arm64.conf	\
  gnu/packages/aux-files/linux-libre/6.17-i686.conf	\
  gnu/packages/aux-files/linux-libre/6.17-riscv.conf	\
@@ -1948,60 +1948,35 @@ keyword parameters for procedures that take more than four parameters.
@node Submitting Patches
@section Submitting Patches

-@cindex pull requests
-@cindex patch submission
 Development is done using the Git distributed version control system.
 Thus, access to the repository is not strictly necessary.  We welcome
-contributions as @dfn{pull requests} (PR) at
-@url{https://codeberg.org/guix/guix/pulls/}@footnote{Before January 1st,
-2026, changes would be submitted by email to
-@email{guix-patches@@gnu.org} and could be
-@uref{https://issues.guix.gnu.org, browsed online}.  In accordance with
-@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002}, this method is no longer supported.}.
-
-There are two ways to create a pull request:
+contributions in one of the following forms:

@itemize
@item
-By creating a personal ``fork'' of @uref{https://codeberg.org/guix/guix,
-the repository}, creating a branch with your changes, and
-@uref{https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/,
-submitting a pull request for that branch}.
+@cindex pull request, for contributions
+As a @dfn{pull request} (PR) at
+@url{https://codeberg.org/guix/guix/pulls/}.  This is now the preferred
+form.

@item
-@cindex AGit workflow, for pull requests
-By following the @uref{https://forgejo.org/docs/next/user/agit-support/,
-@dfn{AGit workflow}}, which is somewhat more convenient and consumes
-less disk space at Codeberg since it removes the need to create a
-``fork''.
+Until December 31st, 2025@footnote{This date is the result of a decision
+made collectively in
+@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
+Guix Consensus Document 002} in May 2025.}, you may also send patches as
+produced by @code{git format-patch} to the @email{guix-patches@@gnu.org}
+mailing list (@pxref{Submitting patches to a project,,, git, Git User
+Manual}).

-Assuming your local checkout is on the branch containing the changes you
-would like to submit for inclusion in the @code{master} branch, run:
-
-@example
-git push origin HEAD:refs/for/master \
-  -o topic=@var{topic} \
-  -o title=@var{title} -o description=@var{description}
-@end example
-
-@var{topic} must be an identifier without whitespace, similar to a
-branch name; @var{title} and @var{description} are arbitrary text that
-can be omitted, in which case the message of the last commit on the
-branch fills that role.
-
-To send an update to an AGit pull request of yours, run:
-
-@example
-git push origin HEAD:refs/for/master \
-  -o topic=@var{topic} -o force-push=yes
-@end example
-
-Codeberg automatically figures out which pull request @var{topic}
-corresponds to and updates the associated branch.
+This mailing list is backed by a Debbugs instance, which allows us to
+keep track of submissions (@pxref{Tracking Bugs and Changes}).
+Each message sent to that mailing list gets a new tracking number
+assigned; people can then follow up on the submission by sending email
+to @code{@var{ISSUE_NUMBER}@@debbugs.gnu.org}, where @var{ISSUE_NUMBER}
+is the tracking number (@pxref{Sending a Patch Series}).
@end itemize

-Contributors are encouraged to take a moment to set some Git
+Either way, contributors are encouraged to take a moment to set some Git
 repository options (@pxref{Configuring Git}) first, which can improve
 the readability of patches.  Seasoned Guix developers may also want to
 look at the section on commit access (@pxref{Commit Access}).
@@ -2168,13 +2143,36 @@ guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-auth

@end enumerate

+When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
+a subject, if your patch is to be applied on a branch other than
+@code{master}, say @code{core-updates}, specify it in the subject like
+@samp{[PATCH core-updates] @dots{}}.
+
+You may use your email client, the @command{git send-email} command
+(@pxref{Sending a Patch Series}) or the @command{mumi send-email}
+command (@pxref{Debbugs User Interfaces}).  We prefer to get patches in
+plain text messages, either inline or as MIME attachments.  You are
+advised to pay attention if your email client changes anything like line
+breaks or indentation which could potentially break the patches.
+
+Expect some delay when you submit your very first patch to
+@email{guix-patches@@gnu.org}. You have to wait until you get an
+acknowledgement with the assigned tracking number. Future acknowledgements
+should not be delayed.
+
+When a bug is resolved, please close the thread by sending an email to
+@email{@var{ISSUE_NUMBER}-done@@debbugs.gnu.org}.
+
@menu
 * Configuring Git::
+* Sending a Patch Series::
@end menu

@node Configuring Git
@subsection Configuring Git
@cindex git configuration
+@cindex @code{git format-patch}
+@cindex @code{git send-email}

 If you have not done so already, you may wish to set a name and email
 that will be associated with your commits (@pxref{telling git your name,
@@ -2194,6 +2192,166 @@ changes was already submitted for review.  If you have a
@file{commit-msg} hook of your own you would like to use with Guix, you
 can place it under the @file{.git/hooks/commit-msg.d/} directory.

+@node Sending a Patch Series
+@subsection Sending a Patch Series
+@cindex patch series
+@cindex @code{git send-email}
+@cindex @code{git format-patch}
+
+@quotation Warning
+This section is about contributing code by sending patches by email.
+This option is supported until December 31st, 2025, but we recommend
+getting familiar with the @dfn{pull request} workflow, which will become
+the norm after that date.  @xref{Submitting Patches}, for more info.
+@end quotation
+
+@unnumberedsubsubsec Single Patches
+@anchor{Single Patches}
+The @command{git send-email} command is the best way to send both single
+patches and patch series (@pxref{Multiple Patches}) to the Guix mailing
+list.  Sending patches as email attachments may make them difficult to
+review in some mail clients, and @command{git diff} does not store commit
+metadata.
+
+@quotation Note
+The @command{git send-email} command is provided by the @code{send-email}
+output of the @code{git} package, i.e. @code{git:send-email}.
+@end quotation
+
+The following command will create a patch email from the latest commit,
+open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to
+the Guix mailing list to be reviewed and merged.  Assuming you have
+already configured Git according to @xref{Configuring Git}, you can
+simply use:
+
+@example
+$ git send-email --annotate -1
+@end example
+
+@quotation Tip
+To add a prefix to the subject of your patch, you may use the
+@option{--subject-prefix} option.  The Guix project uses this to
+specify that the patch is intended for a branch or repository
+other than the @code{master} branch of
+@url{https://codeberg.org/guix/guix.git}.
+
+@example
+git send-email --annotate --subject-prefix='PATCH core-updates' -1
+@end example
+@end quotation
+
+The patch email contains a three-dash separator line after the commit
+message.  You may ``annotate'' the patch with explanatory text by adding
+it under this line.  If you do not wish to annotate the email, you may
+drop the @option{--annotate} option.
+
+If you need to send a revised patch, don't resend it like this or send
+a ``fix'' patch to be applied on top of the last one; instead, use
+@command{git commit --amend} or @url{https://git-rebase.io,
+@command{git rebase}} to modify the commit, and use the
+@email{@var{ISSUE_NUMBER}@@debbugs.gnu.org} address and the @option{-v}
+flag with @command{git send-email}.
+
+@example
+$ git commit --amend
+$ git send-email --annotate -v@var{REVISION} \
+      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org -1
+@end example
+
+@quotation Note
+Due to an apparent bug in @command{git send-email},
+@option{-v @var{REVISION}} (with the space) will not work; you
+@emph{must} use @option{-v@var{REVISION}}.
+@end quotation
+
+You can find out @var{ISSUE_NUMBER} either by searching on the mumi
+interface at @url{https://issues.guix.gnu.org} for the name of your patch or
+reading the acknowledgement email sent automatically by Debbugs in
+reply to incoming bugs and patches, which contains the bug number.
+
+@unnumberedsubsubsec Notifying Teams
+@anchor{Notifying Teams}
+@cindex teams
+If your git checkout has been correctly configured (@pxref{Configuring
+Git}), the @command{git send-email} command will automatically notify
+the appropriate team members, based on the scope of your changes.  This
+relies on the @file{etc/teams.scm} script, which can also be invoked
+manually if you do not use the preferred @command{git send-email}
+command to submit patches.  To list the available actions of the script,
+you can invoke it via the @command{etc/teams.scm help} command.  For
+more information regarding teams, @pxref{Teams}.
+
+@quotation Note
+On foreign distros, you might have to use @command{./pre-inst-env git
+send-email} for @file{etc/teams.scm} to work.
+@end quotation
+
+@unnumberedsubsubsec Multiple Patches
+@anchor{Multiple Patches}
+@cindex cover letter
+While @command{git send-email} alone will suffice for a single
+patch, an unfortunate flaw in Debbugs means you need to be more
+careful when sending multiple patches: if you send them all to the
+@email{guix-patches@@gnu.org} address, a new issue will be created
+for each patch!
+
+When sending a series of patches, it's best to send a Git ``cover
+letter'' first, to give reviewers an overview of the patch series.
+We can create a directory called @file{outgoing} containing both
+our patch series and a cover letter called @file{0000-cover-letter.patch}
+with @command{git format-patch}.
+
+@example
+$ git format-patch -@var{NUMBER_COMMITS} -o outgoing \
+      --cover-letter
+@end example
+
+@quotation Note
+@code{git format-patch} accepts a wide range of
+@uref{https://git-scm.com/docs/gitrevisions, revision range} specifiers.
+For example, if you are working in a branch, you could select all commits
+in your branch starting at @code{master}.
+
+@example
+$ git format-patch master..@var{MY_BRANCH} -o outgoing \
+      --cover-letter
+@end example
+@end quotation
+
+We can now send @emph{just} the cover letter to the
+@email{guix-patches@@gnu.org} address, which will create an issue
+that we can send the rest of the patches to.
+
+@example
+$ git send-email outgoing/0000-cover-letter.patch --annotate
+$ rm outgoing/0000-cover-letter.patch # we don't want to resend it!
+@end example
+
+Ensure you edit the email to add an appropriate subject line and
+blurb before sending it.  Note the automatically generated shortlog
+and diffstat below the blurb.
+
+Once the Debbugs mailer has replied to your cover letter email, you
+can send the actual patches to the newly-created issue address.
+
+@example
+$ git send-email outgoing/*.patch --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
+$ rm -rf outgoing # we don't need these anymore
+@end example
+
+Thankfully, this @command{git format-patch} dance is not necessary
+to send an amended patch series, since an issue already exists for
+the patchset.
+
+@example
+$ git send-email -@var{NUMBER_COMMITS} -v@var{REVISION} \
+      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
+@end example
+
+If need be, you may use @option{--cover-letter --annotate} to send
+another cover letter, e.g. for explaining what's changed since the last
+revision, and why these changes are necessary.
+
@node Tracking Bugs and Changes
@section Tracking Bugs and Changes

@@ -2204,26 +2362,31 @@ patch submissions and topic branches.
 * The Issue Tracker::           The official bug and patch tracker.
 * Managing Patches and Branches::  How changes to Guix are managed.
 * Debbugs User Interfaces::     Ways to interact with Debbugs.
+* Debbugs Usertags::            Tag reports with custom labels.
 * Cuirass Build Notifications::  Be alerted of any breakage via RSS feeds.
@end menu

@node The Issue Tracker
@subsection The Issue Tracker

-@cindex email workflow, deprecated
-@cindex issue tracker, for the email workflow
+@cindex bug reports, tracking
+@cindex patch submissions, tracking
+@cindex issue tracking
@cindex Debbugs, issue tracking system
 Bug reports (@dfn{issues}) and patch submissions (@dfn{pull requests})
 are currently tracked at the @uref{https://codeberg.org/guix/guix,
 project's home at Codeberg}.

-Before January 1st, 2026, bug reports and patches were tracked using the
-Debbugs instance at @uref{https://bugs.gnu.org}, which can also be
-browsed at @uref{https://issues.guix.gnu.org}.  This has been
-discontinued and Codeberg is now the sole option to report new bugs and
-propose new changes@footnote{Check out
+Before May 25th, 2025, bug reports and patches were exclusively tracked
+using the Debbugs instance at @uref{https://bugs.gnu.org}; it may still
+be used for these purposes until December 31st, 2025, after which
+Codeberg will become the sole option to report new bugs and propose new
+changes@footnote{Check out
@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002} for details on this decision.}.
+Guix Consensus Document 002} for details on this decision.}.  With
+Debbugs, bug reports are sent by email to @email{bug-guix@@gnu.org} and
+patches are sent to @email{guix-patches@@gnu.org} (@pxref{Submitting
+Patches}).

@node Managing Patches and Branches
@subsection Managing Patches and Branches
@@ -2335,10 +2498,11 @@ only then should the merge requests be created, as documented earlier.

@quotation Warning
 This section is about bug reports and patches sent by email to
-@uref{https://issues.guix.gnu.org, Debbugs}, which is discontinued.
-Since January 1st, 2026, bug reports and patches are submitted as issues
-and pull requests on @uref{https://codeberg.org/guix/guix, Codeberg}.
-@xref{Submitting Patches}, for more info.
+@uref{https://issues.guix.gnu.org, Debbugs}.  This option is supported
+until December 31st, 2025, after which
+@uref{https://codeberg.org/guix/guix, Codeberg} will be the only
+interface for submitting bug reports and changes.  @xref{Submitting
+Patches}, for more info.
@end quotation

@subsubsection Web interface
@@ -2527,6 +2691,63 @@ used.
@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on
 this nifty tool!

+@node Debbugs Usertags
+@subsection Debbugs Usertags
+
+@cindex usertags, for debbugs
+@cindex Debbugs usertags
+Debbugs provides a feature called @dfn{usertags} that allows any user to
+tag any bug with an arbitrary label.  Bugs can be searched by usertag,
+so this is a handy way to organize bugs@footnote{The list of usertags is
+public information, and anyone can modify any user's list of usertags,
+so keep that in mind if you choose to use this feature.}.  If you use
+Emacs Debbugs, the entry-point to consult existing usertags is the
+@samp{C-u M-x debbugs-gnu-usertags} procedure.  To set a usertag, press
+@samp{C} while consulting a bug within the *Guix-Patches* buffer opened
+with @samp{C-u M-x debbugs-gnu-bugs} buffer, then select @code{usertag}
+and follow the instructions.
+
+For example, to view all the bug reports (or patches, in the case of
+@code{guix-patches}) tagged with the usertag @code{powerpc64le-linux}
+for the user @code{guix}, open a URL like the following in a web
+browser:
+@url{https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?tag=powerpc64le-linux;users=guix}.
+
+For more information on how to use usertags, please refer to the
+documentation for Debbugs or the documentation for whatever tool you use
+to interact with Debbugs.
+
+In Guix, we are experimenting with usertags to keep track of
+architecture-specific issues, as well as reviewed ones.  To facilitate
+collaboration, all our usertags are associated with the single user
+@code{guix}.  The following usertags currently exist for that user:
+
+@table @code
+
+@item powerpc64le-linux
+The purpose of this usertag is to make it easy to find the issues that
+matter most for the @code{powerpc64le-linux} system type.  Please assign
+this usertag to bugs or patches that affect @code{powerpc64le-linux} but
+not other system types.  In addition, you may use it to identify issues
+that for some reason are particularly important for the
+@code{powerpc64le-linux} system type, even if the issue affects other
+system types, too.
+
+@item reproducibility
+For issues related to reproducibility.  For example, it would be
+appropriate to assign this usertag to a bug report for a package that
+fails to build reproducibly.
+
+@item reviewed-looks-good
+You have reviewed the series and it looks good to you (LGTM).
+
+@end table
+
+If you're a committer and you want to add a usertag, just start using it
+with the @code{guix} user.  If the usertag proves useful to you,
+consider updating this section of the manual so that others will know
+what your usertag means.
+
@node Cuirass Build Notifications
@subsection Cuirass Build Notifications

@@ -3028,7 +3249,7 @@ to that commit message.

 If you are not a committer, you can help others find a @emph{series} you
 have reviewed more easily by adding a @code{reviewed-looks-good} usertag
-for the @code{guix} user.
+for the @code{guix} user (@pxref{Debbugs Usertags}).

@node Updating the Guix Package
@section Updating the Guix Package
@@ -56,7 +56,7 @@ Copyright @copyright{} 2017 Andy Wingo@*
 Copyright @copyright{} 2017, 2018, 2019, 2020, 2023, 2024, 2025 Arun Isaac@*
 Copyright @copyright{} 2017 nee@*
 Copyright @copyright{} 2018 Rutger Helling@*
-Copyright @copyright{} 2018, 2021, 2023, 2025, 2026 Oleg Pykhalov@*
+Copyright @copyright{} 2018, 2021, 2023, 2025 Oleg Pykhalov@*
 Copyright @copyright{} 2018 Mike Gerwitz@*
 Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
 Copyright @copyright{} 2018, 2019 Gábor Boskovits@*
@@ -22102,22 +22102,6 @@ determined based on @code{destination} or @code{gateway}.

@item @code{gateway} (default: @code{#f})
 IP address (a string) through which traffic is routed.
-
-@item @code{scope} (default: @code{'universe})
-Scope of the route, as a symbol:
-
-@table @code @c see rtnetlink(7)
-@item universe
-global route;
-@item site
-route within the local autonomous system;
-@item link
-route on this link;
-@item host
-route on the local host;
-@item nowhere
-means the destination does not exist.
-@end table
@end table
@end deftp

@@ -51766,19 +51750,6 @@ stateless: it can be replicated elsewhere or at another point in time.
 Preparing this list can be relatively tedious though, which is why
@code{*unspecified*} is kept as a default.

-@item @code{known-hosts2} (default: @code{*unspecified*})
-Either @code{*unspecified*} or a list of file-like objects containing
-known host keys.  When specified, these files will be concatenated and
-installed as @file{~/.ssh/known_hosts2}.  This allows for declaratively
-manage known hosts (stored in @file{known_hosts2}), while leaving the
-primary @file{known_hosts} file unmanaged by Guix.
-
-The SSH client by default reads both @code{known-hosts} and
-@code{known-hosts2} for host key verification.  If only
-@code{known-hosts2} is specified in Guix Home, @file{known_hosts}
-remains as a regular file that SSH can modify, while @file{known_hosts2}
-contains the declaratively managed host keys.
-
@item @code{authorized-keys} (default: @code{#false})
 The default @code{#false} value means: Leave any
@file{~/.ssh/authorized_keys} file alone.  Otherwise, this must be a
@@ -14,7 +14,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
 ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2025 Jelle Licht <jlicht@fsfe.org>
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -285,25 +285,14 @@ PARAMETERS."

 ;; API documentation at <https://codeberg.org/api/swagger>.

-(define-forgejo-request (organization-teams/paginated organization page)
-  "Return the list of teams of ORGANIZATION, for the given PAGE (1-indexed)."
+(define-forgejo-request (organization-teams organization)
+  "Return the list of teams of ORGANIZATION."
  (GET "orgs" organization "teams"
-       & `(("page" . ,(number->string page))))
+       & '(("limit" . "100")))                    ;get up to 100 teams
  => 200
  (lambda (port)
    (map json->forgejo-team (vector->list (json->scm port)))))

-(define (organization-teams token organization)
-  "Return the list of teams of ORGANIZATION."
-  (let loop ((index 1)
-             (pages '()))
-    (match (organization-teams/paginated token organization index)
-      (()
-       (concatenate (reverse pages)))
-      (lst
-       (loop (+ 1 index)
-             (cons lst pages))))))
-
 (define-forgejo-request (create-team organization team)
  "Create TEAM, a Forgejo team, under ORGANIZATION."
  (POST "orgs" organization "teams")
@@ -500,8 +489,7 @@ of Rebar and Mix build systems and Hex.pm importer."
  (team 'bootstrap
        #:name "Bootstrap"
        #:description "Full-source bootstrap: stage0, Mes, Gash, etc."
-        #:scope (list "gnu/packages/bootstrap.scm"
-                      "gnu/packages/commencement.scm"
+        #:scope (list "gnu/packages/commencement.scm"
                      "gnu/packages/mes.scm")))

 (define-team c++
@@ -521,8 +509,7 @@ of Rebar and Mix build systems and Hex.pm importer."
  (team 'core
        #:name "Core / Tools / Internals"
        #:scope
-        (list "etc/teams.scm"
-              "guix/avahi.scm"
+        (list "guix/avahi.scm"
              "guix/base16.scm"
              "guix/base32.scm"
              "guix/base64.scm"
@@ -582,7 +569,6 @@ of Rebar and Mix build systems and Hex.pm importer."
              "guix/read-print.scm"
              "guix/records.scm"
              "guix/remote.scm"
-              "guix/remote-procedures.scm"
              "guix/repl.scm"
              "guix/search-paths.scm"
              "guix/self.scm"
@@ -715,17 +701,6 @@ GLib/GIO, GTK, GStreamer and Webkit."
                      "guix/scripts/import/go.scm"
                      "tests/import/go.scm")))

-(define-team guile
-  (team 'guile
-        #:name "Guile team"
-        #:description
-        "Team for the Guile platform, libraries, and build system."
-        #:scope (list "gnu/packages/guile.scm"
-                      "gnu/packages/guile-wm.scm"
-                      "gnu/packages/guile-xyz.scm"
-                      "guix/build-system/guile.scm"
-                      "guix/build/guile-build-system.scm")))
-
 (define-team hare
  (team 'hare
        #:name "Hare"
@@ -796,20 +771,16 @@ the haskell-build-system."
        "The JDK and JRE, the Maven build system, Java packages, the ant-build-system,
 and the maven-build-system."
        #:scope
-        (list "gnu/packages/clojure.scm"
-              ;; Match java.scm and java-*.scm.
+        (list ;; Match java.scm and java-*.scm.
              (make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
              ;; Match maven.scm and maven-*.scm
              (make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
              "guix/build/ant-build-system.scm"
-              "guix/build/clojure-build-system.scm"
-              "guix/build/clojure-utils.scm"
              "guix/build/java-utils.scm"
              "guix/build/maven-build-system.scm"
              ;; The maven directory
              (make-regexp* "^guix/build/maven/")
              "guix/build-system/ant.scm"
-              "guix/build-system/clojure.scm"
              "guix/build-system/maven.scm")))

 (define-team javascript
@@ -1018,7 +989,6 @@ release."
        #:description
        "Secrets, passwords, cryptography and security related packages."
        #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
-                      "gnu/packages/cryptsetup.scm"
                      "gnu/packages/gnupg.scm"
                      "gnu/packages/nettle.scm"
                      "gnu/packages/password-utils.scm"
@@ -1147,7 +1117,7 @@ the \"texlive\" importer."
                       "ludo@gnu.org"
                       "civodul")
  core core-packages hpc installer
-  guile)
+  mentors)

 (define-member (person "Andreas Enge"
                       "andreas@enge.fr"
@@ -1267,7 +1237,7 @@ the \"texlive\" importer."
 (define-member (person "Katherine Cox-Buday"
                       "cox.katherine.e+guix@gmail.com"
                       "katco")
-  emacs lisp)
+  emacs go lisp)

 (define-member (person "Munyoki Kilyungi"
                       "me@bonfacemunyoki.com"
@@ -1299,11 +1269,6 @@ the \"texlive\" importer."
                       "Hellseher")
  go julia python science sysadmin)

-(define-member (person "Arthur Rodrigues"
-                       "arthurhdrodrigues@proton.me"
-                       "arthurhdrodrigues")
-  go)
-
 (define-member (person "Mark H Weaver"
                       "mhw@netris.org"
                       "mhw")
@@ -1408,11 +1373,6 @@ the \"texlive\" importer."
                       "rodion-goritskov")
  release)

-(define-member (person "Jason Conroy"
-                       "jconroy@tscripta.net"
-                       "conroj")
-  ocaml)
-
 (define-member (person "Rutherther"
                       "rutherther@ditigal.xyz"
                       "Rutherther")
@@ -1462,41 +1422,6 @@ the \"texlive\" importer."
                       "reza@housseini.me"
                       "rhou")
  python science c++)
-
-(define-member (person "Yunqi Shao"
-                       "me@yqshao.se"
-                       "yqshao")
-  sysadmin)
-
-(define-member (person "Collin Doering"
-                       "collin@rekahsoft.ca"
-                       "rekahsoft")
-  embedded electronics haskell sysadmin)
-
-(define-member (person "Mathieu Lirzin"
-                       "mthl@gnu.org"
-                       "mthl")
-  java)
-
-(define-member (person "Hugo Buddelmeijer"
-                       "hugo@buddelmeijer.nl"
-                       "hugobuddel")
-  python)
-
-(define-member (person "Yan Abu Arab"
-                       "yanabuarab@gmail.com"
-                       "tux1c")
-  python sysadmin)
-
-(define-member (person "Wilko Meyer"
-                       "w@wmeyer.eu"
-                       "theesm")
-  kernel)
-
-(define-member (person "Untrusem"
-                       "mysticmoksh@riseup.net"
-                       "untrusem")
-  mozilla)

 (define (find-team name)
  (or (hash-ref %teams (string->symbol name))
@@ -36,7 +36,6 @@
            u-boot-a20-olinuxino-lime2-bootloader
            u-boot-a20-olinuxino-micro-bootloader
            u-boot-bananapi-m2-ultra-bootloader
-            u-boot-am335x-evm-bootloader
            u-boot-beaglebone-black-bootloader
            u-boot-cubietruck-bootloader
            u-boot-firefly-rk3399-bootloader
@@ -98,48 +97,6 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
      (if bootloader
        (error "Failed to install U-Boot"))))

-(define install-am335x-evm-u-boot
-  (write-u-boot-image
-   ;; According to the "26.1.8.5.5 MMC/SD Read Sector Procedure in Raw Mode"
-   ;; section in the "AM335x and AMIC110 Sitara™ Processors Technical
-   ;; Reference Manual", we have offset, the bootrom tries to load code at the
-   ;; offsets 0x0, 0x20000 (128KB), 0x40000 (256KB) and 0x60000 (384KB).
-   ;;
-   ;; The MBR is 512 Bytes
-   ;; (https://en.wikipedia.org/wiki/Master_boot_record#Sector_layout).
-   ;;
-   ;; At the time of writing, u-boot.img is 1.4 MiB, and it is at offset
-   ;; 0x60000 (384KB) as per CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR.
-   ;;
-   ;; We also need to align the first partition to make sure read/writes are
-   ;; properly aligned.
-   ;;
-   ;; Given these constraints, we chose the following partitioning:
-   ;;
-   ;; 0   512 Bytes    128 KiB
-   ;; |       |        (0x20000)   256 KiB
-   ;; |       |           /        (0x40000)       384 KiB            4 MiB
-   ;; |       |          /            |            (0x60000)           |
-   ;; |       |         /             |               |                |
-   ;; v       v        /              v               v                v
-   ;; +-------+        +--------------+---------------+----------------+
-   ;; |  MBR  |   ...  |  First MLO   |  Second MLO   |   u-boot.img   |
-   ;; +-------+        +--------------+---------------+----------------+
-   ;; <-512 B->   ...  <-- 128 KiB --> <-- 128 KiB --> <-- 3712 KiB -->
-   ;;
-   ;; The rationale for that is as follows:
-   ;;
-   ;; - We add a second copy of the MLO at 256 KiB for improving reliability
-   ;;   as the doc/board/ti/am335x_evm.rst documentation in u-boot advise us
-   ;;   to do that, and also because the space there isn't used.
-   ;;
-   ;; - All can fit into 2MiB (u-boot.img can grow up to 1664 KiB), but we
-   ;;   want a bit more space in case u-boot.img grows over time, so we allow
-   ;;   u-boot to grow until the 4 MiB offset.
-   '(("MLO" 256 256) ;; First MLO
-     ("MLO" 256 512) ;; Second MLO
-     ("u-boot.img" 7424 768)) 512))
-
 (define install-beaglebone-black-u-boot
  ;; http://wiki.beyondlogic.org/index.php?title=BeagleBoneBlack_Upgrading_uBoot
  ;; This first stage bootloader called MLO (U-Boot SPL) is expected at
@@ -201,33 +158,6 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
   (installer #f)
   (disk-image-installer install-u-boot)))

-(define u-boot-am335x-evm-bootloader
-  (bootloader
-   (inherit u-boot-bootloader)
-   ;; This bootloader supports the following computers:
-   ;; - SanCloud BeagleBone Enhanced
-   ;; - SanCloud BeagleBone Enhanced Extended WiFi
-   ;; - SanCloud BeagleBone Enhanced Lite
-   ;; - Seeed Studio BeagleBone Green Eco
-   ;; - TI AM3359 ICE-V2
-   ;; - TI AM335x BeagleBone
-   ;; - TI AM335x BeagleBone Black
-   ;; - TI AM335x BeagleBone Green
-   ;; - TI AM335x EVM
-   ;; - TI AM335x EVM-SK
-   ;; - TI AM335x PocketBeagle
-   ;;
-   ;; This list was made by retrieving the list of Devicetrees used in
-   ;; configs/am335x_evm_defconfig in u-boot source code. Once we have that we
-   ;; can look at each Devicetree in arch/arm/boot/dts/ti/omap/ inside Linux,
-   ;; and in each file, look at the model property to find the name of the
-   ;; computers that this image supports.
-   (package u-boot-am335x-evm)
-   ;; At the time of writing, our u-boot.img is 1.4 MiB. This is why we can't
-   ;; reuse install-beaglebone-black-u-boot. And having the same image being
-   ;; able to boot on multiple computers is useful.
-   (disk-image-installer install-am335x-evm-u-boot)))
-
 (define u-boot-beaglebone-black-bootloader
  (bootloader
   (inherit u-boot-bootloader)
@@ -141,13 +141,12 @@ and bits are set according to the default behaviour of 'mkdir'."
                                 #:key
                                 (directory %skeleton-directory)
                                 uid gid)
-  "Copy the account skeletons from DIRECTORY to HOME and make them writable.
-When UID is an integer, make it the owner of all the files created except the
-home directory; likewise for GID."
-  (define (set-permission file)
+  "Copy the account skeletons from DIRECTORY to HOME.  When UID is an integer,
+make it the owner of all the files created except the home directory; likewise
+for GID."
+  (define (set-owner file)
    (when (or uid gid)
-      (chown file (or uid -1) (or gid -1)))
-    (make-file-writable file))
+      (chown file (or uid -1) (or gid -1))))

  (let ((files (scandir directory (negate dot-or-dot-dot?)
                        string<?)))
@@ -157,9 +156,10 @@ home directory; likewise for GID."
                  (copy-recursively (string-append directory "/" file)
                                    target
                                    #:log (%make-void-port "w"))
-                  (for-each set-permission
+                  (for-each set-owner
                            (find-files target (const #t)
-                                        #:directories? #t))))
+                                        #:directories? #t))
+                  (make-file-writable target)))
              files)))

 (define* (make-skeletons-writable home
@@ -107,8 +107,8 @@ QEMU monitor and to the guest's backdoor REPL."
  (define extra-options
    (list "-nographic"
          "-monitor" (string-append "unix:" socket-directory "/monitor")
-          "-chardev" (string-append "socket,id=repl,path="
-                                    socket-directory "/repl")
+          "-chardev" (string-append "socket,id=repl,path=" socket-directory
+                                    "/repl,reconnect=1")
          "-chardev" (string-append "socket,id=qga,server=on,wait=off,path="
                                    socket-directory "/qemu-ga")

@@ -60,7 +60,10 @@
 or 'stow, but ~a was found.")
        value))))

-(define-maybe/no-serialization list-of-strings)
+(define list-of-strings?
+  (list-of string?))
+
+(define-maybe list-of-strings)

 (define-configuration/no-serialization home-dotfiles-configuration
  (source-directory
@@ -3,7 +3,6 @@
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2026 Oleg Pykhalov <go.wigust@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -312,8 +311,6 @@ through before connecting to the server.")
                     (default #f))
  (known-hosts       home-openssh-configuration-known-hosts ;unspec | list of file-like
                     (default *unspecified*))
-  (known-hosts2      home-openssh-configuration-known-hosts2 ;unspec | list of file-like
-                     (default *unspecified*))
  (hosts             home-openssh-configuration-hosts   ;list of <openssh-host>
                     (default '()))
  (add-keys-to-agent home-openssh-configuration-add-keys-to-agent ;string with limited values
@@ -379,7 +376,6 @@ inserted after each of them."
  (let* ((ssh-config (plain-file "ssh.conf"
                                 (openssh-configuration->string config)))
         (known-hosts (home-openssh-configuration-known-hosts config))
-         (known-hosts2 (home-openssh-configuration-known-hosts2 config))
         (authorized-keys (home-openssh-configuration-authorized-keys config))
         (authorized-keys (and
                           authorized-keys
@@ -391,10 +387,6 @@ inserted after each of them."
            '()
            `((".ssh/known_hosts"
               ,(file-join "known_hosts" known-hosts "\n"))))
-      ,@(if (unspecified? known-hosts2)
-            '()
-            `((".ssh/known_hosts2"
-               ,(file-join "known_hosts2" known-hosts2 "\n"))))
      (".ssh/config" ,ssh-config))))

 (define openssh-activation
@@ -103,21 +103,10 @@ subdirectory from XDG_CONFIG_HOME to generate a target path."
           (define backup
             (string-append backup-directory "/" (preprocess-file file)))

-           (define (copy-file* oldfile newfile)
-             "Like 'copy-file', but also copies dangling symlinks."
-             (catch 'system-error
-               (lambda ()
-                 (copy-file oldfile newfile))
-               (lambda args
-                 (if (and (eq? 'symlink (stat:type (lstat oldfile)))
-                          (= ENOENT (system-error-errno args)))
-                     (symlink (readlink oldfile) newfile)
-                     (apply throw args)))))
-
           (mkdir-p backup-directory)
           (format #t (G_ "Backing up ~a...") (target-file file))
           (mkdir-p (dirname backup))
-           (copy-file* (target-file file) backup)
+           (copy-file (target-file file) backup)
           (delete-file (target-file file))
           (display (G_ " done\n")))

@@ -108,11 +108,10 @@ like sockets.")
@file{/var/log}, but for user.  It is not a part of XDG Base Directory
 Specification, but helps to make implementation of home services more
 consistent."
-   (serializer
-    (lambda (field-name val)
-      (when (maybe-value-set? val)
-        (warn-about-deprecation field-name #f #:replacement 'state-home))
-      (serialize-path field-name val))))
+   (lambda (field-name val)
+     (when (maybe-value-set? val)
+       (warn-about-deprecation field-name #f #:replacement 'state-home))
+     (serialize-path field-name val)))
  (state-home
   (path "$HOME/.local/state")
   "Base directory for programs to store state data that should persist
@@ -243,33 +243,44 @@
 ;; under their own account: use 'guix search KEYWORD' to search
 ;; for packages and 'guix install PACKAGE' to install a package.\n")))))

-    `(,@(if (null? packages)
-            (if (target-hurd?)
+    (if (null? snippets)
+        `(,@(if (null? packages)
+                (if (target-hurd?)
+                    `(,@package-heading
+                      (packages %base-packages/hurd))
+                    '())
                `(,@package-heading
-                  (packages %base-packages/hurd))
-                '())
-            `(,@package-heading
-              (packages (append (list ,@packages)
-                                ,(if (target-hurd?)
-                                     '%base-packages/hurd
-                                     '%base-packages)))))
+                  (packages (append (list ,@packages)
+                                    ,(if (target-hurd?)
+                                         '%base-packages/hurd
+                                         '%base-packages)))))

-      ,@service-heading
-      ,(if (and (null? snippets)
-                (not desktop?))
-           `(services ,services)
-           `(services
-             (append (list ,@snippets
+          ,@service-heading
+          (services ,services))
+        `(,@(if (null? packages)
+                (if (target-hurd?)
+                    `(,@package-heading
+                      (packages %base-packages/hurd))
+                    '())
+                `(,@package-heading
+                  (packages (append (list ,@packages)
+                                    ,(if (target-hurd?)
+                                         '%base-packages/hurd
+                                         '%base-packages)))))

-                           ,@(if desktop?
-                                 ;; XXX: Assume 'keyboard-layout' is in scope.
-                                 `((set-xorg-configuration
-                                    (xorg-configuration
-                                      (keyboard-layout keyboard-layout))))
-                                 '()))
+          ,@service-heading
+          (services (append (list ,@snippets

-                     ,(vertical-space 1)
-                     ,(comment (G_ "\
+                                  ,@(if desktop?
+                                        ;; XXX: Assume 'keyboard-layout' is in
+                                        ;; scope.
+                                        `((set-xorg-configuration
+                                           (xorg-configuration
+                                            (keyboard-layout keyboard-layout))))
+                                        '()))
+
+                            ,(vertical-space 1)
+                            ,(comment (G_ "\
 ;; This is the default list of services we
 ;; are appending to.\n"))
-                     ,services))))))
+                            ,services))))))
@@ -1237,6 +1237,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch  \
  %D%/packages/patches/emacs-pgtk-super-key-fix.patch	\
  %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch  \
+  %D%/packages/patches/emacs-shx-byte-compilation-test.patch	\
  %D%/packages/patches/emacs-telega-path-placeholder.patch	\
  %D%/packages/patches/emacs-telega-test-env.patch		\
  %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
@@ -1354,6 +1355,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/gcc-asan-missing-include.patch		\
  %D%/packages/patches/gcc-boot-2.95.3.patch			\
  %D%/packages/patches/gcc-boot-4.6.4.patch			\
+  %D%/packages/patches/gcc-boot-4.6.4-riscv64-support.patch	\
+  %D%/packages/patches/gcc-boot-4.6.4-riscv64-libstdc++-support.patch	\
  %D%/packages/patches/gcc-cross-environment-variables.patch	\
  %D%/packages/patches/gcc-cross-gxx-include-dir.patch          \
  %D%/packages/patches/gcc-fix-texi2pod.patch			\
@@ -1521,7 +1524,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \
  %D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \
  %D%/packages/patches/go-skip-gc-test.patch			\
-  %D%/packages/patches/godot-glslang.patch			\
+  %D%/packages/patches/godot-libjpeg-turbo-unbundle.patch	\
  %D%/packages/patches/gourmet-sqlalchemy-compat.patch		\
  %D%/packages/patches/gpaste-fix-paths.patch			\
  %D%/packages/patches/gpm-glibc-2.26.patch			\
@@ -1646,6 +1649,7 @@ 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-qwindowkit.patch			\
  %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch	\
@@ -1694,6 +1698,7 @@ dist_patch_DATA =						\
  %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/libmaus2-fix-gcc-13-require-include-cstdint.patch	\
  %D%/packages/patches/libretro-dolphin-emu-data.patch		\
  %D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch  \
@@ -1856,7 +1861,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/luit-posix.patch				\
  %D%/packages/patches/lxc-no-static-bin.patch	\
  %D%/packages/patches/lxsession-potfiles-ignore.patch		\
-  %D%/packages/patches/mate-common-honor-aclocal.patch		\
  %D%/packages/patches/mactelnet-remove-init.patch		\
  %D%/packages/patches/mailutils-variable-lookup.patch		\
  %D%/packages/patches/mandoc-support-zstd-compression.patch	\
@@ -1992,6 +1996,7 @@ dist_patch_DATA =						\
  %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/openexr-2-gcc-14.patch			\
  %D%/packages/patches/openfst-for-vosk-fix-unique-ptr.patch	\
  %D%/packages/patches/openjdk-currency-time-bomb.patch		\
@@ -2427,6 +2432,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/twinkle-bcg729.patch			\
  %D%/packages/patches/u-boot-allow-disabling-openssl.patch	\
  %D%/packages/patches/u-boot-nintendo-nes-serial.patch		\
+  %D%/packages/patches/u-boot-rockchip-inno-usb.patch		\
  %D%/packages/patches/ucx-tcp-iface-ioctl.patch		\
  %D%/packages/patches/uftrace-fix-tests.patch			\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
@@ -2484,6 +2490,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/vcmi-disable-privacy-breach.patch	\
  %D%/packages/patches/vinagre-newer-freerdp.patch             \
  %D%/packages/patches/vinagre-newer-rdp-parameters.patch      \
+  %D%/packages/patches/vlc-livemedia-2024.11.28.patch          \
  %D%/packages/patches/vsearch-unbundle-cityhash.patch		\
  %D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch	\
  %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
@@ -17,7 +17,7 @@
 ;;; Copyright © 2022 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
-;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 ;;; Copyright © 2025 Skylar Hill <stellarskylark@posteo.net>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
@@ -985,44 +985,6 @@ gnu build version."))))
     (string-append (package-description fftw)
                    "  With OpenMPI parallelism support."))))

-(define-public python-pyflct
-  (package
-    (name "python-pyflct")
-    (version "0.3.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pyflct" version))
-       (sha256
-        (base32 "1xv4h1a4f8y3ww97g2vc7fg2scfi142vwjz556nx0r1nnpgggj41"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 6 passed
-      #:test-flags
-      #~(list "--pyargs" "pyflct")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'remove-local-source
-            (lambda _
-              (delete-file-recursively "pyflct"))))))
-    (native-inputs
-     (list python-cython
-           python-extension-helpers
-           python-pytest
-           python-setuptools
-           python-setuptools-scm))
-    (inputs
-     (list fftw))
-    (propagated-inputs
-     (list python-numpy
-           python-packaging))
-    (home-page "https://docs.sunpy.org/projects/pyflct/")
-    (synopsis "Python wrapper for Fourier Local Correlation Tracking")
-    (description
-     "This package provides a Python wrapper for Fourier Local Correlation Tracking.")
-    (license license:lgpl2.1)))
-
 (define-public java-la4j
  (package
    (name "java-la4j")
@@ -316,7 +316,7 @@ language.")
            ;; Ensure that all required Qt plugins are found at runtime.
            (add-after 'install 'wrap-executable
              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((qt '("qtbase" "qtmultimedia" "qtwayland")))
+                (let ((qt '("qtbase" "qtmultimedia")))
                  (wrap-program (string-append #$output "/bin/Papagayo")
                    `("QT_PLUGIN_PATH" ":" prefix
                      ,(map (lambda (label)
@@ -324,7 +324,7 @@ language.")
                                             "/lib/qt5/plugins/"))
                            qt)))))))))
      (inputs
-       (list bash-minimal qtbase-5 qtmultimedia-5 qtwayland-5 libsndfile))
+       (list bash-minimal qtbase-5 qtmultimedia-5 libsndfile))
      (native-inputs
       (list qttools-5))
      (home-page "https://www.lostmarble.com/papagayo/")
@@ -352,8 +352,7 @@ waveform until they line up with the proper sounds.")
                "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
    (build-system gnu-build-system)
    (inputs
-     (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5
-           qtwayland-5))
+     (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5))
    (arguments
     (list
      #:phases
@@ -59,7 +59,6 @@
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2025 Isidor Zeuner <guix@quidecco.pl>
 ;;; Copyright © 2025 Evgenii Klimov <eugene.dev@lipklim.org>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -813,147 +812,6 @@ attacks, performing pitch detection, tapping the beat and producing MIDI
 streams from live audio.")
    (license license:gpl3+)))

-(define-public dexed
-  (package
-    (name "dexed")
-    (version "1.0.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/asb2m10/dexed")
-                     (commit (string-append "v" version))
-                     ;; This is a JUCE project and so it bundles a particular
-                     ;; version of the JUCE repository and the sources of
-                     ;; other libraries.
-                     (recursive? #true)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1n604cvkjs11wqnaxnqzx8fgjj1klz85fnka15nnmhz49lqdlipl"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #false ;there are none
-      #:modules '((guix build utils)
-                  (guix build cmake-build-system)
-                  (guix base32)
-                  (ice-9 string-fun)
-                  (ice-9 regex)
-                  (rnrs bytevectors))
-      #:imported-modules `((guix base32)
-                           (guix build cmake-build-system)
-                           ,@%default-gnu-imported-modules)
-      #:configure-flags
-      ;; We extract the build identifer from the output prefix.  This is more
-      ;; useful than setting it to a constant string.
-      #~(let ((build-id
-               (lambda (out)
-                 (let* ((nix-store (string-append
-                                    (or (getenv "NIX_STORE") "/gnu/store")
-                                    "/"))
-                        (filename
-                         (string-replace-substring out nix-store ""))
-                        (hash (match:substring (string-match "[0-9a-z]{32}"
-                                                             filename)))
-                        (bv (nix-base32-string->bytevector hash)))
-                   (format #f "0x~x"
-                           (bytevector-u32-ref bv 0 (endianness big)))))))
-          (list (string-append "-DBUILD_ID=" (build-id #$output))))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; HOME must be defined for .vst3
-          (add-after 'unpack 'set-home-directory
-            (lambda _ (setenv "HOME" "HOME")))
-          (add-after 'unpack 'patch-libraries
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "libs/JUCE/modules/juce_gui_basics/native/juce_XSymbols_linux.h"
-                (("libX11.so.6")
-                 (search-input-file inputs "/lib/libX11.so.6"))
-                (("libXext.so.6")
-                 (search-input-file inputs "/lib/libXext.so.6"))
-                (("libXcursor.so.1")
-                 (search-input-file inputs "/lib/libXcursor.so.1"))
-                (("libXinerama.so.1")
-                 (search-input-file inputs "/lib/libXinerama.so.1"))
-                (("libXrender.so.1")
-                 (search-input-file inputs "/lib/libXrender.so.1"))
-                (("libXrandr.so.2")
-                 (search-input-file inputs "/lib/libXrandr.so.2")))))
-          (add-after 'unpack 'enable-lv2-format
-            (lambda _
-              (substitute* "Source/CMakeLists.txt"
-                (("set\\(DEXED_JUCE_FORMATS Standalone\\).*" m)
-                 (string-append m "
-if(NOT DEXED_SKIP_LV2)
-  list(APPEND DEXED_JUCE_FORMATS LV2)
-endif()
-"))
-                (("PRODUCT_NAME \"Dexed\".*" m)
-                 (string-append m "
-LV2URI \"https://github.com/asb2m10/dexed\"
-")))))
-          (replace 'install
-            (lambda* (#:key build-type #:allow-other-keys)
-              (with-directory-excursion "Source/Dexed_artefacts"
-                (install-file (string-append build-type "/Standalone/Dexed")
-                              (string-append #$output "/bin"))
-                (mkdir-p (string-append #$output:clap "/lib"))
-                (copy-recursively (string-append build-type "/CLAP")
-                                  (string-append #$output:clap "/lib"))
-                (mkdir-p (string-append #$output:lv2 "/lib"))
-                (copy-recursively (string-append build-type "/LV2")
-                                  (string-append #$output:lv2 "/lib"))
-                (mkdir-p (string-append #$output:vst3 "/lib"))
-                (copy-recursively (string-append build-type "/VST3")
-                                  (string-append #$output:vst3 "/lib"))))))))
-    (inputs
-     (list alsa-lib
-           freetype
-           gtk+
-           jack-2
-           libx11
-           libxcursor
-           libxext
-           libxinerama
-           libxrandr
-           libxrender
-           lv2
-           mesa))
-    (native-inputs
-     (list pkg-config))
-    (outputs '("out" "lv2" "clap" "vst3"))
-    (home-page "https://asb2m10.github.io/dexed/")
-    (synopsis "Frequency modulation (FM) plugin synthesizer")
-    (description
-     "Dexed is a multi-platform, multi-format plugin synthesizer.  The sound
-engine is closely modeled on the original Yamaha DX7 characteristics.  Dexed
-is also a MIDI cartridge librarian/manager for the DX7.  Features include:
-
-@enumerate
-@item 144 DAW automatable DX7 parameters available from one single panel;
-@item It fully supports DX7 input and output Sysex messages; including
-  controller change. This means that you can use this with a native DX7/TX7 as
-  a patch editor and sysex manager.
-@item Every FM operator has a realtime VU meter to know which one is active.
-@item It can load/save any DX7/TX7 sysex programs.  It is also possible to
-  save a single program into a different sysex file.
-@end enumerate
-
-Dexed can be configured to use some of the original math limitation of a DX
-synthesizer. This does not only apply to the DAC, it also involves the bit
-resolution of the sine waves and the way that the amplitude is applied to each
-operator.  Dexed comes with three engine types:
-
-@enumerate
-@item Modern: this is the original 24-bit implementation.
-@item Mark I: Based on the OPL Series but at a higher resolution (LUT are
-  10-bits).  The target of this engine is to be closest to the real DX7.
-@item OPL Series: this is an experimental 8-bit implementation of the reversed
-  engineered OPL family chips.
-@end enumerate
-")
-    (license license:gpl3+)))
-
 (define-public dsp
  (package
    (name "dsp")
@@ -3424,30 +3282,6 @@ from being able to mix multiple JACK audio streams.")
    (home-page "https://rdio.space/jackmixer/")
    (license license:gpl2+)))

-(define-public pipemixer
-  (package
-    (name "pipemixer")
-    (version "0.4.0")
-    (source
-     (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/heather7283/pipemixer")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
-    (build-system meson-build-system)
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libinih ncurses pipewire-minimal))
-    (synopsis "TUI volume control app for pipewire.")
-    (description "This is a TUI volume control application for pipewire built with
-ncurses. Heavily inspired by pulsemixer and pwvucontrol.")
-    (home-page "https://github.com/heather7283/pipemixer")
-    (license license:gpl3)))
-
 (define-public jalv
  (package
    (name "jalv")
@@ -31,7 +31,6 @@
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
-;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1398,7 +1397,7 @@ RNA-seq or spatial transcriptomics.")
                               python-anndata
                               python-geosketch
                               python-scanpy
-                               python-scvelo))
+                               scvelo))
      (native-inputs (list r-knitr))
      (home-page "https://github.com/WWXkenmo/NetID_package")
      (synopsis
@@ -17087,7 +17086,7 @@ The following file formats are supported:
              "-DCMAKE_CXX_FLAGS=\"-DHAVE_NUMERIC_LIMITS128=1\""
              "-Dlibgff_FOUND=TRUE"
              "-DTBB_FOUND=TRUE"
-              #$(string-append "-DTBB_VERSION=" (package-version onetbb))
+              #$(string-append "-DTBB_VERSION=" (package-version tbb))
              "-DFETCHED_PUFFERFISH=TRUE"
              "-DUSE_SHARED_LIBS=TRUE")
       #:phases
@@ -17174,7 +17173,7 @@ The following file formats are supported:
           htscodecs
           jemalloc
           libgff
-           onetbb
+           tbb
           libstadenio-for-salmon
           xz
           zlib))
@@ -17507,6 +17506,52 @@ t-SNE algorithm.  The implementation is described here:
@url{http://lvdmaaten.github.io/publications/papers/JMLR_2014.pdf}.")
      (license license:bsd-3))))

+(define-public python-multivelo
+  (package
+    (name "python-multivelo")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "multivelo" version))
+              (sha256
+               (base32
+                "1b4qyngwagh5sc2ygyfqyirg63myzh1g1glk03a1ykxfii32cjlp"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f                       ;pypi source does not contain tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'sanity-check 'set-env
+            (lambda _
+              ;; numba RuntimeError: cannot cache function 'rdist'
+              (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+    (native-inputs (list python-pypa-build))
+    (propagated-inputs
+     (list python-anndata
+           python-h5py
+           python-ipywidgets
+           python-joblib
+           python-loompy
+           python-matplotlib
+           python-numba
+           python-numpy
+           python-pandas
+           python-scanpy
+           python-scikit-learn
+           python-scipy
+           python-seaborn
+           python-tqdm
+           python-umap-learn
+           scvelo))
+    (home-page "https://github.com/welch-lab/MultiVelo")
+    (synopsis "Velocity inference from single-cell multi-omic data")
+    (description "MultiVelo uses a probabilistic latent variable model to
+estimate the switch time and rate parameters of gene regulation, providing a
+quantitative summary of the temporal relationship between epigenomic and
+transcriptomic changes.")
+    (license license:bsd-3)))
+
 (define-public python-mygene
  (package
    (name "python-mygene")
@@ -24336,9 +24381,9 @@ aligner.")
    ;; bwa itself is licenced under GNU General Public License v3.0.
    (license license:mpl2.0)))

-(define-public python-scvelo
+(define-public scvelo
  (package
-    (name "python-scvelo")
+    (name "scvelo")
    (version "0.3.3")
    (source
     (origin
@@ -24397,9 +24442,6 @@ adapts RNA velocity to widely varying specifications such as non-stationary
 populations.")
    (license license:bsd-3)))

-(define-deprecated-package scvelo
-  python-scvelo)
-
 (define-public scregseg
  ;; 0.1.3 was released in 2023, there are a lot of comparability fixes on
  ;; master branch, use the latest commit for now.
@@ -370,14 +370,6 @@ across a broad spectrum of applications.")
     (modify-inputs (package-native-inputs boost)
       (append python-numpy-1)))))

-(define-public boost-with-numpy
-  (package
-    (inherit boost)
-    (name "boost-with-numpy")
-    (native-inputs
-     (modify-inputs (package-native-inputs boost)
-       (append python-numpy)))))
-
 (define-public boost-sync
  (let ((commit "e690de2d30e2f1649ff500c9a6f3539814994b1c")
        (version "1.55")
@@ -853,7 +853,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
 (define u-boot
  (package
    (name "u-boot")
-    (version "2026.01")
+    (version "2025.01")
    (source
     (origin
       (method git-fetch)
@@ -862,8 +862,9 @@ tree binary files.  These are board description files used by Linux and BSD.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1ics2b560gjqh7f1b194axy5rdplrgxhpifay61zpa6p5gl4fxsz"))
-       (patches (search-patches "u-boot-allow-disabling-openssl.patch"))
+        (base32 "1i1v86bnixh8hyqbwwr5iwdnnadmg2fqxw9g526fvclsbvl8lz0v"))
+       (patches (search-patches "u-boot-allow-disabling-openssl.patch"
+                                "u-boot-rockchip-inno-usb.patch"))
       (snippet
        ;; Remove non-free binary licenses, blobs and microcode.
        #~(begin
@@ -927,8 +928,6 @@ also initializes the boards (RAM etc).")
       (append fontconfig
               python-sphinx
               python-sphinx-prompt
-               ; python-sphinx-rtd-theme ; optional
-               python-sphinx-reredirects
               texinfo
               which)))
    (synopsis "U-Boot documentation")
@@ -1009,9 +1008,8 @@ def test_ctrl_c"))
                           ;; to GPL/Openssl license incompatibilities.
                           ;; See https://bugs.gnu.org/34717 for
                           ;; details.
-                           (("CONFIG_FIT=y")
-                            "CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=n
+                           (("CONFIG_FIT_SIGNATURE=y")
+                            "CONFIG_FIT_SIGNATURE=n
 CONFIG_UT_LIB_ASN1=n
 CONFIG_TOOLS_LIBCRYPTO=n
 CONFIG_TOOLS_KWBIMAGE=n")
@@ -1464,7 +1462,7 @@ partition."))
      ;; These disabled features require OpenSSL, which is
      ;; incompatible with the GPLv2-only parts of U-boot.
      #:configs (map (cut string-append "# CONFIG_" <> " is not set")
-                     '("FIT_CIPHER" "MBEDTLS_LIB" "HKDF_MBEDTLS"))
+                     '("FIT_CIPHER" "MBEDTLS_LIB"))
      #:append-description
      "The sandbox configuration of U-Boot provides a @command{u-boot}
 command that runs as a normal user space application.  It can be used to
@@ -194,8 +194,7 @@ bioinformatics, materials science, and related areas.")
           (sha256
             (base32
               "1vhjh0gilmm90269isrkvyzwwh1cj3bwcxls394psadw1a89mk14"))))))
-    (inputs (list avogadrolibs hdf5 molequeue openbabel qtbase-5 qtsvg-5
-                  qtwayland-5))
+    (inputs (list avogadrolibs hdf5 molequeue openbabel qtbase-5 qtsvg-5))
    ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
    (arguments
     (list
@@ -217,8 +216,7 @@ bioinformatics, materials science, and related areas.")
                (list
                  "QT_PLUGIN_PATH"
                  'suffix
-                  (list (string-append #$qtsvg-5 "/lib/qt5/plugins")
-                        (string-append #$qtwayland-5 "/lib/qt5/plugins")))))))))
+                  (list (string-append #$qtsvg-5 "/lib/qt5/plugins")))))))))
    (home-page "https://www.openchemistry.org/projects/avogadro2/")
    (synopsis "Advanced molecule editor")
    (description
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019-2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2019-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
 ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -571,33 +571,36 @@ Cmake files.  It supports syntax highlighting, indenting and refilling of
 comments.")))

 (define-public qmsetup
-  (package
-    (name "qmsetup")
-    (version "1.0.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/stdware/qmsetup")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0cfl26ff8y384cbgi340l1znxvdjmc4f5s86kl20gkkwlkc11zdy"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #f                     ;no test suite
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'patch-paths
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (substitute* "src/corecmd/utils_unix.cpp"
-                         (("\"patchelf\"")
-                          (format #f "~s" (search-input-file
-                                           inputs "bin/patchelf")))))))))
-    (inputs (list patchelf syscmdline))
-    (home-page "https://github.com/stdware/qmsetup")
-    (synopsis "CMake modules and basic libraries for C/C++ projects")
-    (description "QMSetup is a set of CMake Modules and Basic Libraries for
+  (let ((commit "89fa57046241c26dfcfd97ceba174728b24bdd27")
+        (revision "0"))
+    (package
+      (name "qmsetup")
+      ;; The base version string is retrieved from the CMakeLists.txt file.
+      (version (git-version "0.0.1.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/stdware/qmsetup")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0nqpblv08yqv97vjv7cxkpf160s3877gnd7jjqxnfrrknm2396r1"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no test suite
+        #:phases #~(modify-phases %standard-phases
+                     (add-after 'unpack 'patch-paths
+                       (lambda* (#:key inputs #:allow-other-keys)
+                         (substitute* "src/corecmd/utils_unix.cpp"
+                           (("\"patchelf\"")
+                            (format #f "~s" (search-input-file
+                                             inputs "bin/patchelf")))))))))
+      (inputs (list patchelf syscmdline))
+      (home-page "https://github.com/stdware/qmsetup")
+      (synopsis "CMake modules and basic libraries for C/C++ projects")
+      (description "QMSetup is a set of CMake Modules and Basic Libraries for
 C/C++ projects.  It features:
@itemize
@item Helpful CMake utilities
@@ -607,7 +610,7 @@ C/C++ projects.  It features:
@item Support calling Doxygen via CMake conveniently
@item Support calling Qt Linguist Tools via CMake conveniently
@end itemize")
-    (license license:expat)))
+      (license license:expat))))

 (define-public tinycmmc
  ;; XXX: Does not release anymore.
@@ -424,7 +424,7 @@ COCOMO model or user-provided parameters.")
 (define-public cloc
  (package
    (name "cloc")
-    (version "2.08")
+    (version "2.06")
    (source
     (origin
       (method git-fetch)
@@ -433,7 +433,7 @@ COCOMO model or user-provided parameters.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1pk4v9w2c8wzdjimk23gndrcrd3y6cxi0avds3a36yasd3mg45hm"))))
+        (base32 "02l56ks3p3344nf6lz9s3aym9f0xslkns8q8d8zm1i3whf98iymv"))))
    (build-system gnu-build-system)
    (inputs
     (list bash-minimal
@@ -8,7 +8,7 @@
 ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
 ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2020, 2021, 2023-2026 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020, 2021, 2023, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020, 2021, 2022, 2024, 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
@@ -31,7 +31,7 @@
 ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022-2025 David Elsing <david.elsing@posteo.net>
 ;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2022-2024, 2026 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;; Copyright © 2023, 2025 Sughosha <Sughosha@disroot.org>
 ;;; Copyright © 2023, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -1718,36 +1718,32 @@ lock-free fixed size queue written in C++11.")
    (license license:expat)))

 (define-public syscmdline
-  (let ((commit "0c9f3de8b11bd2f33b03bea5521bf446af4ead69")
-        (revision "0"))
-    (package
-      (name "syscmdline")
-      ;; The version string is taken from
-      ;; <https://raw.githubusercontent.com/SineStriker/syscmdline/refs/heads/main/CMakeLists.txt>.
-      (version (git-version "1.0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/SineStriker/syscmdline")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "168dij7p2kjl0qs3k5lzrnbzf2s2mbfpm83jimk028whx8cbv4jh"))))
-      (build-system cmake-build-system)
-      (arguments
-       (list #:configure-flags
-             #~(list "-DSYSCMDLINE_BUILD_STATIC=OFF" ;build a shared library
-                     "-DSYSCMDLINE_BUILD_TESTS=ON")
-             #:phases #~(modify-phases %standard-phases
-                          (replace 'check
-                            ;; There isn't currently any exposed test target.
-                            (lambda* (#:key tests? #:allow-other-keys)
-                              (when tests?
-                                (invoke "bin/tst_basic")))))))
-      (home-page "https://github.com/SineStriker/syscmdline")
-      (synopsis "C++ advanced command line parser")
-      (description "SysCmdLine is a C++ command line parser that is inspired by
+  (package
+    (name "syscmdline")
+    (version "0.0.1.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/SineStriker/syscmdline")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "00n9vkyymp1dzixxl93f6pkpd3ndsk1vib7shhlxv4zvy5hjqhqw"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DSYSCMDLINE_BUILD_STATIC=OFF" ;build a shared library
+                   "-DSYSCMDLINE_BUILD_TESTS=ON")
+           #:phases #~(modify-phases %standard-phases
+                        (replace 'check
+                          ;; There isn't currently any exposed test target.
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "bin/tst_basic")))))))
+    (home-page "https://github.com/SineStriker/syscmdline")
+    (synopsis "C++ advanced command line parser")
+    (description "SysCmdLine is a C++ command line parser that is inspired by
@code{QCommandLineParser} from Qt and @code{System.CommandLine} from C#.  It
 has features such as:
@itemize
@@ -1762,7 +1758,7 @@ has features such as:
@item Highly configurable
@item Friendly interface
@end itemize")
-      (license license:expat))))
+    (license license:expat)))

 (define-public gperftools
  (package
@@ -3700,9 +3696,9 @@ different floating point sizes and complex transformations.")
      (license license:bsd-3))))

 (define-public priocpp
-  ;; Latest release is from 2022-08-14.
-  (let ((commit "ea15402adcd0d9191dc29ca6f7e4dd0bff67b9b5")
-        (revision "1"))
+  ;; XXX: No releases.
+  (let ((commit "214a0ff789d5c58e76d870fe2e75f98857991855")
+        (revision "0"))
    (package
      (name "priocpp")
      (version (git-version "0.0.0" revision commit))
@@ -3714,15 +3710,15 @@ different floating point sizes and complex transformations.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0x4cgivaprj5c74yyyzny5dsg288w9y8sf21h79sl9r303ins867"))))
+          (base32 "0ksrgajcwqvim5ymxikj26akza3sbhvx3kn4n9xib6r57131kq2m"))))
      (build-system cmake-build-system)
      (arguments
       (list
        #:configure-flags
        #~(list "-DBUILD_TESTS=ON")))
-      (inputs (list fmt-10 logmich))
+      (inputs (list fmt-8 logmich))
      (native-inputs (list googletest pkg-config tinycmmc))
-      ;; TODO: cmake-built dependents currently require propagation -- why?
+      ;; XXX: CMake-built dependents currently require propagation.
      (propagated-inputs (list jsoncpp sexp-cpp))
      (home-page "https://github.com/Grumbel/priocpp")
      (synopsis "Property input/output for C++")
@@ -4152,16 +4148,16 @@ features:
 (define-public juce
  (package
    (name "juce")
-    (version "8.0.12")
+    (version "8.0.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://github.com/juce-framework/JUCE")
-                     (commit version)))
+                    (url "https://github.com/juce-framework/JUCE")
+                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0m4kbpwg2gblnilly0h2a3rr7f7lb13gsx4fvs2mnvyvy6jfbbls"))))
+                "1n2w571wc7fl178x5ynxiaxvhjvqskfwnd0x295yzr6vpc35a1mv"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test suite
@@ -4171,17 +4167,20 @@ features:
               (add-after 'unpack 'patch-paths
                 (lambda* (#:key inputs #:allow-other-keys)
                   (substitute*
-                       (find-files "." "juce_Fonts_linux.cpp$")
+                       (find-files "." "jucer_ProjectExport_CodeBlocks.h$")
+                     (("/usr/include/freetype2")
+                      (search-input-directory inputs "/include/freetype2")))
+                   (substitute*
+                       (find-files "." "juce_linux_Fonts.cpp$")
                     (("fonts\\.conf\" };")
                      (string-append
-                       "fonts.conf\",\n\""
+                       "fonts.conf\"\n\""
                       (search-input-file inputs "/etc/fonts/fonts.conf")
                       "\"\n};"))))))))
    (native-inputs
     (list alsa-lib
           curl
-           jack-2
-           ladspa
+           jack-1
           libx11
           pkg-config
           webkitgtk-with-libsoup2))
@@ -45477,7 +45477,7 @@ well as extracting and replacing names and symbols from these objects.")
               ((".*use_nan is working.*" m)
                (string-append m "skip('skip');\n"))))))))
    (native-inputs (list r-entropy r-knitr r-proxy r-testthat))
-    (inputs (list onetbb))
+    (inputs (list tbb))
    (propagated-inputs
     (list r-matrix r-rcpp r-rcpparmadillo))
    (home-page "https://cran.r-project.org/package=proxyC")
@@ -1739,16 +1739,16 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.")
 (define-public keychain
  (package
    (name "keychain")
-    (version "2.9.8")
+    (version "2.9.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/danielrobbins/keychain")
+                    (url "https://github.com/funtoo/keychain")
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1ps1hm6xf12agbrgw3jpja28q6b52cpa0fgsvkyhp4j1b2hfhkf6"))))
+                "0nj5rq9vzvf5g8axmicy5zfcjir7a6fr1ai4ha3cpqj4zgridga7"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1775,7 +1775,7 @@ with various operating systems (including GNU/Linux and HURD) and
 shells (like bourne-compatible, csh-compatible and fish shells).  By
 default Keychain will only start ssh-agent, but it can also be
 configured to start gpg-agent.")
-    (home-page "https://github.com/danielrobbins/keychain")
+    (home-page "https://www.funtoo.org/Keychain")
    (license license:gpl2)))

 (define-public libdigidocpp
@@ -1814,7 +1814,7 @@ for creation and reading of DigiDoc files.")
 (define-public osslsigncode
  (package
    (name "osslsigncode")
-    (version "2.12")
+    (version "2.11")
    (source
     (origin
       (method git-fetch)
@@ -1823,7 +1823,7 @@ for creation and reading of DigiDoc files.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "000balq0cw49jra9gvr8dk8x7ns9gd77qim3z8qci5rrkjbb8nai"))))
+        (base32 "17vzkrv4qzjrjinjlgk8fbimkzd5b5akkpangkpn8cdficxgibxr"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -79,8 +79,7 @@
 (define-public diffoscope
  (package
    (name "diffoscope")
-    ;; Use git snapshot to fix tests using u-boot-tools 2026.01
-    (version "311-2-ge4ec97f7")
+    (version "308")
    (source
     (origin
       (method git-fetch)
@@ -89,7 +88,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1nk8di19r5x5jwb2jh1m7mzj109z2a2axikysijz2hm7m30wjkq7"))))
+        (base32 "0g4kac0r2plhcl3drpihp2z99yfqlz36xvvfr4v6sn49zj103kny"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -999,7 +999,7 @@ format is completely customizable.")
 (define-public f3
  (package
    (name "f3")
-    (version "9.0")
+    (version "8.0")
    (source
     (origin
      (method git-fetch)
@@ -1008,7 +1008,7 @@ format is completely customizable.")
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "0k9299phdxp0yag0mm58sfrbqmb19zvia57wgcaqawf9clafba35"))))
+       (base32 "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678"))))
    (build-system gnu-build-system)
    (arguments
     (list #:tests? #f                      ; no check target
@@ -1114,7 +1114,8 @@ Duperemove can also take input from the @command{fdupes} program.")
    (source
     (origin
       (method url-fetch)
-       (uri (string-append "https://ranger.fm/ranger-" version ".tar.gz"))
+       (uri (string-append "https://ranger.github.io/" "ranger-" version
+                           ".tar.gz"))
       (sha256
        (base32 "128ggxfhfmckl7x89flwxks7gxq0m02insdizcsp62193c6mxmvs"))))
    (build-system pyproject-build-system)
@@ -1122,13 +1123,6 @@ Duperemove can also take input from the @command{fdupes} program.")
     (list
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'unpack 'set-paths
-            (lambda _
-              (substitute* (find-files "ranger" "\\.py$")
-                (("\"file\"")
-                 (simple-format #f "~s"
-                   #$(file-append (this-package-input "file")
-                                  "/bin/file"))))))
          (add-after 'install 'wrap-program
            ;; Tell 'ranger' where 'w3mimgdisplay' is.
            (lambda _
@@ -1140,8 +1134,8 @@ Duperemove can also take input from the @command{fdupes} program.")
                  `("W3MIMGDISPLAY_PATH" ":" prefix
                    (,w3mimgdisplay)))))))))
    (native-inputs (list python-pytest python-setuptools python-wheel))
-    (inputs (list bash-minimal file w3m))
-    (home-page "https://ranger.fm")
+    (inputs (list bash-minimal w3m))
+    (home-page "https://ranger.github.io/")
    (synopsis "Console file manager")
    (description
     "ranger is a console file manager with Vi key bindings.  It provides a
@@ -111,7 +111,6 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-check)
-  #:use-module (gnu packages python-compression)
  #:use-module (gnu packages python-science)
  #:use-module (gnu packages python-web)
  #:use-module (gnu packages python-xyz)
@@ -252,7 +251,7 @@ formal verification.")
  (package
    (inherit abc)
    (name "abc-yosyshq")
-    (version "0.62")
+    (version "0.61")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -261,7 +260,7 @@ formal verification.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1f3nza8w5r0z2pkngf5iyqgrl23l5qqr7d4gkh3grs72wrrrbmyz"))))
+                "0x6662719qdybkd46vh9aq3p20xngwn9g81155j96a4r6jdqm1js"))))
    (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.")
@@ -324,48 +323,6 @@ supporting gerber, excellon and g-code.  It is part of the RiNgDove EDA
 suite.")
    (license license:gpl2+)))

-(define-public ciel
-  (package
-    (name "ciel")
-    (version "2.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/fossi-foundation/ciel")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0cj4cpmpqi7aqj9jkpp87qs9bjcg3j97adv1s91pnfrkplff8rh1"))))
-    (arguments
-     (list
-      #:tests? #f ;no tests
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'wrap 'wrap-ciel
-            (lambda* (#:key inputs #:allow-other-keys)
-              (wrap-program (string-append #$output "/bin/ciel")
-                `("PATH" ":" prefix
-                  (,(string-append
-                     (assoc-ref inputs "git-minimal") "/bin")))))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-poetry-core))
-    (inputs
-     (list bash-minimal
-           git-minimal
-           python-click
-           python-httpx
-           python-pcpp
-           python-rich
-           python-zstandard))
-    (home-page "https://github.com/fossi-foundation/ciel")
-    (synopsis
-     "Version manager for open-source @acronym{PDKs, Process Design Kits}")
-    (description
-     "@code{ciel} downloads and installs open-source PDKs which are used for
-chip design and @acronym{EDA, Electronic Design Automation}.")
-    (license license:asl2.0)))
-
 (define-public comedilib
  (package
    (name "comedilib")
@@ -390,7 +347,7 @@ individual low-level driver modules.")
 (define-public eqy
  (package
    (name "eqy")
-    (version "0.62")
+    (version "0.61")
    (source
     (origin
       (method git-fetch)
@@ -1386,7 +1343,7 @@ versus schematic} tests and can assist with automatic routing.")
 (define-public mcy
  (package
    (name "mcy")
-    (version "0.62")
+    (version "0.61")
    (source
     (origin
       (method git-fetch)
@@ -1624,7 +1581,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
 (define-public nvc
  (package
    (name "nvc")
-    (version "1.19.0")
+    (version "1.18.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1633,7 +1590,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0a2q7lsjps1yrmpmr3j6sz4rx4jgdm79382xyn6c862qzs69impp"))))
+                "0930bjaprvx9d0g8152xyzl2hxbx34gd36198ljvr55brrisfmvb"))))
    (build-system gnu-build-system)
    (arguments
     (list #:out-of-source? #t
@@ -2248,29 +2205,8 @@ for @acronym{EDA, elecronic design automation} and chip design.")))
       (file-name (git-file-name name version))))
    (build-system pyproject-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              ;; Run the tests as specified in pyproject.toml.
-              (when tests?
-                (invoke "python"
-                        #$(plain-file "python-klayout-test-runner.py"
-                                      "import tomllib, subprocess
-with open(\"pyproject.toml\", \"rb\") as f:
-    config = tomllib.load(f)
-
-commands = config['tool']['cibuildwheel']['test-command']
-
-for command in commands:
-    subprocess.run(command.format(package=\".\").split())"))))))))
-    (native-inputs (list curl
-                         expat
-                         libpng
-                         python-setuptools
-                         python-tomli
-                         python-wrapper)) ;; The test commands invoke "python".
+     '(#:tests? #f))
+    (native-inputs (list curl expat libpng python-setuptools python-tomli))
    (home-page "https://klayout.de")
    (synopsis "Mask layout library for Python")
    (description
@@ -3331,7 +3267,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
 (define-public sby
  (package
    (name "sby")
-    (version "0.62")
+    (version "0.61")
    (source
     (origin
       (method git-fetch)
@@ -3340,7 +3276,7 @@ them usable as simple logic analyzer and/or oscilloscope hardware.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "03l60j3darb7xlfbzhqw78m0xsmqsy5q3i2zrxd669zzlbpqwq4s"))))
+        (base32 "02b3jl3wk93lz0snz2v6kgxhlr7gg9l1gksfmafj2vvy45zhj1fx"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -3759,20 +3695,15 @@ parallel computing platforms.  It also supports serial execution.")
 (define-public yosys
  (package
    (name "yosys")
-    (version "0.62")
+    (version "0.61")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
              (url "https://github.com/YosysHQ/yosys")
              (commit (string-append "v" version))))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils)
-                         (srfi srfi-26))
-            (delete-file-recursively "abc")))
       (sha256
-        (base32 "1x4j191wsp276jallp0xr92z19q4r5ddy2vr8vli95nrn5chy1hl"))
+        (base32 "1z96wvgm12vcsp88xkdljvhrrx9b8wc9y2gwjsff83jsp2q0q2wp"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -1779,43 +1779,41 @@ STC89, STC90, STC10, STC11, STC12, STC15, STC8 and STC32 series.")
    (license license:expat)))

 (define-public stlink
-  (let ((commit "6a6718b3342b6c5e282a4e33325b9f97908a0692")
-        (revision "0"))
-    (package
-      (name "stlink")
-      (version (git-version "1.8.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/stlink-org/stlink")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1sk9qr3f8v1rm735vq6pxckgwzsgr4k2kl6skh79f4v2qm0hc4qd"))))
-      (build-system cmake-build-system)
-      (arguments
-       (list #:tests? #f                      ;no tests
-             #:configure-flags
-             #~(let* ((etc (in-vicinity #$output "etc"))
-                      (modprobe (in-vicinity etc "modprobe.d"))
-                      (udev-rules (in-vicinity etc "udev/rules.d")))
-                 (list (string-append "-DSTLINK_UDEV_RULES_DIR=" udev-rules)
-                       (string-append "-DSTLINK_MODPROBED_DIR=" modprobe)))))
-      (inputs
-       (list libusb))
-      (synopsis "Programmer for STM32 Discovery boards")
-      (description "This package provides a firmware programmer for the STM32
-  Discovery boards.  It supports two versions of the chip: ST-LINK/V1 (on
-  STM32VL discovery kits) and ST-LINK/V2 (on STM32L discovery and later kits).
-  Two different transport layers are used: ST-LINK/V1 uses SCSI passthru
-  commands over USB, and ST-LINK/V2 and ST-LINK/V2-1 (seen on Nucleo boards) use
-  raw USB commands.")
-      (home-page "https://github.com/stlink-org/stlink")
-      ;; The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are
-      ;; licensed under the GPLv2+.
-      (license (list license:bsd-3 license:gpl2+)))))
+  (package
+    (name "stlink")
+    (version "1.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/stlink-org/stlink")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1g5ahnj400sdf75k3xafawa6x0pzz7s86nqnfd65gqjr3bdlhlc6"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f                      ;no tests
+           #:configure-flags
+           #~(let* ((etc (in-vicinity #$output "etc"))
+                    (modprobe (in-vicinity etc "modprobe.d"))
+                    (udev-rules (in-vicinity etc "udev/rules.d")))
+               (list (string-append "-DSTLINK_UDEV_RULES_DIR=" udev-rules)
+                     (string-append "-DSTLINK_MODPROBED_DIR=" modprobe)))))
+    (inputs
+     (list libusb))
+    (synopsis "Programmer for STM32 Discovery boards")
+    (description "This package provides a firmware programmer for the STM32
+Discovery boards.  It supports two versions of the chip: ST-LINK/V1 (on
+STM32VL discovery kits) and ST-LINK/V2 (on STM32L discovery and later kits).
+Two different transport layers are used: ST-LINK/V1 uses SCSI passthru
+commands over USB, and ST-LINK/V2 and ST-LINK/V2-1 (seen on Nucleo boards) use
+raw USB commands.")
+    (home-page "https://github.com/stlink-org/stlink")
+    ;; The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are
+    ;; licensed under the GPLv2+.
+    (license (list license:bsd-3 license:gpl2+))))

 (define-public west
  (package
@@ -26,7 +26,6 @@
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.comg>
 ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;; Copyright © 2025 Laura Kirsch <laurakirsch240406@gmail.com>
-;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4383,44 +4382,6 @@ of the Nestopia emulator.")
    (license (list license:gpl2+        ;this project
                   license:lgpl2.1+)))) ;nes_ntsc source files

-(define-public libretro-nestopia
-  (let ((commit "473d3072be67fa2542ca833c274ef6682cf0f0bc")
-        (revision "0"))
-    (package
-      (inherit jg-nestopia)
-      (name "libretro-nestopia")
-      (version (git-version "2.0" ;from libretro/libretro_core_options.h
-                            revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/libretro/nestopia")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "01gfwm6ig9ih4yw34fw4hdg6qsyzyjx3v4rvzb0bwk31453v9vhx"))))
-      (arguments
-       (list
-        #:tests? #f ;no test suite
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'change-to-build-dir
-              (lambda _
-                (chdir "libretro")))
-            (delete 'configure)
-            (replace 'install
-              (lambda _
-                (let ((out (string-append #$output "/lib/libretro")))
-                  (mkdir-p out)
-                  (install-file "nestopia_libretro.so" out)))))))
-      (synopsis "Libretro port of Nestopia NES/Famicom emulator")
-      (description
-       "This is the libretro port of the Nestopia emulator, based on the de
-facto upstream Nestopia JG fork, which lives at:
-https://gitlab.com/jgemu/nestopia.  The libretro port contains an additional
-overclocking feature."))))
-
 (define-public jg-cega
  (package
    (name "jg-cega")
@@ -176,6 +176,7 @@
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages stb)
  #:use-module (gnu packages swig)
+  #:use-module (gnu packages tbb)
  #:use-module (gnu packages tcl)
  #:use-module (gnu packages tex)
  #:use-module (gnu packages texinfo)
@@ -1142,7 +1143,7 @@ Emacs).")
 (define-public kicad
  (package
    (name "kicad")
-    (version "9.0.7")
+    (version "9.0.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1150,7 +1151,7 @@ Emacs).")
                    (commit version)))
              (sha256
               (base32
-                "0glsdq5c54d2sif0jmpym79i6vham5w3kzcvcr0yq5nimqig7h0q"))
+                "0mfnlx0dlpk3jz1b8pard6b7ax1ycyv069k4vg89ph2bia1a9d98"))
              (file-name (git-file-name name version))))
    (build-system cmake-build-system)
    (arguments
@@ -1267,7 +1268,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1b03mc5ad0w3lhgig131jkfa243mlkzk9myjyr78lhqw07k7sxk2"))))
+                "0sdardnkr8ayrzahhy8hmq5yhlh1fprj5rxf7wq44cn2biyzfr5c"))))
    (build-system cmake-build-system)
    (arguments
     `(#:configure-flags (list "-DBUILD_FORMATS=html")
@@ -1298,7 +1299,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4"))))
+                "03k3y86mgc10ir5l1gdzc0r7w1gg7iavb1zl31kgfh9hnfmgv06w"))))
    (build-system cmake-build-system)
    (arguments
     `(#:tests? #f))                    ; no tests exist
@@ -1327,7 +1328,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524"))))
+                "0jzkrmzkxv3kqqmkpq5dpp3shy9ajfg1b1yzhk4ddzvy8l05qym4"))))
    (synopsis "Official KiCad footprint libraries")
    (description "This package contains the official KiCad footprint libraries.")))

@@ -1344,7 +1345,7 @@ libraries.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1bv1k8i01x7gyayrlkzl3d2nsf7mcdmzx8gjwx1i2va9557rgli9"))))
+                "04hw6b4hyl2plfgynin3dv7siqml4341264wz2wngddszq8z32ki"))))
    (synopsis "Official KiCad 3D model libraries")
    (description "This package contains the official KiCad 3D model libraries.")))

@@ -3089,7 +3090,7 @@ but also adds new features and improves existing ones.")
 (define-public emacs-scad-mode
  (package
    (name "emacs-scad-mode")
-    (version "98.0")
+    (version "97.0")
    (source
     (origin
       (method git-fetch)
@@ -3097,7 +3098,7 @@ but also adds new features and improves existing ones.")
             (url "https://github.com/openscad/emacs-scad-mode")
             (commit version)))
       (sha256
-        (base32 "19mn6z98c8s7mspa7j8xw7za33gmpsy4iw2r9xiggdv7yh6mh8h8"))
+        (base32 "1h86z2qn9q7ww2m7p992fx8abzdffcd3bcp3bmck3c9q2aksjl5j"))
       (file-name (git-file-name name version))))
    (build-system emacs-build-system)
    (propagated-inputs (list emacs-compat))
@@ -4154,7 +4155,7 @@ perform various useful functions such as:
       ("gmp" ,gmp)
       ("mesa" ,mesa)
       ("mpfr" ,mpfr)
-       ("onetbb" ,onetbb)
+       ("tbb" ,tbb)
       ("tinyxml2" ,tinyxml2)
       ("openblas" ,openblas)
       ("imgui" ,imgui)
@@ -4421,7 +4422,7 @@ G-codes to binary and vice versa.")
           ;; with regular wxwidgets.
           prusa-wxwidgets
           qhull
-           onetbb
+           tbb
           webkitgtk-for-gtk3
           webkitgtk-with-libsoup2
           z3
@@ -758,7 +758,7 @@ from a mounted file system.")
  ;; completions by running a native bcachefs binary at build time.
  (package
    (name "bcachefs-tools-minimal")
-    (version "1.35.1")
+    (version "1.11.0")
    (source
     (origin
       (method git-fetch)
@@ -767,7 +767,7 @@ from a mounted file system.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
+        (base32 "0m6z8z1cv78ay9yspypgr0kv70ck4wpln5n44f6n57i7sihqhrrg"))))
    (build-system cargo-build-system)
    (arguments
     (list
@@ -778,11 +778,6 @@ from a mounted file system.")
      #:vendor-dir "../guix-vendor"
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'unpack 'add-version
-            (lambda _
-              (with-output-to-file ".version"
-                (lambda ()
-                  (display #$version)))))
          (replace 'build
            (lambda* (#:key parallel-build? #:allow-other-keys)
              (apply invoke "make"
@@ -795,12 +790,8 @@ from a mounted file system.")
            ;; ‘make install’ hard-codes target/release/bcachefs, which is
            ;; incorrect when passing --target, as required to cross-compile or
            ;; even just link statically.  We always pass it, so always patch.
-            ;; 'make install' also always installs sources for kernel module
-            ;; build, which is packaged separately in Guix, so disable here.
            (lambda _
              (substitute* "Makefile"
-                (("install: all install_dkms")
-                 "install: all")
                (("target/release")
                 #$(bcachefs-tools-target/release)))))
          (replace 'install
@@ -840,21 +831,25 @@ performance and other characteristics.")

 (define-public bcachefs-tools
  ;; The final public package with shell completion even when cross-compiling,
-  ;; as well as optional features.
+  ;; as well as optional features such as FUSE (‘bcachefs fusemount’).
  (package
    (inherit bcachefs-tools-minimal)
    (name "bcachefs-tools")
    (arguments
     (substitute-keyword-arguments
-         (package-arguments bcachefs-tools-minimal)
+	 (package-arguments bcachefs-tools-minimal)
       ((#:modules modules '())
-        `(,@modules
-          (guix build cargo-build-system)
+	`(,@modules
+	  (guix build cargo-build-system)
          (guix build utils)
          (srfi srfi-26)))
       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (add-after 'install 'install-completions
+	#~(modify-phases #$phases
+            (add-before 'build 'enable-fuse
+              (lambda _
+                ;; This must be an environment variable, not a make flag!
+                (setenv "BCACHEFS_FUSE" "1")))
+	    (add-after 'install 'install-completions
              (lambda* (#:key native-inputs #:allow-other-keys)
                (define bcachefs
                  (or (false-if-exception (search-input-file native-inputs
@@ -878,9 +873,12 @@ performance and other characteristics.")
                             "share/zsh/site-functions/_bcachefs")))))))))
    (native-inputs
     (append (package-native-inputs bcachefs-tools-minimal)
-             (if (%current-target-system)
-                 (list bcachefs-tools-minimal)
-                 (list))))))
+	     (if (%current-target-system)
+		 (list bcachefs-tools-minimal)
+		 (list))))
+    (inputs
+     (modify-inputs (package-inputs bcachefs-tools-minimal)
+       (append fuse)))))

 (define-public bcachefs-tools-minimal/static
  ;; The static variant is public for consistency with the other file system
@@ -894,14 +892,6 @@ performance and other characteristics.")
     (substitute-keyword-arguments (package-arguments bcachefs-tools-minimal)
       ((#:phases phases #~%standard-phases)
        #~(modify-phases #$phases
-            (add-after 'unpack 'patch-makefile
-              (lambda _
-                ;; Change in v1.13.0 (commit 3666da87) adds
-                ;; default-linker-libraries to RUSTFLAGS which breaks
-                ;; static builds by trying to link against libc
-                (substitute* "Makefile"
-                  (("export RUSTFLAGS:=\\$\\(RUSTFLAGS\\) -C default-linker-libraries")
-                    "export RUSTFLAGS:=$(RUSTFLAGS)"))))
            (add-after 'configure 'set-rust-flags
              (lambda _
                (setenv "RUSTFLAGS" (string-join
@@ -965,7 +955,7 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
 (define-public bcachefs-linux-module
  (package
    (name "bcachefs-linux-module")
-    (version "1.35.1")
+    (version "1.33.0")
    (source
     (origin
       (method git-fetch)
@@ -974,7 +964,7 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1jn7fqlvhr0iazfx31wamvmf3qmgrzlf9ghvz8qazk8b6ipv77fn"))))
+        (base32 "05lqw3mxi73nm1q4qv43p9hyiwi2hdx4nc9fzm7rxwip6ys1kqkd"))))
    (build-system linux-module-build-system)
    (arguments
     (list
@@ -982,14 +972,13 @@ minimal bcachefs-tools package.  It is meant to be used in initrds.")
      #:source-directory "build/src/fs/bcachefs"
      #:phases
      #~(modify-phases %standard-phases
-          (add-after 'unpack 'add-version
-            (lambda _
-              (with-output-to-file ".version"
-                (lambda ()
-                  (display #$version)))))
          (add-after 'unpack 'patch-source
-            (lambda _
+            (lambda* (#:key version #:allow-other-keys)
              (substitute* "Makefile"
+                ;; Remove unnecessary dependency on cargo
+                (("^VERSION=\\$.*$")
+                 (string-append "VERSION=\""
+                                #$version "\""))
                ;; Remove unnecessary dependencies
                (("^.*PKG_CONFIG.*$")
                 ""))))
@@ -1732,7 +1721,7 @@ with the included @command{xfstests-check} helper.")
 (define-public zfs
  (package
    (name "zfs")
-    (version "2.4.0")
+    (version "2.3.4")
    (outputs '("out" "module" "src"))
    (source
     (origin
@@ -1741,7 +1730,7 @@ with the included @command{xfstests-check} helper.")
                           "/download/zfs-" version
                           "/zfs-" version ".tar.gz"))
       (sha256
-        (base32 "1vn9fnpi279vb5y3pdplshq6qy2hixg7vr73q1a5bnbi1bg17pvv"))))
+        (base32 "15d47y4alicdl99pjidks9p1hqk9glz5y0w024d1ccq16v7rghwy"))))
    (build-system linux-module-build-system)
    (arguments
     (list
@@ -655,13 +655,13 @@ do so.")
 (define-public electrum-aionostr
  (package
    (name "electrum-aionostr")
-    (version "0.1.0")
+    (version "0.0.11")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "electrum_aionostr" version))
       (sha256
-        (base32 "117cgcll1p726qf8ar6mv1a4lgadkyf8c6l520p2g21367lghx1p"))))
+        (base32 "10fgidah8ca59j3gssg9b434j49c1dd9cs3224nanjsxwl0ivsqf"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -676,7 +676,8 @@ do so.")
                  python-electrum-ecc))
    (native-inputs (list python-click
                         python-pytest
-                         python-setuptools))
+                         python-setuptools
+                         python-wheel))
    (home-page "https://github.com/spesmilo/electrum-aionostr")
    (synopsis "Asyncio nostr client")
    (description "This package is a fork of @code{aionostr} that does not
@@ -686,16 +687,20 @@ require Coincurve.")
 (define-public electrum
  (package
    (name "electrum")
-    (version "4.7.0")
+    (version "4.6.1")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/spesmilo/electrum.git")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://download.electrum.org/"
+                           version "/Electrum-"
+                           version ".tar.gz"))
       (sha256
-        (base32 "15rkinaknaw199wrqcknnjy8989z1hwdcb3b4pdfd24fzkppa1kv"))))
+        (base32 "1h7z019sp99csrj1djmhlm9y7vyyzl7wvar7z9x4jx59lmmvs1xs"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete the bundled dependencies.
+           (delete-file-recursively "packages")))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -716,7 +721,7 @@ require Coincurve.")
          (add-before 'check 'set-home
            (lambda _ ; 3 tests run mkdir
              (setenv "HOME" "/tmp"))))))
-    (native-inputs (list python-pytest python-setuptools))
+    (native-inputs (list python-pytest python-setuptools python-wheel))
    (inputs
     (list electrum-aionostr
           python-aiohttp
@@ -2431,7 +2436,7 @@ files.")
 (define-public xmrig
  (package
    (name "xmrig")
-    (version "6.25.0")
+    (version "6.24.0")
    (source
     (origin
       (method git-fetch)
@@ -2439,7 +2444,7 @@ files.")
             (url "https://github.com/xmrig/xmrig")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
-       (sha256 (base32 "0hchl2vwsn7aps6y1zjhxczm8l8lvl5ac8hblwl3qj0y2n7iszjz"))
+       (sha256 (base32 "10q91sh29hlb7yd4lkfjsrk16qgb2j1z19ac77c9y7ccfci97f01"))
       (modules '((guix build utils)))
       (snippet
        ;; TODO: Try to use system libraries instead of bundled ones in
@@ -2488,7 +2493,7 @@ mining.")
 (define-public p2pool
  (package
    (name "p2pool")
-    (version "4.13")
+    (version "4.12")
    (source
     (origin
       (method git-fetch)
@@ -2497,7 +2502,7 @@ mining.")
             (commit (string-append "v" version))
             (recursive? #t)))
       (file-name (git-file-name name version))
-       (sha256 (base32 "1flpr0kzyl72hm5vjs9jixiv8fdhvwchlz3p2banb8naxlpads0x"))
+       (sha256 (base32 "0s2bx8yjyd4qspidrly4082b6h4sbkn26dy1cpbsj7cvv3m3gdv2"))
       (modules '((guix build utils)))
       (snippet
        #~(for-each delete-file-recursively
@@ -1308,7 +1308,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
        (string=? (%current-system) (gnu-triplet->nix-system triplet))))
  (package
    (name (downstream-package-name "arm-trusted-firmware-" platform))
-    (version "2.12.9")
+    (version "2.12.2")
    (source
     (origin
       (method git-fetch)
@@ -1318,7 +1318,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
              (commit (string-append "lts-v" version))))
       (file-name (git-file-name "arm-trusted-firmware" version))
       (sha256
-        (base32 "0zlb3g9qn7i8xr731nrsdqf00s03wv1ybhc28ka5nwniaccpg9dx"))
+        (base32 "01i40asy9dsbx4l5kbvsvi55bdf308nnraf8kfli5d4cx8pxqmrj"))
       (patches (search-patches "8mq-enable-imx_hab_handler.patch"
                                "8mq-move-stack-to-ocram_s.patch"))
       (modules '((guix build utils)))
@@ -2856,7 +2856,7 @@ to the C library @code{uchardet} to increase performance.")
 (define-public udiskie
  (package
    (name "udiskie")
-    (version "2.6.0")
+    (version "2.5.8")
    (source
     (origin
       (method git-fetch)
@@ -2865,7 +2865,7 @@ to the C library @code{uchardet} to increase performance.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0adj4ssl9zvq7vync9qznnlqhvx531nl4pg236app4d26j7iza35"))))
+        (base32 "0ccp55fgmcc4fsd7jsqla6k1m6v8zkn03i4axw446zh2nzxpanhl"))))
    (build-system pyproject-build-system)
    (arguments
     (list
@@ -3523,7 +3523,7 @@ notifies the user using any notification daemon implementing
 (define-public waypipe
  (package
    (name "waypipe")
-    (version "0.11.0")
+    (version "0.10.5")
    (source
     (origin
       (method git-fetch)
@@ -3532,7 +3532,7 @@ notifies the user using any notification daemon implementing
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1vszh1mk71jvyicsnac944jdmldrsaym9n70zjzbvjbliz4pzdsd"))
+        (base32 "1rg9qzsi07b65cdf421895dfy4gkb1kwmkwn3sfx6n7sfr8b1z6a"))
       (snippet
        #~(begin (use-modules (guix build utils))
                 ;; Fix the cargo flags:
@@ -29,7 +29,7 @@
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 dan <i@dan.games>
 ;;; Copyright © 2022 Cairn <cairn@pm.me>
-;;; Copyright © 2023-2026 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022-2023, 2025 Adam Faiz <adam.faiz@disroot.org>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024-2025 Maxim Cournoyer <maxim@guixotic.coop>
@@ -2547,7 +2547,7 @@ scripted in a Python-like language.")
 (define-public godot
  (package
    (name "godot")
-    (version "4.6")
+    (version "4.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2556,10 +2556,10 @@ scripted in a Python-like language.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1lwjydaa4cvnfrllxlryppcfmba3qq1518zi4qr5580n731xfg10"))
-              ;; TODO: Remove on next release; see
-              ;; <https://github.com/godotengine/godot/pull/93478>.
-              (patches (search-patches "godot-glslang.patch"))
+                "0s9ymgy9cwnk4v35qpn9fm993pn64h1i5k9khpd7mqs6023hl8i4"))
+              ;; TODO: Remove this patch on next update as it was merged post
+              ;; 4.5 release.
+              (patches (search-patches "godot-libjpeg-turbo-unbundle.patch"))
              (modules '((guix build utils)
                         (ice-9 ftw)
                         (srfi srfi-1)))
@@ -2582,12 +2582,17 @@ scripted in a Python-like language.")
                              "certs"
                              "clipper2"
                              "cvtt"
-                              "dr_libs"
                              "linuxbsd_headers"
                              "etc2comp"
                              "etcpak"
                              "fonts"
                              "glad"
+                              ;; TODO: Remove once Godot once again builds
+                              ;; with our glslang package, or with a
+                              ;; workaround.  Currently it looks for a Types.h
+                              ;; which is no longer in the glslang output
+                              ;; after the most recent update.
+                              "glslang"
                              ;; This is part of the simdjson package though
                              ;; modified by Godot.
                              "grisu2"
@@ -2607,7 +2612,6 @@ scripted in a Python-like language.")
                              "oidn"
                              "openxr"
                              "pvrtccompressor"
-                              "re-spirv"
                              "recastnavigation"
                              "rvo2"
                              "smaa"
@@ -2635,7 +2639,9 @@ scripted in a Python-like language.")
                        "builtin_embree=no"
                        "builtin_enet=no"
                        "builtin_freetype=no"
-                        "builtin_glslang=no"
+                        ;; TODO: Uncomment this option when the todo for
+                        ;; glslang in the snippet is resolved.
+                        ;; "builtin_glslang=no"
                        "builtin_graphite=no"
                        "builtin_harfbuzz=no"
                        "builtin_icu4c=no"
@@ -2728,12 +2734,7 @@ scripted in a Python-like language.")
                (("./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h")
                 (string-append
                  (search-input-file inputs "include/xkbcommon/xkbcommon-keysyms.h"))))))
-          (add-after 'unbundle-xkbcommon 'unpack-mesa
-            (lambda _
-              (mkdir "mesa-src")
-              (invoke "tar" "--strip-components=1" "-C"
-                      "mesa-src" "-xf" #$(package-source mesa))))
-          (add-after 'unpack-mesa 'unbundle-wayland
+          (add-after 'unbundle-xkbcommon 'unbundle-wayland
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "platform/linuxbsd/wayland/SCsub"
                ;; This first file does not exist in a "protocol" directory of
@@ -2741,9 +2742,6 @@ scripted in a Python-like language.")
                ;; other substitutions.
                (("#thirdparty/wayland/protocol/wayland.xml")
                 (search-input-file inputs "share/wayland/wayland.xml"))
-                ;; And this one is from the mesa source.
-                (("#thirdparty/wayland-protocols/mesa/wayland-drm.xml")
-                 "../../../mesa-src/src/egl/wayland/wayland-drm/wayland-drm.xml")
                (("#thirdparty/wayland-protocols")
                 (string-append
                  #$(this-package-input "wayland-protocols") "/share/wayland-protocols"))
@@ -2757,11 +2755,6 @@ scripted in a Python-like language.")
                (copy-recursively (string-append #$(this-package-input "vulkan-volk")
                                                 "/include")
                                  volk-dir))))
-          (add-after 'unbundle-volk 'use-system-spirv
-            (lambda _
-              (substitute* "thirdparty/spirv-reflect/spirv_reflect.h"
-                (("#if defined\\(SPIRV_REFLECT_USE_SYSTEM_SPIRV_H\\)")
-                 "#if 1"))))
          (replace 'install
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((zenity (search-input-file inputs "bin/zenity")))
@@ -2830,14 +2823,13 @@ scripted in a Python-like language.")
           pulseaudio
           sdl3
           speech-dispatcher
-           spirv-headers
           vulkan-volk
           wayland
           wayland-protocols
           wslay
           zenity
           zlib
-           `(,zstd-1.5.7 "lib")))
+           `(,zstd "lib")))
    (home-page "https://godotengine.org/")
    (synopsis "Advanced 2D and 3D game engine")
    (description
@@ -3302,7 +3294,7 @@ fiction and classic point-and-click adventures.")
 (define-public openvr
  (package
    (name "openvr")
-    (version "2.12.14")
+    (version "1.26.7")
    (home-page "https://github.com/ValveSoftware/openvr/")
    (source
     (origin
@@ -3312,7 +3304,7 @@ fiction and classic point-and-click adventures.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0i85awq7w669j0x091chma8rcx1zqwn1j4v0d42bcjcvhqa6iv0v"))))
+        (base32 "09rvrja3pz6ggs41ra71p4dwjl4n0rpqrqw8jiy92xl33hhxbsmx"))))
    (build-system cmake-build-system)
    (arguments
     ;; No tests.
@@ -3834,9 +3834,9 @@ fight Morgoth, the Lord of Darkness.")
    (license license:gpl2)))

 (define-public pingus
-  ;; Latest release is from 2021-12-24.
-  (let ((commit "7d65221e1cd1026053c8a5a08ad911fbdd13d3ed")
-        (revision "1"))
+  ;; XXX: Does not release anymore.
+  (let ((commit "8c68e08b0b9530b0078a6e2972786f7accf0d0e6")
+        (revision "0"))
    (package
      (name "pingus")
      (version (git-version "0.7.6" revision commit))
@@ -3844,41 +3844,38 @@ fight Morgoth, the Lord of Darkness.")
       (origin
         (method git-fetch)
         (uri (git-reference
-                (url "https://github.com/Pingus/pingus")
-                (commit commit)))
+               (url "https://github.com/Pingus/pingus")
+               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0dc6b192y1zwpiqfcpkyq5gk4xl8hl9hs71cmhag8hz59c5hfdfr"))))
+          (base32 "0cnjrma5wfsgjxzclzsk5rycllfh2ncsv2frqwhijwm2ggwcm3am"))))
      (build-system cmake-build-system)
      (arguments
       (list
-        ;; Upstream reported the tests don't work.
-        ;; See: <https://github.com/Pingus/pingus/blob/8c68e08b0b9530b0078a6e2972786f7accf0d0e6/pingus.nix#L47>
+        ;; XXX: tests build but are flagged as failing in pingus.nix
        #:tests? #f
-        #:configure-flags
-        #~(list "-DBUILD_TESTS=OFF")))
+        #:configure-flags #~(list "-DBUILD_TESTS=OFF")))
      (native-inputs (list googletest pkg-config tinycmmc uitest))
-      (inputs
-       (list argpp
-             boost
-             fmt-10
-             geomcpp
-             glm
-             glu
-             libpng
-             libsigc++-2
-             logmich
-             mesa
-             priocpp
-             sdl2
-             sdl2-image
-             sdl2-mixer
-             strutcpp
-             tinygettext-with-sdl2
-             wstsound
-             xdgcpp))
+      (inputs (list argpp
+                    boost
+                    fmt-8
+                    geomcpp
+                    glm
+                    glu
+                    libpng
+                    libsigc++-2
+                    logmich
+                    mesa
+                    priocpp
+                    sdl2
+                    sdl2-image
+                    sdl2-mixer
+                    strutcpp
+                    tinygettext-with-sdl2
+                    wstsound
+                    xdgcpp))
      (home-page "https://pingus.seul.org/")
-      (synopsis "Lemmings-like puzzle game")
+      (synopsis "Lemmings clone")
      (description
       "Pingus is a free Lemmings-like puzzle game in which the player takes
 command of a bunch of small animals and has to guide them through levels.
@@ -3886,11 +3883,8 @@ Since the animals walk on their own, the player can only influence them by
 giving them commands, like build a bridge, dig a hole, or redirect all animals
 in the other direction.  Multiple such commands are necessary to reach the
 level's exit.  The game is presented in a 2D side view.")
-      (license
-       ;; Project itself is GPL3+, but some files are under distinct licenses.
-       (list license:bsd-3
-             license:gpl2+
-             license:gpl3+)))))
+      ;; Some source files are under bsd-3 and gpl2+ licenses.
+      (license license:gpl3+))))

 (define-public talkfilters
  (package
@@ -5206,9 +5200,7 @@ falling, themeable graphics and sounds, and replays.")
 (define-public wesnoth
  (package
    (name "wesnoth")
-    ;; Even-numbered minor versions indicate stable versions:
-    ;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
-    (version "1.18.6")
+    (version "1.18.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5217,7 +5209,7 @@ falling, themeable graphics and sounds, and replays.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
+                "16mrdpz1yq12ppnrmm4yv768zmh08qjdxh892pzc5i17n7xkmpy4"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test target
@@ -5651,7 +5643,7 @@ Transport Tycoon Deluxe.")
  (package
    (inherit openttd)
    (name "openttd-jgrpp")
-    (version "0.69.2")
+    (version "0.68.2")
    (source
     (origin
       (method git-fetch)
@@ -5660,7 +5652,7 @@ Transport Tycoon Deluxe.")
             (commit (string-append "jgrpp-" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "142kxddx0pv8wi9ca4xfl3hv857k828bayi8n8nv0zrcjb9s3lqg"))))
+        (base32 "0kd4zd48352q74jv0kgh8asgksbnq2441lk894r0jm16iigsgg88"))))
    (inputs (modify-inputs (package-inputs openttd)
              (append zstd harfbuzz)))
    (arguments
@@ -6510,7 +6502,7 @@ tactics.")
 (define-public widelands
  (package
    (name "widelands")
-    (version "1.3")
+    (version "1.2.1")
    (source
     (origin
       (method git-fetch)
@@ -6519,7 +6511,7 @@ tactics.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1j288rkflqmzxbacrrx35y8qm4mvbvd30c03cmkvh8b29jkgz3gp"))
+        (base32 "1n8daxarwcagcxpzlxrrdy0piir1zinwnfbcsyyg4yd789pixhgw"))
       (modules '((guix build utils)))
       (snippet
        #~(delete-file-recursively "src/third_party/minizip"))))
@@ -6532,12 +6524,15 @@ tactics.")
                (string-append "-DWL_INSTALL_BINDIR=" #$output "/bin")
                (string-append "-DWL_INSTALL_BASEDIR=" share)
                (string-append "-DWL_INSTALL_DATADIR=" share)
-                "-DOPTION_BUILD_WEBSITE_TOOLS=OFF"))
+                "-DOPTION_BUILD_WEBSITE_TOOLS=OFF"
+                ;; CMakeLists.txt does not handle properly RelWithDebInfo build
+                ;; type.  When used, no game data is installed!
+                "-DCMAKE_BUILD_TYPE=Release"))
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'unbundle-fonts
            ;; Unbundle fonts already packaged in Guix.  XXX: missing fonts are
-            ;; mmrCensus, Nakula, and Sinhala.
+            ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala.
            (lambda* (#:key inputs #:allow-other-keys)
              (for-each
               (lambda (font)
@@ -6551,8 +6546,6 @@ tactics.")
     (list gettext-minimal pkg-config python))
    (inputs
     (list asio
-           font-amiri
-           font-culmus
           font-dejavu
           font-wqy-microhei
           glew
@@ -48,26 +48,6 @@
  #:use-module ((guix build utils) #:select (alist-replace))
  #:use-module (srfi srfi-1))

-
-(define (gdb-python-config pkg-config)
-  "Return a script to satisfy gdb to enable python support."
-  ;; based on https://www.sourceware.org/gdb/wiki/CrossCompilingWithPythonSupport
-  (program-file "gdb-python-config"
-    #~(begin
-        (use-modules (ice-9 match))
-        (let ((pkg-config #$pkg-config))
-          (match (command-line)
-            ((_ _ "--includes")
-             (execlp pkg-config pkg-config
-                     "python3-embed" "--cflags"))
-            ((_ _ "--ldflags")
-             (execlp pkg-config pkg-config
-                     "python3-embed" "--libs"))
-            ((_ _ "--exec-prefix")
-             (execlp pkg-config pkg-config
-                     "python3-embed" "--variable=exec_prefix"))
-            (_  (exit 1)))))))
-
 (define-public gdb-14
  (package
    (name "gdb")
@@ -87,16 +67,9 @@
      #:out-of-source? #t
      #:modules `((srfi srfi-1)
                  ,@%default-gnu-modules)
-      #:configure-flags
-      #~(list
-         #$@(if (and (this-package-input "python-wrapper")
-                     (%current-target-system))
-                #~((string-append "--with-python="
-                                  #+(gdb-python-config (pkg-config-for-target))))
-                #~())
-         #$@(if (target-hurd64?)
-                #~("--enable-targets=i586-pc-gnu,x86_64-pc-gnu")
-                #~()))
+      #:configure-flags (if (target-hurd64?)
+                            #~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu")
+                            #~'())
      #:phases #~(modify-phases %standard-phases
                   ;; The following phase only applies to gdb@12, which
                   ;; inherits from this package. Remove it when removing
@@ -108,13 +81,6 @@
                           (("aarch64_get_CPSR_bits  \\(sim_cpu \\*, uint32_t\\)")
                             "aarch64_get_CPSR_bits  (sim_cpu *, FlagMask)")))))
                     #~())
-                   #$@(if (%current-target-system)
-                          #~((add-after 'unpack 'enable-guile
-                               (lambda* (#:key native-inputs #:allow-other-keys)
-                                 (setenv "ac_cv_guild_program_name" (which "guild"))
-                                 (setenv "ac_cv_path_pkg_config_prog_path"
-                                         (which #$(pkg-config-for-target))))))
-                          #~())
                   (add-after 'unpack 'patch-paths
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let ((sh (string-append (assoc-ref inputs "bash")
@@ -170,9 +136,6 @@
     `(("texinfo" ,texinfo)
       ("dejagnu" ,dejagnu)
       ("pkg-config" ,pkg-config)
-       ,@(if (%current-target-system)
-             `(("guile" ,guile-3.0))
-             '())
       ,@(if (target-hurd?)
             ;; When cross-compiling from x86_64-linux, make sure to use a
             ;; 32-bit MiG because we assume target i586-pc-gnu.
@@ -209,13 +172,6 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
              (sha256
               (base32
                "1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf"))))
-    ;; TODO: Remove this when updating gdb/pinned.
-    (arguments
-     (substitute-keyword-arguments (package-arguments gdb-14)
-       ((#:configure-flags flags '())
-        (if (target-hurd64?)
-            #~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu")
-            #~'()))))
    (properties `((hidden? . #t)))))

 (define-public gdb-15
@@ -159,7 +159,6 @@
  #:use-module (gnu packages video)
  #:use-module (gnu packages web)
  #:use-module (gnu packages webkit)
-  #:use-module (gnu packages wget)
  #:use-module (gnu packages wxwidgets)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg)
@@ -2446,20 +2445,10 @@ dropping features at lower levels.")
        (base32
         "1m8d3r1q1v05pkr8k9czrmb4xjszw6hvgsf3kn9pf0v14gpn4r8f"))))
    (build-system gnu-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'install 'wrap
-                 (lambda _
-                   (wrap-program (string-append #$output "/bin/osmupdate")
-                     `("PATH" prefix
-                       (,(string-append #$(this-package-input "wget")
-                                        "/bin")))))))))
    (native-inputs
     (list autoconf automake))
    (inputs
-     (list wget ;required by osmupdate
-           zlib))
+     (list zlib))
    (home-page "https://gitlab.com/osm-c-tools/osmctools")
    (synopsis "Tools to convert, filter and update OpenStreetMap data files")
    (description "This project contains a few tools which are used in the
@@ -8266,7 +8266,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
           json-glib
           libcanberra
           libgweather
-           libphonenumber-8.11
+           libphonenumber
           mit-krb5
           openldap
           webkitgtk-for-gtk3))
@@ -130,7 +130,7 @@
           texinfo))
    (inputs
     (list bzip2
-           exiv2-0.27
+           exiv2
           file                         ;libmagic, for the MIME plug-in
           flac
           gdk-pixbuf
@@ -25,7 +25,6 @@
 ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -79,6 +78,7 @@
  #:use-module (gnu packages tor)
  #:use-module (gnu packages web)
  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages popt)
  #:use-module (gnu packages xdisorg)
@@ -87,7 +87,6 @@
  #:use-module (guix download)
  #:use-module (guix utils)
  #:use-module (guix git-download)
-  #:use-module (guix build-system copy)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
  #:use-module (guix build-system python)
@@ -1037,38 +1036,6 @@ with @code{rofi-pass} a good front end for @code{password-store}.")
     "This package provides a Pinentry implementation based on Bemenu.")
    (license license:gpl3+)))

-(define-public pinentry-fuzzel
-  (package
-    (name "pinentry-fuzzel")
-    (version "1.0.0")
-    (source
-     (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://github.com/JonasToth/pinentry-fuzzel")
-            (commit (string-append "v" version))))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32 "1ykmxckiy361rl4aj3bkyihx1639x61ic4995yxkqr9r4vc7zha1"))))
-    (build-system copy-build-system)
-    (arguments
-     (list #:install-plan
-           #~'(("pinentry-fuzzel" "bin/"))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-scripts
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* "pinentry-fuzzel"
-                    (("fuzzel") (search-input-file inputs "bin/fuzzel"))))))))
-    (inputs
-     (list fuzzel))
-    (synopsis "Pinentry implementation based on @code{fuzzel}")
-    (description
-     "This package provides a very simple Pinentry implementation based
-on Fuzzel.")
-    (home-page "https://github.com/JonasToth/pinentry-fuzzel")
-    (license license:gpl3)))
-
 (define-public pinentry
  (package (inherit pinentry-gtk2)
    (name "pinentry")))
@@ -4,7 +4,6 @@
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,8 +30,6 @@
  #:use-module (gnu packages golang)
  #:use-module (gnu packages golang-build)
  #:use-module (gnu packages golang-check)
-  #:use-module (gnu packages golang-crypto)
-  #:use-module (gnu packages golang-vcs)
  #:use-module (gnu packages golang-web)
  #:use-module (gnu packages golang-xyz))

@@ -425,63 +422,3 @@ editing and auto-completion.  Some of its features include:
    (description "mnc (my next cron) opens the user's crontab and echos the
 time when the next cronjob will be ran.")
    (license license:unlicense)))
-
-(define-public git-bug
-  (package
-    (name "git-bug")
-    (version "0.10.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/git-bug/git-bug")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1s3y8ll2942d6my2wz6bbipram4l6brbwwfvp2nr8cchzrb23dl8"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:tests? #f  ;; tests require several unpackaged dependencies
-           #:import-path "github.com/git-bug/git-bug"
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'realize-symlinks
-                 (lambda _
-                   ;; Replace symlinks with a copy of the file. With symlinks,
-                   ;; the build fails with "cannot embed irregular file".
-                   (let* ((symlink-path
-                           "src/github.com/vektah/gqlparser/v2/validator/prelude.graphql")
-                          (canonical-path (canonicalize-path symlink-path)))
-                     (delete-file symlink-path)
-                     (copy-file canonical-path symlink-path)))))))
-    (native-inputs
-     (list go-github-com-99designs-gqlgen
-           go-github-com-99designs-keyring
-           go-github-com-araddon-dateparse
-           go-github-com-awesome-gocui-gocui
-           go-github-com-blevesearch-bleve
-           go-github-com-dustin-go-humanize
-           go-github-com-fatih-color
-           go-github-com-go-git-go-billy-v5
-           go-github-com-go-git-go-git-v5
-           go-github-com-gorilla-mux
-           go-github-com-hashicorp-golang-lru-v2
-           go-github-com-michaelmure-go-term-text
-           go-github-com-phayes-freeport
-           go-github-com-protonmail-go-crypto
-           go-github-com-shurcool-githubv4
-           go-github-com-skratchdot-open-golang
-           go-github-com-spf13-cobra
-           go-github-com-stretchr-testify
-           go-github-com-vbauerster-mpb
-           go-github-com-vektah-gqlparser-v2
-           ;; The build fails without this specific version of
-           ;; go-gitlab-com-gitlab-org-api-client-go.
-           go-gitlab-com-gitlab-org-api-client-go-0.116
-           go-golang-org-x-oauth2))
-    (home-page "https://github.com/git-bug/git-bug")
-    (synopsis "Distributed, offline-first bug tracker embedded in git")
-    (description "git-bug is a standalone, distributed, offline-first issue
-management tool that embeds issues, comments, and more as objects in a git
-repository.")
-    (license license:gpl3+)))
@@ -27,7 +27,6 @@
 ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com>
 ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3071,37 +3070,6 @@ the end of a test.")
 built-in @code{testing} package, but can be used in other contexts too.")
    (license license:asl2.0)))

-(define-public go-github-com-matryer-moq
-  (package
-    (name "go-github-com-matryer-moq")
-    (version "0.6.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/matryer/moq")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0s2ls1wkqapdqw4yjlbwbyp25c3iwi4pp706qlxapds5sx1izq5x"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:go go-1.25
-           #:import-path "github.com/matryer/moq"
-           ;; Disable failing tests.
-           #:test-flags #~(list "-skip"
-                                (string-join (list "TestGoGenerateVendoredPackages"
-                                                   "TestMockGolden/TypeAlias"
-                                                   "TestModulesNestedPackage")
-                                             "|"))))
-    (propagated-inputs (list go-github-com-pmezard-go-difflib
-                             go-golang-org-x-tools))
-    (home-page "https://github.com/matryer/moq")
-    (synopsis "Interface mocking tool for @command{go generate}")
-    (description "Moq is a tool that generates a struct from any
-interface.  The struct can be used in test code as a mock of the interface.")
-    (license license:expat)))
-
 (define-public go-golang-org-x-lint
  (package
    (name "go-golang-org-x-lint")
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2021, 2026 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
@@ -557,35 +557,6 @@ LZ4 data blocks.  The implementation is based on the reference C
           go-github-com-pierrec-cmdflag
           go-github-com-schollz-progressbar-v3))))

-(define-public go-github-com-roaringbitmap-roaring
-  (package
-    (name "go-github-com-roaringbitmap-roaring")
-    (version "2.14.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/RoaringBitmap/roaring")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0qs11vr7bnsabrzhfz0fdphjsvv7xbp11d4ixd6qhbg5bvkzikyc"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/RoaringBitmap/roaring"))
-    (propagated-inputs (list go-github-com-bits-and-blooms-bitset
-                             go-github-com-google-uuid
-                             go-github-com-mschoch-smat
-                             go-github-com-stretchr-testify))
-    (home-page "https://github.com/RoaringBitmap/roaring")
-    (synopsis "Roaring bitmaps in Go")
-    (description "This package is an implementation of Roaring Bitmaps in Go.
-They provide fast compressed bitmap data structures (also called bitset).
-They are ideally suited to represent sets of integers over relatively small
-ranges.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-saracen-fastzip
  (package
    (name "go-github-com-saracen-fastzip")
@@ -47,7 +47,6 @@
 ;;; Copyright © 2025 Danny Milosavljevic <dannym@friendly-machines.com>
 ;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
 ;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -13813,106 +13812,6 @@ and is designed to be accessible to both humans and machines.")
 implementation as closely while remaining idiomatic and easy to use.")
    (license license:expat)))

-;; git-bug specifically requires version 0.17.73 of
-;; go-github-com-99designs-gqlgen. If updating this package, please create a
-;; 0.17.73 variant of this package.
-(define-public go-github-com-99designs-gqlgen
-  (package
-    (name "go-github-com-99designs-gqlgen")
-    (version "0.17.73")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/99designs/gqlgen")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1xs867y230zzbx9ws42nzqxnp44205v9hsdqv0hifljx26igv85k"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:import-path "github.com/99designs/gqlgen"
-           #:test-flags
-           #~(list "-skip" (string-join
-                            (list
-                             ;; These tests require network access.
-                             "TestAltairHandler_Integrity"
-                             "TestApolloSandboxHandler_Integrity"
-                             "TestHandler_Integrity"
-                             ;; These tests fail due to the way our
-                             ;; go-build-system unpacks and lays out the
-                             ;; source code.
-                             "TestImportPathForDir"
-                             "TestRewriter/out_of_scope_dir"
-                             ;; Commenting out autobind generates the modules
-                             ;; necessary for these tests. See discussion at
-                             ;; https://github.com/99designs/gqlgen/issues/1765
-                             ;; But then, go mod tidy fails probably because
-                             ;; modules are disabled by GO111MODULE=off
-                             "TestAutobinding"
-                             "TestCodeGeneration"
-                             "TestCodeGenerationFederation2"
-                             "TestGenerate"
-                             "TestInjectSourceLate"
-                             "TestNoEntities"
-                             "TestWithEntities")
-                            "|"))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-tests
-                 (lambda _
-                   ;; Remove column number from expected error message. TODO:
-                   ;; Revisit this fix later when we update this package or
-                   ;; one of its dependencies.
-                   (substitute* "src/github.com/99designs/gqlgen/graphql/executor/executor_test.go"
-                     (("input:1:2:") "input:1:"))
-                   ;; Make some go files writable. Some tests fail when they
-                   ;; are not.
-                   (for-each (lambda (file)
-                               (chmod file #o644))
-                             (append (find-files "src/github.com/99designs/gqlgen/plugin"
-                                                 "^generated_omit_root_models.go$")
-                                     (find-files "src/github.com/99designs/gqlgen/plugin"
-                                                 "^schema.custom.go$")
-                                     (find-files "src/github.com/99designs/gqlgen/plugin"
-                                                 "^schema.resolvers.go$")
-                                     (find-files "src/github.com/99designs/gqlgen/plugin"
-                                                 "^generated\\.go$")))))
-               (add-after 'unpack 'realize-symlinks
-                 (lambda _
-                   ;; Replace symlinks with a copy of the file. With symlinks,
-                   ;; the build fails with "cannot embed irregular file".
-                   (let* ((symlink-path
-                           "src/github.com/vektah/gqlparser/v2/validator/prelude.graphql")
-                          (canonical-path (canonicalize-path symlink-path)))
-                     (delete-file symlink-path)
-                     (copy-file canonical-path symlink-path)))))))
-    (propagated-inputs (list go-github-com-go-viper-mapstructure-v2
-                             go-github-com-goccy-go-yaml
-                             go-github-com-google-uuid
-                             go-github-com-gorilla-websocket
-                             go-github-com-hashicorp-golang-lru-v2
-                             go-github-com-kevinmbeaulieu-eq-go
-                             go-github-com-logrusorgru-aurora-v4
-                             go-github-com-matryer-moq
-                             go-github-com-mattn-go-colorable
-                             go-github-com-mattn-go-isatty
-                             go-github-com-puerkitobio-goquery
-                             go-github-com-sosodev-duration
-                             go-github-com-stretchr-testify
-                             go-github-com-urfave-cli-v2
-                             go-github-com-vektah-gqlparser-v2
-                             go-golang-org-x-text
-                             go-golang-org-x-tools
-                             go-google-golang-org-protobuf
-                             go-gopkg-in-yaml-v3))
-    (home-page "https://github.com/99designs/gqlgen")
-    (synopsis "Go GraphQL server library")
-    (description "gqlgen is a @command{go generate} based GraphQL server
-library.  It generates Go server code from a schema written in the GraphQL
-Schema Definition Language.")
-    (license license:expat)))
-
 (define-public go-github-com-vishvananda-netlink
  (package
    (name "go-github-com-vishvananda-netlink")
@@ -14320,75 +14219,6 @@ programming language.")
 programming language, which supports draft-04, draft-06 and draft-07.")
    (license license:asl2.0)))

-(define-public go-github-com-blevesearch-geo-geojson
-  (package
-    (name "go-github-com-blevesearch-geo-geojson")
-    (version "0.2.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/blevesearch/geo")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "05vgzxf6g7gmw9wymxxwkq2xxwakr1lrhs2jy6v91k7akgz9alsv"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/geojson"
-           #:unpack-path "github.com/blevesearch/geo"))
-    (propagated-inputs
-     (list go-github-com-blevesearch-bleve-index-api
-           go-github-com-json-iterator-go
-           go-github-com-google-go-cmp))
-    (home-page "https://github.com/blevesearch/geo")
-    (synopsis "Go S2 geometry library")
-    (description "This is a library for manipulating geometric shapes.  Unlike
-many geometry libraries, S2 is primarily designed to work with spherical
-geometry, i.e., shapes drawn on a sphere rather than on a planar 2D map.  This
-makes it especially suitable for working with geographic data.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-blevesearch-geo-r1
-  (package
-    (inherit go-github-com-blevesearch-geo-geojson)
-    (name "go-github-com-blevesearch-geo-r1")
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/r1"
-           #:unpack-path "github.com/blevesearch/geo"))))
-
-(define-public go-github-com-blevesearch-geo-r2
-  (package
-    (inherit go-github-com-blevesearch-geo-geojson)
-    (name "go-github-com-blevesearch-geo-r2")
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/r2"
-           #:unpack-path "github.com/blevesearch/geo"))))
-
-(define-public go-github-com-blevesearch-geo-r3
-  (package
-    (inherit go-github-com-blevesearch-geo-geojson)
-    (name "go-github-com-blevesearch-geo-r3")
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/r3"
-           #:unpack-path "github.com/blevesearch/geo"))))
-
-(define-public go-github-com-blevesearch-geo-s1
-  (package
-    (inherit go-github-com-blevesearch-geo-geojson)
-    (name "go-github-com-blevesearch-geo-s1")
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/s1"
-           #:unpack-path "github.com/blevesearch/geo"))))
-
-(define-public go-github-com-blevesearch-geo-s2
-  (package
-    (inherit go-github-com-blevesearch-geo-geojson)
-    (name "go-github-com-blevesearch-geo-s2")
-    (arguments
-     (list #:import-path "github.com/blevesearch/geo/s2"
-           #:unpack-path "github.com/blevesearch/geo"))))
-
 (define-public go-github-com-xo-dburl
  (package
    (name "go-github-com-xo-dburl")
@@ -14712,7 +14542,7 @@ https://openid.net/developers/how-connect-works/}.")
 (define-public go-gitlab-com-gitlab-org-api-client-go
  (package
    (name "go-gitlab-com-gitlab-org-api-client-go")
-    (version "1.28.0")
+    (version "0.130.1")
    (source
     (origin
       (method git-fetch)
@@ -14721,38 +14551,43 @@ https://openid.net/developers/how-connect-works/}.")
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0n6grsvc39w879jmwfx86y1w8harhbykzdx8sq7slvwvhj5kjzvj"))))
+        (base32 "06bnaja7b0q2wgznqg9rz7kdx5wq70hmdn9ymf2546svwibmz4vk"))))
    (build-system go-build-system)
    (arguments
     (list
-      ;; TODO: Try to enable complete test suite, most of them SIGSEGV trying
-      ;; to setup HTTP client.
-      #:tests? #f
      #:import-path "gitlab.com/gitlab-org/api/client-go"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-examples
-            (lambda* (#:key import-path #:allow-other-keys)
-              (with-directory-excursion (string-append "src/" import-path)
-                (delete-file-recursively "config/examples")))))))
+      #:test-flags
+      #~(list "-skip"
+              (string-join
+               ;; Tests requir network access.
+               (list "TestGetMergeRequest"
+                     "TestPagination_Scan2"
+                     "TestPagination_Scan2_Error"
+                     "TestPagination_ScanAndCollect"
+                     "TestPagination_Scan_Error"
+                     "TestPagination_Scan_KeysetBased"
+                     "TestPagination_Scan_OffsetBased"
+                     "TestRepositoryFilesService_CreateFile"
+                     "TestRepositoryFilesService_DeleteFile"
+                     "TestRepositoryFilesService_GetFile"
+                     "TestRepositoryFilesService_GetFileBlame"
+                     "TestRepositoryFilesService_GetFileMetaData"
+                     "TestRepositoryFilesService_GetRawFile"
+                     "TestRepositoryFilesService_GetRawFileMetaData"
+                     "TestRepositoryFilesService_UpdateFile"
+                     "TestRepositorySubmodulesService_UpdateSubmodule"
+                     "TestTagsService_GetTagSignature"
+                     "TestUpdateRepositoryEnvironmentsEscapesURL")
+               "|"))))
    (native-inputs
     (list go-github-com-stretchr-testify
           go-go-uber-org-mock))
    (propagated-inputs
-     ;; XXX: Packaging of buf is quite complex is it requires buf to produce
-     ;; buf modules, see: <https://codeberg.org/guix/guix/pulls/2572>.
-     (list ;; go-buf-build-gen-go-bufbuild-protovalidate-protocolbuffers-go
-           ;; go-buf-build-go-protovalidate
-           ;; go-buf-build-go-protoyaml
-           go-github-com-google-go-querystring
+     (list go-github-com-google-go-querystring
           go-github-com-hashicorp-go-cleanhttp
           go-github-com-hashicorp-go-retryablehttp
-           go-github-com-makenowjust-heredoc-v2
-           go-github-com-zalando-go-keyring
           go-golang-org-x-oauth2
-           go-golang-org-x-time
-           go-google-golang-org-protobuf
-           go-gopkg-in-yaml-v3))
+           go-golang-org-x-time))
    (home-page "https://gitlab.com/gitlab-org/api/client-go")
    (synopsis "GitLab client for Golang")
    (description
@@ -14760,26 +14595,6 @@ https://openid.net/developers/how-connect-works/}.")
 interact with GitLab in a simple and uniform way.")
    (license license:asl2.0)))

-(define-public go-gitlab-com-gitlab-org-api-client-go-0.116
-  (package
-    (inherit go-gitlab-com-gitlab-org-api-client-go)
-    (name "go-gitlab-com-gitlab-org-api-client-go")
-    (version "0.116.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/gitlab-org/api/client-go")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0cajw57mcsgf0b8xk8z0bgfqsmz7wp7dwzwyapvdxn8a9kqzx59r"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments go-gitlab-com-gitlab-org-api-client-go)
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (delete 'remove-examples)))))))
-
 (define-public go-gitlab-torproject-org-tpo-anti-censorship-geoip
  (package
    (name "go-gitlab-torproject-org-tpo-anti-censorship-geoip")
@@ -129,7 +129,7 @@ manipulate maps.")
 (define-public gpscorrelate
  (package
    (name "gpscorrelate")
-    (version "2.3")
+    (version "2.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -138,7 +138,7 @@ manipulate maps.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0b074zd2jvn0rm0mkjdah61cmg3xvzqmllc9sijzpq45sm87gigq"))))
+                "1kvybhfnygz79q3pgwc1q2x4ccmnsfscx2hzxnmzjbnc6arnqari"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
@@ -13,7 +13,6 @@
 ;;; Copyright © 2023 David Elsing <david.elsing@posteo.net>
 ;;; Copyright © 2025 Mark Walker <mark.damon.walker@gmail.com>
 ;;; Copyright © 2025 Tiago de Paula Peixoto <tiago@skewed.de>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -558,10 +557,8 @@ intuitive way.")
    (build-system cmake-build-system)
    (arguments
     (list #:configure-flags
-           #~'("-DFAISS_ENABLE_C_API=ON"
-               "-DFAISS_ENABLE_GPU=OFF"     ; thanks, but no thanks, CUDA.
-               "-DFAISS_ENABLE_PYTHON=OFF"
-               "-DBUILD_SHARED_LIBS=ON")))
+           #~'("-DFAISS_ENABLE_GPU=OFF"     ; thanks, but no thanks, CUDA.
+               "-DFAISS_ENABLE_PYTHON=OFF")))
    (inputs
     (list openblas))
    (native-inputs
@@ -42,7 +42,6 @@
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
-;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -112,7 +111,6 @@
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ninja)
  #:use-module (gnu packages opencl)
-  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
@@ -577,7 +575,7 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.")
          ;; (that would be AVX512--and that segfaults GCC (!)).
          "-DEMBREE_MAX_ISA=AVX2")))
    (inputs
-     (list glfw onetbb))
+     (list tbb glfw))
    (home-page "https://www.embree.org/")
    (synopsis "High performance ray tracing kernels")
    (description
@@ -622,7 +620,7 @@ applications.")
       (list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
                            (assoc-ref %outputs "out") "/lib"))))
    (inputs
-     (list boost c-blosc jemalloc onetbb zlib))
+     (list boost c-blosc jemalloc tbb zlib))
    (native-inputs
     (list pkg-config))
    (home-page "https://www.openvdb.org/")
@@ -718,7 +716,6 @@ typically encountered in feature film production.")
           libxi
           libxrender
           lzo
-           onetbb
           openal
           opencolorio
           openexr
@@ -729,6 +726,7 @@ typically encountered in feature film production.")
           pugixml
           python
           python-numpy-1
+           tbb
           zlib
           `(,zstd "lib")))
    (home-page "https://www.blender.org/")
@@ -7702,8 +7702,7 @@ application to open a given file or URL based on given configurations.")
      #~(list "GUILE_AUTO_COMPILE=0")))
    (native-inputs (list pkg-config texinfo))
    (inputs (list guile-3.0))
-    (propagated-inputs
-     (list guile-bstructs guile-fibers guile-gnutls guile-websocket))
+    (propagated-inputs (list guile-fibers guile-gnutls guile-websocket))
    (home-page "https://spritely.institute/goblins")
    (synopsis "Distributed programming environment for Guile")
    (description
@@ -626,7 +626,6 @@ support.")
                                  #:inputs inputs)))))))
      (native-inputs (list qttools-5 pkg-config))
      (inputs (list qtbase-5
-                    qtwayland-5
                    zlib
                    libdbusmenu-qt
                    quazip-5
@@ -25,7 +25,6 @@
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2026 Yarl Baudig <yarl-baudig@mailoo.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -59,7 +58,6 @@
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages linux)
  #:use-module (gnu packages lisp)
-  #:use-module (gnu packages llvm)
  #:use-module (gnu packages m4)
  #:use-module (gnu packages multiprecision)
  #:use-module (gnu packages ncurses)
@@ -1402,104 +1400,6 @@ interactive environment for the functional language Haskell.")

 (define-public ghc-8 ghc-8.10)

-(define ghc-bootstrap-aarch64-8.10.7
-  (origin
-    (method url-fetch)
-    (uri
-     "https://downloads.haskell.org/ghc/8.10.7/ghc-8.10.7-aarch64-deb10-linux.tar.xz")
-    (sha256
-     (base32 "0m8fklyqcd8xrmhwnimyhyg3b5h82kkc0yfyiazk6li9kdzl3lps"))))
-
-(define-public binary-ghc-8.10.7
-  (package
-    ;; Named like this to be able to install it in profile without
-    ;; ghc-package-cache-file (guix profiles) trying to install ghc...
-    (name "binary-ghc")
-    (version "8.10.7")
-    (source ghc-bootstrap-aarch64-8.10.7)
-    (build-system gnu-build-system)
-    (supported-systems '("aarch64-linux"))
-    ;; We need llvm until 9.2 which introduce aarch64 native code generation.
-    ;; Make sure you have installed LLVM between [9 and 13)
-    (inputs (list gcc-13 gmp llvm-12 ncurses/tinfo numactl))
-    (native-inputs
-     (list patchelf perl))
-    (arguments
-     (list
-      #:configure-flags
-      #~(list
-         (string-append "--with-gmp-libraries="
-                        (assoc-ref %build-inputs "gmp") "/lib")
-         (string-append "--with-gmp-includes="
-                        (assoc-ref %build-inputs "gmp") "/include"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'build)
-          ;; We don't run the check phase on binary inputs.
-          (delete 'check)
-          (add-before 'configure 'fix-lnuma
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (substitute* "rts/package.conf.in"
-                (("FFI_LIB_DIR")
-                 (string-append
-                  "FFI_LIB_DIR "
-                  (assoc-ref inputs "numactl") "/lib")))))
-          (add-after 'fix-lnuma 'add-rpaths
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let* ((libraries
-                      (cons* "rts/dist/build/libffi.so"
-                             (find-files "." "-ghc8\\.10\\.7\\.so$")))
-                     (binaries
-                      (list "ghc/stage2/build/tmp/ghc-stage2"
-                            "utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
-                            "utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
-                            "utils/haddock/dist/build/tmp/haddock"
-                            "utils/hp2ps/dist-install/build/tmp/hp2ps"
-                            "utils/hpc/dist-install/build/tmp/hpc"
-                            "utils/hsc2hs/dist-install/build/tmp/hsc2hs"
-                            "utils/iserv/stage2/build/tmp/ghc-iserv"
-                            "utils/iserv/stage2_dyn/build/tmp/ghc-iserv-dyn"
-                            "utils/iserv/stage2_p/build/tmp/ghc-iserv-prof"
-                            "utils/runghc/dist-install/build/tmp/runghc"
-                            "utils/unlit/dist-install/build/tmp/unlit"))
-                     (ld-so (search-input-file inputs #$(glibc-dynamic-linker))))
-                (for-each
-                 (lambda (b)
-                   (invoke "patchelf" "--add-rpath"
-                           (string-append #$gmp "/lib")  b)
-                   (invoke "patchelf" "--add-rpath"
-                           (string-append (assoc-ref inputs "ncurses-with-tinfo") "/lib") b)
-                   (invoke "patchelf" "--add-rpath"
-                           (string-append #$gcc-13:lib "/lib")  b)
-                   (invoke "patchelf" "--add-rpath"
-                           (string-append #$numactl "/lib")  b))
-                 (append libraries binaries))
-                ;; The binaries have "/lib64/ld-linux-aarch64.so.1" hardcoded.
-                (for-each
-                 (lambda (b)
-                   (invoke "patchelf" "--set-interpreter" ld-so b))
-                 binaries))))
-          (add-before 'add-rpaths 'set-target-programs
-              (lambda* (#:key inputs #:allow-other-keys)
-                (setenv "CC" (search-input-file inputs "/bin/gcc"))
-                (setenv "fp_prog_ar" (search-input-file inputs "/bin/ar"))
-                (setenv "LD" (search-input-file inputs "/bin/ld"))
-                (setenv "LLC" (search-input-file inputs "/bin/llc"))
-                (setenv "OPT" (search-input-file inputs "/bin/opt")))))))
-    (native-search-paths
-     (list (search-path-specification
-            (variable "GHC_PACKAGE_PATH")
-            (files (list (string-append "lib/ghc-" version)))
-            (file-pattern "\\.conf\\.d$")
-            (file-type 'directory))))
-    (home-page "https://www.haskell.org/ghc/")
-    (synopsis "The Glasgow Haskell Compiler")
-    (description
-     "The Glasgow Haskell Compiler (GHC) is a state-of-the-art compiler and
-interactive environment for the functional language Haskell.")
-    (properties '((hidden? . #t)))
-    (license license:bsd-3)))
-
 (define-public ghc-9.0
  (package
    (inherit ghc-8.10)
@@ -1552,7 +1452,6 @@ interactive environment for the functional language Haskell.")
      (inherit base)
      (name "ghc")
      (version "9.2.8")
-      (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux"))
      (source (origin
                (method url-fetch)
                (uri (string-append "https://www.haskell.org/ghc/dist/" version
@@ -1575,34 +1474,14 @@ interactive environment for the functional language Haskell.")
                (lambda _
                  (substitute* '("testsuite/tests/simplCore/should_compile/all.T")
                    (("^test\\('T21694', \\[ " all)
-                     (string-append all "when(arch('i386'), skip), ")))))
-              #$@(if (target-aarch64?)
-                     ;; Eats up all memory then fail
-                     #~((add-after 'skip-more-tests 'skip-T16992-aarch64
-                          (lambda _
-                            (substitute* "libraries/ghc-compact/tests/all.T"
-                              (("^test\\('T16992', \\[" all)
-                               (string-append all "when(arch('aarch64'), skip), ")))))
-                        ;; The RTS linker does not find __aarch64_*_sync symbols,
-                        ;; Fixed in 9.12 :
-                        ;; https://gitlab.haskell.org/ghc/ghc/-/commit/7db8c9927fae3369fc4ecff68f80c4cb32eea757
-                        (add-before 'configure 'no-outline-atomics
-                          (lambda _
-                            (with-output-to-file "mk/build.mk"
-                              (lambda ()
-                                (display "
-SRC_HC_OPTS += -optc-mno-outline-atomics
-              "))))))
-                     '())))
+                     (string-append all "when(arch('i386'), skip), ")))))))
         ;; Increase verbosity, so running the test suite does not time out on CI.
         ((#:make-flags make-flags ''())
          #~(cons "VERBOSE=4" #$make-flags))))
      (properties '((max-silent-time . 36000))) ; 10 hours, for i686.
      (native-inputs
       `(;; GHC 9.2 must be built with GHC >= 8.6.
-         ("ghc-bootstrap" ,(if (target-aarch64?)
-                               binary-ghc-8.10.7
-                               base))
+         ("ghc-bootstrap" ,base)
         ("ghc-testsuite"
          ,(origin
             (method url-fetch)
@@ -2,7 +2,7 @@
 ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2022, 2024-2026  Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2022, 2024, 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr>
 ;;; Copyright © 2024 jgart <jgart@dismail.de>
 ;;; Copyright © 2024 Jordan Moore <lockbox@struct.foo>
@@ -237,7 +237,7 @@ applications.")
 (define-public kronosnet
  (package
    (name "kronosnet")
-    (version "1.33")
+    (version "1.32")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -246,7 +246,7 @@ applications.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "068q6v4hyr46iw12nb8mq59fxx92hcy6p5vcqprd0x99gfv1rkjd"))))
+                "1sn2y5z52y0z2bjh1rrv722lm6nma9bsk0dqwwri9397s6qpv1dc"))))
    (build-system gnu-build-system)
    (arguments
     ;; XXX: Multiple tests failed. Tests
@@ -428,7 +428,7 @@ instrumentation
 (define-public corosync
  (package
    (name "corosync")
-    (version "3.1.10")
+    (version "3.1.9")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -437,7 +437,7 @@ instrumentation
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "12i9a3fgr0dwkb36iwqz8chxm1bc4pkkqcpl9bd7sng8f84g1hjm"))))
+                "1l6vgn61q3qv439lrdb9nnbkx5yvda6hy9da0jf3bggjdwqq9g3a"))))
    (build-system gnu-build-system)
    (arguments
     (list #:configure-flags #~'("--disable-static")
@@ -28,7 +28,6 @@
 ;;; Copyright © 2025 Anderson Torres <anderson.torres.8519@gmail.com>
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2025 dan <i@dan.games>
-;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -95,7 +94,6 @@
  #:use-module (gnu packages maths)
  #:use-module (gnu packages mpi)
  #:use-module (gnu packages nss)
-  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages opencl)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages perl)
@@ -116,6 +114,7 @@
  #:use-module (gnu packages ssh)
  #:use-module (gnu packages statistics)
  #:use-module (gnu packages swig)
+  #:use-module (gnu packages tbb)
  #:use-module (gnu packages textutils)
  #:use-module (gnu packages tls)
  #:use-module (gnu packages version-control)
@@ -472,7 +471,7 @@ many popular formats.")
     ;; 'find_package(THEORA)', which in turns looks for libogg.  Likewise for
     ;; TBB.
     (list libogg
-           onetbb))
+           tbb))
    (home-page "https://vtk.org/")
    (synopsis "Libraries for 3D computer graphics")
    (description
@@ -1222,7 +1221,7 @@ recalculates.")
           qtwebengine
           sdl2
           sqlite
-           onetbb
+           tbb
           utfcpp
           zlib))
    (home-page "https://www.paraview.org/")
@@ -1461,7 +1460,7 @@ libraries designed for computer vision research and implementation.")
                    opencl-icd-loader
                    perl
                    python
-                    onetbb
+                    tbb
                    vxl-1
                    zlib))
      (native-inputs
@@ -1646,17 +1645,7 @@ combine the information contained in both.")
                 (list (string-append #$(this-package-input "qtbase")
                                      "/lib/qt6/plugins")
                       (string-append #$(this-package-input "qtdeclarative")
-                                      "/lib/qt6/plugins")
-                       (string-append #$(this-package-input "qtwayland")
-                                      "/lib/qt6/plugins"))))
-              ;; The application uses argv[0] to locate itself.  The wrapper
-              ;; generated by wrap-program uses 'exec -a "${0##*/}"' which sets
-              ;; argv[0] to just "itksnap" without a path, causing "Error
-              ;; locating executable" on startup.  Remove the -a flag so
-              ;; argv[0] contains the full path to .itksnap-real.
-              (substitute* (string-append #$output "/bin/itksnap")
-                (("exec -a \"\\$\\{0##\\*/\\}\" ")
-                 "exec ")))))))
+                                      "/lib/qt6/plugins")))))))))
    (inputs
     (list curl
           freetype
@@ -1668,7 +1657,6 @@ combine the information contained in both.")
           mesa-opencl
           qtbase
           qtdeclarative
-           qtwayland
           vtk))
    (native-inputs
     (list
@@ -563,7 +563,7 @@ needs.")
           pkg-config
           shared-mime-info))
    (inputs
-     (list exiv2-0.27
+     (list exiv2
           gdk-pixbuf
           gtk+-2
           webp-pixbuf-loader))
@@ -912,12 +912,15 @@ displayed in a terminal.")
    (arguments
     (list #:phases
           #~(modify-phases %standard-phases
-               (add-after 'install 'record-absolute-file-name
+               (add-after 'install 'record-absolute-file-names
                 (lambda _
-                   ;; 'imv-dir' execs 'imv'.  Record the absolute file name.
-                   (substitute* (string-append #$output "/bin/imv-dir")
-                     (("exec imv")
-                      (string-append "exec " #$output "/bin/imv"))))))))
+                   ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'.
+                   ;; 'imv-dir' execs 'imv'. Record their absolute file names.
+                   (let ((bin (string-append #$output "/bin")))
+                     (substitute* (string-append bin "/imv")
+                       (("imv-") (string-append bin "/imv-")))
+                     (substitute* (string-append bin "/imv-dir")
+                       (("imv") (string-append bin "/imv")))))))))
    (native-inputs
     (list asciidoc
           cmocka
@@ -87,7 +87,6 @@
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages guile)
  #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages linux)
  #:use-module (gnu packages lua)
  #:use-module (gnu packages man)
  #:use-module (gnu packages maths)
@@ -1609,20 +1608,17 @@ channels.")
 (define-public exiv2
  (package
    (name "exiv2")
-    (version "0.28.7")
+    (version "0.27.5")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/exiv2/exiv2")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://www.exiv2.org/builds/exiv2-" version
+                           "-Source.tar.gz"))
       (sha256
-        (base32 "1l0f8dijv4r09fqj9cas7bv2y6xdnvy4ch1agc80nwyk726czfbb"))))
+        (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m"))))
    (build-system cmake-build-system)
    (arguments
     (list
-      #:tests? #f ;no tests
      #:configure-flags
      #~(list "-DEXIV2_BUILD_UNIT_TESTS=ON"
              ;; darktable needs BMFF to support
@@ -1663,7 +1659,7 @@ channels.")
                         (("retval = \\[1\\]") "retval = [0]")))))
                 '()))))
    (propagated-inputs
-     (list brotli expat libinih zlib))
+     (list expat zlib))
    (native-inputs
     (list googletest python))
    (home-page "https://www.exiv2.org/")
@@ -1688,20 +1684,6 @@ and XMP metadata of images in various formats.")
        #~(modify-phases #$phases
            (delete 'delete-static-libraries)))))))

-(define-public exiv2-0.27
-  (package/inherit exiv2
-    (name (package-name exiv2))
-    (version "0.27.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/exiv2/exiv2")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1a3g7qly75zidj2xjfx1548h6az8sda79cpwvfknsjy3n8d5aay7"))))))
-
 (define-public devil
  (package
    (name "devil")
@@ -65,7 +65,7 @@
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages)
  #:use-module (guix build-system copy)
-  #:use-module (guix build-system meson)
+  #:use-module (guix build-system gnu)
  #:use-module (guix build-system qt)
  #:use-module (guix download)
  #:use-module (guix gexp)
@@ -81,8 +81,8 @@
 ;;; 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 "20260126.0")
-(define %jami-daemon-commit "60f72b3b957c3d8fcaf5ee58771f7a01dd23a754")
+(define %jami-nightly-version "20251212.0")
+(define %jami-daemon-commit "663dc3f7b625abcd05e516d819c70fd883a3c9f2")

 (define-public libjami
  (package
@@ -91,32 +91,49 @@
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                     (url "https://review.jami.net/jami-daemon")
-                     (commit %jami-daemon-commit)))
+                    (url "https://review.jami.net/jami-daemon")
+                    (commit %jami-daemon-commit)))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "07l6zwwp385ryd41bnfga1p6qa640af7llvkx44b688wpj32ir6h"))
-              (patches (search-patches "libjami-pkgconf.patch"))))
-    ;; Reduce the output by about 2 MiB by splitting the seldom used 'jamid'
-    ;; daemon binary to the "bin" output.
-    (outputs '("out" "bin" "debug"))
-    (build-system meson-build-system)
+                "1379vq5afqgrjgwhl2qwapzrs9irjsxr2gzm35jrsg31rms5xgzb"))
+              (patches (search-patches "libjami-pkgconf.patch"
+                                       "libjami-simdutf.patch"))))
+    (outputs '("out" "bin" "debug"))    ;"bin' contains jamid
+    (build-system gnu-build-system)
    (arguments
     (list
-      #:configure-flags
-      #~(list "-Dinterfaces=library,dbus"
-              ;; The test suite currently fails to build (see:
-              ;; <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1168>).
-              "-Dtests=false")
+      ;; 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>).
      #: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>).
+      #:configure-flags #~(list "--disable-agent" "--enable-debug")
+      #:make-flags #~(list"V=1")        ;build verbosely
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'change-directory/maybe
            (lambda _
              ;; Allow building from the tarball or a git checkout.
              (false-if-exception (chdir "daemon"))))
+          (add-after 'install 'delete-static-libraries
+            ;; Remove 100+ MiB of static libraries.  "--disable-static" cannot
+            ;; be used as the test suite requires access to private symbols
+            ;; not included in the shared library.
+            (lambda _
+              (for-each delete-file
+                        (find-files (string-append #$output "/lib")
+                                    "\\.a$"))))
          (add-after 'install 'move-jamid
+            ;; This reduces the size of the main output, due to not depending
+            ;; on sdbus-c++.
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((libexec (string-append #$output:bin "/libexec"))
                    (share (string-append #$output:bin "/share")))
@@ -125,16 +142,12 @@
                             (string-append libexec "/jamid"))
                (mkdir-p share)
                (rename-file (search-input-directory outputs "share/dbus-1")
-                             (string-append share "/dbus-1")))))
-          (add-after 'install 'sanitize-jami.pc
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; The Meson-generated pkg-config file adds most inputs to
-              ;; Requires.private, which is unnecessary for our shared library
-              ;; use and would require propagating them.
-              (substitute* (search-input-file outputs "lib/pkgconfig/jami.pc")
-                (("^Requires.private:.*") "")))))))
+                             (string-append share "/dbus-1"))))))))
    (native-inputs
-     (list cppunit
+     (list autoconf
+           automake
+           cppunit
+           libtool
           perl                         ;to generate manpages with pod2man
           pkg-config
           which))
@@ -144,6 +157,7 @@
           dhtnet
           eudev
           ffmpeg-jami
+           ;guile-3.0
           jack-1
           jsoncpp
           libarchive
@@ -223,8 +237,9 @@ QSortFilterProxyModel conveniently exposed for QML.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0j1fx7a74hm5y6x301yppp1wg5h6wnmigpvp19rzvpnc64xffsqr"))
+                "13mpv62pw4f8cb9h8qaplxkn2ydsy9d2fr4v4p54r225ynzbq04h"))
              (patches (search-patches
+                        "jami-allow-system-zxing-cpp.patch"
                        "jami-libjami-cmake.patch"
                        "jami-qwindowkit.patch"
                        "jami-avutil-link.patch"))))
@@ -241,6 +256,9 @@ QSortFilterProxyModel conveniently exposed for QML.")
              ;; Disable the webengine since it grows the closure size by
              ;; about 450 MiB and requires more resources.
              "-DWITH_WEBENGINE=OFF"
+              ;; Use libwrap to link directly to libjami instead of
+              ;; communicating via D-Bus to jamid, the Jami daemon.
+              "-DENABLE_LIBWRAP=ON"
              ;; Ensure FetchContent contribs are looked from the system.
              "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS")
      #:phases
@@ -320,8 +338,8 @@ P2P-DHT.")

 (define-public jami-docs
  ;; There aren't any tags, so use the latest commit.
-  (let ((revision "5")
-        (commit "f95825cdda2570d0c30d0fdf076186fe72da71b1"))
+  (let ((revision "4")
+        (commit "d7930e51a50a8a5f1cec0fe186dbc3e5b9143294"))
    (package
      (name "jami-docs")
      (version (git-version "0.0.0" revision commit))
@@ -333,7 +351,7 @@ P2P-DHT.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "1f92l4ym14w8j70x9b4nybvpb967sv6359vjdxnqd71b6pal8pjr"))))
+                  "12g17yl78vhkjn97x62dlxjijhkhbrzvxk4g1jm5s1cxrrqg2bg2"))))
      (build-system copy-build-system)
      (arguments
       (list
@@ -24,7 +24,6 @@
 ;;; Copyright © 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2025 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Julian Flake <julian@flake.de>
-;;; Copyright © 2026 Mathieu Lirzin <mthl@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3512,38 +3511,10 @@ libraries and embed them into your own distribution.  Jar Jar Links includes
 an Ant task that extends the built-in @code{jar} task.")
    (license license:asl2.0)))

-(define-public java-hamcrest
-  (package
-    (name "java-hamcrest")
-    (version "3.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/hamcrest/JavaHamcrest/")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "07cagv2ncs4y02fmwbll3r4rqpjf3zxs163ync24q3x9fplrxmly"))))
-    (build-system ant-build-system)
-    (arguments
-     `(#:tests? #f                      ; Tests require junit
-       #:source-dir "hamcrest/src/main"
-       #:jar-name "hamcrest.jar"))
-    (home-page "https://hamcrest.org/")
-    (synopsis "Library of matchers for building test expressions")
-    (description
-     "This package provides a library of matcher objects (also known as
-constraints or predicates) allowing @code{match} rules to be defined
-declaratively, to be used in other frameworks.  Typical scenarios include
-testing frameworks, mocking libraries and UI validation rules.")
-    (license license:bsd-3)))
-
 (define-public java-hamcrest-core
  (package
    (name "java-hamcrest-core")
    (version "1.3")
-    (properties `((superseded . ,java-hamcrest)))
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3662,7 +3633,6 @@ testing frameworks, mocking libraries and UI validation rules.")
  (package
    (inherit java-hamcrest-core)
    (name "java-hamcrest-library")
-    (properties `((superseded . ,java-hamcrest)))
    (arguments
     (substitute-keyword-arguments (package-arguments java-hamcrest-core)
      ((#:build-target _) "library")
@@ -5703,7 +5673,6 @@ The jMock library
 (define-public java-hamcrest-all
  (package (inherit java-hamcrest-core)
    (name "java-hamcrest-all")
-    (properties `((superseded . ,java-hamcrest)))
    (arguments
     `(#:jdk ,icedtea-8
       ,@(substitute-keyword-arguments (package-arguments java-hamcrest-core)
@@ -65,14 +65,14 @@
 (define-public kqtquickcharts
  (package
    (name "kqtquickcharts")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kqtquickcharts-" version ".tar.xz"))
              (sha256
               (base32
-                "0lv8ikda7ny6ayns55khlc0hwgbiz6sms7h3qs66pr5sy828p2xn"))))
+                "048c27q5kxv59pkm1davs9cyh16khb86czmpbgl53qzp3b5sjacg"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list qtdeclarative))
@@ -89,14 +89,14 @@ charts.")
 (define-public analitza
  (package
    (name "analitza")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/analitza-" version ".tar.xz"))
       (sha256
-        (base32 "1g8yl258m1hs13fpnfkxn5wkpgllsxybah1vqav0zn37x33yqxgd"))))
+        (base32 "1lg4hdmra49pidahypd73gr4rmhgi4bbad6gp263v6qq7wf79ghs"))))
    (native-inputs (list extra-cmake-modules qttools))
    (inputs (list eigen qtbase qtdeclarative qtsvg))
    (build-system qt-build-system)
@@ -172,14 +172,14 @@ Currently available boards include:
 (define-public kalgebra
  (package
    (name "kalgebra")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kalgebra-" version ".tar.xz"))
       (sha256
-        (base32 "1mbw8gkrmxjklipz02f83n216j9061kxf6bbif7ysgg0xzcramzv"))))
+        (base32 "0h8xkg7slvbcbzaci8sz4ma0czn4w4nps4fpqahqp96lr3131i9x"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -224,14 +224,14 @@ such as addition, trigonometric functions or derivatives.")
 (define-public ktouch
  (package
    (name "ktouch")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/ktouch-" version ".tar.xz"))
       (sha256
-        (base32 "1bgllrrg40jna0qh536gngcihchwl1mwp854spvh7dbh1s4csgy3"))))
+        (base32 "077qk4d0l20qdd4gcfdcszyz4lhx8y0h7ba6g9rrb1k3wfdwc6s7"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools pkg-config))
@@ -362,14 +362,16 @@ to perform data analysis.")
 (define-public marble
  (package
    (name "marble")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/stable/release-service/"
-                           version "/src/marble-" version ".tar.xz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://invent.kde.org/education/marble.git/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
       (sha256
-        (base32 "0yywm869ah3hns7bgg08fy5vzgn16igqzignkw3kbvwyn2cvsadf"))))
+        (base32 "0ggb9cjbmv0aykih1qg1gyac4zrh8qydxfkrcdjrv916jmh8skx6"))))
    (build-system qt-build-system)
    (arguments
     ;; FIXME: libmarblewidget-qt5.so.28 not found.  Also enable the
@@ -51,14 +51,14 @@
 (define-public libkdegames
  (package
    (name "libkdegames")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkdegames-" version ".tar.xz"))
       (sha256
-        (base32 "1w86a2vlap1n38gfwbbqvb0kikb1ahnk0g3q39f798q77adgk20s"))))
+        (base32 "1928nizx6667imxvp69jlr8j2mrvanv7mlbvnk37hydkgxkhbws6"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -96,14 +96,14 @@
 (define-public katomic
  (package
    (name "katomic")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/katomic-" version ".tar.xz"))
       (sha256
-        (base32 "04bwpkyfr0q60sbad3d4zblj5wll2m2rq5r8w3882wwzg7607yik"))))
+        (base32 "1k22md9hbaa0mq51nqmalc7bzjv6rlhcdd9c70jhv8ndxwdvw8ch"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -134,14 +134,14 @@ This package is part of the KDE games module.")
 (define-public ktuberling
  (package
    (name "ktuberling")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ktuberling-" version ".tar.xz"))
       (sha256
-        (base32 "1a1pc4hbf2jl96myfy4p1249519zq4szm5263w6bxsrknlsdm5pf"))))
+        (base32 "0kb181xvmq6764yffknj8bhgvap2ywjjjrb41h7d2gg5mlmswzcj"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -186,14 +186,14 @@ This package is part of the KDE games module.")
 (define-public picmi
  (package
    (name "picmi")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/picmi-" version ".tar.xz"))
       (sha256
-        (base32 "066p47hdslfrwk9mdq6j6kk63y72caa699fanyckrjh91crj08p9"))))
+        (base32 "0w59d3kvaj13078317ylbxx6isnfxalb0vwkbbig2w6kp23w0p6x"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -224,14 +224,14 @@ This package is part of the KDE games module.")
 (define-public kolf
  (package
    (name "kolf")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kolf-" version ".tar.xz"))
       (sha256
-        (base32 "1x34l9imb36kf32wzgyvkssl3fz4nrg4jrv2lv16sj3ryh88xv02"))))
+        (base32 "17ahfja5wbma3cyalsj312bxbxk4npwm1ywq60f0zx5mr66av51x"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -275,14 +275,14 @@ This package is part of the KDE games module.")
 (define-public libkmahjongg
  (package
    (name "libkmahjongg")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/libkmahjongg-" version ".tar.xz"))
       (sha256
-        (base32 "1iyvp71zbs99asb2zmr3cpvc6l92gwajmi39jfmia19r8wy5bc3x"))))
+        (base32 "0my6plc4pk743nk41n3zxdafkw6cpvqb5adkf492v9jvlgprqbs8"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -324,14 +324,14 @@ other Mah Jongg like games.")
 (define-public kmahjongg
  (package
    (name "kmahjongg")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kmahjongg-" version ".tar.xz"))
       (sha256
-        (base32 "1fpfakx0gl76crba64dlnw3bk12304dzlm8mriv31nj08v84mwla"))))
+        (base32 "08zix4ck3v7fk21cz985wmm3gcdgdgpz45459a1lij9rb6x50si9"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -366,14 +366,14 @@ This package is part of the KDE games module.")
 (define-public kshisen
  (package
    (name "kshisen")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kshisen-" version ".tar.xz"))
       (sha256
-        (base32 "1a35fb3bb0nvjas1d3cmjxr5gchh85cdp1dcwm7r6ph3wjirfmfg"))))
+        (base32 "1a0y11kyrpibf3vl4imlgmnhi9vmpy3yaxj7nqlv6xy26a2lxzyh"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules
@@ -405,14 +405,14 @@ This package is part of the KDE games module.")
 (define-public kajongg
  (package
    (name "kajongg")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kajongg-" version ".tar.xz"))
       (sha256
-        (base32 "06wqnvj0nn4hp48p2fqgfjk66fd5jx5cxkgggcnw13b26fvs8mxj"))))
+        (base32 "0y3mmvgl7sydr7ax5091y7abqziqaflgb8bqnazr3s8lzp48dma7"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -479,14 +479,14 @@ This package is part of the KDE games module.")
 (define-public kbreakout
  (package
    (name "kbreakout")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kbreakout-" version ".tar.xz"))
       (sha256
-        (base32 "07kdbhymvf2brswzfw6fi857dv9483hh835nnpk1iy77a23wyl7m"))))
+        (base32 "0h2gn18x7mk59qzp3bfh0my4zsb6fmc4b01fj4rcvbbzjcgg12q5"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -520,14 +520,14 @@ This package is part of the KDE games module.")
 (define-public kmines
  (package
    (name "kmines")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmines-" version ".tar.xz"))
       (sha256
-        (base32 "1yy9bmrwf5cwgpai8lqqspfyv1b158sz8m9dsv3qznwnnig1lmn1"))))
+        (base32 "0gsamph4ipmxw3anr214vbxlpg7d7d1lxlzpm0sad7xgv0ydmw4r"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -561,14 +561,14 @@ This package is part of the KDE games module.")
 (define-public konquest
  (package
    (name "konquest")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/konquest-" version ".tar.xz"))
       (sha256
-        (base32 "196yzircqgrxwxy66nqwwzn673aypj5i7difacvl2ka1xzg2f1r8"))))
+        (base32 "1yayqgpl9gj5py1mq2srrmkhyafw74p2awk04n4nsqwc1s1xb40a"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -604,14 +604,14 @@ This package is part of the KDE games module.")
 (define-public kbounce
  (package
    (name "kbounce")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kbounce-" version ".tar.xz"))
       (sha256
-        (base32 "1a4qr0hcacrcgyrc908i80kcrw9n087aar5jryq29rdr5g848qf5"))))
+        (base32 "06lh7nn6212c2sa0qkxgdr5j4n7b50rcnnkvlasj6cl68i4rwhgi"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -646,14 +646,14 @@ This package is part of the KDE games module.")
 (define-public kblocks
  (package
    (name "kblocks")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/kblocks-" version ".tar.xz"))
       (sha256
-        (base32 "0n2h3scphwj0mlkg8bsmf2pbdfv4gm94w0rhw8rr03hfr7vphkwx"))))
+        (base32 "1b84rvp50adsnlprarm1jc4ii9243ds5yxapad4gp1ynzyazw6h9"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -688,14 +688,14 @@ This package is part of the KDE games module.")
 (define-public ksudoku
  (package
    (name "ksudoku")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/ksudoku-" version ".tar.xz"))
       (sha256
-        (base32 "1ivnsfh0ngzsig3vr252k4pmhygs554r13j8q3q0car3jcbf2mb3"))))
+        (base32 "1m5xgnwyq444qvakfqljiir7xdg0sf9jpdc0fj5xqil5x96b2xym"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -752,14 +752,14 @@ This package is part of the KDE games module.")
 (define-public klickety
  (package
    (name "klickety")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/klickety-" version ".tar.xz"))
       (sha256
-        (base32 "1n440690867flcsvx6g77hm77ig7m7pl84jgsfjzxwhccac0snzr"))))
+        (base32 "167c5y8kqi30j3p0iwhm9lqvls3dljpwbgv15rbya16iba5r2rgw"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -790,14 +790,14 @@ This package is part of the KDE games module.")
 (define-public klines
  (package
    (name "klines")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/klines-" version ".tar.xz"))
       (sha256
-        (base32 "1h65hqalhrb54rb9hrxgrqvyccf76zvc17fvvg4vj98iyr6z00p7"))))
+        (base32 "0xwsr63p37pdk8232c856qpymjwvlr5jydvjli0mlq3nj6wka489"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -837,14 +837,14 @@ This package is part of the KDE games module.")
 (define-public kgoldrunner
  (package
    (name "kgoldrunner")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kgoldrunner-" version ".tar.xz"))
       (sha256
-        (base32 "1dcad00vbayp6dar4p7g524bz7561dyk5mpl8rwk8psabq7330pf"))))
+        (base32 "1k5mi6zq0ypmkgzq54n0y10g62ipg9v2xin4d7vddjlfxz0sspzf"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -882,14 +882,14 @@ This package is part of the KDE games module.")
 (define-public kdiamond
  (package
    (name "kdiamond")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdiamond-" version ".tar.xz"))
       (sha256
-        (base32 "1sqra4i1rfzml0vk15390rjvksgvym4v3jwzx5v8z81z3ak9igva"))))
+        (base32 "0m9p5fw1436y0q4lpq2s4ih2w03qhl1xnix35r4y6nx0jnyls97a"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -924,14 +924,14 @@ This package is part of the KDE games module.")
 (define-public kfourinline
  (package
    (name "kfourinline")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kfourinline-" version ".tar.xz"))
       (sha256
-        (base32 "18n5a031q5y1jf1jx5lkfghxz39jaw254qiqybilf7jicbg91rn0"))))
+        (base32 "04lpm7f119imm0x439bqlm62v7jq4arb0w1kq5s2b2hj1w6ayn65"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -967,14 +967,14 @@ This package is part of the KDE games module.")
 (define-public kblackbox
  (package
    (name "kblackbox")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kblackbox-" version ".tar.xz"))
       (sha256
-        (base32 "00l2cwb47dsx1f78rybay761y34mg07c08r6697hpf823c77g9fb"))))
+        (base32 "0px1pzny7v9y3prdc1a499d1zg47sagbwysiw146c394m9jra07g"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1011,14 +1011,14 @@ This package is part of the KDE games module.")
 (define-public knetwalk
  (package
    (name "knetwalk")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/knetwalk-" version ".tar.xz"))
       (sha256
-        (base32 "16g473aiy6mmwn6l4447slxnh8lkra4wyz9pyxgkr98zl6vmhwh8"))))
+        (base32 "0vx1lca2x6idd41dixpx0r4wagjyciqj5dli7v7a4rpi8yiv5bfg"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -1054,14 +1054,14 @@ This package is part of the KDE games module.")
 (define-public bomber
  (package
    (name "bomber")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/bomber-" version ".tar.xz"))
       (sha256
-        (base32 "078y9lhlq1gwcsc9z1m7l9dj0nkw85vmj4si13p1nm0b5l1ghk1q"))))
+        (base32 "16ycx665y8bj0j3m27js9ipwhlpwffw0f4wh41a2lp2i87bwrhbq"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1099,14 +1099,14 @@ This package is part of the KDE games module.")
 (define-public granatier
  (package
    (name "granatier")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/granatier-" version ".tar.xz"))
       (sha256
-        (base32 "0ihf72v1gpacy9i95q5v1f1sgxsd5ibqawgn2yxpfmrbbgafqjd7"))))
+        (base32 "0vv207hkl6c8rhb2p52sdiqpaa2ac81qiv6329d5c3gss7w1m4zl"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1140,14 +1140,14 @@ This package is part of the KDE games module.")
 (define-public ksirk
  (package
    (name "ksirk")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksirk-" version ".tar.xz"))
       (sha256
-        (base32 "1m12kgvjj00ijr4988khhgkblyhqklqzm32k9gs0bwm31ilg05jg"))))
+        (base32 "1ip79mnp7xwba6vnds9f4scvfia3bqqpb4akvrqnmjsxb5ki2alr"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1201,14 +1201,14 @@ This package is part of the KDE games module.")
 (define-public palapeli
  (package
    (name "palapeli")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/palapeli-" version ".tar.xz"))
       (sha256
-        (base32 "0xanz1fqp8ydhv2qlfqg8vb83zzh28gjvphgjx1cialq03k02pa8"))))
+        (base32 "0ic9c10mmvh6zl6f3zb8a0gyxhmwvs6kw7hy2qpv2p12wikyxiwg"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1251,14 +1251,14 @@ This package is part of the KDE games module.")
 (define-public kiriki
  (package
    (name "kiriki")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kiriki-" version ".tar.xz"))
       (sha256
-        (base32 "0zsf15i4zqya9n2abb187lr2ayrykjd5h9s5pxqalg0zj7vpsnan"))))
+        (base32 "05b345krj5i5m5f6mrmgqbxhcxq2djy3vyapyn9zcysvyxhj8qc2"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1292,14 +1292,14 @@ This package is part of the KDE games module.")
 (define-public kigo
  (package
    (name "kigo")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kigo-" version ".tar.xz"))
       (sha256
-        (base32 "15gphhp6rvdy98qy15lf2s9pwidjv1xchlchp9p3lipjf4hgd292"))))
+        (base32 "0frrgwszdisjzjhcdlwm3vxncj59x8zyrbsk85mly6mgw44x6fh5"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -1349,14 +1349,14 @@ This package is part of the KDE games module.")
 (define-public kubrick
  (package
    (name "kubrick")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kubrick-" version ".tar.xz"))
       (sha256
-        (base32 "02ss8s48jv0x4f7ibfn12p3r3qj1fgfdwp812s45mn2ix75183by"))))
+        (base32 "04lrxkr1j4md757zk7cdq0rrswdh4y84739kxnss451v8wbp9zy2"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1395,14 +1395,14 @@ This package is part of the KDE games module.")
 (define-public lskat
  (package
    (name "lskat")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/lskat-" version ".tar.xz"))
       (sha256
-        (base32 "0018cjrc3l5nipzz7fryggr8kx0nalygm2hsllzrf2rhgfgvmxij"))))
+        (base32 "1g9952vzf94frg57izljl4ydzh6bzmacx9k55gw6h97gax2qhclm"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1438,14 +1438,14 @@ This package is part of the KDE games module.")
 (define-public kapman
  (package
    (name "kapman")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kapman-" version ".tar.xz"))
       (sha256
-        (base32 "09ikvv2sf05x5i5lfyqv46j0pqwra3mwr65hzi3yv8a3sf0dcm2a"))))
+        (base32 "0wr98pzvz99yhi3545898g7mqr3pyaids527wwhx49svgbm4jr4v"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1481,14 +1481,14 @@ This package is part of the KDE games module.")
 (define-public kspaceduel
  (package
    (name "kspaceduel")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kspaceduel-" version ".tar.xz"))
       (sha256
-        (base32 "0cxh4q8nr3s1lna3ffxvg05bkydp34ndxhq3qk4jwz8qwsjcvg88"))))
+        (base32 "1znlyd9wrcx7i46vx3cw7xm26z2814vw0h2pljikgzxg8jjdq4mp"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1519,14 +1519,14 @@ This package is part of the KDE games module.")
 (define-public bovo
  (package
    (name "bovo")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/bovo-" version ".tar.xz"))
       (sha256
-        (base32 "16r70bhpihy9fzwkc31sy4sqibv1g4mpsi2hb44raqljp9gdinvn"))))
+        (base32 "1rndf5aiikay930s0zrfp986pvhmwsz0x80cjs0cgpp1gj2j9rnz"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1559,14 +1559,14 @@ This package is part of the KDE games module.")
 (define-public killbots
  (package
    (name "killbots")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/killbots-" version ".tar.xz"))
       (sha256
-        (base32 "121f3ig1wib6z0j52gw7py1jzh0rga4h8wnsahy60fccs895nwb8"))))
+        (base32 "1arsm9j1b0asb0bxqqcf2rb29ljg0j7a7dq4d25nh0knkqh739fa"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1604,14 +1604,14 @@ This package is part of the KDE games module.")
 (define-public ksnakeduel
  (package
    (name "ksnakeduel")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksnakeduel-" version ".tar.xz"))
       (sha256
-        (base32 "17dwqlf6x3m5ip29p0wlqgxq3gfkm0dyxyp796aa6g0mhczjjqij"))))
+        (base32 "1in6lg4zyz3a31ip95y1b3glx4shmqxcf6apmw1zagb2kw069zhv"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1646,14 +1646,14 @@ This package is part of the KDE games module.")
 (define-public kollision
  (package
    (name "kollision")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kollision-" version ".tar.xz"))
       (sha256
-        (base32 "1xan8xxy5vpc1mg3bpl3xyybqqlnmvz8h7lbd96zac631y7b7kls"))))
+        (base32 "0flplbf0xxag9vpdqp6zq5bvdc3zkm75gwf7cdwavs2aqmkc3xcx"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1687,14 +1687,14 @@ This package is part of the KDE games module.")
 (define-public knavalbattle
  (package
    (name "knavalbattle")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/knavalbattle-" version ".tar.xz"))
       (sha256
-        (base32 "0v26pmgrf1dj6mrniz20f64i372f2dbd8m8b8w6jml2f6z9d1syv"))))
+        (base32 "0bynpqcgy9njkkbi5csjzzwyn9kyhvmnnvh1mbdqm1frc4bz31hd"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1730,14 +1730,14 @@ This package is part of the KDE games module.")
 (define-public kreversi
  (package
    (name "kreversi")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kreversi-" version ".tar.xz"))
       (sha256
-        (base32 "19w1fpfvb5hq1x8rcyj9b9s1x4j6wnslsp8f7wnqrs0c5d89b9bh"))))
+        (base32 "094mab1zkg91jyp7a1kcy6hzcjsyfhbjmq1b53m15381c27ypzw1"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1775,14 +1775,14 @@ This package is part of the KDE games module.")
 (define-public ksquares
  (package
    (name "ksquares")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksquares-" version ".tar.xz"))
       (sha256
-        (base32 "008d2n7cf5zq4ji3cxkpj0f0gzs5fsdfhdrisbb3wg93l21fsck0"))))
+        (base32 "1kxmvl5775r2gf9jhy6j5c66qbg8br8bxpwcbp6a53si7f63qxss"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1814,14 +1814,14 @@ This package is part of the KDE games module.")
 (define-public kjumpingcube
  (package
    (name "kjumpingcube")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kjumpingcube-" version ".tar.xz"))
       (sha256
-        (base32 "0d4ipqyknls3vcbl27r7v1461zg85kfn7hdbkl12l5cskfz3nr4p"))))
+        (base32 "1qs0yjdchhfv3c27pxn24drrz04yxbaz9pfnb3s13piddpprn1d0"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1855,14 +1855,14 @@ This package is part of the KDE games module.")
 (define-public knights
  (package
    (name "knights")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/knights-" version ".tar.xz"))
       (sha256
-        (base32 "0vwl0y41qz9bih4dirbn4d3wcp629zxf31r9is2aa2m4p1arrxdn"))))
+        (base32 "0g9825yn76r6mmimisvfk4xp1albqq4mg84mas11xbfx60jrn26a"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1919,14 +1919,14 @@ This package is part of the KDE games module.")
 (define-public kpat
  (package
    (name "kpat")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kpat-" version ".tar.xz"))
       (sha256
-        (base32 "0w41zpbb07s1wnhh59pxvfi51bxxh5i4a70h9xgfs0z1kvfqcps8"))))
+        (base32 "1vi6hf2nffq4wwsc6x21r71bb4fcmc5vbm0jf1sskfmap7bk7q35"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -98,14 +98,14 @@
 (define-public kquickimageeditor
  (package
    (name "kquickimageeditor")
-    (version "0.6.0")
+    (version "0.5.1")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/" name "/"
                           name "-" version ".tar.xz"))
       (sha256
-        (base32 "0yjl4b8ix9ffya89nq9pp1gmvdwshjslh5dw1gavda34q7hlrv8i"))))
+        (base32 "0acv6cis7gjpnzpnlxfrf6rzhwyqdm234p6r7vx7gl7ad3rp30ph"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -113,9 +113,7 @@
    (native-inputs
     (list extra-cmake-modules))
    (inputs
-     (list kconfig
-           opencv
-           qtdeclarative))
+     (list qtdeclarative))
    (home-page "https://invent.kde.org/libraries/kquickimageeditor/")
    (synopsis "QtQuick components for image editing")
    (description "KQuickImageEditor is a set of QtQuick components providing
@@ -125,14 +123,14 @@ image editing capabilities.")
 (define-public ksanecore
  (package
    (name "ksanecore")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                             "/src/ksanecore-" version ".tar.xz"))
       (sha256
-        (base32 "0cnv7jgcbyyfbsh2az1qrbwkgw0n9gk1f5b87m6av2x7dvch2zb1"))))
+        (base32 "15x9mfg8mb3wll48ibwz8hpc6gs55ryy42dfkz961vlk86cmjmp1"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -276,14 +274,14 @@ settings and rules that process and organize imported items on-the-fly.")
 (define-public gwenview
  (package
    (name "gwenview")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/gwenview-" version ".tar.xz"))
       (sha256
-        (base32 "137p1d0j67l3bnglglljjicxsj9hs62vh005mp48bwsyiib8lcng"))))
+        (base32 "18gcfr57kzlwd5jjxkvi7xhpzlh7vpyx50jz6p794gpf80nw8010"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -339,7 +337,7 @@ annotating features.")
 (define-public kcolorchooser
  (package
    (name "kcolorchooser")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
@@ -347,7 +345,7 @@ annotating features.")
                           "/src/kcolorchooser-" version ".tar.xz"))
       (sha256
        (base32
-         "1xk76zzh24gazad9qg5ny22bn22fnxaam4n0wq3b8p0pv8g9gsgr"))))
+         "0rxy61lm4sfksvzbza56mphkzv5brnxznn6h48462jl0nc1wxkka"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -367,14 +365,14 @@ annotating features.")
 (define-public kdegraphics-mobipocket
  (package
    (name "kdegraphics-mobipocket")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "03bhj8r9yaffw2sijjqfg2gaqnm6dvz69zm8p5c8qgr5gr1gc5gm"))))
+        (base32 "0m5mqgf8gmsl0rrn739w6gw3k5jxk5hjcwwma1li231768bgzy54"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f
@@ -392,14 +390,14 @@ Mobipocket e-books in Dolphin and other KDE apps.")
 (define-public kdegraphics-thumbnailers
  (package
    (name "kdegraphics-thumbnailers")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1dfsrm4xlbxij8bcly5kgvz57bv0fl9fpfnmxsy2mw4y1mifczhy"))))
+        (base32 "113yr4sw28lk9vvh8zplxbcw6gpaskcddsrk6m35hz4cayr2pz0m"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -498,14 +496,14 @@ replace the other outdated Graphviz tools.")
 (define-public kolourpaint
  (package
    (name "kolourpaint")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kolourpaint-" version ".tar.xz"))
       (sha256
-        (base32 "1gz343af48n6nm1wnqn07bfdyjd944ayq5g1jc7miwkmj92m4ndh"))))
+        (base32 "035ln578r2gdb2aa0h59b65k0lirr77i7ns9asahvib14fdw3xzd"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -668,14 +666,14 @@ expression library, that is used in Krita.")
 (define-public libkdcraw
  (package
    (name "libkdcraw")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1m2gz0md29jra8ac73q2mzq1xhi76daxrh7fc2k16hvqb4d40mji"))))
+        (base32 "1prclxx92zk42m2d59j8k7c1330ay678dmml5z374g712g87iyjj"))))
    (build-system cmake-build-system)
    (native-inputs
     (list pkg-config extra-cmake-modules))
@@ -704,14 +702,14 @@ decode RAW picture files.")
 (define-public libksane
  (package
    (name "libksane")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                             "/src/libksane-" version ".tar.xz"))
       (sha256
-        (base32 "145bsfywycpiv0s3b8m2k944ppc8cvnp5mg4abnpj5hmm73f9zdl"))))
+        (base32 "0s3gdlblzh19zxp1wbk07q6anyck2gj94538ijlkp0lvrkpz82vk"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -734,14 +732,14 @@ scanners.")
 (define-public libkexiv2
  (package
    (name "libkexiv2")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "15mrk47gzj6c4l8ry1zws9wlz5qan116r56x7nm8idbhyak0zsqx"))))
+        (base32 "00rxa2d4pjgy8sqsfav9n68xwayq4cclifrk9n1nyamnaj2qj1h8"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -760,14 +758,14 @@ picture metadata as EXIF/IPTC and XMP.")
 (define-public okular
  (package
    (name "okular")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "14443kk5brdnqr9l6nk47xppkzj2mikrx82szgkyb3m7pcasa1fg"))))
+        (base32 "0kvicpc61ak0rv5wqrcb97gcc0pqws412sar30a9crslzkl3sbh3"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -151,7 +151,7 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
 (define-public falkon
  (package
    (name "falkon")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
@@ -159,7 +159,7 @@ framework.  It builds XMPP clients complying with the XMPP Compliance Suites
                           "/src/falkon-" version ".tar.xz"))
       (sha256
        (base32
-         "0nd9nywi42cr9a9zwksbp5zwv20jpjwppv9n0xbh83fy3fx4v6vd"))))
+         "0ag140vn8jlwr5b3282gwjfk0xaqp6psbr71i15zb2q28a52s98n"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase))
@@ -252,14 +252,14 @@ Qt-based XMPP library QXmpp.")
 (define-public kget
  (package
    (name "kget")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kget-" version ".tar.xz"))
       (sha256
-        (base32 "08crazryh2ib1ynlhxmybwl1rlbcm2d1p72mnwbbfazjqmkc445x"))))
+        (base32 "13g3lw1kylw94wbbhwfpzrv2q171np6hl8nkm0wypa2j6mjy9q5x"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools pkg-config))
@@ -310,7 +310,7 @@ This package is part of the KDE networking module.")
 (define-public kdeconnect
  (package
    (name "kdeconnect")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
@@ -319,7 +319,7 @@ This package is part of the KDE networking module.")
                           version ".tar.xz"))
       (sha256
        (base32
-         "1a3jrhknggyi6hm71mj6px0dqmsdbhw02vkxin2zrzncf79j9zqg"))))
+         "0asy7vq9k9fdnyp5vzkswdnqjr43jvka6v6xj85fgxc55vrg2hbf"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -349,6 +349,7 @@ This package is part of the KDE networking module.")
    (inputs
     (list dbus
           kcmutils
+           kconfigwidgets
           kcrash
           kdbusaddons
           kguiaddons
@@ -400,7 +401,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
 (define-public kio-extras
  (package
    (name "kio-extras")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -408,7 +409,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
                                  version ".tar.xz"))
              (sha256
               (base32
-                "0hfzx2ysvggr3h7db06zrg9ap9ginhbwwnmg1ml6fgjnz3z66da5"))
+                "1ln2x7l5cgwybgc8qv99pmwb391dnf18qxq6r6rqrgk3qvf6dycr"))
              (modules '((guix build utils)))
              (snippet
               ;; Fix including libproxy.
@@ -419,7 +420,6 @@ communicate with each other.  Here's a few things KDE Connect can do:
     (list #:test-exclude
           (string-append "("
                          (string-join '("filenamesearchtest"
-                                         "filenamesearchexternaltest"
                                         "thumbnailtest"
                                         "testkioarchive")
                                       "|")
@@ -456,11 +456,13 @@ communicate with each other.  Here's a few things KDE Connect can do:
                  kconfig
                  kconfigwidgets
                  kcoreaddons
-                  kdbusaddons
                  kdnssd
+                  kdbusaddons
                  kdsoap
                  kdsoap-ws-discovery-client
+                  kguiaddons
                  knotifications
+                  ktextwidgets
                  ki18n
                  kio
                  ksyntaxhighlighting
@@ -473,8 +475,8 @@ communicate with each other.  Here's a few things KDE Connect can do:
                  libtirpc
                  openexr
                  phonon
-                  qt5compat
                  qtbase
+                  qt5compat
                  qcoro-qt6
                  qtsvg
                  samba
@@ -492,14 +494,14 @@ the functionality of the KDE resource and network access abstractions.")
 (define-public kio-zeroconf
  (package
    (name "kio-zeroconf")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kio-zeroconf-" version ".tar.xz"))
       (sha256
-        (base32 "1a727i2j690z7di3qcbrx20g5c3022gzqibfc1lypmvk2vh96z12"))))
+        (base32 "1q3knm21xd5lwhll0mdpignjh9sy4bhvfyhvii5c146vklrb4yyy"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -520,14 +522,14 @@ or Bonjour by other projects).")
 (define-public konversation
  (package
    (name "konversation")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/konversation-" version ".tar.xz"))
       (sha256
-        (base32 "0s2q38454myzjvlwsw7k5z3kybbwnna9j12hsmgx41qcj3s8x2mw"))))
+        (base32 "13c0hlvdqs49v7ap8yccxlc3945fqn09f3f5rmf2gxyq6a6bfiay"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools qttools))
@@ -595,14 +597,14 @@ Features are:
 (define-public krdc
  (package
    (name "krdc")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/krdc-" version ".tar.xz"))
       (sha256
-        (base32 "0icnnl01h4g6sazwk22jfy6mj6qf25z8r9xmqq01n59xa30c034j"))))
+        (base32 "0slha1lnc775bjvj5x52xgzfsi7l2z525wb9vmnjndn04657ncda"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config kdoctools))
@@ -652,14 +654,14 @@ This package is part of the KDE networking module.")
 (define-public ktorrent
  (package
    (name "ktorrent")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ktorrent-" version ".tar.xz"))
       (sha256
-        (base32 "1qvlgndw0yydysayvp1wyfq29rhr6c2590c6jq0jrh0pvvgb9ly3"))))
+        (base32 "0gjdzwnwmmx4r96xkxby8gdgxzv94kgd29r8c0cpckr74qs2bjv2"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -708,14 +710,14 @@ a full-featured client for BitTorrent.")
 (define-public libktorrent
  (package
    (name "libktorrent")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "0k1h707fz5nsnvg2fz67ssfcj8x1mdpl9parhq8jfb1r67976ngv"))))
+        (base32 "0sfds455xi2c40iqhagfdm8wnwqp9mrazh3csr57m0mn9rpxk96g"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -743,14 +745,14 @@ management, IP blocking lists.")
 (define-public kunifiedpush
  (package
    (name "kunifiedpush")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1zhgnr1ivla2f08xpc1sfaiqiwbcgzxfqw24sgh7h5i9s4fisn9p"))))
+        (base32 "02ijhc9mg5cmjbb5ksgl1wx6w1qj208kbarh17xg0nakim1j9jg8"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -779,14 +781,14 @@ UnifiedPush} client library and distributor daemon.")
 (define-public neochat
  (package
    (name "neochat")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/"
                           version "/src/" name "-" version ".tar.xz"))
       (sha256
-        (base32 "1z7y4xzdm94x39ckfxygflbfhh4fcd4d1dsnknlvp89xsl114bd5"))))
+        (base32 "0dccrjpmf2fajvay6xppid21qj3ggznmbk6p5fgplmqb593rdbaz"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -800,8 +802,10 @@ UnifiedPush} client library and distributor daemon.")
           kcolorscheme
           kconfig
           kcoreaddons
+           kcrash
           kdbusaddons
           ki18n
+           kiconthemes
           kio
           kirigami
           kirigami-addons
@@ -940,7 +944,7 @@ desktop.  It supports:
 (define-public smb4k
  (package
    (name "smb4k")
-    (version "4.0.5")
+    (version "4.0.4")
    (source
     (origin
       (method git-fetch)
@@ -948,7 +952,7 @@ desktop.  It supports:
                           (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "16lm0d83xq5rjc4cnaaznvqibmh4kn6s0spccjrb99zsyhp4fgkc"))))
+        (base32 "1sbw7fdcgfjadggnmsl3m85kgim80lkn2vakwv4mrkrci0izk1xj"))))
    (build-system qt-build-system)
    (arguments (list
                #:qtbase qtbase
@@ -126,14 +126,14 @@
 (define-public audiocd-kio
  (package
    (name "audiocd-kio")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/audiocd-kio-" version ".tar.xz"))
       (sha256
-        (base32 "12jnjl2a5d050kqr2bpr5g8m8222457ymsn9j4gsjp6g8rzdf2p9"))))
+        (base32 "1b7fawpribq9csyj8ixqdsg288cjx82l5q83vd3m0qbvxm383qvf"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -277,14 +277,14 @@ This package is part of the KDE multimedia module.")
 (define-public dragon
  (package
    (name "dragon")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/dragon-" version ".tar.xz"))
       (sha256
-        (base32 "16gf8vpk2jc8vjc25kn9m3qaradk7gsxs61b3db0qzqrrj22dwyf"))))
+        (base32 "0f6hz4ngxj3jj3301df1kg4wblc4jcpzr0pwrcc685hq63ljy7cy"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools pkg-config))
@@ -377,14 +377,14 @@ This package is part of the KDE multimedia module.")
 (define-public elisa
  (package
    (name "elisa")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/elisa-" version ".tar.xz"))
       (sha256
-        (base32 "02x26bfhj07ymfi3w6jbyf12cmam2ss6zvmcrbjd3klhwxr0ciyw"))))
+        (base32 "04yx8y22830c3z609f9zqdpq2smgm5jhv26r1ds8slca0nylnrv3"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config dbus kdoctools
@@ -446,14 +446,14 @@ its own database.  You can build and play your own playlist.")
 (define-public ffmpegthumbs
  (package
    (name "ffmpegthumbs")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ffmpegthumbs-" version ".tar.xz"))
       (sha256
-        (base32 "1kvbrifg06hrwzbni5nrlpywy5c5rqdmkkljc03fsmxgs7plwy74"))))
+        (base32 "0qj9r26jgjfjw7wrdbxzbgj0wvn5f09gq8j585gq3687llqx3v44"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config))
@@ -475,14 +475,14 @@ This package is part of the KDE multimedia module.")
 (define-public juk
  (package
    (name "juk")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/juk-" version ".tar.xz"))
       (sha256
-        (base32 "1njbbsxw3ijkd9s4hwl6v0x34z5fh6rmxkp5ip7683sbrl0p4bdb"))))
+        (base32 "12gyiwpp037vs6qxqpiyxrbvpm88ih79qaxm58xlarz0baxiyp5r"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -530,14 +530,14 @@ This package is part of the KDE multimedia module.")
 (define-public kdenlive
  (package
    (name "kdenlive")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdenlive-" version ".tar.xz"))
       (sha256
-        (base32 "199c4jw76hk8dbyhyypn6f3km5n0pxh8vwi0fx89zs99xkcfkzna"))))
+        (base32 "10rp8fv1phgk46mpzz6v4j47pxg918plning7g9xpma7268lxfl1"))))
    (build-system qt-build-system)
    (arguments
     ;; XXX otiotest seemingly freezes.  Additionally, tests/mixtest.cpp:818
@@ -577,8 +577,8 @@ This package is part of the KDE multimedia module.")
           karchive
           kcrash
           kdbusaddons
-           kddockwidgets
           kdeclarative
+           kdoctools
           kfilemetadata
           kguiaddons
           kiconthemes
@@ -674,14 +674,14 @@ variety of formats.")
 (define-public k3b
  (package
    (name "k3b")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/k3b-" version ".tar.xz"))
       (sha256
-        (base32 "10zmydz6k8bhffsxz6v9n2ib31w0yx7viwsn0bm85cbjf0ncnbax"))))
+        (base32 "09ax204q8k4za6z85qjn8nm2iwfm4rinrjcnvbzhnqwyh5ciy7jp"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -832,14 +832,14 @@ autoloading of subtitle files for use while playing video.")
 (define-public kamoso
  (package
    (name "kamoso")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kamoso-" version ".tar.xz"))
       (sha256
-        (base32 "1bz61pbwhx5g25q6vxjia1z1dl6c7qkvpdpz6s55jgz4msi5k3gb"))))
+        (base32 "1dqqyg1bzybpnhzx5c870aw8pqlshphzn22hr1r5xhxp2i1nj6a2"))))
    (build-system qt-build-system)
    (native-inputs
     (list
@@ -856,7 +856,6 @@ autoloading of subtitle files for use while playing video.")
           ki18n
           kio
           kirigami
-           kirigami-addons
           kitemmodels
           knotifications
           kparts
@@ -877,14 +876,14 @@ camera.  Use it to take pictures and make videos to share.")
 (define-public kasts
  (package
    (name "kasts")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kasts-" version ".tar.xz"))
       (sha256
-        (base32 "10jjd54nc0j55fqkyn4nfisyc2iywdbryarwbbjjjxd949s57wng"))))
+        (base32 "0wv2v2d9rjair65bwlnkp42kx723hsb63cwxzhnny86gr4r8xk6c"))))
    (build-system qt-build-system)
    (native-inputs (list pkg-config extra-cmake-modules))
    (inputs (list breeze-icons
@@ -935,14 +934,14 @@ Its main features are:
 (define-public kmix
  (package
    (name "kmix")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmix-" version ".tar.xz"))
       (sha256
-        (base32 "0gjmssy56cd75ivawi0qbkf0wv7av4llrk2rfp2l5z8xq4nw1xmg"))))
+        (base32 "177p10qn7awlfrz356fm9wv4zx7479afjdhdl2gwss6v18b8qhpq"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -981,14 +980,14 @@ This package is part of the KDE multimedia module.")
 (define-public kwave
  (package
    (name "kwave")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kwave-" version ".tar.xz"))
       (sha256
-        (base32 "1a3zgkyf0b9k6gvjjwk9rxmmmxxpc9dvxmyy0pnljcll7y1bqny6"))))
+        (base32 "0m52ik72cv85va2lnc61j7pav8zp7j7jawgczi3ckjfx01l7ip28"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools
@@ -1066,14 +1065,14 @@ Its features include:
 (define-public libkcddb
  (package
    (name "libkcddb")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkcddb-" version ".tar.xz"))
       (sha256
-        (base32 "16qi9a9y291flxlvajb0n73jwcr9bybv1k45k6q8mw24gj25xwkx"))))
+        (base32 "15vnsdjhx6cbpniqsqkq6fjgwi3r68w01pqgy9pkakklrzryp18x"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1099,14 +1098,14 @@ Its features include:
 (define-public libkcompactdisc
  (package
    (name "libkcompactdisc")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkcompactdisc-" version ".tar.xz"))
       (sha256
-        (base32 "0qbmjyzsf44kmqprfgar41p4kykgwfn3bznmnlxxkjqp7q27wknp"))))
+        (base32 "0w46wcm67xpqlxxpzjbqxkm59s2vlq5yx6s5p849f56wnj59wyix"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -1158,14 +1157,14 @@ CDs.")
 (define-public plasmatube
  (package
    (name "plasmatube")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/plasmatube-" version ".tar.xz"))
              (sha256
               (base32
-                "1cnj1yjazqx8pwyqbhrhz123x6522w0j1ch39g98qjj072dmz8a9"))))
+                "0n1vihz8c2fywxr3kdky7a3vsgcfppp415h0z1vgl5kvsc31k7m8"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules pkg-config python-minimal))
    (inputs
@@ -249,13 +249,13 @@ translation engines.")
 (define-public ghostwriter
  (package
    (name "ghostwriter")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/ghostwriter-" version ".tar.xz"))
              (sha256
-               (base32 "04hsq4jfh8szzcazx4mcpmndnad6300jsrxp6dj3q5gldp5x7sfm"))))
+               (base32 "01mh09908s5d2vkx5ymhm6a95wps5nidcwp1zj1likq70zpnk69r"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -38,11 +38,9 @@
  #:use-module (gnu packages base)
  #:use-module (gnu packages bison)
  #:use-module (gnu packages boost)
-  #:use-module (gnu packages calendar)
  #:use-module (gnu packages cmake)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages crypto)
  #:use-module (gnu packages cyrus-sasl)
  #:use-module (gnu packages databases)
  #:use-module (gnu packages documentation)
@@ -57,34 +55,31 @@
  #:use-module (gnu packages kde-plasma)
  #:use-module (gnu packages kde-graphics)
  #:use-module (gnu packages markup)
-  #:use-module (gnu packages messaging)
  #:use-module (gnu packages openldap)
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
  #:use-module (gnu packages qt)
-  #:use-module (gnu packages rsync)
  #:use-module (gnu packages rust)
  #:use-module (gnu packages search)
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages gcc)
  #:use-module (gnu packages tls)
-  #:use-module (gnu packages wget)
  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml))

 (define-public kopeninghours
  (package
    (name "kopeninghours")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0izsnzgwmdy8sxzqndbzxkjqf3mwqnwf5c15g5w1nzxxjl62ir54"))))
+                "0wyb266aksrj91qqbi97axsxv172r40rzqrgyh5zx26v5ifqhq0f"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -113,14 +108,14 @@ opening hours expressions.")
 (define-public kosmindoormap
  (package
    (name "kosmindoormap")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "1m2f7cgns6grighyv6p943nfmrc0rf5x9wc887zynhp4w8d45frw"))))
+                "1pz3kd85ffy0v95l93x8haniq4lry0xr9phzgcgf1gqlwp1y4b0s"))))
    (build-system cmake-build-system)
    (native-inputs (list bison extra-cmake-modules flex python-minimal))
    (inputs (list ki18n
@@ -141,14 +136,14 @@ multi-floor indoor maps.")
 (define-public grantleetheme
  (package
    (name "grantleetheme")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/grantleetheme-" version ".tar.xz"))
       (sha256
-        (base32 "0iswifrwndyd8vcj179zhq7331y91g3kjpq4f3ip5xyz8vq9xr0z"))))
+        (base32 "1q3sz072gzd76rv28kzxdk6h2lp467ifplxfnk4qya31pfcyk7b4"))))
    (build-system qt-build-system)
    (arguments (list
                #:qtbase qtbase
@@ -171,14 +166,14 @@ multi-floor indoor maps.")
 (define-public akonadi
  (package
    (name "akonadi")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/akonadi-" version ".tar.xz"))
              (sha256
               (base32
-                "1p30cv8x75jn5y0xz78wygi8m69c6mghiyvgbmz8arghwv4zzl49"))
+                "0yh1xqz9wlzcjhh3jrrkw65za80g2z24scxb5nlkgmnr2qggsrzq"))
              (patches (search-patches "akonadi-paths.patch"
                                       "akonadi-timestamps.patch"
                                       "akonadi-not-relocatable.patch"))))
@@ -284,14 +279,14 @@ programs.")
 (define-public akonadi-calendar
  (package
    (name "akonadi-calendar")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/akonadi-calendar-" version ".tar.xz"))
       (sha256
-        (base32 "04p9n0m3iksw31zwhg21jz25ip4agp6jx86xcswf6hjl65jqpydq"))))
+        (base32 "1hj0vnnbvf2c05zj8nqvzhccaybc4lyr8s2q02v2l7x2j0l13qxy"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -334,14 +329,14 @@ collection and item views.")
 (define-public akonadi-contacts
  (package
    (name "akonadi-contacts")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/akonadi-contacts-" version ".tar.xz"))
       (sha256
-        (base32 "0xala89nypbf3jgi5mkpxsywrfa1b5zkd70xmnfnz2n3xs382ljz"))))
+        (base32 "0kfjydnccqcknh27scp2ggc2p3b4pllw7kbbafzxkf8wdsz0wh1q"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -392,14 +387,14 @@ to list and filter contacts.")
 (define-public akonadi-mime
  (package
    (name "akonadi-mime")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/akonadi-mime-" version ".tar.xz"))
       (sha256
-        (base32 "1y7m0jrmm4r9pvhj8lhvj1wdn51gph2alpbyd7j34jsz4m0g5pcd"))))
+        (base32 "0ri2n7ny0cz73kfz4rxwm0gg7ajmz9qs61bw1f5ycldhqz5r48kj"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions
@@ -443,14 +438,14 @@ with emails through Akonadi easier.")
 (define-public akonadi-search
  (package
    (name "akonadi-search")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/akonadi-search-" version ".tar.xz"))
       (sha256
-        (base32 "1xmq9jjz8dvxgc8prbdg9pgdrdrv0d6k31qkpggfd220ygvrri4d"))))
+        (base32 "0lfzg7gbj2v0f5nc4v4q2v2pknlhp88zr00nhc0rdd03h0npv39w"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules
@@ -503,7 +498,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
 (define-public akonadi-import-wizard
  (package
    (name "akonadi-import-wizard")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
@@ -511,7 +506,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
                           "/src/akonadi-import-wizard-" version
                           ".tar.xz"))
       (sha256
-        (base32 "12v22gajm8dnyly8wcf8whs1ddi4rya0p6bjpscq4kyaz23nflzf"))))
+        (base32 "168kxnphrkidp0shxky2gdycma7hfd5yyzvlr4l8ay6vyyhvblsz"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -561,14 +556,14 @@ PIM data into Akonadi for use in KDE PIM applications.")
 (define-public akregator
  (package
    (name "akregator")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/akregator-" version ".tar.xz"))
       (sha256
-        (base32 "17aishnjfl5bjn5ahs57v770lwccfvmcdll92gs55l63km9dwlkp"))))
+        (base32 "10qgkg0dbrnz493y6fihnzmp5lcq6ymfd5a3gmq6qdzg96lvnrqw"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase))
@@ -623,15 +618,16 @@ browser for easy news reading.")
 (define-public itinerary
  (package
    (name "itinerary")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "1g50w82qj8wwgafs7c41pkyrx6lqljls53dj9r561911nm5n6k7n"))))
+                "11qz2qidprqh6mfizi94wfk9giy1b0nqilpn4s1y974lgzscxy18"))))
    (build-system qt-build-system)
+
    (arguments
     (list #:qtbase qtbase
           #:phases
@@ -646,41 +642,34 @@ browser for easy news reading.")
           #:tests? #f)) ;Fails 20/27
    (native-inputs (list extra-cmake-modules python-minimal))
    (inputs (list karchive
-                  kcalendarcore
-                  kcontacts
-                  kcoreaddons
-                  kcrash
                  kdbusaddons
-                  kfilemetadata
-                  khealthcertificate
-                  kholidays
                  ki18n
                  kio
                  kirigami
                  kirigami-addons
-                  kitemmodels
                  kitinerary
+                  kitemmodels
+                  kcoreaddons
+                  kcontacts
+                  kholidays
                  kmime
                  knotifications
-                  kopeninghours
-                  kosmindoormap
-                  kpkpass
                  kpublictransport
+                  kcalendarcore
+                  khealthcertificate
+                  kosmindoormap
+                  kopeninghours
+                  kpkpass
                  kunitconversion
                  kwindowsystem
-                  libical
-                  libqmatrixclient
-                  olm
-                  openssl
                  prison
-                  qcoro-qt6
-                  qqc2-desktop-style
                  qtdeclarative
                  qtkeychain-qt6
+                  qtpositioning
                  qtlocation
                  qtmultimedia
-                  qtpositioning
                  qtwayland
+                  qqc2-desktop-style
                  shared-mime-info
                  solid
                  sonnet
@@ -696,14 +685,14 @@ information.")
 (define-public kincidenceeditor
  (package
    (name "kincidenceeditor")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/incidenceeditor-" version ".tar.xz"))
       (sha256
-        (base32 "1kz738byg15nrym3d94wmv783jjwqqjl4zb802pipq9scvj1r8kd"))))
+        (base32 "160s477xws1x53adyjz99690i7ij5lb6nfm207qvqfkja4vmrhfh"))))
    (properties `((upstream-name . "incidenceeditor")))
    (build-system qt-build-system)
    (native-inputs
@@ -767,14 +756,14 @@ information.")
 (define-public kaddressbook
  (package
    (name "kaddressbook")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kaddressbook-" version ".tar.xz"))
       (sha256
-        (base32 "0pnr2ya7n29zyyd9gm7xd75cmynky8bx5r7qmmcx1q8sghi73jcg"))))
+        (base32 "0mxa2wqa8z4i157l8zn6l3j2k7n577ky5mdgfa864a0lrm6g6dc5"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -826,14 +815,14 @@ CalDAV server.")
 (define-public kaccounts-integration
  (package
    (name "kaccounts-integration")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "04a7pwg09af2n097v87ga73jqpa6vvq4prm6b6sm2f3ffxbkxinn"))))
+                "12qw5az0lb7nsgk5cj8zng5lazpd1ydx5jqp91f3fn9z1hzk983z"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list kcmutils
@@ -858,14 +847,14 @@ management system and its Plasma integration components.")
 (define-public kaccounts-providers
  (package
    (name "kaccounts-providers")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "135jzmbh7fb8prxl7ga3a3v16sxwc1fi4xrbs48mcr3w0ilvc7x9"))))
+                "0vqh8mc3rhg6mq12cji3svy2scy7jz6ird1bz9syysjr3gr4wahj"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules intltool))
    (inputs (list kaccounts-integration
@@ -890,14 +879,14 @@ KAccounts system.")
 (define-public kcalendarsupport
  (package
    (name "kcalendarsupport")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/calendarsupport-" version ".tar.xz"))
       (sha256
-        (base32 "0wdncvha9pjxfi83v3gdaqp7qgcl4wffgr00c9blfrqpdc8ryvqv"))))
+        (base32 "1bcxryikk45f5pnhppcfja535qhw1vklhfhdsxk19i78h5cp6hw3"))))
    (properties `((upstream-name . "calendarsupport")))
    (build-system qt-build-system)
    (native-inputs
@@ -932,14 +921,14 @@ calendaring applications.")
 (define-public kcalutils
  (package
    (name "kcalutils")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kcalutils-" version ".tar.xz"))
       (sha256
-        (base32 "1h1w8fwzzkn8f3n773i6dzzqvv7d3fylxqzxazks7zsmw0s82123"))))
+        (base32 "0bcan45zpx9sya6j8lcjn9q40wpz5fx90fliq3is82sigav3g86f"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules libxml2)) ;; xmllint required for tests
@@ -970,14 +959,14 @@ functions for accessing calendar data using the kcalcore API.")
 (define-public kdepim-addons
  (package
    (name "kdepim-addons")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdepim-addons-" version ".tar.xz"))
       (sha256
-        (base32 "1iqgdw1b2wxg79zqq77pwbshgsf8118rn26bn35y554bxjlnjrxx"))))
+        (base32 "1mww8xnmgg2nhcwc6lil0xabzp80nfvpnkd5s5r8kry98wbmra5s"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1103,14 +1092,14 @@ as KMail, KAddressBook etc.")
 (define-public kdepim-runtime
  (package
    (name "kdepim-runtime")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdepim-runtime-" version ".tar.xz"))
       (sha256
-        (base32 "0j211sg6lwgdl4kl3fxs09vhlfvr5gq69nn68zj7ln8h4v7fhn8p"))))
+        (base32 "11azlr7vbbih8vxv2p1znxchdghkcmki39b9j4yqsrbifbqardwq"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info))
@@ -1178,8 +1167,7 @@ migrationtest"
                                         "templatemethodstest"
                                         "akonadi-sqlite-serverbusytest"
                                         "ewsattachment_ut"
-                                         "testmovecollectiontask"
-                                         "schedulertest")
+                                         "testmovecollectiontask")
                                       "|")
                          ")")
           #:phases
@@ -1212,14 +1200,14 @@ package.")
 (define-public keventviews
  (package
    (name "keventviews")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/eventviews-" version ".tar.xz"))
       (sha256
-        (base32 "0h47327h5y8wknx533vzmggcd0bxvnssq1xnkl8xdpgldd6li69r"))))
+        (base32 "0giq1v8jsy55yrqcc8nzq8k2z2ryfs9yzfdgkmdlyzcwjccws5pa"))))
    (properties `((upstream-name . "eventviews")))
    (build-system qt-build-system)
    (native-inputs
@@ -1262,14 +1250,14 @@ package.")
 (define-public kgpg
  (package
    (name "kgpg")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kgpg-" version ".tar.xz"))
       (sha256
-        (base32 "1q55hnj3diaz6n7y6r1mvjpgzms1yhz9pfgiqj0s67sp96yjwcjy"))))
+        (base32 "1bzq88c961jhygq29f67mdnzcb6a2rc9w53gv16571k82ip9y7p4"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1326,14 +1314,14 @@ cryptography to the contents of the clipboard.")
 (define-public khealthcertificate
  (package
    (name "khealthcertificate")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/khealthcertificate-" version ".tar.xz"))
              (sha256
               (base32
-                "142qqfn3pn52g2a7akbjgy6cybsyqgy1mcr610d54gdacfn4mia7"))))
+                "1nkd4pxj6cpcqpmiv0ylcvrkqj2z3k3y5kj0kzhw3g6yanhigvbc"))))
    (build-system qt-build-system)
    (arguments
     (list
@@ -1369,14 +1357,14 @@ test and recovery certificates.")
 (define-public kidentitymanagement
  (package
    (name "kidentitymanagement")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kidentitymanagement-" version ".tar.xz"))
       (sha256
-        (base32 "1nxn0vprxsfrp2kxflp59zh46fi02rkash74zxza4612p6dhb3kr"))))
+        (base32 "1nzp9ww8nc07cf74zlx7b8ssvrqmv5d919n479p0c0nh8kzixcpv"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -1408,14 +1396,14 @@ test and recovery certificates.")
 (define-public kimap
  (package
    (name "kimap")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kimap-" version ".tar.xz"))
       (sha256
-        (base32 "1d53jz4lriiflb5q6lrnih08a6jm89lfvw5q6n872g2csvdg8865"))))
+        (base32 "0gdbi4s46lkwha8fgdmp0n4s4lc1sn1pgf45yj6km0xqn9y31f6n"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -1440,14 +1428,14 @@ easier to do so.")
 (define-public kitinerary
  (package
    (name "kitinerary")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kitinerary-" version ".tar.xz"))
              (sha256
               (base32
-                "032z9lw0sgppj6xaxbj81i9j3bcgnjgqzvzs3mp5whv3a94nl2bm"))))
+                "083jyh8qjqgajj0jvx0n7vayd2085mzwp3682yy5y4x5nvyhcx5k"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1475,33 +1463,22 @@ easier to do so.")
                             (search-input-directory inputs "share/zoneinfo"))
                     (invoke "dbus-launch" "ctest" "-E" test-exclude)))))))
    (native-inputs (list dbus extra-cmake-modules tzdata-for-tests))
-    (inputs (list karchive
+    (inputs (list kpkpass
                  kcalendarcore
-                  kcontacts
-                  kcoreaddons
+                  karchive
                  ki18n
+                  kcoreaddons
+                  kcontacts
                  kmime
                  knotifications
-                  kpkpass
-                  libphonenumber
-                  libxml2
+                  shared-mime-info
                  openssl
-                  osmctools
                  poppler
                  qtdeclarative
                  qtkeychain-qt6
-                  shared-mime-info
+                  libxml2
                  zlib
-                  zxing-cpp
-
-                  ;; Required by libphonenumber
-                  abseil-cpp
-                  boost-1.83
-                  protobuf
-
-                  ;; Required by osmctools
-                  rsync
-                  wget))
+                  zxing-cpp))
    (home-page "https://apps.kde.org/itinerary/")
    (synopsis
     "Data Model and Extraction System for Travel Reservation information")
@@ -1512,14 +1489,14 @@ model and itinerary extraction code.")
 (define-public kldap
  (package
    (name "kldap")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kldap-" version ".tar.xz"))
       (sha256
-        (base32 "0msa6ckfqqvlcqxfxs3yyab8jasw834zhwbsk4fksl4wmw29n9di"))))
+        (base32 "0cn0ywd1nnbrmgjfzkn9h9vq0dsmgmi6ci3dz2g5kf93yx1q05v2"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1538,14 +1515,14 @@ protocol for querying and modifying directory services running over TCP/IP.")
 (define-public kleopatra
  (package
    (name "kleopatra")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kleopatra-" version ".tar.xz"))
       (sha256
-        (base32 "1nmvs9c561wr2bc3rdv0kaxigc0qlgppv7lngdc67cp6c9yrfp03"))))
+        (base32 "0rk7ri8kp06ihp1gqyl91qk46v1a6j9jm0qycdr6zkfagqh6abrw"))))
    (build-system qt-build-system)
    (native-inputs
     (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path
@@ -1597,14 +1574,14 @@ and retrieving certificates from LDAP servers.")
 (define-public kmail
  (package
    (name "kmail")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmail-" version ".tar.xz"))
       (sha256
-        (base32 "0pb64vzvl9gyqiyvgbwr1rkv17j9b9ndis5f0a4ykc4i2jv09jb2"))))
+        (base32 "1x4idbflx49yphb3168a5s0bnfsrkshiih4rl2x4vpzsw9yfhi55"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules dbus kdoctools))
@@ -1722,14 +1699,14 @@ manager from KDE.")
 (define-public kmail-account-wizard
  (package
    (name "kmail-account-wizard")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmail-account-wizard-" version ".tar.xz"))
       (sha256
-        (base32 "1gk5ly0mby4csmb51jdp4fsq7pyfcryx112f1dxx8vszlwj32lf8"))))
+        (base32 "0i63k32530czi0k085xf6g199xp313y0iccr2z1jj6i0adhz2r9k"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules shared-mime-info))
@@ -1773,14 +1750,14 @@ KMail.")
 (define-public kmailcommon
  (package
    (name "kmailcommon")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/mailcommon-" version ".tar.xz"))
       (sha256
-        (base32 "0lnnn7j3n2dnzrh6w3v0rv5khfqd8snpcirxhw2qfb1bm7aim0qq"))))
+        (base32 "1yj32yqi7aknibvcc224v7rcgqjkbb6zm4sraavh03llfgw8ciiw"))))
    (properties `((upstream-name . "mailcommon")))
    (build-system qt-build-system)
    (native-inputs
@@ -1843,14 +1820,14 @@ dealing with email.")
 (define-public kmailimporter
  (package
    (name "kmailimporter")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/mailimporter-" version ".tar.xz"))
       (sha256
-        (base32 "05aacvrgi0d8mar8xfikbxi53xy4cr1scy5r5vsc3bsx664sqsdn"))))
+        (base32 "1afsdz67n2vwjfqvzmkig7iz0gw12a9m3vbdflr56fjbwamh3jzh"))))
    (properties `((upstream-name . "mailimporter")))
    (build-system qt-build-system)
    (native-inputs
@@ -1890,14 +1867,14 @@ e-mail client programs into KMail and KDE PIM.")
 (define-public kmailtransport
  (package
    (name "kmailtransport")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmailtransport-" version ".tar.xz"))
       (sha256
-        (base32 "1gz15py1nrg2kr8kvb1zq4swhgvj7xxy2bwfpzdjlzb55pczs3s8"))))
+        (base32 "1bip4prvds1nmifpyr4q291r6sh6y409fa8x4znwl9gdckmqbyr1"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1933,14 +1910,14 @@ mail transport.")
 (define-public kmbox
  (package
    (name "kmbox")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmbox-" version ".tar.xz"))
       (sha256
-        (base32 "1s4kiqdrj5mcrwdrmvl71mqnfzs4qam2lcsdin8lh5javjdi0sis"))))
+        (base32 "132my33ivkpbrxnx0w92lqr0ih1z9ac0n2ifvldmcf3y73x8aq9i"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -1956,14 +1933,14 @@ using a Qt/KMime C++ API.")
 (define-public kmessagelib
  (package
    (name "kmessagelib")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/messagelib-" version ".tar.xz"))
       (sha256
-        (base32 "0z6gfdndc2llmzh534qp5ys3z3pn9p7vgl595gsq0047jznbyjws"))))
+        (base32 "1y37ylr03dm6sk5m7v4clav306kfqxiragcbr590fyax1a1pij57"))))
    (properties `((upstream-name . "messagelib")))
    (build-system qt-build-system)
    (native-inputs
@@ -2042,14 +2019,14 @@ kwebengineviewer.")
 (define-public kmime
  (package
    (name "kmime")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmime-" version ".tar.xz"))
       (sha256
-        (base32 "0da61xdjchwcriq9di9p4ajl14zf3maws8lfrn3n90m6zjqif7y2"))))
+        (base32 "00bzhfhrljjf2w05cjsmv0x6khfkywyhgn7kki6xi7wrzwxwlkqz"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules qttools tzdata-for-tests))
@@ -2077,14 +2054,14 @@ information in non-ASCII character sets.")
 (define-public kontactinterface
  (package
    (name "kontactinterface")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kontactinterface-" version ".tar.xz"))
       (sha256
-        (base32 "0rh2gwczd19m6l3n7dqns7xpwrpx7fqzgidhacn1i18p2z5gbwmh"))))
+        (base32 "124p0pcb764648fa2xx7wfkqrpkyv1pj4z0fs0p8kgmg0wwd0nbv"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -2108,14 +2085,14 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
 (define-public korganizer
  (package
    (name "korganizer")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/korganizer-" version ".tar.xz"))
       (sha256
-        (base32 "08aimsb1axhhxs3mz7p4zrqlxk2j77s3bdm4bym1ns2y3pv8agq3"))))
+        (base32 "0xdrn3v90vpgxbsx9jwf0763p25jdg4zr57i5xjxi4jvb38s18b2"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules dbus qttools kdoctools tzdata-for-tests))
@@ -2143,6 +2120,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
           keventviews
           kholidays
           kiconthemes
+           kidentitymanagement
           kimap
           kincidenceeditor
           kitemmodels
@@ -2196,17 +2174,17 @@ and exchanging calendar data, vCalendar and iCalendar.")
 (define-public kpkpass
  (package
    (name "kpkpass")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/kpkpass-" version ".tar.xz"))
              (sha256
               (base32
-                "1xjk7ydsjgaxkyfijgngx6c5sb4pvsn0z329qxlspizpx0bglb2r"))))
+                "12vm7vgqwngvi4i3p23d722973j77sv3wfy0fplip46x7vrac0iq"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
-    (inputs (list karchive qtdeclarative shared-mime-info))
+    (inputs (list karchive shared-mime-info))
    (arguments (list #:qtbase qtbase))
    (home-page "https://invent.kde.org/pim/kpkpass")
    (synopsis "Apple Wallet Pass reader")
@@ -2217,14 +2195,14 @@ pass files.")
 (define-public kpimcommon
  (package
    (name "kpimcommon")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/pimcommon-" version ".tar.xz"))
       (sha256
-        (base32 "1chb1gghqj7ghh9i6p8yfllg1ymyvcqqwy5drjxk91is17mgmq0i"))))
+        (base32 "123vhygbyrcbj8rw8ny1kb2hd11lwml2xkw3xp75bdbqifv0d0py"))))
    (properties `((upstream-name . "pimcommon")))
    (build-system qt-build-system)
    (native-inputs
@@ -2278,7 +2256,7 @@ pass files.")
 (define-public kpublictransport
  (package
    (name "kpublictransport")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -2286,7 +2264,7 @@ pass files.")
                                  ".tar.xz"))
              (sha256
               (base32
-                "0dasw1bm0m20jaz8whw66x7fcg943b4wi1ybw3aa0l1r66ibzfsx"))))
+                "05vcb00s6jq8lzwc8yls9qjn4vf2mvgrk75mf78yp8847pr7v27d"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -2308,16 +2286,13 @@ pass files.")
    (native-inputs (list extra-cmake-modules pkg-config tzdata-for-tests))
    ;; TODO: clipper and osmctools are not detected
    (inputs (list clipper
-                  ki18n
                  kirigami-addons
-                  kitemmodels
-                  networkmanager-qt
                  osmctools
                  protobuf
                  qtdeclarative
-                  qtlocation
-                  qtpositioning
-                  zlib))
+                  zlib
+                  networkmanager-qt
+                  ki18n))
    (home-page "https://api.kde.org/kdepim/kpublictransport/html/index.html")
    (synopsis "Library for accessing realtime public transport data")
    (description
@@ -2328,14 +2303,14 @@ transport data and for performing public transport journey queries.")
 (define-public libgravatar
  (package
    (name "libgravatar")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libgravatar-" version ".tar.xz"))
       (sha256
-        (base32 "0zmgykcx65jcmpjf7qkv8lnggbirk5byhiz1qyfcap727lx5fjz4"))))
+        (base32 "1yr3dxgbgbdf7ibfzzpbb809fc4lkmljg8j49n5smbdk08k7giwl"))))
    (build-system cmake-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list kconfig
@@ -2361,14 +2336,14 @@ unnecessary network operations.")
 (define-public kpimtextedit
  (package
    (name "kpimtextedit")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kpimtextedit-" version ".tar.xz"))
       (sha256
-        (base32 "0bpnynwp90gzcxv7dpzkpxmmfcls4yisnbgnw1jlciv9knr6kbsg"))))
+        (base32 "0ikdwkzxg7bwpxdcs4725vjc531gh72c20j78akkwaxd2jkgz6s2"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules qttools))
@@ -2400,14 +2375,14 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
 (define-public ksmtp
  (package
    (name "ksmtp")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksmtp-" version ".tar.xz"))
       (sha256
-        (base32 "0i8s0vsz78sk6fqx4hz89zh0as4c7b3m5v0v00v3rzjpvk6nxmhm"))))
+        (base32 "1rnc2pja4ciqwmgksli2z1yzvzl5sya67s61dgjcxw93fy0421qm"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -2431,14 +2406,14 @@ standard protocols for e-mail transmission.")
 (define-public ktnef
  (package
    (name "ktnef")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ktnef-" version ".tar.xz"))
       (sha256
-        (base32 "1w5h7hsf0hrzcw5xgw0j8qmh04fjjz6iv56r9xd9chprvvdzvxyb"))))
+        (base32 "04z20lksck42pvz9dx048rpqgdmi0r1vkrmlv6wxv70ia1wlf5bh"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -2463,14 +2438,14 @@ and allows one to view/extract message formatted text in Rich Text Format.")
 (define-public libkdepim
  (package
    (name "libkdepim")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkdepim-" version ".tar.xz"))
       (sha256
-        (base32 "1g4d5ayzk8g93yqrm51agrl3dmrllqbzwlhypwryajyzzg5mq2hw"))))
+        (base32 "1sdis1614734zldn7dzb8h6d0jvdfvyggwh5jdlv6np33fvmbjis"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules qttools))
@@ -2509,14 +2484,14 @@ and allows one to view/extract message formatted text in Rich Text Format.")
 (define-public libkgapi
  (package
    (name "libkgapi")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkgapi-" version ".tar.xz"))
       (sha256
-        (base32 "1gm4nkcrjv9qsw2hhqfic76kr5xsyj7q4v2da8dfn0pymwfwk798"))))
+        (base32 "0pnizcxj8n88ijbs982l73v5gpvwr7bwg87jacxhqjng0kd90ras"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules qttools))
@@ -2544,14 +2519,14 @@ various Google services.")
 (define-public libkleo
  (package
    (name "libkleo")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkleo-" version ".tar.xz"))
       (sha256
-        (base32 "1nda6pqh74963x6527yfch820ai6z857cx14qvfvl8zdcgarpfpz"))))
+        (base32 "05mqa2k1r8v7mxz67hfj8dyx1r1ag15076dfbzzzpdaw565b2lq5"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools qttools))
@@ -2600,7 +2575,7 @@ KDE using certificate-based crypto.")
 (define-public libksieve
  (package
    (name "libksieve")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
@@ -2608,7 +2583,7 @@ KDE using certificate-based crypto.")
                           "/src/libksieve-" version ".tar.xz"))
       (sha256
        (base32
-	 "08c45gc3y096l1nxz5n4ah5yka60hv54fgxy4dxg586jx8pzwpmy"))))
+	 "16gzbxvp2sc3piw74fxfnxhvncvi6v287asgck2hfh0cgbmn61kf"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -2650,7 +2625,7 @@ is a Sieve parser and interpreter library for KDE.")
 (define-public merkuro
  (package
    (name "merkuro")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -2658,7 +2633,7 @@ is a Sieve parser and interpreter library for KDE.")
                                  ".tar.xz"))
              (sha256
               (base32
-                "021cg5ivzs5j014lz9iqfmv73p46b0zm8jf3yx8grqmb27f9fm2r"))))
+                "1b8j2chnnc2ysadsp1g4xgaxsfrbzi0qbzvblmsr6l90b9ywn8d0"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -2729,14 +2704,14 @@ NOTE: plsase add akonadi and kdepim-runtime to system package.")
 (define-public mimetreeparser
  (package
    (name "mimetreeparser")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/mimetreeparser-" version ".tar.xz"))
       (sha256
-        (base32 "0hbqvp62x55jwfzp48676vxwz8a751ad08vm7khvh99fhikj6rk3"))))
+        (base32 "0xxr6p44764pi5d58nxmc405sw50xwbbv50lli8aj73yr0zwy5pa"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -2762,14 +2737,14 @@ part.")
 (define-public zanshin
  (package
    (name "zanshin")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/zanshin-" version ".tar.xz"))
       (sha256
-        (base32 "1wavlp9gya9dmy83hgfgd2f40zdvig8qbflnlb167cwc39jzwyfl"))))
+        (base32 "10bd545qr0qj6l552rb1bx7fri5fzn75wnrrybz5f4ra5wc103fw"))))
    (build-system qt-build-system)
    (arguments
     (list ;; TODO: Do not exclude this test when
@@ -55,7 +55,7 @@
 (define-public poxml
  (package
    (name "poxml")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri
@@ -63,7 +63,7 @@
                              "/src/poxml-" version ".tar.xz"))
              (sha256
               (base32
-                "1k682yib9nsjv076mazgg1jblq3s4pqrzq1fcnymkn119q09j57g"))))
+                "0zbvmv5vbdjv33f78mxln8b6cnvg2dw99wrwvvl00m302d9pp5hj"))))
    (build-system cmake-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -80,14 +80,14 @@ PO template files.")
 (define-public libkomparediff2
  (package
    (name "libkomparediff2")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/libkomparediff2-" version ".tar.xz"))
       (sha256
-        (base32 "0yd0xa67n35ipcsj58lyb71zs62vcdbjy8p2lk2y0pzcqp16rylk"))))
+        (base32 "1v696vkqj9asmdjir836snf4ya7v3mp297pprydcndpkc636z4vf"))))
    (native-inputs
     (list extra-cmake-modules pkg-config))
    (inputs
@@ -111,14 +111,14 @@ used in KDE development tools Kompare and KDevelop.")
 (define-public kapptemplate
  (package
    (name "kapptemplate")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kapptemplate-" version ".tar.xz"))
       (sha256
-        (base32 "0zmvpjg3v8p9jghk2lk0zddn3ysh3rsvh1w71qc8glrkqm4rmmkh"))))
+        (base32 "0yjy1inm6714an72l1dijsrnmqjw5k2sl908l4n8hx0bsd6f81im"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase))
@@ -154,14 +154,14 @@ structure.  It features:
 (define-public kcachegrind
  (package
    (name "kcachegrind")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/kcachegrind-" version ".tar.xz"))
              (sha256
               (base32
-                "027wpnswp91q7zj4swm167p45k9rvqgcbg4i25ln5p8avpg6ysbn"))))
+                "1ghb5c2h44x2jg2qdnh9dnwcspljm6i6dfzmk38kid06m3gkij5f"))))
    (build-system cmake-build-system)
    (native-inputs
     (list extra-cmake-modules perl python qttools kdoctools))
@@ -211,14 +211,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
 (define-public kdevelop
  (package
    (name "kdevelop")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kdevelop-" version ".tar.xz"))
       (sha256
-        (base32 "0prz7zvlkslahdq5fvzwi4ynfip6pw538bwx6a15vbw6sn5pbzzg"))))
+        (base32 "14nfp9wxxz442jm20d37ibc7n12jyp2paw0kv56k58x96z7r4asd"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config shared-mime-info qttools))
@@ -352,14 +352,14 @@ submoduletest|cachetest|switchtest)")))))))
 (define-public kompare
  (package
    (name "kompare")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/kompare-" version ".tar.xz"))
              (sha256
               (base32
-                "0j0zjhlkgwcvs3w4gn1jb02pxsmkbgzgcg1j8hc7hm6hwlcmr3w4"))))
+                "1qjg876mjjahlw52lfpxqhw7savh2nc4jzl8xcghs8cgxvihchyf"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -401,14 +401,14 @@ include:
 (define-public massif-visualizer
  (package
    (name "massif-visualizer")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/massif-visualizer-" version ".tar.xz"))
       (sha256
-        (base32 "0s30dy0ilmh1q7ak7msgqi5fzdrsgkn2wvf0g27hqjvynzqlsrzh"))))
+        (base32 "0xb702s42n999v0fwcvhwrm9pw4nsljhfrisk0j95c6bwa7x2787"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config shared-mime-info))
@@ -62,14 +62,14 @@
 (define-public baloo-widgets
  (package
    (name "baloo-widgets")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/baloo-widgets-" version ".tar.xz"))
       (sha256
-        (base32 "10vgk8fs3h0nwzian9bsi2kq10yi07ybmqlbihsfsyrlp5gqbpwf"))))
+        (base32 "1jz77ky8v9il4s070lbmsn89n0bpfn7csrgiw6q4ngqv6b2qw2pw"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -87,14 +87,14 @@ This package contains GUI widgets for baloo.")
 (define-public dolphin
  (package
    (name "dolphin")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/dolphin-" version ".tar.xz"))
       (sha256
-        (base32 "1zqv904g9a2vpbiz506a8mry8vcsrz0g3w2793vlqniwq5cp1mh2"))))
+        (base32 "02gfm3m7aci048j5114zbwb40qlzrb1njvr12rbdydrqpqp67g8s"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools ruby ruby-test-unit))
@@ -146,14 +146,14 @@ The main features of Dolphin are:
 (define-public dolphin-plugins
  (package
    (name "dolphin-plugins")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/dolphin-plugins-" version ".tar.xz"))
       (sha256
-        (base32 "0v4w5b5p666wlip1s1ndc58s9vp1n81d3b207h4kvga6lxh3dvpn"))))
+        (base32 "1idsm1qgc0zwhwiz8p8718b58s50ggs16vrv7xb7gkmaw0arsi18"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -179,14 +179,14 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
 (define-public kdf
  (package
    (name "kdf")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kdf-" version ".tar.xz"))
              (sha256
               (base32
-                "1m4kl3zh3z4mrdwzc7l1dfd34yfg08m1m8ifmy9cm4g5v12sky25"))))
+                "0rgs8nqnc0wskikgvck78y59my8p2yd98ynsrbg6yhpf9xl6amvy"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -218,14 +218,14 @@ unmount drives and view them in a file manager.")
 (define-public khelpcenter
  (package
    (name "khelpcenter")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/khelpcenter-" version ".tar.xz"))
       (sha256
-        (base32 "1a3xjaa59wjlq3i12f6ajz22cmz6nihxzc4q1laknqf7hx21g987"))))
+        (base32 "184v94yw31bqrl40plhg3hq6z1scb69sy7qxnlqibwxf9m1bpd2g"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase))
@@ -288,7 +288,7 @@ document meta data file.")
 (define-public kpmcore
  (package
    (name "kpmcore")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -296,7 +296,7 @@ document meta data file.")
                    "/src/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "1k6fwhhfgziihvp0jfkwpnwrncfx711mamhwzv0c7mrvn0pgr77n"))))
+                "1qv8xmqr5d9pysj66c3khcg8v3w3ckq63wnsc6xx839sid4j40j3"))))
    (build-system cmake-build-system)
    (native-inputs
     (list extra-cmake-modules pkg-config))
@@ -352,14 +352,14 @@ document meta data file.")
 (define-public konsole
  (package
    (name "konsole")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/konsole-" version ".tar.xz"))
       (sha256
-        (base32 "0d2a4dv4cdw6i53spcrm6b215s98xdkhxbc3fpirj3435g99xqxz"))))
+        (base32 "05b6ydmczg1x1qindndyidlvqaq6hickpysnndwhgizk1pqpynh9"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools zlib))
@@ -407,14 +407,14 @@ This package is part of the KDE base applications module.")
 (define-public krfb
  (package
    (name "krfb")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/krfb-" version ".tar.xz"))
       (sha256
-        (base32 "139d958g5yxw901b7ylba1fir9fyw4821y4g8mmjq7j59gshlsh1"))))
+        (base32 "0hpzkpmn2fhr8cxbla2dcr8a8gi2a8g21f3jzjwd9adni688fbz1"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase
                     #:tests? #f
@@ -468,14 +468,14 @@ This package is part of the KDE networking module.")
 (define-public ksystemlog
  (package
    (name "ksystemlog")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/ksystemlog-" version ".tar.xz"))
       (sha256
-        (base32 "09fzaxaz1q8097r6p2fr2l8avg1kvsc3j58qfmwd8kh0p3cqfwn6"))))
+        (base32 "0w9ynf96bpjjgm1qzcj861nx6891fsj7gwzwhi8ys9iqxmahyl73"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs
@@ -509,14 +509,14 @@ This package is part of the KDE administration module.")
 (define-public kwalletmanager
  (package
    (name "kwalletmanager")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kwalletmanager-" version ".tar.xz"))
       (sha256
-        (base32 "0y4xqhqzh71rwf36b5wd809wrj8agslfmhwwvcfqk7akcbljyraz"))))
+        (base32 "0bf5dm5n3dc49pxb9dlajjzy3lmgpch9qc8m2b9m9maznlzbddjl"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -552,14 +552,14 @@ This package is part of the KDE administration module.")
 (define-public partitionmanager
  (package
    (name "partitionmanager")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/partitionmanager-" version ".tar.xz"))
       (sha256
-        (base32 "1ym2jmb05jpv2dp5fkv5d3smnqr900mpyvjri8s72c1qyw207ris"))))
+        (base32 "0wdiyyhhjs3fr8x6gcksm37awf67b5wafcnxrsakm0qrj84dplfp"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -636,14 +636,14 @@ as well as QR codes.")
 (define-public yakuake
  (package
    (name "yakuake")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/yakuake-" version ".tar.xz"))
              (sha256
               (base32
-                "17iwzd5m4kkl3khxzchwqjlvaibmn52qfqhxrmhv3520wxa8hgss"))))
+                "1v0y8n1iscpnk20xy5s7f1gp9vw5rzsxr9qqhq6g167xxkzz1lyq"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules))
@@ -65,14 +65,14 @@
 (define-public ark
  (package
    (name "ark")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/ark-" version ".tar.xz"))
              (sha256
               (base32
-                "1h5m9c17ndg02jwgnbxh7fb6xjqy2zivlahbqa15fd4z0h0pw451"))
+                "0ksmvrhwb8np3yy8gcrqh5hny3712gqn8jyj0bgq00h9bwlvfkya"))
              ;; The libarchive package in Guix does not support
              ;; xar; disable related tests.
              (patches (search-patches "ark-skip-xar-test.patch"))))
@@ -273,14 +273,14 @@ well as CD-ROM images.")
 (define-public filelight
  (package
    (name "filelight")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/filelight-" version ".tar.xz"))
              (sha256
               (base32
-                "1ax5h69v9dj1vadqmqmgfq6vj95wji0ciyvnpzp0i2782368clrm"))))
+                "1040v9dz2v4ysa68wg3jyv4nmvzsz1dzg1mpsxi3ckqwb9f84fla"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list kcrash
@@ -304,14 +304,14 @@ your computer.")
 (define-public francis
  (package
    (name "francis")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/francis-" version ".tar.xz"))
              (sha256
               (base32
-                "1szqdqvsq9sj7bazmsgx1jp4vbgr600d48ygqkpfd8n4ynyw80lf"))))
+                "0cgyjmsihxw7ppar9vckpr07w6x7pahhcn0n8phvb3w7aai49gd3"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list kirigami
@@ -333,7 +333,7 @@ your computer.")
 (define-public isoimagewriter
  (package
    (name "isoimagewriter")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -341,7 +341,7 @@ your computer.")
                                  ".tar.xz"))
              (sha256
               (base32
-                "1fgkfn7dmjbw1fl8jhip7vz3g891152ym0vfbfkggjs7jxhqrams"))))
+                "0bifa4ig9m1scxg34a42xgbzyklqbwmiv3pjyk351mx8i6vv8446"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list gpgme
@@ -365,14 +365,14 @@ your computer.")
 (define-public kaichat
  (package
    (name "kaichat")
-    (version "0.5.1")
+    (version "0.5.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde//stable/kaichat/kaichat-" version
                           ".tar.xz"))
       (sha256
-        (base32 "19w31mpbc5c1rfzygmxhmqx8wlwdmi1gfg75i4cfvz49936q0nal"))))
+        (base32 "18bwannb0p40fpqw0ygiq8m9wfl3k6561l10s7754x7a4lgpfshn"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase))
@@ -404,14 +404,14 @@ models such as Ollama.")
 (define-public kamera
  (package
    (name "kamera")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kamera-" version ".tar.xz"))
              (sha256
               (base32
-                "1di2v07nhg10y49cbacyvz1i25bnm6vs16036p9wdyb1azmh490b"))))
+                "04pdapw7mv311djvv4f7chrj2php8d2nqi3vayv8i4j7zfqbiijd"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -438,18 +438,17 @@ to camera devices supported by @code{libgphoto2} using
 (define-public kate
  (package
    (name "kate")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kate-" version ".tar.xz"))
       (sha256
-        (base32 "0mkz6xlwhc2xgi05n9gygm2nr09w1sh5aj1magnjlfgb1v244hga"))))
+        (base32 "02x9zhrk459gz7c9yxql260vgq1s9w5x4ijw3g4mv6qwp2svhbn9"))))
    (build-system qt-build-system)
    (native-inputs
-     (list extra-cmake-modules kdoctools xorg-server-for-tests))
-    ;; TODO: Unbundle rapidjson and SingleApplication.
+     (list extra-cmake-modules kdoctools))
    (inputs
     (list breeze-icons ;; default icon set
           karchive
@@ -474,7 +473,6 @@ to camera devices supported by @code{libgphoto2} using
           libplasma
           libxkbcommon
           plasma-activities
-           qtsvg
           qtwayland))
    (arguments
     (list #:qtbase qtbase
@@ -487,8 +485,10 @@ to camera devices supported by @code{libgphoto2} using
                     (("QStringLiteral[(]\"/usr\"[)]")
                      (format #f "QStringLiteral(\"~a\")"
                              (dirname (dirname (which "ls"))))))))
-               (add-before 'check 'set-home-directory
-                 (lambda* _
+               (add-before 'check 'check-setup
+                 (lambda _
+                   ;; make Qt render "offscreen", required for tests
+                   (setenv "QT_QPA_PLATFORM" "offscreen")
                   (setenv "HOME" (getcwd)))))))
    (home-page "https://kate-editor.org/")
    (synopsis "Multi-document, multi-view text editor")
@@ -507,15 +507,13 @@ Kate's features include:
@item Symbol viewers for C, C++, and Python
@item XML completion and validation
@end itemize")
-    (license
-     ;; GPL for programs, LGPL for libraries and MIT (Expat) for the 3rd party
-     ;; libraries.
-     (list license:gpl2+ license:lgpl2.0 license:expat))))
+    (license ;; GPL for programs, LGPL for libraries
+     (list license:gpl2+ license:lgpl2.0))))

 (define-public kdebugsettings
  (package
    (name "kdebugsettings")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -523,19 +521,18 @@ Kate's features include:
                                  ".tar.xz"))
              (sha256
               (base32
-                "1jf9s04jg6iqrbbxd3dkpnskgkjfqzl3lgal6ar12da9aaqwd5yi"))))
+                "181x57rpffg8kz4bfkiwfg65x5dg2qzv6793r0bg2ibch6mhx6bn"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
-    (inputs (list kcompletion
-                  kcoreaddons
+    (inputs (list kcoreaddons
                  kconfig
                  kcrash
                  kdbusaddons
                  ki18n
                  kiconthemes
-                  kitemviews
                  kwidgetsaddons
-                  kwindowsystem
+                  kitemviews
+                  kcompletion
                  kxmlgui
                  qtwayland))
    (arguments (list #:qtbase qtbase))
@@ -548,14 +545,14 @@ Kate's features include:
 (define-public kbackup
  (package
    (name "kbackup")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kbackup-" version ".tar.xz"))
              (sha256
               (base32
-                "1l2c645307aq3hr93b6ihk3961zali6ivnqr9zzzzgwp9831qrli"))))
+                "097wbyarc0nlshf394c7rp701fsr4m06b0gnlh045fz9rwd1x2gz"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules))
    (inputs (list kguiaddons
@@ -589,14 +586,14 @@ drive, USB stick, etc
 (define-public kcalc
  (package
    (name "kcalc")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kcalc-" version ".tar.xz"))
              (sha256
               (base32
-                "031zbp8b3j4a1rz9kpqk839hfj0ml5439di22wr50c1hyrl16623"))))
+                "12l3l7n08kyqf58dngnp3nz8iwkcbhghiihypmd7zr4n0ja2r10f"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase))
    (native-inputs (list extra-cmake-modules kdoctools))
@@ -607,7 +604,6 @@ drive, USB stick, etc
                  kconfigwidgets
                  kguiaddons
                  ki18n
-                  kiconthemes
                  knotifications
                  kxmlgui
                  mpc
@@ -622,7 +618,7 @@ drive, USB stick, etc
 (define-public kcharselect
  (package
    (name "kcharselect")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
@@ -630,7 +626,7 @@ drive, USB stick, etc
                                  ".tar.xz"))
              (sha256
               (base32
-                "1lzq9ziq5dldpg01cd910bv0say166rw4zp5hma8p69hg1657rya"))))
+                "1qrsvqy73znr5j3qxawj3ljm3yl8l6ir4hpd73hawx83brp27vmg"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -657,14 +653,14 @@ characters.")
 (define-public kdialog
  (package
    (name "kdialog")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kdialog-" version ".tar.xz"))
              (sha256
               (base32
-                "18bl0254c5rn7q6nrxp604w22irc8h646yqlhv0ilgm8gcz4n1pg"))))
+                "1d5svwlg7yjv0cf9flfn1zld24lj1dq3xf23aq9jv2mlxhrzrjfj"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase
                     #:tests? #f))
@@ -719,14 +715,14 @@ conversions between European currencies.")
 (define-public keysmith
  (package
    (name "keysmith")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/keysmith-" version ".tar.xz"))
              (sha256
               (base32
-                "146fdmgp5njlcmfjwwni3fjzk1cgagmb5kjh9bi2a6614q52a4ia"))))
+                "098mik8ayiaq1g4x56vwgqadxyyayai69p56ag6vfmq6pvnbr261"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules pkg-config python-minimal))
    (inputs (list kconfig
@@ -764,14 +760,14 @@ with support for QR scanning.")
 (define-public kfind
  (package
    (name "kfind")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kfind-" version ".tar.xz"))
              (sha256
               (base32
-                "0zpafr8vm791rcxs6ncw3nb62f6p724slnrsf2h1ay8rbz67vl2k"))))
+                "064m1hw6jn0cqlsymf1k0wql3ssz7mhmhgam2796q24jjfc4yvbm"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase
                     #:tests? #f))
@@ -894,14 +890,14 @@ It's features include:
 (define-public kongress
  (package
    (name "kongress")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/kongress-" version ".tar.xz"))
              (sha256
               (base32
-                "04rw413lsi4850pf51cvphyvlyjx3znmjfpkjb57a7hk7k21q54w"))))
+                "1nsmapfc4fizy9a7cg0pvj32c673qsqfgph331zsclrmjmw5wzwx"))))
    (build-system qt-build-system)
    (native-inputs (list extra-cmake-modules python-minimal))
    ;; NOTE: Reporting bugs is linked to web browser, better not link it and let
@@ -936,14 +932,14 @@ the schedule and venue information.")
 (define-public kontrast
  (package
    (name "kontrast")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/"
                                  version "/src/kontrast-" version ".tar.xz"))
              (sha256
               (base32
-                "0n13zmhwwxfk8w25ryh0rmkq7vybhhyrcrx0rw16d2hanm9hngdp"))))
+                "0slwflwafaw0n8zq2qnc3qxnyy4badp6wwl437w2snadza4f02sj"))))
    (build-system qt-build-system)
    (arguments (list #:qtbase qtbase
                     #:tests? #f))
@@ -995,14 +991,14 @@ the computer and 3D Printers.")
 (define-public kmag
  (package
    (name "kmag")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmag-" version ".tar.xz"))
       (sha256
-        (base32 "0vblnm6gmz7a4nbjjb7d9f2sgvipcmqhabc72ncn7lmwqwz7wz0a"))))
+        (base32 "0s5lm8hxndy78yr4cjf4dazjbhgh1zdap51b2xbld0rvb477jc64"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -1029,14 +1025,14 @@ artists to web-designers to people with low vision.")
 (define-public kmousetool
  (package
    (name "kmousetool")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmousetool-" version ".tar.xz"))
       (sha256
-        (base32 "178ck5alyv585imm8nkcwpvzc43qmp28q27h6srj27f3wn6i3pwn"))))
+        (base32 "13z04iqf71krpx1p48xapvb3b1y51g8k3dap6l7g2r6g441y1lvr"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1072,14 +1068,14 @@ whom pressing buttons hurts.")
 (define-public kmouth
  (package
    (name "kmouth")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/kmouth-" version ".tar.xz"))
       (sha256
-        (base32 "07zrdvldq6ab7jda5yr579i6sgpynidq9l1gh31hnchydxxx537k"))))
+        (base32 "0znkxsqk7fxicd4xkijc4730qy9p5pq9gfy3rbda40ijz676vvrg"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules kdoctools))
@@ -1279,14 +1275,14 @@ great on your desktop.")
 (define-public ktimer
  (package
    (name "ktimer")
-    (version "25.12.0")
+    (version "25.08.3")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kde/stable/release-service/" version
                                  "/src/ktimer-" version ".tar.xz"))
              (sha256
               (base32
-                "0lc2irzjwmdlbxkrva4ypg2iz4z8vya2zpwiq8296npsk4b1xplj"))))
+                "0672hpwmvj0378hmf4rqqw1ncynsr8c29dl3r6sdh4qw6kb2dd54"))))
    (build-system qt-build-system)
    (native-inputs
     (list extra-cmake-modules
@@ -1454,14 +1450,14 @@ remind you to take a break now and then.")
 (define-public sweeper
  (package
    (name "sweeper")
-    (version "25.12.0")
+    (version "25.08.3")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "mirror://kde/stable/release-service/" version
                           "/src/sweeper-" version ".tar.xz"))
       (sha256
-        (base32 "0vvrwb79lh7aqrz66xx5qsbfncsj5bw0crsy7fvj5mpvfnd22wp0"))))
+        (base32 "17b58p83j7gnavmrz7jgi41ssm18z2458wnlwj81zglz3b1vgc3f"))))
    (build-system qt-build-system)
    (arguments
     (list #:qtbase qtbase
@@ -13,7 +13,6 @@
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,8 +57,6 @@
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pulseaudio)
  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages perl-check)
  #:use-module (gnu packages qt)
  #:use-module (gnu packages ruby)
@@ -80,7 +77,6 @@
  #:use-module (guix build-system glib-or-gtk)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system qt)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix download)
@@ -1063,50 +1059,6 @@ from the database are used as entries (heading terms).")
    ;; triple-licensed (at the user’s choice)
    (license (list license:gpl2+ license:lgpl2.1 license:bsd-3))))

-(define-public python-sacremoses
-  (package
-    (name "python-sacremoses")
-    (version "0.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/hplt-project/sacremoses")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0g70vchfniknp65n4wnx7chg6g49d4xrz1wagv7f7ir2swdzyn9b"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (let ((norvig-big-txt
-            (origin
-              (method url-fetch)
-              ;; The file is a concatenation of public domain book excerpts
-              ;; from Project Gutenberg and lists of most frequent words
-              ;; from Wiktionary and the British National Corpus:
-              ;; https://norvig.com/spell-correct.html
-              (uri "https://norvig.com/big.txt")
-              (sha256
-               (base32
-                "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps")))))
-       (list #:phases #~(modify-phases %standard-phases
-                          (add-before 'check 'supply-big-txt
-                            (lambda _
-                              (symlink #$norvig-big-txt "big.txt"))))
-             #:test-backend #~'unittest
-             #:test-flags #~'("discover" "-s" "sacremoses/test"))))
-    (native-inputs (list python-setuptools))
-    (propagated-inputs (list python-click
-                             python-joblib
-                             python-regex
-                             python-tqdm))
-    (home-page "https://github.com/hplt-project/sacremoses")
-    (synopsis "Natural language tokenizer, truecaser and normalizer")
-    (description
-     "SacreMoses is a Python port of Moses'
-tokenizer, detokenizer, truecaser and punctuation normalizer.")
-    (license license:expat)))
-
 (define-public dparser
  (package
    (name "dparser")
@@ -242,17 +242,17 @@
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260205200629")
+(define %librewolf-build-id "20260118150544")

 (define-public librewolf
  (package
    (name "librewolf")
-    (version "147.0.3-1")
+    (version "147.0.1-3")
    (source
     (make-librewolf-source
      #:version version
-      #:firefox-hash "064w9nk928jydig31ph18k93ain152nabv6fgl3zz20sslb8m8xz"
-      #:librewolf-hash "0k7pk62h0g2yz10fq9sfapgqlfjpqqlsvzn7z9qxd9alhavjl1w5"
+      #:firefox-hash "1jvx0q134nfa19jbdjr3cj2xi8fc6ggmr6glqj9d8bvpqd52gs09"
+      #:librewolf-hash "1290vvbbinlaff60n1gabdggam7ayslrr3rnlpkwprab77gq45yh"
      #:l10n firefox-l10n))
    (build-system gnu-build-system)
    (arguments
@@ -76,7 +76,7 @@
 ;;; Copyright © 2023, 2025 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2023 dan <i@dan.games>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
-;;; Copyright © 2023, 2024, 2026 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2023, 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
 ;;; Copyright © 2024 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -170,7 +170,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages oneapi)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pciutils)
  #:use-module (gnu packages pkg-config)
@@ -193,6 +192,7 @@
  #:use-module (gnu packages serialization)
  #:use-module (gnu packages slang)
  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages tbb)
  #:use-module (gnu packages texinfo)
  #:use-module (gnu packages textutils)
  #:use-module (gnu packages tls)
@@ -529,22 +529,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.

-(define-public linux-libre-6.18-version "6.18.7")
-(define-public linux-libre-6.18-gnu-revision "gnu")
-(define deblob-scripts-6.18
-  (linux-libre-deblob-scripts
-   linux-libre-6.18-version
-   linux-libre-6.18-gnu-revision
-   (base32 "1piyq7183bdf169w66k62yr1vbs0ls7pqx3cyyk7hisw8vhy643j")
-   (base32 "1xdz33lshw1xs6a5qiwhvxzdh2a0acll1zdyk2mnn9d4579a4gn1")))
-(define-public linux-libre-6.18-pristine-source
-  (let ((version linux-libre-6.18-version)
-        (hash (base32 "07lgbc0w7fd9akxmazhkpjgxhd3ffwh7in2nkchhdbprbk8s89mp")))
-   (make-linux-libre-source version
-                            (%upstream-linux-source version hash)
-                            deblob-scripts-6.18)))
-
-(define-public linux-libre-6.17-version "6.17.13")
+(define-public linux-libre-6.17-version "6.17.12")
 (define-public linux-libre-6.17-gnu-revision "gnu")
 (define deblob-scripts-6.17
  (linux-libre-deblob-scripts
@@ -554,7 +539,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
   (base32 "14fypjidk49l0799dbi1pacy37ks94k0bs38cck2y4glxfpbfqr6")))
 (define-public linux-libre-6.17-pristine-source
  (let ((version linux-libre-6.17-version)
-        (hash (base32 "1fgdy9j90yfd4c2yqdciasdhda14pbfrpzkgriin2r6i7bf04s0i")))
+        (hash (base32 "1mlqirjzyx3zvvm87gf7slj2d5gdpp13vw91dgbfk54iz6b08y22")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.17)))
@@ -563,77 +548,77 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>

-(define-public linux-libre-6.12-version "6.12.67")
+(define-public linux-libre-6.12-version "6.12.62")
 (define-public linux-libre-6.12-gnu-revision "gnu")
 (define deblob-scripts-6.12
  (linux-libre-deblob-scripts
   linux-libre-6.12-version
   linux-libre-6.12-gnu-revision
   (base32 "168aykyvyyp34549hqhlprl0n052q8wdb2y3vyxqw40wpf2vw3ln")
-   (base32 "1wyfggr9q0f10yr3nxsvx3nd3wscp5145fgxw0ps0b09ckcyr2mi")))
+   (base32 "1yl447396g454116j8v17wsqg5i0gyb2rrxvaygw6xdkbwrrj28j")))
 (define-public linux-libre-6.12-pristine-source
  (let ((version linux-libre-6.12-version)
-        (hash (base32 "0cn42b7pam5ssk740s3d42sp3cggl923yvs67y5fz98z5v35v00n")))
+        (hash (base32 "04rcnr7bgrqqfj62l31mxx553bjdalr5f46xjbcmvawgmj2wdqhk")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.12)))

-(define-public linux-libre-6.6-version "6.6.121")
+(define-public linux-libre-6.6-version "6.6.119")
 (define-public linux-libre-6.6-gnu-revision "gnu")
 (define deblob-scripts-6.6
  (linux-libre-deblob-scripts
   linux-libre-6.6-version
   linux-libre-6.6-gnu-revision
   (base32 "0y3lawljby2rl0mb0yjdyaasci4pl935y8xa0dnmbzff23knkxlw")
-   (base32 "0z47f6mkllk1fgpq04x73djl5gh3mj50bxj2rpg4jlzm0rcirrag")))
+   (base32 "11i7pvm5n31rvp05msbm3ciclr84cz9c94f5r5aa6mmzhslwpbxk")))
 (define-public linux-libre-6.6-pristine-source
  (let ((version linux-libre-6.6-version)
-        (hash (base32 "1fhl9pr02s10j4b5nli0isy7ps644cpbmjqzkwf5mk14rr7rvbvn")))
+        (hash (base32 "1s75ad95g4y80idadzqmj9kj4rb3dhnvny9lg4lcq15l1fc9p81x")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.6)))

-(define-public linux-libre-6.1-version "6.1.161")
+(define-public linux-libre-6.1-version "6.1.159")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
  (linux-libre-deblob-scripts
   linux-libre-6.1-version
   linux-libre-6.1-gnu-revision
   (base32 "10gcbkd5jxfspa712kvb3qmsjgsapd9cz47pmpfk03bbfzf8ydlv")
-   (base32 "1jiwwl5sgpc16x0v6phbknv94mc46gvwgc2z8s4pdgn4j54yrd8v")))
+   (base32 "0f3jgbfd2j7sz7h1hb30s1r9147g1cbb3ia09k9834fvbiz1ihaa")))
 (define-public linux-libre-6.1-pristine-source
  (let ((version linux-libre-6.1-version)
-        (hash (base32 "0aasgrq6mv5nj7b8ashzx0pxlaah5y0f3sq7d8w00di2lyync5ml")))
+        (hash (base32 "17ib6ila2s8rclqpfxlkk1g72azj2r46k2x1q3n2j24qjfz7w80z")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-6.1)))

-(define-public linux-libre-5.15-version "5.15.198")
+(define-public linux-libre-5.15-version "5.15.197")
 (define-public linux-libre-5.15-gnu-revision "gnu")
 (define deblob-scripts-5.15
  (linux-libre-deblob-scripts
   linux-libre-5.15-version
   linux-libre-5.15-gnu-revision
   (base32 "0b2gd83ihxlq490gpgq930misc6jrckw4rzl7fvwd0qzczqjvff5")
-   (base32 "1s6km2r2mad0wpf7nqn4rqsykw1lm386l1yskmil24239fbva1f1")))
+   (base32 "0rg65s6kd9gxxa3wl6180pr39rb6zbcicwjik4kygs2ns0247y56")))
 (define-public linux-libre-5.15-pristine-source
  (let ((version linux-libre-5.15-version)
-        (hash (base32 "0hwpwbvjh6y4dhbpp34x9j25nc6x48fbiz65zzavplqdb2a0jk2x")))
+        (hash (base32 "12k6c09lgs4ahmxbrg8g3q1ngldajmzyz7y2nr1l8yhhwbw8s8gx")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-5.15)))

-(define-public linux-libre-5.10-version "5.10.248")
+(define-public linux-libre-5.10-version "5.10.247")
 (define-public linux-libre-5.10-gnu-revision "gnu1")
 (define deblob-scripts-5.10
  (linux-libre-deblob-scripts
   linux-libre-5.10-version
   linux-libre-5.10-gnu-revision
   (base32 "1wn9k4lbxcc9rzl1rqidlnb472wyayillrh57gyxnghi7j9ghqna")
-   (base32 "1hgza8fsps7bkjf4i0f2xgvrh1r183z3i6lxrr2nr8qbi5d13qs7")))
+   (base32 "0r1whrfhhhjyvppiidhihcvyzcab6dva6g9a4div8jkxm62s2cq3")))
 (define-public linux-libre-5.10-pristine-source
  (let ((version linux-libre-5.10-version)
-        (hash (base32 "01g05n856c9q7m46dmn48pq7hfph4b1kpvrjvrykg8q4z7qy9rmm")))
+        (hash (base32 "037yv5lryfanpfbk3z60yfsx14nskgf386b6cfkbzn7wl5xvij3h")))
   (make-linux-libre-source version
                            (%upstream-linux-source version hash)
                            deblob-scripts-5.10)))
@@ -681,11 +666,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (patches (append (origin-patches source)
                     patches))))

-(define-public linux-libre-6.18-source
-  (source-with-patches linux-libre-6.18-pristine-source
-                       (list %boot-logo-patch
-                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
-
 (define-public linux-libre-6.17-source
  (source-with-patches linux-libre-6.17-pristine-source
                       (list %boot-logo-patch
@@ -812,11 +792,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (description "Headers of the Linux-Libre kernel.")
    (license license:gpl2)))

-(define-public linux-libre-headers-6.18
-  (make-linux-libre-headers* linux-libre-6.18-version
-                             linux-libre-6.18-gnu-revision
-                             linux-libre-6.18-source))
-
 (define-public linux-libre-headers-6.17
  (make-linux-libre-headers* linux-libre-6.17-version
                             linux-libre-6.17-gnu-revision
@@ -1189,14 +1164,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
 ;;; Generic kernel packages.
 ;;;

-(define-public linux-libre-6.18
-  (make-linux-libre* linux-libre-6.18-version
-                     linux-libre-6.18-gnu-revision
-                     linux-libre-6.18-source
-                     '("x86_64-linux" "i686-linux" "armhf-linux"
-                       "aarch64-linux" "powerpc64le-linux" "riscv64-linux")
-                     #:configuration-file kernel-config))
-
 (define-public linux-libre-6.17
  (make-linux-libre* linux-libre-6.17-version
                     linux-libre-6.17-gnu-revision
@@ -1535,24 +1502,25 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                        ("CONFIG_VHOST_VDPA" . m))
                      (default-extra-linux-options linux-libre-lts-version))))

-(define-public reform-debian-packages-for-6.18
+(define-public reform-debian-packages
  (package
    (name "reform-debian-packages")
-    (version "2023-07-10-515-gc527a1d") ;from git describe
+    (version "2023-07-10-475-ge469c2a") ;from git describe
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://source.mnt.re/reform/reform-debian-packages.git")
-             (commit "c527a1d0e548dfb9d7c28bb2c78907230efa4314")))
+             (commit "e469c2ad131054c7afe4f9f059eb2eb575545b1a")))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1vfq46s4mxc94sdm5i15kj51s6cwjgg5xijag5g5hcqzi29hpclm"))))
+        (base32 "0pv24b317n4h71rn25v2wa3qhs1i0wjfpys899cpm5lf0irvis7q"))))
    (build-system copy-build-system)
    (arguments
     (list
      #:install-plan
-      #~'(("linux/patches6.18/" "/patches6.18")
+      #~'(("linux/patches6.16/" "/patches6.16")
+          ("linux/patches6.17/" "/patches6.17")
          ("linux/" "/dts/amlogic"
           #:include-regexp ("meson.*\\.dts$"))
          ("linux/" "/dts/freescale"
@@ -1622,16 +1590,16 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
 (define-public reform-debian-packages-for-6.17
  (package
    (name "reform-debian-packages")
-    (version "2023-07-10-496-gd25e032") ;from git describe
+    (version "2023-07-10-485-g133081d") ;from git describe
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://source.mnt.re/reform/reform-debian-packages.git")
-             (commit "d25e032b53d231c43d23248518e9bba681858739")))
+             (commit "133081db414ee31ea2751e5152223859d709751f")))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1pyf7lfkjwa244bq7kqbg0ri4bn6n5l0siy9g4igw3nhrll57d5a"))))
+        (base32 "06234a91mkriyx8afm6dppr35r47wsm61dacwixlna22zbxgicgc"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -1661,320 +1629,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
              license:gpl3
              license:x11))))

-(define-public linux-libre-arm64-mnt-reform-6.18
-  ;; Kernel for use on the MNT/Reform systems
-  ;; https://mntre.com/reform.html
-  (let ((base (make-linux-libre* linux-libre-6.18-version
-                                 linux-libre-6.18-gnu-revision
-                                 linux-libre-6.18-source
-                                 '("aarch64-linux")
-                                 #:extra-version "arm64-mnt-reform"
-                                 #:extra-options
-                                 ;; https://source.mnt.re/reform/reform-debian-packages/-/blob/main/linux/config
-                                 (append `(("CONFIG_DRM_LVDS_CODEC" . m)
-                                           ("CONFIG_DRM_CDNS_MHDP8546" . m)
-                                           ("CONFIG_DRM_CDNS_HDMI_CEC" . m)
-                                           ("CONFIG_DRM_IMX_CDNS_MHDP" . m)
-                                           ("CONFIG_DRM_IMX_DCSS" . m)
-                                           ("CONFIG_PHY_FSL_IMX8MQ_HDPTX" . m)
-                                           ("CONFIG_DRM_PANEL_LVDS" . m)
-                                           ("CONFIG_I2C_IMX_LPI2C" . m)
-                                           ("CONFIG_I2C_MUX_REG" . m)
-                                           ("CONFIG_INTERCONNECT_IMX" . #true)
-                                           ("CONFIG_INTERCONNECT_IMX8MQ" . #true)
-                                           ("CONFIG_MFD_WM8994" . m)
-                                           ("CONFIG_MUX_GPIO" . m)
-                                           ("CONFIG_MUX_MMIO" . m)
-                                           ("CONFIG_RTC_DRV_PCF8523" . m)
-                                           ("CONFIG_USB_EHCI_FSL" . m)
-                                           ("CONFIG_NO_HZ_IDLE" . #true)
-                                           ("CONFIG_SND_SOC_FSL_MICFIL" . m)
-                                           ("CONFIG_SND_IMX_SOC" . m)
-                                           ("CONFIG_SND_SOC_FSL_ASOC_CARD" . m)
-                                           ("CONFIG_SND_SOC_IMX_AUDMIX" . m)
-                                           ("CONFIG_SND_SOC_IMX_HDMI" . m)
-                                           ("CONFIG_INPUT_JOYSTICK" . #true)
-                                           ("CONFIG_JOYSTICK_XPAD" . m)
-                                           ("CONFIG_JOYSTICK_XPAD_FF" . #true)
-                                           ("CONFIG_JOYSTICK_XPAD_LEDS" . #true)
-                                           ("CONFIG_INTERCONNECT_IMX8MP" . #true)
-                                           ("CONFIG_SND_SOC_FSL_ASRC" . #true)
-                                           ("CONFIG_DRM_IMX_LCDIF" . #true)
-                                           ("CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE" . #true)
-                                           ("CONFIG_DRM_IMX8MP_HDMI_PVI" . #true)
-                                           ("CONFIG_IMX8MM_THERMAL" . #true)
-                                           ("CONFIG_IMX2_WDT" . #true)
-                                           ("CONFIG_DRM_SAMSUNG_DSIM" . #true)
-                                           ("CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY" . #true)
-                                           ("CONFIG_DRM" . #true)
-                                           ("CONFIG_DRM_PANEL_MNT_POCKET_REFORM" . #true)
-                                           ("CONFIG_IMX8M_BLK_CTRL" . #true)
-                                           ("CONFIG_IMX_GPCV2_PM_DOMAINS" . #true)
-                                           ("CONFIG_DRM_DISPLAY_CONNECTOR" . #true)
-                                           ("CONFIG_DRM_FSL_LDB" . #true)
-                                           ("CONFIG_BACKLIGHT_CLASS_DEVICE" . #true)
-                                           ("CONFIG_BACKLIGHT_PWM" . #true)
-                                           ("CONFIG_BACKLIGHT_GPIO" . #true)
-                                           ("CONFIG_BACKLIGHT_LED" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_PERFORMANCE" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_POWERSAVE" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_USERSPACE" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_ONDEMAND" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_CONSERVATIVE" . #true)
-                                           ("CONFIG_CPU_FREQ_GOV_SCHEDUTIL" . #true)
-                                           ("CONFIG_ARM_IMX_CPUFREQ_DT" . #true)
-                                           ("CONFIG_ARM_IMX_BUS_DEVFREQ" . #true)
-                                           ("CONFIG_IMX_IRQSTEER" . #true)
-                                           ("CONFIG_PCI_MESON" . #true)
-                                           ("CONFIG_DWMAC_MESON" . #true)
-                                           ("CONFIG_MDIO_BUS_MUX_MESON_G12A" . #true)
-                                           ("CONFIG_GPIO_ROCKCHIP" . #true)
-                                           ("CONFIG_PL330_DMA" . #true)
-                                           ("CONFIG_I2C_MESON" . #true)
-                                           ("CONFIG_PWM_MESON" . #true)
-                                           ("CONFIG_USB_DWC3_MESON_G12A" . #true)
-                                           ("CONFIG_MMC_MESON_GX" . #true)
-                                           ("CONFIG_MMC_MESON_MX_SDIO" . #true)
-                                           ("CONFIG_MESON_DDR_PMU" . #true)
-                                           ("CONFIG_RTW88_8822CS" . m)
-                                           ("CONFIG_PWM_FSL_FTM" . #true)
-                                           ("CONFIG_FSL_RCPM" . #true)
-                                           ("CONFIG_ARM_ROCKCHIP_CPUFREQ" . m)
-                                           ("CONFIG_DRM_PANTHOR" . m)
-                                           ("CONFIG_NVMEM_ROCKCHIP_OTP" . #true)
-                                           ("CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX" . m)
-                                           ("CONFIG_PHY_ROCKCHIP_USBDP" . m)
-                                           ("CONFIG_ROCKCHIP_REGULATOR_COUPLER" . #true)
-                                           ("CONFIG_SPI_ROCKCHIP" . #true)
-                                           ("CONFIG_SPI_ROCKCHIP_SFC" . m)
-                                           ("CONFIG_ARM_SCMI_CPUFREQ" . m)
-                                           ("CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY" . #true)
-                                           ("CONFIG_VIDEO_ROCKCHIP_VDEC2" . m)
-                                           ("CONFIG_ROCKCHIP_DW_HDMI_QP" . #true)
-                                           ("CONFIG_ROCKCHIP_DW_MIPI_DSI2" . #true)
-                                           ;; Fixes https://codeberg.org/guix/guix/issues/101
-                                           ("CONFIG_CRYPTO_USER_API_HASH" . #true)
-                                           ("CONFIG_CRYPTO_USER_API_SKCIPHER" . #true)
-                                           ("CONFIG_CRYPTO_USER_API_RNG" . #true)
-                                           ("CONFIG_CRYPTO_USER_API_AEAD" . #true)
-                                           ("CONFIG_KEY_DH_OPERATIONS" . #true)
-                                           ;; nftables support
-                                           ("CONFIG_NF_TABLES" . m)
-                                           ("CONFIG_NF_TABLES_INET" . #true)
-                                           ("CONFIG_NF_TABLES_NETDEV" . #true)
-                                           ("CONFIG_NF_TABLES_IPV4" . #true)
-                                           ("CONFIG_NF_TABLES_ARP" . #true)
-                                           ("CONFIG_NF_TABLES_IPV6" . #true)
-                                           ("CONFIG_NF_TABLES_BRIDGE" . m)
-                                           ("CONFIG_NFT_NUMGEN" . m)
-                                           ("CONFIG_NFT_CT" . m)
-                                           ("CONFIG_NFT_FLOW_OFFLOAD" . m)
-                                           ("CONFIG_NFT_CONNLIMIT" . m)
-                                           ("CONFIG_NFT_LOG" . m)
-                                           ("CONFIG_NFT_LIMIT" . m)
-                                           ("CONFIG_NFT_MASQ" . m)
-                                           ("CONFIG_NFT_REDIR" . m)
-                                           ("CONFIG_NFT_NAT" . m)
-                                           ("CONFIG_NFT_TUNNEL" . m)
-                                           ("CONFIG_NFT_QUEUE" . m)
-                                           ("CONFIG_NFT_QUOTA" . m)
-                                           ("CONFIG_NFT_REJECT" . m)
-                                           ("CONFIG_NFT_REJECT_INET" . m)
-                                           ("CONFIG_NFT_COMPAT" . m)
-                                           ("CONFIG_NFT_HASH" . m)
-                                           ("CONFIG_NFT_FIB" . m)
-                                           ("CONFIG_NFT_FIB_INET" . m)
-                                           ("CONFIG_NFT_XFRM" . m)
-                                           ("CONFIG_NFT_SOCKET" . m)
-                                           ("CONFIG_NFT_OSF" . m)
-                                           ("CONFIG_NFT_TPROXY" . m)
-                                           ("CONFIG_NFT_SYNPROXY" . m)
-                                           ("CONFIG_NFT_DUP_NETDEV" . m)
-                                           ("CONFIG_NFT_FWD_NETDEV" . m)
-                                           ("CONFIG_NFT_FIB_NETDEV" . m)
-                                           ("CONFIG_NFT_REJECT_NETDEV" . m)
-                                           ("CONFIG_NFT_REJECT_IPV4" . m)
-                                           ("CONFIG_NFT_DUP_IPV4" . m)
-                                           ("CONFIG_NFT_FIB_IPV4" . m)
-                                           ("CONFIG_NFT_COMPAT_ARP" . m)
-                                           ("CONFIG_NFT_REJECT_IPV6" . m)
-                                           ("CONFIG_NFT_DUP_IPV6" . m)
-                                           ("CONFIG_NFT_FIB_IPV6" . m)
-                                           ("CONFIG_NFT_BRIDGE_META" . m)
-                                           ("CONFIG_NFT_BRIDGE_REJECT" . m)
-                                           ;; Provide support for USB tethering
-                                           ("CONFIG_USB_NET_CDC_EEM" . m)
-                                           ("CONFIG_USB_NET_RNDIS_HOST" . m)
-                                           ("CONFIG_USB_WDM" . m)
-                                           ("CONFIG_USB_GADGET" . m)
-                                           ("CONFIG_USB_ETH" . m)
-                                           ("CONFIG_USB_ETH_RNDIS" . m)
-                                           ("CONFIG_USB_ETH_EEM" . m)
-                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
-                                           ;; Provide support for ath9k wireless
-                                           ("CONFIG_ATH9K" . m)
-                                           ("CONFIG_ATH9K_HTC" . m))
-                                         (default-extra-linux-options
-                                          linux-libre-6.18-version)))))
-    (package
-      (inherit base)
-      (inputs (list reform-debian-packages-for-6.18))
-      (synopsis (string-append (package-synopsis base)
-                               " for MNT/Reform systems"))
-      (description (string-append (package-description base)
-                    "  Configuration options and patches have been applied for use with MNT/Reform systems."))
-      (arguments
-       (substitute-keyword-arguments (package-arguments base)
-         ((#:phases phases)
-          #~(modify-phases #$phases
-              (add-after 'unpack 'apply-reform-patches
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (for-each (lambda (patch)
-                              (invoke "patch" "-p1" "-i"
-                                      (search-input-file inputs
-                                                         (string-append
-                                                          "patches6.18/" patch))))
-                            (list
-                             "imx8mp-mnt-pocket-reform/2ghz/0001-imx8mp-2ghz-clk.patch"
-                             "imx8mp-mnt-pocket-reform/2ghz/0002-imx8mp-2ghz-opp.patch"
-                             "imx8mp-mnt-pocket-reform/audio/0000-revert-crashy-audiomix-pm-support.patch"
-                             "imx8mp-mnt-pocket-reform/mmc-sdio/0001-sdhci-add-no-sd-uhs-sdr104-devicetree-property.patch"
-                             "imx8mp-mnt-pocket-reform/mmc-sdio/0002-During-the-card-init-the-host-side-sometimes-may-nee.patch"
-                             "imx8mp-mnt-pocket-reform/mmc-sdio/0003-USDHC-IP-has-one-limitation-the-tuning-circuit-can-t.patch"
-                             "imx8mp-mnt-pocket-reform/pocket-panel/0001-v5-add-multi-display-panel-driver.patch"
-                             "imx8mp-mnt-pocket-reform/pocket-panel/0002-pocket-panel-fix-sleep-add-orientation.patch"
-                             "imx8mp-mnt-reform2/0001-sn65dsi86-use-hs-clock-of-samsung-dsim-host-directly.patch"
-                             "imx8mp-mnt-reform2/0002-lcdif-dont-exceed-desired-pixel-clock.patch"
-                             "imx8mq-mnt-reform2/0001-imx8mq-mnt-reform2.dts-multiple-fixes-for-display-wi.patch"
-                             "imx8mq-mnt-reform2/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch"
-                             "imx8mq-mnt-reform2/0002-Revert-drm-bridge-nwl-dsi-Use-vsync-hsync-polarity-f.patch"
-                             "imx8mq-mnt-reform2/0003-lcdif-fix-pcie-interference.patch"
-                             "imx8mq-mnt-reform2/0004-mnt4002-imx-gpcv2-wake-smccc.patch.patch"
-                             "imx8mq-mnt-reform2/0005-pci-imx6-add-support-for-internal-refclk-imx8mq.patch"
-                             "imx8mq-mnt-reform2/0006-imx8mq-import-HDMI-driver-and-make-DCSS-compatible-w.patch"
-                             "ls1028a-mnt-reform2/0000-dtsi-add-hdptx.patch"
-                             "meson-g12b-bananapi-cm4-mnt-pocket-reform/0001-a311d-viu-fifo-lines-config.patch"
-                             "meson-g12b-bananapi-cm4-mnt-pocket-reform/0002-a311d-viu-fifo-lines-config-header.patch"
-                             "meson-g12b-bananapi-cm4-mnt-pocket-reform/0003-tlv320aic31xx-add-1228800hz-support.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0001-meson-g12b-bananapi-cm4-mnt-reform2.dts-fix-audio-an.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0001-Revert-drm-bridge-synopsys-dw-mipi-dsi-enable-EoTp-b.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0011-dw-mipi-dsi-phy-stop-wait-time.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0012-innolux-n125hce-gn1-timing-tweaks.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0013-meson-viu-hold-fifo-lines.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0014-meson-venc-sync.patch.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0015-meson-dw-mipi-dsi-sync-invert.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0016-sn65dsi86-burst-mode-support.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0018-sn65dsi86-never-turn-off.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0020-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0021-HACK-of-partial-revert-of-fdt.c-changes.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0022-add-bt-and-eth-resets.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0023-sdio-pullups.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0024-sdio-improve-wifi-speed.patch"
-                             "meson-g12b-bananapi-cm4-mnt-reform2/0030-WORKAROUND-meson-plane-disable-afbc-32x8.patch"
-                             "rk3588-mnt-reform2/0001-MERGED-drm-bridge-Pass-down-connector-to-drm-bridge-.patch"
-                             "rk3588-mnt-reform2/0024-math.h-add-DIV_ROUND_UP_NO_OVERFLOW.patch"
-                             "rk3588-mnt-reform2/0025-clk-divider-Fix-divisor-masking-on-64-bit-platforms.patch"
-                             "rk3588-mnt-reform2/0026-clk-composite-replace-open-coded-abs_diff.patch"
-                             "rk3588-mnt-reform2/0030-mfd-rk8xx-Fix-shutdown-handler.patch"
-                             "rk3588-mnt-reform2/0031-dt-bindings-display-vop2-Add-VP-clock-resets.patch"
-                             "rk3588-mnt-reform2/0032-drm-rockchip-vop2-Add-clock-resets-support.patch"
-                             "rk3588-mnt-reform2/0033-arm64-dts-rockchip-Add-VOP-clock-resets-for-rk3588s.patch"
-                             "rk3588-mnt-reform2/0035-drm-rockchip-vop2-Add-core-reset-support.patch"
-                             "rk3588-mnt-reform2/0046-arm64-defconfig-Enable-Rockchip-RK3588-DisplayPort-C.patch"
-                             "rk3588-mnt-reform2/0055-phy-rockchip-usbdp-move-orientation-handling-further.patch"
-                             "rk3588-mnt-reform2/0056-phy-rockchip-usbdp-reset-USB3-and-reinit-on-orientat.patch"
-                             "rk3588-mnt-reform2/0060-PCI-dw-rockchip-Rename-rockchip_pcie_get_ltssm-funct.patch"
-                             "rk3588-mnt-reform2/0061-PCI-dw-rockchip-Support-get_ltssm-operation.patch"
-                             "rk3588-mnt-reform2/0062-PCI-dw-rockchip-Move-devm_phy_get-out-of-phy_init.patch"
-                             "rk3588-mnt-reform2/0063-PCI-dw-rockchip-Add-helper-function-for-enhanced-LTS.patch"
-                             "rk3588-mnt-reform2/0064-PCI-dw-rockchip-Add-helper-function-for-controller-m.patch"
-                             "rk3588-mnt-reform2/0065-PCI-dw-rockchip-Add-helper-function-for-DDL-indicato.patch"
-                             "rk3588-mnt-reform2/0066-PCI-dw-rockchip-Add-pme_turn_off-support.patch"
-                             "rk3588-mnt-reform2/0067-PCI-dw-rockchip-Add-system-PM-support.patch"
-                             "rk3588-mnt-reform2/0068-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch"
-                             "rk3588-mnt-reform2/0069-drm-bridge-dw-hdmi-qp-Fixup-timer-base-setup.patch"
-                             "rk3588-mnt-reform2/0070-drm-rockchip-dw_hdmi_qp-Improve-error-handling-with-.patch"
-                             "rk3588-mnt-reform2/0071-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-in-dw_hdmi_q.patch"
-                             "rk3588-mnt-reform2/0072-drm-rockchip-dw_hdmi_qp-Provide-ref-clock-rate-in-dw.patch"
-                             "rk3588-mnt-reform2/0073-arm64-defconfig-Enable-DW-HDMI-QP-CEC-support.patch"
-                             "rk3588-mnt-reform2/0075-phy-hdmi-Add-HDMI-2.1-FRL-configuration-options.patch"
-                             "rk3588-mnt-reform2/0079-phy-rockchip-samsung-hdptx-Use-usleep_range-instead-.patch"
-                             "rk3588-mnt-reform2/0080-phy-rockchip-samsung-hdptx-Fix-coding-style-alignmen.patch"
-                             "rk3588-mnt-reform2/0081-phy-rockchip-samsung-hdptx-Consistently-use-rk_-hdpt.patch"
-                             "rk3588-mnt-reform2/0082-phy-rockchip-samsung-hdptx-Enable-lane-output-in-com.patch"
-                             "rk3588-mnt-reform2/0083-phy-rockchip-samsung-hdptx-Cleanup-_cmn_init_seq-lis.patch"
-                             "rk3588-mnt-reform2/0084-phy-rockchip-samsung-hdptx-Compute-clk-rate-from-PLL.patch"
-                             "rk3588-mnt-reform2/0085-phy-rockchip-samsung-hdptx-Drop-hw_rate-driver-data.patch"
-                             "rk3588-mnt-reform2/0086-phy-rockchip-samsung-hdptx-Switch-to-driver-specific.patch"
-                             "rk3588-mnt-reform2/0087-phy-rockchip-samsung-hdptx-Extend-rk_hdptx_phy_verif.patch"
-                             "rk3588-mnt-reform2/0088-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-FRL-support.patch"
-                             "rk3588-mnt-reform2/0089-drm-rockchip-vop2-Check-bpc-before-switching-DCLK-so.patch"
-                             "rk3588-mnt-reform2/0090-drm-bridge-dw-hdmi-qp-Handle-platform-supported-form.patch"
-                             "rk3588-mnt-reform2/0091-drm-rockchip-dw_hdmi_qp-Switch-to-phy_configure.patch"
-                             "rk3588-mnt-reform2/0092-drm-rockchip-dw_hdmi_qp-Use-bit-macros-for-RK3576-re.patch"
-                             "rk3588-mnt-reform2/0093-drm-rockchip-dw_hdmi_qp-Add-high-color-depth-support.patch"
-                             "rk3588-mnt-reform2/0094-DEBUG-phy-rockchip-samsung-hdptx-Add-verbose-logging.patch"
-                             "rk3588-mnt-reform2/0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch"
-                             "rk3588-mnt-reform2/0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch"
-                             "rk3588-mnt-reform2/0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch"
-                             "rk3588-mnt-reform2/0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch"
-                             "rk3588-mnt-reform2/0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch"
-                             "rk3588-mnt-reform2/0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch"
-                             "rk3588-mnt-reform2/0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch"
-                             "rk3588-mnt-reform2/0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch"
-                             "rk3588-mnt-reform2/0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch"
-                             "rk3588-mnt-reform2/0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch"
-                             "rk3588-mnt-reform2/0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch"
-                             "rk3588-mnt-reform2/0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch"
-                             "rk3588-mnt-reform2/0108-dt-bindings-phy-rockchip-usbdp-add-improved-ports-sc.patch"
-                             "rk3588-mnt-reform2/0114-media-dt-bindings-video-interfaces-add-defines-for-s.patch"
-                             "rk3588-mnt-reform2/2001-drm-bridge-dw-hdmi-qp-Return-0-in-audio-prepare-when.patch"
-                             "rk3588-mnt-reform2/2003-drm-bridge-synopsys-Do-not-warn-about-audio-params-c.patch"
-                             "rk3588-mnt-reform2/5200-drm-rockchip-Set-dma-mask-to-64-bit.patch"))))
-              (add-after 'apply-reform-patches 'copy-reform-dts-files
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (for-each (lambda (dts)
-                              (copy-file (search-input-file inputs
-                                                            (string-append
-                                                             "/dts/" dts))
-                                         (string-append "arch/arm64/boot/dts/"
-                                          dts)))
-                            (list
-                             "amlogic/meson-g12b-bananapi-cm4-mnt-pocket-reform.dts"
-                             "freescale/fsl-ls1028a-mnt-reform2.dts"
-                             "freescale/imx8mp-mnt-pocket-reform.dts"
-                             "freescale/imx8mp-mnt-reform2.dts"
-                             "freescale/imx8mq-mnt-reform2-hdmi.dts"
-                             "rockchip/rk3588-mnt-pocket-reform.dts"
-                             "rockchip/rk3588-mnt-reform-next.dts"
-                             "rockchip/rk3588-mnt-reform2.dts"
-                             "rockchip/rk3588-mnt-reform2-dsi.dts"
-                             ))))
-              (add-after 'apply-reform-patches 'adjust-makefiles-with-new-dtb
-                (lambda _
-                  (substitute* "arch/arm64/boot/dts/amlogic/Makefile"
-                    (("meson-g12b-bananapi-cm4-mnt-reform2.dtb")
-                     "meson-g12b-bananapi-cm4-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-mnt-pocket-reform.dtb"))
-                  (substitute* "arch/arm64/boot/dts/freescale/Makefile"
-                    (("fsl-ls1028a-rdb.dtb")
-                     "fsl-ls1028a-rdb.dtb
-dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1028a-mnt-reform2.dtb"))
-                  (substitute* "arch/arm64/boot/dts/freescale/Makefile"
-                    (("imx8mq-mnt-reform2.dtb")
-                     "imx8mq-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mp-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mp-mnt-pocket-reform.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mq-mnt-reform2-hdmi.dtb"))
-                  (substitute* "arch/arm64/boot/dts/rockchip/Makefile"
-                    (("rk3588-mnt-reform2.dtb")
-                     "rk3588-mnt-reform2.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform2-dsi.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-reform-next.dtb
-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
-
 (define-public linux-libre-arm64-mnt-reform-6.17
  ;; Kernel for use on the MNT/Reform systems
  ;; https://mntre.com/reform.html
@@ -2116,17 +1770,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                           ("CONFIG_NFT_FIB_IPV6" . m)
                                           ("CONFIG_NFT_BRIDGE_META" . m)
                                           ("CONFIG_NFT_BRIDGE_REJECT" . m)
-                                           ;; Provide support for USB tethering
-                                           ("CONFIG_USB_NET_CDC_EEM" . m)
-                                           ("CONFIG_USB_NET_RNDIS_HOST" . m)
-                                           ("CONFIG_USB_WDM" . m)
-                                           ("CONFIG_USB_GADGET" . m)
-                                           ("CONFIG_USB_ETH" . m)
-                                           ("CONFIG_USB_ETH_RNDIS" . m)
-                                           ("CONFIG_USB_ETH_EEM" . m)
-                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                           ;; Provide support for ath9k wireless
                                           ("CONFIG_ATH9K" . m)
                                           ("CONFIG_ATH9K_HTC" . m))
@@ -2215,6 +1858,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                             "rk3588-mnt-reform2/0072-drm-rockchip-dw_hdmi_qp-Provide-ref-clock-rate-in-dw.patch"
                             "rk3588-mnt-reform2/0073-arm64-defconfig-Enable-DW-HDMI-QP-CEC-support.patch"
                             "rk3588-mnt-reform2/0075-phy-hdmi-Add-HDMI-2.1-FRL-configuration-options.patch"
+                             "rk3588-mnt-reform2/0076-phy-rockchip-samsung-hdptx-Fix-reported-clock-rate-i.patch"
+                             "rk3588-mnt-reform2/0077-phy-rockchip-samsung-hdptx-Reduce-ROPLL-loop-bandwid.patch"
+                             "rk3588-mnt-reform2/0078-phy-rockchip-samsung-hdptx-Prevent-Inter-Pair-Skew-f.patch"
                             "rk3588-mnt-reform2/0079-phy-rockchip-samsung-hdptx-Use-usleep_range-instead-.patch"
                             "rk3588-mnt-reform2/0080-phy-rockchip-samsung-hdptx-Fix-coding-style-alignmen.patch"
                             "rk3588-mnt-reform2/0081-phy-rockchip-samsung-hdptx-Consistently-use-rk_-hdpt.patch"
@@ -2441,17 +2087,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                           ("CONFIG_NFT_FIB_IPV6" . m)
                                           ("CONFIG_NFT_BRIDGE_META" . m)
                                           ("CONFIG_NFT_BRIDGE_REJECT" . m)
-                                           ;; Provide support for USB tethering
-                                           ("CONFIG_USB_NET_CDC_EEM" . m)
-                                           ("CONFIG_USB_NET_RNDIS_HOST" . m)
-                                           ("CONFIG_USB_WDM" . m)
-                                           ("CONFIG_USB_GADGET" . m)
-                                           ("CONFIG_USB_ETH" . m)
-                                           ("CONFIG_USB_ETH_RNDIS" . m)
-                                           ("CONFIG_USB_ETH_EEM" . m)
-                                           ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                           ;; Provide support for ath9k wireless
                                           ("CONFIG_ATH9K" . m)
                                           ("CONFIG_ATH9K_HTC" . m))
@@ -3162,7 +2797,7 @@ the system when powering it off via userspace.")
 (define-public v4l2loopback-linux-module
  (package
    (name "v4l2loopback-linux-module")
-    (version "0.15.3")
+    (version "0.15.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3171,7 +2806,7 @@ the system when powering it off via userspace.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1fpzsymsas4d2maj81k1al02m62d81ll4q15xwc4n0rhh88hkdv7"))))
+                "00vkn4c1wlfmf8kqklklxj5kalwgiwwnxwbh4pw7dj9l1ivycm4f"))))
    (build-system linux-module-build-system)
    (arguments
     (list #:tests? #f))                ; no test suite
@@ -11415,7 +11050,7 @@ set as @code{LD_PRELOAD} to override the C library file system functions.")
           ;; available.
           curl
           re2
-           onetbb))
+           tbb))
    (home-page "https://github.com/falcosecurity/libs/")
    (synopsis "Falco security libraries")
    (description "The Falco security libraries include @code{libsinsp} and
@@ -11469,7 +11104,7 @@ types and interfaces and translates so that the X server can use them.")
 (define-public keyd
  (package
    (name "keyd")
-    (version "2.6.0")
+    (version "2.5.0")
    (source
      (origin
        (method git-fetch)
@@ -11478,7 +11113,7 @@ types and interfaces and translates so that the X server can use them.")
               (commit (string-append "v" version))))
        (sha256
          (base32
-            "14rgrg8d1ys1cqq46mgi34yqg9jd1q3yw1acw5r5jpwwk0da7g4p"))))
+            "0nkra6lwdjhjcwj6486cgy562n4bcp98fjgl52rj8pp76i15yad7"))))
    (arguments
      (list #:tests? #f ; tests require root
            #:make-flags
@@ -1057,10 +1057,10 @@ SIMPLET.")
           "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh"))))
      (build-system asdf-build-system/sbcl)
      (inputs
-       (list sbcl-alexandria
-             sbcl-iterate
-             sbcl-metabang-bind
-             sbcl-slime-swank))
+       `(("alexandria" ,sbcl-alexandria)
+         ("iterate" ,sbcl-iterate)
+         ("metabang-bind" ,sbcl-metabang-bind)
+         ("swank" ,sbcl-slime-swank)))
      (arguments
       '(#:phases
         (modify-phases %standard-phases
@@ -336,7 +336,7 @@ library.")
 (define-public rsyslog
  (package
    (name "rsyslog")
-    (version "8.2512.0")
+    (version "8.2204.1")
    (source
     (origin
       (method git-fetch)
@@ -345,7 +345,7 @@ library.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1w0yg5gwj0153z4vpcqayij6m6asji4jyshlji0i4gz1kic53mab"))))
+        (base32 "0bsd1n3n4hvlkwf4g85g3fg37mnvkdmxsfdmg273gcachhyl5hbx"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -25,7 +25,6 @@
 ;;; Copyright © 2024, 2026 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
-;;; Copyright © 2025 Aaron Boyd <aaron.boyd.org@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -68,7 +67,6 @@
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages gnupg)
  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages haskell-xyz)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages linux)
@@ -1548,37 +1546,6 @@ multiple local rocks trees.")
 (define-public luarocks
  (make-luarocks "luarocks" lua))

-(define-public dkjson
-  (package
-    (name "dkjson")
-    (version "2.8")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://dkolf.de/dkjson-lua/dkjson-" version ".lua"))
-       (sha256
-        (base32 "0i3x9qzx2m25fpf1pd6j45imm1gpykpjxibbvfi9bcwgd1hg2fzb"))))
-    (build-system trivial-build-system)
-    (arguments
-     (list
-      #:modules '((guix build utils))
-      #:builder
-      #~(begin
-          (use-modules (guix build utils))
-          (let* ((luajit-major+minor
-                  #$(version-major+minor (package-version lua)))
-                 (lua-dir
-                  (string-append #$output "/share/lua/" luajit-major+minor)))
-            (mkdir-p lua-dir)
-            (copy-file #$source (string-append lua-dir "/dkjson.lua"))))))
-    (inputs (list lua))
-    (synopsis "JSON module for Lua")
-    (description
-     "dkjson is a lua module for processing json in lua. It can handle tasks
- like encoding or decoding JSON objects to and from lua tables.")
-    (home-page "https://dkolf.de/dkjson-lua/")
-    (license license:expat)))
-
 (define-public fennel
  (package
    (name "fennel")
@@ -1717,67 +1684,3 @@ This compiler does the opposite of what the Fennel compiler does.")
     "Fnlfmt is a tool for automatically formatting Fennel code in a consistent
 way, following established lisp conventions.")
    (license license:lgpl3+)))
-
-(define-public fennel-ls
-  (package
-    (name "fennel-ls")
-    (version "0.2.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.sr.ht/~xerool/fennel-ls")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1fyyd6yg8xrb572hvk76yi9ga1ysrn6j40phf8ickav3s28i4k85"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags #~(list "VENDOR=false")
-      #:tests? #f                ; tests require additional dependencies
-      #:phases 
-      #~(let ((luajit-major+minor
-               #$(version-major+minor (package-version lua))))
-         (modify-phases %standard-phases
-          (delete 'configure)
-          (add-before 'build 'rm-vendored-deps
-            (lambda _
-              (delete-file-recursively "fennel")
-              (delete-file-recursively "deps/")))
-          (add-before 'build 'set-lua-path
-            (lambda _
-              (setenv "LUA_PATH"
-                      (string-join
-                       (list
-                        (string-append
-                         #$fennel "/share/lua/" luajit-major+minor "/?.lua")
-                        (string-append
-                         #$dkjson "/share/lua/" luajit-major+minor "/?.lua")
-                        "?.lua")
-                       ";"))))
-          (replace 'install
-            (lambda _
-              (install-file "fennel-ls"
-                            (string-append #$output "/bin"))))
-          (add-after 'install 'wrap
-            (lambda _
-              (wrap-program (string-append #$output "/bin/fennel-ls")
-                `("LUA_PATH" ";" suffix
-                  (,(string-append
-                     #$fennel
-                     "/share/lua/"
-                     luajit-major+minor
-                     "/?.lua")
-                   ,(string-append
-                     #$dkjson
-                     "/share/lua/"
-                     luajit-major+minor
-                     "/?.lua"))))))))))
-    (inputs (list bash-minimal lua fennel pandoc dkjson))
-    (synopsis "Language server for Fennel")
-    (description
-     "Fennel Language Server is a language server for the Fennel programming
- language.")
-    (home-page "https://git.sr.ht/~xerool/fennel-ls")
-    (license license:expat)))
@@ -57,7 +57,7 @@
 (define-public luanti
  (package
    (name "luanti")
-    (version "5.15.0")
+    (version "5.14.0")
    (source
     (origin
       (method git-fetch)
@@ -66,7 +66,7 @@
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0g72jymcj5p5dihc9kjxrb8pa6sfcmvdsb46g6mw6zsva74p51m2"))
+        (base32 "0lwx94pydlxy97lg6b5sn530wmnz9wh3y5fx7jw6n4z7mnb6g06b"))
       (modules '((guix build utils)
                  (srfi srfi-26)
                  (ice-9 ftw)))
@@ -33,7 +33,6 @@
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -103,7 +102,6 @@
  #:use-module (gnu packages image-processing)
  #:use-module (gnu packages imagemagick)
  #:use-module (gnu packages jupyter)
-  #:use-module (gnu packages language)
  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages libffi)
@@ -278,78 +276,6 @@ learning models with just a fraction of the examples and compute.")
 family of functions.")
    (license license:expat)))

-(define-public python-burr
-  (package
-    (name "python-burr")
-    (version "0.40.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/apache/burr/")
-              (commit (string-append "burr-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0scdfdn2dkan5rkrh5ngai8j4i01rj6d6ncrhvab62r43c0h042q"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      '(modify-phases %standard-phases
-         ;; Avoid "async def functions are not natively supported." with 70+
-         ;; test failures.  This hack triggers a bunch of warnings, because
-         ;; now also synchronous tests are marked with @pytest.mark.asyncio,
-         ;; but at least the tests run successfully.
-         (add-after 'unpack 'patch-tests
-           (lambda _
-             (substitute* "tests/common/test_async_utils.py"
-               (("from typing.*" m)
-                (string-append m "\
-import asyncio
-import pytest
-pytestmark = pytest.mark.asyncio\n")))
-             (substitute* '("tests/visibility/test_tracing.py"
-                            "tests/core/test_parallelism.py"
-                            "tests/core/test_action.py"
-                            "tests/core/test_application.py"
-                            "tests/test_end_to_end.py")
-               (("^import asyncio.*" m)
-                (string-append m "\
-import pytest
-pytestmark = pytest.mark.asyncio\n"))))))
-      ;; There are integration tests and examples comparing Burr to and
-      ;; interfacing with alternatives, such as the overly complex langchain.
-      ;; We should not add them here just to run these tests.
-      #:test-flags
-      #~(list "--ignore-glob=tests/integration**"
-              "--ignore-glob=examples/**"
-              "--ignore-glob=burr/examples/**"
-              "--ignore=tests/core/test_graphviz_display.py"
-              "--ignore=tests/core/test_persistence.py")))
-    (native-inputs
-     (list python-flit-core
-           python-anyio
-           python-pytest
-           python-pytest-asyncio
-           python-setuptools))
-    ;; Burr has very few hard dependencies.  Including these optional packages
-    ;; makes it more useful, though.
-    (propagated-inputs
-     (list python-pydantic           ;optional
-           python-pydantic-settings  ;optional
-           python-loguru
-           python-requests))
-    (home-page "https://burr.apache.org/")
-    (synopsis "Build applications that make decisions")
-    (description
-     "Apache Burr makes it easy to develop applications that make
-decisions (chatbots, agents, simulations, etc...) from simple Python building
-blocks.  Apache Burr works well for any application that uses LLMs, and can
-integrate with any of your favorite frameworks.  Burr includes a UI that can
-track/monitor/trace your system in real time, along with pluggable
-persisters (e.g. for memory) to save and load application state.")
-    (license license:asl2.0)))
-
 (define-public python-faster-whisper
  (package
    (name "python-faster-whisper")
@@ -1941,72 +1867,6 @@ transformers like BERT, as well as a production-ready training system and easy
 model packaging, deployment and workflow management.")
    (license license:expat)))

-(define-public python-stanza
-  (package
-    (name "python-stanza")
-    (version "1.10.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stanfordnlp/stanza")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "0zcpzmbv0aafircl12m3x5999hxpg2hzm1xxv97pz09y4v589snj"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'set-up-check
-            (lambda _
-              ;; Cherry pick from stanza/tests/setup.py,
-              ;; which downloads many datasets
-              (mkdir-p "stanza_test/out")
-              (copy-file "stanza/tests/data/example_french.json"
-                         "stanza_test/out/example_french.json"))))
-      ;; tests: 288 passed, 361 deselected, 1 warning
-      #:test-flags
-      #~(list
-         "-k"
-         (string-join
-          '("not CoreNLP" "EnglishPipeline" "FrenchPipeline"
-            "SentimentPipeline" "TestTrainer"
-            "amt_annotator" "arabic_pos" "bert"
-            "charlm" "conllu" "convert_units"
-            "data_objects" "defaultdict_config"
-            "depparse" "dictionary" "download"
-            "ensemble" "example" "finetune" "install"
-            "langid" "lemmatizer" "long_paragraph" "long_tokens"
-            "model" "morphology" "multilingual" "mwt"
-            "pipeline_" "pretrain" "process_doc"
-            "read_snippets" "register" "reload"
-            "requirements" "resources" "retag"
-            "score" "semgrex" "serialized" "server_" "ssurgeon"
-            "tagger" "test_core" "test_one_sentence" "test_tokenizer"
-            "text_processing" "tokenize_files" "tokensregex"
-            "train_pipeline" "training" "tsurgeon")
-          " and not ")                  ;exclude tests requiring datasets
-         "stanza/tests")))
-    (native-inputs (list python-pytest
-                         python-setuptools
-                         python-transformers))
-    (propagated-inputs (list python-emoji
-                             python-networkx
-                             python-numpy
-                             python-protobuf
-                             python-pytorch
-                             python-requests
-                             python-tqdm))
-    (home-page "https://stanfordnlp.github.io/stanza/")
-    (synopsis "Stanford NLP Python library for many human languages")
-    (description
-     "Stanza is a collection of accurate and efficient tools
-for the linguistic analysis of many human languages.  Starting from raw text,
-Stanza divides it into sentences and words, and then can recognize
-parts of speech and entities, do syntactic analysis, and more.")
-    (license license:asl2.0)))
-
 (define-public onnx
  (package
    (name "onnx")
@@ -4682,7 +4542,7 @@ different backends")
 (define-public koboldcpp
  (package
    (name "koboldcpp")
-    (version "1.107")
+    (version "1.106.2")
    (source
     (origin
       (method git-fetch)
@@ -4690,15 +4550,8 @@ different backends")
             (url "https://github.com/LostRuins/koboldcpp")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
-       (snippet
-        #~(begin
-            (use-modules (guix build utils)
-                         (ice-9 ftw)
-                         (srfi srfi-26))
-            (delete-file-recursively "lib")
-            (for-each delete-file (find-files "." "\\.(dll|exe|bat)$"))))
       (sha256
-        (base32 "14zcksqlq0a9hhx41gw23imcazpqa19wzvm3kd28hnhkpg4ah75v"))))
+        (base32 "0599c2h251b5d3nvyvaxh02lqcn7lqd75i432vdjaq1kf9gbpfaz"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -6205,70 +6058,6 @@ models on CPU and GPU.")
                         python-pyyaml
                         python-numpy))))

-(define-public python-xx-sent-ud-sm
-  ;; For Argos Translate CLI tool
-  (hidden-package
-   (package
-     (name "python-xx-sent-ud-sm")
-     (version "3.8.0")
-     (source
-      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/explosion/spacy-models"
-                           "/releases/download/xx_sent_ud_sm-3.8.0"
-                           "/xx_sent_ud_sm-" version ".tar.gz"))
-       (sha256
-        (base32 "1pwyl23nvmmkpvq5wgafdqq0mlnq14l2svh9m6gi6w0skv7dd5fq"))))
-     (build-system pyproject-build-system)
-     (arguments '(#:tests? #f))         ;no test
-     (native-inputs (list python-setuptools))
-     (propagated-inputs (list python-spacy))
-     (home-page "https://spacy.io/models/xx#xx_sent_ud_sm")
-     (synopsis "Small multi-language sentence boundary model for spaCy")
-     (description "@code{xx_sent_ud_sm} is a spaCy model optimized for CPU.
-It includes a sentence boundary component of a relatively small size.")
-     (license license:cc-by-sa3.0))))
-
-(define-public python-argostranslate
-  (package
-    (name "python-argostranslate")
-    (version "1.10.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/argosopentech/argos-translate")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "18fhqabdyh66ymri9xi9xc3q619f5bd3yb9izwhvwyladx65xcfn"))))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'writable-home
-            (lambda _
-              ;; Tests want a writable home
-              (setenv "HOME" "/tmp"))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
-    (propagated-inputs (list python-ctranslate2
-                             python-packaging
-                             python-sacremoses
-                             python-sentencepiece
-                             python-spacy
-                             python-stanza
-                             python-xx-sent-ud-sm))
-    (home-page "https://www.argosopentech.com")
-    (synopsis "Offline translation library and CLI tool")
-    (description
-     "Argos Translate uses OpenNMT for translations and can be used
-as either a Python library, command-line, or GUI application.
-It supports installing language model packages which are ZIP archives
-with a @code{.argosmodel} extension.  This package provides
-the Python library and the command-line program.")
-    (license license:expat)))
-
 (define-public python-hmmlearn
  (package
    (name "python-hmmlearn")
@@ -1285,62 +1285,64 @@ repository and Maildir/IMAP as LOCAL repository.")
  offlineimap3)

 (define-public emacs-mew
-  (package
-    (name "emacs-mew")
-    (version "6.10")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/kazu-yamamoto/Mew")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "13ajr51yk2hcfiq532cayb0kvpdb3psf877cxl6qwx0pgaf1qm57"))))
-    (build-system gnu-build-system)
-    (arguments
-     (let ((icon-dir  #~(string-append #$output "/share/mew")))
-       (list
-        #:modules '((guix build gnu-build-system)
-                    (guix build utils)
-                    ((guix build emacs-build-system) #:prefix emacs:)
-                    (guix build emacs-utils))
-        #:imported-modules %emacs-build-system-modules
-        #:tests? #f
-        #:configure-flags
-        #~(list (string-append "--with-elispdir="
-                               (emacs:elpa-directory #$output))
-                (string-append "--with-etcdir=" #$icon-dir))
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'configure 'patch-mew-icon-directory
-              (lambda _
-                (emacs-substitute-sexps "elisp/mew-key.el"
-                  ("(def.* mew-icon-directory"
-                   `(progn
-                     (add-to-list 'image-load-path 'mew-icon-directory)
-                     ,#$icon-dir)))))
-            (add-after 'unpack 'generate-autoloads
-              (lambda _
-                (emacs-generate-autoloads "mew" "elisp")
-                (substitute* "elisp/mew-autoloads.el"
-                  ((";; no-byte-compile.*") ""))
-                ;; Add generated autoloads to Makefile, so they get compiled
-                (substitute* "elisp/Makefile"
-                  (("OBJS =") "OBJS = mew-autoloads.elc")
-                  (("SRCS =") "SRCS = mew-autoloads.el"))))))))
-    (native-inputs
-     (list emacs))
-    (propagated-inputs
-     (list ruby          ; to set GEM_PATH so ruby-sqlite3 is found at runtime
-           ruby-sqlite3))              ; optional for the database of messages
-    (home-page "https://mew.org")
-    (synopsis "Emacs e-mail client")
-    (description "Mew (Messaging in the Emacs World) is a user interface
+  (let ((commit "35772ee0b44dd7e56b0f3899b27fa545b2bc6f03")
+        (revision "1"))
+    (package
+      (name "emacs-mew")
+      (version (git-version "6.9" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/kazu-yamamoto/Mew")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0xazygwdc328m5l31rxjazq9giv2xrygp2p2q455lf3jhdxwq1km"))))
+      (build-system gnu-build-system)
+      (arguments
+       (let ((icon-dir  #~(string-append #$output "/share/mew")))
+         (list
+          #:modules '((guix build gnu-build-system)
+                      (guix build utils)
+                      ((guix build emacs-build-system) #:prefix emacs:)
+                      (guix build emacs-utils))
+          #:imported-modules %emacs-build-system-modules
+          #:tests? #f
+          #:configure-flags
+          #~(list (string-append "--with-elispdir="
+                                 (emacs:elpa-directory #$output))
+                  (string-append "--with-etcdir=" #$icon-dir))
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-after 'configure 'patch-mew-icon-directory
+                (lambda _
+                  (emacs-substitute-sexps "elisp/mew-key.el"
+                    ("(def.* mew-icon-directory"
+                     `(progn
+                       (add-to-list 'image-load-path 'mew-icon-directory)
+                       ,#$icon-dir)))))
+              (add-after 'unpack 'generate-autoloads
+                (lambda _
+                  (emacs-generate-autoloads "mew" "elisp")
+                  (substitute* "elisp/mew-autoloads.el"
+                    ((";; no-byte-compile.*") ""))
+                  ;; Add generated autoloads to Makefile, so they get compiled
+                  (substitute* "elisp/Makefile"
+                    (("OBJS =") "OBJS = mew-autoloads.elc")
+                    (("SRCS =") "SRCS = mew-autoloads.el"))))))))
+      (native-inputs
+       (list emacs))
+      (propagated-inputs
+       (list ruby        ; to set GEM_PATH so ruby-sqlite3 is found at runtime
+             ruby-sqlite3))            ; optional for the database of messages
+      (home-page "https://mew.org")
+      (synopsis "Emacs e-mail client")
+      (description "Mew (Messaging in the Emacs World) is a user interface
 for text messages, multimedia messages (MIME), news articles and
 security functionality including PGP, S/MIME, SSH, and SSL.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))

 (define-public mu
  (package
@@ -90,9 +90,7 @@
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-         "02ms4s6kfxkbghc24rx9g1axdv50rndzdm0s3iz1vxv8wb7c5ds2"))
-       (patches
-        (search-patches "mate-common-honor-aclocal.patch"))))
+         "02ms4s6kfxkbghc24rx9g1axdv50rndzdm0s3iz1vxv8wb7c5ds2"))))
    (build-system gnu-build-system)
    (home-page "https://mate-desktop.org/")
    (synopsis "Common files for development of MATE packages")
@@ -175,7 +175,6 @@
  #:use-module (gnu packages ocaml)
  #:use-module (gnu packages onc-rpc)
  #:use-module (gnu packages oneapi)
-  #:use-module (gnu packages opencl)
  #:use-module (gnu packages parallel)
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages popt)
@@ -294,16 +293,14 @@ interactive dialogs to guide them.")
 (define-public calc
  (package
    (name "calc")
-    (version "2.16.1.2")
+    (version "2.15.1.1")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/lcn2/calc")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "http://www.isthe.com/chongo/src/calc/calc-"
+                           version ".tar.bz2"))
       (sha256
-        (base32 "18vb5gi9mf4c8vmhvimxqdzja8b56glyk23bpb2igwm903x3ciav"))))
+        (base32 "1710wsyjg3k6qx5xaa5fa1r81izpgjiy676ayznd2p42rn3czmm2"))))
    (build-system gnu-build-system)
    (inputs (list readline))
    (native-inputs (list man-db util-linux)) ;for col
@@ -368,36 +365,6 @@ finite domain propagation and Boolean satisfiability.")
    (home-page "https://github.com/chuffed/chuffed")
    (license license:expat)))

-(define-public clblast
-  (package
-    (name "clblast")
-    (version "1.6.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/CNugteren/CLBlast")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1zp8rfkscnh4l9x71kp39hsg5zxfhkkf88886mv40hw0a1hafdvz"))))
-    (build-system cmake-build-system)
-    (arguments (list #:tests? #f))      ;no device available during tests
-    (inputs
-     (list opencl-icd-loader opencl-headers))
-    (native-inputs
-     (list python-minimal-wrapper))
-    (home-page "https://cnugteren.github.io/clblast/")
-    (synopsis "Tunable OpenCL BLAS library")
-    (description
-     "CLBlast is a lightweight, performant and tunable OpenCL BLAS library
-written in C++11.  It is designed to leverage the full performance potential
-of a wide variety of OpenCL devices from different vendors, including desktop
-and laptop GPUs, embedded GPUs, and other accelerators.  CLBlast implements
-BLAS routines: basic linear algebra subprograms operating on vectors and
-matrices.")
-    (license license:asl2.0)))
-
 (define-public coda
  (package
    (name "coda")
@@ -109,7 +109,6 @@
  #:use-module (gnu packages hunspell)
  #:use-module (gnu packages icu4c)
  #:use-module (gnu packages image)
-  #:use-module (gnu packages java)
  #:use-module (gnu packages kde-frameworks)
  #:use-module (gnu packages kerberos)
  #:use-module (gnu packages less)
@@ -2256,7 +2255,7 @@ notifications, and Python scripting support.")
 (define-public libqmatrixclient
  (package
    (name "libqmatrixclient")
-    (version "0.9.5")
+    (version "0.9.3")
    (source
     (origin
       (method git-fetch)
@@ -2265,7 +2264,7 @@ notifications, and Python scripting support.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "100l7nbpr8yhhx9zcd9wd6bw3j7j9f8a17wipsa7b5rqnbj09ln1"))))
+        (base32 "0liidazw1ff1f73lb476pvrhzkmmk9dbgf5qsfajkxdj4xvy047k"))))
    (build-system qt-build-system)
    (inputs
     (list olm openssl qtkeychain-qt6 qtmultimedia))
@@ -2644,7 +2643,7 @@ asynchronicity.")
 (define-public libphonenumber
  (package
   (name "libphonenumber")
-   (version "9.0.21")
+   (version "8.11.3")
   (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2655,7 +2654,7 @@ asynchronicity.")
                        "libphonenumber-reproducible-build.patch"))
              (sha256
               (base32
-                "07ap8qvzlm4wb7x8qvs4n1jhb50fgwsy41ck4ivsj427wy79726r"))))
+                "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9"))))
   (arguments
    (list
     #:modules '((guix build cmake-build-system)
@@ -2673,7 +2672,7 @@ asynchronicity.")
   (native-inputs
    (list googletest pkg-config))
   (inputs
-    (list abseil-cpp boost-1.83 protobuf icedtea icu4c))
+    (list boost-1.83 protobuf icu4c))
   (synopsis "Library for parsing and using phone numbers")
   (description
    "This package provides a C++ library for parsing, formatting, and
@@ -2681,23 +2680,6 @@ validating international phone numbers.")
   (home-page "https://github.com/google/libphonenumber")
   (license license:asl2.0)))

-(define-public libphonenumber-8.11
-  (package/inherit libphonenumber
-    (name (package-name libphonenumber))
-    (version "8.11.5")
-    (source (origin
-              (inherit (package-source libphonenumber))
-              (uri (git-reference
-                    (url "https://github.com/google/libphonenumber")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
-    (inputs
-     (modify-inputs (package-inputs libphonenumber)
-       (delete "abseil-cpp" "icedtea")))))
-
 (define-public chatty
  (package
    (name "chatty")
@@ -4205,8 +4205,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
                (sha256
                 (base32
                  "1v8miwsslqlqlpp7p210jhxwkblqyc69cgxaq680qhg7h1sf3y2i"))
-                (patches
-                 (search-patches "opendht-meson-install-headers.patch"))))
+                (patches (search-patches "opendht-meson-install-headers.patch"
+                                         "opendht-meson-liburing.patch"))))
      (outputs '("out" "python" "tools" "debug"))
      (build-system meson-build-system)
      (arguments
@@ -4224,10 +4224,25 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
            (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)")
+                   ""))
+                (substitute* "tests/Makefile.am"
+                  (("\\bdhtrunnertester\\.(h|cpp)\\b")
                   ""))))
            (add-after 'unpack 'relax-test-timeouts
              (lambda _
@@ -4266,8 +4281,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
             argon2
             gnutls
             jsoncpp
-             ;; liburing causes issues (see
-             ;; <https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/2179>).
+             liburing
             nettle
             openssl                      ;required for the DHT proxy
             simdutf))
@@ -4300,13 +4314,13 @@ 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 "0")
-        (commit "8a43aedd235e02b2a8503a55fd50bbe35d49114a"))
+  (let ((revision "6")
+        (commit "6dd5a5e3eb15cebafa212e134ce436705c6d5fc5"))
    (package
      (name "dhtnet")
      ;; The base version is taken from the CMakeLists.txt file (see:
      ;; <https://github.com/savoirfairelinux/dhtnet/blob/master/CMakeLists.txt#L3>)
-      (version (git-version "0.1.0" revision commit))
+      (version (git-version "0.0.1" revision commit))
      (source (origin
                (method git-fetch)
                (uri (git-reference
@@ -4315,7 +4329,7 @@ A very simple IM client working over the DHT.
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                  "0n8r8bhzbixz0ps5ip8fppdwrvkc3cqhxmr2agyzjdzdkcycwgmg"))))
+                  "0nj9zpsy68lxqgip48qnsxjw9m59bghn9aj3r7chmap23a4963z7"))))
      (outputs (list "out" "debug"))
      (build-system cmake-build-system)
      (arguments
@@ -1,46 +1,44 @@
-From c71418d39d5cc0af58548a8885b799efe032c9e3 Mon Sep 17 00:00:00 2001
-From: Sughosha <sughosha@disroot.org>
-Date: Tue, 16 Dec 2025 08:39:32 +0530
-Subject: [PATCH] revert make relocatable
+From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Sun, 25 Apr 2021 08:01:21 -0500
+Subject: [PATCH 3/3] akonadi revert make relocatable

 ---
- CMakeLists.txt             | 4 ----
- KPimAkonadiConfig.cmake.in | 6 +++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
+ CMakeLists.txt            | 3 ---
+ KF5AkonadiConfig.cmake.in | 6 +++---
+ 2 files changed, 3 insertions(+), 6 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c65b2671b..d93ba08f7 100644
+index 4e8cc81..63161b7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -399,10 +399,6 @@ configure_package_config_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
-     "${CMAKE_CURRENT_BINARY_DIR}/KPim6AkonadiConfig.cmake"
+@@ -368,9 +368,6 @@ configure_package_config_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
+     "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-    PATH_VARS
-        AKONADI_DBUS_INTERFACES_INSTALL_DIR
-        AKONADI_INCLUDE_DIR
-        KF5Akonadi_DATA_DIR
+-    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
+-              AKONADI_INCLUDE_DIR
+-              KF5Akonadi_DATA_DIR
 )
- 
- install(
+
+ install(FILES
 diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
-index 3d1214a5a..2865d1fce 100644
+index bcf7320..1574319 100644
 --- a/KPimAkonadiConfig.cmake.in
 +++ b/KPimAkonadiConfig.cmake.in
@@ -1,10 +1,10 @@
 @PACKAGE_INIT@
- 
+
 -set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
 -set_and_check(AKONADI_INCLUDE_DIR          "@PACKAGE_AKONADI_INCLUDE_DIR@")
 +set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
 +set_and_check(AKONADI_INCLUDE_DIR          "@AKONADI_INCLUDE_DIR@")
- 
+
 # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
 -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
 +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
- 
+
 # set the directories
 if(NOT AKONADI_INSTALL_DIR)
-- 
-2.52.0
-
+--
+2.31.1
@@ -0,0 +1,35 @@
+From 6e8cb6f2175cd5c108de615a970a27877adfaea0 Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Fri, 19 Jan 2024 10:49:51 -0500
+Subject: [PATCH] tests: Fix byte-compilation test.
+
+* test/shx-test.el (shx-test-unit-byte-compile): Simply assert on the
+return value of byte-compile-file, which is non-nil when there are no
+errors.
+
+Fixes: <https://github.com/riscy/shx-for-emacs/issues/33>
+---
+ test/shx-test.el | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/test/shx-test.el b/test/shx-test.el
+index e18cefb..ed5aee3 100644
+--- a/test/shx-test.el
+++ b/test/shx-test.el
+@@ -83,10 +83,8 @@ Example:
+   "Test byte-compilation against the shx.el file."
+   (ignore-errors (kill-buffer "*Compile-Log*"))
+   (let ((file (replace-regexp-in-string ".elc$" ".el" (symbol-file 'shx-mode))))
+-    (byte-compile-file file)
+     (shx-test-assert "shx.el passes byte-compilation"
+-                     (with-current-buffer (get-buffer-create "*Compile-Log*")
+-                       (<= (- (point-max) (point)) 3)))))
+                     (byte-compile-file file))))
+ 
+ (defun shx-test-unit-declare-function ()
+   "Test `declare-function'."
+
+base-commit: b99d16f36bc278d668d8428c4bc9af77064c336a
+-- 
+2.41.0
+
@@ -0,0 +1,31 @@
+This is part 2 of the diff between Ekaitz's branch and upstream's releases/gcc-4.6.4 branch.
+It only contains the libstdc++ diff.
+
+diff --git a/libstdc++-v3/config/os/generic/os_defines.h b/libstdc++-v3/config/os/generic/os_defines.h
+index 3199bf30bb3..b8d7c16361e 100644
+--- a/libstdc++-v3/config/os/generic/os_defines.h
+++ b/libstdc++-v3/config/os/generic/os_defines.h
+@@ -33,4 +33,9 @@
+ // System-specific #define, typedefs, corrections, etc, go here.  This
+ // file will come before all others.
+
+// Disable the weak reference logic in gthr.h for os/generic because it
+// is broken on every platform unless there is implementation specific
+// workaround in gthr-posix.h and at link-time for static linking.
+#define _GLIBCXX_GTHREAD_USE_WEAK 0
+
+ #endif
+diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
+index e29404c026f..5bbeb7f3763 100644
+--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
+@@ -236,6 +236,9 @@ case "${host_os}" in
+   freebsd*)
+     os_include_dir="os/bsd/freebsd"
+     ;;
+  linux-musl*)
+    os_include_dir="os/generic"
+    ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
@@ -1,23 +0,0 @@
-From 4011d426468eda71e11e13ad3232ad252a141b93 Mon Sep 17 00:00:00 2001
-From: Sertonix <sertonix@posteo.net>
-Date: Sat, 22 Jun 2024 17:14:11 +0000
-Subject: [PATCH] Fix missing lib with builtin_glslang=false
-
-The `GetDefaultResource` function is in separate library file.
---
- platform/linuxbsd/detect.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
-index e1e6886ac0d8..35415dc269c2 100644
--- a/platform/linuxbsd/detect.py
-+++ b/platform/linuxbsd/detect.py
-@@ -514,7 +514,7 @@ def configure(env: "SConsEnvironment"):
-             env.ParseConfig("pkg-config vulkan --cflags --libs")
-         if not env["builtin_glslang"]:
-             # No pkgconfig file so far, hardcode expected lib name.
-            env.Append(LIBS=["glslang", "SPIRV"])
-+            env.Append(LIBS=["glslang", "SPIRV", "glslang-default-resource-limits"])
- 
-     if env["opengl3"]:
-         env.Append(CPPDEFINES=["GLES3_ENABLED"])
@@ -0,0 +1,32 @@
+Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31461>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c046b597..3251762e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -714,13 +714,18 @@ else()
+ endif()
+ 
+ # ZXing-cpp configuration
+-set(ZXING_EXAMPLES OFF CACHE BOOL "")
+-set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
+-add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
+-
+-# Add ZXing-cpp to includes and libraries
+-list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
+-list(APPEND CLIENT_LIBS ZXing)
+pkg_check_modules(zxing IMPORTED_TARGET zxing)
+if(zxing_FOUND)
+  message(STATUS "Using system-provided ZXing-cpp")
+  list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS})
+  list(APPEND CLIENT_LIBS PkgConfig::zxing)
+else()
+  set(ZXING_EXAMPLES OFF CACHE BOOL "")
+  set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
+  add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
+  list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
+  list(APPEND CLIENT_LIBS ZXing)
+endif()
+ 
+ # common executable sources
+ qt_add_executable(
@@ -1,7 +1,7 @@
 Upstream-status: <https://review.jami.net/c/jami-client-qt/+/32711>

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80017d20..9ece96ef 100644
+index c046b597..8ee7b16d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ endif()
@@ -12,18 +12,17 @@ index 80017d20..9ece96ef 100644
 endif()
 
 # init some variables for includes, libs, etc.
-@@ -236,8 +235,8 @@ endif()
+@@ -236,9 +235,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/extras/build/cmake/modules)
 if (NOT JAMICORE_AS_SUBDIR)
   find_package(LibJami REQUIRED)
 -  if(LIBJAMI_FOUND)
 -    include_directories(${LIBJAMI_INCLUDE_DIR})
-+  if (NOT TARGET LibJami::LibJami)
-+    message(FATAL_ERROR "libjami could not be found")
-   endif()
+-  endif()
 endif()
 
-@@ -756,7 +755,7 @@ if(MSVC)
+ include(FindPython3)
+@@ -751,7 +747,7 @@ if(MSVC)
     WIN32_EXECUTABLE TRUE)
 
   list(APPEND CLIENT_LIBS
@@ -32,7 +31,7 @@ index 80017d20..9ece96ef 100644
     ${GNUTLS_LIB}
     ${LIBCLIENT_NAME}
     ${QT_LIBS}
-@@ -799,7 +798,8 @@ elseif (NOT APPLE)
+@@ -794,7 +790,8 @@ elseif (NOT APPLE)
     ${LIBNOTIFY_LIBRARIES}
     ${LIBGDKPIXBUF_LIBRARIES}
     ${GLIB_LIBRARIES}
@@ -95,7 +94,7 @@ index ee2bf6d9..31ec9c02 100644
 message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
 message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
 diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
-index 04cdbc6d..0214d813 100644
+index 5c35e402..94d77523 100644
 --- a/src/libclient/CMakeLists.txt
 +++ b/src/libclient/CMakeLists.txt
@@ -47,9 +47,6 @@ endif()
@@ -109,7 +108,7 @@ index 04cdbc6d..0214d813 100644
 string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
 if(CMAKE_GENERATOR_SHORT MATCHES "Visual Studio ")
 diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
-index c412112f..ba4bd5cb 100644
+index 761278c9..b4b5a708 100644
 --- a/src/libclient/qtwrapper/CMakeLists.txt
 +++ b/src/libclient/qtwrapper/CMakeLists.txt
@@ -39,7 +39,6 @@ else()
@@ -1,7 +1,7 @@
 Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31456>

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80017d20..30b10471 100644
+index c046b597..366758f5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -101,13 +101,13 @@ endif()
@@ -11,7 +11,7 @@ index 80017d20..30b10471 100644
 -  TARGET qwindowkit
 +  TARGET QWindowKit
   URL https://github.com/stdware/qwindowkit.git
-   BRANCH d4536ebe12dd35504abdba66986daf21c0aee805
+   BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
   PATCHES ${QWINDOWKIT_PATCHES}
   OPTIONS ${QWINDOWKIT_OPTIONS}
 )
@@ -21,7 +21,7 @@ index 80017d20..30b10471 100644
 
 # If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 33a892b8..502a9434 100644
+index a1aeb22f..94f558e0 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
@@ -61,7 +61,7 @@ target_include_directories(test_common_obj PRIVATE
@@ -0,0 +1,51 @@
+Upstream-status: <https://review.jami.net/c/jami-daemon/+/32708>
+
+diff --git a/configure.ac b/configure.ac
+index 055151670..f6e4ae978 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -590,6 +590,8 @@ PKG_CHECK_MODULES([SECP256K1], [libsecp256k1 >= 0.1],,
+ PKG_CHECK_MODULES([FMT], [fmt >= 7.0],,
+   AC_MSG_FAILURE([Missing {fmt}]))
+ 
+PKG_CHECK_MODULES([SIMDUTF], [simdutf])
+
+ # SHM
+ dnl check for shm
+ AS_IF([test "x$with_dbus" == xyes],
+diff --git a/meson.build b/meson.build
+index c0f98c7f8..3ad0bd0ba 100644
+--- a/meson.build
+++ b/meson.build
+@@ -32,6 +32,7 @@ deplibavutil      = dependency('libavutil', version: '>= 55.75.100')
+ depfmt            = dependency('fmt', version: '>= 5.3')
+ depyamlcpp        = dependency('yaml-cpp', version: '>= 0.5.1')
+ depjsoncpp        = dependency('jsoncpp', version: '>= 1.6.5')
+depsimdutf        = dependency('simdutf')
+ depzlib           = dependency('zlib')
+ 
+ if get_option('interfaces').contains('dbus')
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8d874223e..cee546126 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -52,6 +52,7 @@ libjami_la_LIBADD += \
+ 	$(FMT_LIBS) \
+ 	$(LIBSSL_LIBS) \
+ 	$(LIBCRYPTO_LIBS) \
+	$(SIMDUTF_LIBS) \
+ 	$(ZLIB_LIBS)
+ 
+ # XXX: It seems this should be the default value when otherwise left
+diff --git a/src/meson.build b/src/meson.build
+index 22d026abc..bfc809cba 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -140,6 +140,7 @@ libjami_dependencies = [
+     depfmt,
+     depyamlcpp,
+     depjsoncpp,
+    depsimdutf,
+     depzlib,
+     depopenssl
+ ]
--- a/Show More
+++ b/Show More