tests: Fix the git-http test.

The test fails because the fcgiwrap daemon that runs as "fcgiwrap" user cannot
access the /srv/git directory that is root-owned.

* gnu/tests/version-control.scm (run-git-http-test): Change the ownership
of /srv/git so that fcgiwrap can access it.

Change-Id: I01fa98e3311ac0dba88a4af21cee3ae0da986582

CODEOWNERS

@@ -190,7 +190,6 @@ tests/home-import\.scm                             @guix/home
 tests/home-services\.scm                           @guix/home
 
 gnu/packages/mpi\.scm                              @guix/hpc
-gnu/packages/oneapi\.scm                           @guix/hpc
 gnu/packages/rocm\.scm                             @guix/hpc
 gnu/packages/sycl\.scm                             @guix/hpc
 gnu/packages/tbb\.scm                              @guix/hpc
@@ -347,7 +346,6 @@ gnu/packages/openldap\.scm                         @guix/sysadmin
 gnu/packages/openstack\.scm                        @guix/sysadmin
 gnu/packages/prometheus\.scm                       @guix/sysadmin
 gnu/packages/rdesktop\.scm                         @guix/sysadmin
-gnu/packages/samba\.scm                            @guix/sysadmin
 gnu/packages/selinux\.scm                          @guix/sysadmin
 gnu/packages/storage\.scm                          @guix/sysadmin
 gnu/packages/task-runners\.scm                     @guix/sysadmin

Makefile.am

@@ -14,7 +14,7 @@
 # Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
-# Copyright © 2020, 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+# Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim@guixotic.coop>
 # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2021 Andrew Tropin <andrew@trop.in>
 # Copyright © 2023 Clément Lassieur <clement@lassieur.org>
@@ -170,7 +170,6 @@ MODULES =					\
   guix/build-system/gnu.scm			\
   guix/build-system/go.scm			\
   guix/build-system/guile.scm			\
-  guix/build-system/hare.scm			\
   guix/build-system/haskell.scm		\
   guix/build-system/julia.scm			\
   guix/build-system/linux-module.scm		\
@@ -241,7 +240,6 @@ MODULES =					\
   guix/build/gnu-build-system.scm		\
   guix/build/gnu-dist.scm			\
   guix/build/guile-build-system.scm		\
-  guix/build/hare-build-system.scm		\
   guix/build/luanti-build-system.scm		\
   guix/build/maven-build-system.scm		\
   guix/build/minetest-build-system.scm		\
@@ -452,10 +450,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.17-arm64.conf	\
-  gnu/packages/aux-files/linux-libre/6.17-i686.conf	\
-  gnu/packages/aux-files/linux-libre/6.17-riscv.conf	\
-  gnu/packages/aux-files/linux-libre/6.17-x86_64.conf	\
   gnu/packages/aux-files/linux-libre/6.16-arm.conf	\
   gnu/packages/aux-files/linux-libre/6.16-arm64.conf	\
   gnu/packages/aux-files/linux-libre/6.16-riscv.conf	\
@@ -592,7 +586,6 @@ SCM_TESTS =					\
   tests/http-client.scm				\
   tests/inferior.scm				\
   tests/ipfs.scm				\
-  tests/ld-wrapper.scm				\
   tests/lint.scm				\
   tests/modules.scm				\
   tests/monads.scm				\
@@ -729,7 +722,7 @@ endif !CAN_RUN_TESTS
 
 check-system: $(GOBJECTS)
 	$(AM_V_at)$(top_builddir)/pre-inst-env			\
-	  guix build -m $(top_srcdir)/etc/manifests/system-tests.scm -K
+          guix repl -- $(top_srcdir)/build-aux/run-system-tests.scm -K
 
 # Public keys used to sign substitutes.
 dist_pkgdata_DATA =				\

build-aux/run-system-tests.scm

@@ -0,0 +1,228 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Mathieu Othacehe <othacehe@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(use-modules (gnu)
+             (gnu tests)
+             (gnu packages package-management)
+             (guix)
+             (guix colors)
+             ((guix build utils)
+                #:select (delete-file-recursively))
+             (guix store)
+             (guix packages)
+             (guix utils)
+             (guix ui)
+             (guix build syscalls)
+             (srfi srfi-1)
+             (srfi srfi-26)
+             (ice-9 getopt-long)
+             (ice-9 match)
+             (ice-9 exceptions)
+             (ice-9 pretty-print)
+             (ice-9 rdelim)
+             (web uri))
+
+;; Version of the script.
+(define script-version "0.1")
+
+;; Directory for the system test logs.
+(define tmpdir (mkdtemp! "/tmp/system-tests-XXXXXX"))
+
+;; Save the stdout and stderr ports.
+(define output-port (duplicate-port (current-output-port) "w0"))
+(define error-port (duplicate-port (current-error-port) "w0"))
+
+;; List of all the system tests, sorted alphabetically.
+(define all-sorted-tests
+  (sort (all-system-tests)
+        (lambda (a b)
+          (string<? (system-test-name a) (system-test-name b)))))
+
+(define (test->log-file test)
+  "Return the name of the log file for the given system TEST."
+  (format #f "~a/~a.log" tmpdir (system-test-name test)))
+
+(define (print-failure)
+  "Print a failure message."
+  (format output-port
+          (colorize-string "FAIL" (color RED BOLD)))
+  (format output-port "~%"))
+
+(define (print-success)
+  "Print a success message."
+  (format output-port
+          (colorize-string "OK" (color GREEN BOLD)))
+  (format output-port "~%"))
+
+(define* (run-system-test test #:key redirect-output?)
+  "Run the given system-test and redirect the test output to a file.
+Return true if the test is successful and false otherwise."
+  (define log-port
+    (and redirect-output?
+         (open-output-file (test->log-file test))))
+
+  (dynamic-wind
+    (lambda ()
+      (when redirect-output?
+        (redirect-port log-port (current-output-port))
+        (redirect-port log-port (current-warning-port))
+        (redirect-port log-port (current-error-port))))
+    (lambda ()
+      (parameterize ((current-build-output-port
+                      (if redirect-output?
+                          log-port
+                          (current-build-output-port))))
+        (let ((store (open-connection)))
+          (run-with-store store
+            (mlet %store-monad
+                ((drv (lower-object test)))
+              (return
+               (guard (c ((store-protocol-error? c)
+                          (print-failure)
+                          #f))
+                 (and (build-derivations store (list drv))
+                      (print-success)))))))))
+    (lambda ()
+      (and redirect-output?
+           (close-port log-port)))))
+
+(define* (print-results results #:key keep-logs)
+  "Use RESULTS, a list of booleans, to print out the test results.  If
+some tests are failing, exit with the error code 1.  Otherwise, exit with
+success."
+  (let* ((ok-count (count identity results))
+         (fail-count (- (length results) ok-count)))
+    (format output-port "~%")
+    (if keep-logs
+        (format output-port "Test results are available in ~a~%" tmpdir)
+        (delete-file-recursively tmpdir))
+    (if (= fail-count 0)
+        (begin
+          (format output-port "All system tests are successful.~%")
+          (exit 0))
+        (begin
+          (format output-port "~a failing test~a~%" fail-count
+                  (if (> fail-count 1) "s" ""))
+          (exit 1)))))
+
+(define* (run-tests tests #:key keep-logs redirect-output?)
+  "Run all the given TESTS.  If KEEP-LOGS is set to true, keep the system test
+log files."
+  (let* ((count (length tests))
+         (indexes (iota count)))
+    (print-results
+     (map (lambda (index test)
+            (format output-port "Running ~a (~a/~a): "
+                    (system-test-name test)
+                    (1+ index) count)
+            (force-output output-port)
+            (run-system-test test #:redirect-output? redirect-output?))
+          indexes tests)
+     #:keep-logs keep-logs)))
+
+(define (subset-tests tests subset)
+  "Return the subset of TESTS that are also in the given SUBSET list."
+  (filter
+   (lambda (test)
+     (let ((name (system-test-name test)))
+       (member name subset)))
+   tests))
+
+(define (exclude-tests tests excludes)
+  "Return the given TESTS list without the tests that are part of the EXCLUDES
+list."
+  (filter
+   (lambda (test)
+     (let ((name (system-test-name test)))
+       (not (member name excludes))))
+   tests))
+
+(define (show-help)
+  (display "Usage: run-system-tests.scm [OPTIONS]
+Run the system tests.\n")
+  (display " --tests=TEST1,TEST2,...           run only TEST1 and TEST2")
+  (newline)
+  (display " --exclude-tests=TEST1,TEST2,...   run all tests but TEST1 and TEST2")
+  (newline)
+  (display " --list-tests                      list all the system tests")
+  (newline)
+  (display " -n, --no-redirect                 do not redirect the test logs")
+  (newline)
+  (display " -K, --keep-logs                   keep the test logs")
+  (newline)
+  (display " -h, --help                        display this help and exit")
+  (newline)
+  (display " -V, --version                     display verson information and exit")
+  (newline))
+
+(define %options
+  '((tests                          (value #t))
+    (exclude-tests                  (value #t))
+    (list-tests                     (value #f))
+    (keep-logs    (single-char #\K) (value #f))
+    (no-redirect  (single-char #\n) (value #f))
+    (help         (single-char #\h) (value #f))
+    (version      (single-char #\V) (value #f))))
+
+(define (main . args)
+  (define guix-source
+    (canonicalize-path
+     (string-append (current-source-directory) "/..")))
+
+  ;; Use the local Guix as the current-guix-package so that we do not compute
+  ;; the Guix derivation over and over.
+  (define guix-local
+    (package
+      (inherit guix)
+      (source (local-file guix-source #:recursive? #t))
+      (arguments
+     (substitute-keyword-arguments (package-arguments guix)
+       ((#:tests? #f #f) #f)))))
+
+  (let* ((opts (getopt-long (command-line) %options))
+         (option (cut option-ref opts <> <>))
+         (keep-logs (option 'keep-logs #f))
+         (no-redirect (option 'no-redirect #f)))
+    (cond
+     ((option 'help #f)
+      (show-help))
+     ((option 'version #f)
+      (format #t "run-system-tests.scm ~A~%" script-version))
+     ((option 'list-tests #f)
+      (format #t "System tests:~%~{- ~a~%~}"
+              (map (lambda (test)
+                     (system-test-name test))
+                   all-sorted-tests)))
+     (else
+      (let* ((subset
+              (and=> (option 'tests #f)
+                     (cut string-split <> #\,)))
+             (excludes
+              (and=> (option 'exclude-tests #f)
+                     (cut string-split <> #\,)))
+             (tests
+              (cond
+               (excludes (exclude-tests all-sorted-tests excludes))
+               (subset (subset-tests all-sorted-tests subset))
+               (else all-sorted-tests))))
+        (parameterize ((current-guix-package guix-local))
+          (run-tests tests
+                     #:keep-logs keep-logs
+                     #:redirect-output? (not no-redirect))))))))
+
+(apply main (cdr (command-line)))

configure.ac

@@ -21,7 +21,7 @@
 AC_PREREQ([2.69])
 AC_INIT([GNU Guix],
   [m4_esyscmd([build-aux/git-version-gen .tarball-version])],
-  [https://codeberg.org/guix/guix/issues/], [guix],
+  [bug-guix@gnu.org], [guix],
   [https://www.gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])
 

doc/contributing.texi

@@ -3344,21 +3344,13 @@ for @b{at least one year}.  For example, @code{go-ipfs} was renamed to
 change to users, the package module provided this definition:
 
 @findex deprecated-package
-@findex define-deprecated-package
 @lisp
-(define-deprecated-package go-ipfs
-  kubo)
+(define-public go-ipfs
+  (deprecated-package "go-ipfs" kubo))
 @end lisp
 
 That way, someone running @command{guix install go-ipfs} or similar sees
-a deprecation warning mentioning the new package name; likewise, someone
-referring to the @code{go-ipfs} @emph{variable} from their manifest or
-package definition will see a warning.
-
-Under the hood, @code{define-deprecated-package} combines
-@code{define-deprecated/public-alias} to mark the variable as deprecated
-(see below), and the @code{deprecated-package} procedure to mark the
-package name as deprecated.
+a deprecation warning mentioning the new name.
 
 @cindex package removal policy
 @anchor{package-removal-policy}
@@ -3368,8 +3360,8 @@ of life'' or being unmaintained may be removed; likewise, packages that
 have been @b{failing to build for two months or more} may be removed.
 
 There is no formal deprecation mechanism for this case, unless a
-replacement exists, in which case the @code{define-deprecated-package}
-macro mentioned above can be used.
+replacement exists, in which case the @code{deprecated-package}
+procedure mentioned above can be used.
 
 If the package being removed is a ``leaf'' (no other packages depend on
 it), it may be removed after a @b{one-month review period} of the patch

doc/guix-cookbook.texi

@@ -518,7 +518,7 @@ as ``SICP'', this book is a reference.
 You can also install it and read it from your computer:
 
 @example
-guix install book-sicp info-reader
+guix install sicp info-reader
 info sicp
 @end example
 
@@ -5737,9 +5737,9 @@ packages:
 guix shell -C gcc-toolchain cmake coreutils grep sed make -- @dots{}
 @end example
 
-Or perhaps you'll find that you could just as well provide a package
-definition for your code---@pxref{Defining Packages,,, guix, GNU Guix
-Reference Manual}, to learn more on how to do that.
+Or perhaps you'll find that you could just as well provide a definition
+for your package---@pxref{Defining Packages,,, guix, GNU Guix Reference
+Manual}, to learn more on how to do that.
 
 Eventually, you'll have a list of packages that satisfies your needs.
 

doc/guix.texi

@@ -145,7 +145,6 @@ Copyright @copyright{} 2025 jgart@*
 Copyright @copyright{} 2025 Artur Wroblewski@*
 Copyright @copyright{} 2025 Edouard Klein@*
 Copyright @copyright{} 2025 Rodion Goritskov@*
-Copyright @copyright{} 2025 dan@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -5833,7 +5832,6 @@ Voilà!
 @c What follows stems from discussions at
 @c <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22629#134> as well as
 @c earlier discussions on guix-devel@gnu.org.
-@c Updated in 2025 to refer to the Deprecation Policy.
 @quotation Warning
 Before you publish your channel, we would like to share a few words of
 caution:
@@ -5848,10 +5846,10 @@ process.
 
 @item
 Package modules and package definitions are Scheme code that uses
-various programming interfaces (APIs).  Those may occasionally change,
-in accordance with our deprecation policy (@pxref{Deprecation Policy}),
-and it is your responsibility as a channel author to adjust your code
-accordingly.
+various programming interfaces (APIs).  We, Guix developers, never
+change APIs gratuitously, but we do @emph{not} commit to freezing APIs
+either.  When you maintain package definitions outside Guix, we consider
+that @emph{the compatibility burden is on you}.
 
 @item
 Corollary: if you're using an external channel and that channel breaks, please
@@ -10491,29 +10489,6 @@ run SCons can be specified by selecting the appropriate SCons package
 with the @code{#:scons} parameter.
 @end defvar
 
-@defvar hare-build-system
-This variable is exported by @code{(guix build-system hare)}.  It implements the
-Makefile build process typically used by Hare packages, removing the
-@code{configure} phase used by @code{gnu-build-system} and modifying existing
-phases to set the Hare architecture tag, module path, and package install
-destinations appropriately.
-
-This relies on the package's Makefile supporting, at minimum, the variables
-@code{HAREFLAGS} and @code{THIRDPARTYDIR}.  Packages may set @code{make-flags}
-to override or supplement these variables.
-
-By default, Hare modules are installed to the @code{lib} output if it exists,
-and all other files to the @code{bin} output. If an output does not exist,
-the default @code{out} output is used instead. This behavior may be overriden
-through the @code{#:binary-output} and @code{#:module-output} keyword arguments.
-
-@code{(guix build-system hare)} also provides utility definitions for creating
-Hare packages.  The variable @code{%hare-supported-systems} is the list of build
-targets currently supported by @code{hare}, for use in @code{supported-systems}
-(@pxref{package Reference}).  The procedure @code{target->hare-arch} may be used
-to get the Hare architecture tag for a given (supported) Guix target or system.
-@end defvar
-
 @defvar haskell-build-system
 This variable is exported by @code{(guix build-system haskell)}.  It
 implements the Cabal build procedure used by Haskell packages, which
@@ -15825,49 +15800,6 @@ Note that changes made by the @code{arguments} rule do not entail a
 rebuild of the affected packages.  Furthermore, if a package definition
 happens to be using G-expressions already, @command{guix style} leaves
 it unchanged.
-
-@item git-source
-If the @code{home-page} is a Git repository (as per
-@code{git-repository-url?}), and the actual Git repository is tagged
-with @code{version} or @code{(string-append ``v'' version)}, change the
-package origin to the @code{git-fetch} method
-(@pxref{origin Reference}).  Consider this example:
-
-@lisp
-(define-public guile-json-4
-  (package
-    (inherit guile-json-3)
-    (name "guile-json")
-    (version "4.7.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/guile-json/guile-json-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "127k2xc07w1gnyqs40z4865l8p3ra5xgpcn569dz04lxsa709fiq"))))))
-@end lisp
-
-@noindent
-Running @command{guix style -S git-source} on this package would rewrite
-its @code{source} field like to:
-
-@lisp
-(define-public guile-json-4
-  (package
-    (inherit guile-json-3)
-    (name "guile-json")
-    (version "4.7.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference (url
-                                   "https://github.com/aconchillo/guile-json")
-                                  (commit version)))
-              (file-name (git-file-name name version))
-              (sha256 (base32
-                       "0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
-@end lisp
-
 @end table
 
 @item --list-stylings
@@ -18444,7 +18376,7 @@ bits), @code{no-atime} (do not update file access times),
 @code{no-diratime} (likewise for directories only),
 @code{strict-atime} (update file access time), @code{lazy-time} (only
 update time on the in-memory version of the file inode),
-@code{no-exec} (disallow program execution), @code{remount} (remount a mounted file system), and @code{shared} (make the
+@code{no-exec} (disallow program execution), and @code{shared} (make the
 mount shared).
 @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference
 Manual}, for more information on these flags.
@@ -24715,8 +24647,8 @@ To ensure that upgrades are actually happening, you can run
 the unattended upgrade log file (see below).
 
 @defvar unattended-upgrade-service-type
-This is the service type for unattended upgrades.  It sets up a Shepherd
-Timer (@pxref{Scheduled Job Execution}) that runs @command{guix system
+This is the service type for unattended upgrades.  It sets up an mcron
+job (@pxref{Scheduled Job Execution}) that runs @command{guix system
 reconfigure} from the latest version of the specified channels.
 
 Its value must be a @code{unattended-upgrade-configuration} record (see
@@ -27047,37 +26979,6 @@ The value for this service is a @code{<geoclue-configuration>} object.
 @c TODO: Document <geoclue-configuration>, preferably by refactoring this to use
 @c       define-configuration and generating documentation from it.
 
-@defvar iio-sensor-proxy-service-type
-Type for the service that runs
-@uref{https://gitlab.freedesktop.org/hadess/iio-sensor-proxy, IIO sensor
-proxy}, a daemon that proxies low-level sensor data from Industrial I/O
-(IIO) devices into a D-Bus interface.  It enables user-space
-applications, such as desktop environments like GNOME and KDE, and
-services like GeoClue, to access data from various sensors commonly
-found in devices like ultrabooks and 2-in-1s.  This allows for:
-
-@itemize @bullet
-@item
-Automatic screen rotation based on accelerometer data.
-@item
-Ambient brightness adjustment using light sensor data.
-@item
-Compass/direction information for location services (via GeoClue).
-@end itemize
-
-The value for this service is a @code{<iio-sensor-proxy-configuration>} object.
-@end defvar
-
-@deftp {Data Type} iio-sensor-proxy-configuration
-Data type representing the configuration for @code{iio-sensor-proxy-service-type}.
-
-@table @asis
-@item @code{iio-sensor-proxy} (default: @code{iio-sensor-proxy}) (type: file-like)
-Package object of iio-sensor-proxy.
-
-@end table
-@end deftp
-
 @defvar bluetooth-service-type
 This is the type for the @uref{https://bluez.org/, Linux Bluetooth Protocol
 Stack} (BlueZ) system, which generates the @file{/etc/bluetooth/main.conf}
@@ -38263,9 +38164,6 @@ as its configuration and access token.
 @item @code{run-directory} (default: @code{"/var/run/forgejo-runner"})
 Directory where @command{forgejo-runner} stores cached data.
 
-@item @code{log-file} (default: @code{"/var/log/forgejo-runner.log"})
-Name of the @command{forgejo-runner} log file.
-
 @end table
 @end deftp
 
@@ -42813,10 +42711,6 @@ The location of the repositories.  Note that only public repositories will
 be shown by Gitile.  To make a repository public, add an empty
 @file{git-daemon-export-ok} file at the root of that repository.
 
-@item @code{git-owner-validation?} (default: @code{#t})
-Whether to check for the service user's ownership of repositories.
-By default, Git will refuse to process a repository owned by another user.
-
 @item @code{base-git-url}
 The base git url that will be used to show clone commands.
 
@@ -43597,12 +43491,6 @@ The port to bind the server to.
 @item @code{host} (default: @code{"127.0.0.1"})
 The host to bind the server to.
 
-@item @code{control-port} (default: @code{8734})
-The port to bind the control server to.
-
-@item @code{control-host} (default: @code{"127.0.0.1"})
-The host to bind the control server to.
-
 @item @code{mirror} (default: @code{#f})
 Optional URL of the other Nar Herder instance which should be mirrored.
 This means that this Nar Herder instance will download it's database,
@@ -50424,8 +50312,6 @@ Extend home-shell-profile service only if you really know what you do.
 @subsubheading Bash Home Service
 
 @anchor{home-bash-configuration}
-@c %start of fragment
-
 @deftp {Data Type} home-bash-configuration
 Available @code{home-bash-configuration} fields are:
 
@@ -50440,19 +50326,13 @@ use Guix System, is it safe to set this to @code{#f}, as in this case
 this is already taken care of by the globally installed
 @file{/etc/bashrc}.
 
-@item @code{environment-variables} (default: @code{()}) (type: alist)
-Association list of environment variables to set for the Bash session.
-The rules for the @code{home-environment-variables-service-type} apply
-here (@pxref{Essential Home Services}).  The contents of this field will
-be added after the contents of the @code{bash-profile} field.
+@item @code{environment-variables} (default: @code{'()}) (type: alist)
+Association list of environment variables to set for the Bash session.  The
+rules for the @code{home-environment-variables-service-type} apply
+here (@pxref{Essential Home Services}).  The contents of this field will be
+added after the contents of the @code{bash-profile} field.
 
-@item @code{variables} (default: @code{()}) (type: alist)
-Bash variables (not to be confused with environment variables) to be set
-in @file{.bashrc} for use by interactive shells.  A typical example of
-such variables is @code{HISTSIZE} and related history variables
-(@pxref{Bash Variables,,, bash,Bash Reference Manual}).
-
-@item @code{aliases} (type: alist)
+@item @code{aliases} (default: @code{%default-bash-aliases}) (type: alist)
 Association list of aliases to set for the Bash session.  The aliases
 will be defined after the contents of the @code{bashrc} field has been
 put in the @file{.bashrc} file.  The alias will automatically be quoted,
@@ -50468,31 +50348,27 @@ turns into
 alias ls="ls -alF"
 @end example
 
-@item @code{bash-profile} (default: @code{()}) (type: text-config)
+@item @code{bash-profile} (default: @code{'()}) (type: text-config)
 List of file-like objects, which will be added to @file{.bash_profile}.
 Used for executing user's commands at start of login shell (In most
 cases the shell started on tty just after login).  @file{.bash_login}
 won't be ever read, because @file{.bash_profile} always present.
 
-@item @code{bashrc} (default: @code{()}) (type: text-config)
+@item @code{bashrc} (default: @code{'()}) (type: text-config)
 List of file-like objects, which will be added to @file{.bashrc}.  Used
 for executing user's commands at start of interactive shell (The shell
 for interactive usage started by typing @code{bash} or by terminal app
 or any other program).
 
-@item @code{bash-logout} (default: @code{()}) (type: text-config)
+@item @code{bash-logout} (default: @code{'()}) (type: text-config)
 List of file-like objects, which will be added to @file{.bash_logout}.
 Used for executing user's commands at the exit of login shell.  It won't
 be read in some cases (if the shell terminates by exec'ing another
 process for example).
 
 @end table
-
 @end deftp
 
-
-@c %end of fragment
-
 You can extend the Bash service by using the @code{home-bash-extension}
 configuration record, whose fields must mirror that of
 @code{home-bash-configuration} (@pxref{home-bash-configuration}).  The
@@ -50502,14 +50378,14 @@ Bash Reference Manual}.
 
 For example, here is how you would define a service that extends the
 Bash service such that @file{~/.bash_profile} defines an additional
-shell variable, @env{PS1}:
+environment variable, @env{PS1}:
 
 @lisp
 (define bash-fancy-prompt-service
   (simple-service 'bash-fancy-prompt
                   home-bash-service-type
                   (home-bash-extension
-                   (variables
+                   (environment-variables
                     '(("PS1" . "\\u \\wλ "))))))
 @end lisp
 
@@ -50517,43 +50393,34 @@ You would then add @code{bash-fancy-prompt-service} to the list in the
 @code{services} field of your @code{home-environment}.  The reference of
 @code{home-bash-extension} follows.
 
-@c %start of fragment
-
 @deftp {Data Type} home-bash-extension
 Available @code{home-bash-extension} fields are:
 
 @table @asis
-@item @code{environment-variables} (default: @code{()}) (type: alist)
-Additional environment variables to set.  These will be combined with
-the environment variables from other extensions and the base service to
-form one coherent block of environment variables.
+@item @code{environment-variables} (default: @code{'()}) (type: alist)
+Additional environment variables to set.  These will be combined with the
+environment variables from other extensions and the base service to form one
+coherent block of environment variables.
 
-@item @code{variables} (default: @code{()}) (type: alist)
-Extra Bash variables (not to be confused with environment variables) to
-be set in @file{.bashrc} for use by interactive shells.
-
-@item @code{aliases} (default: @code{()}) (type: alist)
+@item @code{aliases} (default: @code{'()}) (type: alist)
 Additional aliases to set.  These will be combined with the aliases from
 other extensions and the base service.
 
-@item @code{bash-profile} (default: @code{()}) (type: text-config)
-Additional text blocks to add to @file{.bash_profile}, which will be
-combined with text blocks from other extensions and the base service.
+@item @code{bash-profile} (default: @code{'()}) (type: text-config)
+Additional text blocks to add to @file{.bash_profile}, which will be combined
+with text blocks from other extensions and the base service.
 
-@item @code{bashrc} (default: @code{()}) (type: text-config)
+@item @code{bashrc} (default: @code{'()}) (type: text-config)
 Additional text blocks to add to @file{.bashrc}, which will be combined
 with text blocks from other extensions and the base service.
 
-@item @code{bash-logout} (default: @code{()}) (type: text-config)
-Additional text blocks to add to @file{.bash_logout}, which will be
-combined with text blocks from other extensions and the base service.
+@item @code{bash-logout} (default: @code{'()}) (type: text-config)
+Additional text blocks to add to @file{.bash_logout}, which will be combined
+with text blocks from other extensions and the base service.
 
 @end table
-
 @end deftp
 
-@c %end of fragment
-
 @subsubheading Zsh Home Service
 
 @deftp {Data Type} home-zsh-configuration

doc/he-config-bare-bones.scm

@@ -13,9 +13,8 @@
             (service home-bash-service-type
                      (home-bash-configuration
                       (guix-defaults? #t)
-                      (variables
-                       `(("HISTFILE" . "$XDG_CACHE_HOME/.bash_history")
-                         ("HISTSIZE" . "50000")))))
+                      (bash-profile (list (plain-file "bash-profile" "\
+export HISTFILE=$XDG_CACHE_HOME/.bash_history")))))
 
             (simple-service 'test-config
                             home-xdg-configuration-files-service-type

etc/committer.scm.in

@@ -283,20 +283,15 @@ corresponding to the top-level definition containing the staged changes."
   (define variable-name
     (second old))
   (define version
-    (match ((xpath:node-or
+    (and=> ((xpath:node-or
              (xpath:sxpath '(*any* *any* package version *any*))
              ;; For let binding
              (xpath:sxpath '(*any* *any* (*any*) package version *any*)))
             (cons '*TOP* new))
-      (() #f)
-      ((version . rest) version)))
-  (if version
-      (format port
-              "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
-              variable-name version file-name variable-name version)
-      (format port
-              "gnu: ~a: Update.~%~%* ~a (~a): Update.~%"
-              variable-name file-name variable-name))
+           first))
+  (format port
+          "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
+          variable-name version file-name variable-name version)
   (for-each (lambda (field)
               (let ((old-values (get-values old field))
                     (new-values (get-values new field)))

etc/teams.scm

@@ -326,12 +326,6 @@ PARAMETERS."
        "members" user)
   => 204)
 
-(define-forgejo-request (remove-team-member team user)
-  "Remove USER (a string) from TEAM, a Forgejo team."
-  (DELETE "teams" (number->string (forgejo-team-id team))
-          "members" user)
-  => 204)
-
 (define-forgejo-request (repository-teams owner repository)
   "Return the list of teams assigned to REPOSITORY of OWNER."
   (GET "repos" owner repository "teams"
@@ -378,8 +372,7 @@ PARAMETERS."
               to-add)
     (for-each (lambda (user)
                 (format log-port "removing '~a' from team '~a'~%"
-                        user (forgejo-team-name forgejo-team))
-                (remove-team-member token forgejo-team user))
+                        user (forgejo-team-name forgejo-team)))
               to-remove)))
 
 (define* (synchronize-team token team
@@ -705,10 +698,9 @@ the haskell-build-system."
 
 (define-team hpc
   (team 'hpc
-        #:name "High-performance computing team"
-        #:description "High-performance computing (HPC) related packages."
+        #:name "Hpc team"
+        #:description "High performance computing related packages."
         #:scope (list "gnu/packages/mpi.scm"
-                      "gnu/packages/oneapi.scm"
                       "gnu/packages/rocm.scm"
                       "gnu/packages/sycl.scm"
                       "gnu/packages/tbb.scm"
@@ -990,7 +982,6 @@ packages (e.g. Astronomy, Chemistry, Math, Physics etc.)"
                       "gnu/packages/openstack.scm"
                       "gnu/packages/prometheus.scm"
                       "gnu/packages/rdesktop.scm"
-                      "gnu/packages/samba.scm"
                       "gnu/packages/selinux.scm"
                       "gnu/packages/storage.scm"
                       "gnu/packages/task-runners.scm"
@@ -1155,8 +1146,7 @@ the \"texlive\" importer."
   ocaml)
 
 (define-member (person "Josselin Poiret"
-                       "dev@jpoiret.xyz"
-                       "jpoiret")
+                       "dev@jpoiret.xyz")
   installer)
 
 (define-member (person "("
@@ -1164,8 +1154,7 @@ the \"texlive\" importer."
   )
 
 (define-member (person "Simon Tournier"
-                       "zimon.toutoune@gmail.com"
-                       "zimoun")
+                       "zimon.toutoune@gmail.com")
   julia core mentors r)
 
 (define-member (person "宋文武"
@@ -1189,8 +1178,7 @@ the \"texlive\" importer."
   core documentation electronics gnome qt telephony)
 
 (define-member (person "Katherine Cox-Buday"
-                       "cox.katherine.e+guix@gmail.com"
-                       "katco")
+                       "cox.katherine.e+guix@gmail.com")
   emacs go lisp)
 
 (define-member (person "Munyoki Kilyungi"
@@ -1237,8 +1225,7 @@ the \"texlive\" importer."
   games)
 
 (define-member (person "Laurent Gatto"
-                       "laurent.gatto@gmail.com"
-                       "lgatto")
+                       "laurent.gatto@gmail.com")
   r)
 
 (define-member (person "Nicolas Goaziou"
@@ -1318,7 +1305,7 @@ the \"texlive\" importer."
 (define-member (person "Nicolas Graves"
                        "ngraves@ngraves.fr"
                        "nicolas-graves")
-  core javascript python ruby)
+  javascript python ruby)
 
 (define-member (person "Yelninei"
                        "yelninei@tutamail.com"
@@ -1355,11 +1342,6 @@ the \"texlive\" importer."
                        "daym")
   bootstrap hpc rust science)
 
-(define-member (person "Andy Tai"
-                       "atai@atai.org"
-                       "atai")
-  ai)
-
 
 (define (find-team name)
   (or (hash-ref %teams (string->symbol name))

etc/teams/r/r-manifest.scm

@@ -1,48 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Simon Tournier <zimon.toutoune@gmail.com>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(use-modules (guix packages)
-             (guix profiles)
-             (guix gexp)
-             (guix build-system)
-             (ice-9 match)
-             (srfi srfi-1)
-             (srfi srfi-26))
-
-(define* (has-r-build-system? build-system #:key modules #:allow-other-keys)
-  (or (eq? (build-system-name build-system) 'r)
-      (any
-       (match-lambda
-         (('guix 'build 'r-build-system) #t)
-         ('((guix build r-build-system) . _) #t)
-         (_ #f))
-       (cond
-        ((gexp? modules) (gexp->approximate-sexp modules))
-        ((pair? modules) modules)
-        (else '())))))
-
-(manifest
-  (map package->manifest-entry
-       (fold-packages
-        (lambda (package lst)
-          (if (apply has-r-build-system?
-                     (package-build-system package)
-                     (package-arguments package))
-              (cons package lst)
-              lst))
-        (list))))

gnu/bootloader/u-boot.scm

@@ -7,7 +7,6 @@
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2025 dan <i@dan.games>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,7 +46,6 @@
             u-boot-pine64-lts-bootloader
             u-boot-pinebook-bootloader
             u-boot-pinebook-pro-rk3399-bootloader
-            u-boot-nanopi-r4s-rk3399-bootloader
             u-boot-puma-rk3399-bootloader
             u-boot-rock-4c-plus-rk3399-bootloader
             u-boot-rock64-rk3328-bootloader
@@ -275,11 +273,6 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
    (inherit u-boot-rockchip-bootloader)
    (package u-boot-pinebook-pro-rk3399)))
 
-(define u-boot-nanopi-r4s-rk3399-bootloader
-  (bootloader
-   (inherit u-boot-rockchip-bootloader)
-   (package u-boot-nanopi-r4s-rk3399)))
-
 (define u-boot-ts7970-q-2g-1000mhz-c-bootloader
   ;; This bootloader doesn't really need to be installed, as it is read from
   ;; an SPI memory chip, not the SD card.  It is copied to /boot/u-boot.imx

gnu/build/file-systems.scm

@@ -1312,8 +1312,6 @@ corresponds to the symbols listed in FLAGS."
        (logior MS_STRICTATIME (loop rest)))
       (('lazy-time rest ...)
        (logior MS_LAZYTIME (loop rest)))
-      (('remount rest ...)
-       (logior MS_REMOUNT (loop rest)))
       (('shared rest ...)
        (loop rest))
       (()

gnu/build/linux-container.scm

@@ -190,10 +190,7 @@ for the process."
       (remount-read-only "/"))))
 
 (define* (initialize-user-namespace pid host-uids
-                                    #:key
-                                    (host-uid (getuid))
-                                    (host-gid (getgid))
-                                    (guest-uid 0) (guest-gid 0))
+                                    #:key (guest-uid 0) (guest-gid 0))
   "Configure the user namespace for PID.  HOST-UIDS specifies the number of
 host user identifiers to map into the user namespace.  GUEST-UID and GUEST-GID
 specify the first UID (respectively GID) that host UIDs (respectively GIDs)
@@ -204,21 +201,24 @@ map to in the namespace."
   (define (scope file)
     (string-append proc-dir file))
 
-  ;; Only root can write to the gid map without first disabling the
-  ;; setgroups syscall.
-  (unless (and (zero? host-uid) (zero? host-gid))
-    (call-with-output-file (scope "/setgroups")
-      (lambda (port)
-        (display "deny" port))))
+  (let ((uid (getuid))
+        (gid (getgid)))
 
-  ;; Map the user/group that created the container to the root user
-  ;; within the container.
-  (call-with-output-file (scope "/uid_map")
-    (lambda (port)
-      (format port "~d ~d ~d" guest-uid host-uid host-uids)))
-  (call-with-output-file (scope "/gid_map")
-    (lambda (port)
-      (format port "~d ~d ~d" guest-gid host-gid host-uids))))
+    ;; Only root can write to the gid map without first disabling the
+    ;; setgroups syscall.
+    (unless (and (zero? uid) (zero? gid))
+      (call-with-output-file (scope "/setgroups")
+        (lambda (port)
+          (display "deny" port))))
+
+    ;; Map the user/group that created the container to the root user
+    ;; within the container.
+    (call-with-output-file (scope "/uid_map")
+      (lambda (port)
+        (format port "~d ~d ~d" guest-uid uid host-uids)))
+    (call-with-output-file (scope "/gid_map")
+      (lambda (port)
+        (format port "~d ~d ~d" guest-gid gid host-uids)))))
 
 (define (namespaces->bit-mask namespaces)
   "Return the number suitable for the 'flags' argument of 'clone' that
@@ -239,14 +239,12 @@ corresponds to the symbols in NAMESPACES."
                         #:key (guest-uid 0) (guest-gid 0)
                         (populate-file-system (const #t))
                         (loopback-network? #t)
-                        (lock-mounts? #t)
                         writable-root?)
   "Run THUNK in a new container process and return its PID.  ROOT specifies
 the root directory for the container.  MOUNTS is a list of <file-system>
 objects that specify file systems to mount inside the container.  NAMESPACES
 is a list of symbols that correspond to the possible Linux namespaces: mnt,
-ipc, uts, user, and net.  When LOCK-MOUNTS? is true, arrange so that none of
-MOUNTS can be unmounted or remounted individually from within THUNK.
+ipc, uts, user, and net.
 
 When LOOPBACK-NETWORK? is true and 'net is amount NAMESPACES, set up the
 loopback device (\"lo\") and a minimal /etc/hosts.
@@ -263,93 +261,75 @@ that host UIDs (respectively GIDs) map to in the namespace."
   ;; child process blocks until the parent writes to it.
   (match (socketpair PF_UNIX (logior SOCK_CLOEXEC SOCK_STREAM) 0)
     ((child . parent)
-     (safe-clone
-      (namespaces->bit-mask namespaces)
-      (lambda ()
-        (call-with-clean-exit
-         (lambda ()
-           (close-port parent)
-           ;; Wait for parent to set things up.
-           (match (read child)
-             ('ready
-              (purify-environment)
-              (when (and (memq 'mnt namespaces)
-                         (not (string=? root "/")))
-                (catch #t
-                  (lambda ()
-                    (mount-file-systems root mounts
-                                        #:mount-/proc? (memq 'pid namespaces)
-                                        #:mount-/sys?  (memq 'net
-                                                             namespaces)
-                                        #:populate-file-system
-                                        (lambda ()
-                                          (populate-file-system)
-                                          (when (and (memq 'net namespaces)
-                                                     loopback-network?)
-                                            (set-network-interface-up "lo")
+     (let ((flags (namespaces->bit-mask namespaces)))
+       (match (clone flags)
+         (0
+          (call-with-clean-exit
+           (lambda ()
+             (close-port parent)
+             ;; Wait for parent to set things up.
+             (match (read child)
+               ('ready
+                (purify-environment)
+                (when (and (memq 'mnt namespaces)
+                           (not (string=? root "/")))
+                  (catch #t
+                    (lambda ()
+                      (mount-file-systems root mounts
+                                          #:mount-/proc? (memq 'pid namespaces)
+                                          #:mount-/sys?  (memq 'net
+                                                               namespaces)
+                                          #:populate-file-system
+                                          (lambda ()
+                                            (populate-file-system)
+                                            (when (and (memq 'net namespaces)
+                                                       loopback-network?)
+                                              (set-network-interface-up "lo")
 
-                                            ;; When isolated from the
-                                            ;; network, provide a minimal
-                                            ;; /etc/hosts to resolve
-                                            ;; "localhost".
-                                            (mkdir-p "/etc")
-                                            (call-with-output-file "/etc/hosts"
-                                              (lambda (port)
-                                                (display "127.0.0.1 localhost\n" port)
-                                                (chmod port #o444)))))
-                                        #:writable-root?
-                                        (or writable-root?
-                                            (not (memq 'mnt namespaces)))))
-                  (lambda args
-                    ;; Forward the exception to the parent process.
-                    ;; FIXME: SRFI-35 conditions and non-trivial objects
-                    ;; cannot be 'read' so they shouldn't be written as is.
-                    (write args child)
-                    (primitive-exit 3))))
+                                              ;; When isolated from the
+                                              ;; network, provide a minimal
+                                              ;; /etc/hosts to resolve
+                                              ;; "localhost".
+                                              (mkdir-p "/etc")
+                                              (call-with-output-file "/etc/hosts"
+                                                (lambda (port)
+                                                  (display "127.0.0.1 localhost\n" port)
+                                                  (chmod port #o444)))))
+                                          #:writable-root?
+                                          (or writable-root?
+                                              (not (memq 'mnt namespaces)))))
+                    (lambda args
+                      ;; Forward the exception to the parent process.
+                      ;; FIXME: SRFI-35 conditions and non-trivial objects
+                      ;; cannot be 'read' so they shouldn't be written as is.
+                      (write args child)
+                      (primitive-exit 3))))
+                ;; TODO: Manage capabilities.
+                (write 'ready child)
+                (close-port child)
+                (thunk))
+               (_                                 ;parent died or something
+                (primitive-exit 2))))))
+         (pid
+          (close-port child)
+          (when (memq 'user namespaces)
+            (initialize-user-namespace pid host-uids
+                                       #:guest-uid guest-uid
+                                       #:guest-gid guest-gid))
+          ;; TODO: Initialize cgroups.
+          (write 'ready parent)
+          (newline parent)
 
-              (when (and lock-mounts?
-                         (memq 'mnt namespaces)
-                         (memq 'user namespaces))
-                ;; Create a new mount namespace owned by a new user
-                ;; namespace to "lock" together previous mounts, such that
-                ;; they cannot be unmounted or remounted separately--see
-                ;; mount_namespaces(7).
-                (let ((uid (getuid)) (gid (getgid)))
-                  (unshare (logior CLONE_NEWUSER CLONE_NEWNS))
-                  (when (file-exists? "/proc/self")
-                    (initialize-user-namespace (getpid)
-                                               host-uids
-                                               #:host-uid uid
-                                               #:host-gid gid
-                                               #:guest-uid guest-uid
-                                               #:guest-gid guest-gid))))
-
-              ;; TODO: Manage capabilities.
-              (write 'ready child)
-              (close-port child)
-              (thunk))
-             (_                         ;parent died or something
-              (primitive-exit 2))))))
-      (lambda (pid)
-        (close-port child)
-        (when (memq 'user namespaces)
-          (initialize-user-namespace pid host-uids
-                                     #:guest-uid guest-uid
-                                     #:guest-gid guest-gid))
-        ;; TODO: Initialize cgroups.
-        (write 'ready parent)
-        (newline parent)
-
-        ;; Check whether the child process' setup phase succeeded.
-        (let ((message (read parent)))
-          (close-port parent)
-          (match message
-            ('ready                     ;success
-             pid)
-            (((? symbol? key) args ...) ;exception
-             (apply throw key args))
-            (_                          ;unexpected termination
-             #f))))))))
+          ;; Check whether the child process' setup phase succeeded.
+          (let ((message (read parent)))
+            (close-port parent)
+            (match message
+              ('ready                             ;success
+               pid)
+              (((? symbol? key) args ...)         ;exception
+               (apply throw key args))
+              (_                                  ;unexpected termination
+               #f)))))))))
 
 ;; FIXME: This is copied from (guix utils), which we cannot use because it
 ;; would pull (guix config) and all.
@@ -396,7 +376,6 @@ if there are no child processes left."
 
 (define* (call-with-container mounts thunk #:key (namespaces %namespaces)
                               (host-uids 1) (guest-uid 0) (guest-gid 0)
-                              (lock-mounts? #t)
                               (relayed-signals (list SIGINT SIGTERM))
                               (child-is-pid1? #t)
                               (populate-file-system (const #t))
@@ -481,7 +460,6 @@ load path must be adjusted as needed."
   (call-with-temporary-directory
    (lambda (root)
      (let ((pid (run-container root mounts namespaces host-uids thunk*
-                               #:lock-mounts? lock-mounts?
                                #:guest-uid guest-uid
                                #:guest-gid guest-gid
                                #:populate-file-system populate-file-system
@@ -502,35 +480,24 @@ return the exit status, an integer as returned by 'waitpid'."
     (0
      (call-with-clean-exit
       (lambda ()
-        ;; First, determine the user namespace that owns the pid namespace and
-        ;; join that user namespace (the assumption is that it also owns all
-        ;; the other namespaces).  It's important that the user namespace is
-        ;; joined first, so that the user will have the privileges to join the
-        ;; other namespaces.
-        (let* ((pid-ns (open-fdes (namespace-file pid "pid")
-                                  (logior O_CLOEXEC O_RDONLY)))
-               (user-ns (get-user-ns pid-ns)))
-          (close-fdes pid-ns)
-          (unless (equal? (stat user-ns)
-                          (stat (namespace-file (getpid) "user")))
-            (setns user-ns 0))
-          (close-fdes user-ns)
-
-          ;; Then join all the remaining namespaces.
-          (for-each (lambda (ns)
-                      (let ((source (namespace-file (getpid) ns))
-                            (target (namespace-file pid ns)))
-                        ;; Joining the namespace that the process already
-                        ;; belongs to would throw an error so avoid that.
-                        ;; XXX: This /proc interface leads to TOCTTOU.
-                        (unless (string=? (readlink source) (readlink target))
-                          (call-with-input-file target
-                            (lambda (new-ns-port)
-                              (setns (fileno new-ns-port) 0))))))
-                    ;; It's important that the mount namespace is joined last,
-                    ;; otherwise the /proc mount point would no longer be
-                    ;; accessible.
-                    '("ipc" "uts" "net" "pid" "mnt")))
+        (for-each (lambda (ns)
+                    (let ((source (namespace-file (getpid) ns))
+                          (target (namespace-file pid ns)))
+                      ;; Joining the namespace that the process already
+                      ;; belongs to would throw an error so avoid that.
+                      ;; XXX: This /proc interface leads to TOCTTOU.
+                      (unless (string=? (readlink source) (readlink target))
+                        (call-with-input-file source
+                          (lambda (current-ns-port)
+                            (call-with-input-file target
+                              (lambda (new-ns-port)
+                                (setns (fileno new-ns-port) 0))))))))
+                  ;; It's important that the user namespace is joined first,
+                  ;; so that the user will have the privileges to join the
+                  ;; other namespaces.  Furthermore, it's important that the
+                  ;; mount namespace is joined last, otherwise the /proc mount
+                  ;; point would no longer be accessible.
+                  '("user" "ipc" "uts" "net" "pid" "mnt"))
         (purify-environment)
         (chdir "/")
 

gnu/home/services.scm

@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2021-2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
-;;; Copyright © 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2023 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -58,7 +58,6 @@
 
             with-shell-quotation-bindings
             environment-variable-shell-definitions
-            shell-variable-definitions
             home-files-directory
             xdg-configuration-files-directory
             xdg-data-files-directory
@@ -242,27 +241,6 @@ ensures variable values are properly quoted."
                                   "\n")))
               variables))))
 
-(define (shell-variable-definitions variables)
-  "Return a gexp that evaluates to a list of POSIX shell statements defining
-VARIABLES, a list of variable name/value pairs, as shell variables (not
-environment variables).  The returned code ensures variable values are
-properly quoted."
-  (with-shell-quotation-bindings
-   #~(string-append
-      #$@(map (match-lambda
-                ((key . (or (? string? value)
-                            (? file-like? value)
-                            (? gexp? value)))
-                 #~(string-append #$key "="
-                                  (shell-double-quote #$value)
-                                  "\n"))
-                ((key . (? literal-string? value))
-                 #~(string-append #$key "="
-                                  (shell-single-quote
-                                   #$(literal-string-value value))
-                                  "\n")))
-              variables))))
-
 (define (environment-variables->setup-environment-script vars)
   "Return a file that can be sourced by a POSIX compliant shell which
 initializes the environment.  The file will source the home

gnu/home/services/shells.scm

@@ -2,7 +2,6 @@
 ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2025 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -122,9 +121,6 @@ service type can be extended with a list of file-like objects.")))
 (define (serialize-posix-env-vars field-name val)
   (environment-variable-shell-definitions val))
 
-(define (serialize-shell-variables field value)
-  (shell-variable-definitions value))
-
 
 ;;;
 ;;; Zsh.
@@ -351,13 +347,6 @@ rules for the @code{home-environment-variables-service-type} apply
 here (@pxref{Essential Home Services}).  The contents of this field will be
 added after the contents of the @code{bash-profile} field."
    (serializer serialize-posix-env-vars))
-  (variables
-   (alist '())
-   "Bash variables (not to be confused with environment variables) to be set
-in @file{.bashrc} for use by interactive shells.  A typical example of such
-variables is @code{HISTSIZE} and related history variables (@pxref{Bash
-Variables,,, bash, Bash Reference Manual})."
-   (serializer serialize-shell-variables))
   (aliases
    (alist %default-bash-aliases)
    "Association list of aliases to set for the Bash session.  The aliases will be
@@ -436,12 +425,10 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
 
      ,@(list (file-if-not-empty
               'bashrc
-              (let ((user-settings (list (serialize-field 'variables) "\n"
-                                         (serialize-field 'aliases))))
-                (if (home-bash-configuration-guix-defaults? config)
-                    (cons* (plain-file-content %default-bashrc) "\n"
-                           user-settings)
-                    user-settings)))
+              (if (home-bash-configuration-guix-defaults? config)
+                  (list (plain-file-content %default-bashrc) "\n"
+                        (serialize-field 'aliases))
+                  (list (serialize-field 'aliases))))
              (file-if-not-empty 'bash-logout)))))
 
 (define (add-bash-packages config)
@@ -453,10 +440,6 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi
    "Additional environment variables to set.  These will be combined with the
 environment variables from other extensions and the base service to form one
 coherent block of environment variables.")
-  (variables
-   (alist '())
-   "Extra Bash variables (not to be confused with environment variables) to be
-set in @file{.bashrc} for use by interactive shells.")
   (aliases
    (alist '())
    "Additional aliases to set.  These will be combined with the aliases from
@@ -476,17 +459,13 @@ with text blocks from other extensions and the base service."))
 
 (define (home-bash-extensions original-config extension-configs)
   (match-record original-config <home-bash-configuration>
-    (environment-variables variables aliases bash-profile bashrc bash-logout)
+    (environment-variables aliases bash-profile bashrc bash-logout)
     (home-bash-configuration
      (inherit original-config)
      (environment-variables
       (append environment-variables
               (append-map
                home-bash-extension-environment-variables extension-configs)))
-     (variables
-      (append variables
-              (append-map
-               home-bash-extension-variables extension-configs)))
      (aliases
       (append aliases
               (append-map

gnu/installer/newt/network.scm

@@ -112,35 +112,29 @@ network devices were found. Do you want to continue anyway?"))
              full-value
              (+ value 1)))))))
 
-(define (url-alive? url)
-  (false-if-exception
-   (begin
-     (http-request url)
-     #t)))
-
-(define (common-urls-alive? urls)
-  (dynamic-wind
-    (lambda ()
-      (sigaction SIGALRM
-        (lambda _ #f))
-      (alarm 3))
-    (lambda ()
-      (any url-alive?
-           urls))
-    (lambda ()
-      (alarm 0))))
-
 (define (wait-service-online)
   "Display a newt scale until connman detects an Internet access. Do
 FULL-VALUE tentatives, spaced by 1 second."
+  (define (url-alive? url)
+    (false-if-exception
+     (= (response-code (http-request url))
+        200)))
+
+  (define (ci-available?)
+    (dynamic-wind
+      (lambda ()
+        (sigaction SIGALRM
+          (lambda _ #f))
+        (alarm 3))
+      (lambda ()
+        (or (url-alive? "https://bordeaux.guix.gnu.org")
+            (url-alive? "https://ci.guix.gnu.org")))
+      (lambda ()
+        (alarm 0))))
+
   (define (online?)
     (or (and (connman-online?)
-             (common-urls-alive?
-              (list
-               "https://bordeaux.guix.gnu.org"
-               "https://ci.guix.gnu.org"
-               "https://guix.gnu.org"
-               "https://gnu.org")))
+             (ci-available?))
         (file-exists? "/tmp/installer-assume-online")))
 
   (let* ((full-value 5))
@@ -155,47 +149,11 @@ FULL-VALUE tentatives, spaced by 1 second."
            full-value
            (+ value 1))))
     (unless (online?)
-      (case (choice-window
-             (G_ "Internet access")
-             (G_ "Continue")
-             (G_ "Try again?")
-             (G_ "
-The selected network does not seem to provide access to the \
-Internet. The install process requires Internet access. \
-Do you want to continue anyway?"))
-        ((2) (abort-to-prompt 'installer-step 'abort))))))
-
-(define (check-substitute-availability)
-  "Check that at least one of the Guix substitute servers is available."
-  (define (substitutes-available?)
-    (or
-     (file-exists? "/tmp/installer-assume-online")
-     (common-urls-alive?
-      (list
-       "https://bordeaux.guix.gnu.org/nix-cache-info"
-       "https://ci.guix.gnu.org/nix-cache-info"))))
-
-  (let* ((full-value 5))
-    (run-scale-page
-     #:title (G_ "Checking substitutes")
-     #:info-text (G_ "Checking if Guix substitutes are available...")
-     #:scale-full-value full-value
-     #:scale-update-proc
-     (lambda (value)
-       (sleep 1)
-       (if (substitutes-available?)
-           full-value
-           (+ value 1))))
-    (unless (substitutes-available?)
-      (case (choice-window
-             (G_ "Substitute availability")
-             (G_ "Continue")
-             (G_ "Try again?")
-             (G_ "
-None of the Guix substitute servers are available.
-You can proceed with the install, but you will
-have to build most of the packages you install locally."))
-        ((2) (abort-to-prompt 'installer-step 'abort))))))
+      (run-error-page
+       (G_ "The selected network does not provide access to the \
+Internet and the Guix substitute server, please try again.")
+       (G_ "Connection error"))
+      (abort-to-prompt 'installer-step 'abort))))
 
 (define (run-network-page)
   "Run a page to allow the user to configure connman so that it can access the
@@ -234,11 +192,7 @@ Internet."
      (installer-step
       (id 'wait-online)
       (compute (lambda _
-                 (wait-service-online))))
-     (installer-step
-      (id 'check-substitutes)
-      (compute (lambda _
-                 (check-substitute-availability))))))
+                 (wait-service-online))))))
   (run-installer-steps
    #:steps network-steps
    #:rewind-strategy 'start))

gnu/installer/services.scm

@@ -5,8 +5,6 @@
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua>
-;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
-;;; Copyright © 2025 Fredrik Salomonsson <plattfot@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -82,9 +80,6 @@
      (desktop-environment
       (name "MATE")
       (snippet '((service mate-desktop-service-type))))
-     (desktop-environment
-      (name "KDE Plasma")
-      (snippet '((service plasma-desktop-service-type))))
      (desktop-environment
       (name "Icewm")
       (packages '((specification->package "icewm"))))
@@ -108,11 +103,6 @@
       (packages '((specification->package "emacs")
                   (specification->package "emacs-exwm")
                   (specification->package "emacs-desktop-environment"))))
-     (desktop-environment
-      (name "Sway")
-      (packages (map (lambda (package)
-                       `(specification->package ,package))
-                     '("sway" "wmenu" "foot"))))
 
      ;; Networking.
      (system-service
@@ -204,11 +194,8 @@
                        (if (target-hurd?)
                            '%base-services/hurd
                            '%base-services)))
-         (native-console-font (match (false-if-exception
-                                      (string-take (getenv "LANGUAGE") 2))
-                                ((or "el" ;easier with more complete Greek font
-                                     ;; These need Cyrillic:
-                                     "be" "bg" "kk" "ky"
+         (native-console-font (match (getenv "LANGUAGE")
+                                ((or "be" "bg" "el" "eo" "kk" "ky"
                                      "mk" "mn" "ru" "sr" "tg" "uk")
                                  "LatGrkCyr-8x16")
                                 (_ #f)))

gnu/local.mk

@@ -72,7 +72,6 @@
 # Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 # Copyright © 2024 James Smith <jsubuntuxp@disroot.org>
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
-# Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 #
 # This file is part of GNU Guix.
 #
@@ -299,8 +298,10 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/fortran-xyz.scm			\
   %D%/packages/freedesktop.scm			\
   %D%/packages/freeipmi.scm			\
+  %D%/packages/fsf.scm				\
   %D%/packages/ftp.scm				\
   %D%/packages/fribidi.scm			\
+  %D%/packages/fvwm.scm				\
   %D%/packages/gambas.scm			\
   %D%/packages/game-development.scm		\
   %D%/packages/games.scm			\
@@ -648,7 +649,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/storage.scm			\
   %D%/packages/suckless.scm			\
   %D%/packages/sugar.scm			\
-  %D%/packages/swift.scm			\
   %D%/packages/swig.scm				\
   %D%/packages/sycl.scm				\
   %D%/packages/sync.scm			\
@@ -683,7 +683,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/upnp.scm				\
   %D%/packages/usb-modeswitch.scm		\
   %D%/packages/uucp.scm				\
-  %D%/packages/oneapi.scm			\
   %D%/packages/valgrind.scm			\
   %D%/packages/version-control.scm		\
   %D%/packages/video.scm			\
@@ -1079,7 +1078,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/capnproto-fix-test.patch		\
   %D%/packages/patches/capstone-fix-python-constants.patch	\
   %D%/packages/patches/catdoc-CVE-2017-11110.patch		\
-  %D%/packages/patches/chez-irregex-import-cond-expand.patch	\
   %D%/packages/patches/chez-scheme-bin-sh.patch			\
   %D%/packages/patches/circos-remove-findbin.patch		\
   %D%/packages/patches/cdparanoia-fpic.patch			\
@@ -1103,7 +1101,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/clang-16-remove-crypt-interceptors.patch	\
   %D%/packages/patches/clang-17.0-libc-search-path.patch	\
   %D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch	\
-  %D%/packages/patches/clang-17.0-fix-build-with-gcc-14-on-arm.patch    \
   %D%/packages/patches/clang-18.0-libc-search-path.patch	\
   %D%/packages/patches/clang-runtime-esan-build-fixes.patch	\
   %D%/packages/patches/clang-runtime-12-remove-crypt-interceptors.patch \
@@ -1165,6 +1162,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-c++-gcc-compat.patch		\
   %D%/packages/patches/dbus-c++-threading-mutex.patch		\
+  %D%/packages/patches/dbxfs-remove-sentry-sdk.patch		\
   %D%/packages/patches/ddd-build.patch				\
   %D%/packages/patches/debops-setup-py-avoid-git.patch	\
   %D%/packages/patches/dee-vapi.patch			\
@@ -1281,7 +1279,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch	\
   %D%/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch	\
   %D%/packages/patches/ffmpeg-4-binutils-2.41.patch	\
-  %D%/packages/patches/fgallery-also-look-for-7z.patch		\
   %D%/packages/patches/fifengine-boost-compat.patch		\
   %D%/packages/patches/fifengine-python-3.9-compat.patch	\
   %D%/packages/patches/fifengine-swig-compat.patch		\
@@ -1308,8 +1305,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/fp16-system-libraries.patch		\
   %D%/packages/patches/fpc-reproducibility.patch		\
   %D%/packages/patches/fpc-glibc-2.34-compat.patch		\
-  %D%/packages/patches/fritzing-0.9.6-fix-types.patch		\
-  %D%/packages/patches/freedink-engine-fix-const-char.patch	\
   %D%/packages/patches/freedict-tools-fix-determinism.patch	\
   %D%/packages/patches/freedink-engine-fix-sdl-hints.patch	\
   %D%/packages/patches/freeimage-libtiff-compat.patch		\
@@ -1441,45 +1436,51 @@ dist_patch_DATA =						\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch	\
-  %D%/packages/patches/glibc-2.35-CVE-2023-4911.patch	\
-  %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch	\
-  %D%/packages/patches/glibc-2.37-versioned-locpath.patch	\
-  %D%/packages/patches/glibc-2.38-ldd-x86_64.patch		\
   %D%/packages/patches/glibc-2.39-git-updates.patch	\
   %D%/packages/patches/glibc-2.40-dl-cache.patch		\
-  %D%/packages/patches/glibc-2.41-bootstrap-system.patch	\
-  %D%/packages/patches/glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch	\
-  %D%/packages/patches/glibc-2.41-ldd-x86_64.patch		\
+  %D%/packages/patches/glibc-CVE-2019-7309.patch		\
+  %D%/packages/patches/glibc-CVE-2019-9169.patch		\
+  %D%/packages/patches/glibc-CVE-2019-19126.patch		\
+  %D%/packages/patches/glibc-2.35-CVE-2023-4911.patch	\
   %D%/packages/patches/glibc-allow-kernel-2.6.32.patch		\
-  %D%/packages/patches/glibc-boot-2.2.5.patch			\
   %D%/packages/patches/glibc-boot-2.16.0.patch			\
+  %D%/packages/patches/glibc-boot-2.2.5.patch			\
   %D%/packages/patches/glibc-bootstrap-system-2.2.5.patch 	\
   %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch 	\
   %D%/packages/patches/glibc-bootstrap-system.patch		\
+  %D%/packages/patches/glibc-2.41-bootstrap-system.patch	\
   %D%/packages/patches/glibc-cross-objcopy.patch		\
   %D%/packages/patches/glibc-cross-objdump.patch		\
   %D%/packages/patches/glibc-dl-cache.patch			\
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
   %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
+  %D%/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch	\
+  %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch	\
+  %D%/packages/patches/glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch	\
+  %D%/packages/patches/glibc-2.37-versioned-locpath.patch	\
+  %D%/packages/patches/glibc-2.38-ldd-x86_64.patch		\
+  %D%/packages/patches/glibc-2.41-ldd-x86_64.patch		\
   %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
   %D%/packages/patches/glibc-hurd-getauxval.patch		\
   %D%/packages/patches/glibc-hurd-gettyent.patch		\
   %D%/packages/patches/glibc-hurd-mach-print.patch		\
   %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch	\
-  %D%/packages/patches/glibc-hurd-signal-fpe-exception.patch 	\
   %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch	\
   %D%/packages/patches/glibc-hurd-2.41-pthread-once.patch	\
   %D%/packages/patches/glibc-hurd-2.41-pthread-sigmask.patch	\
   %D%/packages/patches/glibc-hurd-2.41-symlink.patch		\
-  %D%/packages/patches/glibc-hurd-xstate.patch  		\
   %D%/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch	\
   %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch	\
   %D%/packages/patches/glibc-ldd-powerpc.patch			\
   %D%/packages/patches/glibc-ldd-x86_64.patch			\
   %D%/packages/patches/glibc-locales.patch			\
+  %D%/packages/patches/glibc-locales-2.28.patch			\
   %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch	\
-  %D%/packages/patches/glibc-supported-locales.patch     	\
+  %D%/packages/patches/glibc-skip-c++.patch			\
   %D%/packages/patches/glibc-versioned-locpath.patch		\
+  %D%/packages/patches/glibc-2.29-git-updates.patch     	\
+  %D%/packages/patches/glibc-2.29-supported-locales.patch     	\
+  %D%/packages/patches/glibc-supported-locales.patch     	\
   %D%/packages/patches/gmime-disable-tests.patch		\
   %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
   %D%/packages/patches/gmp-faulty-test.patch			\
@@ -1493,7 +1494,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-session-support-elogind.patch	\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
   %D%/packages/patches/gnulib-bootstrap.patch			\
-  %D%/packages/patches/gnumach-div0.patch			\
   %D%/packages/patches/gnumach-version.patch			\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
@@ -1520,6 +1520,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/grantlee-register-metaenumvariable.patch	\
   %D%/packages/patches/grep-timing-sensitive-test.patch		\
   %D%/packages/patches/grfcodec-gcc-compat.patch		\
+  %D%/packages/patches/gromacs-tinyxml2.patch			\
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch	\
   %D%/packages/patches/grub-efi-fat-serial-number.patch		\
   %D%/packages/patches/grub-hurd64.patch			\
@@ -1582,15 +1583,16 @@ dist_patch_DATA =						\
   %D%/packages/patches/highlight-gui-data-dir.patch		\
   %D%/packages/patches/hplip-usb-timeout.patch			\
   %D%/packages/patches/http-parser-CVE-2020-8287.patch		\
+  %D%/packages/patches/htslib-for-stringtie.patch		\
   %D%/packages/patches/hubbub-sort-entities.patch		\
   %D%/packages/patches/hueplusplus-mbedtls.patch		\
   %D%/packages/patches/hugs-fix-build.patch			\
   %D%/packages/patches/hurd-refcounts-assert.patch		\
   %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
+  %D%/packages/patches/hurd-socket-activation.patch		\
   %D%/packages/patches/hurd-startup.patch			\
   %D%/packages/patches/hwloc-1-test-btrfs.patch			\
   %D%/packages/patches/i7z-gcc-10.patch				\
-  %D%/packages/patches/icecat-adjust-mozilla-desktop.patch      \
   %D%/packages/patches/icecat-makeicecat.patch			\
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
   %D%/packages/patches/icecat-compare-paths.patch		\
@@ -1838,7 +1840,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/maxima-defsystem-mkdir.patch		\
   %D%/packages/patches/maven-generate-component-xml.patch		\
   %D%/packages/patches/maven-generate-javax-inject-named.patch		\
-  %D%/packages/patches/mc2mt-add-packaging-support.patch	\
   %D%/packages/patches/mcrypt-CVE-2012-4409.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
@@ -1948,7 +1949,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ocaml-4.09-multiple-definitions.patch	\
   %D%/packages/patches/omake-fix-non-determinism.patch	\
   %D%/packages/patches/oneko-remove-nonfree-characters.patch	\
-  %D%/packages/patches/onetbb-other-arches.patch	\
   %D%/packages/patches/online-judge-tools.patch		\
   %D%/packages/patches/onnx-optimizer-system-library.patch	\
   %D%/packages/patches/onnx-1.13.1-use-system-googletest.patch	\
@@ -2005,10 +2005,14 @@ dist_patch_DATA =						\
   %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
   %D%/packages/patches/ots-no-include-missing-file.patch	\
   %D%/packages/patches/owncloud-disable-updatecheck.patch	\
+  %D%/packages/patches/p7zip-CVE-2016-9296.patch		\
+  %D%/packages/patches/p7zip-CVE-2017-17969.patch		\
   %D%/packages/patches/pnet-fix-line-number-info.patch		\
   %D%/packages/patches/pnet-fix-off-by-one.patch		\
   %D%/packages/patches/pnet-newer-libgc-fix.patch		\
   %D%/packages/patches/pnet-newer-texinfo-fix.patch		\
+  %D%/packages/patches/p7zip-fix-build-with-gcc-11.patch	\
+  %D%/packages/patches/p7zip-remove-unused-code.patch		\
   %D%/packages/patches/pam-krb5-CVE-2020-10595.patch		\
   %D%/packages/patches/pango-skip-libthai-test.patch		\
   %D%/packages/patches/password-store-tree-compat.patch		\
@@ -2049,7 +2053,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-random2-getrandbits-test.patch		\
   %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
   %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
-  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
   %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
   %D%/packages/patches/python-sip-include-dirs.patch	\
   %D%/packages/patches/python-scikit-build-setuptools-compat.patch	\
@@ -2077,7 +2080,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/smalltalk-multiplication-overflow.patch	\
   %D%/packages/patches/soci-mysql-ddl-types.patch		\
   %D%/packages/patches/sqlite-hurd.patch			\
-  %D%/packages/patches/squeak-vm-gcc-14-fix.patch		\
   %D%/packages/patches/stepmania-ffmpeg-compat.patch			\
   %D%/packages/patches/stk-5.0.1-fix-typo.patch			\
   %D%/packages/patches/strace-readlink-tests.patch		\
@@ -2158,6 +2160,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-3-reproducible-build.patch	\
   %D%/packages/patches/python-cross-compile.patch		\
   %D%/packages/patches/python-colour-remove-d2to1.patch		\
+  %D%/packages/patches/python-configobj-setuptools.patch	\
   %D%/packages/patches/python-debugpy-unbundle-pydevd.patch	\
   %D%/packages/patches/python-docopt-pytest6-compat.patch	\
   %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch	\
@@ -2177,7 +2180,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pytorch-fix-codegen.patch		\
   %D%/packages/patches/python-pytorch-for-r-torch-fix-codegen.patch \
   %D%/packages/patches/python-pytorch-for-r-torch-system-libraries.patch \
-  %D%/packages/patches/python-pytorch-for-r-torch-without-kineto.patch \
   %D%/packages/patches/python-pytorch-runpath.patch		\
   %D%/packages/patches/python-pytorch-system-libraries.patch	\
   %D%/packages/patches/python-pytorch-without-kineto.patch	\
@@ -2294,7 +2296,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/seq24-rename-mutex.patch			\
   %D%/packages/patches/libsequoia-fix-ffi-Makefile.patch	\
   %D%/packages/patches/libsequoia-remove-store.patch		\
-  %D%/packages/patches/shaderc-for-pcsx2-changes.patch		\
   %D%/packages/patches/shakespeare-spl-fix-grammar.patch		\
   %D%/packages/patches/shared-mime-info-xdgmime-path.patch	\
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
@@ -2324,13 +2325,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/superlu-dist-awpm-grid.patch		\
   %D%/packages/patches/superlu-dist-scotchmetis.patch		\
   %D%/packages/patches/supertux-unbundle-squirrel.patch		\
-  %D%/packages/patches/swift-5.7.3-sdk-path.patch			\
-  %D%/packages/patches/swift-5.7.3-sourcekit-rpath.patch		\
-  %D%/packages/patches/swift-6.2-cplus-include-path.patch		\
-  %D%/packages/patches/swift-6.2-exclude-scan-test.patch		\
-  %D%/packages/patches/swift-corelibs-libdispatch-5.6.3-lock-cpp.patch	\
-  %D%/packages/patches/swift-corelibs-libdispatch-5.7.3-modulemap.patch	\
-  %D%/packages/patches/swift-llvm-5.7.3-linux.patch	\
   %D%/packages/patches/swig-support-gcc-12.patch		\
   %D%/packages/patches/swish-e-search.patch			\
   %D%/packages/patches/swish-e-format-security.patch		\
@@ -2478,7 +2472,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/xfce4-settings-defaults.patch		\
   %D%/packages/patches/xgboost-use-system-dmlc-core.patch	\
   %D%/packages/patches/xiphos-glib.patch                        \
-  %D%/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch \
   %D%/packages/patches/xmonad-dynamic-linking.patch		\
   %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch		\
   %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch	\

gnu/packages/admin.scm

@@ -583,14 +583,14 @@ interface and is based on GNU Guile.")
 (define-public shepherd-1.0
   (package
     (inherit shepherd-0.10)
-    (version "1.0.8")
+    (version "1.0.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/shepherd/shepherd-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1xbzf7vmanb36hfb0kc9a240x7xnkynsfs6hcz2kj0xzf19h1srv"))))
+                "15vmfbnah4p978zs4j95fl7m3sy98z1brgyz2m8s30zfh5srnnij"))))
     (arguments
      (substitute-keyword-arguments (package-arguments shepherd-0.10)
        ((#:configure-flags flags #~'())
@@ -603,19 +603,10 @@ interface and is based on GNU Guile.")
                                "/bin/zstd")))))
     (native-inputs
      (modify-inputs (package-native-inputs shepherd-0.10)
-       (replace "guile-fibers"
-         ;; Work around <https://codeberg.org/guile/fibers/issues/89>.
-         ;; This affects any system without a functional real-time
-         ;; clock (RTC), but in practice these are typically
-         ;; single-board computers.
-         (if (or (target-arm?)
-                 (target-riscv64?))
-             guile-fibers-1.1
-             guile-fibers)))) ;use latest guile-fibers available
+       (replace "guile-fibers" guile-fibers))) ;use latest guile-fibers available
     (inputs
      (modify-inputs (package-inputs shepherd-0.10)
-       (replace "guile-fibers"
-                (this-package-native-input "guile-fibers"))
+       (replace "guile-fibers" guile-fibers) ;use latest guile-fibers available
        (append gzip zstd)))))
 
 (define-public shepherd shepherd-0.10)
@@ -3784,14 +3775,14 @@ rules is done with the @code{auditctl} utility.")
 (define-public nmap
   (package
     (name "nmap")
-    (version "7.98")
+    (version "7.97")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nmap.org/dist/nmap-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "1rlpv238ixcj62d740w8xghcfmkvmg9453kh46gmr7mfx89p716f"))
+                "1h252sz1cqr0r440s7pxn9wwn1jffbrdvacnvmbw4w664mwz565g"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -4668,7 +4659,7 @@ information tool.")
 (define-public fastfetch-minimal
   (package
     (name "fastfetch-minimal")
-    (version "2.54.0")
+    (version "2.53.0")
     (source
      (origin
        (method git-fetch)
@@ -4677,7 +4668,7 @@ information tool.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0iw58idc45x505rhix3mqymnfbk1r7jc10alyry9qypflalqwkqx"))
+        (base32 "0w260lscjy3rqahhr2637hb3fqsklv2qx59f2v66wy99nnmqvbha"))
        (modules '((guix build utils)))
        (snippet '(begin
                    (delete-file-recursively "src/3rdparty")))))
@@ -5152,7 +5143,7 @@ cache of unix and unix-like systems.")
 (define-public solaar
   (package
     (name "solaar")
-    (version "1.1.16")
+    (version "1.1.14")
     (source
      (origin
        (method git-fetch)
@@ -5161,7 +5152,7 @@ cache of unix and unix-like systems.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1q05pcrl1pr6ls92m5k690qrwqb4nz1lganxvbj9b40w3c6nh5iy"))))
+        (base32 "000700waw4z6ab40naycapjgqz8yvz9ny1px94ni4pwf8f3kh0vh"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest
@@ -5398,7 +5389,7 @@ elogind's uaccess feature.")
 (define-public jc
   (package
     (name "jc")
-    (version "1.25.6")
+    (version "1.25.5")
     (source
      (origin
        ;; The PyPI tarball lacks the test suite.
@@ -5408,7 +5399,7 @@ elogind's uaccess feature.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0bpna1hfwigv9r3i1xafl96jlj4335hrjq5rkrgh2nzc57453bly"))))
+        (base32 "16agzk47f1g72gni3lazqlcv7fs0nb2dwbagv6kxjbk36pm3mzmn"))))
     (build-system pyproject-build-system)
     (arguments
      (list #:phases
@@ -5578,14 +5569,14 @@ Netgear devices.")
 (define-public atop
   (package
     (name "atop")
-    (version "2.12.1")
+    (version "2.12.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.atoptool.nl/download/atop-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1xhjpmaans63g0y4z9gzff09fxxf9sgmj64ycc2r9y7sbmyfdnsg"))))
+                "11ih6kan3j9kg83pjhy9yffgpr638b0mfg1fq90yzrhl1k4yq28d"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/algebra.scm

@@ -14,7 +14,6 @@
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020, 2021, 2023, 2024, 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org>
-;;; Copyright © 2022 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -46,7 +45,6 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
-  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages curl)
@@ -239,7 +237,7 @@ the real span of the lattice.")
     (inputs
      (list fplll gmp mpfr pari-gp))
     (propagated-inputs
-     (list python-cysignals python-cython python-flake8 python-numpy))
+     (list python-cysignals python-cython-3 python-flake8 python-numpy))
     (home-page "https://github.com/fplll/fpylll")
     (synopsis "Python interface for fplll")
     (description "fpylll is a Python wrapper for fplll.")
@@ -552,7 +550,7 @@ fast arithmetic.")
     (native-inputs
      (list meson-python
            pkg-config
-           python-cython
+           python-cython-3
            python-pytest))
     (inputs
      (list gmp
@@ -1055,34 +1053,6 @@ Optional thin wrappers allow usage of the library from other languages.")
     (license (list license:expat        ;SymEngine
                    license:bsd-3))))    ;3rd party code
 
-(define-public python-symengine
-  (package
-    (name "python-symengine")
-    (version "0.14.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "symengine" version))
-       (sha256
-        (base32 "1w7hwavbxgikljy9m3p89k3x2zdhv81h9bh330aw4wb3qm74p7jf"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags #~(list "--pyargs" "symengine")))
-    (native-inputs
-     (list cmake-minimal
-           python-cython
-           python-pytest
-           python-setuptools))
-    (inputs
-     (list symengine))
-    (home-page "https://github.com/symengine/symengine.py")
-    (synopsis "Python library providing wrappers to SymEngine")
-    (description
-     "This library provides a Python wrapper to SymEngine, a fast C++ symbolic
-manipulation library.")
-    (license license:expat)))
-
 (define-public ginac
   (package
     (name "ginac")

gnu/packages/android.scm

@@ -53,9 +53,7 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang-xyz)
-  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pcre)
@@ -1117,30 +1115,36 @@ safest way, on a file image.")
 (define-public python-androguard
   (package
     (name "python-androguard")
-    (version "3.3.5")    ;TODO: It was released in 2019, there is a fresh version
+    (version "3.2.1")
     (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "androguard" version))
-       (sha256
-        (base32 "18nd08rbvc4d1p9r70qp76rcbldvpv89prsi15alrmxdlnimqrgh"))))
-    (build-system pyproject-build-system)
-    ;; XXX: The pypi release doesn't have the tests, but the tests use
-    ;; packaged binaries, so we skip them.
+      (origin
+        ;; The pypi release doesn't have the tests, but the tests use
+        ;; packaged binaries, so we skip them.
+        (method url-fetch)
+        (uri (pypi-uri "androguard" version))
+        (sha256
+         (base32
+          "0ndsw00pkyda4i2s3wi5ap8gbk6a9d23xhhxpdbk02padv8sxkfv"))))
+    (build-system python-build-system)
     (arguments
-     (list #:tests? #f))
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           ;; Adapted from .travis.yml
+           (lambda _
+             (invoke "nosetests" "--with-coverage" "--with-timer"
+                     "--timer-top-n" "50"))))))
     (native-inputs
-     (list python-setuptools))
+     (list python-codecov python-coverage python-mock python-nose
+           python-nose-timer))
     (propagated-inputs
      (list python-asn1crypto
-           python-click
            python-colorama
            python-future
            python-ipython
            python-lxml
            python-matplotlib
            python-networkx
-           python-pydot
            python-pygments
            python-pyperclip))
     (home-page "https://github.com/androguard/androguard")
@@ -1192,49 +1196,49 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
 (define-public fdroidserver
   (package
     (name "fdroidserver")
-    (version "2.4.2")
+    (version "1.1.9")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fdroidserver" version))
        (sha256
         (base32
-         "06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
-    (build-system pyproject-build-system)
+         "0m07f791z45w7r2dzx4yb6s54b3c3wykm3w9hn25p2jcyax082a2"))))
+    (build-system python-build-system)
     (arguments
-     (list
-      #:tests? #f                       ;requires Android SDK
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'set-env
-            (lambda _
-              (setenv "HOME" "/tmp"))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-versioning
+           (lambda _
+             (substitute* "setup.py"
+               (("0.2.1") ,(package-version python-pyasn1-modules))
+               ;; The dependency on docker has been removed upstream by
+               ;; a fairly large patch:
+               ;; https://gitlab.com/fdroid/fdroidserver/-/commit/89614851250c79a05db84070feca6dea033af334
+               ;; that is not in a release yet. It appears we can compile with
+               ;; a newer version.
+               (("docker-py >= 1.9, < 2.0") "docker >= 1.9"))
+             #t)))))
     (propagated-inputs
      (list python-androguard
            python-apache-libcloud
-           python-argcomplete
-           python-asn1crypto
            python-clint
            python-defusedxml
            python-docker
            python-gitpython
            python-mwclient
-           python-oscrypto
            python-paramiko
            python-pillow
-           python-platformdirs
-           python-puremagic
            python-pyasn1
            python-pyasn1-modules
            python-pyyaml
            python-qrcode
+           python-ruamel.yaml
            python-requests
-           python-ruamel.yaml-0.16
-           python-vagrant
-           python-yamllint
-           sdkmanager))
+           python-vagrant))
     (native-inputs
-     (list python-babel python-setuptools))
+     (list python-babel python-bcrypt python-docker-pycreds python-pynacl
+           python-websocket-client))
     (home-page "https://f-droid.org")
     (synopsis "F-Droid server tools")
     (description

gnu/packages/arcan.scm

@@ -84,69 +84,70 @@
                    (delete-file-recursively "external/sqlite")))))
     (build-system cmake-build-system)
     (arguments
-     (list
-      #:configure-flags
-      #~'("-DBUILD_PRESET=everything" "-DDISTR_TAG='Guix'")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-paths
-            (lambda _
-              (substitute* "src/platform/posix/paths.c"
-                (("/usr/local") #$output))))
-          ;; Normally, it tries to fetch patched openal with git
-          ;; but copying files manually in the right place seems
-          ;; to work too.
-          (add-after 'unpack 'prepare-static-openal
-            (lambda* (#:key inputs #:allow-other-keys)
-              (copy-recursively #$(this-package-input "arcan-openal-checkout")
-                                "external/git/openal")))
-          (add-after 'prepare-static-openal 'generate-man
-            (lambda _
-              (with-directory-excursion "doc"
-                (invoke "ruby" "docgen.rb" "mangen"))))
-          (add-before 'configure 'chdir
-            (lambda _
-              (chdir "src"))))
+     (list #:configure-flags #~'("-DBUILD_PRESET=everything"
+                                 "-DDISTR_TAG='Guix'")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'patch-paths
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (substitute* "src/platform/posix/paths.c"
+                              (("/usr/local")
+                               (assoc-ref outputs "out")))))
+                        ;; Normally, it tries to fetch patched openal with git
+                        ;; but copying files manually in the right place seems
+                        ;; to work too.
+                        (add-after 'unpack 'prepare-static-openal
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            (let ((arcan-openal (assoc-ref inputs
+                                                           "arcan-openal")))
+                              (copy-recursively arcan-openal
+                                                "external/git/openal")) #t))
+                        (add-after 'prepare-static-openal 'generate-man
+                          (lambda _
+                            (with-directory-excursion "doc"
+                              (invoke "ruby" "docgen.rb" "mangen")) #t))
+                        (add-before 'configure 'chdir
+                          (lambda _
+                            (chdir "src") #t)))
            #:tests? #f))
-    (inputs
-     (list bash-minimal
-           espeak
-           ffmpeg-6
-           freetype
-           gumbo-parser
-           harfbuzz
-           jbig2dec
-           leptonica
-           libdrm
-           libjpeg-turbo
-           libseccomp
-           libusb
-           libvnc
-           libxkbcommon
-           luajit
-           mupdf
-           openal
-           openjpeg
-           sdl2
-           sqlite
-           tesseract-ocr
-           vlc
-           wayland
-           wayland-protocols
-           xcb-util
-           xcb-util-wm
-           zlib
-           ;; To build arcan_lwa, we need a patched version of openal.
-           ;; https://github.com/letoram/arcan/wiki/packaging
-           (origin
-             (method git-fetch)
-             (file-name "arcan-openal-checkout")
-             (uri (git-reference (url
-                                  "https://github.com/letoram/openal")
-                                 (commit "0.6.2")))
-             (sha256
-              (base32
-               "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))
+    (inputs `(("bash-minimal" ,bash-minimal)
+              ("espeak" ,espeak)
+              ("ffmpeg" ,ffmpeg)
+              ("freetype" ,freetype)
+              ("gumbo-parser" ,gumbo-parser)
+              ("harfbuzz" ,harfbuzz)
+              ("jbig2dec" ,jbig2dec)
+              ("leptonica" ,leptonica)
+              ("libdrm" ,libdrm)
+              ("libjpeg-turbo" ,libjpeg-turbo)
+              ("libseccomp" ,libseccomp)
+              ("libusb" ,libusb)
+              ("libvnc" ,libvnc)
+              ("libxkbcommon" ,libxkbcommon)
+              ("luajit" ,luajit)
+              ("mupdf" ,mupdf)
+              ("openal" ,openal)
+              ("openjpeg" ,openjpeg)
+              ("sdl2" ,sdl2)
+              ("sqlite" ,sqlite)
+              ("tesseract-ocr" ,tesseract-ocr)
+              ("vlc" ,vlc)
+              ("wayland" ,wayland)
+              ("wayland-protocols" ,wayland-protocols)
+              ("xcb-util" ,xcb-util)
+              ("xcb-util-wm" ,xcb-util-wm)
+              ("zlib" ,zlib)
+              ;; To build arcan_lwa, we need a patched version of openal.
+              ;; https://github.com/letoram/arcan/wiki/packaging
+              ("arcan-openal"
+               ,(origin
+                  (method git-fetch)
+                  (file-name "arcan-openal-0.6.2")
+                  (uri (git-reference (url
+                                       "https://github.com/letoram/openal")
+                                      (commit "0.6.2")))
+                  (sha256
+                   (base32
+                    "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z"))))))
     (native-inputs (list pkg-config ruby)) ;For documentation and testing
     (home-page "https://arcan-fe.com")
     (synopsis "Display server, multimedia framework and game engine")
@@ -315,5 +316,5 @@ as a window under Arcan.")
     (license (list license:bsd-3 license:expat))))
 
 ;; Package was merged into arcan in upstream.
-(define-deprecated-package arcan-wayland
-  arcan)
+(define-public arcan-wayland
+  (deprecated-package "arcan-wayland" arcan))

gnu/packages/audio.scm

@@ -57,7 +57,6 @@
 ;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
-;;; Copyright © 2025 Isidor Zeuner <guix@quidecco.pl>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4277,14 +4276,14 @@ different audio devices such as ALSA or PulseAudio.")
 (define-public qjackctl
   (package
     (name "qjackctl")
-    (version "1.0.4")
+    (version "1.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
                                   version "/qjackctl-" version ".tar.gz"))
               (sha256
                (base32
-                "1bhlfnlvqgircnlq014whaka01ki6ja44xzynjbwszclknc6zsz3"))))
+                "0wzimnxb9yjj155l0hqb57smf0158a4bbzi6bj11pp60njld4zqn"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f))                    ; no check target
@@ -4378,7 +4377,6 @@ link REQUIRED)"))))))
        "ide"))                          ;qt ide
     (arguments
      (list
-      #:qtbase qtbase
       #:configure-flags
       #~(list "-DSYSTEM_BOOST=ON"
               "-DSYSTEM_YAMLCPP=ON"
@@ -5625,42 +5623,6 @@ encoder used for an MPEG Layer III (MP3) file, as well as scan any MPEG audio
 file (any layer) and print a lot of useful information.")
     (license license:lgpl2.1+)))
 
-(define-public mp3cat
-  (package
-    (name "mp3cat")
-    (version "0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/tomclegg/mp3cat")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ;upstream defines no tests
-      #:make-flags
-      #~(list (string-append "PREFIX="
-                             #$output))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (add-before 'build 'patch-makefile
-            (lambda _args
-              (substitute* "Makefile"
-                (("cc")
-                 #$(cc-for-target))))))))
-    (home-page "http://tomclegg.net/mp3cat")
-    (synopsis "MP3 stream copier and concatenator")
-    (description
-     "Copies a stream, skipping everything except MP3 frames with valid
-headers.  This can be used to copy and concatenate streams, even if
-they contain extra garbage.")
-    (license license:gpl2+)))
-
 (define-public shntool
   (package
     (name "shntool")
@@ -6358,16 +6320,16 @@ library supports sample rates up to 96 kHz and up to eight channels (7.1
 (define-public libfreeaptx
   (package
     (name "libfreeaptx")
-    (version "0.2.2")
+    (version "0.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/regularhunter/libfreeaptx")
+                    (url "https://github.com/iamthehorker/libfreeaptx")
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0xk247w2l7jd51rbavqnmqk6sqnifhf46k4wwfj572pz7k9cbmly"))))
+                "1fm5041nd08yzg0m9474g0943lb3x54zmn59b53nhvxan8x22ibq"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f ;no tests.
@@ -6379,8 +6341,8 @@ library supports sample rates up to 96 kHz and up to eight channels (7.1
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure))))
-    (home-page "https://github.com/regularhunter/libfreeaptx")
-    (synopsis "Free implementation of aptX")
+    (home-page "https://github.com/iamthehorker/libfreeaptx")
+    (synopsis "aptX codec library")
     (description "libfreeaptx is an implementation of the Audio Processing
 Technology codecs aptX and aptX HD, mainly intended for use with an A2DP
 bluetooth profile.")
@@ -7238,13 +7200,17 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
     (native-inputs
      (list catch-framework
            python ;for running tests
-           portaudio)) ;for portaudio examples
+           portaudio ;for portaudio examples
+           qtbase-5 ;for Qt examples
+           qtdeclarative-5
+           qttools-5))
     (inputs
-     (list jack-1)) ;for JACK examples
+     (list jack-1 ;for JACK examples
+           qtquickcontrols-5)) ;for Qt examples
     (propagated-inputs
      ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp
      ;; contains '#include <asio.hpp>'.
-     (list asio-1.28))
+     (list asio))
     (arguments
      `(#:configure-flags
        '("-DLINK_BUILD_QT_EXAMPLES=ON"
@@ -7623,7 +7589,7 @@ and DSD streams.")
 (define-public qpwgraph
   (package
     (name "qpwgraph")
-    (version "0.9.6")
+    (version "0.8.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -7632,7 +7598,7 @@ and DSD streams.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "17f84qp0vphw0qbgi4yzvws19cw1lppn5r35niy032gw8qr7l6nf"))))
+                "036qzc2sjxa1lvysf7shyjkp1jyjkpalgxf74bgyzm89phqac7cc"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f))                ; no tests

gnu/packages/axoloti.scm

@@ -662,5 +662,5 @@ with some layout changes and added features.
 
 This package provides the patcher application.")))
 
-(define-deprecated-package axoloti-patcher-next
-  ksoloti-patcher)
+(define-public axoloti-patcher-next
+  (deprecated-package "axoloti-patcher-next" ksoloti-patcher))

gnu/packages/base.scm

@@ -133,6 +133,15 @@ command-line arguments, multiple languages, and so on.")
    (inputs (list pcre2))
    (arguments
     (list #:configure-flags #~(list "--enable-perl-regexp")
+
+          ;; XXX: On 32-bit Hurd platforms, 'time_t' is defined as a 32-bit
+          ;; integer in 'hurd_types.defs', so this Gnulib test always fails.
+          #:make-flags
+          #~#$(if (and (not (%current-target-system))
+                       (string=? (%current-system) "i586-gnu"))
+                  #~'("XFAIL_TESTS=test-year2038")
+                  #~'())
+
           #:phases
           #~(modify-phases %standard-phases
               (add-after 'install 'fix-egrep-and-fgrep
@@ -152,17 +161,6 @@ command-line arguments, multiple languages, and so on.")
                             (substitute* "lib/sigsegv.in.h"
                               (("__GNU__") "__XGNU__")))))
                      #~())
-              ;; XXX: On 32-bit Hurd platforms, 'time_t' is defined as a 32-bit
-              ;; integer in 'hurd_types.defs', so this Gnulib test always fails.
-              ;; Use a phase instead of XFAIL_TESTS to not override
-              ;; xfailing tests in grep
-              #$@(if (target-hurd32?)
-                     #~((add-after 'unpack 'skip-year2038-test
-                          (lambda _
-                            (substitute* "gnulib-tests/test-year2038.c"
-                              (("(^| )main *\\(.*" all)
-                               (string-append all "{\n  return 77;//"))))))
-                     #~())
               #$@(if (system-hurd?)
                      #~((add-before 'check 'skip-test
                           (lambda _
@@ -271,7 +269,8 @@ implementation offers several extensions over the standard utility.")
            '(#:make-flags (list "TESTSUITEFLAGS= -k '!tricky time stamps'")))
           (else '()))
       ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
-      ,@(if (target-hurd32?)
+      ,@(if (and (target-hurd?)
+                 (not (target-64bit?)))
             (list #:configure-flags ''("--disable-year2038"))
             '())
       #:phases (modify-phases %standard-phases
@@ -347,7 +346,7 @@ differences.")
     (arguments
      (substitute-keyword-arguments (package-arguments patch/pinned)
        ((#:configure-flags flags #~'())
-        (if (target-hurd32?)
+        (if (and (target-hurd?) (not (target-64bit?)))
             #~(cons* "--disable-year2038"
                      #$flags)
             flags))))
@@ -371,7 +370,7 @@ differences.")
      ;; integer in 'hurd_types.defs', so this Gnulib test always fails.
      #:make-flags
      #~#$(cond ((and (not (%current-target-system))
-                     (target-hurd32?))
+                     (string=? (%current-system) "i586-gnu"))
                 #~'("XFAIL_TESTS=test-year2038"))
                ;; TODO: Figure out why these gnulib tests are failing.
                ((and (not (%current-target-system))
@@ -429,7 +428,8 @@ interactive means to merge two files.")
    (arguments
     `(#:configure-flags (list
                          ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
-                         ,@(if (target-hurd32?)
+                         ,@(if (and (target-hurd?)
+                                    (not (target-64bit?)))
                                '("--disable-year2038")
                                '())
                          ;; Tell 'updatedb' to write to /var.
@@ -527,7 +527,6 @@ used to apply commands with arbitrarily long arguments.")
                                    ;; These tests error
                                    "tests/dd/nocache.sh"
                                    ;; These tests fail
-                                   "tests/cp/parent-perm-race.sh"
                                    "tests/cp/sparse.sh"
                                    "tests/cp/special-f.sh"
                                    "tests/dd/bytes.sh"
@@ -1355,6 +1354,145 @@ with the Linux kernel.")
            ;; This phase fails trying to create /etc/ld.so.cache
            (delete 'install-utf8-c-locale)))))))
 
+(define-public glibc-2.32
+  (package
+    (inherit glibc-2.35)
+    (version "2.32")
+    (source (origin
+              (inherit (package-source glibc))
+              (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"))
+              (patches (search-patches
+                        "glibc-skip-c++.patch"
+                        "glibc-ldd-powerpc.patch"
+                        "glibc-ldd-x86_64.patch"
+                        "glibc-dl-cache.patch"
+                        "glibc-hidden-visibility-ldconfig.patch"
+                        "glibc-versioned-locpath.patch"
+                        "glibc-allow-kernel-2.6.32.patch"
+                        "glibc-reinstate-prlimit64-fallback.patch"
+                        "glibc-supported-locales.patch"
+                        "glibc-hurd-clock_t_centiseconds.patch"
+                        "glibc-2.31-hurd-clock_gettime_monotonic.patch"
+                        "glibc-hurd-signal-sa-siginfo.patch"
+                        "glibc-hurd-mach-print.patch"
+                        "glibc-hurd-gettyent.patch"))
+              #;
+              (patches (search-patches "glibc-ldd-x86_64.patch"
+                                       "glibc-hidden-visibility-ldconfig.patch"
+                                       "glibc-versioned-locpath.patch"
+                                       "glibc-allow-kernel-2.6.32.patch"
+                                       "glibc-reinstate-prlimit64-fallback.patch"
+                                       "glibc-supported-locales.patch"
+                                       "glibc-hurd-clock_t_centiseconds.patch"
+                                       "glibc-hurd-clock_gettime_monotonic.patch"
+                                       "glibc-hurd-signal-sa-siginfo.patch"))))
+
+    (arguments
+     (substitute-keyword-arguments (package-arguments glibc)
+       ((#:make-flags flags '())
+        ;; Arrange so that /etc/rpc & co. go to $out/etc.
+        `(list (string-append "sysconfdir="
+                              (assoc-ref %outputs "out")
+                              "/etc")))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'set-etc-rpc-installation-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; Install the rpc data base file under `$out/etc/rpc'.
+               (let ((out (assoc-ref outputs "out")))
+                 (substitute* "sunrpc/Makefile"
+                   (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
+                    (string-append out "/etc/rpc" suffix "\n"))
+                   (("^install-others =.*$")
+                    (string-append "install-others = " out "/etc/rpc\n"))))))))))))
+
+(define-public glibc-2.31
+  (package
+    (inherit glibc-2.35)
+    (version "2.31")
+    (source (origin
+              (inherit (package-source glibc))
+              (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+              (sha256
+               (base32
+                "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj"))
+              (patches (search-patches
+                        "glibc-skip-c++.patch"
+                        "glibc-ldd-powerpc.patch"
+                        "glibc-ldd-x86_64.patch"
+                        "glibc-dl-cache.patch"
+                        "glibc-hidden-visibility-ldconfig.patch"
+                        "glibc-versioned-locpath.patch"
+                        "glibc-allow-kernel-2.6.32.patch"
+                        "glibc-reinstate-prlimit64-fallback.patch"
+                        "glibc-supported-locales.patch"
+                        "glibc-hurd-clock_t_centiseconds.patch"
+                        "glibc-2.31-hurd-clock_gettime_monotonic.patch"
+                        "glibc-hurd-signal-sa-siginfo.patch"
+                        "glibc-hurd-mach-print.patch"
+                        "glibc-hurd-gettyent.patch"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments glibc)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'set-etc-rpc-installation-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; Install the rpc data base file under `$out/etc/rpc'.
+               (let ((out (assoc-ref outputs "out")))
+                 (substitute* "sunrpc/Makefile"
+                   (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
+                    (string-append out "/etc/rpc" suffix "\n"))
+                   (("^install-others =.*$")
+                    (string-append "install-others = " out "/etc/rpc\n"))))))))))))
+
+(define-public glibc-2.30
+  (package
+    (inherit glibc-2.31)
+    (version "2.30")
+    (native-inputs
+     ;; This fails with a build error in libc-tls.c when using GCC 10.  Use an
+     ;; older compiler.
+     (modify-inputs (package-native-inputs glibc)
+       (prepend gcc-8)))
+    (source (origin
+              (inherit (package-source glibc))
+              (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72"))
+              (patches (search-patches "glibc-skip-c++.patch"
+                                       "glibc-ldd-x86_64.patch"
+                                       "glibc-CVE-2019-19126.patch"
+                                       "glibc-hidden-visibility-ldconfig.patch"
+                                       "glibc-versioned-locpath.patch"
+                                       "glibc-allow-kernel-2.6.32.patch"
+                                       "glibc-reinstate-prlimit64-fallback.patch"
+                                       "glibc-2.29-supported-locales.patch"))))))
+
+(define-public glibc-2.29
+  (package
+    (inherit glibc-2.30)
+    (version "2.29")
+    (source (origin
+              (inherit (package-source glibc))
+              (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk"))
+              (patches (search-patches "glibc-skip-c++.patch"
+                                       "glibc-ldd-x86_64.patch"
+                                       "glibc-CVE-2019-7309.patch"
+                                       "glibc-CVE-2019-9169.patch"
+                                       "glibc-2.29-git-updates.patch"
+                                       "glibc-hidden-visibility-ldconfig.patch"
+                                       "glibc-versioned-locpath.patch"
+                                       "glibc-allow-kernel-2.6.32.patch"
+                                       "glibc-reinstate-prlimit64-fallback.patch"
+                                       "glibc-2.29-supported-locales.patch"))))))
+
 (define-public (make-gcc-libc base-gcc libc)
   "Return a GCC that targets LIBC."
   (package (inherit base-gcc)
@@ -1375,7 +1513,14 @@ with the Linux kernel.")
     (inherit glibc)
     (name "glibc-locales")
     (source (origin (inherit (package-source glibc))
-                    (patches (cons (search-patch "glibc-locales.patch")
+                    ;; The patch for glibc 2.28 and earlier replaces the same
+                    ;; content, but the context in the patch is different
+                    ;; enough to fail to merge.
+                    (patches (cons (search-patch
+                                    (if (version>=? (package-version glibc)
+                                                    "2.29")
+                                        "glibc-locales.patch"
+                                        "glibc-locales-2.28.patch"))
                                    (origin-patches (package-source glibc))))))
     (synopsis "All the locales supported by the GNU C Library")
     (description
@@ -1529,6 +1674,21 @@ test environments.")
 (define-public glibc-locales-2.33
   (package (inherit (make-glibc-locales glibc-2.33))
            (name "glibc-locales-2.33")))
+(define-public glibc-locales-2.32
+  (package (inherit (make-glibc-locales glibc-2.32))
+           (name "glibc-locales-2.32")))
+(define-public glibc-locales-2.31
+  (package (inherit (make-glibc-locales glibc-2.31))
+           (name "glibc-locales-2.31")))
+(define-public glibc-locales-2.30
+  (package (inherit (make-glibc-locales glibc-2.30))
+           (name "glibc-locales-2.30")))
+(define-public glibc-locales-2.29
+  (package (inherit (make-glibc-locales glibc-2.29))
+           (name "glibc-locales-2.29")))
+(define-public glibc-utf8-locales-2.29
+  (package (inherit (make-glibc-utf8-locales glibc-2.29))
+           (name "glibc-utf8-locales-2.29")))
 
 (define-public which
   (package
@@ -1550,18 +1710,7 @@ variety of options.  It is an alternative to the shell \"type\" built-in
 command.")
     (license gpl3+))) ; some files are under GPLv2+
 
-(define-public glibc/hurd
-  (hidden-package
-   (package/inherit glibc
-     (source
-      (origin
-        (inherit (package-source glibc))
-        (patches
-         (append (map search-patch
-                      (delete "glibc-hurd64-intr-msg-clobber.patch" %glibc-patches))
-                 (search-patches
-		  "glibc-hurd-signal-fpe-exception.patch"
-		  "glibc-hurd-xstate.patch"))))))))
+(define-public glibc/hurd glibc)
 
 (define-public glibc/hurd-headers
   (package/inherit glibc/hurd

gnu/packages/benchmark.scm

@@ -13,7 +13,6 @@
 ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,7 +47,6 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages c)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -266,17 +264,17 @@ tests.")
 (define-public bonnie++
   (package
     (name "bonnie++")
-    (version "2.00a")
+    (version "1.98")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.coker.com.au/bonnie++/bonnie++-"
                                   version ".tgz"))
               (sha256
                (base32
-                "03lg8rz2a9wgwn9axd6gkjiswgxmp62fbxjvrrcvazmwh6ykplx8"))))
+                "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list gcc-10 perl))
+     (list perl))
     (arguments '(#:tests? #f)) ; there are no tests
     (home-page "https://doc.coker.com.au/projects/bonnie/")
     (synopsis "Hard drive and file system benchmark suite")
@@ -904,31 +902,3 @@ user-provided Lua scripts.
 aspects of Vulkan performance.  The way in which each scene is rendered is
 configurable through a set of options.")
       (license license:lgpl2.1+))))
-
-(define-public osu-micro-benchmarks
-  (package
-    (name "osu-micro-benchmarks")
-    (version "7.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://mvapich.cse.ohio-state.edu/download/mvapich/" name "-"
-             version ".tar.gz"))
-       (sha256
-        (base32 "08ifql3q8kv22xncvp6asfqp62dvfnc7w96b1r925c1w7ig0s38n"))))
-    (build-system gnu-build-system)
-    (inputs (list openmpi))
-    (arguments
-     (list
-      #:configure-flags
-      #~(list (string-append
-               "CC=" #$(this-package-input "openmpi") "/bin/mpicc")
-              (string-append
-               "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
-    (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
-    (synopsis "Benchmarking suite from the MVAPICH project")
-    (description
-     "Microbenchmarks suite to evaluate MPI and PGAS (OpenSHMEM, UPC, and
-UPC++) libraries for CPUs and GPUs.")
-    (license license:bsd-3)))

gnu/packages/bioconductor.scm

@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2019-2023, 2025 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2019, 2020, 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com>
 ;;; Copyright © 2020-2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -4992,23 +4992,6 @@ create an alternative mapping from sequences.")
                (base32
                 "0zx0brvcyi9id7xli9h5nk9an7j46p7zgjj3qmwr3jm4b95qahpl"))))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* '("src/densities.cpp"
-                             "src/loghmm.cpp"
-                             "src/scalehmm.cpp"
-                             "src/utility.cpp")
-                (("Calloc\\(") "R_Calloc(")
-                (("Free\\(") "R_Free(")))))))
     (native-inputs
      (list r-bsgenome-hsapiens-ucsc-hg19 r-knitr r-testthat))
     (propagated-inputs
@@ -10207,22 +10190,6 @@ at @url{https://github.com/kharchenkolab/hahmmr/}.")
                 "1jm0ia06ls1m7dsbzp1hk68qi5wbqzhcf6x66534bj1kxdll17k7"))))
     (properties `((upstream-name . "Harshlight")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-c-standard
-            (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CFLAGS=-g -O2"
-                              " -std=gnu11"))))))))))
     (propagated-inputs
      (list r-affy
            r-altcdfenvs
@@ -11838,12 +11805,6 @@ specific parser.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'skip-bad-tests
-           (lambda _
-             ;; These tests need Internet access to load XML schemas.
-             (with-directory-excursion "inst/unitTests/"
-               (delete-file "test_isolationWindow.R")
-               (delete-file "test_mzid.R"))))
          (add-after 'unpack 'use-system-boost
            (lambda _
              (substitute* "src/Makevars"
@@ -15430,10 +15391,7 @@ posterior for individual coefficients.")
           r-rsamtools
           r-rtracklayer
           r-summarizedexperiment))
-   (native-inputs (list r-biocgenerics
-                        r-biocstyle
-                        r-bsgenome-hsapiens-ucsc-hg19
-                        r-runit))
+   (native-inputs (list r-biocgenerics r-bsgenome-hsapiens-ucsc-hg19 r-runit))
    (home-page "https://bioconductor.org/packages/GreyListChIP")
    (synopsis "Greylist artefact regions based on ChIP inputs")
    (description "This package identifies regions of ChIP experiments with high
@@ -17442,7 +17400,7 @@ to install interface to SYMPHONY.")
     (propagated-inputs
      (list r-biocgenerics r-fdrtool r-lpsymphony r-slam))
     (native-inputs
-     (list r-knitr r-ggplot2 r-testthat r-scales))
+     (list r-knitr r-testthat))
     (home-page "https://bioconductor.org/packages/IHW")
     (synopsis "Independent hypothesis weighting")
     (description
@@ -19964,9 +19922,7 @@ footprints.")
            r-rcpp
            r-vioplot))
     (native-inputs
-     (list r-knitr
-           r-homo-sapiens
-           r-testthat))
+     (list r-knitr r-testthat))
     (home-page "https://bioconductor.org/packages/GOfuncR/")
     (synopsis "Gene ontology enrichment using FUNC")
     (description
@@ -20391,22 +20347,6 @@ gene-specific binding is expected.")
         (base32
          "04a11dsqd5y4b39nny94acnh0qhdazjc6d1803izza4vrgmw2csb"))))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-gcc-14-strictness
-            (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CFLAGS=-g -O2"
-                              " -Wno-error=incompatible-pointer-types\n"))))))))))
     (propagated-inputs
      (list r-affy r-biobase r-biocgenerics r-gcrma r-genefilter))
     (home-page "https://bioconductor.org/packages/simpleaffy/")
@@ -21034,7 +20974,7 @@ Gaussian distributions.")
                (add-after 'unpack 'patch-sources
                  (lambda _
                    (setenv "POPCNT_CAPABILITY" "0")))))))
-    (inputs (list zlib))
+    (inputs (list))
     (native-inputs
      (list r-knitr r-testthat))
     (home-page "https://bioconductor.org/packages/Rbowtie/")
@@ -25537,19 +25477,7 @@ decompression of raw bead-level data from the Illumina BeadArray platform.")
              (delete-file "tests/testthat/test_Axt.R")
              (substitute* "tests/testthat/test_CNE.R"
                ((".*test_CNE.*" m)
-                (string-append m "skip('guix')\n")))))
-         (add-before 'install 'fix-gcc-14-strictness
-           (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CFLAGS=-g -O2"
-                              " -std=gnu11 \n"))))))))))
+                (string-append m "skip('guix')\n"))))))))
     (build-system r-build-system)
     (inputs (list zlib))
     (propagated-inputs
@@ -27006,23 +26934,6 @@ the earlier snpMatrix package, allowing for uncertainty in genotypes.")
          "071aipwk1awr71hvzflps49dzp83p12zm1pbyx4l8d2v3wbj0dlz"))))
     (properties `((upstream-name . "chromstaR")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* '("src/densities.cpp"
-                             "src/scalehmm.cpp"
-                             "src/utility.cpp")
-                (("Calloc\\(") "R_Calloc(")
-                (("Free\\(") "R_Free(")
-                (("Realloc\\(") "R_Realloc(")))))))
     (propagated-inputs
      (list r-bamsignals
            r-biocgenerics
@@ -28266,16 +28177,6 @@ visualizing bisulfite sequencing data.")
                 "0lxva0lvh3xcpkrjalkg2ps8jlzaypnsy3ibd9mk4lnjpbn5hiii"))))
     (properties `((upstream-name . "dada2")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-gcc-14-strictness
-            (lambda _
-              (substitute* "src/Makevars"
-                (("CXX_STD = CXX11")
-                 "CXX_STD = CXX11
-PKG_CXXFLAGS=-g -O2 -Wno-error=changes-meaning")))))))
     (propagated-inputs
      (list r-biocgenerics
            r-biostrings

gnu/packages/bittorrent.scm

@@ -224,19 +224,18 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
 (define-public libtorrent
   (package
     (name "libtorrent")
-    (version "0.16.1")
+    (version "0.13.8")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/rakshasa/libtorrent/")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append
+                    "http://rtorrent.net/downloads/libtorrent-"
+                    version ".tar.gz"))
               (sha256
                (base32
-                "1rk5y27r2v3x2v1gngxfw8kj1i8n93dpkvda6idbid6yxvv9slkm"))))
+                "10z9i1rc41cmmi7nx8k7k1agsx6afv09g9cl7g9zr35fyhl5l4gd"))))
     (build-system gnu-build-system)
-    (inputs (list curl openssl zlib))
-    (native-inputs (list autoconf automake cppunit libtool pkg-config))
+    (inputs (list openssl zlib))
+    (native-inputs (list pkg-config cppunit))
     (synopsis "BitTorrent library of rtorrent")
     (description
      "LibTorrent is a BitTorrent library used by and developed in parallel
@@ -248,16 +247,15 @@ speed and efficiency.")
 (define-public rtorrent
   (package
     (name "rtorrent")
-    (version "0.16.1")
+    (version "0.9.8")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/rakshasa/rtorrent/")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append
+                    "http://rtorrent.net/downloads/rtorrent-"
+                    version ".tar.gz"))
               (sha256
                (base32
-                "0azpqclksczh1j7kpkwqh68xp3p9rayf9dym1c2iif56fm960mgh"))))
+                "1bs2fnf4q7mlhkhzp3i1v052v9xn8qa7g845pk9ia8hlpw207pwy"))))
     (build-system gnu-build-system)
     (inputs (list libtorrent
                   ncurses
@@ -265,7 +263,7 @@ speed and efficiency.")
                   cyrus-sasl
                   openssl
                   zlib))
-    (native-inputs (list autoconf automake cppunit libtool pkg-config))
+    (native-inputs (list pkg-config cppunit))
     (synopsis "BitTorrent client with ncurses interface")
     (description
      "rTorrent is a BitTorrent client with an ncurses interface.  It supports
@@ -566,8 +564,8 @@ features.")
        (modify-inputs (package-inputs base)
          (delete "qtsvg"))))))
 
-(define-deprecated-package qbittorrent-nox
-  qbittorrent-no-x)
+(define-public qbittorrent-nox
+  (deprecated-package "qbittorrent-nox" qbittorrent-no-x))
 
 (define-public qbittorrent-enhanced
   (package
@@ -604,8 +602,8 @@ the following features:
     (arguments (package-arguments qbittorrent-no-x))
     (inputs (package-inputs qbittorrent-no-x))))
 
-(define-deprecated-package qbittorrent-enhanced-nox
-  qbittorrent-enhanced-no-x)
+(define-public qbittorrent-enhanced-nox
+  (deprecated-package "qbittorrent-enhanced-nox" qbittorrent-enhanced-no-x))
 
 (define-public deluge
   (package

gnu/packages/books.scm

@@ -1,17 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
-;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2023 宋文武 <iyzsong@envs.net>
-;;; Copyright © 2023-2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2025 Gabriel Santos <gabrielsantosdesouza@disroot.org>
-;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,9 +21,7 @@
 (define-module (gnu packages books)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
-  #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
@@ -62,105 +50,11 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages tex)
-  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
 
-(define-public book-faif
-  (package
-    (name "book-faif")
-    (version "2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://www.fsf.org/faif/faif-" version
-                                  ".tar.bz2"))
-              (sha256
-               (base32
-                "0qf14d0n6k1dn9z0fdnx9qkhn4iq685xd443w7l7w54bm931p7dw"))))
-    (build-system copy-build-system)
-    (native-inputs
-     (list (texlive-local-tree
-            (list texlive-caption
-                  texlive-endnotes
-                  texlive-etoolbox
-                  texlive-fncychap
-                  texlive-helvetic
-                  texlive-times
-                  texlive-ucs))))
-    (arguments
-     (list
-      #:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'writable-texmfvar
-            ;; Generating font shapes require a writable TEXMFVAR directory.
-            (lambda _ (setenv "TEXMFVAR" "/tmp")))
-          (add-before 'install 'build
-            (lambda _
-              (invoke "pdflatex" "faif-2.0.tex"))))))
-    (home-page "https://www.fsf.org/faif")
-    (synopsis "Free as in Freedom (2.0)")
-    (description
-     "In 2002, Sam Williams wrote Free as in Freedom, a biography of Richard
-M. Stallman.  In its epilogue, Williams expressed hope that choosing to
-distribute his book under the GNU Free Documentation License would enable and
-encourage others to share corrections and their own perspectives through
-modifications to his work.  Free as in Freedom (2.0) is Stallman's revision of
-the original biography.  While preserving Williams's viewpoint, it includes
-factual corrections and extensive new commentary by Stallman, as well as new
-prefaces by both authors written for the occasion.  It is a rare kind of
-biography, where the reader has the benefit of both the biographer's original
-words and the subject's response.")
-    (license license:fdl1.3+)))
-
-(define-public book-sicp
-  (let ((commit "bda03f79d6e2e8899ac2b5ca6a3732210e290a79")
-        (revision "3"))
-    (package
-      (name "book-sicp")
-      (version (git-version "20180718" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/sarabander/sicp")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "0mng7qrj2dvssyffr9ycnf4a5k0kadp4dslq7mc5bhzq1qxyjs2w"))
-                (file-name (git-file-name name version))))
-      (build-system copy-build-system)
-      (native-inputs (list gzip texinfo))
-      (arguments
-       (list #:install-plan ''(("html" "share/doc/sicp/")
-                               ("sicp.info" "share/info/"))
-             #:phases #~(modify-phases %standard-phases
-                          (add-after 'unpack 'remove-obsolete-commands
-                            (lambda _
-                              ;; Reported upstream:
-                              ;; https://github.com/sarabander/sicp/issues/46.
-                              (substitute* "sicp-pocket.texi"
-                                (("@setshortcontentsaftertitlepage")
-                                 ""))))
-                          (add-before 'install 'build
-                            (lambda _
-                              (invoke "makeinfo" "--no-split"
-                                      "--output=sicp.info"
-                                      "sicp-pocket.texi"))))))
-      (home-page "https://sarabander.github.io/sicp")
-      (synopsis "Structure and Interpretation of Computer Programs")
-      (description "Structure and Interpretation of Computer Programs (SICP) is
-a textbook aiming to teach the principles of computer programming.
-
-Using Scheme, a dialect of the Lisp programming language, the book explains
-core computer science concepts such as abstraction in programming,
-metalinguistic abstraction, recursion, interpreters, and modular programming.")
-      (license license:cc-by-sa4.0))))
-
-;; It may be removed after 2025-12-19.
-(define-deprecated/public-alias sicp book-sicp)
-
 (define-public book-sparc
   (package
     (name "book-sparc")

gnu/packages/boost.scm

@@ -226,8 +226,8 @@ across a broad spectrum of applications.")
                (base32
                 "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))))))
 
-(define-deprecated-package boost-with-python3
-  boost)
+(define-public boost-with-python3
+  (deprecated-package "boost-with-python3" boost))
 
 (define-public boost-static
   (package

gnu/packages/bootloaders.scm

@@ -23,7 +23,6 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Esther Flashner <esther@flashner.co.il>
 ;;; Copyright © 2025 André Batista <nandre@riseup.net>
-;;; Copyright © 2025 dan <i@dan.games>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -928,16 +927,12 @@ Info manual.")))
     (inherit u-boot)
     (name "u-boot-tools")
     (native-inputs
-     (if (string-match "^x86_64-linux" (%current-system))
-         (modify-inputs (package-native-inputs u-boot)
-                          (prepend python-filelock
-                                   python-pycryptodomex
-                                   python-coverage
-                                   python-pytest
-                                   python-pytest-xdist))
-           (modify-inputs (package-native-inputs u-boot)
-                          (prepend python-filelock
-                                   python-pycryptodomex))))
+     (modify-inputs (package-native-inputs u-boot)
+       (prepend python-coverage
+                python-filelock
+                python-pycryptodomex
+                python-pytest
+                python-pytest-xdist)))
     (arguments
      `(#:make-flags '("HOSTCC=gcc")
        #:test-target "tcheck"
@@ -1038,7 +1033,9 @@ CONFIG_TOOLS_KWBIMAGE=n")
                (invoke "test/image/test-imagetools.sh"))))
          ;; Only run full test suite on x86_64 systems, as many tests
          ;; assume x86_64.
-         ,@(if (string-match "^x86_64-linux" (%current-system))
+         ,@(if (string-match "^x86_64-linux"
+                             (or (%current-target-system)
+                                 (%current-system)))
                '((add-after 'check 'check-x86
                    (lambda* (#:key make-flags test-target tests? #:allow-other-keys)
                      (when tests?
@@ -1551,9 +1548,6 @@ Documentation} for more information (for example by running @samp{info
 (define-public u-boot-pinebook-pro-rk3399
   (make-u-boot-rockchip-package "pinebook-pro" 'rk3399))
 
-(define-public u-boot-nanopi-r4s-rk3399
-  (make-u-boot-rockchip-package "nanopi-r4s" 'rk3399))
-
 (define*-public (make-u-boot-bin-package u-boot-package
                                          #:key
                                          (u-boot-bin "u-boot.bin"))

gnu/packages/browser-extensions.scm

@@ -193,15 +193,15 @@ ungoogled-chromium.")
 (define-public passff-host
   (package
     (name "passff-host")
-    (version "1.2.5")
-    (home-page "https://codeberg.org/PassFF/passff-host")
+    (version "1.2.4")
+    (home-page "https://github.com/passff/passff-host")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url home-page) (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "01kw5w6ihm4d6l5va7c0mb7539rnmqfn16c9w543xf5s0n5f2i7h"))))
+                "1lcwa1qzfxlifmj33qndp1wgi6yx6vj21ir0az79vhm5k03p961z"))))
     (build-system copy-build-system)
     (arguments
      (let ((native-manifests "lib/icecat/native-messaging-hosts"))
@@ -231,15 +231,15 @@ properly.")
 (define passff
   (package
     (name "passff")
-    (version "1.23")
-    (home-page "https://codeberg.org/passff/passff")
+    (version "1.16")
+    (home-page "https://github.com/passff/passff")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url home-page) (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0y6ji3mqmp9dadj1rm712n1bjpl021a4yssv7m1ydllmw10gs009"))))
+                "0y3cbgy89lgvq6lfabp7mi1zhphdvihcccn3yw5mmaql9yrdm5kc"))))
     (propagated-inputs (list passff-host))
     (build-system copy-build-system)
     (properties '((addon-id . "passff@invicem.pro")))
@@ -328,7 +328,7 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
 (define noscript
   (package
     (name "noscript")
-    (version "13.2.1")
+    (version "13.0.9")
     (source (origin
               (method url-fetch/zipbomb)
               (uri (string-append
@@ -336,7 +336,7 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
                     ".xpi"))
               (sha256
                (base32
-                "16p63kg7zwnfss9sb3j2kn9m7dx9prh09h4vbz3b0pg5s7rrf0hr"))))
+                "1xbisx3xqak9aj7nb2lh94an6yfldsl6a2g2qc87vxi1zwdbcnjj"))))
     (build-system copy-build-system)
     (properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
     (arguments

gnu/packages/build-tools.scm

@@ -371,7 +371,7 @@ resembles Python.")
      (list meson
            ninja/pinned
            python-colorama
-           python-cython
+           python-cython-3
            python-pyproject-metadata
            python-tomli
            python-typing-extensions
@@ -381,7 +381,7 @@ resembles Python.")
            git-minimal/pinned
            patchelf
            pkg-config
-           python-cython
+           python-cython-3
            python-gitpython
            python-pytest
            python-pytest-cov
@@ -1298,5 +1298,5 @@ The Waf Book and in the API docs
 
 ;; waf is the final program no need to prefix it with "python-", the same way
 ;; as meson or ninja which are written in Python as well.
-(define-deprecated-package python-waf
-  waf)
+(define-public python-waf
+  (deprecated-package "python-waf" waf))

gnu/packages/c.scm

@@ -14,7 +14,7 @@
 ;;; Copyright © 2021 David Dashyan <mail@davie.li>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org>
-;;; Copyright © 2022, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2022 ( <paren@disroot.org>
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
@@ -149,8 +149,8 @@ slicing.")
      (license license:boost1.0))))
 
 (define-public cproc
-  (let ((commit "14a8916e23bc6daebcb54f1384fa0eb2455072e3")
-        (revision "3"))
+  (let ((commit "70fe9ef1810cc6c05bde9eb0970363c35fa7e802")
+        (revision "2"))
     (package
       (name "cproc")
       (version (git-version "0.0" revision commit))
@@ -162,7 +162,7 @@ slicing.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1yrs1ccsjypfsjsmxxjspaggn0bjwifs2slalnpvsrgzxw5559bx"))
+          (base32 "1qmgzll7z7mn587azkj4cizyyd8ii6iznfxpc66ja08140sbn9yx"))
          (patches (search-patches "cproc-extra-linkflags.patch"))))
       (build-system gnu-build-system)
       (arguments
@@ -958,17 +958,17 @@ replacement for the syslog() call, but retains its ease of use.")
 (define-public liblognorm
   (package
     (name "liblognorm")
-    (version "2.0.7")
+    (version "2.0.6")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rsyslog/liblognorm")
+             (url "https://github.com/rsyslog/liblognorm.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1syh3lx58q6izzgmpq8pj4j5aw6qr5nzplnmk42f2alrw38sprd5"))))
+         "1pyy1swvq6jj12aqma42jimv71z8m66zy6ydd5v19cp2azm4krml"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/check.scm

@@ -1100,21 +1100,6 @@ generation.")
        (sha256
         (base32 "1zn701fgmbk29y45p49sajaswm01i2bv89ds2kkbiq8i0p2cr08w"))))))
 
-(define-public googletest-1.13
-  (package
-    (inherit googletest)
-    (name "googletest")
-    (version "1.13.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/google/googletest")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1x5lr1k4kgw3i8d7c12vp759p0w8c8r2y8lwvqswswxvwygw8lid"))))))
-
 (define-public googletest-1.8
   (package
     (inherit googletest)
@@ -3093,29 +3078,30 @@ backported from Python 2.7 for Python 2.4+.")
 (define-public behave
   (package
     (name "behave")
-    (version "1.3.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/behave/behave")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1fxj51kailsdakqi7qbw700k258n7r3lv75mgxs45ld5xh2jfyxh"))))
+    ;; The 1.2.6 release from 2018 has several problems with newer Python
+    ;; versions, so we package a recent snapshot.
+    (version "1.2.7.dev5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/behave/behave")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "14162pclfvy4wy2az4v9gkgb3v0b338zxrb2ikqcqifckrmk8nhv"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-assertpy
-           python-chardet
-           python-mock
-           python-path
+     (list python-mock
+           python-assertpy
+           python-pathpy
            python-pyhamcrest
            python-pytest
            python-pytest-html
-           python-setuptools))
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-colorama
-           python-cucumber-expressions
            python-cucumber-tag-expressions
            python-parse
            python-parse-type))

gnu/packages/chemistry.scm

@@ -60,7 +60,6 @@
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
-  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -494,47 +493,23 @@ stored with user-specified precision.")
 (define-public gromacs
   (package
     (name "gromacs")
-    (version "2025.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/gromacs/gromacs")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1p9vvlbrysh8lwnbgy845pgx664k6mkw8p66f8bx468f7z2rp900"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Still bundled: part of gromacs, source behind registration
-           ;; but free software anyways
-           ;;(delete-file-recursively "src/external/vmd_molfile")
-           ;; Still bundled: threads-based OpenMPI-compatible fallback
-           ;; designed to be bundled like that
-           ;;(delete-file-recursively "src/external/thread_mpi")
-           ;; Still bundled: Colvars is intended to be built as part of a
-           ;; molecular simulation program.
-           ;;(delete-file-recursively "src/external/colvars")
-           ;; Unbundling
-           (delete-file-recursively "src/external/lmfit")
-           (delete-file-recursively "src/external/clFFT")
-           (delete-file-recursively "src/external/fftpack")
-           (delete-file-recursively "src/external/build-fftw")
-           (delete-file-recursively "src/external/tng_io")
-           (delete-file-recursively "src/external/tinyxml2")
-           (delete-file-recursively "src/external/googletest")
-           (delete-file-recursively "src/external/muparser")
-           (delete-file-recursively "src/external/rpc_xdr")
-           (delete-file-recursively "src/external/vkfft")))))
+    (version "2022.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://ftp.gromacs.org/pub/gromacs/gromacs-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "15vjwasxjq0h18dmzacjkdim51zrvr0ni42hbc30557j5xhbw4f5"))
+              ;; Our version of tinyxml2 is far newer than the bundled one and
+              ;; require fixing `testutils' code. See patch header for more info
+              (patches (search-patches "gromacs-tinyxml2.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags
            #~(list "-DGMX_DEVELOPER_BUILD=on"     ; Needed to run tests
                    ;; Unbundling
                    "-DGMX_USE_LMFIT=EXTERNAL"
-                   "-DGMX_USE_MUPARSER=EXTERNAL"
                    "-DGMX_BUILD_OWN_FFTW=off"
                    "-DGMX_EXTERNAL_BLAS=on"
                    "-DGMX_EXTERNAL_LAPACK=on"
@@ -546,29 +521,31 @@ stored with user-specified precision.")
                    ;; Workaround for cmake/FindSphinx.cmake version parsing that does
                    ;; not understand the guix-wrapped `sphinx-build --version' answer
                    (string-append "-DSPHINX_EXECUTABLE_VERSION="
-                                  #$(package-version python-sphinx))
-                   (string-append
-                    "-DCMAKE_CXX_FLAGS=-I"
-                    (search-input-directory %build-inputs "/include/tirpc")))
+                                  #$(package-version python-sphinx)))
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'fixes
-                 (lambda _
-                   (copy-recursively #$(package-source googletest-1.13)
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; Still bundled: part of gromacs, source behind registration
+                   ;; but free software anyways
+                   ;;(delete-file-recursively "src/external/vmd_molfile")
+                   ;; Still bundled: threads-based OpenMPI-compatible fallback
+                   ;; designed to be bundled like that
+                   ;;(delete-file-recursively "src/external/thread_mpi")
+                   ;; Unbundling
+                   (delete-file-recursively "src/external/lmfit")
+                   (delete-file-recursively "src/external/clFFT")
+                   (delete-file-recursively "src/external/fftpack")
+                   (delete-file-recursively "src/external/build-fftw")
+                   (delete-file-recursively "src/external/tng_io")
+                   (delete-file-recursively "src/external/tinyxml2")
+                   (delete-file-recursively "src/external/googletest")
+                   (copy-recursively #$(package-source googletest)
                                      "src/external/googletest")
                    ;; This test warns about the build host hardware, disable
                    (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp"
                      (("TEST\\(HardwareTopologyTest, HwlocExecute\\)")
-                      "void __guix_disabled()"))
-                   (substitute* "cmake/gmxTestXDR.cmake"
-                     (("TestXDR\\.cpp\"" orig)
-                      (string-append orig " LINK_LIBRARIES -ltirpc")))
-                   (substitute* "CMakeLists.txt"
-                     (("set\\(GMX_EXTRA_LIBRARIES.*" orig)
-                      (string-append
-                       orig "\nlist(APPEND GMX_EXTRA_LIBRARIES \"-ltirpc\")\n")))
-                   (substitute* "src/external/CMakeLists.txt"
-                     (("add_subdirectory\\(rpc_xdr\\)") "")))))))
+                      "void __guix_disabled()")))))))
     (native-inputs
      (list doxygen
            graphviz
@@ -579,9 +556,7 @@ stored with user-specified precision.")
     (inputs
      (list fftwf
            `(,hwloc-2 "lib")
-           libtirpc
            lmfit
-           muparser
            openblas
            perl
            tinyxml2

gnu/packages/chez.scm

@@ -1185,19 +1185,16 @@ Chez Scheme.")
 (define-public chez-irregex
   (package
     (name "chez-irregex")
-    (version "0.9.11")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "http://synthcode.com/scheme/irregex/irregex-"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "026kzl96pmwbjqdc7kh8rdh8ng813sjvdsik0dag5acza20sjm19"))
-              (patches
-               ;; TODO: Remove this patch if upstream release a new version.
-               ;; See https://github.com/ashinn/irregex/issues/49
-               (search-patches "chez-irregex-import-cond-expand.patch"))))
+    (version "0.9.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fedeinthemix/chez-irregex")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q"))
+       (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (inputs
      (list chez-matchable)) ; for tests
@@ -1207,21 +1204,11 @@ Chez Scheme.")
      (list chez-scheme))
     (arguments
      (list #:make-flags (chez-make-flags name version)
-           #:tests? #f                  ; no test available for Chez Scheme
+           #:test-target "test"
            #:phases #~(modify-phases %standard-phases
                         (replace 'configure
-                          #$configure-chezschemelibdirs)
-                        (replace 'build
-                          (lambda* (#:key make-flags #:allow-other-keys)
-                            (apply invoke `("make" "chez-build"
-                                            ,@make-flags))))
-                        (replace 'install
-                          (lambda* (#:key make-flags #:allow-other-keys)
-                            (apply invoke `("make" "chez-install"
-                                            ,@make-flags))
-                            (apply invoke `("make" "chez-install-src"
-                                            ,@make-flags)))))))
-    (home-page "https://synthcode.com/scheme/irregex")
+                          #$configure-chezschemelibdirs))))
+    (home-page "https://github.com/fedeinthemix/chez-irregex")
     (synopsis "Portable regular expression library for Scheme")
     (description "This package provides a portable and efficient
 R[4567]RS implementation of regular expressions, supporting both POSIX
@@ -1386,40 +1373,3 @@ required to port the program @code{Scmutils} to Chez Scheme.")
 Scmutils program to Chez Scheme.  The port consists of a set of
 libraries providing most of the functionality of the original.")
     (license license:gpl3+)))
-
-(define-public schemesh
-  (package
-    (name "schemesh")
-    (version "0.9.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/cosmos72/schemesh")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "0rnd2mz3vnsxdac5q7i625mkmfc1znp865wxdqqx1c6dqb26bqrv"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:tests? #f
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-Makefile
-                 (lambda _
-                   (substitute* "Makefile"
-                     (("CC=cc")
-                      (string-append "CC=" #$(cc-for-target)))
-                     (("^(prefix[^/]*)/.*" all prefix)
-                      (string-append prefix #$output "\n")))))
-               (delete 'configure))))
-    (inputs (list chez-scheme
-                  lz4
-                  zlib
-                  ncurses
-                  `(,util-linux "lib")))
-    (home-page "https://github.com/cosmos72/schemesh")
-    (synopsis "Unix shell and Lisp REPL, fused together")
-    (description "Schemesh is an interactive shell scriptable in Lisp.  It
-supports interactive line editing, autocompletion, history and the familiar Unix
-shell syntax.")
-    (license license:gpl2)))

gnu/packages/cmake.scm

@@ -156,12 +156,15 @@ using the CMake build system.")
 (define %common-disabled-tests/hurd
   '("CTestTestTimeout"
     "CTestTestRerunFailed"
+    "RunCMake.CompilerChange"
     "RunCMake.ctest_test"
+    "RunCMake.file"
+    "RunCMake.BundleUtilities"
+    "RunCMake.configure_file"
     "RunCMake.CTestTimeout"
     "RunCMake.CTestTimeoutAfterMatch"
-    "RunCMake.CTestCommandLine"
-    ;; Fixed in v4.0.0
-    "RunCMake.RuntimePath"))
+    "RunCMake.CommandLine"
+    "RunCMake.CTestCommandLine"))
 
 (define %preserved-third-party-files
   '(;; 'Source/cm_getdate.c' includes archive_getdate.c wholesale, so it must
@@ -244,7 +247,15 @@ using the CMake build system.")
           ;; CMake uses its own configure script.
           (replace 'configure
             (lambda* (#:key (configure-flags '()) #:allow-other-keys)
-              (apply invoke "./configure" configure-flags))))))
+              (apply invoke "./configure" configure-flags)))
+          #$@(if (target-hurd?)
+                 #~((add-after 'unpack 'patch-hurd
+                      (lambda _
+                        ;; Version 3.25.0 has a similar fix.
+                        (substitute* "Utilities/cmlibuv/src/unix/udp.c"
+                          (("!defined\\(__QNX__\\)")
+                           "!defined(__GNU__)")))))
+                 #~()))))
     (inputs
      (list bzip2
            curl

gnu/packages/code.scm

@@ -627,21 +627,6 @@ functionality such as HTML output.")
        (sha256
         (base32 "13xmr249c6qygm14gilb0icrsgb35ghsrr14a1zvppmxy9jf5a7g"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-source
-            (lambda _
-              ;; Prevent setuptools.errors.InvalidConfigError:
-              ;; License classifiers have been superseded by license expressions
-              ;; (see https://peps.python.org/pep-0639/). Please remove:
-              ;; License :: OSI Approved :: Apache Software License
-              ;; Reported upstream:
-              ;; https://github.com/eriwen/lcov-to-cobertura-xml/pull/65
-              (substitute* "setup.cfg"
-                (("\tLicense :: OSI Approved :: Apache Software License\n")
-                 "")))))))
     (native-inputs
      (list python-pytest
            python-setuptools
@@ -1149,5 +1134,5 @@ requirements is not met.")
     (properties '((lint-hidden-cpe-vendors . ("vmware"))))
     (license license:expat)))
 
-(define-deprecated-package python-xenon
-  xenon)
+(define-public python-xenon
+  (deprecated-package "python-xenon" xenon))

gnu/packages/commencement.scm

@@ -2723,7 +2723,7 @@ memoized as a function of '%current-system'."
    (package
      (inherit gnumach-headers)
      (name "gnumach-headers-boot0")
-     (version "1.8+git20250731")
+     (version "1.8+git20250304")
      (source
       (origin
         (inherit (package-source gnumach-headers))
@@ -2737,7 +2737,7 @@ memoized as a function of '%current-system'."
                   "gnumach-" version ".tar.gz"))
             (sha256
              (base32
-              "1dc40cf2s8jr6xhhbmy6khmig5zz1gpb4vc9c40aagccxf72jkpv")))))))
+              "1mmjlcbzk1fs64q6vz2p2irp7vgbmyvm5inj3bf522gx50b3v67q")))))))
      (native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
      (arguments
       (substitute-keyword-arguments (package-arguments gnumach-headers)
@@ -2787,7 +2787,7 @@ memoized as a function of '%current-system'."
    (package
      (inherit hurd-headers)
      (name "hurd-headers-boot0")
-     (version "0.9.git20251029")
+     (version "0.9.git20250420")
      (source
       (origin
         (inherit (package-source hurd-headers))
@@ -2797,10 +2797,10 @@ memoized as a function of '%current-system'."
             (method url-fetch)
             (uri (string-append
                   "https://git.savannah.gnu.org/cgit/hurd/hurd.git/snapshot/"
-                  "hurd-" version ".tar.gz"))
+                  "hurd-v" version ".tar.gz"))
             (sha256
              (base32
-              "0pjxh4qln8m7jznqlzsz81vi38chjv64jj9824dj7wkm36gxbn3a")))))))
+              "14ldrijzgqkvnii873vjlsmrjr3kvs1aksyc5b4ha8anlnnvdkg1")))))))
      (native-inputs
       (list autoconf-boot0 automake-boot0 mig-boot0))
      (inputs '()))))

gnu/packages/compression.scm

@@ -67,7 +67,6 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system ant)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system copy)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
@@ -1461,86 +1460,73 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
     (license license:asl2.0)
     (properties '((cpe-vendor . "google")))))
 
-(define-public 7zip
-  (package
-    (name "7zip")
-    (version "25.01")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/ip7z/7zip")
-              (commit version)))
-       (sha256
-        (base32 "01jg1fkc2zsdngv3ag3pwq4x8i5x01hjxsk30n78ffwiv2ps4rmq"))
-       (file-name (git-file-name name version))
-       (modules '((guix build utils)
-                  (ice-9 regex)))
-       (snippet #~(begin
-                    (for-each
-                     delete-file
-                     (append (find-files "CPP/7zip/Compress" "^Rar.*")
-                             (find-files "DOC/unRarLicense.txt")))))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:install-plan
-      #~'(("DOC/" "share/doc/7zip")
-          ("CPP/7zip/UI/Console/_o/7z" "bin/")
-          ("CPP/7zip/Bundles/Format7zF/_o/7z.so" "lib/")
-          ("CPP/7zip/Bundles/SFXCon/_o/7zCon" "lib/7zCon.sfx"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (delete 'check)
-          (add-after 'unpack 'patch-sources
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (lib (string-append out "/lib")))
-                (substitute* "CPP/7zip/UI/Client7z/Client7z.cpp"
-                  (("if \\(!lib\\.Load\\(dllPrefix + FTEXT\\(kDllName\\)\\)\\)")
-                   (string-append "if (!lib.Load(FTEXT(\"" lib
-                                  "\") + FTEXT(kDllName)) || "
-                                  "!lib.Load(dllPrefix + FTEXT(kDllName)))")))
-                (substitute* "CPP/7zip/UI/Common/ArchiveCommandLine.cpp"
-                  (("s = FTEXT\\(\"\\.\"\\)")
-                   (string-append "s = FTEXT(\"" lib "\")"))
-                  (("s = fas2fs\\(g_ModuleDirPrefix\\)")
-                   (string-append "s = FTEXT(\"" lib "\") "
-                                  "FSTRING_PATH_SEPARATOR"))))))
-          (add-before 'install 'build
-            (lambda* _
-              (define make-flags
-                '#$(list "DISABLE_RAR=1"
-                         (string-append "CC=" (cc-for-target))
-                         (string-append "CXX=" (cxx-for-target))
-                         (string-append "PLATFORM="
-                                        (cond
-                                         ((target-x86-64?) "x64")
-                                         ((target-x86-32?) "x86")
-                                         ((target-arm32?) "arm")
-                                         ((target-aarch64?) "arm64")
-                                         (#t "")))))
-              (with-directory-excursion "CPP/7zip/"
-                (for-each
-                 (lambda (dir)
-                   (with-directory-excursion dir
-                     (apply invoke "make" "-f" "makefile.gcc" make-flags)))
-                 '("UI/Console"
-                   "Bundles/Format7zF"
-                   "Bundles/SFXCon"))))))))
-    (home-page "https://7-zip.org")
-    (synopsis "7-zip file archiver")
-    (description
-     "7-zip is a command-line file compressor that supports a number
-of archive formats and features self-extracting archives.")
-    (license (list license:lgpl2.1+
-                   license:bsd-2
-                   license:bsd-3
-                   license:public-domain))))
-
 (define-public p7zip
-  (deprecated-package "p7zip" 7zip))
+  (package
+    (name "p7zip")
+    (version "16.02")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/" name "/" name "/"
+                                  version "/" name "_" version
+                                  "_src_all.tar.bz2"))
+              (sha256
+               (base32
+                "07rlwbbgszq8i7m8jh3x6j2w2hc9a72dc7fmqawnqkwlwb00mcjy"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Remove non-free source files
+                  (for-each delete-file
+                            (append
+                             (find-files "CPP/7zip/Compress" "Rar.*")
+                             (find-files "CPP/7zip/Crypto" "Rar.*")
+                             (find-files "DOC/unRarLicense.txt")
+                             (find-files  "Utils/file_Codecs_Rar_so.py")))
+                  (delete-file-recursively "CPP/7zip/Archive/Rar")
+                  (delete-file-recursively "CPP/7zip/Compress/Rar")
+                  ;; Fix FTBFS with gcc-10.
+                  (substitute* "CPP/Windows/ErrorMsg.cpp"
+                    (("switch\\(errorCode\\) \\{")
+                     "switch(static_cast<HRESULT>(errorCode)) {"))))
+              (patches (search-patches "p7zip-CVE-2016-9296.patch"
+                                       "p7zip-CVE-2017-17969.patch"
+                                       "p7zip-fix-build-with-gcc-11.patch"
+                                       "p7zip-remove-unused-code.patch"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "DEST_HOME=" (assoc-ref %outputs "out")) "all3")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (copy-file
+               ,(cond ((target-x86-64?)
+                       "makefile.linux_amd64_asm")
+                      ((target-x86-32?)
+                       "makefile.linux_x86_asm_gcc_4.X")
+                      (else
+                        "makefile.linux_any_cpu_gcc_4.X"))
+               "makefile.machine")))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "make" "test")
+               (invoke "make" "test_7z")
+               (invoke "make" "test_7zr")))))))
+    (native-inputs
+      (cond ((target-x86-64?)
+             (list yasm))
+            ((target-x86-32?)
+             (list nasm))
+            (else '())))
+    (home-page "https://p7zip.sourceforge.net/")
+    (synopsis "Command-line file archiver with high compression ratio")
+    (description "p7zip is a command-line port of 7-Zip, a file archiver that
+handles the 7z format which features very high compression ratios.")
+    (license (list license:lgpl2.1+
+                   license:gpl2+
+                   license:public-domain))))
 
 (define-public gzstream
   (package
@@ -2437,8 +2423,8 @@ with @code{deflate} but offers more dense compression.
 The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
     (license license:expat)))
 
-(define-deprecated-package google-brotli
-  brotli)
+(define-public google-brotli
+  (deprecated-package "google-brotli" brotli))
 
 (define-public java-brotli
   (package

gnu/packages/cpp.scm

@@ -34,7 +34,7 @@
 ;;; 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>
+;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
@@ -625,20 +625,18 @@ Scalable Vector Graphics (SVG) files.")
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
-     (list
-      ;; No check target. Setting test-target to "unit_test" runs it twice.
-      #:tests? #f
-      #:configure-flags
-      #~(list "-DBUILD_DOCUMENTATION=OFF"
-              "-DBUILD_EXAMPLES=OFF"
-              "-DBUILD_UNIT_TESTS=OFF")
+     '(;; No check target. Setting test-target to "unit_test" runs it twice.
+       #:tests? #f
+       #:configure-flags
+       '("-DBUILD_DOCUMENTATION=OFF" "-DBUILD_EXAMPLES=OFF")
        #:phases
-       #~(modify-phases %standard-phases
+       (modify-phases %standard-phases
          ;; library_test fails in chroot.
          (add-after 'unpack 'skip-library-test
            (lambda _
              (substitute* "src/unit_tests/unit_tests.cmake"
-               (("misc/library_test.cpp") "")))))))
+               (("misc/library_test.cpp") ""))
+             #t)))))
     (native-inputs (list pkg-config))
     (home-page "https://github.com/rttrorg/rttr/")
     (synopsis "C++ Reflection Library")
@@ -683,7 +681,7 @@ the name of the library itself, which is written in C++.")
 (define-public plutovg
   (package
     (name "plutovg")
-    (version "1.3.1")
+    (version "0.0.13")
     (source
      (origin
        (method git-fetch)
@@ -692,7 +690,7 @@ the name of the library itself, which is written in C++.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1pkil2g9vvnhn7xycha5lwya0kp9h1ndg0lszgh8nkbilnavwig9"))))
+        (base32 "0y2w0qhs89bnh440z1xj65vg4c71rlwinxgs3p8bvh2fmbi7lqff"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
@@ -702,33 +700,6 @@ the name of the library itself, which is written in C++.")
     (description "PlutoVG is a standalone 2D vector graphics library in C.")
     (license license:expat)))
 
-(define-public plutosvg
-  (package
-    (name "plutosvg")
-    (version "0.0.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/sammycage/plutosvg")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0vj21y4sr98mb337sr2yrgzs8ipgrnhd23qk3c1gykdxwgiy94p0"))))
-    (build-system cmake-build-system)
-    (native-inputs (list plutovg))
-    (arguments
-     '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
-       #:tests? #f)) ;No tests.
-    (home-page "https://github.com/sammycage/plutovg")
-    (synopsis "Tiny SVG rendering library in C")
-    (description
-     "PlutoSVG is a compact and efficient SVG rendering library written in C.
-It is specifically designed for parsing and rendering SVG documents embedded
-in OpenType fonts, providing an optimal balance between speed and minimal
-memory usage. It is also suitable for rendering scalable icons.")
-    (license license:expat)))
-
 (define-public pystring
   (package
     (name "pystring")
@@ -1292,8 +1263,8 @@ data transfer object.")
 intuitive syntax and trivial integration.")
     (license license:expat)))
 
-(define-deprecated-package json-modern-cxx
-  nlohmann-json)
+(define-public json-modern-cxx
+  (deprecated-package "json-modern-cxx" nlohmann-json))
 
 (define-public jthread
   (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")
@@ -1725,16 +1696,16 @@ library.")
 (define-public rapidfuzz-cpp
   (package
     (name "rapidfuzz-cpp")
-    (version "3.3.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/rapidfuzz/rapidfuzz-cpp")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ma2hpp4c53fwjb8yi7rpkgivhsw7bkd8agw3sw5zwdlwsks88xv"))))
+    (version "3.3.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rapidfuzz/rapidfuzz-cpp")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1im0k0pjg1fnzsixl5k7j706kwwdhkw15a9hpkyr8yqbmmbg9q82"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1742,9 +1713,8 @@ library.")
     (native-inputs (list catch2))
     (home-page "https://github.com/rapidfuzz/rapidfuzz-cpp")
     (synopsis "Rapid fuzzy string matching using the Levenshtein Distance")
-    (description
-     "RapidFuzz is a fast string matching library for Python and C++, which is
-using the string similarity calculations from FuzzyWuzzy.")
+    (description "RapidFuzz is a fast string matching library for Python and
+C++, which is using the string similarity calculations from FuzzyWuzzy.")
     (license license:expat)))
 
 (define-public cpplint

gnu/packages/cran.scm

@@ -1833,22 +1833,6 @@ code for possible problems.")
        (sha256
         (base32 "1rsx69wjpa73c6x2hacvvvbzdzxn7wg06gizf97kasjdlb7azmp3"))))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-c-standard
-            (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CFLAGS=-g -O2"
-                              " -std=gnu17"))))))))))
     (home-page "https://github.com/jalvesaq/colorout")
     (synopsis "Colorize output in the R REPL")
     (description "@code{colorout} is an R package that colorizes R output when
@@ -9179,16 +9163,6 @@ statistical analyses or create publication-ready tables and plots.")
         (base32 "01ly4hxwa64a0ya5gla8rvv72s9mcknsfznivjkh937pbjwb7iih"))))
     (properties `((upstream-name . "parallelDist")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-gcc-14-strictness
-            (lambda _
-              (substitute* "src/Makevars"
-                (("CXX_STD = CXX11")
-                 "CXX_STD = CXX11
-PKG_CXXFLAGS=-g -O2 -Wno-error=changes-meaning")))))))
     (propagated-inputs (list r-rcpp r-rcpparmadillo r-rcppparallel))
     (native-inputs (list r-dtw r-ggplot2 r-proxy r-rcppxptrutils r-testthat))
     (home-page "https://github.com/alexeckert/parallelDist")
@@ -11086,13 +11060,13 @@ matrix) for the double-truncated multinormal case.")
 (define-public r-rvest
   (package
     (name "r-rvest")
-    (version "1.0.5")
+    (version "1.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rvest" version))
        (sha256
-        (base32 "005wadzdhxf6hgr8vl4nl0nfi2crj6467mhwbccqfy26njh38z0y"))))
+        (base32 "19lw0jk8d8x88z247hz761gwbx9f5n3yqnv63mn7pkwl55mpqw3x"))))
     (build-system r-build-system)
     (arguments
      (list
@@ -19584,22 +19558,6 @@ phylogenies and ancestral character states.")
         (base32 "0by01x4qpf1pin5l61wmm600bmsnlnns9knwb0qmjlj72pmwfkqh"))))
     (properties `((upstream-name . "dtwclust")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'relax-gcc-14-strictness
-            (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CXXFLAGS=-g -O2"
-                              " -Wno-error=changes-meaning\n"))))))))))
     (propagated-inputs
      (list r-clue
            r-cluster
@@ -21323,18 +21281,7 @@ provides some missing S-PLUS functionality in R.")
 #define ERROR	),error(R_problem_buf);}
 #define WARNING(x)		),warning(R_problem_buf);}
 #define WARN			WARNING(NULL)
-" m)))))
-         (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* "src/ut_alloc.c"
-                (("Calloc") "R_Calloc")
-                (("Free") "R_Free")
-                (("Realloc") "R_Realloc")))))))
+" m))))))))
     (propagated-inputs
      (list r-mass r-splus2r))
     (home-page "https://cran.r-project.org/web/packages/ifultools/")
@@ -25767,17 +25714,6 @@ cross-validation.")
         (base32 "00pxi5zj68796b3qkil3w66z446ib61xl2l5v1qia1mc9fznlzri"))))
     (properties `((upstream-name . "blavaan")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-gcc-14-strictness
-            (lambda _
-              (substitute* "configure"
-                ;; Modifying src/Makevars directly is overruled.
-                (("config\\(\\)\"")
-                 "config()\"
-echo \"PKG_CXXFLAGS+=-g -O2 -Wno-error=changes-meaning\" >> src/Makevars")))))))
     (propagated-inputs (list r-bayesplot
                              r-bh
                              r-coda
@@ -29780,15 +29716,7 @@ package provides a minimal R interface by relying on the Rcpp package.")
                   (lambda _
                     (display (string-append
                               "CXXFLAGS=-g -O2"
-                              " -Wno-error=changes-meaning\n")))))))
-          ;; This change lets us use GCC 13+.  We need to patch things here so
-          ;; that packages using RcppParallel to generate code can be compiled
-          ;; without errors.
-          (add-after 'install 'gcc-compatibility
-            (lambda _
-              (substitute* (string-append #$output "/site-library/RcppParallel/include/tbb/task.h")
-                (("task\\* next_offloaded")
-                 "tbb::task* next_offloaded")))))))
+                              " -Wno-error=changes-meaning\n"))))))))))
     (inputs (list tbb-2020))
     (native-inputs (list r-rcpp r-runit))
     (home-page "https://rcppcore.github.io/RcppParallel/")
@@ -32425,6 +32353,32 @@ the properties of models.  This is mainly for use by other package developers
 who want to include run-time testing features in their own packages.")
     (license license:gpl3+)))
 
+(define-public r-assertive-reflection
+  (package
+    (name "r-assertive-reflection")
+    (version "0.0-5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "assertive.reflection" version))
+       (sha256
+        (base32
+         "1g9lpwzy6r2xmyi2mlbcccnfgyzhzbmx5bsicf3vkffxrlkrpjn2"))))
+    (properties
+     `((upstream-name . "assertive.reflection")))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-assertive-base))
+    (native-inputs (list r-testthat))
+    (home-page "https://bitbucket.org/richierocks/assertive.reflection")
+    (synopsis "Assertions for checking the state of R")
+    (description
+     "This package provides a set of predicates and assertions for checking
+the state and capabilities of R, the operating system it is running on, and
+the IDE being used.  This is mainly for use by other package developers who
+want to include run-time testing features in their own packages.")
+    (license license:gpl3+)))
+
 (define-public r-assertive-types
   (package
     (name "r-assertive-types")
@@ -32638,6 +32592,45 @@ for use by other package developers who want to include run-time testing
 features in their own packages.")
     (license license:gpl3+)))
 
+(define-public r-assertive
+  (package
+    (name "r-assertive")
+    (version "0.3-6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "assertive" version))
+       (sha256
+        (base32
+         "02palil82idqhhshcdjsfsja9qkqnd0dczqzj5gbccy4hfg1c0y4"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-assertive-base
+           r-assertive-code
+           r-assertive-data
+           r-assertive-data-uk
+           r-assertive-data-us
+           r-assertive-datetimes
+           r-assertive-files
+           r-assertive-matrices
+           r-assertive-models
+           r-assertive-numbers
+           r-assertive-properties
+           r-assertive-reflection
+           r-assertive-sets
+           r-assertive-strings
+           r-assertive-types
+           r-knitr))
+    (native-inputs
+     (list r-knitr r-testthat))
+    (home-page "https://bitbucket.org/richierocks/assertive")
+    (synopsis "Readable check functions to ensure code integrity")
+    (description
+     "This package provides lots of predicates (@code{is_*} functions) to
+check the state of your variables, and assertions (@code{assert_*} functions)
+to throw errors if they aren't in the right form.")
+    (license license:gpl3+)))
+
 (define-public r-dotcall64
   (package
     (name "r-dotcall64")
@@ -33024,21 +33017,7 @@ putative directions).")
     (build-system r-build-system)
     ;; FIXME: Error in genomePartition(reader, ref) : pCoords: begin must be
     ;; <= end!
-    (arguments
-     (list
-      #:tests? #false
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* '("src/gapSiteList.h" "src/gapSiteListList.h")
-                (("Calloc") "R_Calloc")
-                (("Free") "R_Free")))))))
+    (arguments (list #:tests? #false))
     (inputs (list zlib))
     (propagated-inputs
      (list r-refgenome))
@@ -35854,20 +35833,6 @@ lines.  It includes maximum likelihood and Bayesian tools.")
         (base32
          "0c4svyfd7xjx9k6pl40l7y9rc67zschs0nz1l386xi1m7arsp44n"))))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* "src/lsConstrain.c"
-                (("Calloc") "R_Calloc")
-                (("Free") "R_Free")))))))
     (home-page "https://www.mayo.edu/research/labs/\
 statistical-genetics-genetic-epidemiology/software")
     (synopsis "Regression methods for IBD linkage with covariates")
@@ -39668,8 +39633,8 @@ integrative non-negative matrix factorization to identify shared and
 dataset-specific factors.")
     (license license:gpl3)))
 
-(define-deprecated-package r-liger
-  r-rliger)
+(define-public r-liger
+  (deprecated-package "r-liger" r-rliger))
 
 (define-public r-harmony
   (package
@@ -43074,13 +43039,13 @@ It also provides a small number of bug fixes to the original code.")
 (define-public r-torch
   (package
     (name "r-torch")
-    (version "0.16.3")
+    (version "0.14.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "torch" version))
        (sha256
-        (base32 "0gqjg9qhsrwh5cvdlk6lyqp2j1d3kr49im3m2ja4c3wkjpk9swhv"))))
+        (base32 "1j0wgxr25h91c7x48svmgd0pbjl2ljn8rv6rsgw5a56vdgr992nb"))))
     (properties
      '((upstream-name . "torch")
        (updater-ignored-native-inputs . ("r-aten"))
@@ -43107,7 +43072,8 @@ It also provides a small number of bug fixes to the original code.")
                     inputs "/lib/liblantern.so")
                    (string-append deps "/liblantern.so")))))))))
     (inputs
-     (list liblantern python-pytorch-for-r-torch))
+     (list python-pytorch-for-r-torch
+           liblantern))
     (propagated-inputs
      (list r-bit64
            r-callr
@@ -45599,13 +45565,7 @@ techniques to average Bayesian predictive distributions.")
              (setenv "TZ" "UTC+1")
              (setenv "TZDIR"
                      (search-input-directory inputs
-                                             "share/zoneinfo"))))
-         (add-before 'install 'relax-gcc-14-strictness
-            (lambda _
-              (substitute* "src/Makevars"
-                (("CXX_STD = CXX17")
-                 "CXX_STD = CXX17
-PKG_CXXFLAGS+=-g -O2 -Wno-error=changes-meaning")))))))
+                                             "share/zoneinfo")))))))
     (native-inputs
      (list r-knitr
            r-matrix
@@ -46512,19 +46472,6 @@ download images.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'relax-gcc-14-strictness
-            (lambda _
-              ;; XXX FIXME: $HOME/.R/Makevars seems to be the only way to
-              ;; set custom CFLAGS for R?
-              (setenv "HOME" (getcwd))
-              (mkdir-p ".R")
-              (with-directory-excursion ".R"
-                (with-output-to-file "Makevars"
-                  (lambda _
-                    (display (string-append
-                              "CFLAGS=-g -O2"
-                              " -std=gnu11"
-                              " -Wno-error=implicit-function-declaration\n")))))))
          (add-before 'install 'install-server-binary
            ;; Makevars tries to install to R's store directory.
            (lambda* (#:key outputs #:allow-other-keys)
@@ -48101,22 +48048,6 @@ importance measure as introduced in Kursa (2014)
              (base32
               "05x9wgzsmx4vb12lmcspymgmpb2xw8bwryb8ysg7vzg2nkh0ma3g"))))
    (build-system r-build-system)
-   (arguments
-    (list
-     #:phases
-     '(modify-phases %standard-phases
-        (add-before 'install 'fix-r-4.5.0
-          ;; Changes in R 4.5.0: C-Level Facilities.
-          ;; Strict R headers are now the default. This removes the legacy
-          ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-          ;; R_Calloc, R_Realloc or R_Free instead.
-          ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-          (lambda _
-            (substitute* '("src/featContrib.c"
-                           "src/featContribClass.c"
-                           "src/forest.c")
-              (("Calloc") "R_Calloc")
-              (("Free") "R_Free")))))))
    (propagated-inputs
     (list r-randomforest))
    (home-page "https://r-forge.r-project.org/projects/rffc/")
@@ -50264,8 +50195,8 @@ other R users.")
     (license license:gpl3)))
 
 ;; This is for r-seurat5
-(define-deprecated-package r-seurat5object
-  r-seuratobject)
+(define-public r-seurat5object
+  (deprecated-package "r-seurat5object" r-seuratobject))
 
 (define-public r-seurat
   (package
@@ -50345,8 +50276,8 @@ discovery of differentially expressed genes and markers.")
 
 ;; Seurat5 is only available via the seurat5 branch.  It will replace r-seurat
 ;; eventually once it has been released to CRAN.
-(define-deprecated-package r-seurat5
-  r-seurat)
+(define-public r-seurat5
+  (deprecated-package "r-seurat5" r-seurat))
 
 (define-public r-seuratdisk
   (let ((commit "877d4e18ab38c686f5db54f8cd290274ccdbe295")
@@ -50551,20 +50482,6 @@ parabolic or user defined by custom scale factors.")
             "036cv56wf42q2p3d5h15hbrp5rc29xxy20qwv4k1qzhkq6hmw0qs"))))
     (properties `((upstream-name . "decon")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'install 'fix-r-4.5.0
-            ;; Changes in R 4.5.0: C-Level Facilities.
-            ;; Strict R headers are now the default. This removes the legacy
-            ;; definitions of PI, Calloc, Realloc and Free: use M_PI,
-            ;; R_Calloc, R_Realloc or R_Free instead.
-            ;; https://cran.r-project.org/doc/manuals/r-release/NEWS.html
-            (lambda _
-              (substitute* "src/Ckernel.c"
-                (("pow\\(PI") "pow(M_PI")
-                (("fint/PI") "fint/M_PI")))))))
     (native-inputs
      (list gfortran))
     (home-page
@@ -50601,17 +50518,6 @@ Journal of Statistical Software, 39(10), 1-24.")
         (base32 "0ydnjyprv8fz037nkfvjd8w6hg4a19lbnq4kl7yankxksjfdyqc3"))))
     (properties `((upstream-name . "densEstBayes")))
     (build-system r-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-gcc-14-strictness
-            (lambda _
-              (substitute* "configure"
-                ;; Modifying src/Makevars directly is overruled.
-                (("src/Makevars")
-                 "src/Makevars
-echo \"PKG_CXXFLAGS+=-g -O2 -Wno-error=changes-meaning\" >> src/Makevars")))))))
     (propagated-inputs
      (list r-bh
            r-mass
@@ -51630,16 +51536,18 @@ avoid system fonts to make sure your outputs are reproducible.")
                     "--without-harfbuzz")))))
        ("static-harfbuzz"
         ,(package
-           (inherit harfbuzz)
+           (inherit (static-package harfbuzz))
            (arguments
             `(#:tests? #false ; fail because shared library is disabled
               #:configure-flags
-              (list "--default-library=static"
-                   "--default-both-libraries=static"
-                   "-Dfreetype=enabled"
-                   "-Dicu=disabled"
-                   "-Dcairo=disabled"
-                   "-Dglib=disabled")))))))
+              (list "--enable-static=yes"
+		    "--enable-shared=no"
+		    "--with-pic=yes"
+		    "--with-freetype=yes"
+		    "--without-icu"
+		    "--without-cairo"
+		    "--without-fontconfig"
+		    "--without-glib")))))))
     (inputs
      (list zlib))
     (home-page "https://cran.r-project.org/package=freetypeharfbuzz")

gnu/packages/crypto.scm

@@ -1367,13 +1367,13 @@ API.")
     (home-page "https://matrix.org/docs/projects/other/olm/")
     (license license:asl2.0)))
 
-(define-deprecated-package libolm
-  olm)
+(define-public libolm
+  (deprecated-package "libolm" olm))
 
 (define-public python-olm
   (package
-    ;; python-olm is part of olm and must be updated at the same time.
-    (inherit olm)
+    ;; python-olm is part of libolm and must be updated at the same time.
+    (inherit libolm)
     (name "python-olm")
     (build-system python-build-system)
     (arguments
@@ -1390,7 +1390,7 @@ API.")
              (when tests?
                (add-installed-pythonpath inputs outputs)
                (invoke "pytest")))))))
-    (inputs (list olm))
+    (inputs (list libolm))
     (propagated-inputs
      (list python-cffi python-future))
     (native-inputs

gnu/packages/curl.scm

@@ -179,8 +179,7 @@ tunneling, and so on.")
     (license (license:non-copyleft "file://COPYING"
                                    "See COPYING in the distribution."))))
 
-(define-deprecated-package gnurl
-  curl)
+(define-public gnurl (deprecated-package "gnurl" curl))
 
 (define-public curl-ssh
   (package/inherit curl

gnu/packages/cybersecurity.scm

@@ -110,7 +110,7 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
 (define-public gallia
   (package
     (name "gallia")
-    (version "2.0.0b2")
+    (version "1.9.0")
     (source
      (origin
        (method git-fetch)
@@ -119,11 +119,10 @@ Refresh}in-DRAM mitigations effectively and as such can trigger bit flips.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0bf9zq89dcnnm8ir322l69assrhxrspa97m7yk153q0vv9vib6q9"))))
+        (base32 "11pyq2jn0py6n4xi5yxbsazybbdn9m8fgllqmfrsiqg9k96i6cwb"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:build-backend "poetry.core.masonry.api" ;XXX: python-uv-build is required
       ;; NOTE: Test steps are sourced from GitHub Actions attached to the
       ;; project. This is a minimal test suite, more precise tests require
       ;; setting up local service with Bats (Bash Automated Testing System)

gnu/packages/databases.scm

@@ -128,7 +128,6 @@
   #:use-module (gnu packages language)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
-  #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lisp-xyz)
@@ -829,7 +828,7 @@ the API, and provides features such as:
       #:tests? #f
       #:build-backend "setuptools.build_meta"))
     (native-inputs
-     (list python-cython
+     (list python-cython-3
            python-setuptools
            python-wheel))
     (propagated-inputs
@@ -878,30 +877,6 @@ they exist.")
 client.")
     (license license:asl2.0)))
 
-(define-public python-psycopg2cffi
-  (package
-    (name "python-psycopg2cffi")
-    (version "2.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "psycopg2cffi" version))
-       (sha256
-        (base32 "0ljwsglgjm0c28dzlqlyvbz1jnn4hpmqa8dn28fkmpipv3f2w9vy"))))
-    (build-system pyproject-build-system)
-    ;; TODO: Fix tests: ImportError: cannot import name 'psycopg2_tests' from
-    ;; partially initialized module 'psycopg2cffi.tests' (most likely due to a
-    ;; circular import)
-    (arguments '(#:tests? #f))
-    (propagated-inputs (list python-cffi
-                             python-six)) ;; hard dependency
-    (native-inputs (list python-setuptools postgresql))
-    (home-page "https://github.com/chtd/psycopg2cffi")
-    (synopsis "Port of psycopg2 to CFFI")
-    (description
-     "This package is an implementation of @code{psycopg2} using CFFI.")
-    (license license:lgpl3)))
-
 (define-public python-pylibmc
   (package
     (name "python-pylibmc")
@@ -1067,32 +1042,25 @@ autocompletion and syntax highlighting.")
 (define-public mycli
   (package
     (name "mycli")
-    (version "1.37.1")
+    (version "1.25.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "mycli" version))
        (sha256
-        (base32 "03kvw0n6s3f06whr7prjfwp1arl66mahlxizv27i9dkm5ibv1qrz"))))
-    (build-system pyproject-build-system)
+        (base32 "0231v7f6q84mjmi1h0ni3s55m2g8p5d7x5q49bgkxlaz2bc2xwgy"))))
+    (build-system python-build-system)
     (arguments
      '(#:tests? #f))                    ; tests expect a running MySQL
-    (native-inputs
-     (list python-setuptools
-           python-setuptools-scm))
     (propagated-inputs
      (list python-cli-helpers
-           python-click-7
+           python-click
            python-configobj
-           python-cryptography
            python-prompt-toolkit
            python-pyaes
-           python-pyfzf
            python-pygments
            python-pymysql
            python-pyperclip
-           python-sqlglot
-           python-sqlglotrs
            python-sqlparse))
     (home-page "https://www.mycli.net")
     (synopsis
@@ -2117,8 +2085,8 @@ supports editing, navigation, and querying of recutils database files
 including field and record folding.")
     (license license:gpl3+)))
 
-(define-deprecated-package emacs-recutils
-  emacs-rec-mode)
+(define-public emacs-recutils
+  (deprecated-package "emacs-recutils" emacs-rec-mode))
 
 (define-public rocksdb
   (package
@@ -4804,7 +4772,7 @@ with the @code{psycopg} PostgreSQL driver.")
 	          (invoke "psql" "-h" dbdir "-d" "postgres"
                           "-c" "CREATE DATABASE nixbld;"))))))))
     (native-inputs
-     (list python-cython
+     (list python-cython-3
            python-mypy
            python-psycopg-pool
            python-pytest
@@ -5070,8 +5038,8 @@ reasonable substitute.")
      "This package provides a Python interface to the Redis key-value store.")
     (license license:expat)))
 
-(define-deprecated-package python-aioredis
-  python-redis)
+(define-public python-aioredis
+  (deprecated-package "python-aioredis" python-redis))
 
 (define-public python-rq
   (package
@@ -5614,7 +5582,7 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
     (native-inputs
      (list cmake ;needs 3.25
            pkg-config
-           python-cython
+           python-cython-3
            python-pytest
            python-pytest-runner
            python-setuptools-scm))
@@ -6181,16 +6149,16 @@ mechanism of @code{dogpile}.")
 (define-public datasette
   (package
     (name "datasette")
-    (version "1.0a19")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/simonw/datasette")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0wb73iksrc5vg2lnq3q4vr7yhlzxwr711jfmjdndd0s77996zsfh"))))
+    (version "1.0a16")
+    (source (origin
+              (method git-fetch)        ;for tests
+              (uri (git-reference
+                    (url "https://github.com/simonw/datasette")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "10c754idn9ka5hhai1qwjwlxw4dajdlrh162k71i5gwn4cgq6wr5"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -6200,14 +6168,7 @@ mechanism of @code{dogpile}.")
                     ;; These contain two unexpected extra items.
                     "not test_searchable"
                     " and not test_searchmode")
-              "--ignore=tests/test_black.py"
-              "-n" (number->string (parallel-job-count)))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "setup.py"
-                (("\"pip\",") "")))))))
+              "-n" (number->string (parallel-job-count)))))
     (propagated-inputs
      (list python-aiofiles
            python-asgi-csrf
@@ -6229,14 +6190,17 @@ mechanism of @code{dogpile}.")
     (native-inputs
      (list nss-certs-for-test
            python-beautifulsoup4
+           python-black
            python-cogapp
+           python-pip
            python-pytest
-           python-pytest-asyncio-0.26
+           python-pytest-asyncio
            python-pytest-runner
            python-pytest-timeout
            python-pytest-xdist
            python-setuptools
-           python-trustme))
+           python-trustme
+           python-wheel))
     (home-page "https://datasette.io/")
     (synopsis "Multi-tool for exploring and publishing data")
     (description "Datasette is a tool for exploring and publishing data.

gnu/packages/debug.scm

@@ -686,7 +686,6 @@ conditions.")
         (base32
          "1mpzjaksc2qg2hzqflf39pl06p53qam2dn3hkhkcv6p00d2n4kx3"))))
     (build-system gnu-build-system)
-    (native-inputs (list gcc-13))
     (home-page "https://github.com/samhocevar/zzuf")
     (synopsis "Transparent application input fuzzer")
     (description "Zzuf is a transparent application input fuzzer.  It works by

gnu/packages/dictionaries.scm

@@ -37,7 +37,6 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system copy)
@@ -47,7 +46,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
@@ -67,7 +66,6 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages speech)
   #:use-module (gnu packages tcl)
@@ -77,39 +75,6 @@
   #:use-module (gnu packages wordnet)
   #:use-module (gnu packages xml))
 
-(define-public cmudict
-  (package
-    (name "cmudict")
-    (properties '((commit . "0f8072f814306c5ee4fbf992ed853601b12c01f9")
-                  (revision . "0")))
-    (version (git-version "0"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/cmusphinx/cmudict")
-              (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ri9r9ljbwv282lmv9cp3gmbwlanf99nhzvw83fjf12bc4nxl0qd"))))
-    (build-system copy-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'install-license-files))))
-    (home-page "https://github.com/cmusphinx/cmudict")
-    (synopsis "Pronouncing English dictionary")
-    (description
-     "CMUdict (the Carnegie Mellon Pronouncing Dictionary) is a free
-pronouncing dictionary of English, suitable for uses in speech technology and
-is maintained by the Speech Group in the School of Computer Science at
-Carnegie Mellon University.")
-    (license (license:fsdg-compatible
-              "https://github.com/cmusphinx/cmudict/blob/master/LICENSE"))))
-
 (define-public dico
   (package
     (name "dico")
@@ -781,47 +746,3 @@ Guix package is installed.")
  and export them to any format and application.")
       (home-page "https://freedict.org")
       (license license:gpl2+))))
-
-(define-public python-cmudict
-  (package
-    (name "python-cmudict")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/prosegrinder/python-cmudict")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ia9flqchgr975zjc9l1p379sglg9b56q9m09n05sag8368409k4"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "pyproject.toml"
-                ((".*importlib-resources.*")
-                 ""))))
-          (add-after 'ensure-no-mtimes-pre-1980 'inject-data
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((cmudict (search-input-file inputs "cmudict.dict")))
-                (rmdir "src/cmudict/data")
-                (copy-recursively (dirname cmudict) "src/cmudict/data"))))
-          (add-after 'install 'replace-by-symlink
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let ((cmudict (search-input-file inputs "cmudict.dict"))
-                    (target (string-append (site-packages inputs outputs)
-                                           "/cmudict/data")))
-                (delete-file-recursively target)
-                (symlink (dirname cmudict) target)))))))
-    (native-inputs (list python-poetry-core python-pytest python-setuptools))
-    (inputs (list cmudict))
-    (home-page "https://github.com/prosegrinder/python-cmudict")
-    (synopsis "Python wrapper for The CMU Pronouncing Dictionary data files")
-    (description
-     "This package provides a versioned python wrapper package for The CMU
-Pronouncing Dictionary data files.")
-    (license license:gpl3+)))

gnu/packages/diffoscope.scm

@@ -35,7 +35,6 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages firmware)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gnome)
@@ -79,7 +78,7 @@
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "307")
+    (version "306")
     (source
      (origin
        (method git-fetch)
@@ -88,7 +87,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0iclf59z01w4g569ksgn607ca61m2lm8znal00akysz76nkbnzxf"))))
+        (base32 "1cakqyf6sg4g3y3ykagnk4p0wzk285cb6b864mrafbwjkdv6m32w"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/disk.scm

@@ -471,14 +471,14 @@ output without any plausibility checks.")
 (define-public gptfdisk
   (package
     (name "gptfdisk")
-    (version "1.0.10")
+    (version "1.0.9")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
                           version "/gptfdisk-" version ".tar.gz"))
       (sha256
-       (base32 "10m2jgb2m6r0m6snjh0lsxr7ljw0ic5l9h3ki54yrffjqqdxdgia"))))
+       (base32 "1hjh5m77fmfq5m44yy61kchv7mbfgx026aw3jy5qxszsjckavzns"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -1052,8 +1052,8 @@ a card with a smaller capacity than stated.")
     (description "This package provides @code{parted} bindings for Python.")
     (license license:gpl2+)))
 
-(define-deprecated-package python-parted
-  python-pyparted)
+(define-public python-parted
+  (deprecated-package "python-parted" python-pyparted))
 
 (define-public duperemove
   (package

gnu/packages/django.scm

@@ -203,13 +203,13 @@ your project into different processes.")
 (define-public python-django
   (package
     (name "python-django")
-    (version "5.2.8")
+    (version "5.2.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django" version))
        (sha256
-        (base32 "0zvc8p4brwbj4yy8jxcannjfnik2xh4vis04c3x2r6mvlmk4h993"))))
+        (base32 "0yx82k8iilz8l6wkdvjcrz75i144lf211xybrrrks6b34wvh0pns"))))
     (build-system pyproject-build-system)
     (arguments
      '(#:test-flags
@@ -302,13 +302,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
   (package
     (inherit python-django)
     (name "python-django-4")
-    (version "4.2.26")
+    (version "4.2.23")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "django" version))
         (sha256
-         (base32 "0ylxdpkiwdh8yhqxqzm90fxiagm8v7xijvdm5ha3ypmmpj3y964k"))))
+         (base32 "1r7sbhllc6d903di0ydqy737s28m223lgpk69y6xhjb4dsxfmza2"))))
     (arguments
      (substitute-keyword-arguments (package-arguments python-django)
        ((#:phases phases)
@@ -854,6 +854,29 @@ information about the current request and response as a toolbar on the
 rendered page.")
     (license license:bsd-3)))
 
+(define-public python-django-debug-toolbar-alchemy
+  (package
+    (name "python-django-debug-toolbar-alchemy")
+    (version "0.1.5")
+    (home-page "https://github.com/miki725/django-debug-toolbar-alchemy")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "django-debug-toolbar-alchemy" version))
+              (sha256
+               (base32
+                "1kmpzghnsc247bc1dl22s4y62k9ijgy1pjms227018h5a4frsa5b"))))
+    (build-system python-build-system)
+    (arguments '(#:tests? #f))          ;XXX: 'make check' does "echo TODO"
+    (propagated-inputs
+     (list python-django python-django-debug-toolbar python-jsonplus
+           python-six python-sqlalchemy))
+    (synopsis "Django Debug Toolbar panel for SQLAlchemy")
+    (description
+     "This package completely mimics the default Django Debug Toolbar SQL
+panel (internally it is actually subclassed), but instead of displaying
+queries done via the Django ORM, SQLAlchemy generated queries are displayed.")
+    (license license:expat)))
+
 (define-public python-django-gravatar2
   (package
     (name "python-django-gravatar2")
@@ -1024,6 +1047,29 @@ applications with a @var{SEARCH_URL} variable.")
     (description "Pickled object field for Django")
     (license license:expat)))
 
+(define-public python-django-bulk-update
+  (package
+    (name "python-django-bulk-update")
+    (version "2.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "django-bulk-update" version))
+              (sha256
+               (base32
+                "0dxkmrm3skyw82i0qa8vklxw1ma1y308kh9w2hcnvhpacn5cxdss"))))
+    (build-system python-build-system)
+    (arguments
+     ;; XXX: Tests require a Postgres database.
+     `(#:tests? #f))
+    (propagated-inputs
+     (list python-django))
+    (home-page "https://github.com/aykut/django-bulk-update")
+    (synopsis "Simple bulk update over Django ORM or with helper function")
+    (description
+      "Simple bulk update over Django ORM or with helper function.  This
+project aims to bulk update given objects using one query over Django ORM.")
+    (license license:expat)))
+
 (define-public python-django-contact-form
   (package
     (name "python-django-contact-form")
@@ -1609,8 +1655,8 @@ Django projects, which allows association of a number of tags with any
 provides features like a Web-browsable API and authentication policies.")
     (license license:bsd-2)))
 
-(define-deprecated-package python-djangorestframework
-  python-django-rest-framework)
+(define-public python-djangorestframework
+  (deprecated-package "python-djangorestframework" python-django-rest-framework))
 
 (define-public python-django-sekizai
   (package

gnu/packages/dns.scm

@@ -642,18 +642,18 @@ BIND and djbdns---whilst using relatively little memory.")
 (define-public unbound
   (package
     (name "unbound")
-    (version "1.24.1")
+    (version "1.24.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.unbound.net/downloads/unbound-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1azfl6dkab043jjs7r8fxkh3mwxhg1wgc9q5mqcrch1rw8ricavz"))))
+        (base32 "11jh8qkjxgry4mlv5lyjzycziz2vhjrm3qh722i8l0677jc24yql"))))
     (build-system gnu-build-system)
     (outputs '("out" "python"))
     (native-inputs
-     (list flex pkg-config swig python-wrapper))
+     (list flex swig python-wrapper))
     (inputs
      (list expat
            libevent
@@ -1291,7 +1291,7 @@ nameservers other than libc.")
 (define-public smartdns
   (package
     (name "smartdns")
-    (version "47")
+    (version "46.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1303,7 +1303,7 @@ nameservers other than libc.")
                           ((".*SYSTEMDSYSTEMUNITDIR.*") "")))
               (sha256
                (base32
-                "10a4nnrnf10n4rq166yixm0va1j0sdj9vca3kpwkzgn9blwvbqph"))))
+                "0jjzvm4i5978gb2xhkx7fhqwzgjnvwyk9a2d88zzv93mal7q9xi2"))))
     (build-system gnu-build-system)
     (arguments
      (list #:test-target "test"
@@ -1338,8 +1338,6 @@ nameservers other than libc.")
                (add-after 'check 'leave-test-dir
                  (lambda _
                    (chdir "../../source"))))))
-    ;; NOTE: DoQ and DoH3 support require OpenSSL 3.4+, which is currently not
-    ;; available in Guix.
     (inputs (list openssl))
     (native-inputs (list googletest `(,isc-bind "utils") which))
     (home-page "https://github.com/pymumu/smartdns")

gnu/packages/docker.scm

@@ -49,7 +49,6 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
-  #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages linux)
@@ -68,110 +67,6 @@
 ;; of several associated packages (docker-libnetwork and go-sctp).
 (define %docker-version "20.10.27")
 
-(define-public go-github-com-compose-spec-compose-go-v2
-  (package
-    (name "go-github-com-compose-spec-compose-go-v2")
-    (version "2.9.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/compose-spec/compose-go")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "18z626vjd0cbqs130nsqhx0vfr6hxarvwgrw5acydy7hfv594aiq"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            ;; Build fails when this file is kept: Code in directory
-            ;; /tmp/<...>/src/github.com/compose-spec/compose-go/v2 expects
-            ;; import "github.com/compose-spec/compose-go"
-            (delete-file "package.go")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:embed-files
-      #~(list "applicator"
-              "content"
-              "core"
-              "format"
-              "format-annotation"
-              "format-assertion"
-              "meta-data"
-              "schema"
-              "unevaluated"
-              "validation")
-      #:import-path "github.com/compose-spec/compose-go/v2"
-      #:test-flags
-      #~(list "-skip" (string-join
-                       ;; error decoding 'services[test].environment':
-                       ;; environment variable DEBUG is declared with a
-                       ;; trailing space
-                       (list "TestEnvironmentWhitespace"
-                             ;; ports_test.go:80: assertion failed: expected
-                             ;; error "Invalid ip address: 127.0.1", got
-                             ;; "invalid IP address: 127.0.1"
-                             "Test_transformPorts/invalid_IP"
-                             ;; types_test.go:190: assertion failed: expected
-                             ;; error "Invalid containerPort: 9999999", got
-                             ;; "invalid containerPort: 9999999"
-                             "TestParsePortConfig")
-                       "|"))))
-    (native-inputs
-     (list go-github-com-google-go-cmp
-           go-github-com-stretchr-testify
-           go-gotest-tools-v3))
-    (propagated-inputs
-     (list go-github-com-distribution-reference
-           go-github-com-docker-go-connections
-           go-github-com-docker-go-units
-           go-github-com-go-viper-mapstructure-v2
-           go-github-com-mattn-go-shellwords
-           go-github-com-opencontainers-go-digest
-           go-github-com-santhosh-tekuri-jsonschema-v6
-           go-github-com-sirupsen-logrus
-           go-github-com-xhit-go-str2duration-v2
-           go-go-yaml-in-yaml-v3
-           go-golang-org-x-sync
-           go-golang-org-x-text))
-    (home-page "https://compose-spec.io/")
-    (synopsis "Reference library for parsing and loading Compose YAML files")
-    (description
-     "This package provides a Golang reference library for parsing and
-loading Compose files as specified by the
-@url{https://github.com/compose-spec/compose-spec, Compose specification}.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-docker-go-events
-  (package
-    (name "go-github-com-docker-go-events")
-    (version "0.0.0-20250808211157-605354379745")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/docker/go-events")
-             (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0q3ylzyl670m3an32nhb0l5bsc3f4d9b963x3pjwsc94brg9l5qp"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/docker/go-events"))
-    (propagated-inputs
-     (list go-github-com-sirupsen-logrus))
-    (home-page "https://github.com/docker/go-events")
-    (synopsis "Composable event distribution for Golang")
-    (description
-     "This package implements a composable event distribution library,
-originally created to implement the notifications in
-@url{https://github.com/distribution/distribution/blob/v3.0.0/docs/content/about/notifications.md,
-Docker Registry 2}.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-docker-go-metrics
   (package
     (name "go-github-com-docker-go-metrics")

gnu/packages/documentation.scm

@@ -410,7 +410,7 @@ the Net to search for documents which are not on the local system.")
 (define-public zeal
   (package
     (name "zeal")
-    (version "0.7.2")
+    (version "0.7.1")
     (source
      (origin
        (method git-fetch)
@@ -419,11 +419,10 @@ the Net to search for documents which are not on the local system.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1slq3asssszim9y4lvqx08svilmyisk3cl35mmb676fsx7pningn"))))
+        (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp"))))
     (build-system qt-build-system)
     (arguments
       (list
-       #:qtbase qtbase
        #:tests? #f))                    ;no tests
     (native-inputs
      (list extra-cmake-modules pkg-config))
@@ -431,10 +430,12 @@ the Net to search for documents which are not on the local system.")
      (list bash-minimal
            libarchive
            sqlite
-           qtdeclarative
-           qtwayland
-           qtwebchannel
-           qtwebengine
+           qtbase-5
+           qtdeclarative-5
+           qtwayland-5
+           qtwebchannel-5
+           qtwebengine-5
+           qtquickcontrols-5
            qtx11extras
            xcb-util-keysyms))
     (home-page "https://zealdocs.org/")

gnu/packages/dpdk.scm

@@ -41,7 +41,7 @@
 (define-public dpdk
   (package
     (name "dpdk")
-    (version "25.07")
+    (version "24.07")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -50,7 +50,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "12bzmaiw4f4hz62grsp7bid0z2rpibwc21j62bfwmz4j3zci0w81"))))
+                "04i4j4c5vcyldh0435hr01d2d5c0xf6y0sfg64764f79902i8p6i"))))
     (build-system meson-build-system)
     (native-inputs (list pkg-config python-minimal python-pyelftools))
     (inputs (list

gnu/packages/ebook.scm

@@ -68,7 +68,6 @@
   #:use-module (gnu packages language)
   #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages libusb)
-  #:use-module (gnu packages machine-learning)
   #:use-module (gnu packages music)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages pdf)
@@ -137,14 +136,14 @@ with Microsoft Compiled HTML (CHM) files")
 (define-public calibre
   (package
     (name "calibre")
-    (version "8.13.0")
+    (version "8.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "http://download.calibre-ebook.com/" version
                            "/calibre-" version ".tar.xz"))
        (sha256
-        (base32 "092zv9s0w87vwb5n54ps7lawjmwjqpmk93yp6lslnphpb6hqal6z"))
+        (base32 "1s9m80nakclxvsw0lax9bak23qipnia74xpy9sv061jvidqb3rz6"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -165,30 +164,29 @@ with Microsoft Compiled HTML (CHM) files")
     (build-system python-build-system)
     (native-inputs
      (list bash-minimal
-           cmake
            pkg-config
            python-flake8
            python-pyqt-builder
            qtbase                     ; for qmake
-           xdg-utils))
+           xdg-utils
+           cmake))
     (inputs
-     (list bash-minimal
-           espeak-ng
+     (list libxkbcommon
            ffmpeg
-           font-liberation
+           uchardet
+           bash-minimal
            fontconfig
+           font-liberation
            glib
            hunspell
            hyphen
            icu4c
-           libjpeg-turbo
-           libjxr
            libmtp
            libpng
+           libjpeg-turbo
+           libjxr
            libstemmer
            libusb
-           libxkbcommon
-           onnxruntime
            openssl
            optipng
            podofo
@@ -219,16 +217,15 @@ with Microsoft Compiled HTML (CHM) files")
            python-pychm
            python-pycryptodome
            python-pygments
-           python-pykakasi
            python-pyqt-6
            python-pyqtwebengine-6
+           python-pykakasi
            python-regex
            python-xxhash
+           speech-dispatcher
            python-zeroconf
            qtwebengine
-           speech-dispatcher
-           sqlite
-           uchardet))
+           sqlite))
     (arguments
      (list
       ;; Calibre is using setuptools by itself, but the setup.py is not
@@ -258,16 +255,6 @@ with Microsoft Compiled HTML (CHM) files")
               (substitute* "setup/plugins_mirror.py"
                 (("href=\"//calibre-ebook.com/favicon.ico\"")
                  "href=\"favicon.ico\""))))
-          (add-after 'unpack 'skip-7z-test ;FIXME: require py7zr >= 1.0
-            (lambda _
-              (substitute* "src/calibre/utils/seven_zip.py"
-                (("(def test_basic\\(\\).*)" line)
-                 (string-append line "\n    return True\n")))))
-          (add-after 'unpack 'skip-flaky-test
-            (lambda _
-              (substitute* "src/calibre/srv/tests/web_sockets.py"
-                (("^([ \t]*)def test_websocket_basic\\(.*" line lead)
-                 (string-append line "\n" lead "    return True\n")))))
           (add-before 'build 'configure
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "setup/build.py"

gnu/packages/education.scm

@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@@ -13,8 +13,6 @@
 ;;; Copyright © 2022 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2024 Luis Higino <luishenriquegh2701@gmail.com>
-;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +36,6 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages cups)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
@@ -455,42 +452,100 @@ specialized device.")
     (build-system qt-build-system)
     (arguments
      (list
-      #:qtbase qtbase
       #:tests? #f                       ;no tests
+      #:modules '((guix build qt-build-system)
+                  ((guix build gnu-build-system) #:prefix gnu:)
+                  (guix build utils))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'set-initial-values
-            ;; Remove useless "Check for updates" action from menu.
+            ;; Remove useless "Check for updates" action from menu.  Also
+            ;; prevent pop-up window about importing Open Sankore documents
+            ;; since we don't package OpenBoard-Importer.
             (lambda _
               (substitute* "src/core/UBSettings.cpp"
                 (("(appHideCheckForSoftwareUpdate = .*?)false(\\);)" _ beg end)
-                 (string-append beg "true" end))))))))
+                 (string-append beg "true" end))
+                (("(appLookForOpenSankoreInstall = .*?)true(\\);)" _ beg end)
+                 (string-append beg "false" end)))))
+          (add-after 'unpack 'fix-hard-coded-env
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/frameworks/UBPlatformUtils_linux.cpp"
+                (("/usr/bin/env") (search-input-file inputs "/bin/env")))))
+          (add-after 'unpack 'fix-library-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "OpenBoard.pro"
+                (("/usr/include/quazip5")
+                 (search-input-directory inputs "/include/QuaZip-Qt5-1.5/quazip"))
+                (("-lquazip5")
+                 "-lquazip1-qt5")
+                (("/usr/include/poppler")
+                 (search-input-directory inputs "/include/poppler")))))
+          (replace 'configure
+            (lambda _
+              (invoke "qmake" "OpenBoard.pro")))
+          (replace 'build (assoc-ref gnu:%standard-phases 'build))
+          (replace 'install
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let* ((share (string-append #$output "/share"))
+                     (openboard (string-append share "/openboard"))
+                     (i18n (string-append openboard "/i18n")))
+                ;; Install data.
+                (with-directory-excursion "resources"
+                  (for-each (lambda (directory)
+                              (let ((target
+                                     (string-append openboard "/" directory)))
+                                (mkdir-p target)
+                                (copy-recursively directory target)))
+                            '("customizations" "etc" "library"))
+                  (mkdir-p i18n)
+                  (for-each (lambda (f)
+                              (install-file f i18n))
+                            (find-files "i18n" "\\.qm$")))
+                ;; Install desktop file an icon.
+                (install-file "resources/images/OpenBoard.png"
+                              (string-append share
+                                             "/icons/hicolor/64x64/apps/"))
+                (make-desktop-entry-file
+                 (string-append share "/applications/" #$name ".desktop")
+                 #:name "OpenBoard"
+                 #:comment "Interactive whiteboard application"
+                 #:exec "openboard %f"
+                 #:icon "OpenBoard"
+                 #:mime-type "application/ubz"
+                 #:categories '("Education"))
+                ;; Install executable.
+                (install-file "build/linux/release/product/OpenBoard" openboard)
+                (let ((bin (string-append #$output "/bin")))
+                  (mkdir-p bin)
+                  (symlink (string-append openboard "/OpenBoard")
+                           (string-append bin "/openboard")))))))))
     (native-inputs
-     (list pkg-config qttools))
+     (list qttools-5))
     (inputs
      (list alsa-lib
            coreutils-minimal            ;for patched 'env' shebang
-           cups-minimal
-           ffmpeg
+           ffmpeg-4
            freetype
            lame
            libass
            libfdk
+           libressl
            libtheora
            libva
            libvorbis
            libvpx
            libx264
-           openssl
            opus
            poppler
-           qt5compat
-           qtdeclarative
-           qtmultimedia
-           qtsvg
-           qtwebchannel
-           qtwebengine
-           quazip
+           qtbase-5
+           qtdeclarative-5
+           qtmultimedia-5
+           qtsvg-5
+           qtwebchannel-5
+           qtwebengine-5
+           qtxmlpatterns-5
+           quazip-5
            sdl
            zlib))
     (home-page "https://openboard.ch/")
@@ -505,7 +560,7 @@ a pen-tablet display and a beamer.")
 (define-public fet
   (package
     (name "fet")
-    (version "7.5.4")
+    (version "6.28.4")
     (source
      (origin
        (method url-fetch)
@@ -514,7 +569,7 @@ a pen-tablet display and a beamer.")
               (list (string-append directory base)
                     (string-append directory "old/" base))))
        (sha256
-        (base32 "0vjjvr9vs3vxncrikchmk60qa99d5wyxja6b3p46vgfaziv1nj31"))))
+        (base32 "11mcbgi8lima4fng78lqdkd5km212drkk5l4bkzz1pz1k7wcykfn"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -541,7 +596,7 @@ algorithm.
 Usually, FET is able to solve a complicated timetable in maximum 5-20 minutes.
 For extremely difficult timetables, it may take a longer time, a matter of
 hours.")
-    (license license:agpl3)))
+    (license license:agpl3+)))
 
 (define-public klavaro
   (package
@@ -1075,61 +1130,6 @@ learning for programming languages.")
 simple concepts using multimedia flash cards and spaced reviews.")
     (license license:public-domain)))
 
-(define-public hardv
-  (package
-    (name "hardv")
-    (version "5.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/dongyx/hardv")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0l1wb7hlyldl5hq0z9a1a1rrgn33rjyqb08jph3q7mcn5p3qx40i"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:make-flags #~(list (string-append "prefix=" #$output)
-                                (string-append "CC=" #$(cc-for-target)))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-paths
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* (list "hardv.man1" "learn.c")
-                     (("/bin/sh")
-                      (search-input-file inputs "/bin/sh")))))
-               (delete 'configure)
-               (delete 'check)
-               (add-after 'install 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   ;; Tests can only be run after installation.
-                   (when tests?
-                     (setenv "PATH"
-                             (string-append #$output "/bin:" (getenv "PATH")))
-                     (invoke "make" "test")))))))
-    (home-page "https://github.com/dongyx/hardv")
-    (synopsis "Spaced repetition flash card program")
-    (description "HardV is a powerful spaced repetition flash card program.
-The key features are:
-
-@itemize
-@item HardV runs in the CLI mode by default, but you may configure it
-to be a TUI program, or to view images in a GUI window.
-@item HardV can open the editor, send the content you wrote to an online
-judging system, and determine the next quiz time by the judging result.
-@item It can be used to implement keyboard shortcut practice, cloze deletion,
-text-to-speech review, typing in the answer, and more.
-@item The format of input files are easy to be parsed by both human and other
-Unix utilities like grep, sed, and awk.
-@item Metadata like scheduled time is written back to input files; thus all
-your data is in files created and managed by yourself.
-@item HardV is a Unix filter in the default mode; that makes it easy to be
-called by other programs.  For example, you could pipe HardV to a voice
-synthesizer to make an audio quiz.
-@end itemize")
-    (license license:bsd-2)))
-
 (define-public tagainijisho
   (package
     (name "tagainijisho")

gnu/packages/electronics.scm

@@ -13,7 +13,7 @@
 ;;; Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
-;;; Copyright © 2020, 2021, 2022, 2023, 2024, 2025 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw>
 ;;; Copyright © 2022 Christian Gelinek <cgelinek@radlogic.com.au>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
@@ -21,9 +21,6 @@
 ;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
 ;;; Copyright © 2025 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022, 2025 Evgeny Pisemsky <mail@pisemsky.site>
-;;; Copyright © 2025, Ekaitz Zarraga <ekaitz@elenq.tech>
-;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,7 +73,6 @@
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gawk)
-  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages gettext)
@@ -96,7 +92,6 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages maths)
-  #:use-module (gnu packages mpi)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -625,48 +620,6 @@ used in the declarative section of design units.")
       (native-inputs
        '()))))
 
-(define-public libngspice
-  ;; Note: The ngspice's build system does not allow us to build both the
-  ;; library and the executables in one go.  Thus, we have two packages.
-  ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
-  (package
-    (name "libngspice")
-    (version "44.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://git.code.sf.net/p/ngspice/ngspice")
-              (commit (string-append "ngspice-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1vp27149kx8l7397bv5p708jqph1kma8rb9bl7ckgmbr9sw9cn3q"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f ;there are no tests for libngspice
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'install 'delete-scripts
-                     (lambda _
-                       (delete-file-recursively
-                        (string-append #$output
-                                       "/share/ngspice/scripts")))))
-      #:configure-flags #~(list "--enable-openmp" "--enable-cider"
-                                "--enable-xspice" "--with-ngshared")))
-    (native-inputs (list autoconf automake bison flex libtool))
-    (inputs (list openmpi))
-    (home-page "https://ngspice.sourceforge.io/")
-    (synopsis "Mixed-level/mixed-signal circuit simulator")
-    (description
-     "Ngspice is a mixed-level/mixed-signal circuit simulator.  It includes
-@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that
-provides code modeling support and simulation of digital components through
-an embedded event driven algorithm.")
-    (license (list license:lgpl2.0+ ;code in frontend/numparam
-                   (license:non-copyleft "file:///COPYING") ;spice3 bsd-style
-                   license:bsd-3 ;ciderlib
-                   license:public-domain)))) ;xspice
-
 (define librnd
   (package
     (name "librnd")
@@ -1053,32 +1006,13 @@ which allows one to install the M8 firmware on any Teensy.")
     (synopsis
      (string-append (package-synopsis nextpnr) " Cli only version."))))
 
-(define-deprecated-package nextpnr-ice40
-  nextpnr)
-
-(define-public ngspice
-  ;; The ngspice executables (see libngpsice above.)
-  (package
-    (inherit libngspice)
-    (name "ngspice")
-    (arguments
-     (substitute-keyword-arguments (package-arguments libngspice)
-       ;; Tests require a X server running, so we keep them disabled
-       ((#:configure-flags flags)
-        #~(cons*  "--enable-rpath" "--with-x" "--with-readline=yes"
-                  (delete "--with-ngshared" #$flags)))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (delete 'delete-scripts)))))
-    (native-inputs
-     (modify-inputs (package-native-inputs libngspice)
-       (append perl)))
-    (inputs (list libngspice readline libxaw libx11))))
+(define-public nextpnr-ice40
+  (deprecated-package "nextpnr-ice40" nextpnr))
 
 (define-public nvc
   (package
     (name "nvc")
-    (version "1.18.1")
+    (version "1.18.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1087,7 +1021,7 @@ which allows one to install the M8 firmware on any Teensy.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1l4aiaf2009wak7bccpm8x2pr27pr2b5w2naz874y8k98wqq5zlr"))))
+                "1b8bsmxv2p9v8g7yzdj8s22l5bx9n58kmbklgnj17gd362lai51y"))))
     (build-system gnu-build-system)
     (arguments
      (list #:out-of-source? #t
@@ -1395,8 +1329,8 @@ The following features are currently available:
 
 (define-public opensta
   ;; There are no releases, we use last commit.
-  (let ((commit "6e29fcb3f0d8a73af3a0913eb945b665a72e69cb")
-        (revision "1"))
+  (let ((commit "12f03395ec80d3593f4796b2a3cf5480e75735bd")
+        (revision "0"))
     (package
       (name "opensta")
       ;; The version string is taken from the CMakeLists.txt.
@@ -1409,7 +1343,7 @@ The following features are currently available:
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1drhgp4s6q8j4fhsbxn6szmxl48xdlq0x5z4g6z72img453qvglx"))))
+          (base32 "1gka50p4wv2b49d8jbw5fs3qg7cppa8ynl3diqgdf8mqgskwapzf"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -1584,35 +1518,6 @@ verification.")
         #~(modify-phases #$phases
             (delete 'fix-scripts)))))))
 
-(define-public python-pyucis
-  (package
-    (name "python-pyucis")
-    (version "0.1.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/fvutils/pyucis/")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19bxmhqkdmhbibkbzcjqvzvcni1kzg28nqz9vh6zj73hl26lf2ij"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
-    (propagated-inputs
-     (list python-jsonschema-objects
-           python-lxml
-           python-pyyaml))
-    (home-page "https://fvutils.github.io/pyucis//")
-    (synopsis "Python interface to UCIS data")
-    (description
-     "The code{PyUCIS} library provides two APIs for creating and accessing
-coverage data via the @acronym{UCIS, Unified Coverage Interoperability
-Standard} data mode.")
-    (license license:asl2.0)))
-
 (define-public python-cocotb
   (package
     (name "python-cocotb")
@@ -1911,7 +1816,7 @@ design.")
 (define-public python-vsg
   (package
     (name "python-vsg")
-    (version "3.35.0")
+    (version "3.34.0")
     (source
      (origin
        (method git-fetch)
@@ -1920,7 +1825,7 @@ design.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01hwida51bdyzv6wy71nby9cllf6nbvin5a0lhl4dizvnp3h4mb4"))))
+        (base32 "0sryf1wv4r5maxj4di5rpsmzcxins3gq8aksv7cpw6ywvdk1nj5l"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -2129,8 +2034,6 @@ input and outputs an XML dataset.")
           (add-after 'unpack 'adjust-default-settings
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "qucs/settings.cpp"
-                (("\"/usr/local/Xyce.*\"")
-                 (format #f "~s" (search-input-file inputs "bin/Xyce")))
                 (("\"ngspice\"")
                  (format #f "~s" (search-input-file inputs "bin/ngspice")))
                 (("\"octave\"")
@@ -2141,20 +2044,11 @@ input and outputs an XML dataset.")
                 `("PATH" ":" prefix
                   (,(string-append #$(this-package-input "ngspice") "/bin")
                    ,(string-append
-                     #$(this-package-input "qucsator-rf") "/bin")
-                   ,(string-append
-                     #$(this-package-input "xyce-serial") "/bin")))))))))
+                     #$(this-package-input "qucsator-rf") "/bin")))))))))
     (native-inputs (list qttools))
     (inputs
-     (list bash-minimal
-           ngspice
-           octave
-           qtbase
-           qtcharts
-           qtsvg
-           qtwayland
-           qucsator-rf
-           xyce-serial))
+     ;; TODO Add xyce-serial to the list.
+     (list bash-minimal octave qtbase qtcharts qtsvg qtwayland qucsator-rf ngspice))
     (synopsis "GUI for different circuit simulation kernels")
     (description
      "@acronym{Qucs-S, Quite universal circuit simulator with SPICE} provides
@@ -2249,7 +2143,7 @@ suite.")
 (define-public sch-rnd
   (package
     (name "sch-rnd")
-    (version "1.0.10")
+    (version "1.0.9")
     (source
      (origin
        (method url-fetch)
@@ -2257,7 +2151,7 @@ suite.")
                            "releases/sch-rnd-" version ".tar.gz"))
        (sha256
         (base32
-         "1wa43jhgzlchqpql9qdz7q4ps4wfk88akrl3pqgcb61mdwy51s20"))))
+         "07a1ik0rpsa5cscg9l7i5rnipx76543s7cdnkg802747rral7yj5"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      (list
@@ -2472,96 +2366,6 @@ using different abstraction levels.")
 VPI Interface, Elaborator, Serialization, Visitor and Listener.")
     (license license:asl2.0)))
 
-(define trilinos-serial-xyce
-  ;; Note: This is a Trilinos containing only the packages Xyce needs, so we
-  ;; keep it private.  See
-  ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#248>.
-  ;; TODO: Remove when we have modular Trilinos packages?
-  (package
-    (name "trilinos-serial-xyce")
-    (version "12.12.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/trilinos/Trilinos")
-             (commit (string-append "trilinos-release-"
-                                    (string-map (lambda (chr)
-                                                  (case chr
-                                                    ((#\.) #\-)
-                                                    (else chr)))
-                                                version)))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1smz3wlpfyjn0czmpl8bj4hw33p1zi9nnfygpsx7jl1523nypa1n"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #f                       ;no tests
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; Delete unneeded tribits(build system) directory which makes
-          ;; validate-runpath phase to fail.
-          (add-before 'validate-runpath 'delete-tribits
-            (lambda _
-              (delete-file-recursively
-               (string-append #$output "/lib/cmake/tribits")))))
-      #:configure-flags
-      #~(list "-DCMAKE_CXX_FLAGS=-O3 -fPIC"
-              "-DCMAKE_C_FLAGS=-O3 -fPIC"
-              "-DCMAKE_Fortran_FLAGS=-O3 -fPIC"
-              "-DTrilinos_ENABLE_NOX=ON"
-              "-DNOX_ENABLE_LOCA=ON"
-              "-DTrilinos_ENABLE_EpetraExt=ON"
-              "-DEpetraExt_BUILD_BTF=ON"
-              "-DEpetraExt_BUILD_EXPERIMENTAL=ON"
-              "-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON"
-              "-DTrilinos_ENABLE_TrilinosCouplings=ON"
-              "-DTrilinos_ENABLE_Ifpack=ON"
-              "-DTrilinos_ENABLE_Isorropia=ON"
-              "-DTrilinos_ENABLE_AztecOO=ON"
-              "-DTrilinos_ENABLE_Belos=ON"
-              "-DTrilinos_ENABLE_Teuchos=ON"
-              "-DTeuchos_ENABLE_COMPLEX=ON"
-              "-DTrilinos_ENABLE_Amesos=ON"
-              "-DAmesos_ENABLE_KLU=ON"
-              "-DAmesos_ENABLE_UMFPACK=ON"
-              "-DTrilinos_ENABLE_Sacado=ON"
-              "-DTrilinos_ENABLE_Kokkos=OFF"
-              "-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF"
-              "-DTPL_ENABLE_AMD=ON"
-              "-DTPL_ENABLE_UMFPACK=ON"
-              "-DTPL_ENABLE_BLAS=ON"
-              "-DTPL_ENABLE_LAPACK=ON")))
-    (native-inputs (list gfortran swig))
-    (inputs (list boost lapack suitesparse))
-    (home-page "https://trilinos.org")
-    (synopsis "Engineering and scientific problems algorithms")
-    (description
-     "The Trilinos Project is an effort to develop algorithms and enabling
-technologies within an object-oriented software framework for the solution of
-large-scale, complex multi-physics engineering and scientific problems.  A
-unique design feature of Trilinos is its focus on packages.")
-    (license (list license:lgpl2.1+
-                   license:bsd-3))))
-
-(define trilinos-parallel-xyce
-  (package
-    (inherit trilinos-serial-xyce)
-    (name "trilinos-parallel-xyce")
-    (arguments
-     (substitute-keyword-arguments
-         (package-arguments trilinos-serial-xyce)
-       ((#:configure-flags flags)
-        #~(cons* "-DTrilinos_ENABLE_ShyLU=ON"
-                 "-DTrilinos_ENABLE_Zoltan=ON"
-                 "-DTPL_ENABLE_MPI=ON"
-                 #$flags))))
-    (inputs
-     (modify-inputs (package-inputs trilinos-serial-xyce)
-       (prepend openmpi)))))
-
 (define-public verilator
   (package
     (name "verilator")
@@ -2622,93 +2426,27 @@ and coverage-analysis points.  It outputs single- or multi-threaded
     (license license:lgpl3)))
 
 (define-public xoscope
-  (let ((revision "0.0.0")
-        (commit "d97b9b186a4137582ae27fce1da73f51c06f852e"))
   (package
     (name "xoscope")
-    (version (git-version "2.3" revision commit))
+    (version "2.3")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://git.code.sf.net/p/xoscope/code")
-                     (commit commit)))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/xoscope/xoscope/"
+                                  version "/xoscope-" version ".tar.gz"))
               (sha256
                (base32
-                "1jaz14pb8lx1y34f979v507dmkrq3wdczi0hkqzb64zg76cdkwya"))))
+                "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list m4 pkg-config automake libtool autoconf))
+     (list m4 pkg-config))
     (inputs
      (list alsa-lib comedilib fftw gtk+ gtkdatabox))
     (synopsis "Digital oscilloscope")
     (description "Xoscope is a digital oscilloscope that can acquire signals
 from ALSA, ESD, and COMEDI sources.  This package currently does not include
-support for ESD or COMEDI sources.")
+support for ESD sources.")
     (home-page "https://xoscope.sourceforge.net/")
-    (license license:gpl2+))))
-
-(define-public xyce-serial
-  (package
-    (name "xyce-serial")
-    (version "6.8")
-    (source
-     (origin (method url-fetch)
-             (uri (string-append "https://archive.org/download/Xyce-"
-                                 version "/Xyce-" version ".tar.gz"))
-             (sha256
-              (base32
-               "09flp1xywbb2laayd9rg8vd0fjsh115y6k1p71jacy0nrbdvvlcg"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f
-      #:configure-flags
-      #~(list
-         "CXXFLAGS=-O3"
-         (string-append "CFLAGS="
-                        " -Wno-error=builtin-declaration-mismatch"
-                        " -Wno-error=implicit-function-declaration"
-                        " -Wno-error=implicit-int")
-         (string-append "ARCHDIR=" #$trilinos-serial-xyce))))
-    (native-inputs
-     (list bison-3.0                    ;'configure' fails with Bison 3.4
-           flex
-           gfortran))
-    (inputs
-     (list fftw lapack suitesparse trilinos-serial-xyce))
-    (home-page "https://xyce.sandia.gov/")
-    (synopsis "High-performance analog circuit simulator")
-    (description
-     "Xyce is a SPICE-compatible, high-performance analog circuit simulator,
-capable of solving extremely large circuit problems by supporting large-scale
-parallel computing platforms.  It also supports serial execution.")
-    (license license:gpl3+)))
-
-(define-public xyce-parallel
-  (package
-    (inherit xyce-serial)
-    (name "xyce-parallel")
-    (arguments
-     (substitute-keyword-arguments
-         (package-arguments xyce-serial)
-       ((#:configure-flags flags)
-        #~(list "CXXFLAGS=-O3"
-                "CXX=mpiCC"
-                "CC=mpicc"
-                "F77=mpif77"
-                "--enable-mpi"
-                (string-append
-                 "CFLAGS="
-                 " -Wno-error=builtin-declaration-mismatch"
-                 " -Wno-error=implicit-function-declaration"
-                 " -Wno-error=implicit-int")
-                (string-append "ARCHDIR=" #$trilinos-parallel-xyce)))))
-    (propagated-inputs (list openmpi))
-    (inputs
-     (modify-inputs (package-inputs xyce-serial)
-       (append zlib)
-       (replace "trilinos-serial-xyce" trilinos-parallel-xyce)))))
+    (license license:gpl2+)))
 
 (define-public yosys
   (package

gnu/packages/elf.scm

@@ -15,7 +15,6 @@
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
-;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,17 +37,12 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module (guix build-system meson)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages pkg-config)
@@ -397,60 +391,6 @@ changed.")
                 (substitute* "tests/set-empty-rpath.sh"
                   (("^\\$\\{SCRATCH\\}\\/simple.$") ""))))))))))
 
-(define-public pax-utils
-  (package
-    (name "pax-utils")
-    (version "1.3.8")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://anongit.gentoo.org/git/proj/pax-utils.git")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1vxklqnabhy15idrg5s2m07lk1hqyf9fnvsfy66n2rdmqijn5rvw"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:modules '((guix build meson-build-system)
-                  (guix build utils)
-                  (srfi srfi-26))
-      #:configure-flags #~(list "-Dlddtree_implementation=sh")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'wrap-lddtree
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let* ((needed-bin
-                      (map (cut string-append <> "/bin")
-                           (list #$(this-package-input "coreutils-minimal")
-                                 #$(this-package-input "gawk")
-                                 #$(this-package-input "sed")
-                                 #$output)))
-                     (PATH `("PATH" = (,@needed-bin))))
-                (for-each (lambda (p)
-                            (wrap-program
-                                (search-input-file outputs
-                                                   (string-append "bin/" p))
-                              PATH))
-                          (list "lddtree" "symtree"))))))))
-    (native-inputs (list docbook-xsl xmlto))
-    (inputs (list bash-minimal coreutils-minimal gawk sed))
-    (home-page "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities")
-    (synopsis "ELF integrity and security-focused utils")
-    (description "The pax-utils package contains a small set of utilities
-for performing mostly security checks on systems.  It is focused on the ELF
-format.  The included utilities are:
-@table @command
-@item pspax List ELF/PaX information about running processes
-@item scanelf Scan ELF binaries
-@item dumpelf Dump internal ELF structure
-@item scanmacho Scan Mach-O binaries
-@item symtree Display libraries that satisfy undefined symbols, as a tree
-@item lddtree Display ELF dependencies as a tree.
-@end table")
-    (license license:gpl2+)))
-
 (define-public libdwarf
   (package
     (name "libdwarf")

gnu/packages/elm.scm

@@ -174,8 +174,8 @@ such as @command{elm make} and @command{elm repl}.")
     (license license:bsd-3)))
 
 ;; The 'elm' package used to be called 'elm-compiler'.
-(define-deprecated-package elm-compiler
-  elm)
+(define-public elm-compiler
+  (deprecated-package "elm-compiler" elm))
 
 (define-public elm-core
   (package

gnu/packages/emacs.scm

@@ -711,8 +711,8 @@ editor (with wide ints)" )
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
 (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
-(define-deprecated-package emacs-next-tree-sitter
-  emacs-next)
+(define-public emacs-next-tree-sitter
+  (deprecated-package "emacs-next-tree-sitter" emacs-next))
 
 (define-public guile-emacs
   (let ((upstream-version "31.0.50")

gnu/packages/emulators.scm

@@ -69,7 +69,6 @@
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages containers)
-  #:use-module (gnu packages cpp)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages digest)
@@ -95,14 +94,12 @@
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages music)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
-  #:use-module (gnu packages ninja)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages pulseaudio)
@@ -2081,8 +2078,8 @@ metadata about each known libretro core.  The snapshot is taken from the
 @url{https://github.com/libretro/libretro-super, libretro-super} repository.")
     (license license:expat)))
 
-(define-deprecated-package retroarch-core-info
-  libretro-core-info)
+(define-public retroarch-core-info
+  (deprecated-package "retroarch-core-info" libretro-core-info))
 
 (define-public libretro-database
   (package
@@ -3629,137 +3626,6 @@ assembler, and debugger for the Intel 8085 microprocessor.
 improvements.")
       (license license:gpl2+))))
 
-(define-public pcsx2-patches
-  (let ((commit "2fdc835f0725b318efcdaae84db1c73a9139b6f6")
-        (revision "0"))
-    (package
-      (name "pcsx2-patches")
-      (version (git-version "2025.10.24" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-	       (url "https://github.com/PCSX2/pcsx2_patches")
-	       (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0qn9jwk983hxzrf2x550wcb9l782618lm662w5fb6cw81bbrv5is"))))
-      (build-system copy-build-system)
-      (arguments
-       (list
-        #:phases
-        #~(modify-phases %standard-phases
-	    (add-before 'install 'compress
-	      (lambda _
-                (with-directory-excursion "patches"
-                  (apply invoke "7z" "a" "-r" "patches.zip"
-                         (find-files "."))))))
-        #:install-plan #~(list '("patches/patches.zip" "patches.zip"))))
-      (native-inputs (list 7zip))
-      (home-page "https://github.com/PCSX2/pcsx2_patches")
-      (synopsis "PCSX2 widescreen and de-interlacing patches")
-      (description "This package provides game-specific widescreen and
-de-interlacing patches for use with PCSX2.")
-      (license license:gpl3+))))           ;same as pcsx2
-
-(define-public pcsx2
-  (package
-    (name "pcsx2")
-    (version "2.4.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/PCSX2/pcsx2")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0nr53cjifqwnz3icxsj01yd3aw1vfsfxga4zz5zi8aqr175mvq27"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (substitute* "pcsx2/Pcsx2Config.cpp"
-	      (("Path::Canonicalize\\(Path::GetDirectory\\(program_path\\)\\);")
-	       "Path::Canonicalize(
-((std::string)Path::GetDirectory(program_path)).append(\"/../share/\"));"))
-            (delete-file-recursively "3rdparty/d3d12memalloc")
-            (delete-file-recursively "3rdparty/winpixeventruntime")
-            (delete-file-recursively "3rdparty/winwil")))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:parallel-build? #t
-      #:configure-flags
-      #~(list "-DCMAKE_C_COMPILER=clang"
-              "-DCMAKE_CXX_COMPILER=clang++"
-              "-DCMAKE_PREFIX_PATH=\"$PWD/deps\""
-              "-GNinja")
-      #:imported-modules `((guix build copy-build-system)
-                           ,@%cmake-build-system-modules)
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'build
-            (lambda _
-              (invoke "ninja" "-j" (number->string (parallel-job-count)))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests? (invoke "ninja" "unittests"))))
-          (replace 'install
-            (lambda* args
-              (apply
-               (assoc-ref (@ (guix build copy-build-system) %standard-phases)
-                          'install)
-               #:install-plan
-               '(("bin/pcsx2-qt" "bin/")
-                 ("bin/resources" "share/")
-                 ("bin/translations" "share/")
-                 ("../source/.github/workflows/scripts/linux/pcsx2-qt.desktop"
-                  "share/applications/"))
-               args)))
-          (add-after 'install 'install-patches
-            (lambda* (#:key inputs #:allow-other-keys)
-              (install-file (search-input-file %build-inputs "/patches.zip")
-                            (string-append #$output "/share/resources")))))))
-    (inputs (list (module-ref
-                   (resolve-interface '(gnu packages debug)) 'libbacktrace)
-                  `(,zstd-1.5.7 "lib")
-                  curl
-                  dbus
-                  eudev
-                  ffmpeg
-                  freetype
-                  kddockwidgets
-                  libaio
-                  libjpeg-turbo
-                  libpcap
-                  libpng-for-pcsx2
-                  libwebp
-                  libxrandr
-                  lz4
-                  pcsx2-patches
-                  plutovg
-                  plutosvg
-                  qtbase
-                  qtdeclarative
-                  qtsvg
-                  qttools
-                  qtwayland
-                  sdl3
-                  shaderc
-                  vulkan-headers
-                  wayland
-                  libxi))
-    (native-inputs (list clang-17 extra-cmake-modules ninja pkg-config))
-    (home-page "https://pcsx2.net")
-    (synopsis "PlayStation 2 (PS2) emulator")
-    (description
-     "PCSX2 is a free and open-source PlayStation 2 (PS2)
-emulator.  Its purpose is to emulate the PS2's hardware, using a combination
-of MIPS CPU interpreters, recompilers and a virtual machine which manages
-hardware states and PS2 system memory.  This allows you to play PS2 games on
-your PC, with many additional features and benefits.")
-    (license license:gpl3+)))
-
 (define-public gens-gs
   (package
     (name "gens-gs")
@@ -4787,14 +4653,14 @@ device contains a @code{exec} port to interface with the host system.")
        (sha256
         (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"))))
     (build-system pyproject-build-system)
-    ;; Tests either require kstool, or Python 2, or are 10 years old and fail.
-    (arguments (list #:tests? #f))          ; no tests
+    (arguments
+     (list #:tests? #f)) ;no tests in PyPI archive
     (native-inputs
      (list cmake-minimal
-           python-setuptools))
+           python-setuptools
+           python-wheel))
     (home-page "https://www.keystone-engine.org")
-    (synopsis
-     "Lightweight multi-platform, multi-architecture assembler framework")
+    (synopsis "Lightweight multi-platform, multi-architecture assembler framework")
     (description
      "Keystone is a lightweight multi-platform, multi-architecture
 assembler framework.  It supports a wide-range of different architectures

gnu/packages/engineering.scm

@@ -105,7 +105,6 @@
   #:use-module (gnu packages digest)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages electronics)
   #:use-module (gnu packages emacs-build)
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages file)
@@ -722,21 +721,12 @@ multipole-accelerated algorithm.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"))
-       (patches (search-patches "fritzing-0.9.6-fix-types.patch"))))
+        (base32 "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"))))
     (build-system gnu-build-system)
     (arguments
      (list
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-files
-            (lambda _
-              ;; Trick the internal mechanism to load the parts
-              (substitute* "src/version/partschecker.cpp"
-                ((".*git_libgit2_init.*")
-                 "return \"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";"))
-              (substitute* "src/utils/textutils.cpp"
-                (("QUuid::createUuid\\(\\)") "QUuid()"))))
           (replace 'configure
             (lambda _
               ;; Integrate parts library
@@ -753,22 +743,17 @@ multipole-accelerated algorithm.")
                   "INCLUDEPATH += $$LIBGIT2INCLUDE\n"
                   "LIBS += -L$$LIBGIT2LIB -lgit2\n"))
                 (("^.*pri/libgit2detect.pri.") ""))
+              ;; Trick the internal mechanism to load the parts
+              (substitute* "src/version/partschecker.cpp"
+                ((".*git_libgit2_init.*")
+                 "return \"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";"))
+              ;; XXX: NixOS and Gento have a phase where they generate part
+              ;; SQLite library, have proper investigation if it's required in
+              ;; Guix as well.
               (invoke "qmake"
                       (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," #$output "/lib")
                       (string-append "PREFIX=" #$output)
-                      "phoenix.pro")))
-          (add-after 'install 'generate-parts-db
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out"))
-                    (env-qt-qpa-platform (getenv "QT_QPA_PLATFORM"))
-                    (env-qt-hash-seed (getenv "QT_HASH_SEED")))
-                (setenv "QT_QPA_PLATFORM" "offscreen")
-                (setenv "QT_HASH_SEED" "0")
-                (invoke (string-append out "/bin/Fritzing")
-                        "-db" (string-append out "/share/fritzing/parts/parts.db")
-                        "-folder" (string-append out "/share/fritzing"))
-                (setenv "QT_QPA_PLATFORM" env-qt-qpa-platform)
-                (setenv "QT_HASH_SEED" env-qt-hash-seed)))))))
+                      "phoenix.pro"))))))
     (native-inputs
      (list fritzing-parts))
     (inputs
@@ -1181,32 +1166,24 @@ Emacs).")
                  `("PATH" ":" prefix
                    (,(string-append python "/bin:"))))))))))
     (native-search-paths
-     ;; Currently, KiCad environment variables are single-valued
-     ;; (see https://gitlab.com/kicad/code/kicad/-/issues/14792).
      (list (search-path-specification
             (variable "KICAD") ;to find kicad-doc
-            (files '(""))
-            (separator #f))
+            (files '("")))
            (search-path-specification
             (variable "KICAD9_TEMPLATE_DIR")
-            (files '("share/kicad/template"))
-            (separator #f))
+            (files '("share/kicad/template")))
            (search-path-specification
             (variable "KICAD9_SYMBOL_DIR")
-            (files '("share/kicad/symbols"))
-            (separator #f))
+            (files '("share/kicad/symbols")))
            (search-path-specification
             (variable "KICAD9_FOOTPRINT_DIR")
-            (files '("share/kicad/footprints"))
-            (separator #f))
+            (files '("share/kicad/footprints")))
            (search-path-specification
             (variable "KICAD9_3DMODEL_DIR")
-            (files '("share/kicad/3dmodels"))
-            (separator #f))
+            (files '("share/kicad/3dmodels")))
            (search-path-specification
             (variable "KICAD_STOCK_DATA_HOME")
-            (files '("share/kicad"))
-            (separator #f))))
+            (files '("share/kicad")))))
     (native-inputs (list boost
                          desktop-file-utils
                          gettext-minimal
@@ -1726,7 +1703,7 @@ or an Ethernet connection.")
 (define-public harminv
   (package
     (name "harminv")
-    (version "1.4.2")
+    (version "1.4.1")
     (source (origin
               (method url-fetch)
               (uri
@@ -1735,7 +1712,7 @@ or an Ethernet connection.")
                               name "-" version ".tar.gz"))
               (sha256
                (base32
-                "18n71d3wj0jnldh72vb9lfj3vv64s1i2rmnhcpq4494p23vip6js"))))
+                "0w1n4d249vlpda0hi6z1v13qp21vlbp3ykn0m8qg4rd5132j7fg1"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--enable-shared")
@@ -1806,17 +1783,7 @@ for scientific simulations.")
        (list (string-append "--with-libctl="
                             (assoc-ref %build-inputs "libctl")
                             "/share/libctl")
-             "--enable-shared")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'relax-gcc-14-strictness
-           (lambda _
-             (setenv "CFLAGS"
-                     (string-join
-                      (list "-Wno-error=incompatible-pointer-types"
-                            "-Wno-error=implicit-function-declaration"
-                            "-Wno-error=int-conversion")
-                      " ")))))))
+             "--enable-shared")))
     (native-inputs
      `(("fortran" ,gfortran)
        ("pkg-config" ,pkg-config)
@@ -2267,15 +2234,6 @@ and a fallback for environments without libc for Zydis.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
-         (add-before 'build 'relax-gcc-14-strictness
-           (lambda _
-             (substitute* (find-files "." "Makefile")
-               (("CFLAGS = (.*)$" all options)
-                (string-append "CFLAGS = "
-                               " -Wno-error=incompatible-pointer-types"
-                               " -Wno-error=implicit-function-declaration"
-                               " "
-                               options)))))
          (add-before 'build 'fix-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((coreutils (assoc-ref inputs "coreutils-minimal")))
@@ -2305,6 +2263,212 @@ and a fallback for environments without libc for Zydis.")
 high-performance parallel differential evolution (DE) optimization algorithm.")
     (license license:gpl2+)))
 
+(define-public libngspice
+  ;; Note: The ngspice's build system does not allow us to build both the
+  ;; library and the executables in one go.  Thus, we have two packages.
+  ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
+  (package
+    (name "libngspice")
+    (version "44.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.code.sf.net/p/ngspice/ngspice")
+              (commit (string-append "ngspice-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vp27149kx8l7397bv5p708jqph1kma8rb9bl7ckgmbr9sw9cn3q"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:tests? #f ;there are no tests for libngspice
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'delete-scripts
+                     (lambda _
+                       (delete-file-recursively
+                        (string-append #$output
+                                       "/share/ngspice/scripts")))))
+      #:configure-flags #~(list "--enable-openmp" "--enable-cider"
+                                "--enable-xspice" "--with-ngshared")))
+    (native-inputs (list autoconf automake bison flex libtool))
+    (inputs (list openmpi))
+    (home-page "https://ngspice.sourceforge.io/")
+    (synopsis "Mixed-level/mixed-signal circuit simulator")
+    (description
+     "Ngspice is a mixed-level/mixed-signal circuit simulator.  It includes
+@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that
+provides code modeling support and simulation of digital components through
+an embedded event driven algorithm.")
+    (license (list license:lgpl2.0+ ;code in frontend/numparam
+                   (license:non-copyleft "file:///COPYING") ;spice3 bsd-style
+                   license:bsd-3 ;ciderlib
+                   license:public-domain)))) ;xspice
+
+(define-public ngspice
+  ;; The ngspice executables (see libngpsice above.)
+  (package
+    (inherit libngspice)
+    (name "ngspice")
+    (arguments
+     (substitute-keyword-arguments (package-arguments libngspice)
+       ;; Tests require a X server running, so we keep them disabled
+       ((#:configure-flags flags)
+        #~(cons*  "--enable-rpath" "--with-x" "--with-readline=yes"
+                 (delete "--with-ngshared" #$flags)))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (delete 'delete-scripts)))))
+    (native-inputs
+     (modify-inputs (package-native-inputs libngspice)
+       (append perl)))
+    (inputs (list libngspice readline libxaw libx11))))
+
+(define trilinos-serial-xyce
+  ;; Note: This is a Trilinos containing only the packages Xyce needs, so we
+  ;; keep it private.  See
+  ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#248>.
+  ;; TODO: Remove when we have modular Trilinos packages?
+  (package
+    (name "trilinos-serial-xyce")
+    (version "12.12.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/trilinos/Trilinos")
+             (commit (string-append "trilinos-release-"
+                                    (string-map (lambda (chr)
+                                                  (case chr
+                                                    ((#\.) #\-)
+                                                    (else chr)))
+                                                version)))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1smz3wlpfyjn0czmpl8bj4hw33p1zi9nnfygpsx7jl1523nypa1n"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:out-of-source? #t
+       #:phases
+       (modify-phases %standard-phases
+         ;; Delete unneeded tribits(build system) directory which makes validate-runpath
+         ;; phase to fail.
+         (add-before 'validate-runpath 'delete-tribits
+           (lambda* (#:key outputs #:allow-other-keys)
+             (delete-file-recursively
+              (string-append (assoc-ref outputs "out")
+                             "/lib/cmake/tribits")))))
+       #:configure-flags
+       (list "-DCMAKE_CXX_FLAGS=-O3 -fPIC"
+             "-DCMAKE_C_FLAGS=-O3 -fPIC"
+             "-DCMAKE_Fortran_FLAGS=-O3 -fPIC"
+             "-DTrilinos_ENABLE_NOX=ON"
+             "-DNOX_ENABLE_LOCA=ON"
+             "-DTrilinos_ENABLE_EpetraExt=ON"
+             "-DEpetraExt_BUILD_BTF=ON"
+             "-DEpetraExt_BUILD_EXPERIMENTAL=ON"
+             "-DEpetraExt_BUILD_GRAPH_REORDERINGS=ON"
+             "-DTrilinos_ENABLE_TrilinosCouplings=ON"
+             "-DTrilinos_ENABLE_Ifpack=ON"
+             "-DTrilinos_ENABLE_Isorropia=ON"
+             "-DTrilinos_ENABLE_AztecOO=ON"
+             "-DTrilinos_ENABLE_Belos=ON"
+             "-DTrilinos_ENABLE_Teuchos=ON"
+             "-DTeuchos_ENABLE_COMPLEX=ON"
+             "-DTrilinos_ENABLE_Amesos=ON"
+             "-DAmesos_ENABLE_KLU=ON"
+             "-DAmesos_ENABLE_UMFPACK=ON"
+             "-DTrilinos_ENABLE_Sacado=ON"
+             "-DTrilinos_ENABLE_Kokkos=OFF"
+             "-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF"
+             "-DTPL_ENABLE_AMD=ON"
+             "-DTPL_ENABLE_UMFPACK=ON"
+             "-DTPL_ENABLE_BLAS=ON"
+             "-DTPL_ENABLE_LAPACK=ON")))
+    (native-inputs (list gfortran swig))
+    (inputs (list boost lapack suitesparse))
+    (home-page "https://trilinos.org")
+    (synopsis "Engineering and scientific problems algorithms")
+    (description
+     "The Trilinos Project is an effort to develop algorithms and enabling
+technologies within an object-oriented software framework for the solution of
+large-scale, complex multi-physics engineering and scientific problems.  A
+unique design feature of Trilinos is its focus on packages.")
+    (license (list license:lgpl2.1+
+                   license:bsd-3))))
+
+(define-public xyce-serial
+  (package
+    (name "xyce-serial")
+    (version "6.8")
+    (source
+     (origin (method url-fetch)
+             (uri (string-append "https://archive.org/download/Xyce-"
+                                 version "/Xyce-" version ".tar.gz"))
+             (sha256
+              (base32
+               "09flp1xywbb2laayd9rg8vd0fjsh115y6k1p71jacy0nrbdvvlcg"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f
+       #:configure-flags
+       (list
+        "CXXFLAGS=-O3"
+        (string-append "ARCHDIR="
+                       (assoc-ref %build-inputs "trilinos")))))
+    (native-inputs
+     `(("bison" ,bison-3.0)                  ;'configure' fails with Bison 3.4
+       ("flex" ,flex)
+       ("fortran" ,gfortran)))
+    (inputs
+     `(("fftw" ,fftw)
+       ("suitesparse" ,suitesparse)
+       ("lapack" ,lapack)
+       ("trilinos" ,trilinos-serial-xyce)))
+    (home-page "https://xyce.sandia.gov/")
+    (synopsis "High-performance analog circuit simulator")
+    (description
+     "Xyce is a SPICE-compatible, high-performance analog circuit simulator,
+capable of solving extremely large circuit problems by supporting large-scale
+parallel computing platforms.  It also supports serial execution.")
+    (license license:gpl3+)))
+
+(define trilinos-parallel-xyce
+  (package (inherit trilinos-serial-xyce)
+    (name "trilinos-parallel-xyce")
+    (arguments
+     `(,@(substitute-keyword-arguments (package-arguments trilinos-serial-xyce)
+           ((#:configure-flags flags)
+            `(append (list "-DTrilinos_ENABLE_ShyLU=ON"
+                           "-DTrilinos_ENABLE_Zoltan=ON"
+                           "-DTPL_ENABLE_MPI=ON")
+                     ,flags)))))
+    (inputs
+     `(("mpi" ,openmpi)
+       ,@(package-inputs trilinos-serial-xyce)))))
+
+(define-public xyce-parallel
+  (package (inherit xyce-serial)
+    (name "xyce-parallel")
+    (arguments
+     `(,@(substitute-keyword-arguments (package-arguments xyce-serial)
+           ((#:configure-flags flags)
+            `(list "CXXFLAGS=-O3"
+                   "CXX=mpiCC"
+                   "CC=mpicc"
+                   "F77=mpif77"
+                   "--enable-mpi"
+                   (string-append
+                    "ARCHDIR="
+                    (assoc-ref %build-inputs "trilinos")))))))
+    (propagated-inputs
+     `(("mpi" ,openmpi)))
+    (inputs
+     `(("trilinos" ,trilinos-parallel-xyce)
+       ,@(alist-delete "trilinos"
+                       (package-inputs xyce-serial))))))
+
 (define-public librepcb
   (package
     (name "librepcb")
@@ -3088,7 +3252,7 @@ but also adds new features and improves existing ones.")
 (define-public emacs-scad-mode
   (package
     (name "emacs-scad-mode")
-    (version "97.0")
+    (version "96.0")
     (source
      (origin
        (method git-fetch)
@@ -3096,7 +3260,7 @@ but also adds new features and improves existing ones.")
              (url "https://github.com/openscad/emacs-scad-mode")
              (commit version)))
        (sha256
-        (base32 "1h86z2qn9q7ww2m7p992fx8abzdffcd3bcp3bmck3c9q2aksjl5j"))
+        (base32 "0vsidz3qws89z8blq5nng7mvzn3kj06lw9417aymhykyjgjn5f8m"))
        (file-name (git-file-name name version))))
     (build-system emacs-build-system)
     (propagated-inputs (list emacs-compat))
@@ -3674,10 +3838,6 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
                              "/share/vim/vimfiles/pack/guix/start/poke")
               (string-append "--with-lispdir="
                              (emacs:elpa-directory #$output)))))
-    (native-search-paths
-     (list (search-path-specification
-             (variable "POKE_LOAD_PATH")
-             (files '("share/poke/pickles")))))
     (home-page "https://www.gnu.org/software/poke/#documentation")
     (synopsis "Editing of arbitrary binary data")
     (description "GNU poke is an interactive, extensible editor for binary data.
@@ -3686,30 +3846,10 @@ full-fledged procedural, interactive programming language designed to describe
 data structures and to operate on them.")
     (license license:gpl3+)))
 
-(define-public poke-elf
-  (package
-    (name "poke-elf")
-    (version "1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/poke/poke-elf-" version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "0x3shih7sjj34f5305kvbp4cfy11m92zwidjk3658m23zkd6gdqa"))))
-    (build-system gnu-build-system)
-    (native-inputs (list poke))         ;for the test suite
-    (home-page "https://jemarch.net/poke-elf")
-    (synopsis "GNU poke pickle for ELF object files")
-    (description "@code{poke-elf} is a GNU poke pickle for editing ELF object files,
-executables, shared libraries and core dumps.  It supports many architectures
-and extensions.")
-    (license license:gpl3+)))
-
-;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is
-;; a different beast.
-(define-deprecated-package emacs-poke
-  poke)
+(define-public emacs-poke
+  ;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is
+  ;; a different beast.
+  (deprecated-package "emacs-poke" poke))
 
 (define-public pcb2gcode
   ;; XXX: The latest release was on <2022-09-12>, but master branch contains a

gnu/packages/enlightenment.scm

@@ -443,6 +443,47 @@ embedded systems.")
 Libraries stack (eo, evas, ecore, edje, emotion, ethumb and elementary).")
     (license license:lgpl3)))
 
+(define-public edi
+  (package
+    (name "edi")
+    (version "0.8.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://github.com/Enlightenment/edi/releases/"
+                            "download/v" version "/edi-" version ".tar.xz"))
+        (sha256
+         (base32
+          "01k8gp8r2wa6pyg3dkbm35m6hdsbss06hybghg0qjmd4mzswcd3a"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-clang-header
+           (lambda _
+             (substitute* "scripts/clang_include_dir.sh"
+               (("grep clang") "grep clang | head -n1"))
+             #t))
+         (add-after 'unpack 'set-home-directory
+           ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
+           (lambda _ (setenv "HOME" "/tmp") #t)))
+       #:tests? #f)) ; tests require running dbus service
+    (native-inputs
+     `(("check" ,check)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     (list clang efl))
+    (home-page "https://www.enlightenment.org/about-edi")
+    (synopsis "Development environment for Enlightenment")
+    (description "EDI is a development environment designed for and built using
+the EFL.  It's aim is to create a new, native development environment for Linux
+that tries to lower the barrier to getting involved in Enlightenment development
+and in creating applications based on the Enlightenment Foundation Library suite.")
+    (license (list license:public-domain ; data/extra/skeleton
+                   license:gpl2          ; edi
+                   license:gpl3))))      ; data/extra/examples/images/mono-runtime.png
+
 (define-public ephoto
   (package
     (name "ephoto")
@@ -519,3 +560,35 @@ directories.
      "This is a process monitor and system monitor using the
 @dfn{Enlightenment Foundation Libraries} (EFL).")
     (license license:bsd-2)))
+
+;; XXX: See: <https://codeberg.org/guix/guix/issues/3014>.
+(define-public epour
+  (package
+    (name "epour")
+    (version "0.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.enlightenment.org/rel/apps/epour"
+             "/epour-" version ".tar.xz"))
+       (sha256
+        (base32 "0g9f9p01hsq6dcf4cs1pwq95g6fpkyjgwqlvdjk1km1i5gj5ygqw"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no test target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'find-theme-dir
+            (lambda _
+              (substitute* "epour/gui/__init__.py"
+                (("join\\(data_path")
+                 (string-append "join(\"" #$output "/share/epour\""))))))))
+    (native-inputs (list intltool python-distutils-extra python-setuptools-67
+                         python-wheel-0.40))
+    (inputs (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg))
+    (home-page "https://www.enlightenment.org")
+    (synopsis "EFL Bittorrent client")
+    (description "Epour is a BitTorrent client based on the @dfn{Enlightenment
+Foundation Libraries} (EFL) and rb-libtorrent.")
+    (license license:gpl3+)))

gnu/packages/erlang-xyz.scm

@@ -407,13 +407,13 @@ Server.")
 (define-public erlang-p1-acme
   (package
     (name "erlang-p1-acme")
-    (version "1.0.28")
+    (version "1.0.25")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "p1_acme" version))
        (sha256
-        (base32 "08v4shjng4gdq6nffsvckhs9lcj5rcipbs5ghp95z79zvs36js6f"))))
+        (base32 "136h8nkfd62xd76p8p4mgdiz8hxdqcg4arayl6c4znsx953mpdd7"))))
     (build-system rebar-build-system)
     (inputs (list erlang-base64url erlang-idna erlang-jiffy erlang-jose
                   erlang-yconf))
@@ -450,13 +450,13 @@ Server.")
 (define-public erlang-p1-utils
   (package
     (name "erlang-p1-utils")
-    (version "1.0.28")
+    (version "1.0.26")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "p1_utils" version))
        (sha256
-        (base32 "0cq0gwd4vy51j1qq2c6p1i6nv98agvfjdy0sd6bdj2m4qi5x96y4"))))
+        (base32 "0k5hfqrjrvgh7gknqj5pzpra9k1g0bgc2ac19zb8pfan2669wdyh"))))
     (build-system rebar-build-system)
     (synopsis "ProcessOne utility modules for Erlang")
     (description "This package provides ProcessOne utility modules for Erlang.")
@@ -466,13 +466,13 @@ Server.")
 (define-public erlang-p1-mysql
   (package
     (name "erlang-p1-mysql")
-    (version "1.0.26")
+    (version "1.0.25")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "p1_mysql" version))
        (sha256
-        (base32 "1v7xz81wqx2c6ndl9rd3kq0v125209cbz7alrywijiy5ya1q04za"))))
+        (base32 "0d7438sfzzh57d0fxq165k75khja6krfcglgx2c60wjvx7x7y676"))))
     (build-system rebar-build-system)
     (synopsis "Pure Erlang MySQL driver")
     (description "This package provides pure Erlang @code{MySQL} driver.")
@@ -482,13 +482,13 @@ Server.")
 (define-public erlang-p1-pgsql
   (package
     (name "erlang-p1-pgsql")
-    (version "1.1.35")
+    (version "1.1.29")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "p1_pgsql" version))
        (sha256
-        (base32 "1hjmw82f6k2dpchgdn2i0j0bvi7m6qihcnvrjq36c721di2995g9"))))
+        (base32 "1h9qigb3qfys46rqpqm6s5a0r7cz38hscgnsjlw3z6bln7l5izx6"))))
     (build-system rebar-build-system)
     (inputs (list erlang-xmpp))
     (synopsis "PostgreSQL driver for Erlang")
@@ -582,13 +582,13 @@ Erlang-based systems.")
 (define-public erlang-stringprep
   (package
     (name "erlang-stringprep")
-    (version "1.0.33")
+    (version "1.0.30")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "stringprep" version))
        (sha256
-        (base32 "1h4qvajlsfqfg61c9f0rjf3rmha8sahvqiivnc2zd1q8ql5v7y4n"))))
+        (base32 "16hb49f9ghx8sqrs7928fjig9wyah22z7cl91y1pff50hhrrpz7n"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -665,13 +665,13 @@ dispatch them as Telemetry events.")
 (define-public erlang-cache-tab
   (package
     (name "erlang-cache-tab")
-    (version "1.0.33")
+    (version "1.0.31")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "cache_tab" version))
        (sha256
-        (base32 "002rqgikbdnzfkzw4n2wi6k03155pcqf4j68w2mjmcjhn2g00n22"))))
+        (base32 "0lb35g3p3ybij5f7fnilq3ni37nfgzhajnrmhvplgch9985bd0l5"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -691,13 +691,13 @@ dispatch them as Telemetry events.")
 (define-public erlang-eimp
   (package
     (name "erlang-eimp")
-    (version "1.0.26")
+    (version "1.0.23")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "eimp" version))
        (sha256
-        (base32 "0k04abnna5vqd0r248car4xkfjc83p5z0iqy4w7w9pxrfa2lwvfr"))))
+        (base32 "12k2df0mwq16rh77ziiahq9mjd9cy2jfdnsbzkj96a6b4c07hz4h"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -717,13 +717,13 @@ dispatch them as Telemetry events.")
 (define-public erlang-mqtree
   (package
     (name "erlang-mqtree")
-    (version "1.0.19")
+    (version "1.0.17")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "mqtree" version))
        (sha256
-        (base32 "0g6fz25j942ryc6m6c6iyb9hvs22v3i5l2pq28l8i8a9biqna468"))))
+        (base32 "18z23c1axn6y9799f0ydb0m29wxvq956b57bzk886ixwiz7vgs2z"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -743,13 +743,13 @@ dispatch them as Telemetry events.")
 (define-public erlang-ezlib
   (package
     (name "erlang-ezlib")
-    (version "1.0.15")
+    (version "1.0.13")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "ezlib" version))
        (sha256
-        (base32 "1arfjvipmfvz52szlsy6gn4s1x25spip6gljwv7za6jj29nbl56x"))))
+        (base32 "1fxz584ry1ib35r74hbmapwq71j5iv5rymm927ys0mgdz2rjmrly"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -769,13 +769,13 @@ dispatch them as Telemetry events.")
 (define-public erlang-fast-tls
   (package
     (name "erlang-fast-tls")
-    (version "1.1.25")
+    (version "1.1.22")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "fast_tls" version))
        (sha256
-        (base32 "08d894ckv6flwagngk5zwmgrwxz7nmrycsxap010wrqffjsq7qar"))))
+        (base32 "0ns8wbl5gxprficlm653ql6d51z6fy0fy3r3am3mrcbszfp7jmz6"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils openssl))
     (native-inputs (list erlang-pc openssl))
@@ -809,13 +809,13 @@ for Erlang/Elixir.")
 (define-public erlang-stun
   (package
     (name "erlang-stun")
-    (version "1.2.21")
+    (version "1.2.15")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "stun" version))
        (sha256
-        (base32 "1n8j3vf8g2aq7i271lcm5202vzvvif5vz9m9d8528nyhp7pyhzrx"))))
+        (base32 "1vzdq3mpajv4y7g54nq4dswn44k6rk07ddjqwqn3zlczl90sbn7n"))))
     (build-system rebar-build-system)
     (inputs (list erlang-fast-tls erlang-p1-utils))
     (synopsis "STUN and TURN library for Erlang/Elixir")
@@ -827,13 +827,13 @@ Erlang/Elixir.")
 (define-public erlang-fast-xml
   (package
     (name "erlang-fast-xml")
-    (version "1.1.57")
+    (version "1.1.55")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "fast_xml" version))
        (sha256
-        (base32 "0fcwj8yifwhr5m5maqa0ifwp7vad05d67ayxsmky9bxcmn84xhzf"))))
+        (base32 "11czr4iqv2m9b5msigwxf26q6ny90qzrawzcrmkzbm8fg0xf5ww3"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc))
@@ -854,13 +854,13 @@ parsing library.")
 (define-public erlang-xmpp
   (package
     (name "erlang-xmpp")
-    (version "1.11.1")
+    (version "1.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "xmpp" version))
        (sha256
-        (base32 "05ipgf53dnz5d7hfz0bvmv1lxs0c85737ni5ak0wxcsaj3gk7jd5"))))
+        (base32 "1p3m6a8x89j8gsfpxf13hdxh9syd276g1jlhpz4a9hg4yqd47cfj"))))
     (build-system rebar-build-system)
     (inputs (list erlang-ezlib
                   erlang-fast-tls
@@ -886,13 +886,13 @@ for Erlang/Elixir.")
 (define-public erlang-esip
   (package
     (name "erlang-esip")
-    (version "1.0.59")
+    (version "1.0.56")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "esip" version))
        (sha256
-        (base32 "1rpvsfm5y932wfra1mvkqhdabikmwqlh65bky52b3h4x6hy2xpqb"))))
+        (base32 "07ys2n43fdg3cka6v7lh6633a177yiwmrkcd6vvj7dlkxw66dwwy"))))
     (build-system rebar-build-system)
     (inputs (list erlang-fast-tls erlang-p1-utils erlang-stun))
     (native-inputs (list erlang-pc))
@@ -914,13 +914,13 @@ Erlang.")
 (define-public erlang-fast-yaml
   (package
     (name "erlang-fast-yaml")
-    (version "1.0.39")
+    (version "1.0.37")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "fast_yaml" version))
        (sha256
-        (base32 "13d7n1zjgvnkrxjk7riignqssrh952hs5x259vb6k4ibksmvkir4"))))
+        (base32 "0sd72nal5i6mbmicsmb494mr4g0gvs719lzp2hj1gqpp3dr6is4d"))))
     (build-system rebar-build-system)
     (inputs (list erlang-p1-utils))
     (native-inputs (list erlang-pc libyaml))
@@ -945,13 +945,13 @@ Erlang/Elixir.")
 (define-public erlang-yconf
   (package
     (name "erlang-yconf")
-    (version "1.0.21")
+    (version "1.0.17")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri "yconf" version))
        (sha256
-        (base32 "0v093p002l0zw8v8g4f3l769fkr0ihv2xk39nj2mv1w6zpqsa965"))))
+        (base32 "098s6if76z37amcqi99m0xq30h5i1znbjmw4ri39li216a994a6x"))))
     (build-system rebar-build-system)
     (inputs (list erlang-fast-yaml))
     (synopsis "YAML configuration processor")

gnu/packages/fcitx5.scm

@@ -545,14 +545,14 @@ including input methods previous bundled inside Fcitx 4:
              "/fcitx5-configtool/fcitx5-configtool-" version ".tar.zst"))
        (sha256
         (base32 "1fb21mbc0k33cadslq0rjwi5y7fxm5jzgdk9yna3h2r62sdmdb60"))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
     (arguments
-     (list #:qtbase qtbase
-           #:tests? #f
+     (list #:tests? #f
            #:configure-flags #~(list "-DUSE_QT6=ON")))
     (inputs
      (list fcitx5
            fcitx5-qt
+           qtbase
            qtdeclarative
            ksvg
            kcmutils
@@ -568,7 +568,6 @@ including input methods previous bundled inside Fcitx 4:
            kirigami
            libxkbcommon
            libx11
-           qtwayland
            xkeyboard-config
            libxkbfile
            gettext-minimal

gnu/packages/fediverse.scm

@@ -218,8 +218,8 @@ native interface that allows you to integrate Mastodon's social experience
 seamlessly with your desktop environment.")
     (license license:gpl3)))
 
-(define-deprecated-package tootle
-  tuba)
+(define-public tootle
+  (deprecated-package "tootle" tuba))
 
 (define-public python-mastodon-py
   (package

gnu/packages/file-systems.scm

@@ -49,8 +49,6 @@
   #:use-module (guix build-system go)
   #:use-module (guix build-system linux-module)
   #:use-module (guix build-system pyproject)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -2011,48 +2009,50 @@ compatible directories.")
 (define-public dbxfs
   (package
     (name "dbxfs")
-    (version "2.0.1")
+    (version "1.0.63")
     (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "dbxfs" version))
-       (sha256
-        (base32 "1ml03anr6zz26ab3d8z1r8klz9bfincrn5v53l725svar9an0b12"))))
+      (origin
+        ;; Release tarball contains files not in git repository.
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://thelig.ht/code/dbxfs")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32
+          "1vzfhw3z2r0rb6s0qdzirh3pl7rv1z8xmxa0z5h7h1wqhpl05ai7"))
+        (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))
+        (snippet
+         #~(begin (use-modules (guix build utils))
+                  ;; Don't check for package updates.
+                  (substitute* "dbxfs/main.py"
+                    (("if version") "if False"))))))
     (build-system pyproject-build-system)
     (arguments
-     (list
-      ;; XXX: No tests in Pypi archive. git-fetch fails to download the
-      ;; git source upstream though.
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "setup.py"
-                (("\"sentry_sdk.*\",")
-                 ""))
-              (substitute* "dbxfs/main.py"
-                (("import sentry_sdk")
-                 "")
-                (("^(\\s)sentry_sdk\\.init" all space)
-                 (string-append space "import sentry_sdk\n" all))
-                ;; Don't check for package updates.
-                (("if version")
-                 "if False")))))))
-    (inputs
-     (list python-block-tracing
+     '(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "setup.py"
+               (("keyrings.alt>=3.1,<5")
+                "keyrings.alt>=3.1")))))))
+    (propagated-inputs
+     (list python-appdirs
+           python-block-tracing
            python-dropbox
-           python-platformdirs
+           python-keyring
+           python-keyrings-alt
            python-privy
            python-userspacefs))
     (native-inputs
      (list python-setuptools))
-    (home-page "https://thelig.ht/code/dbxfs/")
-    (synopsis "User-space file system for Dropbox")
-    (description
-     "@code{dbxfs} allows you to mount your Dropbox folder as if it were a
+  (home-page "https://thelig.ht/code/dbxfs/")
+  (synopsis "User-space file system for Dropbox")
+  (description
+   "@code{dbxfs} allows you to mount your Dropbox folder as if it were a
 local file system using FUSE.")
-    (license license:gpl3+)))
+  (license license:gpl3+)))
 
 (define-public rewritefs
   (let ((revision "1")
@@ -2441,7 +2441,7 @@ filtering and ordering functionality.
 (define-public sirikali
   (package
     (name "sirikali")
-    (version "1.8.4")
+    (version "1.6.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2449,21 +2449,19 @@ filtering and ordering functionality.
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0z144ki7664aclnv3p0bpjlzknlsgldl85v76hs2bhnk1jjlgf5y"))))
-    (build-system qt-build-system)
+               (base32
+                "06cl7srxaqpzv7gcd17cl78qhrpqhdvpfcj4pr73fr5hhackrf52"))))
+    (build-system cmake-build-system)
     (arguments
-     (list
-      #:tests? #f                       ;No tests
-      #:qtbase qtbase
-      #:configure-flags #~(list "-DBUILD_WITH_QT6=true")))
-    (inputs (list xdg-utils libpwquality libgcrypt libsecret qtwayland))
+     '(#:tests? #f ;No tests
+       #:configure-flags '("-DQT5=true" "-DCMAKE_BUILD_TYPE=RELEASE")))
+    (inputs (list xdg-utils libpwquality libgcrypt libsecret qtbase-5))
     (native-inputs (list pkg-config))
     (home-page "https://mhogomchungu.github.io/sirikali/")
-    (synopsis "GUI front end to file system encryption utilities")
-    (description
-     "SiriKali is a Qt/C++ GUI application for managing encrypted folders.  It
-supports various backends, including eCryptfs, CryFS, EncFS, gocryptfs, fscrypt,
-securefs, SSHFS, and Cryptomator.")
+    (synopsis "GUI front end to sshfs, ecryptfs, cryfs, gocryptfs, securefs, fscrypt and encfs")
+    (description "@dfn{SiriKali} is a Qt/C++ GUI application that manages
++ecryptfs, cryfs, encfs, gocryptfs, fscrypt and securefs
++based encrypted folders.")
     (license license:gpl3+)))
 
 (define-public watcher

gnu/packages/finance.scm

@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016, 2023 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016-2018, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2016, 2020, 2024, 2025 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2016, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
@@ -110,7 +110,6 @@
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
   #:use-module (gnu packages haskell-xyz)
-  #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libevent)
@@ -1589,30 +1588,6 @@ The module also includes implementations of the Verhoeff,
 Luhn and family of ISO/IEC 7064 check digit algorithms.")
     (license license:lgpl2.1+)))
 
-(define-public python-schwifty
-  (package
-    (name "python-schwifty")
-    (version "2025.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "schwifty" version))
-       (sha256
-        (base32 "16d0q1yzrh9fn6ybbsvhr9wbgld27rvn152w4wdcibidq2jbi0s2"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-hatchling python-hatch-vcs python-pytest
-                         python-pydantic-2))
-    (propagated-inputs (list python-importlib-resources python-pycountry
-                             python-rstr python-typing-extensions))
-    (home-page "http://github.com/mdomke/schwifty/")
-    (synopsis "Python module to work with IBANs and BICs")
-    (description
-     "schwifty is a Python library that let's you easily work with
-IBANs and BICs as specified by the ISO.  IBAN is the Internation Bank Account
-Number and BIC the Business Identifier Code.  Both are used for international
-money transfer.")
-    (license license:expat)))
-
 (define-public python-duniterpy
   (package
     (name "python-duniterpy")
@@ -1657,44 +1632,21 @@ main features are:
 (define-public silkaj
   (package
     (name "silkaj")
-    (version "0.12.1")
+    (version "0.10.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://git.duniter.org/clients/python/silkaj")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "silkaj" version))
        (sha256
-        (base32 "0prglgwvzi676h4lyw9266sqiqbfs2l0mv0bmjvplvdxzzcs63bv"))))
+        (base32 "0p8jqnswrrxri8i2ikdz8mij7gks0yab3wdcb37jf2kjwmrwanpk"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; They require Poetry in the PATH.
-      #~(list "--ignore=tests/integration/"
-              ;; Network access is required.
-              "--deselect=tests/unit/money/test_history.py::test_csv_output"
-              ;; AssertionError: Expected 'mock' to have been called
-              ;; once. Called 0 times
-              "--deselect=tests/unit/test_auth.py::test_authentication_wif")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'set-check-environment
-            (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "TZ" "UTC")
-              (setenv "TZDIR"
-                      (search-input-directory inputs
-                                              "share/zoneinfo")))))))
     (native-inputs
-     (list python-poetry-core
-           python-pytest
-           python-pytest-sugar
-           tzdata-for-tests))
+     (list python-poetry-core))
     (propagated-inputs
-     (list python-duniterpy
+     (list python-click
+           python-duniterpy
            python-pendulum
-           python-rich-click
+           python-tabulate
            python-texttable))
     (home-page "https://git.duniter.org/clients/python/silkaj")
     (synopsis "Command line client for Duniter network")
@@ -2060,16 +2012,11 @@ that allows you to run services and through them access the Bitcoin Cash network
     (arguments
      (list
       #:test-flags
-      #~(list
-         ;; These tests require network.
-         "--ignore=beancount/web/web_test.py"
-         "-k" (string-join
-               (list "not test_parse_stdin" ; ModuleNotFoundError: 'pytest'
-                     "test_setup" ; AssertionError: 5 not greater than 20
-                     ;; Require network
-                     "test_bake_archive__known"
-                     "test_bake_directory")
-               " and not "))
+      #~(list "-k" (string-append
+                    ;; ModuleNotFoundError: No module named 'pytest'
+                    "not test_parse_stdin"
+                    ;; AssertionError: 5 not greater than 20
+                    " and not test_setup"))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'relax-requirements
@@ -2245,10 +2192,14 @@ from account statements and other documents and for managing documents.")
            python-werkzeug))
     (native-inputs
      (list python-babel
+           python-mypy
            python-pytest
+           python-pytest-cov
            python-setuptools
+           python-twine
            python-types-setuptools
-           python-types-simplejson))
+           python-types-simplejson
+           python-wheel))
     (home-page "https://beancount.github.io/fava/")
     (synopsis "Web interface for the accounting tool Beancount")
     (description "Fava is a web interface for the double-entry bookkeeping
@@ -2385,7 +2336,7 @@ trading, and risk management in real-life.")
 (define-public optionmatrix
   (package
     (name "optionmatrix")
-    (version "1.4.4")
+    (version "1.4.3")
     (source
      (origin
        (method url-fetch)
@@ -2393,7 +2344,7 @@ trading, and risk management in real-life.")
              "mirror://sourceforge/optionmatrix/optionmatrix-"
              version ".tar.xz"))
        (sha256
-        (base32 "0ijwj798jli5rw1dj8dkz6sqbsa4hia407imicrk3djqmhn1ky3z"))))
+        (base32 "1zd0pfiphnijh1l94swb3mjrpmjsn37z11mklamd7zw6h2d4zh4d"))))
     (build-system gnu-build-system)
     (inputs
      (list gsl gtk+ ncurses))
@@ -2437,7 +2388,7 @@ interactive controls.  This package provides a GTK+ graphical user interface
                        (invoke "make" "cython"))))))
     (inputs (list ta-lib))
     (propagated-inputs (list python-numpy))
-    (native-inputs (list python-cython
+    (native-inputs (list python-cython-3
                          python-pandas
                          python-pytest
                          python-setuptools
@@ -2508,24 +2459,6 @@ format used by SWIFT.  It returns smart Python collections for statistics
 and manipulation.")
     (license license:bsd-3)))
 
-(define-public python-mt940
-  (package
-    (name "python-mt940")
-    (version "0.6.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "mt940" version))
-       (sha256
-        (base32 "00w9m06wxxqg9w1bkddqr6yl6ajlzhbiryqzijax64l6sks6ml6g"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-setuptools-67 python-wheel-0.40))
-    (home-page "http://mt940.b2ck.com/")
-    (synopsis "A simple module to parse MT940 files")
-    (description "This package provides a simple module to parse MT940
-files.")
-    (license license:bsd-3)))
-
 (define-public xmrig
   (package
     (name "xmrig")

gnu/packages/firmware.scm

@@ -3,19 +3,15 @@
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2017, 2018, 2022-2025 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2018, 2020, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2019 Vagrant Cascadian <vagrant@debian.org>
+;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
 ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
-;;; Copyright © 2025 Murilo <murilo@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,7 +38,6 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix git-download)
-  #:use-module (guix build-system cargo)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -70,7 +65,6 @@
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages flashing-tools)
   #:use-module (gnu packages flex)
-  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
@@ -220,43 +214,6 @@ assembler, disassembler, and debugging tools for the Linux kernel b43 wireless
 driver.")
       (license license:gpl2))))
 
-(define-public binwalk
-  (package
-    (name "binwalk")
-    (version "3.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ReFirmLabs/binwalk")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jm1zx8jfj7fsxa87rkbq0qjjb66wqqmvqcs2127wr22g0xa6vvs"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      ;; These tests fail on the v3.1.0 release.
-      ;; They will be most likely fixed on the next release, where the
-      ;; test files are included in the source itself.
-      ;; See <https://github.com/ReFirmLabs/binwalk/issues/882>.
-      #:cargo-test-flags ''("--"
-                            "--skip=binwalk::Binwalk"
-                            "--skip=binwalk::Binwalk::scan"
-                            "--skip=binwalk::Binwalk::analyze"
-                            "--skip=binwalk::Binwalk::extract")))
-    (native-inputs (list pkg-config))
-    (inputs (cons* fontconfig xz
-                   (cargo-inputs 'binwalk)))
-    (home-page "https://github.com/ReFirmLabs/binwalk")
-    (synopsis "Firmware analysis tool")
-    (description "Binwalk is a tool for analyzing, reverse engineering, and
-extracting firmware images.")
-    (license license:expat)))
-
-(define-deprecated-package python-binwalk binwalk)
-
 (define-public fwupd-efi
   (package
     (name "fwupd-efi")
@@ -291,7 +248,7 @@ used in the process of installing and updating firmware.")
 (define-public fwupd
   (package
     (name "fwupd")
-    (version "1.9.32")
+    (version "1.8.14")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -300,7 +257,7 @@ used in the process of installing and updating firmware.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0nabjgskbpinj7sj44kblnd8g6psppas4g8qgajfs3p19skp07y1"))))
+                "179yc0nbbyrdya5q16ncf7lkslrhr3i90rgb9vdmv751ikilkby6"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -323,11 +280,7 @@ used in the process of installing and updating firmware.")
       #~(modify-phases %standard-phases
           (add-after 'unpack 'make-source-writable
             (lambda _
-              (for-each (lambda (file)
-                          ;; Skip symlinks as `make-file-writable' fails for those.
-                          (unless (eq? 'symlink (stat:type (lstat file)))
-                            (format #t "Make writable: ~A~%" file)
-                            (make-file-writable file)))
+              (for-each make-file-writable
                         (find-files "."))
               (substitute* "src/fu-self-test.c"
                 (("/bin/sh")
@@ -379,7 +332,6 @@ used in the process of installing and updating firmware.")
                                       "/libexec/fwupd/efi")
                        (string-append #$output "/libexec/fwupd/efi")))))))
     (native-inputs (list gobject-introspection
-                         python-jinja2
                          python-pygobject
                          python-pillow
                          python-pycairo
@@ -1295,8 +1247,8 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
                       (install-file "RISCV_VIRT_CODE.fd" fmw)
                       (install-file "RISCV_VIRT_VARS.fd" fmw))))))))))))
 
-(define-deprecated-package ovmf
-  ovmf-x86-64)
+(define-public ovmf
+  (deprecated-package "ovmf" ovmf-x86-64))
 
 (define* (make-arm-trusted-firmware platform #:key
                                     (triplet "aarch64-linux-gnu")
@@ -1676,7 +1628,6 @@ corresponding layout." layout))
            gnu-make
            grep
            python
-           python-appdirs
            python-dotty-dict
            python-hid
            python-hjson

gnu/packages/flashing-tools.scm

@@ -61,7 +61,6 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages electronics)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages flex)
@@ -77,10 +76,7 @@
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages swig)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module (srfi srfi-26))
@@ -165,29 +161,29 @@ brick your device.")
 (define-public avrdude
   (package
     (name "avrdude")
-    (version "8.1")
+    (version "8.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/avrdudes/avrdude/")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1jfz0z8i5vib181f854zwxd8avw5fy59lh3d78igqxwm08sv8nlb"))))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/avrdudes/avrdude/")
+            (commit (string-append "v" version))))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1r8cfi1lkic8zknb7x44i2mmwxzfwfbblr894x36mffa5da0g7y3"))))
     (build-system cmake-build-system)
     (arguments
-     (list #:tests? #f))                     ;no tests
+     (list #:tests? #f))                      ; no tests
     (inputs
-     (list libelf libusb-compat libftdi libserialport readline))
+     (list libelf libusb-compat libftdi))
     (native-inputs
-     (list bison flex python-wrapper))
+     (list bison flex))
     (home-page "https://www.nongnu.org/avrdude/")
     (synopsis "AVR downloader and uploader")
     (description
-     "@code{AVRDUDE} is a utility to download/upload/manipulate the ROM and
-EEPROM contents of AVR microcontrollers using the @acronym{ISP, in-system
-programming} technique.")
+     "@code{AVRDUDE} is a utility to download/upload/manipulate the ROM and EEPROM
+contents of AVR microcontrollers using the @acronym{ISP, in-system programming}
+technique.")
     (license license:gpl2+)))
 
 (define-public dfu-programmer

gnu/packages/fonts.scm

@@ -1102,6 +1102,35 @@ Ideographs Extension B of Unicode.
 of Unicode.
 @end itemize\n")))
 
+;; In past, TW-Kai and TW-Sung are distributed in same zip archive.  But now
+;; they are already separated in font-cns11643-kai and font-cns11643-sung.
+;; This package exists as a backward-compatible definition.
+(define-public font-cns11643
+  (package
+    (inherit font-cns11643-sung)
+    (name "font-cns11643")
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments
+     (list
+      #:modules '((guix build union))
+      #:builder
+      #~(begin
+          (use-modules (ice-9 match)
+                       (guix build union))
+          (match %build-inputs
+            (((names . directories) ...)
+             (union-build #$output directories))))))
+    (inputs (list font-cns11643-kai font-cns11643-sung))
+    (synopsis "CJK TrueType fonts, TW-Kai and TW-Sung")
+    (description
+     "@code{CNS 11643} character set (Chinese National Standard, or Chinese
+Standard Interchange Code) is the standard character set of the Republic of
+China (Taiwan) for Chinese Characters and other Unicode symbols.
+
+This package is an amalgamation of @code{font-cns11643-sung} and
+@code{font-cns11643-kai}.")))
+
 (define-public font-cns11643-swjz
   (package
     (name "font-cns11643-swjz")
@@ -1281,7 +1310,7 @@ heavier printing.")
 (define-public font-amiri
   (package
     (name "font-amiri")
-    (version "1.003")
+    (version "1.000")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1290,7 +1319,7 @@ heavier printing.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hi3d6s42wk2hgk2x8niga84h1kpk9p4vxkyich1mzmw5b7kq8hw"))))
+                "0c4yg1b03aihdqvz6w5ak8wapni3l8p18mw6bkqhblmm75jb5kif"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1962,8 +1991,8 @@ well in user interface (UI) environments.")
     (license license:silofl1.1)))
 
 ;; https://github.com/adobe-fonts/source-sans/issues/192
-(define-deprecated-package font-adobe-source-sans-pro
-  font-adobe-source-sans)
+(define-public font-adobe-source-sans-pro
+  (deprecated-package "font-adobe-source-sans-pro"  font-adobe-source-sans))
 
 (define-public font-adobe-source-serif
   (package
@@ -1989,8 +2018,8 @@ family.")
     (license license:silofl1.1)))
 
 ;; https://github.com/adobe-fonts/source-serif/issues/77
-(define-deprecated-package font-adobe-source-serif-pro
-  font-adobe-source-serif)
+(define-public font-adobe-source-serif-pro
+  (deprecated-package "font-adobe-source-serif-pro" font-adobe-source-serif))
 
 (define-public font-microsoft-cascadia
   (package
@@ -2900,8 +2929,8 @@ characters mostly intact.")
   constraint of usability at small point sizes.")
     (license (list license:silofl1.1))))
 
-(define-deprecated-package font-iosevka-comfy
-  font-aporetic)
+(define-public font-iosevka-comfy
+  (deprecated-package "font-iosevka-comfy"  font-aporetic))
 
 (define-public font-junicode
   (package
@@ -3624,8 +3653,8 @@ and legible typeface suitable for web pages and applications.")
     (license license:silofl1.1)))
 
 ;; https://github.com/rastikerdar/vazirmatn/blob/master/CHANGELOG.md#3200
-(define-deprecated-package font-vazir
-  font-vazirmatn)
+(define-public font-vazir
+  (deprecated-package "font-vazir" font-vazirmatn))
 
 (define-public font-victor-mono
   (package

gnu/packages/fontutils.scm

@@ -805,29 +805,26 @@ high-level API is bound.")
 (define-public python-glyphslib
   (package
     (name "python-glyphslib")
-    (version "6.6.1")  ;6.6.1 is the last version that works with ufo2ft 2.x
+    (version "6.0.7")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/googlefonts/glyphsLib")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (pypi-uri "glyphsLib" version))
               (sha256
                (base32
-                "193h5ixq9p9m2kwz8srfw61rzgqg6gishlndqm759cymwax0cibi"))))
+                "0mkkwd09g76hvif603ij5aqicxh47zvhgyyd0pjcjmpdy6dr70yw"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'pretend-version
-            ;; The version string is usually derived via setuptools-scm, but
-            ;; without the git metadata available this fails.
-            (lambda _
-              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
+      #:test-flags #~'(;; These fail because the test data has not yet been
+                       ;; updated for newer FontTools:
+                       ;;   https://github.com/googlefonts/glyphsLib/issues/787
+                       ;; Re-enable for versions > 6.0.7.
+                       "--ignore=tests/builder/designspace_gen_test.py"
+                       "--ignore=tests/builder/interpolation_test.py")))
     (native-inputs
      (list python-setuptools-scm
            python-setuptools
+           python-wheel
            ;; For tests.
            python-pytest
            python-xmldiff))
@@ -1187,8 +1184,8 @@ stroke fonts with C++11/Qt.")
     ;; Dual-licensed, either license applies.
     (license (list license:asl2.0 license:expat))))
 
-(define-deprecated-package fontobene-qt5
-  fontobene-qt)
+(define-public fontobene-qt5
+  (deprecated-package "fontobene-qt5" fontobene-qt))
 
 (define-public ttfautohint
   (package

gnu/packages/freedesktop.scm

@@ -39,7 +39,7 @@
 ;;; Copyright © 2024-2025 Alvin Hsu <aurtzy@gmail.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
-;;; Copyright © 2024, 2025 dan <i@dan.games>
+;;; Copyright © 2024 dan <i@dan.games>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -2114,14 +2114,7 @@ modems and setup connections with them.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "00ss14hf1qwb42648cldghmfjfn1nkjvpy508b7vaz322fj37qa4"))
-         (modules '((guix build utils)))
-         (snippet
-          ;; Add missing 'const' qualifier to '_error' function.  This fixes
-          ;; an "incompatible pointer type" error with libxml2 2.14.
-          #~(substitute* "lib/ext/wocky/wocky/wocky-xmpp-reader.c"
-              (("xmlErrorPtr error")
-               "const xmlError *error")))))
+           "00ss14hf1qwb42648cldghmfjfn1nkjvpy508b7vaz322fj37qa4"))))
       (build-system gnu-build-system)
       (arguments
        (list
@@ -2322,10 +2315,7 @@ share connections to real-time communication services without conflicting.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "195pz8dgwhyy1cygd0rlncyr3c4wzhnf99sfjj5qmc8j195j1k7a"))
-         (modules '((guix build utils)))
-         (snippet                                 ;for wocky
-          (origin-snippet (package-source telepathy-gabble)))))
+           "195pz8dgwhyy1cygd0rlncyr3c4wzhnf99sfjj5qmc8j195j1k7a"))))
       (build-system gnu-build-system)
       (arguments
        (list
@@ -3477,51 +3467,3 @@ supporting behavior like @samp{ssh -X}.")
 window decorations for them.  It aims to provide multiple backends that
 implements the decoration drawing.")
     (license license:expat)))
-
-(define-public iio-sensor-proxy
-  (package
-    (name "iio-sensor-proxy")
-    (version "3.8")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy")
-             (commit "3.8")))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0rk0si00g75068cqgwd8qfq935wymsjczvpxg3wmlspq13h9amk5"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list "-Dsystemdsystemunitdir=false"
-              (string-append "-Dudevrulesdir="
-                             #$output "/lib/udev/rules.d")
-              "-Dtests=true"
-              "-Dgtk-tests=true")
-      #:glib-or-gtk? #t
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-polkit-dir
-            (lambda _
-              (substitute* "meson.build"
-                (("polkit_gobject_dep\\..*")
-                 (string-append "'"
-                                #$output "/share/polkit-1/actions'"))))))))
-    (inputs (list glib libgudev polkit))
-    (native-inputs
-     (list dbus
-           (list glib "bin")
-           gobject-introspection
-           gtk+
-           pkg-config
-           python
-           python-dbusmock
-           python-psutil
-           umockdev))
-    (home-page "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy")
-    (synopsis "IIO sensors to D-Bus proxy")
-    (description
-     "@code{iio-sensor-proxy} is a daemon which passes IIO sensor data to D-Bus.")
-    (license license:gpl3+)))

gnu/packages/fsf.scm

@@ -0,0 +1,72 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 宋文武 <iyzsong@envs.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages fsf)
+  #:use-module (gnu packages tex)
+  #:use-module (guix build-system copy)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:))
+
+(define-public book-faif
+  (package
+    (name "book-faif")
+    (version "2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.fsf.org/faif/faif-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "0qf14d0n6k1dn9z0fdnx9qkhn4iq685xd443w7l7w54bm931p7dw"))))
+    (build-system copy-build-system)
+    (native-inputs
+     (list (texlive-local-tree
+            (list texlive-caption
+                  texlive-endnotes
+                  texlive-etoolbox
+                  texlive-fncychap
+                  texlive-helvetic
+                  texlive-times
+                  texlive-ucs))))
+    (arguments
+     (list
+      #:install-plan #~'(("faif-2.0.pdf" "share/doc/faif/"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'writable-texmfvar
+            ;; Generating font shapes require a writable TEXMFVAR directory.
+            (lambda _ (setenv "TEXMFVAR" "/tmp")))
+          (add-before 'install 'build
+            (lambda _
+              (invoke "pdflatex" "faif-2.0.tex"))))))
+    (home-page "https://www.fsf.org/faif")
+    (synopsis "Free as in Freedom (2.0)")
+    (description
+     "In 2002, Sam Williams wrote Free as in Freedom, a biography of Richard
+M. Stallman.  In its epilogue, Williams expressed hope that choosing to
+distribute his book under the GNU Free Documentation License would enable and
+encourage others to share corrections and their own perspectives through
+modifications to his work.  Free as in Freedom (2.0) is Stallman's revision of
+the original biography.  While preserving Williams's viewpoint, it includes
+factual corrections and extensive new commentary by Stallman, as well as new
+prefaces by both authors written for the occasion.  It is a rare kind of
+biography, where the reader has the benefit of both the biographer's original
+words and the subject's response.")
+    (license license:fdl1.3+)))

gnu/packages/fvwm.scm

@@ -0,0 +1,83 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017 Nikita <nikita@n0.is>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages fvwm)
+  #:use-module ((guix licenses) #:select (gpl2+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages fribidi)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
+
+(define-public fvwm
+  (package
+    (name "fvwm")
+    (version "2.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/fvwmorg/fvwm/releases/download/"
+                    version "/fvwm-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12s1wgkvrvl8m62gpb2918izfx9ysj7hgn9p00blfi3p1gb6v0k6"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-xsession
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (xsessions (string-append out "/share/xsessions")))
+               (mkdir-p xsessions)
+               (make-desktop-entry-file
+                 (string-append xsessions "/fvwm2.desktop")
+                 #:name "FVWM"
+                 #:exec (string-append out "/bin/" ,name)
+                 #:comment '("FVWM")))
+             #t)))))
+    (native-inputs
+     `(("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     (list fribidi
+           libpng
+           (librsvg-for-system)
+           libxcursor
+           libxext
+           libxft
+           libxinerama
+           libxpm
+           libxt
+           readline))
+    (synopsis "Virtual window manager for X11")
+    (description
+     "FVWM is an extremely powerful ICCCM-compliant multiple virtual desktop
+window manager for the X Window system.")
+    (home-page "https://www.fvwm.org/")
+    (license gpl2+)))

gnu/packages/gambas.scm

@@ -55,7 +55,7 @@
 (define-public gambas
   (package
     (name "gambas")
-    (version "3.21.0")
+    (version "3.20.2")
     (source
      (origin
        (method git-fetch)
@@ -64,7 +64,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0lkm4fbxqmkqpk2f2z660m77xshhmvj4pnlv0z43zrarsij8l6gf"))))
+        (base32 "060f8w19jf78mappqgy11873ss3h97gi47ga3c1ws1bazix9x7rk"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -159,8 +159,12 @@
            poppler
            postgresql
            qtbase
+           qtbase-5
            qtsvg
+           qtsvg-5
            qtwebengine
+           qtwebengine-5
+           qtx11extras
            sdl2
            sdl2-image
            sdl2-mixer

gnu/packages/game-development.scm

@@ -17,7 +17,7 @@
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
-;;; Copyright © 2020-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
@@ -560,46 +560,6 @@ types (circle, polygon, thin line segments), and quite a few joint
 types (revolute, prismatic, wheel, etc.).")
     (license license:zlib)))
 
-(define-public python-anvil-parser
-  (let ((commit "27544bb41f035617be130a209a84371cbaf837cc")
-        (revision "0"))
-  (package
-    (name "python-anvil-parser")
-    (version (git-version "0.9.0" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/0xTiger/anvil-parser")
-             (commit commit)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "196nli36pz4sllx1m8jlys661hgbxhcxr2c4545fqb4nd27hhwy7"))))
-    (build-system python-build-system)
-    (propagated-inputs (list python-frozendict python-nbt))
-    (home-page "https://github.com/0xTiger/anvil-parser")
-    (synopsis "Anvil file format parser")
-    (description "This package provides an Anvil file format parser.")
-    (license license:expat))))
-
-(define-public python-nbt
-  (package
-    (name "python-nbt")
-    (version "1.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "NBT" version))
-              (sha256
-               (base32
-                "1i9ncrzy5zcfnxzkh2j31n9ayzxfncckzwa6fkz9vjq5fq9v4fys"))))
-    (build-system python-build-system)
-    (home-page "https://github.com/twoolie/NBT")
-    (synopsis "Named Binary Tag reader and writer")
-    (description
-     "This library is a parser and writer for the NBT file format.  It is suited
-to inspect and edit the Minecraft data files.")
-    (license license:expat)))
-
 (define-public python-sge
   (package
     (name "python-sge")
@@ -1724,7 +1684,7 @@ developed mainly for Ren'py.")
                        (setenv "SDL_AUDIODRIVER" "disk"))))))
     (native-inputs (list meson-python
                          pkg-config
-                         python-cython
+                         python-cython-3
                          python-numpy
                          python-pytest
                          python-setuptools))
@@ -2145,38 +2105,6 @@ robust and compatible with many systems and operating systems.")
     (home-page "https://github.com/wgois/OIS")
     (license license:zlib)))
 
-(define-public mc2mt
-  (let ((commit "039dbc26466a430e03c646dc5a9bd0822637a87a")
-        (revision "0"))
-  (package
-    (name "mc2mt")
-    (version (git-version "0.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/listia/mc2mt")
-             (commit commit)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i"))
-       (patches (search-patches "mc2mt-add-packaging-support.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (substitute* "mc2mtlib/argument_parser.py"
-              (("mineclone2") "mineclone"))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-setuptools))
-    (propagated-inputs (list python-anvil-parser))
-    (arguments
-     (list #:tests? #f)) ; no tests
-    (synopsis "Minecraft to Minetest world converter")
-    (description "@code{mc2mt} is a Minecraft to Minetest world converter.
-It can convert worlds from Minecraft 1.9 and later.")
-    (home-page "https://github.com/listia/mc2mt")
-    (license license:expat))))
-
 (define-public mygui
   (package
     (name "mygui")
@@ -3314,14 +3242,14 @@ a.k.a. XenoCollide) as described in Game Programming Gems 7.")
 (define-public ode
   (package
     (name "ode")
-    (version "0.16.6")
+    (version "0.16.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://bitbucket.org/odedevs/ode/downloads/"
                            "ode-" version ".tar.gz"))
        (sha256
-        (base32 "1s0k8nvwbq3b5b1kaynggv4gwshd71m75757hi3jhl16zz32h6n9"))
+        (base32 "0ya6slmy2iysx3fql7w7r56c7gsk93qp1apfjn3raw252vfmx1xs"))
        (modules '((guix build utils)))
        (snippet
         '(begin

gnu/packages/games.scm

@@ -507,7 +507,7 @@ Doom clone shooter game.")
 (define-public antimicrox
   (package
     (name "antimicrox")
-    (version "3.5.1")
+    (version "3.4.1")
     (home-page "https://github.com/AntiMicroX/antimicrox")
     (source
      (origin
@@ -517,7 +517,7 @@ Doom clone shooter game.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0p350l8d6rx72cjmmagsyvrmvzcgqypqas2nfjjbasd94f1y30b4"))))
+        (base32 "04yb5nppn751asbihr90sqk5imamc937886lc24cihhgp0sila8y"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1149,11 +1149,11 @@ original rogue game found on 4.2BSD.")
     (license license:bsd-3)))
 
 (define-public sgt-puzzles
-  (let ((commit "790f5851507be5845164d3ae7b32b2f86717fe50")
+  (let ((commit "50985e9f2c54ad44e8c26491ddddd698bc02fd06")
         (revision "0"))
     (package
       (name "sgt-puzzles")
-      (version (git-version "20251021" revision commit))
+      (version (git-version "20250510" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1162,7 +1162,7 @@ original rogue game found on 4.2BSD.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "163jdm4vdydp3zqw37jg0gmiacz1dgyl58kjdd5wsd0y2qix78p4"))))
+          (base32 "0j3bnzw4bbbm1nl9zmkmhcpk1zm64jmfjiymsjw8axzq5af19jvj"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -1187,14 +1187,14 @@ popular puzzle games for one player.")
 (define-public bzflag
   (package
     (name "bzflag")
-    (version "2.4.30")
+    (version "2.4.26")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.bzflag.org/bzflag/source/"
                            version "/bzflag-" version ".tar.bz2"))
        (sha256
-        (base32 "0kc9ag8yq3iqmwlrdwhbqp3sqjcan1mr0ddx25yamrxwwx8bfy5v"))))
+        (base32 "050h933lmcdf4bw9z3c6g3k8c9sch9f6kq57jp2ivb96zw2h90q1"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -2817,6 +2817,51 @@ map formats, MAPINFO support, full controller support, debug and scripting
 features, rewinding, and a strict mode for speedrunning.")
     (license license:gpl2+)))
 
+(define-public prboom-plus
+  (package
+   (name "prboom-plus")
+   (version "2.5.1.4")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://sourceforge/prboom-plus/prboom-plus/"
+                                version "/prboom-plus-" version ".tar.gz"))
+            (sha256
+             (base32 "151v6nign86m1a2vqz27krsccpc9m4d1jax4y43v2fa82wfj9qp0"))
+            (modules '((guix build utils)))
+            (snippet
+             '(begin
+                (substitute* "src/version.c"
+                  (("__DATE__") "")
+                  (("__TIME__") ""))
+                #t))))
+   (build-system gnu-build-system)
+   (arguments
+    '(#:configure-flags '("--disable-cpu-opt" "CFLAGS=-fcommon")
+      #:make-flags `(,(string-append "gamesdir="
+                                     (assoc-ref %outputs "out") "/bin"))
+      #:phases
+      (modify-phases %standard-phases
+        (add-after 'set-paths 'set-sdl'paths
+          (lambda* (#:key inputs #:allow-other-keys)
+            (setenv "CPATH"
+                    (string-append
+                     (search-input-directory inputs "/include/SDL")
+                     ":" (or (getenv "CPATH") ""))))))))
+   (inputs
+    (list fluidsynth
+          glu
+          libmad
+          libpng
+          libvorbis
+          pcre
+          portmidi
+          (sdl-union (list sdl sdl-image sdl-mixer sdl-net))))
+   (home-page "https://prboom-plus.sourceforge.net/")
+   (synopsis "Version of the classic 3D shoot'em'up game Doom")
+   (description
+    "PrBoom+ is a Doom source port developed from the original PrBoom project.")
+   (license license:gpl2+)))
+
 (define-public redeal
   (let ((commit "e2e81a477fd31ae548a340b5f0f380594d3d0ad6")
         (revision "1"))
@@ -3365,7 +3410,7 @@ Superfluous Returnz.")
 (define-public sosage
   (package
     (name "sosage")
-    (version "1.6.1")
+    (version "1.6.0")
     (source
      (origin
        (method git-fetch)
@@ -3374,7 +3419,7 @@ Superfluous Returnz.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "029mcnx2r86gc7chzd0avga4x7gm1yxl2wi3wqxmzhlh51q0p44x"))
+        (base32 "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -3520,6 +3565,57 @@ can be imported and used to create puzzles with a wide range of sizes.  Games ar
 saved automatically, and you can select between currently in progress games.")
     (license license:gpl3+)))
 
+(define %ufoai-commit "a542a87a891f96b1ab2c44d35b2f6f16859a5019")
+(define %ufoai-revision "0")
+(define %ufoai-version (git-version "2.6.0_dev" %ufoai-revision %ufoai-commit))
+(define ufoai-source
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+          (url "git://git.code.sf.net/p/ufoai/code") ;HTTPS fails mid-clone
+          (commit %ufoai-commit)))
+    (file-name (string-append "ufoai-" %ufoai-version "-checkout"))
+    (sha256
+     (base32
+      "024s7b9rcg7iw8i2p72gwnvabk23ljlq0nldws0y4b6hpwzyn1wz"))
+    (modules '((guix build utils)
+               (srfi srfi-1)
+               (ice-9 ftw)))
+    (snippet
+     '(begin
+        ;; Delete ~32MiB of bundled dependencies.
+        (with-directory-excursion "src/libs"
+          (for-each delete-file-recursively
+                    (lset-difference equal? (scandir ".")
+                                     '("." ".." "gtest" "mumble"))))
+
+        ;; Use relative path to Lua headers.
+        (substitute* "src/common/scripts_lua.h"
+          (("\\.\\./libs/lua/") ""))
+
+        ;; Adjust Makefile targets to not depend on 'ufo2map', since we build
+        ;; it as a separate package.  This way we don't need to make the same
+        ;; adjustments for 'ufoai-data' and 'ufoai' below.
+        (substitute* "build/maps.mk"
+          (("\\./ufo2map") "ufo2map")
+          (("maps: ufo2map") "maps:"))
+        (substitute* "build/modules/testall.mk"
+          (("testall: ufo2map") "testall:"))
+
+        ;; If no cURL headers are found, the build system will try to include
+        ;; the bundled version, even when not required.  Prevent that.
+        (substitute* "build/default.mk"
+          (("^include src/libs/curl/lib/Makefile\\.inc")
+           ""))
+
+        ;; While here, improve reproducibility by adding the '-X' flag to the
+        ;; zip command used to create the map files, in order to prevent time
+        ;; stamps from making it into the generated archives.
+        (substitute* "build/data.mk"
+          (("\\$\\(call ZIP\\)")
+           "$(call ZIP) -X"))
+        #t))))
+
 (define-public trigger-rally
   (package
     (name "trigger-rally")
@@ -3607,6 +3703,200 @@ equipped with spoken co-driver notes and co-driver icons.")
     (license (list license:cc0               ;textures and audio in data.zip
                    license:gpl2+))))
 
+(define-public ufo2map
+  (package
+    (name "ufo2map")
+    (version %ufoai-version)
+    (home-page "https://ufoai.org/")
+    (source ufoai-source)
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("CC=gcc" "CXX=g++"
+                           "--enable-release"
+                           "--enable-ufo2map"
+                           "--disable-uforadiant"
+                           "--disable-cgame-campaign"
+                           "--disable-cgame-multiplayer"
+                           "--disable-cgame-skirmish"
+                           "--disable-game"
+                           "--disable-memory"
+                           "--disable-testall"
+                           "--disable-ufoded"
+                           "--disable-ufo"
+                           "--disable-ufomodel"
+                           "--disable-ufoslicer")
+       #:tests? #f ;no tests
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key (configure-flags '()) #:allow-other-keys)
+                      ;; The home-made configure script does not understand
+                      ;; some of the default flags of gnu-build-system.
+                      (apply invoke "./configure" configure-flags)))
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (install-file "ufo2map" (string-append out "/bin"))
+                        (install-file "debian/ufo2map.6"
+                                      (string-append out "/share/man/man6"))
+                        #t))))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     `(("libjpeg" ,libjpeg-turbo)
+       ("libpng" ,libpng)
+       ("lua" ,lua-5.1)
+       ("sdl-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-ttf)))))
+    (synopsis "UFO: AI map generator")
+    (description
+     "This package provides @command{ufo2map}, a program used to generate
+maps for the UFO: Alien Invasion strategy game.")
+    (license license:gpl2+)))
+
+(define ufoai-data
+  (package
+    (name "ufoai-data")
+    (version %ufoai-version)
+    (home-page "https://ufoai.org/")
+    (source ufoai-source)
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f
+       #:configure-flags '("CC=gcc" "CXX=g++")
+       #:phases (modify-phases %standard-phases
+                  (replace 'configure
+                    (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys)
+                      (apply invoke "./configure" configure-flags)))
+                  (replace 'build
+                    (lambda* (#:key (parallel-build? #t) #:allow-other-keys)
+                      (invoke "make"
+                              "-j" (if parallel-build?
+                                       (number->string (parallel-job-count))
+                                       "1")
+                              "maps")))
+                  (add-after 'build 'pack
+                    (lambda _
+                      (invoke "make" "pk3")))
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (for-each (lambda (file)
+                                    (install-file file out))
+                                  (find-files "base" "\\.pk3$"))
+                        #t))))))
+    (native-inputs
+     `(("python" ,python-2)
+       ("ufo2map" ,ufo2map)
+       ("which" ,which)
+       ("zip" ,zip)))
+    (synopsis "UFO: AI data files")
+    (description
+     "This package contains maps and other assets for UFO: Alien Invasion.")
+    ;; Most assets are available under either GPL2 or GPL2+.  Some use other
+    ;; licenses, see LICENSES for details.
+    (license (list license:gpl2+ license:gpl2 license:cc-by3.0
+                   license:cc-by-sa3.0 license:public-domain))))
+
+(define-public ufoai
+  (package
+    (name "ufoai")
+    (version %ufoai-version)
+    (home-page "https://ufoai.org/")
+    (source ufoai-source)
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--prefix=" (assoc-ref %outputs "out"))
+             (string-append "--datadir=" (assoc-ref %outputs "out")
+                            "/share/games/ufo")
+             "CC=gcc" "CXX=g++"
+             "--enable-release"
+             "--enable-game"
+             "--disable-ufo2map"
+             "--disable-dependency-tracking"
+
+             ;; Disable hard links to prevent huge NARs.
+             "--disable-hardlinkedgame"
+             "--disable-hardlinkedcgame")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'symlink-data-files
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let ((data (assoc-ref inputs "ufoai-data")))
+                        ;; Symlink the data files to where the build system
+                        ;; expects to find them.  Ultimately these files are
+                        ;; copied to $out/share/games/ufoai/base, losing the
+                        ;; symlinks; we could fix that after install, but it
+                        ;; does not make a big difference in practice due to
+                        ;; deduplication.
+                        (with-directory-excursion "base"
+                          (for-each (lambda (file)
+                                      (symlink file (basename file)))
+                                    (find-files data "\\.pk3$")))
+                        #t)))
+                  (add-before 'configure 'create-language-files
+                    (lambda _
+                      (invoke "make" "lang")))
+                  (replace 'configure
+                    (lambda* (#:key outputs (configure-flags '()) #:allow-other-keys)
+                      (apply invoke "./configure" configure-flags)))
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (if tests?
+                          (invoke "./testall")
+                          (format #t "test suite not run~%"))
+                      #t))
+                  (add-after 'install 'install-man-pages
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (man6 (string-append out "/share/man/man6")))
+                        (install-file "debian/ufo.6" man6)
+                        (install-file "debian/ufoded.6" man6)
+                        #t))))
+
+       ;; TODO: Some map tests occasionally fail because of randomness issues,
+       ;; e.g. not enough generated aliens.  The test runner also fails early
+       ;; in the build container with 'failed to shutdown server'?
+       #:tests? #f))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)
+       ("ufo2map" ,ufo2map)
+       ("ufoai-data" ,ufoai-data)))
+    (inputs
+     `(("curl" ,curl)
+       ("libjpeg" ,libjpeg-turbo)
+       ("libogg" ,libogg)
+       ("libpng" ,libpng)
+       ("libtheora" ,libtheora)
+       ("libvorbis" ,libvorbis)
+       ("libxml2" ,libxml2)
+       ("lua" ,lua-5.1)
+       ("mesa" ,mesa)
+       ("minixml" ,minixml)
+       ("sdl-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-ttf)))
+       ("zlib" ,zlib)))
+    (synopsis "Turn-based tactical strategy game")
+    (description
+     "UFO: Alien Invasion is a tactical strategy game set in the year 2084.
+You control a secret organisation charged with defending Earth from a brutal
+alien enemy.  Build up your bases, prepare your team, and dive head-first into
+the fast and flowing turn-based combat.
+
+Over the long term you will need to conduct research into the alien threat to
+figure out their mysterious goals and use their powerful weapons for your own
+ends.  You will produce unique items and use them in combat against your
+enemies.
+
+You can also use them against your friends with the multiplayer functionality.
+
+Warning: This is a pre-release version of UFO: AI!  Some things may not work
+properly.")
+
+    ;; The game code and most assets are GPL2+, but we use GPL2 only here
+    ;; because some assets do not use the "or later" clause.  Many individual
+    ;; assets use Creative Commons or Public Domain; see the LICENSE file.
+    (license (delete license:gpl2+ (package-license ufoai-data)))))
+
 (define-public xshogi
   (package
     (name "xshogi")
@@ -3924,8 +4214,7 @@ interface or via an external visual interface such as GNU XBoard.")
               (method url-fetch)
               (uri (string-append "mirror://gnu/freedink/freedink-" version
                                   ".tar.gz"))
-              (patches (search-patches "freedink-engine-fix-const-char.patch"
-                                       "freedink-engine-fix-sdl-hints.patch"))
+              (patches (search-patches "freedink-engine-fix-sdl-hints.patch"))
               (sha256
                (base32
                 "00hhk1bjdrc1np2qz44sa5n1mb62qzwxbvsnws3vpms6iyn3a2sy"))))
@@ -3938,9 +4227,8 @@ interface or via an external visual interface such as GNU XBoard.")
            (lambda _
              ;; These tests require a graphical interface.
              (substitute* "src/Makefile.am"
-               (("test_gfx_fonts TestIOGfxDisplay") "")
-               ;; FIXME: Figure out why `TestIOTouchDragAnywhere` fails
-               (("TestIOTouchDragAnywhere (test_integration)" all _) _))))
+               (("test_gfx_fonts TestIOGfxDisplay") ""))
+             #t))
          (add-before 'bootstrap 'autoreconf
            (lambda _
 	     ;; automake is out of date in the source
@@ -4704,7 +4992,7 @@ This package expects the game(s) to be placed in subdirectories of
     (home-page "http://exult.info/")
     (license license:gpl2+)))
 
-(define %supertuxkart-version "1.5")
+(define %supertuxkart-version "1.4")
 (define supertuxkart-source
   (origin
     (method git-fetch)
@@ -4713,7 +5001,7 @@ This package expects the game(s) to be placed in subdirectories of
           (commit %supertuxkart-version)))
        (sha256
         (base32
-         "0q2dsv9vxblnv04d73qlvbbnkrxgywplz6qsqmfbamn7lj57kypx"))
+         "1hv4p0430zw6qm5fgsmayhj8hdxx7qpzggwks5w26z0dz1b5m9w2"))
        (file-name (git-file-name "supertuxkart" %supertuxkart-version))
        (modules '((guix build utils)))
        (snippet
@@ -4734,7 +5022,7 @@ This package expects the game(s) to be placed in subdirectories of
   ;; There are no tags or releases for the stk-assets data, nor indication of
   ;; which revision is bundled into the released SuperTuxKart-*-src tarball;
   ;; use the latest SVN revision available.
-  (let ((commit "18621"))
+  (let ((commit "18612"))
     (hidden-package
      (package
        (name "supertuxkart-data")
@@ -4751,7 +5039,7 @@ This package expects the game(s) to be placed in subdirectories of
           (file-name (string-append name "-" commit "-checkout"))
           (sha256
            (base32
-            "0bz4rab0h6dyf014andw7lpd5gh3b2xqdslx0ffdglmf65xi594a"))))
+            "1r21m1aginn4wmgrasv2a0cky75l2wk50pqja80k3fbc1gs3hbhz"))))
        (build-system copy-build-system)
        (arguments
         (list #:install-plan
@@ -4797,6 +5085,17 @@ This package expects the game(s) to be placed in subdirectories of
                    "-DUSE_IPV6=FALSE")
            #:phases
            #~(modify-phases %standard-phases
+               (add-before 'configure 'gcc14
+                 (lambda _
+                   (setenv "CXXFLAGS" "-g -O2 -std=c++11")
+                   (substitute* "lib/graphics_engine/include/vk_mem_alloc.h"
+                     (("#define AMD_VULKAN_MEMORY_ALLOCATOR_H" all)
+                       (string-append all "\n#include <cstdio>\n")))
+                   (substitute*
+                     '("lib/graphics_engine/include/ge_main.hpp"
+                       "lib/graphics_engine/include/ge_vulkan_driver.hpp")
+                     (("#include <string>" all)
+                       (string-append all "\n#include <stdexcept>")))))
                (add-before 'configure 'disable-data-install
                  (lambda _
                    (substitute* "CMakeLists.txt"
@@ -4823,7 +5122,7 @@ This package expects the game(s) to be placed in subdirectories of
            enet
            libjpeg-turbo
            openssl))
-    (native-inputs (list mcpp pkg-config python shaderc))
+    (native-inputs (list mcpp pkg-config python))
     (home-page "https://supertuxkart.net/Main_Page")
     (synopsis "3D kart racing game")
     (description "SuperTuxKart is a 3D kart racing game, with a focus on
@@ -8646,7 +8945,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
 (define-public nudoku
   (package
     (name "nudoku")
-    (version "6.0.0")
+    (version "2.1.0")
     (source
      (origin
        (method git-fetch)
@@ -8655,7 +8954,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wy4ck79avbhj5nxcngldaflhx0xx28pcrsmx5a1rvx6kinnxm4f"))))
+        (base32 "12v00z3p0ymi8f3w4b4bgl4c76irawn3kmd147r0ap6s9ssx2q6m"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake gettext-minimal pkg-config))
@@ -8953,6 +9252,136 @@ You can save humanity and get programming skills!")
     (home-page "https://colobot.info")
     (license license:gpl3+)))
 
+(define-public gzdoom
+  (package
+    (name "gzdoom")
+    (version "4.3.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/coelckers/gzdoom")
+             (commit (string-append "g" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0i4hyg72z84fc6ca2ic9q82q5cbgrbd7bynl3kpkypxvyasq08wz"))
+       (patches (search-patches "gzdoom-search-in-installed-share.patch"
+                                "gzdoom-find-system-libgme.patch"))
+       (modules '((guix build utils)
+                  (ice-9 regex)))
+       (snippet
+        '(begin
+           ;; Remove files which mustn't be commercially redistributed.  See
+           ;; <https://zdoom.org/wiki/License#Commercial_use>, the ‘Contribution
+           ;; Guidelines’ at <https://github.com/ZDoom>, and Guix issue #73435.
+           (for-each
+            (lambda (directory)
+              (delete-file-recursively directory)
+              (substitute* "CMakeLists.txt"
+                (((string-append "add_subdirectory\\([[:blank:]]*"
+                                 directory
+                                 "[[:blank:]]*\\)"))
+                 "")))
+            '( ;; "wadsrc_extra"        ;game_support.pk3
+              "wadsrc_bm"))             ;brightmaps.pk3
+
+           ;; Removing game_support.pk3 entirely would break Freedoom & remove
+           ;; users' ability to play commercial games, despite owning (only) the
+           ;; non-functional data.  That can't be right.  Out of an abundance of
+           ;; caution, remove anything from the PK3 that could conceivably be
+           ;; derived from copyrightable data that's not freely redistributable.
+           (display "Keeping only the following game_support.pk3 files:\n")
+           (let* ((regexps (list "/font\\.inf$"
+                                 "/harmony/.*\\.(txt|zs)$"
+                                 "/(iwadinfo|mapinfo|sprofs)\\.txt$"
+                                 "\\.z$"))
+                  (regexp* (format #f "(~{~a~^|~})" regexps))
+                  (regexp  (make-regexp regexp* regexp/icase)))
+             (define (keep-file? file stat)
+               (let ((keep? (regexp-exec regexp file)))
+                 (when keep?
+                   (format #t "  ~a~%" file))
+                 keep?))
+
+             (for-each delete-file (find-files "wadsrc_extra/static"
+                                               (negate keep-file?))))
+
+           ;; Remove some bundled libraries.  XXX There are more, but removing
+           ;; them would require, at least, patching the build system.
+           (with-directory-excursion "libraries"
+             (delete-file-recursively "bzip2")
+             (delete-file-recursively "game-music-emu")
+             (delete-file-recursively "jpeg")
+             (delete-file-recursively "zlib"))))))
+    (arguments
+     (list
+      #:tests? #f
+      #:configure-flags
+      #~(list
+         (string-append
+          "-DCMAKE_CXX_FLAGS:="
+          "-DSHARE_DIR=\\\"" #$output "/share/\\\" "
+          "-DGUIX_OUT_PK3=\\\"" #$output "/share/games/doom\\\"")
+
+         ;; The build requires some extra convincing not to use the bundled
+         ;; libgme previously deleted in the soure snippet.
+         "-DFORCE_INTERNAL_GME=OFF"
+
+         ;; Link libraries at build time instead of loading them at run time.
+         "-DDYN_OPENAL=OFF"
+         "-DDYN_FLUIDSYNTH=OFF"
+         "-DDYN_GTK=OFF"
+         "-DDYN_MPG123=OFF"
+         "-DDYN_SNDFILE=OFF")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-file-names
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/CMakeLists.txt"
+                (("COMMAND /bin/sh")
+                 (string-append "COMMAND " (which "sh"))))
+              (substitute*
+                  "libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp"
+                (("/usr/share/sounds/sf2/FluidR3_GM.sf2")
+                 (search-input-file inputs
+                                    "share/soundfonts/FluidR3Mono_GM.sf3")))
+              (substitute*
+                  "libraries/zmusic/mididevices/music_timiditypp_mididevice.cpp"
+                (("(exename = \")(timidity)(\".*)" _ prefix exe suffix)
+                 (string-append prefix
+                                (search-input-file inputs
+                                                   (string-append "bin/" exe))
+                                suffix))))))))
+    (build-system cmake-build-system)
+    (inputs (list bzip2
+                  fluid-3
+                  fluidsynth
+                  gtk+
+                  libgme
+                  libjpeg-turbo
+                  libsndfile
+                  mesa
+                  mpg123
+                  openal
+                  sdl2
+                  timidity++
+                  zlib))
+    (native-inputs (list pkg-config unzip))
+    (synopsis "Modern Doom 2 source port")
+    (description "GZdoom is a port of the Doom 2 game engine, with a modern
+renderer.  It improves modding support with ZDoom's advanced mapping features
+and the new ZScript language.  In addition to Doom, it supports Heretic, Hexen,
+Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
+    (home-page "https://zdoom.org/index")
+    ;; The source uses x86 assembly
+    (supported-systems '("x86_64-linux" "i686-linux"))
+    (license (list license:gpl3+         ; gzdoom game
+                   license:lgpl3+        ; gzdoom renderer
+                   license:expat         ; gdtoa
+                   (license:non-copyleft ; modified dumb
+                    "file://dumb/licence.txt"
+                    "Dumb license, explicitly GPL compatible.")))))
+
 (define-public odamex
   (package
     (name "odamex")
@@ -10270,7 +10699,7 @@ game field is extended to 4D space, which has to filled up by the gamer with
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-install-helper-paths
            (lambda* (#:key inputs #:allow-other-keys)
-             (let ((7zip (assoc-ref inputs "7zip"))
+             (let ((p7zip (assoc-ref inputs "p7zip"))
                    (innoextract (assoc-ref inputs "innoextract"))
                    (wget (assoc-ref inputs "wget"))
                    (zenity (assoc-ref inputs "zenity")))
@@ -10282,11 +10711,11 @@ game field is extended to 4D space, which has to filled up by the gamer with
                  (("else innoextract")
                   (string-append "else " innoextract "/bin/innoextract"))
                  (("for _extract_zip_sz in 7za 7z")
-                  (string-append "for _extract_zip_sz in " 7zip "/bin/7z"))
+                  (string-append "for _extract_zip_sz in " p7zip "/bin/7za"))
                  (("else if have 7z")
-                  (string-append "else if have " 7zip "/bin/7z"))
+                  (string-append "else if have " p7zip "/bin/7za"))
                  (("7z x -tiso")
-                  (string-append 7zip "/bin/7z x -tiso"))
+                  (string-append p7zip "/bin/7z x -tiso"))
                  (("if have wget")
                   (string-append "if have " wget "/bin/wget"))
                  (("wget -O")
@@ -10315,7 +10744,7 @@ game field is extended to 4D space, which has to filled up by the gamer with
            glm
            freetype
            ;; The following are only needed by the arx-install-data script.
-           7zip ; Install-helper uses it to extract ISO and .cab archives.
+           p7zip ; Install-helper uses it to extract ISO and .cab archives.
            zenity ; GUI for install-helper.
            wget ; Used by the install-helper to download the patch.
            ;; The install-helper needs it to extract the patch.
@@ -11117,8 +11546,8 @@ across many levels and collect all the coaches to win.")
     ;; license.  Desktop file is licensed under CC0 terms.
     (license (list license:gpl2 license:gpl3 license:cc0))))
 
-(define-deprecated-package ri-li
-  li-ri)
+(define-public ri-li
+  (deprecated-package "ri-li" li-ri))
 
 (define-public freeorion
   (package
@@ -11437,7 +11866,7 @@ Xjump game, using SDL instead of Xlib.")
 (define-public xmoto
   (package
     (name "xmoto")
-    (version "0.6.3")
+    (version "0.6.2")
     (source
      (origin
        (method git-fetch)
@@ -11446,7 +11875,7 @@ Xjump game, using SDL instead of Xlib.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08yi6sgz349s7wa07dyrlbhpkmi25arz0c849qgpsj65vr8n7n8c"))
+        (base32 "14z3yqpiyv4y5l37b12kf8ipgsmb9krb4b5d9adlrry0j43hd7wz"))
        (modules '((guix build utils)
                   (ice-9 ftw)
                   (srfi srfi-1)))
@@ -12718,7 +13147,7 @@ and unsafe rides.  Which path will you take?")
 (define-public ultrastar-deluxe
   (package
     (name "ultrastar-deluxe")
-    (version "2025.10.1")
+    (version "2024.10.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -12727,7 +13156,7 @@ and unsafe rides.  Which path will you take?")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "009fbxdv4qkc15y4lisi6d4phv3dk9mypl2hhzfhyjh0i04d2wwa"))
+                "16q6b5nnjx5baq4m30ys47970kjgp06xihyd6qyb08s0yk2f54jz"))
               (patches (search-patches "ultrastar-deluxe-no-freesans.patch"))
               (modules '((guix build utils)))
               (snippet
@@ -12765,9 +13194,10 @@ and unsafe rides.  Which path will you take?")
                   (string-append
                    "linkflags := -lpthread -lsqlite3 -lSDL2"
                    " -lSDL2_image -ldl "
-                   " -lfreetype -lportaudio -lavcodec"
+                   " -lz -lfreetype -lportaudio -lavcodec"
                    " -lavformat -lavutil -lswresample"
                    " -lswscale -llua -ldl -lX11 -lportmidi"
+                   " -L" (where inputs "lib/libz.so")
                    " -L" (where inputs "lib/libX11.so")
                    " -L" (where inputs "lib/libportmidi.so"))))))
            (add-after 'install 'font-paths
@@ -12791,7 +13221,8 @@ and unsafe rides.  Which path will you take?")
                   portmidi
                   sdl2
                   sdl2-image
-                  sqlite))
+                  sqlite
+                  zlib))
     (native-inputs (list pkg-config fpc autoconf automake))
     (synopsis "Karaoke game")
     (description

gnu/packages/gcc.scm

@@ -1574,6 +1574,28 @@ provides the GNU compiler for the Go programming language.")
                     (("(defaultGOROOTValue.*?return `)[^`]+" _ start)
                      (string-append start "/nonexistent"))))))))))))
 
+(define-public gccgo-4.9
+  (custom-gcc (package
+                (inherit gcc-4.9)
+                (synopsis "Go frontend to GCC")
+                (description
+                 "This package is part of the GNU Compiler Collection and
+provides the GNU compiler for the Go programming language."))
+              "gccgo" '("go")
+              %generic-search-paths
+              ;; Suppress the separate "lib" output, because otherwise the
+              ;; "lib" and "out" outputs would refer to each other, creating
+              ;; a cyclic dependency.  <http://debbugs.gnu.org/18101>
+              #:separate-lib-output? #f))
+
+;; Provides go-1.14.6
+(define-public gccgo-10
+  (make-gccgo gcc-10))
+
+;; Provides go-1.16.5
+(define-public gccgo-11
+  (make-gccgo gcc-11))
+
 ;; Provides go-1.18
 (define-public gccgo-12
   (make-gccgo gcc-12))

gnu/packages/geo.scm

@@ -1094,7 +1094,7 @@ for seismology.")
              (invoke "python" "setup.py" "build_ext" "--inplace"))))))
     (propagated-inputs (list python-certifi python-numpy python-packaging))
     (inputs (list gdal))
-    (native-inputs (list python-cython
+    (native-inputs (list python-cython-3
                          python-pytest
                          python-pytest-cov
                          python-setuptools
@@ -2043,7 +2043,7 @@ extension.")
               (with-directory-excursion #$output
                 (apply invoke "pytest" "-vv" test-flags)))))))
     (native-inputs
-     (list python-cython
+     (list python-cython-3
            python-pytest
            python-setuptools
            python-setuptools-scm

gnu/packages/gettext.scm

@@ -240,7 +240,19 @@ color, font attributes (weight, posture), or underlining.")
        (sha256
         (base32 "0kgbm0af7jwpfspa2xxiy9nc2l1r2s1rhbhz4r229zcqv49ak6sq"))))
     (build-system python-build-system)
-    (native-inputs (list python-bump2version python-pytest python-yamllint))
+    (native-inputs
+     (list python-bump2version
+           python-flake8
+           python-flake8-implicit-str-concat
+           python-flake8-print
+           python-isort
+           python-pytest
+           python-pytest-cov
+           python-sphinx
+           python-sphinx-argparse
+           python-sphinx-rtd-theme
+           python-twine
+           python-yamllint))
     (propagated-inputs
      (list python-polib python-pymd4c))
     (home-page "https://github.com/mondeja/mdpo")

gnu/packages/ghostscript.scm

@@ -408,8 +408,8 @@ Ghostscript.  It currently includes the 35 standard PostScript fonts.")
    (license license:gpl2)
    (home-page "https://sourceforge.net/projects/gs-fonts/")))
 
-(define-deprecated-package gs-fonts
-  font-ghostscript)
+(define-public gs-fonts
+  (deprecated-package "gs-fonts" font-ghostscript))
 
 (define-public libspectre
   (package

gnu/packages/gimp.scm

@@ -504,8 +504,8 @@ that is extensible via a plugin system.")
                               shared-mime-info)))))
 
 (define-public gimp gimp-3)
-(define-deprecated-package gimp-next
-  gimp-3)
+(define-public gimp-next
+  (deprecated-package "gimp-next" gimp-3))
 
 (define-public gimp-fourier
   (package

gnu/packages/gl.scm

@@ -686,8 +686,8 @@ from software emulation to complete hardware acceleration for modern GPUs.")
 
 ;;; ICD was part of the Gallium (Clover) OpenCL driver, which was replaced
 ;;; with Rusticl.
-(define-deprecated-package mesa-opencl-icd
-  mesa-opencl)
+(define-public mesa-opencl-icd
+  (deprecated-package "mesa-opencl-icd" mesa-opencl))
 
 (define-public mesa-headers
   (package/inherit mesa

gnu/packages/gnome-xyz.scm

@@ -240,7 +240,7 @@ simple and consistent.")
 (define-public papirus-icon-theme
   (package
     (name "papirus-icon-theme")
-    (version "20250501")
+    (version "20250201")
     (source
      (origin
        (method git-fetch)
@@ -248,7 +248,7 @@ simple and consistent.")
              (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
              (commit version)))
        (sha256
-        (base32 "1k1fjvj01iy6yjkx8r65h6ycvhliv8x85zsysnd3x3m9h173kvxs"))
+        (base32 "1sbzmfcmbsa57grq0jy17mmagdsg95qr2v75zpqlp53jpjq74v53"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
@@ -1221,8 +1221,9 @@ copies you now want to paste.")
 shell, including panels, corners, workspaces.")
     (license license:gpl3)))
 
-(define-deprecated-package gnome-shell-extension-vertical-overview
-  gnome-shell-extension-v-shell)
+(define-public gnome-shell-extension-vertical-overview
+  (deprecated-package "gnome-shell-extension-vertical-overview"
+                      gnome-shell-extension-v-shell))
 
 (define-public gnome-shell-extension-burn-my-windows
   (package

gnu/packages/gnome.scm

@@ -48,7 +48,7 @@
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
-;;; Copyright © 2020, 2021, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net>
 ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
@@ -82,7 +82,6 @@
 ;;; Copyright © 2024 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2025 Noé Lopez <noelopez@free.fr>
 ;;; Copyright © 2025 Ashvith Shetty <ashvithshetty0010@zohomail.in>
-;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2967,8 +2966,8 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
     (description "Icons for the GNOME desktop.")
     (license license:lgpl3))) ; or Creative Commons BY-SA 3.0
 
-(define-deprecated-package gnome-icon-theme
-  adwaita-icon-theme)
+(define-public gnome-icon-theme
+  (deprecated-package "gnome-icon-theme" adwaita-icon-theme))
 
 (define-public tango-icon-theme
   (package
@@ -7406,8 +7405,8 @@ programs via D-Bus.  It also ships a library for integration into development
 environments.")
     (license license:gpl2+)))
 
-(define-deprecated-package d-feet
-  d-spy)
+(define-public d-feet
+  (deprecated-package "d-feet" d-spy))
 
 (define-public yelp-xsl
   (package
@@ -10617,8 +10616,8 @@ Aegis (encrypted / plain-text), andOTP, Google Authenticator
 @end itemize")
     (license license:gpl3+)))
 
-(define-deprecated-package authenticator
-  gnome-authenticator)
+(define-public authenticator
+  (deprecated-package "authenticator" gnome-authenticator))
 
 (define-public gsound
   (package
@@ -11264,18 +11263,6 @@ is suitable as a default application in a Desktop environment.")
            `(,gtk+ "bin") intltool pkg-config))
     (inputs
      (list gtk+ gtksourceview-4 libsm))
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-configure
-                 (lambda _
-                   ;; xpad fails to build due to gettext version mismatch, so
-                   ;; we force it to use gettext 0.23.
-                   (substitute* "configure.ac"
-                     (("AM_GNU_GETTEXT_VERSION.*")
-                      (string-append
-                       "AM_GNU_GETTEXT_VERSION([0.23])\n"
-                       "AM_GNU_GETTEXT_REQUIRE_VERSION([0.23])\n"))))))))
     (home-page "https://wiki.gnome.org/Apps/Xpad")
     (synopsis "Virtual sticky note")
     (description
@@ -11755,7 +11742,7 @@ automatically and it can stream songs from online music services and charts.")
 (define-public gnome-video-effects
   (package
     (name "gnome-video-effects")
-    (version "0.6.0")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -11763,7 +11750,7 @@ automatically and it can stream songs from online music services and charts.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1a68wf9f3z3ss6nwjam55hh60qccpx10png0n8pq6nizdfsaxbnp"))))
+                "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"))))
     (build-system meson-build-system)
     (native-inputs
      (list gettext-minimal pkg-config))
@@ -11775,75 +11762,77 @@ photo-booth-like software, such as Cheese.")
     (license license:gpl2+)))
 
 (define-public cheese
-  (let ((commit "c059d4f1cdfa209ac98d9df82adcc2ade9001c24")
-        (revision "1"))
-    (package
-      (name "cheese")
-      (version (git-version "44.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://gitlab.gnome.org/GNOME/cheese.git")
-                       (commit commit)))
-                (sha256
-                 (base32
-                  "1zi9p7xxbkz7pjb2mbdk95sawyigb1hwgs3yms2drchk5vznnxav"))))
-      (arguments
-       (list #:glib-or-gtk? #t
-             #:phases
-             #~(modify-phases %standard-phases
-                 (add-after 'unpack 'skip-gtk-update-icon-cache
-                   (lambda _
-                     ;; Don't create 'icon-theme.cache'.
-                     (substitute* "meson.build"
-                       (("gtk_update_icon_cache: true")
-                        "gtk_update_icon_cache: false"))))
-                 (add-after 'install 'wrap-cheese
-                   (lambda* (#:key inputs outputs #:allow-other-keys)
-                     (wrap-program (search-input-file outputs "bin/cheese")
-                       `("GST_PLUGIN_SYSTEM_PATH" prefix
-                         (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
-                       `("GST_PRESET_PATH" prefix
-                         (,(dirname (search-input-file inputs
-                                                       "share/gstreamer-1.0\
+  (package
+    (name "cheese")
+    (version "44.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major version) "/" name "-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "13pnz35yvwvmk1iyhcp1a94yal4rh610rxmsp3rdsm4yr728a8az"))))
+    (arguments
+     (list #:glib-or-gtk? #t
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'skip-gtk-update-icon-cache
+                 (lambda _
+                   ;; Don't create 'icon-theme.cache'.
+                   (substitute* "meson.build"
+                     (("gtk_update_icon_cache: true")
+                      "gtk_update_icon_cache: false"))))
+               (add-before 'configure 'relax-gcc-14-strictness
+                 (lambda _
+                   (setenv "CFLAGS"
+                           "-g -O2 -Wno-error=incompatible-pointer-types")))
+               (add-after 'install 'wrap-cheese
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (wrap-program (search-input-file outputs "bin/cheese")
+                     `("GST_PLUGIN_SYSTEM_PATH" prefix
+                       (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
+                     `("GST_PRESET_PATH" prefix
+                       (,(dirname (search-input-file inputs
+                                                     "share/gstreamer-1.0\
 /presets/GstVP8Enc.prs"))))))))))
-      (build-system meson-build-system)
-      (native-inputs
-       (list docbook-xml-4.3
-             docbook-xsl
-             gettext-minimal
-             `(,glib "bin")
-             gobject-introspection
-             gtk-doc/stable
-             itstool
-             libxml2
-             libxslt
-             pkg-config
-             vala))
-      (propagated-inputs
-       (list clutter
-             clutter-gst
-             clutter-gtk
-             gdk-pixbuf
-             glib
-             gnome-video-effects
-             gstreamer
-             libcanberra))
-      (inputs
-       (list bash-minimal
-             gnome-desktop
-             gst-plugins-bad
-             gst-plugins-base
-             gst-plugins-good
-             gtk+
-             libx11
-             libxtst))
-      (home-page "https://wiki.gnome.org/Apps/Cheese")
-      (synopsis "Webcam photo booth software for GNOME")
-      (description
-       "Cheese uses your webcam to take photos and videos.  Cheese can also
+    (build-system meson-build-system)
+    (native-inputs
+     (list docbook-xml-4.3
+           docbook-xsl
+           gettext-minimal
+           `(,glib "bin")
+           gobject-introspection
+           gtk-doc/stable
+           itstool
+           libxml2
+           libxslt
+           pkg-config
+           vala))
+    (propagated-inputs
+     (list clutter
+           clutter-gst
+           clutter-gtk
+           gdk-pixbuf
+           glib
+           gnome-video-effects
+           gstreamer
+           libcanberra))
+    (inputs
+     (list bash-minimal
+           gnome-desktop
+           gst-plugins-bad
+           gst-plugins-base
+           gst-plugins-good
+           gtk+
+           libx11
+           libxtst))
+    (home-page "https://wiki.gnome.org/Apps/Cheese")
+    (synopsis "Webcam photo booth software for GNOME")
+    (description
+     "Cheese uses your webcam to take photos and videos.  Cheese can also
 apply fancy special effects and lets you share the fun with others.")
-      (license license:gpl2+))))
+    (license license:gpl2+)))
 
 (define-public secrets
   (package
@@ -11907,8 +11896,8 @@ format.  It integrates perfectly with the GNOME desktop and provides an easy
 and uncluttered interface for the management of password databases.")
     (license license:gpl3+)))
 
-(define-deprecated-package passwordsafe
-  secrets)
+(define-public passwordsafe
+  (deprecated-package "passwordsafe" secrets))
 
 (define-public sound-juicer
   (package
@@ -12671,8 +12660,8 @@ versions of Adwaita, Adwaita-dark and HighContrast themes.  It also provides
 index files needed for Adwaita to be used outside of GNOME.")
     (license license:lgpl2.1+)))
 
-(define-deprecated-package gnome-themes-standard
-  gnome-themes-extra)
+(define-public gnome-themes-standard
+  (deprecated-package "gnome-themes-standard" gnome-themes-extra))
 
 (define-public gnote
   (package
@@ -13345,46 +13334,42 @@ provided there is a DBus service present:
 (define-public parlatype
   (package
     (name "parlatype")
-    (version "4.3")
+    (version "3.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/gkarsay/parlatype")
-              (commit (string-append "v" version))))
+             (url "https://github.com/gkarsay/parlatype")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "167ij050d6qqkg088rv7a4ply0bzfjz0z0arpymrw2vs7bwxd77x"))))
+        (base32 "0cqrzbkyksfsm57riirmjkwf2nf2dgl1xpps1wvqxpij475qcb9b"))))
     (build-system meson-build-system)
     (arguments
-     (list
-      #:glib-or-gtk? #t
-      #:tests? #f                       ;require internet access
-      #:configure-flags #~(list "-Dpocketsphinx=true")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'wrap-parlatype
-            ;; Add gstreamer plugin provided in this package to system's
-            ;; plugins.
-            (lambda _
-              (let ((gst-plugin-path
-                     (string-append #$output "/lib/gstreamer-1.0/"
-                                    ":"
-                                    (getenv "GST_PLUGIN_SYSTEM_PATH"))))
-                (wrap-program (string-append #$output "/bin/parlatype")
-                  `("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path))))))
-          (add-after 'glib-or-gtk-wrap 'wrap-gdk-pixbuf
-            ;; This phase is necessary for Parlatype to load SVG icons.
-            (lambda _
-              (let ((pixbuf-module-file (getenv "GDK_PIXBUF_MODULE_FILE")))
-                (wrap-program (string-append #$output "/bin/parlatype")
-                  `("GDK_PIXBUF_MODULE_FILE" = (,pixbuf-module-file)))))))))
+     `(#:glib-or-gtk? #t
+       #:tests? #f                      ;require internet access
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "data/meson_post_install.py"
+               (("gtk-update-icon-cache") "true"))))
+         (add-after 'install 'wrap-parlatype
+           ;; Add gstreamer plugin provided in this package to system's
+           ;; plugins.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (gst-plugin-path (string-append
+                                      out "/lib/gstreamer-1.0/"
+                                      ":"
+                                      (getenv "GST_PLUGIN_SYSTEM_PATH"))))
+               (wrap-program (string-append out "/bin/parlatype")
+                 `("GST_PLUGIN_SYSTEM_PATH" ":" = (,gst-plugin-path)))))))))
     (native-inputs
      (list appstream-glib
            desktop-file-utils           ;for desktop-file-validate
            gettext-minimal
            `(,glib "bin")               ;for glib-compile-resources
-           `(,gtk "bin")                ;for gtk-update-icon-cache
            pkg-config
            yelp-tools))
     (inputs
@@ -13392,11 +13377,11 @@ provided there is a DBus service present:
            gst-plugins-base
            gst-plugins-good
            gstreamer
-           gtk
+           gtk+
            iso-codes/pinned
-           libadwaita
            pocketsphinx
-           pulseaudio))
+           pulseaudio
+           sphinxbase))
     (home-page "https://www.parlatype.org")
     (synopsis "GNOME audio player for transcription")
     (description "Parlatype is an audio player for the GNOME desktop
@@ -13790,7 +13775,7 @@ profiler via Sysprof, debugging support, and more.")
            python-natsort
            python-piexif
            python-pillow
-           python-pillow-heif-0.22
+           python-pillow-heif
            python-pure-protobuf
            python-pycairo
            python-pygobject

gnu/packages/gnunet.scm

@@ -193,7 +193,7 @@ authentication and support for SSL3 and TLS.")
 (define-public gnunet
   (package
     (name "gnunet")
-    (version "0.25.2")
+    (version "0.25.1")
     (source
      (origin
        (method url-fetch)
@@ -201,7 +201,7 @@ authentication and support for SSL3 and TLS.")
                            ".tar.gz"))
        (sha256
         (base32
-         "1rn24rm6z5p0vnk5lwq0jihnbh956n24yd5nmmgv2firbp1nzdza"))))
+         "0p4gcv67rh9832vgi5k31pgpq6hmv6198dfmbyfizyaprlb6qcr1"))))
     (build-system meson-build-system)
     (inputs
      (list bluez
@@ -338,3 +338,37 @@ The following services are supported:
     ;; or GPL.  Documentation is licensed as GFDL.
     (license (list license:agpl3+ license:gpl3+ license:fdl1.3+ license:lgpl3+))
     (home-page "https://git.gnunet.org/gnunet-scheme.git")))
+
+(define-public gnunet-gtk
+  (package (inherit gnunet)
+    (name "gnunet-gtk")
+    (version "0.24.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1asp0c5f278zdf6586zng36zmn5pj08qqx0pnap4nh58ycr37i5f"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--with-libunique"
+                   "--with-qrencode"
+                   (string-append "--with-gnunet="
+                                  #$(this-package-input "gnunet")))))
+    (inputs
+     (list glade3
+           gnunet
+           gnutls/dane
+           gtk+
+           libextractor
+           libgcrypt
+           libsodium
+           libunique
+           qrencode))
+    (native-inputs
+     (list pkg-config libglade))
+    (synopsis "Graphical front-end tools for GNUnet")
+    (properties '((ftp-server . "ftp.gnu.org")
+                  (ftp-directory . "/gnunet")))))

gnu/packages/gnuzilla.scm

@@ -941,9 +941,7 @@ preferences/advanced-scripts.dtd"
                  #$(local-file
                     (search-patch "icecat-use-system-wide-dir.patch"))
                  #$(local-file
-                    (search-patch "icecat-fhs-configure-option.patch"))
-                 #$(local-file
-                    (search-patch "icecat-adjust-mozilla-desktop.patch"))))))
+                    (search-patch "icecat-fhs-configure-option.patch"))))))
           (add-after 'apply-guix-specific-patches 'remove-bundled-libraries
             (lambda _
               ;; Remove bundled libraries that we don't use, since they may

gnu/packages/golang-apps.scm

@@ -1,5 +1,4 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2023 JOULAUD François <Francois.JOULAUD@radiofrance.com>
 ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
@@ -111,39 +110,6 @@ special case for no-op or fake fxevent.Loggers, it ignores implementations
 that handle none of the event types.")
     (license license:expat)))
 
-(define-public go-jsonnet
-  (package
-    (name "go-jsonnet")
-    (version "0.21.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/google/go-jsonnet")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0d05f16qxabfhaj0l3da3x7zl5g8jbvkcyn39bidd2a278sb3p97"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:import-path "github.com/google/go-jsonnet/cmd/jsonnet"
-      #:unpack-path "github.com/google/go-jsonnet"))
-    (native-inputs
-     (list go-github-com-fatih-color
-           go-github-com-sergi-go-diff
-           go-golang-org-x-crypto
-           go-sigs-k8s-io-yaml))
-    (home-page "https://github.com/google/go-jsonnet")
-    (synopsis "Go implementation of Jsonnet")
-    (description
-     "This package provides an implementation of the @url{http://jsonnet.org/,
-Jsonnet} data templating language in Go.  It is a feature-complete,
-production-ready implementation, compatible with the original Jsonnet
-C++implementation.")
-    (license license:asl2.0)))
-
 (define-public godef
   (package
     (name "godef")
@@ -166,9 +132,6 @@ C++implementation.")
       ;; The TestGoDef/Modules test fails, because of the lack of Go modules
       ;; support.
       #:test-flags #~(list "-skip" "TestGoDef/GOPATH|TestGoDef/Modules")))
-    (native-inputs
-     ;; XXX: Remove in the next refresh cycle.
-     (list go-golang-org-x-tools-go-packages-packagestest))
     (inputs
      (list go-golang-org-x-tools
            go-ninefans-net-go))

gnu/packages/golang-build.scm

@@ -91,7 +91,7 @@ interoperate.")
 (define-public go-github-com-ebitengine-purego
   (package
     (name "go-github-com-ebitengine-purego")
-    (version "0.9.0")
+    (version "0.8.4")
     (source
      (origin
        (method git-fetch)
@@ -100,14 +100,14 @@ interoperate.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0qkjn7xswbfrly8bwryww0jwfdasig9bfx24dnwryz8iakkyww6f"))))
+        (base32 "0sy5cn56wxwv1qpl6vg5160hlk004m5wdlf18rfnj63573f5kivh"))))
     (build-system go-build-system)
     (arguments
      (list
       #:import-path "github.com/ebitengine/purego"
       ;; TODO: This failed test should be proper checked.
       ;; ld:
-      ;; /tmp/guix-build-go-github-com-ebitengine-purego-0.9.0.drv-0/ccguQKNs.o:
+      ;; /tmp/guix-build-go-github-com-ebitengine-purego-0.8.4.drv-0/ccguQKNs.o:
       ;; relocation R_X86_64_32 against `.bss' can not be used when making a
       ;; shared object; recompile with -fPIC ld: failed to set dynamic section
       ;; sizes: bad value collect2: error: ld returned 1 exit status
@@ -384,79 +384,6 @@ replace a file or symbolic link.")
 1.1: Authentication and Security Services.")
     (license license:bsd-3)))
 
-(define-public go-github-com-magefile-mage
-  (package
-    (name "go-github-com-magefile-mage")
-    (version "1.15.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/magefile/mage")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zjglw9ra0mc77d6i3yavhihp94qzr9rqx1lhs9whm3qw7gyz4v9"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/magefile/mage"
-      #:test-flags
-      #~(list "-tags" "CI"
-              "-skip" (string-join
-                       ;; Some tests need the "mage" binary to bootstrap
-                       ;; tests, other fail on comparing output of options.
-                       (list "TestBootstrap"
-                             "TestGoModules"
-                             "TestGoRun"
-                             "TestInvalidAlias"
-                             "TestMagefilesFolderMixedWithMagefiles"
-                             "TestNoArgNoDefaultList"
-                             "TestTimeout"
-                             "TestWrongDependency")
-                       "|"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'pre-check
-            (lambda _
-              (setenv "HOME" "/tmp"))))))
-    (home-page "https://github.com/magefile/mage")
-    (synopsis "Make/rake-like dev tool for Golang")
-    (description
-     "Mage is a make-like build tool using for Go.  It implements a
-functionality of writing plain-old go functions which Mage automatically uses
-as Makefile-like runnable targets consistent across a project.  This package
-provides a source library and built command @command{mage}.")
-    (license license:asl2.0)))
-
-(define-public go-github-com-matttproud-golang-protobuf-extensions
-  (package
-    (name "go-github-com-matttproud-golang-protobuf-extensions")
-    (version "1.0.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/matttproud/golang_protobuf_extensions")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:skip-build? #t
-      #:import-path "github.com/matttproud/golang_protobuf_extensions"))
-    (propagated-inputs
-     (list go-github-com-golang-protobuf))
-    (home-page "https://github.com/matttproud/golang_protobuf_extensions")
-    (synopsis "Support for streaming Protocol Buffer messages for Golang")
-    (description
-     "This package provides various Protocol Buffer extensions for the Go
-language (golang), namely support for record length-delimited message
-streaming.")
-    (license license:asl2.0)))
-
 (define-public go-github-com-mmcloughlin-avo
   (package
     (name "go-github-com-mmcloughlin-avo")
@@ -523,17 +450,16 @@ primitives in Go.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/twitchyliquid64/golang-asm")
-              (commit (string-append "v" version))))
+             (url "https://github.com/twitchyliquid64/golang-asm")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32 "1akw41i0snxqw9lqzmnn4gx6hd5js5dr1vmfkm49wxans4k14vw4"))))
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/twitchyliquid64/golang-asm"
-      #:test-flags
-      #~(list "-vet=off")))   ;Go@1.24 forces vet, but tests are not ready yet.
+      #:go go-1.23
+      #:import-path "github.com/twitchyliquid64/golang-asm"))
     (home-page "https://github.com/twitchyliquid64/golang-asm")
     (synopsis "Assembler from the Go compiler, in library form")
     (description
@@ -545,16 +471,16 @@ library.")
 (define-public go-github-com-yuin-goldmark
   (package
     (name "go-github-com-yuin-goldmark")
-    (version "1.7.13")
+    (version "1.7.12")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/yuin/goldmark")
-              (commit (string-append "v" version))))
+             (url "https://github.com/yuin/goldmark")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "183v5bzgwr7ibbj6srnaaq7n98xqifaswa0c01yf693p5l6q3q6m"))))
+        (base32 "1qc665b8clfvah62l8bkk473ybng7qzwwibxsq5wskfswv5yaj94"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -603,7 +529,7 @@ library.")
 (define-public go-golang-org-x-arch
   (package
     (name "go-golang-org-x-arch")
-    (version "0.22.0")
+    (version "0.17.0")
     (source
      (origin
        (method git-fetch)
@@ -612,7 +538,7 @@ library.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "14s32fhg9wxvnsnl9szfsbhkxyxcql6dg2qwli055wfly8wly26m"))))
+        (base32 "02qwvciikyrssifdp50zbjgqvpkb6sj09jzjvyl1n9v5fvg7mxba"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -637,47 +563,28 @@ toolchain.  The parts needed in the main Go repository are copied in.")
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-    (version "0.43.0")
+    (version "0.38.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/crypto")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/crypto")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1d49g86ndfzj40nrichhhsknn6lgl1gh8862dmgsx0l0885kik9i"))
+        (base32 "1wx7wf3ifb10cx2yckm925a9ydy5bw3iv664cma27abkfssj07ba"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
             ;; Submodules with their own go.mod files and packaged separately:
             ;;
-            ;; - golang.org/x/crypto/argon2/_asm
-            ;; - golang.org/x/crypto/blake2b/_asm/AVX2
-            ;; - golang.org/x/crypto/blake2b/_asm/standard
-            ;; - golang.org/x/crypto/blake2s/_asm
-            ;; - golang.org/x/crypto/chacha20poly1305/_asm
-            ;; - golang.org/x/crypto/internal/poly1305/_asm
-            ;; - golang.org/x/crypto/salsa20/salsa/_asm
-            ;; - golang.org/x/crypto/sha3/_asm
-            ;; - golang.org/x/crypto/x509roots/fallback
-            (for-each delete-file-recursively
-                      (list "argon2/_asm"
-                            "blake2b/_asm/AVX2"
-                            "blake2b/_asm/standard"
-                            "blake2s/_asm"
-                            "chacha20poly1305/_asm"
-                            "internal/poly1305/_asm"
-                            "salsa20/salsa/_asm"
-                            "sha3/_asm"
-                            "x509roots/fallback"))))))
+            ;; - olang.org/x/crypto/x509roots/fallback
+            (for-each delete-file-recursively (list "x509roots/fallback"))))))
     (build-system go-build-system)
     (arguments
      (list
       #:skip-build? #t
       #:import-path "golang.org/x/crypto"
-      ;; panic: testing: test using t.Setenv or t.Chdir can not use t.Parallel
-      #:test-flags #~(list "-skip" "TestWithPebble")
       #:phases
       #~(modify-phases %standard-phases
           ;; Network access required: go mod download -json
@@ -704,8 +611,7 @@ toolchain.  The parts needed in the main Go repository are copied in.")
      (list go-golang-org-x-net-bootstrap
            go-golang-org-x-text-bootstrap))
     (propagated-inputs
-     (list go-golang-org-x-sys
-           go-golang-org-x-term))
+     (list go-golang-org-x-sys go-golang-org-x-term))
     (home-page "https://go.googlesource.com/crypto/")
     (synopsis "Supplementary cryptographic libraries in Go")
     (description
@@ -728,9 +634,8 @@ language.")
   (package
     (name "go-golang-org-x-exp")
     ;; Note: Beware, the updater gets this wrong.  Take the latest version
-    ;; string from <https://pkg.go.dev/golang.org/x/exp?tab=versions>, or try
-    ;; "guix import go golang.org/x/exp".
-    (version "0.0.0-20250911091902-df9299821621")
+    ;; string from <https://pkg.go.dev/golang.org/x/exp?tab=versions>.
+    (version "0.0.0-20250531010427-b6e5de432a8b")
     (source
      (origin
        (method git-fetch)
@@ -739,7 +644,7 @@ language.")
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0jmpq16f2d8i3bnwxa78j384vi5gynfajh34m2nh3vhji3d35777"))
+        (base32 "0vszjiblb7i79dp9x1zvfpjidnmkzsaq6ij2jfh63hv9ph7yz3hf"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -762,14 +667,25 @@ language.")
       #~(list "-skip"
               (string-join
                (list
-                ;; gorelease_test.go:310: error running `go mod init`: go:
-                ;; modules disabled by GO111MODULE=off; see 'go help modules'
+                ;; Disable failing tests: error running `go mod init`:
+                ;; go: modules disabled by GO111MODULE=off.
                 "TestRelease_gitRepo_uncommittedChanges"
-                ;; constraints_test.go:104:
-                ;; /gnu/store/vr0097qq0kl1ansn6iv5smysjh9v7ycd-go-1.24.3/lib/go/bin/go
-                ;; mod tidy: exit status 1 go: modules disabled by
-                ;; GO111MODULE=off; see 'go help modules'
-                "TestFailure")
+                "TestFailure"
+                ;; Delete: want nil discarded elements, got
+                ;; 0xc000012858, 0xc000012860
+                "TestDeleteClearTail"
+                ;; DeleteFunc: want nil discarded elements, got
+                ;; 0xc000012910, 0xc000012918
+                "TestDeleteFuncClearTail"
+                ;; Compact: want nil discarded elements, got
+                ;; 0xc000012b30, 0xc000012b38
+                "TestCompactClearTail"
+                ;; CompactFunc: want nil discarded elements, got
+                ;; 0xc000012be8, 0xc000012bf0
+                "TestCompactFuncClearTail"
+                ;; Replace: want nil discarded element, got
+                ;; 0xc000013058
+                "TestReplaceClearTail")
                "|"))
       #:phases
       #~(modify-phases %standard-phases
@@ -777,8 +693,6 @@ language.")
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
                 (delete-file-recursively "slog/benchmarks")))))))
-    (native-inputs
-     (list go-golang-org-x-tools-go-packages-packagestest))
     (propagated-inputs
      (list go-github-com-google-go-cmp
            go-golang-org-x-mod
@@ -807,7 +721,7 @@ directory) packages.")
     ;; Note: Beware, the updater gets this wrong.  Take the latest version
     ;; string from
     ;; <https://pkg.go.dev/golang.org/x/exp/typeparams?tab=versions>.
-    (version "0.0.0-20251009144603-d2f985daa21b")
+    (version "0.0.0-20250531010427-b6e5de432a8b")
     (source
      (origin
        (method git-fetch)
@@ -816,7 +730,7 @@ directory) packages.")
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kn9bcbrkdvg4f8kvc0cdahyyy72w2jf9v9c95k67k0b46fwh3i6"))))
+        (base32 "0vszjiblb7i79dp9x1zvfpjidnmkzsaq6ij2jfh63hv9ph7yz3hf"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -843,23 +757,23 @@ compile does not support generics.")
 (define-public go-golang-org-x-image
   (package
     (name "go-golang-org-x-image")
-    (version "0.32.0")
+    (version "0.27.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/image")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/image")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "174mwxshc6idwihajb05h68ynf63ppfqw5zi6cm5ja08dsfbk43b"))))
+        (base32 "0kc75lbfb0m9xp0idcqlpcis6xahblw2q7cj6vg9lmblxzqy5nvh"))))
     (build-system go-build-system)
     (arguments
      (list
-      #:skip-build? #t
       #:import-path "golang.org/x/image"
       #:phases
       #~(modify-phases %standard-phases
+          (delete 'build) ; no go files in project's root
           (add-after 'unpack 'remove-examples
             (lambda* (#:key import-path #:allow-other-keys)
               (delete-file-recursively
@@ -886,16 +800,20 @@ compile does not support generics.")
 (define-public go-golang-org-x-mod
   (package
     (name "go-golang-org-x-mod")
-    (version "0.29.0")
+    ;; XXX: To update to 0.22.0+ go-1.23 is required, wich provides
+    ;; "go/version" module, see
+    ;; <https://cs.opensource.google/go/go/+/refs/tags/
+    ;; go1.23.0:src/go/version/version.go>.
+    (version "0.24.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/mod")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/mod")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1cc79540hc7yjwmqi6574808i3i3p0n8q49fp7vccb86qgms1rcc"))))
+        (base32 "17sjk98d3qwh9s6gqjmfy07z0gyj5hyv5a9kyg4si3yjfzbnwhx7"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -933,7 +851,7 @@ loading algorithms.")
 (define-public go-golang-org-x-net
   (package
     (name "go-golang-org-x-net")
-    (version "0.46.0")
+    (version "0.40.0")
     (source
      (origin
        (method git-fetch)
@@ -942,7 +860,7 @@ loading algorithms.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0zb45fmiwsi8nq56wfzk83q7ksqk8jaw8rlpnxv929c419gi8h0s"))))
+        (base32 "0zsh08wbamzlvlwvlw6slgcqhaa59rwz9pq01lbyjigw6cfww406"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -977,16 +895,16 @@ loading algorithms.")
 (define-public go-golang-org-x-sync
   (package
     (name "go-golang-org-x-sync")
-    (version "0.17.0")
+    (version "0.14.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/sync")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/sync")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0bga9sfiwqxs7g913p7b355hg30agw58h5f5k7rzgpsai37nbkik"))))
+        (base32 "1gpa1v6wnp1bszk5iyiakq1j37icgxswj3iysdrdyp0yadw0pm30"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1021,7 +939,7 @@ cancellation for groups of goroutines working on subtasks of a common task
 (define-public go-golang-org-x-sys
   (package
     (name "go-golang-org-x-sys")
-    (version "0.37.0")
+    (version "0.33.0")
     (source
      (origin
        (method git-fetch)
@@ -1030,7 +948,7 @@ cancellation for groups of goroutines working on subtasks of a common task
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0cjq8n66i9cccigi204mkhqmrb9mdirxjxl0nk7c8s6w70fifbby"))))
+        (base32 "19m090xd3abysvk1y07fhhd025k3s456i71ww0pq0b2pzsva5ra2"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1086,16 +1004,16 @@ low-level interaction with the operating system.")
     (name "go-golang-org-x-telemetry")
     ;; Beware: the updater gets this wrong.  Use the latest commit and its
     ;; matching date.
-    (version "0.0.0-20251009181524-91c411e14f39")
+    (version "0.0.0-20250529002037-25d2f7894191")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/telemetry")
-              (commit (go-version->git-ref version))))
+             (url "https://go.googlesource.com/telemetry")
+             (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v5427r8il5bj9h86d7dy1k1g9jag9c7vmbq0kmrzhfn6l0c310c"))
+        (base32 "0ymqig10vyrmzkali1wqhxrrb3fjvl7z9wmzf5g0dydb9a8ng42l"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
@@ -1111,26 +1029,20 @@ low-level interaction with the operating system.")
       #~(list "-skip" (string-join
                        ;; Tests fail with error: failed to download config
                        ;; module.
-                       (list "TestConcurrentStart" ;got 0 report dates, want 3
-                             "TestStart"           ;no upload occurred on 2786
+                       (list "TestConcurrentStart"
                              "TestDownload"
-                             ;; got err clone: checking out
-                             ;; https://go.googlesource.com/tools: fork/exec
-                             ;; /bin/sh: no such file or directory
-                             "TestReadPCLineTable"
-                             "TestUpdateIssues"
-                             ;; querying go info: listing toolchain versions:
-                             ;; listing versions: exit status 1 (stderr: go:
-                             ;; list -m cannot be used with GO111MODULE=off
-                             "TestLoadedChartsAreValid"
                              "TestRun_Basic"
-                             "TestRun_Retries"
-                             "TestRun_MultipleUploads"
+                             "TestRun_Concurrent"
+                             "TestRun_DebugLog"
                              "TestRun_EmptyUpload"
                              "TestRun_MissingDate"
-                             "TestRun_ModeHandling"
-                             "TestRun_DebugLog"
-                             "TestRun_Concurrent")
+                             "TestRun_ModeHandling/on"
+                             "TestRun_MultipleUploads"
+                             "TestRun_Retries"
+                             "TestStart" ;no upload occurred on 2786
+                             ;; TestLoadedChartsAreValid fails with "go: list
+                             ;; -cannot be used with GO111MODULE=off"
+                             "TestLoadedChartsAreValid")
                        "|"))
       #:import-path "golang.org/x/telemetry"))
     (propagated-inputs
@@ -1148,7 +1060,7 @@ Go toolchain programs with opt-in telemetry.")
 (define-public go-golang-org-x-telemetry-config
   (package
     (name "go-golang-org-x-telemetry-config")
-    (version "0.68.0")
+    (version "0.48.0")
     (source
      (origin
        (method git-fetch)
@@ -1158,7 +1070,7 @@ Go toolchain programs with opt-in telemetry.")
                                           #:subdir "config"))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v5427r8il5bj9h86d7dy1k1g9jag9c7vmbq0kmrzhfn6l0c310c"))))
+        (base32 "0lzybsdibr71y6n3x8qh37yh9vfwdmmdb6vksqimg4ayys373q7x"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1178,7 +1090,7 @@ telemetry uploads: GOOS, GOARCH, Go version, and per-program counters.")
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.36.0")
+    (version "0.32.0")
     (source
      (origin
        (method git-fetch)
@@ -1187,7 +1099,7 @@ telemetry uploads: GOOS, GOARCH, Go version, and per-program counters.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13xd1frw2jzqbd8743m5zhrq6asz9ar1maxd3cbk3rzybc9wx0p5"))))
+        (base32 "09q25x265yyy4jfjqpm10x8jai30wcbhb7bqgkjll4gw2sz3zhz1"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
@@ -1212,7 +1124,7 @@ terminals, as commonly found on Unix systems.")
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
-    (version "0.30.0")
+    (version "0.25.0")
     (source
      (origin
        (method git-fetch)
@@ -1221,7 +1133,7 @@ terminals, as commonly found on Unix systems.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pgpfzk86wqf6k2fbrxa80pz1jx6y4dfr4dr26pwsw6j7l3s5pby"))))
+        (base32 "1r9532ml0psfby89agf20q23qzwfikhydl8q77ad5y73xvdx89lf"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1262,16 +1174,16 @@ processing.")
 (define-public go-golang-org-x-time
   (package
     (name "go-golang-org-x-time")
-    (version "0.14.0")
+    (version "0.11.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/time")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/time")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0xinpch5wm57hrf3d8iasxyszibqclsr911l7527al4y92myjn3x"))))
+        (base32 "1bqgxv7b3n69h4mi4hwr51pfr1hr6s1h6k7nb3dl32dryy7xwr12"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1287,60 +1199,80 @@ time.")
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-    (version "0.37.0")
+    (version "0.33.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/tools")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/tools")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0l0srynl2cikmz089q5vqgifz6ll2ic1762fbfvak26vqbcx0knz"))
+        (base32 "1lbb4y1c5b4719pdhfcb90sdzagzsb2lw5hx8gizsba3cj0r0f25"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-           ;; Submodules with their own go.mod files and packaged separately:
-           ;;
-           ;; - golang.org/x/tools/cmd/auth
-           ;; - golang.org/x/tools/gopls
-           (delete-file-recursively "gopls")
-           (delete-file-recursively "cmd/auth")))))
+           ;; gopls versions are tagged separately, and it is a
+           ;; separate Guix package.
+           (delete-file-recursively "gopls")))))
     (build-system go-build-system)
     (arguments
      (list
-      #:skip-build? #t
       #:import-path "golang.org/x/tools"
-      #:test-subdirs
-      #~(list "./blog/..."
-              "./container/..."
-              "./copyright/..."
-              "./cover/..."
-              "./go/ast/..."
-              "./go/buildutil/..."
-              "./go/cfg/..."
-              "./go/gccgoexportdata/..."
-              "./go/gcexportdata/..."
-              "./go/internal/..."
-              "./go/loader/..."
-              "./go/types/..."
-              "./imports/..."
-              "./playground/..."
-              "./refactor/importgraph/..."
-              "./refactor/rename/..."
-              "./refactor/satisfy/..."
-              "./txtar/...")
-      #:test-flags
-      #~(list "-skip" (string-join
-                       (list
-                        ;; The GenericPaths test fails with "invalid memory
-                        ;; address or nil pointer dereference".
-                        "TestGenericPaths"
-                        ;; The ordering and paths tests fails because they
-                        ;; can't find test packages (perhaps because we do not
-                        ;; support Go modules).
-                        "TestOrdering" "TestPaths")
-                       "|"))))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v"
+                          ;; TODO: They contain final project executable builds,
+                          ;; would be packed separately.
+                          ;; - cmd
+                          ;; - godoc
+
+                          ;; FIXME: Figure out why they are failing:
+                          ;; "./go/analysis/..."
+                          ;; "./go/callgraph/..."
+                          ;; "./go/packages/..."
+                          ;; "./go/ssa/..."
+                          ;; "./internal/..."
+                          ;; "./present/..."
+                          ;; "./refactor/eg/..."
+
+                          "./blog/..."  ;
+                          "./container/..."
+                          "./copyright/..."
+                          "./cover/..."
+                          "./go/ast/..."
+                          "./go/buildutil/..."
+                          "./go/cfg/..."
+                          "./go/expect/..."
+                          "./go/gccgoexportdata/..."
+                          "./go/gcexportdata/..."
+                          "./go/internal/..."
+                          "./go/loader/..."
+                          "./go/types/..."
+                          "./imports/..."
+                          "./playground/..."
+                          "./refactor/importgraph/..."
+                          "./refactor/rename/..."
+                          "./refactor/satisfy/..."
+                          "./txtar/..."
+                          "-skip"
+                          (string-join
+                           (list
+                            ;; The GenericPaths test fails with "invalid
+                            ;; memory address or nil pointer dereference".
+                            "TestGenericPaths"
+                            ;; The ordering and paths tests fails because they
+                            ;; can't find test packages (perhaps because we do
+                            ;; not support Go modules).
+                            "TestOrdering" "TestPaths")
+                           "|")))))))))
     (native-inputs
      (list gccgo-14
            go-github-com-google-go-cmp))
@@ -1367,130 +1299,6 @@ Go programming language.")
      (native-inputs '())
      (propagated-inputs '()))))
 
-(define-public go-golang-org-x-tools-go-expect
-  (package
-    (name "go-golang-org-x-tools-go-expect")
-    (version "0.1.1-deprecated")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://go.googlesource.com/tools")
-              (commit (go-version->git-ref version
-                                           #:subdir "go/expect"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "go" "expect")
-            (delete-all-but "." "go")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "golang.org/x/tools/go/expect"
-      #:unpack-path "golang.org/x/tools"))
-    (propagated-inputs (list go-golang-org-x-mod))
-    (home-page "https://golang.org/x/tools")
-    (synopsis "Interpreting structured comments in Golang")
-    (description
-     "Package expect provides support for interpreting structured comments in
-Go source code (including go.mod and go.work files) as test expectations.")
-    (license license:bsd-3)))
-
-(define-public go-golang-org-x-tools-go-packages-packagestest
-  (package
-    (name "go-golang-org-x-tools-go-packages-packagestest")
-    (version "0.1.1-deprecated")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://go.googlesource.com/tools")
-              (commit (go-version->git-ref version
-                                           #:subdir "go/packages/packagestest"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "go" "packages")
-            (delete-all-but "go/packages" "packagestest")
-            (delete-all-but "." "go")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "golang.org/x/tools/go/packages/packagestest"
-      #:unpack-path "golang.org/x/tools"))
-    (propagated-inputs
-     (list go-golang-org-x-tools
-           go-golang-org-x-tools-go-expect))
-    (home-page "https://golang.org/x/tools")
-    (synopsis "Temporary testing projects for Golang")
-    (description
-     "Package packagestest creates temporary projects on disk for testing go
-tools on.")
-    (license license:bsd-3)))
-
-(define-public go-golang-org-x-tools-godoc
-  (package
-    (name "go-golang-org-x-tools-godoc")
-    (version "0.1.0-deprecated")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/tools")
-             (commit (go-version->git-ref version
-                                          #:subdir "godoc"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1blk22apy424j9v58lfy4pxnrgh93yqchqhxsnf78dmx4vx5yi9r"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-26)))
-       (snippet
-        #~(begin
-            (define (delete-all-but directory . preserve)
-              (with-directory-excursion directory
-                (let* ((pred (negate (cut member <>
-                                          (cons* "." ".." preserve))))
-                       (items (scandir "." pred)))
-                  (for-each (cut delete-file-recursively <>) items))))
-            (delete-all-but "." "godoc")))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "golang.org/x/tools/godoc"
-      #:unpack-path "golang.org/x/tools"))
-    (propagated-inputs
-     (list go-golang-org-x-tools
-           go-github-com-yuin-goldmark))
-    (home-page "https://golang.org/x/tools")
-    (synopsis "Code for running a godoc server.")
-    (description
-     "This package provides most of the code for running a @code{godoc}
- server.")
-    (license license:bsd-3)))
-
 (define-public go-golang-org-x-vuln
   (package
     (name "go-golang-org-x-vuln")
@@ -1517,8 +1325,6 @@ tools on.")
       ;; go: modules disabled by GO111MODULE=off
       #:test-flags #~(list "-skip" "TestVet|TestGoModTidy|Test58509")
       #:test-subdirs #~(list "internal/..." "scan/..." ".")))
-    (native-inputs
-     (list go-golang-org-x-tools-go-packages-packagestest))
     (propagated-inputs
      (list go-github-com-google-go-cmdtest
            go-github-com-google-go-cmp
@@ -1559,8 +1365,8 @@ values.")
 
 (define-public go-google-golang-org-genproto-googleapis-rpc
   ;; No release or verion tags, use the latest commit.
-  (let ((commit "49b9836ed3ff1e1dd329d17e442987447e931c7d")
-        (revision "1"))
+  (let ((commit "e70fdf4c4cb4151b7aa3579ce8a3fb662bafe335")
+        (revision "0"))
     (package
       (name "go-google-golang-org-genproto-googleapis-rpc")
       (version (git-version "0.0.0" revision commit))
@@ -1568,11 +1374,11 @@ values.")
        (origin
          (method git-fetch)
          (uri (git-reference
-                (url "https://github.com/googleapis/go-genproto")
-                (commit commit)))
+               (url "https://github.com/googleapis/go-genproto")
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0pr2qvmrg9f3nrbvmw8ir37mki92nkb9km8zlpxslzmxbjmiwjxb"))))
+          (base32 "0jf332yxgf1c6nj76b1p52907g786gynzd78g899m3vrfa45wswz"))))
       (build-system go-build-system)
       (arguments
        (list
@@ -1591,21 +1397,23 @@ values.")
 (define-public go-google-golang-org-protobuf
   (package
     (name "go-google-golang-org-protobuf")
-    (version "1.36.10")
+    (version "1.36.6")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://go.googlesource.com/protobuf")
-              (commit (string-append "v" version))))
+             (url "https://go.googlesource.com/protobuf")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1509n0gvzqq8mr2377lzg70hfzwrijv069z094rnghif9b0hh07g"))))
+        (base32 "0lp1a6bcwdiil4my0aq85ranxf2k757m8q0ss9658jyrh5g7av79"))))
     (build-system go-build-system)
     (arguments
      (list
-      #:skip-build? #t
-      #:import-path "google.golang.org/protobuf"))
+      #:import-path "google.golang.org/protobuf"
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'build)))) ; no go files in project's root
     (propagated-inputs (list go-github-com-google-go-cmp))
     (home-page "https://google.golang.org/protobuf")
     (synopsis "Go library for Protocol Buffers")