gnu: ocaml5: ocaml-5.3: Delete variable.

* gnu/packages/ocaml5.scm (ocaml-5.3): Delete variable.

Change-Id: Id78b07917692518e1afd48041b69871ecbae58c2
Signed-off-by: Julien Lepiller <julien@lepiller.eu>

.forgejo/pull_request_template.md

@@ -28,7 +28,6 @@ Tick a box by changing it from [ ] to [x].
   - [ ] i586-gnu
 
 - Package **update**
-  - Closure size increase after update (`./pre-inst-env guix size PACKAGE`).
   - Build status of direct dependents (`./pre-inst-env guix build -k -P1 PACKAGE ...`):
 ```text
 
@@ -38,14 +37,13 @@ Tick a box by changing it from [ ] to [x].
 
 ```
 - Package **addition**
-  - [ ] The packages includes tests when available.
-  - [ ] Closure size given by `guix size`.
   - [ ] Fixed errors reported by `guix lint` (`./pre-inst-env guix lint PACKAGE ...`).
   - [ ] Verified cryptographic signature provided by upstream.
   - [ ] The packages don't use bundled copies of software.
   - [ ] Synopsis and description are written in conformance with [the guidelines](https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html).
-  - [ ] Commit messages follow [the "ChangeLog" style](https://www.gnu.org/prep/standards/html_node/Change-Logs.html).
-  - [ ] The change doesn't break `guix pull` (`guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-authentication`).
+
+- [ ] Commit messages follow [the "ChangeLog" style](https://www.gnu.org/prep/standards/html_node/Change-Logs.html).
+- [ ] The change doesn't break `guix pull` (`guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-authentication`).
 
 - Successfully cross-compiled to the following target(s) (this is optional):
   - [ ] x86_64-linux-gnu

CODEOWNERS

@@ -308,6 +308,7 @@ gnu/packages/lxqt\.scm                             @guix/lxqt
 
 gnu/packages/mate\.scm                             @guix/mate
 
+
 gnu/build/icecat-extension\.scm                    @guix/mozilla
 gnu/packages/browser-extensions\.scm               @guix/mozilla
 gnu/packages/gnuzilla\.scm                         @guix/mozilla
@@ -315,6 +316,7 @@ gnu/packages/librewolf\.scm                        @guix/mozilla
 gnu/packages/tor-browsers\.scm                     @guix/mozilla
 
 gnu/packages/ocaml\.scm                            @guix/ocaml
+gnu/packages/ocaml5\.scm                           @guix/ocaml
 gnu/packages/coq\.scm                              @guix/ocaml
 guix/build/ocaml-build-system\.scm                 @guix/ocaml
 guix/build/dune-build-system\.scm                  @guix/ocaml
@@ -479,15 +481,6 @@ tests/import/texlive\.scm                          @guix/tex
 etc/news\.scm                                      @guix/translations
 po/                                                @guix/translations
 
-gnu/packages/version-control\.scm                  @guix/vcs
-gnu/services/version-control\.scm                  @guix/vcs
-gnu/tests/version-control\.scm                     @guix/vcs
-guix/build/bzr\.scm                                @guix/vcs
-guix/build/cvs\.scm                                @guix/vcs
-guix/build/git\.scm                                @guix/vcs
-guix/build/hg\.scm                                 @guix/vcs
-guix/build/svn\.scm                                @guix/vcs
-
 gnu/packages/xfce\.scm                             @guix/xfce
 
 gnu/packages/zig\.scm                              @guix/zig

Makefile.am

@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
 # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -87,7 +87,6 @@ MODULES =					\
   guix/base64.scm				\
   guix/ci.scm					\
   guix/cpio.scm					\
-  guix/amd-gpu.scm				\
   guix/cpu.scm					\
   guix/deprecation.scm				\
   guix/docker.scm	   			\

build-aux/cuirass/evaluate.scm

@@ -30,7 +30,6 @@
              (guix ui)
              ((guix ui) #:select (build-notifier))
              (ice-9 match)
-             (ice-9 pretty-print)
              (ice-9 threads))
 
 (define %top-srcdir
@@ -43,6 +42,11 @@
   ((command directory)
    (let ((real-build-things build-things))
      (with-store store
+       ;; Make sure we don't resort to substitutes.
+       (set-build-options store
+                          #:use-substitutes? #f
+                          #:substitute-urls '())
+
        ;; The evaluation of Guix itself requires building a "trampoline"
        ;; program, and possibly everything it depends on.  Thus, allow builds
        ;; but print a notification.
@@ -100,7 +104,7 @@
                       (close-inferior inferior)
                       (call-with-output-file file
                         (lambda (port)
-                          (pretty-print jobs port)))))))
+                          (write jobs port)))))))
               %cuirass-supported-systems
               inferiors)))))))
   (x

build-aux/test-driver.scm

@@ -3,11 +3,10 @@ exec guile --no-auto-compile -e main -s "$0" "$@"
 !#
 ;;;; test-driver.scm - Guile test driver for Automake testsuite harness
 
-(define script-version "2026-03-21.02") ;UTC
+(define script-version "2026-01-23.07") ;UTC
 
 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
@@ -36,8 +35,7 @@ exec guile --no-auto-compile -e main -s "$0" "$@"
              (srfi srfi-1)
              (srfi srfi-19)
              (srfi srfi-26)
-             (srfi srfi-64)
-             (srfi srfi-71))
+             (srfi srfi-64))
 
 (define (show-help)
   (display "Usage:
@@ -97,21 +95,6 @@ case is shown.\n"))
                        "")          ;no color
         result)))
 
-(define* (test-result-kind* #:optional (runner (test-runner-current)))
-  ;; TODO: Since Guile 3.0.11, the test-result-kind value of tests not
-  ;; selected by specifiers is #f instead of 'skip, which seems like a bug.
-  ;; Revert to use 'test-result-kind' after
-  ;; <https://codeberg.org/guile/guile/issues/133> is resolved and made and
-  ;; available in Guix.
-  (or (test-result-ref runner 'result-kind)
-      'skip))
-
-(define (current-test-full-name runner)
-  "Get full name (test group path + name) of current test."
-  (format #f "~{~a~^/~}: ~a"
-          (test-runner-group-path runner)
-          (test-runner-test-name runner)))
-
 
 ;;;
 ;;; SRFI 64 custom test runner.
@@ -122,30 +105,27 @@ case is shown.\n"))
                           (out-port (current-output-port))
                           (trs-port (%make-void-port "w"))
                           select exclude)
-  "Return a custom SRFI-64 test runner and a `finalize' procedure as multiple
-values.  TEST-NAME is a string specifying the file name of the current the
-test.  COLOR?  specifies whether to use colors.  When BRIEF? is true, the
-individual test cases results are masked and only the summary is shown.
-ERRORS-ONLY?  reduces the amount of test case metadata logged to only that of
-the failed test cases.  OUT-PORT and TRS-PORT must be output ports.  OUT-PORT
-defaults to the current output port, while TRS-PORT defaults to a void port,
-which means no TRS output is logged.  SELECT and EXCLUDE may take a regular
-expression to select or exclude individual test cases based on their names.
-
-After the tests are finished running, the `finalize' procedure should be
-called to do the final reporting."
+  "Return an custom SRFI-64 test runner.  TEST-NAME is a string specifying the
+file name of the current the test.  COLOR? specifies whether to use colors.
+When BRIEF? is true, the individual test cases results are masked and only the
+summary is shown.  ERRORS-ONLY? reduces the amount of test case metadata
+logged to only that of the failed test cases.  OUT-PORT and TRS-PORT must be
+output ports.  OUT-PORT defaults to the current output port, while TRS-PORT
+defaults to a void port, which means no TRS output is logged.  SELECT and
+EXCLUDE may take a regular expression to select or exclude individual test
+cases based on their names."
 
   (define test-cases-start-time (make-hash-table))
 
   (define (test-on-test-begin-gnu runner)
     ;; Procedure called at the start of an individual test case, before the
     ;; test expression (and expected value) are evaluated.
-    (let ((test-case-name (current-test-full-name runner))
+    (let ((test-case-name (test-runner-test-name runner))
           (start-time     (current-time time-monotonic)))
       (hash-set! test-cases-start-time test-case-name start-time)))
 
   (define (test-skipped? runner)
-    (eq? 'skip (test-result-kind* runner)))
+    (eq? 'skip (test-result-kind runner)))
 
   (define (test-failed? runner)
     (not (or (test-passed? runner)
@@ -157,7 +137,7 @@ called to do the final reporting."
     (let* ((results (test-result-alist runner))
            (result? (cut assq <> results))
            (result  (cut assq-ref results <>))
-           (test-case-name (current-test-full-name runner))
+           (test-case-name (test-runner-test-name runner))
            (start (hash-ref test-cases-start-time test-case-name))
            (end (current-time time-monotonic))
            (time-elapsed (time-difference end start))
@@ -166,12 +146,12 @@ called to do the final reporting."
       (unless (or brief? (and errors-only? (test-skipped? runner)))
         ;; Display the result of each test case on the console.
         (format out-port "~a: ~a - ~a ~@[[~,3fs]~]~%"
-                (result->string (test-result-kind* runner) #:colorize? color?)
+                (result->string (test-result-kind runner) #:colorize? color?)
                 test-name test-case-name
                 (and show-duration? time-elapsed-seconds)))
 
       (unless (and errors-only? (not (test-failed? runner)))
-        (format #t "test-name: ~A~%" test-case-name)
+        (format #t "test-name: ~A~%" (test-runner-test-name runner))
         (format #t "location: ~A~%"
                 (string-append (result 'source-file) ":"
                                (number->string (result 'source-line))))
@@ -188,29 +168,18 @@ called to do the final reporting."
         (newline))
 
       (format trs-port ":test-result: ~A ~A [~,3fs]~%"
-              (result->string (test-result-kind* runner))
-              test-case-name time-elapsed-seconds)))
+              (result->string (test-result-kind runner))
+              (test-runner-test-name runner) time-elapsed-seconds)))
 
-  (define (finalize runner)
-    "Procedure to call after all tests finish to do the final reporting."
+  (define (test-on-group-end-gnu runner)
+    ;; Procedure called by a 'test-end', including at the end of a test-group.
     (let ((fail (or (positive? (test-runner-fail-count runner))
                     (positive? (test-runner-xpass-count runner))))
           (skip (or (positive? (test-runner-skip-count runner))
                     (positive? (test-runner-xfail-count runner)))))
-      (format trs-port ":global-test-result: ~{~A~^,~}~%"
-              (filter-map (λ (proc str)
-                            (let ((n (proc runner)))
-                              (if (positive? n) str #f)))
-                          (list test-runner-pass-count
-                                test-runner-fail-count
-                                test-runner-xpass-count
-                                test-runner-xfail-count
-                                test-runner-skip-count)
-                          (list "PASS"
-                                "FAIL"
-                                "XPASS"
-                                "XFAIL"
-                                "SKIP")))
+      ;; XXX: The global results need some refinements for XPASS.
+      (format trs-port ":global-test-result: ~A~%"
+              (if fail "FAIL" (if skip "SKIP" "PASS")))
       (format trs-port ":recheck: ~A~%"
               (if fail "yes" "no"))
       (format trs-port ":copy-in-global-log: ~A~%"
@@ -220,14 +189,15 @@ called to do the final reporting."
         (format out-port "~A: ~A~%"
                 (result->string (if fail 'fail (if skip 'skip 'pass))
                                 #:colorize? color?)
-                test-name))))
+                test-name))
+      #f))
 
   (let ((runner (test-runner-null)))
     (test-runner-on-test-begin! runner test-on-test-begin-gnu)
     (test-runner-on-test-end! runner test-on-test-end-gnu)
+    (test-runner-on-group-end! runner test-on-group-end-gnu)
     (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
-    (values runner
-            (λ () (finalize runner)))))
+    runner))
 
 
 ;;;
@@ -235,11 +205,27 @@ called to do the final reporting."
 ;;;
 (define (test-match-name* regexp)
   "Return a test specifier that matches a test name against REGEXP."
-  (compose (cut string-match regexp <>) current-test-full-name))
+  (lambda (runner)
+    (string-match regexp (test-runner-test-name runner))))
 
 (define (test-match-name*/negated regexp)
   "Return a negated test specifier version of test-match-name*."
-  (compose not (test-match-name* regexp)))
+  (lambda (runner)
+    (not (string-match regexp (test-runner-test-name runner)))))
+
+;;; XXX: test-match-all is a syntax, which isn't convenient to use with a list
+;;; of test specifiers computed at run time.  Copy this SRFI 64 internal
+;;; definition here, which is the procedural equivalent of 'test-match-all'.
+(define (%test-match-all . pred-list)
+  (lambda (runner)
+    (let ((result #t))
+      (let loop ((l pred-list))
+	(if (null? l)
+	    result
+	    (begin
+	      (if (not ((car l) runner))
+		  (set! result #f))
+	      (loop (cdr l))))))))
 
 
 ;;;
@@ -263,7 +249,7 @@ called to do the final reporting."
                                identity
                                (list (and=> select test-match-name*)
                                      (and=> exclude test-match-name*/negated))))
-             (test-specifier (apply test-match-all test-specifiers))
+             (test-specifier (apply %test-match-all test-specifiers))
              (color-tests (if (assoc 'color-tests opts)
                               (option->boolean opts 'color-tests)
                               #t)))
@@ -271,19 +257,17 @@ called to do the final reporting."
           (redirect-port log (current-output-port))
           (redirect-port log (current-warning-port))
           (redirect-port log (current-error-port)))
-        (let ((runner
-               finalize (test-runner-gnu
-                         test-name
-                         #:color? color-tests
-                         #:brief? (option->boolean opts 'brief)
-                         #:errors-only? (option->boolean opts 'errors-only)
-                         #:show-duration? (option->boolean
-                                           opts 'show-duration)
-                         #:out-port out #:trs-port trs)))
-          (test-apply runner test-specifier
+        (test-with-runner
+            (test-runner-gnu test-name
+                             #:color? color-tests
+                             #:brief? (option->boolean opts 'brief)
+                             #:errors-only? (option->boolean opts 'errors-only)
+                             #:show-duration? (option->boolean
+                                               opts 'show-duration)
+                             #:out-port out #:trs-port trs)
+          (test-apply test-specifier
                       (lambda _
-                        (load-from-path test-name)))
-          (finalize))
+                        (load-from-path test-name))))
         (and=> log close-port)
         (and=> trs close-port)
         (close-port out))))

doc/contributing.texi

@@ -25,6 +25,7 @@ choice.
 * Running the Test Suite::      Testing Guix.
 * Running Guix Before It Is Installed::  Hacker tricks.
 * The Perfect Setup::           The right tools.
+* Alternative Setups::          Other possible tools that do the job.
 * Source Tree Structure::       Source code guided tour.
 * Packaging Guidelines::        Growing the distribution.
 * Coding Style::                Hygiene of the contributor.
@@ -66,7 +67,7 @@ GNU Guix depends on the following packages:
 @itemize
 @item @url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x,
 version 3.0.9 or later;
-@item @url{https://codeberg.org/guile-gcrypt/guile-gcrypt, Guile-Gcrypt}, version
+@item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version
 0.1.0 or later;
 @item
 @uref{https://gitlab.com/gnutls/guile/, Guile-GnuTLS} (@pxref{Guile
@@ -75,11 +76,11 @@ gnutls-guile, GnuTLS-Guile})@footnote{The Guile bindings to
 @uref{https://gnutls.org/, GnuTLS} were distributed as part of GnuTLS
 until version 3.7.8 included.};
 @item
-@uref{https://codeberg.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0
+@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0
 or later;
-@item @uref{https://codeberg.org/guile-compression/guile-zlib, Guile-zlib},
+@item @uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib},
 version 0.1.0 or later;
-@item @uref{https://codeberg.org/guile-compression/guile-lzlib, Guile-lzlib};
+@item @uref{https://notabug.org/guile-lzlib/guile-lzlib, Guile-lzlib};
 @item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};
 @item
 @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.10.0
@@ -101,7 +102,7 @@ Support for build offloading (@pxref{Daemon Offload Setup}) and
 version 0.13.0 or later.
 
 @item
-@uref{https://codeberg.org/guile-compression/guile-zstd, Guile-zstd}, for zstd
+@uref{https://notabug.org/guile-zstd/guile-zstd, Guile-zstd}, for zstd
 compression and decompression in @command{guix publish} and for
 substitutes (@pxref{Invoking guix publish}).
 
@@ -535,64 +536,14 @@ to build again each time you update a package file, run
 @node The Perfect Setup
 @section The Perfect Setup
 
-@cindex editor setup, for Scheme
-@cindex Scheme code editing
-All configuration and development in Guix is done in the Scheme
-language.  Like all languages of the Lisp family, Scheme has a simple
-syntax.  The perfect setup is one where the editor you choose makes
-working with that syntax seamless and pleasant; for that it must
-absolutely support a few things for Scheme:
-
-@itemize
-@item
-automatic indentation, such that hitting the ``Enter'' key (or
-@kbd{RET}) places cursor ``at the right place'' on the next line;
-@item
-``parentheses matching'', allowing you to jump from a closing
-parenthesis to the corresponding opening parenthesis and vice-versa;
-@item
-syntax highlighting, so that keywords are visually distinguishable.
-@end itemize
-
-The following optional features can make your life easier:
-
-@itemize
-@item
-structural editing of Scheme syntax;
-@item
-Guile integration so you can easily evaluate code, jump to procedure
-definitions, view documentation, and so on.
-@end itemize
-
-The following sections look at editor setups that are known to work
-well.  Do share your setup for these and other editors for inclusion in
-this manual!  @xref{Submitting Patches}.
-
-@menu
-* Emacs::                       Best-of-breed editor for Scheme code.
-* Guile Studio::                First step in your transition to Emacs.
-* Vim and NeoVim::              Classical Unix editors.
-@end menu
-
-@node Emacs
-@subsection Emacs
-
-@url{https://www.gnu.org/software/emacs, Emacs} is probably the most
-widely used editor in the community; it is also the one that,
-historically, has always had excellent support for Lisp languages, being
-itself a Lisp implementation!
-
-@quotation Note
-If you are just getting started with Emacs, @pxref{Guile Studio} for a
-smooth way to start your transition.
-@end quotation
-
-Just like for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile
-Reference Manual}), Emacs works best when empowered by the wonderful
-@url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:
+The Perfect Setup to hack on Guix is basically the perfect setup used
+for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference
+Manual}).  First, you need more than an editor, you need
+@url{https://www.gnu.org/software/emacs, Emacs}, empowered by the
+wonderful @url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:
 
 @example
-guix install emacs guile emacs-geiser emacs-geiser-guile emacs-guix
+guix install emacs guile emacs-geiser emacs-geiser-guile
 @end example
 
 Geiser allows for interactive and incremental development from within
@@ -611,15 +562,6 @@ facilities to directly operate on the syntax tree, such as raising an
 s-expression or wrapping it, swallowing or rejecting the following
 s-expression, etc.
 
-Cherry on the cake: the Emacs-Guix package provides a convenient
-interface to many commands---e.g., it lets you browse packages, install
-or remove packages, and so on---as well as development helpers that
-enhance @code{scheme-mode} and Geiser.  @xref{Introduction,,,
-emacs-guix, Emacs-Guix Reference Manual}, to make sure you don't miss
-out!
-
-@unnumberedsubsubsec Taming Boilerplate with Templates
-
 @cindex code snippets
 @cindex templates
 @cindex reducing boilerplate
@@ -659,8 +601,6 @@ trigger string @code{origin...}, which can be expanded further.  The
 @code{origin} snippet in turn may insert other trigger strings ending on
 @code{...}, which also can be expanded further.
 
-@unnumberedsubsubsec Updating Copyright Lines
-
 @cindex insert or update copyright
 @cindex @code{M-x guix-copyright}
 @cindex @code{M-x copyright-update}
@@ -689,30 +629,104 @@ copyright-update}.  If you want to do it automatically after each buffer
 save then add @code{(add-hook 'after-save-hook 'copyright-update)} in
 Emacs.
 
-@unnumberedsubsubsec Referencing Bug Reports
+@node Viewing Bugs within Emacs
+@subsection Viewing Bugs within Emacs
 
-@cindex bug references, Emacs
-Emacs has a nice minor mode called @code{bug-reference}, which can be
-used to follow link to issues and pull requests such as @samp{#1234} or
-@samp{guix/guix#1234} (@pxref{Bug Reference,,, emacs, The GNU Emacs
-Manual}).  To set it up, enable it in the relevant modes:
+Emacs has a nice minor mode called @code{bug-reference}, which, when
+combined with @samp{emacs-debbugs} (the Emacs package), can be used to
+open links such as @samp{<https://bugs.gnu.org/58697>} or
+@samp{<https://issues.guix.gnu.org/58697>} as bug report buffers.  From
+there you can easily consult the email thread via the Gnus interface,
+reply or modify the bug status, all without leaving the comfort of
+Emacs!  Below is a sample configuration to add to your @file{~/.emacs}
+configuration file:
 
 @lisp
+;;; Bug references.
 (require 'bug-reference)
 (add-hook 'prog-mode-hook #'bug-reference-prog-mode)
+(add-hook 'gnus-mode-hook #'bug-reference-mode)
 (add-hook 'erc-mode-hook #'bug-reference-mode)
-;; Add extra hooks for your mail user agent: Gnus, mu4e, etc.
+(add-hook 'gnus-summary-mode-hook #'bug-reference-mode)
+(add-hook 'gnus-article-mode-hook #'bug-reference-mode)
+
+;;; This extends the default expression (the top-most, first expression
+;;; provided to 'or') to also match URLs such as
+;;; <https://issues.guix.gnu.org/58697> or <https://bugs.gnu.org/58697>.
+;;; It is also extended to detect "Fixes: #NNNNN" git trailers.
+(setq bug-reference-bug-regexp
+      (rx (group (or (seq word-boundary
+                          (or (seq (char "Bb") "ug"
+                                   (zero-or-one " ")
+                                   (zero-or-one "#"))
+                              (seq (char "Pp") "atch"
+                                   (zero-or-one " ")
+                                   "#")
+                              (seq (char "Ff") "ixes"
+                                   (zero-or-one ":")
+                                   (zero-or-one " ") "#")
+                              (seq "RFE"
+                                   (zero-or-one " ") "#")
+                              (seq "PR "
+                                   (one-or-more (char "a-z+-")) "/"))
+                          (group (one-or-more (char "0-9"))
+                                 (zero-or-one
+                                  (seq "#" (one-or-more
+                                            (char "0-9"))))))
+                     (seq (? "<") "https://bugs.gnu.org/"
+                          (group-n 2 (one-or-more (char "0-9")))
+                          (? ">"))
+                     (seq (? "<") "https://issues.guix.gnu.org/"
+                          (? "issue/")
+                          (group-n 2 (one-or-more (char "0-9")))
+                          (? ">"))))))
+(setq bug-reference-url-format "https://issues.guix.gnu.org/%s")
+
+(require 'debbugs)
+(require 'debbugs-browse)
+(add-hook 'bug-reference-mode-hook #'debbugs-browse-mode)
+(add-hook 'bug-reference-prog-mode-hook #'debbugs-browse-mode)
+
+;; The following allows Emacs Debbugs user to open the issue directly within
+;; Emacs.
+(setq debbugs-browse-url-regexp
+      (rx line-start
+          "http" (zero-or-one "s") "://"
+          (or "debbugs" "issues.guix" "bugs")
+          ".gnu.org" (one-or-more "/")
+          (group (zero-or-one "cgi/bugreport.cgi?bug="))
+          (group-n 3 (one-or-more digit))
+          line-end))
+
+;; Change the default when run as 'M-x debbugs-gnu'.
+(setq debbugs-gnu-default-packages '("guix" "guix-patches"))
+
+;; Show feature requests.
+(setq debbugs-gnu-default-severities
+ '("serious" "important" "normal" "minor" "wishlist"))
 @end lisp
 
-When working from a Git checkout of Guix, setup is automatic:
-@code{bug-reference} automatically detects that the project is hosted on
-Codeberg@footnote{
-@c 'vc-git-repository-url' is used by
-@c 'bug-reference-setup-from-vc-alist', which checks for one of these
-@c names for the remote.
-As of Emacs@tie{}30.2, auto-detection works if and
-only if the Git remote is called @code{upstream} or @code{origin}.} and
-infers the issue and pull request URL from there.
+For more information, refer to @ref{Bug Reference,,, emacs, The GNU
+Emacs Manual} and @ref{Minor Mode,,, debbugs-ug, The Debbugs User
+Guide}.
+
+@node Alternative Setups
+@section Alternative Setups
+
+Alternative setups than Emacs may let you work on Guix with a
+similar development experience and they might work better with the
+tools you currently use or help you make the transition to Emacs.
+
+The options listed below only provide the alternatives to the Emacs
+based setup, which is the most widely used in the Guix community.  If
+you want to really understand how the perfect setup for Guix development
+is supposed to work, we encourage you to read the section before this
+regardless of the editor you choose to use.
+
+@menu
+* Guile Studio::                First step in your transition to Emacs.
+* Vim and NeoVim::              When you are evil to the root.
+@end menu
 
 @node Guile Studio
 @subsection Guile Studio
@@ -730,9 +744,9 @@ Guile Studio comes with Geiser preinstalled and prepared for action.
 @node Vim and NeoVim
 @subsection Vim and NeoVim
 
-@cindex Vim, for Scheme code editing
-Vim (and NeoVim) are also packaged in Guix, in case these popular modal
-editors are more to your taste.
+
+Vim (and NeoVim) are also packaged in Guix, just in case you decided
+to go for the evil path.
 
 @example
 guix install vim
@@ -2496,8 +2510,8 @@ For example, to list all open issues on @code{guix-patches}, hit:
 For a more convenient (shorter) way to access both the bugs and patches
 submissions, you may want to configure the
 @code{debbugs-gnu-default-packages} and
-@code{debbugs-gnu-default-severities} Emacs variables (@pxref{Minor
-Mode,,, debbugs-ug, The Debbugs User Guide}).
+@code{debbugs-gnu-default-severities} Emacs variables (@pxref{Viewing
+Bugs within Emacs}).
 
 To search for bugs, @samp{@kbd{M-x} debbugs-gnu-guix-search} can be
 used.

doc/guix-cookbook.texi

@@ -523,9 +523,6 @@ info sicp
 
 You'll find more books, tutorials and other resources at
 @url{https://schemers.org/}.
-
-@xref{The Perfect Setup,,, guix, GNU Guix Reference Manual}, on how to
-set up your editor for Scheme hacking.
 @end quotation
 
 
@@ -5297,7 +5294,7 @@ did above with transformation options. We can add them like so:
   "Return P with FLAGS as additional 'configure' flags."
   (package/inherit p
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments p)
        ((#:configure-flags original-flags #~(list))
         #~(append #$original-flags #$flags))))))
 

doc/guix.texi

@@ -150,7 +150,6 @@ Copyright @copyright{} 2025 dan@*
 Copyright @copyright{} 2025 Noé Lopez@*
 Copyright @copyright{} 2026 David Elsing@*
 Copyright @copyright{} 2026 Nguyễn Gia Phong@*
-Copyright @copyright{} 2026 Yarl Baudig@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -8049,9 +8048,6 @@ Intimidated by the Scheme language or curious about it?  The Cookbook
 has a short section to get started that recaps some of the things shown
 above and explains the fundamentals.  @xref{A Scheme Crash Course,,,
 guix-cookbook, GNU Guix Cookbook}, for more information.
-
-@xref{The Perfect Setup}, on how to set up your editor for Scheme
-hacking.
 @end quotation
 
 Once a package definition is in place, the
@@ -8801,15 +8797,14 @@ dependency like so:
 (define gdb-sans-guile
   (package
     (inherit gdb)
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs gdb)
               (delete "guile")))))
 @end lisp
 
-In the body of the @code{inputs} field above, @code{inputs} is bound to
-the inherited value.  Thus, the @code{modify-inputs} form above removes
-the @code{"guile"} package from the @code{inputs} field of @code{gdb}.
-The @code{modify-inputs} macro is a helper that can prove useful anytime
-you want to remove, add, or replace package inputs.
+The @code{modify-inputs} form above removes the @code{"guile"} package
+from the @code{inputs} field of @code{gdb}.  The @code{modify-inputs}
+macro is a helper that can prove useful anytime you want to remove, add,
+or replace package inputs.
 
 @defmac modify-inputs inputs clauses
 Modify the given package inputs, as returned by @code{package-inputs} & co.,
@@ -9133,7 +9128,7 @@ these lines:
 (define gdb-sans-guile
   (package
     (inherit gdb)
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs gdb)
               (delete "guile")))))
 
 ;; Return a manifest containing that one package plus Git.
@@ -12528,13 +12523,6 @@ package available on the build side, here's how you would do it:
                         @dots{})))
 @end lisp
 
-@quotation Going Further
-To learn more about the design of g-expressions, read
-@c https://dx.doi.org/10.1145/3136040.3136045 goes to ACM
-@uref{https://arxiv.org/abs/1709.00833, @i{Code Staging in
-GNU@tie{}Guix}} (2017).
-@end quotation
-
 The syntactic form to construct gexps is summarized below.
 
 @defmac #~@var{exp}
@@ -12621,30 +12609,6 @@ path, and the last one is created from the given file-like object.
 This form has @emph{lexical} scope: it has an effect on the gexps
 directly defined in @var{body}@dots{}, but not on those defined, say, in
 procedures called from @var{body}@dots{}.
-
-@quotation Caveat
-It is important to distinguish between modules available in the build
-environment and modules in scope.  The @code{with-imported-modules} form
-pulls modules in the build environment of the gexp but it does
-@emph{not} import them.  To do so, you still need to use
-@code{use-modules} in the gexp:
-
-@lisp
-(with-imported-modules '((guix build utils))
-  #~(begin
-      (use-modules (guix build utils))
-      @dots{}))
-@end lisp
-
-@xref{Using Guile Modules,,, guile, GNU Guile Reference Manual}, for
-more information on @code{use-modules}.
-
-Likewise, to import a module provided by Guile---e.g., @code{(srfi
-srfi-1)}---add a @code{use-modules} form in your gexp.  Do @emph{not}
-add Guile-provided modules such as @code{(srfi srfi-1)} to a
-@code{with-imported-modules}; doing so would force a potentially
-incompatible version into your environment.
-@end quotation
 @end defmac
 
 @defmac with-extensions extensions body@dots{}
@@ -18070,9 +18034,6 @@ misplaced parentheses can often be identified by reformatting your file:
 guix style -f config.scm
 @end example
 
-@xref{The Perfect Setup}, on how to set up your editor for Scheme
-hacking.
-
 The Cookbook has a short section to get started with the Scheme
 programming language that explains the fundamentals, which you will find
 helpful when hacking your configuration.  @xref{A Scheme Crash Course,,,
@@ -27893,23 +27854,6 @@ Log level to output logs. Possible values: @samp{"silent"}, @samp{"error"},
 @end table
 @end deftp
 
-@defvar rtkit-service-type
-Type for the service that allows D-Bus to start the RealtimeKit D-Bus
-service. The RTKit service provides a system D-Bus interface for user
-processes, such as PipeWire, to securely use realtime scheduling.
-
-The value for this service is a @code{<rtkit-configuration>} object.
-@end defvar
-
-@deftp {Data Type} rtkit-configuration
-Data type representing the configuration for @code{rtkit-service-type}.
-
-@table @asis
-@item @code{rtkit} (default: @code{rtkit}) (type: file-like)
-Package object for RTKit.
-
-@end table
-@end deftp
 
 @node Sound Services
 @subsection Sound Services
@@ -41547,7 +41491,7 @@ system as the @code{os} field of @code{hurd-vm-configuration}, as in
 this example:
 
 @lisp
-(define %childhurd-os
+(define childhurd-os
   ;; Definition of my GNU/Hurd system, derived from the default one.
   (operating-system
     (inherit %hurd-vm-operating-system)
@@ -41638,7 +41582,7 @@ example below.
 @item @code{disk-size} (default: @code{'guess})
 The size of the disk image.
 
-@item @code{memory-size} (default: @code{2048})
+@item @code{memory-size} (default: @code{512})
 The memory size of the Virtual Machine in mebibytes.
 
 @item @code{options} (default: @code{'("--snapshot")})
@@ -55085,45 +55029,6 @@ You may specify a custom configuration by providing a
                        '(("grafana:/var/lib/grafana"))))))))
 @end lisp
 
-@subsubheading git-annex assistant Service
-
-@cindex git-annex assistant service
-The @code{(gnu home services git-annex-assistant)} module provides a
-service to run the @uref{https://git-annex.branchable.com/assistant/,
-git-annex assistant}.
-
-@defvar home-git-annex-assistant-service-type
-This is the type of the service that runs the assistant.  You must
-supply a @code{<home-git-annex-assistant-configuration>}.
-
-The service runs one assistant for each directory provided.  For
-example:
-
-@lisp
-(service home-git-annex-assistant-service-type
-         (home-git-annex-assistant-configuration
-           (directories '("/path/to/foo" "/path/to/bar"))))
-@end lisp
-@end defvar
-
-@c %start of fragment
-
-@deftp {Data Type} home-git-annex-assistant-configuration
-Available @code{home-git-annex-assistant-configuration} fields are:
-
-@table @asis
-@item @code{package} (default: @code{git-annex}) (type: package)
-Package that provides @code{git-annex}.
-
-@item @code{directories} (default: @code{()}) (type: list-of-strings)
-List of directories.
-
-@end table
-
-@end deftp
-
-@c %end of fragment
-
 @node Invoking guix home
 @section Invoking @command{guix home}
 

etc/git/post-merge

@@ -1,9 +1,3 @@
 #!/bin/sh
 # Authenticate the repo upon 'git pull' and similar.
-if ! git config guix.authentication.introduction-commit; then
-    exec guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \
-         "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA" \
-         -k origin/keyring
-else
-    exec guix git authenticate
-fi
+exec guix git authenticate

etc/news.scm

@@ -1,6 +1,6 @@
 ;; GNU Guix news, for use by 'guix pull'.
 ;;
-;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org>
+;; Copyright © 2019-2025 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright © 2019–2021, 2024 Tobias Geerinckx-Rice <me@tobias.gr>
 ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
 ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
@@ -43,84 +43,10 @@
 (channel-news
  (version 0)
 
- (entry (commit "a7c8e68dc51144a6d3981b770aca9c4897fc7c0c")
-        (title
-         (en "Records can refer to inherited values of thunked fields")
-         (de "Vererbung in Verbundsobjekten erlaubt Verweise auf geerbte Werte verzögert ausgewerteter Felder"))
-        (body
-         (en "A new feature has been added to records—the facility used when
-defining packages, services, operating systems, and many other things—that,
-when inheriting from another record, allows you to refer to inherited field
-values.  When defining package variants, you may have seen this pattern:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs (package-inputs gdb)
-            (delete \"guile\"))))
-@end lisp
-
-This can now be written like this:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs inputs ;<- notice the change
-            (delete \"guile\"))))
-@end lisp
-
-Within the @code{inputs} body, the @code{inputs} identifier is now bound to
-the @dfn{inherited value}—i.e., the value this field inherits from @code{gdb}.
-The same mechanism can be used when changing other input fields or the
-@code{arguments} field.  It is less verbose but also
-@uref{https://issues.guix.gnu.org/50335, more accurate}.
-
-This change applies to \"thunked\" fields of all record types produced by
-@code{define-record-type*}: @code{package}, @code{origin},
-@code{operating-system}, @code{home-environment}, and so on.
-
-Note that this is an incompatible change: the newly introduced
-bindings—@code{inputs} in the example above—could shadow same-named bindings.")
-         (de "Als neue Funktionalität kann man in Verbundsobjekten – also beim
-Definieren von Paketen, Diensten, Betriebssystemen und vielem anderen – beim
-Erben von einem anderen Verbundsobjekt auf die geerbten Werte verweisen. Zum
-Definieren von Paketvarianten wurde früher etwas geschrieben wie:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs (package-inputs gdb)
-            (delete \"guile\"))))
-@end lisp
-
-Das lässt sich jetzt schreiben als:
-
-@lisp
-(package
-  (inherit gdb)
-  (inputs (modify-inputs inputs ;<- hier ändert sich was
-            (delete \"guile\"))))
-@end lisp
-
-Innerhalb des @code{inputs}-Rumpfes ist der Bezeichner @code{inputs} jetzt
-an den @dfn{geerbten Wert} gebunden, d.h. an den Wert, den das Feld von
-@code{gdb} erbt. Derselbe Mechanismus kann beim Ändern anderer Felder mit
-Eingaben oder im Feld @code{arguments} benutzt werden. Das spart Platz und
-@uref{https://issues.guix.gnu.org/50335, verhält sich richtiger}.
-
-Die Änderung wirkt sich auf verzögert ausgewertete \"thunked\"-Felder aller
-Verbundstypen aus, die mit @code{define-record-type*} erstellt wurden:
-@code{package}, @code{origin}, @code{operating-system}, @code{home-environment}
-und so weiter.
-
-Hinweis: das ist eine inkompatible Änderung. Die neu eingeführte Bindung –
-@code{inputs} im obigen Beispiel – kann gleichnamige Bindungen überschatten.")))
-
  (entry (commit "b52ce9041ad58aeababd2d50d3e72bc23dffff60")
         (title
          (en "GNOME 48 is now available")
          (fr "GNOME 48 maintenant disponible")
-         (pt "GNOME 48 já está disponível")
          (de "GNOME 48 jetzt verfügbar"))
         (body
          (en "The GNOME desktop was updated from version 46 to 48, bringing
@@ -139,14 +65,6 @@ d’images (Loupe), et plus:
 @itemize
 @item @url{https://release.gnome.org/47/, GNOME 47 release notes}
 @item @url{https://release.gnome.org/48/, GNOME 48 release notes}
-@end itemize")
-         (pt "GNOME desktop foi atualizado da versão 46 para a 48, trazendo
-cores acentuadas, um aplicativo de arquivos (Nautilus) melhorado, um novo
-visualizador de imagens (Loupe), e mais:
-
-@itemize
-@item @url{https://release.gnome.org/47/, Notas de lançamento do GNOME 47}
-@item @url{https://release.gnome.org/48/, Notas de lançamento do GNOME 48}
 @end itemize")
          (de "Die GNOME-Desktopumgebung wurde von Version 46 auf 48
 aktualisiert. Neue Funktionen in dieser Version sind die Möglichkeit, eine

etc/snippets/yas/scheme-mode/guix-package

@@ -33,7 +33,7 @@
                                           "node-build-system"
                                           "ocaml-build-system"
                                           "perl-build-system"
-                                          "pyproject-build-system"
+                                          "python-build-system"
                                           "qt-build-system"
                                           "r-build-system"
                                           "rakudo-build-system"

etc/teams.scm

@@ -530,13 +530,6 @@ of Rebar and Mix build systems and Hex.pm importer."
                       "gnu/packages/ninja.scm"
                       "gnu/packages/valgrind.scm")))
 
-(define-team community
-  (team 'community
-        #:name "Community"
-        #:description
-        "We focus on collaboration, project growth and future (social)
-challenges"))
-
 (define-team core
   (team 'core
         #:name "Core / Tools / Internals"
@@ -940,6 +933,7 @@ and Firefox."
 importer, and the ocaml-build-system."
         #:scope
         (list "gnu/packages/ocaml.scm"
+              "gnu/packages/ocaml5.scm"
               "gnu/packages/coq.scm"
               "guix/build/ocaml-build-system.scm"
               "guix/build/dune-build-system.scm"
@@ -1204,20 +1198,6 @@ the \"texlive\" importer."
         #:scope (list "etc/news.scm"
                       (make-regexp* "^po/"))))
 
-(define-team vcs
-  (team 'vcs
-        #:name "Version control team"
-        #:description
-        "Version control packages, services, and Guix download backends."
-        #:scope (list "gnu/packages/version-control.scm"
-                      "gnu/services/version-control.scm"
-                      "gnu/tests/version-control.scm"
-                      "guix/build/bzr.scm"
-                      "guix/build/cvs.scm"
-                      "guix/build/git.scm"
-                      "guix/build/hg.scm"
-                      "guix/build/svn.scm")))
-
 (define-team xfce
   (team 'xfce
         #:name "Xfce team"
@@ -1383,7 +1363,7 @@ the \"texlive\" importer."
 (define-member (person "Gabriel Wicki"
                        "gabriel@erlikon.ch"
                        "gabber")
-  audio community documentation electronics embedded)
+  audio documentation electronics embedded)
 
 (define-member (person "Ekaitz Zarraga"
                        "ekaitz@elenq.tech"
@@ -1552,7 +1532,7 @@ the \"texlive\" importer."
 (define-member (person "Nguyễn Gia Phong"
                        "cnx@loang.net"
                        "cnx")
-  build-tools python qa-packages sysadmin vcs)
+  build-tools python qa-packages sysadmin)
 
 (define-member (person "Lilah Tascheter"
                        "lilah@lunabee.space"
@@ -1602,7 +1582,7 @@ the \"texlive\" importer."
 (define-member (person "Untrusem"
                        "mysticmoksh@riseup.net"
                        "untrusem")
-  community mozilla)
+  mozilla)
 
 (define-member (person "David Thompson"
                        "dthompson2@worcester.edu"
@@ -1624,26 +1604,6 @@ the \"texlive\" importer."
                        "folaht")
   documentation)
 
-(define-member (person "Thanos Apollo"
-                       "public@thanosapollo.org"
-                       "thanosapollo")
-  vcs)
-
-(define-member (person "Ashish SHUKLA"
-                       "ashish.is@lostca.se"
-                       "group")
-  vcs)
-
-(define-member (person "Spencer King"
-                       "spencer.king@wustl.edu"
-                       "spencerking")
-  julia)
-
-(define-member (person "Peter Polidoro"
-                       "peter@polidoro.io"
-                       "peterpolidoro")
-  electronics)
-
 
 (define (find-team name)
   (or (hash-ref %teams (string->symbol name))
@@ -1833,12 +1793,8 @@ and REV-END, two git revision strings."
 # usually suited as a reviewer.\n\n"
              port)
     (for-each (lambda (team)
-                (let ((scope (team->codeowners-snippet team)))
-                  ;; Some teams, like Mentors and Community have no scope,
-                  ;; which would result in seemingly arbitrary newlines.
-                  (unless (string-null? scope)
-                    (display scope port)
-                    (newline port))))
+                (display (team->codeowners-snippet team) port)
+                (newline port))
               teams)))
 
 

etc/teams/gnome/gnome-core-refresh

@@ -48,7 +48,8 @@
 (define %gnome-releng-versions-uri
   (make-parameter
    (or (getenv "GNOME_RELENG_VERSIONS_URI")
-       "https://gitlab.gnome.org/GNOME/releng/-/raw/master/tools/versions-49")))
+       "https://gitlab.gnome.org/GNOME/releng/-/raw/master/\
+tools/versions-stable")))
 
 (define (fetch-releng-content)
   "Return a string corresponding to the content of the %GNOME-RELENG-VERSIONS-URI
@@ -73,7 +74,6 @@ NL < '\n'")
 
 (define %names
   '(("adwaita-fonts" . "font-adwaita")
-    ("glycin" . "glycin-loaders")
     ("pygobject" . "python-pygobject")
     ("pyatspi" . "python-pyatspi")))
 

gnu/ci.scm

@@ -37,7 +37,7 @@
   #:use-module (guix ui)
   #:use-module ((guix licenses)
                 #:select (gpl3+ license? license-name))
-  #:use-module (guix utils)
+  #:use-module ((guix utils) #:select (%current-system))
   #:use-module ((guix scripts system) #:select (read-operating-system))
   #:use-module ((guix scripts pack)
                 #:select (self-contained-tarball))
@@ -48,13 +48,9 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)
-  #:use-module (gnu packages man)
   #:use-module (gnu packages base)
   #:use-module (gnu packages gawk)
-  #:use-module (gnu packages hurd)
-  #:use-module (gnu packages admin)
   #:use-module (gnu packages guile)
-  #:use-module (gnu packages linux)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages multiprecision)
@@ -140,43 +136,19 @@ SYSTEM."
                  #:cross? #t
                  #:target target)))
 
-(define %core-packages-for-mingw
-  ;; Core packages that can be built for any target, including MinGW.  This
-  ;; excludes the bootstrap tarballs, which do not support MinGW.
-  (list gcc-10 gcc-11 gcc-12 glibc binutils gdb-minimal
-        gmp mpfr mpc coreutils findutils diffutils patch sed grep
-        gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip bzip2 xz zstd))
-
 (define %core-packages
-  ;; General set of core packages.
   ;; Note: Don't put the '-final' package variants because (1) that's
   ;; implicit, and (2) they cannot be cross-built (due to the explicit input
   ;; chain.)
-  (append %core-packages-for-mingw
-          (list util-linux procps psmisc which e2fsprogs man-db inetutils
-                guix shepherd
-                %bootstrap-binaries-tarball
-                %binutils-bootstrap-tarball
-                (%glibc-bootstrap-tarball)
-                %gcc-bootstrap-tarball
-                %guile-bootstrap-tarball
-                %bootstrap-tarballs)))
-
-(define %linux-packages
-  ;; Extra Linux-specific packages.
-  (list linux-libre))
-
-(define %hurd-packages
-  ;; Extra Hurd-specific packages
-  (list gnumach mig hurd-minimal hurd netdde rumpkernel))
-
-(define (core-packages system)
-  "Return the 'core' package set suitable for SYSTEM, which might be a system
-type or a GNU triplet."
-  (cond ((target-linux? system) (append %core-packages %linux-packages))
-        ((target-hurd? system) (append %core-packages %hurd-packages))
-        ((target-mingw? system) %core-packages-for-mingw)
-        (else '())))
+  (list gcc-10 gcc-11 gcc-12 glibc binutils gdb-minimal
+        gmp mpfr mpc coreutils findutils diffutils patch sed grep
+        gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip xz guix
+        %bootstrap-binaries-tarball
+        %binutils-bootstrap-tarball
+        (%glibc-bootstrap-tarball)
+        %gcc-bootstrap-tarball
+        %guile-bootstrap-tarball
+        %bootstrap-tarballs))
 
 (define (commencement-packages system)
   "Return the list of bootstrap packages from the commencement module for
@@ -193,7 +165,10 @@ SYSTEM."
 
 (define (packages-to-cross-build target)
   "Return the list of packages to cross-build for TARGET."
-  (core-packages target))
+  ;; Don't cross-build the bootstrap tarballs for MinGW.
+  (if (string-contains target "mingw")
+      (drop-right %core-packages 6)
+      %core-packages))
 
 (define %bare-platform-triplets
   ;; Cross-compilation triplets of platforms that lack a proper user-space and
@@ -571,8 +546,7 @@ names, for each one of SYSTEMS."
            (map (lambda (package)
                   (package-job store (job-name package)
                                package system))
-                (append (commencement-packages system)
-                        (core-packages system)))
+                (append (commencement-packages system) %core-packages))
            (cross-jobs store system)))
          ('guix
           ;; Build Guix modules only.

gnu/home/services/git-annex-assistant.scm

@@ -1,83 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Yarl Baudig <yarl-baudig@mailoo.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/>.
-
-(define-module (gnu home services git-annex-assistant)
-  #:use-module (guix gexp)
-  #:use-module ((guix packages) #:select (package?))
-  #:use-module (guix records)
-  #:use-module (gnu services configuration)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services shepherd)
-  #:use-module (gnu packages haskell-apps)
-  #:use-module (srfi srfi-1)
-  #:export (home-git-annex-assistant-configuration
-            home-git-annex-assistant-service-type))
-
-(define-configuration/no-serialization home-git-annex-assistant-configuration
-  (package
-    (package git-annex)
-    "Package that provides @code{git-annex}.")
-  (directories
-   (list-of-strings '())
-   "List of directories."))
-
-(define (home-git-annex-assistant-shepherd-services config)
-  (match-record config
-      <home-git-annex-assistant-configuration> (package directories)
-    (let ((gaa-command
-           #~(list (string-append #$package "/bin/git-annex") "assistant")))
-      (map
-       (lambda (dir)
-         (let ((pid-file (in-vicinity dir ".git/annex/daemon.pid")))
-           (shepherd-service
-	     (documentation
-              (string-append "Run git-annex assistant against " dir "."))
-	     (provision
-	      (list
-	       (symbol-append 'home-git-annex-assistant-
-                              (string->symbol dir))))
-	     (start #~(lambda _
-		        (and (zero? (spawn-command #$gaa-command
-					           #:directory #$dir))
-			     (read-pid-file #$pid-file))))
-	     (stop #~(lambda _
-		       (unless (zero? (spawn-command
-				       (append #$gaa-command '("--stop"))
-				       #:directory #$dir))
-		         (error "failed to stop git-annex assistant"))
-		       #f)))))
-       directories))))
-
-(define home-git-annex-assistant-service-type
-  (service-type
-    (name 'git-annex-assistant)
-    (extensions
-     (list (service-extension home-shepherd-service-type
-			      home-git-annex-assistant-shepherd-services)))
-    (compose concatenate)
-    (extend (lambda (config directories)
-              (home-git-annex-assistant-configuration
-               (inherit config)
-               (directories
-                (append
-                 (home-git-annex-assistant-configuration-directories config)
-                 directories)))))
-    (description
-     "Run the git-annex assistant daemon on a list of directories.")))
-

gnu/local.mk

@@ -42,7 +42,7 @@
 # Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 # Copyright © 2021 Greg Hogan <code@greghogan.com>
 # Copyright © 2021-2024 Philip McGrath <philip@philipmcgrath.com>
-# Copyright © 2021, 2026 Arun Isaac <arunisaac@systemreboot.net>
+# Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
 # Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 # Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
 # Copyright © 2021 Andrew Tropin <andrew@trop.in>
@@ -75,6 +75,7 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
+# Copyright © 2025 Jason Conroy <jconroy@tscripta.net>
 #
 # This file is part of GNU Guix.
 #
@@ -113,7 +114,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/home/services/dotfiles.scm		\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
-  %D%/home/services/git-annex-assistant.scm	\
   %D%/home/services/gnome.scm			\
   %D%/home/services/gnupg.scm			\
   %D%/home/services/guix.scm			\
@@ -214,7 +214,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/connman.scm			\
   %D%/packages/containers.scm			\
   %D%/packages/convmv.scm			\
-  %D%/packages/codex.scm				\
   %D%/packages/coq.scm				\
   %D%/packages/cpio.scm				\
   %D%/packages/cpp.scm 				\
@@ -315,6 +314,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/gd.scm				\
   %D%/packages/gdb.scm				\
   %D%/packages/genealogy.scm			\
+  %D%/packages/genimage.scm			\
   %D%/packages/geo.scm				\
   %D%/packages/gettext.scm			\
   %D%/packages/ghostscript.scm			\
@@ -480,6 +480,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/mc.scm				\
   %D%/packages/mcrypt.scm			\
   %D%/packages/medical.scm			\
+  %D%/packages/mercury.scm			\
   %D%/packages/mes.scm				\
   %D%/packages/messaging.scm			\
   %D%/packages/minetest.scm			\
@@ -518,6 +519,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/nvi.scm				\
   %D%/packages/nx.scm				\
   %D%/packages/ocaml.scm			\
+  %D%/packages/ocaml5.scm			\
   %D%/packages/ocr.scm				\
   %D%/packages/openkinect.scm			\
   %D%/packages/onc-rpc.scm			\
@@ -604,7 +606,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/regex.scm				\
   %D%/packages/robotics.scm			\
   %D%/packages/rocm.scm				\
-  %D%/packages/rocm-apps.scm			\
   %D%/packages/rocm-libs.scm			\
   %D%/packages/rocm-tools.scm			\
   %D%/packages/rpc.scm				\
@@ -1180,6 +1181,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/dbacl-icheck-multiple-definitions.patch	\
   %D%/packages/patches/dblatex-inkscape-1.0.patch		\
   %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/ddd-build.patch				\
   %D%/packages/patches/debops-setup-py-avoid-git.patch	\
   %D%/packages/patches/dee-vapi.patch			\
@@ -1217,21 +1220,17 @@ dist_patch_DATA =						\
   %D%/packages/patches/dvdbackup-with-libdvdread-6.1.0+.patch	\
   %D%/packages/patches/dvd+rw-tools-add-include.patch 		\
   %D%/packages/patches/dwarves-threading-reproducibility.patch	\
-  %D%/packages/patches/e9patch-zydis-4.1-compat.patch		\
   %D%/packages/patches/efitools-riscv64-support.patch		\
   %D%/packages/patches/efivar-fix-fprint-format.patch		\
-  %D%/packages/patches/elastix-1404.patch			\
   %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch	\
   %D%/packages/patches/einstein-build.patch			\
   %D%/packages/patches/elfutils-tests-ptrace.patch		\
   %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch			\
   %D%/packages/patches/elixir-path-length.patch			\
   %D%/packages/patches/elm-ghc9.2.patch	\
-  %D%/packages/patches/exaile-gstreamer-1.28.patch	\
   %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
   %D%/packages/patches/elm-offline-package-registry.patch	\
   %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch	\
   %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
   %D%/packages/patches/emacs-disable-jit-compilation.patch			\
   %D%/packages/patches/emacs-doc-toc-shell-commands.patch	\
@@ -1433,6 +1432,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gemmi-fix-pegtl-usage.patch		\
   %D%/packages/patches/gemmi-fix-sajson-types.patch		\
   %D%/packages/patches/gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch	\
+  %D%/packages/patches/genimage-mke2fs-test.patch		\
   %D%/packages/patches/geoclue-config.patch			\
   %D%/packages/patches/gettext-libunicode-update.patch		\
   %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch	\
@@ -1509,7 +1509,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
   %D%/packages/patches/gmp-faulty-test.patch			\
   %D%/packages/patches/gnome-2048-fix-positional-argument.patch	\
-  %D%/packages/patches/gnome-contacts-evolution-compat.patch	\
   %D%/packages/patches/gnome-control-center-firmware-security.patch	\
   %D%/packages/patches/gnome-control-center-libexecdir.patch	\
   %D%/packages/patches/gnome-dictionary-meson-i18n.patch	\
@@ -1611,7 +1610,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/hurd-rumpdisk-no-hd.patch		\
   %D%/packages/patches/hurd-startup.patch			\
   %D%/packages/patches/hwloc-1-test-btrfs.patch			\
-  %D%/packages/patches/hwloc-add-with-opencl.patch		\
   %D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch	\
   %D%/packages/patches/i7z-gcc-10.patch				\
   %D%/packages/patches/icecat-adjust-mozilla-desktop.patch      \
@@ -1702,12 +1700,10 @@ dist_patch_DATA =						\
   %D%/packages/patches/libguestfs-syms.patch            	\
   %D%/packages/patches/libinfinity-renew-test-certificate.patch \
   %D%/packages/patches/libmaus2-fix-gcc-13-require-include-cstdint.patch	\
-  %D%/packages/patches/libportal-qt-6.9.patch                   \
   %D%/packages/patches/libretro-dolphin-emu-data.patch		\
   %D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch  \
   %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
   %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
-  %D%/packages/patches/libretranslate-use-flasgger.patch	\
   %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
   %D%/packages/patches/librewolf-compare-paths.patch		\
   %D%/packages/patches/librewolf-neuter-locale-download.patch	\
@@ -1724,7 +1720,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/linphone-desktop-cmake-belcard.patch	\
   %D%/packages/patches/linphone-desktop-cmake-find-modules.patch	\
   %D%/packages/patches/localed-xorg-keyboard.patch		\
-  %D%/packages/patches/lufa-fix-incompatible-cast.patch		\
   %D%/packages/patches/kaldi-ignore-failing-test.patch		\
   %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch	\
   %D%/packages/patches/kcontacts-incorrect-country-name.patch	\
@@ -2092,6 +2087,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/pthreadpool-system-libraries.patch	\
   %D%/packages/patches/python-3.11-fix-tests.patch		\
   %D%/packages/patches/python-3.12-fix-tests.patch		\
+  %D%/packages/patches/python-accupy-use-matplotx.patch		\
+  %D%/packages/patches/python-accupy-fix-use-of-perfplot.patch	\
   %D%/packages/patches/python-anyio-unuse-exceptiongroup-in-test.patch	\
   %D%/packages/patches/python-bed-reader-use-store-samples.patch	\
   %D%/packages/patches/python-chai-drop-python2.patch		\
@@ -2326,7 +2323,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qtwayland-5.15.18-0053-client-remove-some-surface-commits.patch	\
   %D%/packages/patches/qtwayland-5.15.18-0054-client-avoid-locking-resizing-in-qwaylandshmbackings.patch	\
   %D%/packages/patches/qtwayland-5.15.18-0055-bradient-use-qwaylandwindow-actual-window-title.patch	\
-  %D%/packages/patches/qtwayland-5.15.18-0056-redraw-hidpi.patch	\
   %D%/packages/patches/qtwebsockets-6.9-fix-tst_QWebSocket.patch\
   %D%/packages/patches/rabbitmq-defaults.patch		\
   %D%/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch	\
@@ -2361,7 +2357,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/rlwrap-no-rbgen.patch	\
   %D%/packages/patches/rng-tools-revert-build-randstat.patch	\
   %D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch		\
-  %D%/packages/patches/rochpl-supported-distros.patch		\
   %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch 	\
   %D%/packages/patches/rocm-bandwidth-test-fix-external-packages-search.patch	\
   %D%/packages/patches/rocm-bandwidth-test-fix-hsa-include-file-lookup.patch	\
@@ -2385,7 +2380,10 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
   %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
   %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-arg0-file-lock.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-core-file-lock.patch	\
   %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
+  %D%/packages/patches/rust-codex-0.98.0-execpolicy-file-lock.patch	\
   %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
   %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
   %D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch	\
@@ -2442,6 +2440,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/snappy-add-inline-for-GCC.patch		\
   %D%/packages/patches/source-highlight-gcc-compat.patch	\
   %D%/packages/patches/sourcetrail-fix-cmakelists-and-paths.patch		\
+  %D%/packages/patches/softhsm-fix-openssl3-tests.patch		\
   %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \
   %D%/packages/patches/sphinxbase-fix-doxygen.patch		\
   %D%/packages/patches/spice-vdagent-monitor-size-calculation.patch     \

gnu/machine/hetzner.scm

@@ -152,7 +152,7 @@
       (operating-system
         (inherit os)
         (services
-         (modify-services services
+         (modify-services (operating-system-user-services os)
            (guix-service-type
             config => (guix-configuration
                        (inherit config)

gnu/packages/admin.scm

@@ -2711,14 +2711,14 @@ command.")
 (define-public wpa-supplicant
   (package (inherit wpa-supplicant-minimal)
     (name "wpa-supplicant")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs wpa-supplicant-minimal)
               (prepend dbus)))
     (source (origin
               (inherit (package-source wpa-supplicant-minimal))
               (patches (search-patches
                         "wpa-supplicant-dbus-group-policy.patch"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'configure 'set-config-options
@@ -2750,11 +2750,11 @@ command.")
   (package
     (inherit wpa-supplicant)
     (name "wpa-supplicant-gui")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs wpa-supplicant)
               (prepend qtbase-5 qtsvg-5 qtwayland-5)))
     (native-inputs
      ;; For icons.
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs wpa-supplicant)
        (prepend imagemagick/stable
                 inkscape/pinned)))
     (build-system qt-build-system)
@@ -3835,15 +3835,8 @@ platform-specific methods.")
                 "0y5w8pl91xapi49ih1pw7h48lac201cj7fm89hkklmzi9m2715gx"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:configure-flags
-           #~(list #$@(cond ((target-aarch64?)
-                             '("--with-aarch64"))
-                            ((target-arm32?)
-                             '("--with-arm"))
-                            (else
-                             '()))
-                   "--with-python=no"
-                   "--disable-static")))
+     `(#:configure-flags (list "--with-python=no"
+                               "--disable-static")))
     (inputs
      (list openldap gnutls cyrus-sasl))
     (synopsis "User-space component to the Linux auditing system")
@@ -4166,6 +4159,39 @@ the status of your battery in the system tray.")
     (home-page "https://github.com/valr/cbatticon")
     (license license:gpl2+)))
 
+(define-public interrobang
+  (let ((revision "1")
+        (commit "896543735e1c99144765fdbd7b6e6b5afbd8b881"))
+    (package
+      (name "interrobang")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/TrilbyWhite/interrobang")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1n13m70p1hfba5dy3i8hfclbr6k9q3d9dai3dg4jvhdhmxcpjzdf"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f                    ; no tests
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure))         ; no configure script
+         #:make-flags (list (string-append "PREFIX="
+                                           (assoc-ref %outputs "out")))))
+      (inputs
+       (list libx11))
+      (native-inputs
+       (list pkg-config))
+      (synopsis "Scriptable launcher menu")
+      (description "Interrobang is a scriptable launcher menu with a customizable
+shortcut syntax and completion options.")
+      (home-page "https://github.com/TrilbyWhite/interrobang")
+      (license license:gpl3+))))
+
 (define-public pam-hooks
   (package
     (name "pam-hooks")
@@ -4746,7 +4772,7 @@ system distribution, akin to many similar tools.")
     (inherit fastfetch-minimal)
     (name "fastfetch")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fastfetch-minimal)
        ((#:configure-flags flags #~'())
         #~(append #$flags
                   (list  "-DBINARY_LINK_TYPE=dynamic"
@@ -4758,7 +4784,7 @@ system distribution, akin to many similar tools.")
                                         #$(this-package-input "libdrm")
                                         "/share/libdrm/amdgpu.ids"))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs fastfetch-minimal)
        (append dbus
                glib
                hwdata
@@ -6166,7 +6192,7 @@ then it can be a greeter.")
     (inherit pam-mount)
     (name "greetd-pam-mount")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments pam-mount)
        ((#:configure-flags flags ''())
         #~(cons* "--with-rundir=/run/greetd" #$flags))
        ((#:phases phases)

gnu/packages/aidc.scm

@@ -169,14 +169,14 @@ integration of this capability into your own programs.")
   (package/inherit zint
     (name "zint-with-qt")
     (build-system qt-build-system)
-    (arguments (substitute-keyword-arguments arguments
+    (arguments (substitute-keyword-arguments (package-arguments zint)
                  ((#:disallowed-references references)
                   (delete qtbase references))
                  ((#:qtbase _ #f)
                   qtbase)
                  ((#:configure-flags flags ''())
                   #~(cons "-DZINT_QT6=ON" #$flags))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs zint)
               ;; The UI library of qttools is linked to; hence it must be used
               ;; as an input rather than a native input.
               (append qtsvg qttools)))
@@ -391,13 +391,13 @@ Python as well as GUI widgets for GTK and Qt.")
     (name "zbar-minimal")
     (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments zbar)
        ((#:configure-flags flags)
         #~(cons* "--with-gtk=no" (delete "--with-gtk=auto" #$flags)))
        ((#:disallowed-references _ '())
         (list qtbase gtk+))))
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs zbar)
        (delete "gtk+")))))
 
 (define-public qrcodegen-cpp

gnu/packages/algebra.scm

@@ -94,7 +94,6 @@
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix hg-download)
-  #:use-module (guix svn-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -954,7 +953,7 @@ gnu build version."))))
   (package/inherit fftw
     (name "fftwf")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fftw)
        ((#:configure-flags fftw-configure-flags)
         `(cons* "--enable-single"
                 ,@(if (string-prefix? "arm" (or (%current-target-system)
@@ -975,7 +974,7 @@ gnu build version."))))
      `(("openmpi" ,openmpi)
        ,@(package-inputs fftw)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fftw)
        ((#:configure-flags cf)
         `(cons "--enable-mpi" ,cf))
        ((#:phases phases '%standard-phases)
@@ -1434,7 +1433,7 @@ features, and more.")
         ;; XXX: Some tests fail, but onnxruntime will move on to the next
         ;; release soon enough.
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments eigen)
            ((#:tests? tests? #t)
             #f)))))))
 
@@ -1462,7 +1461,7 @@ features, and more.")
        ;; XXX: Tests stable_norm_5 and stable_norm_6 are failing due to
        ;; EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE.
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments eigen)
           ((#:tests? flag #f) #false)))))))
 
 (define-public xtensor
@@ -2192,7 +2191,7 @@ and not by the available RAM.")
     (inherit form)
     (name "parform")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments form)
        ((#:configure-flags flags)
         #~(cons* "--enable-parform=yes" #$flags))
        ((#:phases phases)
@@ -2205,120 +2204,94 @@ and not by the available RAM.")
 @code{parform}, a version of FORM parallelized using OpenMPI."))))
 
 (define-public reduce
-  (let ((revision 7333))
-    (package
-      (name "reduce")
-      (version "2026-03-11")
-      (source (origin
-                (method svn-fetch)
-                (uri (svn-reference
-                       (url "https://svn.code.sf.net/p/reduce-algebra/code/trunk")
-                       (revision revision)))
-                (file-name (string-append name "-" version "-checkout"))
-                (sha256
-                 (base32
-                  "04n7z6abfpqxgmdc1vpv2yy4qccvyxdp6klld94wr740dv8r49l2"))
-                (modules '((guix build utils)))
-                (patches (search-patches "reduce-unbundle-libffi.patch"))
-                (snippet '(map delete-file-recursively
-                               (append (find-files "csl/generated-c" "\\.img$")
-                                       '("common-lisp"
-                                         "contrib"
-                                         "csl/embedded"
-                                         "csl/new-embedded"
-                                         "csl/support-packages"
-                                         "csl/winbuild"
-                                         "generic/breduce"
-                                         "generic/casefold"
-                                         "generic/emacs"
-                                         "generic/qreduce"
-                                         "generic/rbench"
-                                         "generic/rlsmt"
-                                         "generic/texmacs"
-                                         "jlisp"
-                                         "jslisp"
-                                         "libedit"
-                                         "libraries/asmjit"
-                                         "libraries/C-Quadratic-Sieve"
-                                         "libraries/core-math"
-                                         ;; "libraries/crlibm"
-                                         ;; "libraries/libedit-20140620-3.1"
-                                         "libraries/libedit-20210216-3.1"
-                                         "libraries/libffi"
-                                         "libraries/original"
-                                         ;; "libraries/SoftFloat-3a"
-                                         "libraries/SoftFloat-3e"
-                                         "libraries/webview"
-                                         "libraries/wineditline"
-                                         "macbuild"
-                                         "MacPorts"
-                                         "mac-universal"
-                                         "psl"
-                                         "reduce2"
-                                         "reduce2-2025"
-                                         "vsl"
-                                         "web"
-                                         "winbuild64"
-                                         "windows-config-cache"))))))
-      (build-system gnu-build-system)
-      (arguments
-       (list #:parallel-build? #f
-             #:configure-flags
-             #~(list "--without-autogen"
-                     ;; fix conflict with internal build name determination
-                     "--build="
-                     "--with-csl"
-                     (string-append "CPPFLAGS=-I"
-                                    #$freetype
-                                    "/include/freetype2"))
-             #:make-flags #~(list "csl")
-             #:phases
-             #~(modify-phases %standard-phases
-                 (replace 'check
-                   (lambda* (#:key tests? #:allow-other-keys)
-                     (when tests?
-                       (invoke "scripts/testall.sh" "--csl" "--noregressions"))))
-                 (add-before 'patch-source-shebangs 'autogen
-                   (lambda _
-                     (invoke "sh" "autogen.sh")))
-                 (add-after 'autogen 'fix-version
-                   (lambda _
-                     (substitute* "csl/cslbase/version.h"
-                       (("(#define VERSION_ID )\"\\$Id\\$\"" all def)
-                        (format #f
-                                "~a \"$Id: version.h ~a ~a 00:00:00Z somebody $\""
-                                def #$revision #$version)))))
-                 (add-after 'install 'fix-install
-                   (lambda _
-                     (copy-file "bin/rfcsl"
-                                (string-append #$output "/bin/rfcsl"))
-                     (copy-file "generic/newfront/redfront.1"
-                                (string-append #$output
-                                               "/share/man/man1/rfcsl.1"))
-                     (let ((.desktop-file
-                            "debianbuild/reduce/debian/redcsl.desktop")
-                           (icon "debianbuild/reduce/debian/reduce.png"))
-                       (install-file .desktop-file
-                                     (string-append #$output
-                                                    "/share/applications"))
-                       (install-file icon
-                                     (string-append
-                                      #$output
-                                      "/share/icons/hicolor/32x32/apps")))
-                     (with-directory-excursion #$output
-                       (map (lambda (dir)
-                              (map (lambda (file)
-                                     (chmod file #o444))
-                                   (find-files dir)))
-                            '("share/man/man1" "share/reduce/fonts"))))))))
-      (native-inputs (list autoconf automake libtool which))
-      (inputs
-       ;; bundled libraries: fox (adjusted) editline (adjusted)
-       ;; crlibm softfloat
-       (list freetype libffi libx11 libxext libxft ncurses))
-      (synopsis "Portable general-purpose computer algebra system")
-      (description
-       "REDUCE is a portable general-purpose computer algebra system.  It is a
+  (package
+    (name "reduce")
+    (version "2024-08-12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/reduce-algebra/snapshot_"
+                    version "/Reduce-svn6860-src.tar.gz"))
+              (sha256
+               (base32
+                "13bij9d4dj96vd5di59skz77s2fihj7awmkx403fvh9rd04ly25z"))
+              (modules '((guix build utils)))
+              (patches (search-patches "reduce-unbundle-libffi.patch"))
+              ;; remove binaries and unnecessary parts
+              ;; to ensure we build from source files only
+              (snippet '(map delete-file-recursively
+                         (append (find-files "csl/generated-c" "\\.img$")
+                          '("psl" "vsl"
+                            "jlisp"
+                            "jslisp"
+                            "libedit"
+                            "macbuild"
+                            "MacPorts"
+                            "mac-universal"
+                            "reduce2"
+                            "winbuild64"
+                            "common-lisp"
+                            "contrib"
+                            "generic/qreduce"
+                            "web/htdocs/images/Thumbs.db")
+                          (find-files "csl"
+                           "^(embedded|new-embedded|winbuild|support-packages)$"
+                           #:directories? #t)
+                          (find-files "libraries"
+                           "^(original|wineditline|libffi|libffi-for-mac)$"
+                           #:directories? #t))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:parallel-build? #f
+           #:configure-flags
+           #~(list "--without-autogen"
+                   ;; fix conflict with internal build name determination
+                   "--build="
+                   "--with-csl"
+                   (string-append "CPPFLAGS=-I"
+                                  #$freetype
+                                  "/include/freetype2"))
+           #:make-flags #~(list "csl")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "scripts/testall.sh" "--csl" "--noregressions"))))
+               (add-before 'patch-source-shebangs 'autogen
+                 (lambda _
+                   (invoke "sh" "autogen.sh")))
+               (add-after 'install 'fix-install
+                 (lambda _
+                   (copy-file "bin/rfcsl"
+                              (string-append #$output "/bin/rfcsl"))
+                   (copy-file "generic/newfront/redfront.1"
+                              (string-append #$output
+                                             "/share/man/man1/rfcsl.1"))
+                   (let ((.desktop-file
+                          "debianbuild/reduce/debian/redcsl.desktop")
+                         (icon "debianbuild/reduce/debian/reduce.png"))
+                     (install-file .desktop-file
+                                   (string-append #$output
+                                                  "/share/applications"))
+                     (install-file icon
+                                   (string-append
+                                    #$output
+                                    "/share/icons/hicolor/32x32/apps")))
+                   (with-directory-excursion #$output
+                     (map (lambda (dir)
+                            (map (lambda (file)
+                                   (chmod file #o444))
+                                 (find-files dir)))
+                          '("share/man/man1" "share/reduce/fonts"))))))))
+    (native-inputs (list autoconf automake libtool which))
+    (inputs
+     ;; bundled libraries: fox (adjusted) editline (adjusted)
+     ;; crlibm softfloat
+     (list freetype libffi libx11 libxext libxft ncurses))
+    (synopsis "Portable general-purpose computer algebra system")
+    (description
+     "REDUCE is a portable general-purpose computer algebra system.  It is a
 system for doing scalar, vector and matrix algebra by computer, which also
 supports arbitrary precision numerical approximation and interfaces to
 gnuplot to provide graphics.  It can be used interactively for simple
@@ -2327,9 +2300,9 @@ similar to other modern programming languages.  REDUCE supports alternative
 user interfaces including Run-REDUCE, TeXmacs and GNU Emacs.  This package
 provides the Codemist Standard Lisp (CSL) version of REDUCE.  It uses the
 gnuplot program, if installed, to draw figures.")
-      (home-page "https://reduce-algebra.sourceforge.io/")
-      (license (license:non-copyleft "file://README"
-                                     "See README in the distribution.")))))
+    (home-page "https://reduce-algebra.sourceforge.io/")
+    (license (license:non-copyleft "file://README"
+                                   "See README in the distribution."))))
 
 (define-public msolve
   (package

gnu/packages/apparmor.scm

@@ -128,7 +128,7 @@ supported by Canonical since 2009.")
                       "USE_SYSTEM=1"
                       ;; No need to run the linter
                       "PYFLAKES=true"))
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (delete 'configure)
@@ -189,7 +189,7 @@ supported by Canonical since 2009.")
       (arguments
        (append
         (list #:tests? #f)              ;no tests
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (delete 'chdir-parser)

gnu/packages/arcan.scm

@@ -172,7 +172,7 @@ engine with a Lua scripting interface.")
     (inherit arcan)
     (name "arcan-sdl")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs arcan)
        (delete "libdrm")
        (prepend glu libglvnd mesa sdl2)))
     (arguments

gnu/packages/aspell.scm

@@ -464,7 +464,7 @@ European languages.")
                 (patches (search-patches "ispell-for-linphone-cmake.patch"))))
       (build-system cmake-build-system)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments ispell)
          ((#:modules _ ''())
           '((guix build cmake-build-system)
             (guix build utils)

gnu/packages/astronomy.scm

@@ -1360,7 +1360,7 @@ dynamic library for the C language implementation of HEALPix.")
                (invoke "aclocal")
                (invoke "automake" "--add-missing")
                (invoke "autoconf"))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs healpix)
               (prepend libsharp zlib)))
     (description
      (string-replace-substring (package-description healpix)
@@ -2191,6 +2191,17 @@ implementation of the ASDF Standard.")
        (sha256
         (base32 "0scnw5y4x5k3vyfylq0w612b662xlccx3gsscaw082zlv2yxfyh4"))))))
 
+(define-public python-asdf-4
+  (package
+    (inherit python-asdf)
+    (version "4.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "asdf" version))
+       (sha256
+        (base32 "1h9dvnxdcd7cmjddpfnjsn6a1acav8gm5307gf7kpifacf99fdqz"))))))
+
 (define-public python-asdf-astropy
   (package
     (name "python-asdf-astropy")
@@ -2317,6 +2328,42 @@ Users should not need to install this directly; instead, install an
 implementation package such as asdf-astropy.")
     (license license:bsd-3)))
 
+(define-public python-asdf-fits-schemas
+  (hidden-package
+   ;; This package was never released and has been archived. The schemas in
+   ;; this package were never removed from and will continue to be maintained
+   ;; in <https://github.com/asdf-format/asdf-standard>.
+   (let ((commit "6321c0ae4e44c9a59ccf81a446f9d9e22fd42b55")
+         (revision "2"))
+     (package
+       (name "python-asdf-fits-schemas")
+       (version (git-version "0.0.1" revision commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://github.com/asdf-format/asdf-fits-schemas")
+                (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32 "0p0m1sgnv9yqk0l0w15skvfshl47x0gc7lg6p2x83158hjyix5q6"))))
+       (build-system pyproject-build-system)
+       (arguments
+        (list
+         #:tests? #f)) ; cycle with python-asdf
+       (native-inputs
+        (list python-setuptools
+              python-setuptools-scm
+              python-wheel))
+       (propagated-inputs
+        (list python-asdf-standard
+              python-importlib-resources))
+       (home-page "https://github.com/asdf-format/asdf-fits-schemas")
+       (synopsis "ASDF schemas to support the FITS format")
+       (description
+        "This package provides ASDF schemas for validating FITS tags.")
+       (license license:bsd-3)))))
+
 (define-public python-asdf-standard
   (package
     (name "python-asdf-standard")
@@ -3157,6 +3204,43 @@ much of the core functionality and some common tools needed for performing
 astronomy and astrophysics.")
     (license license:bsd-3)))
 
+(define-public python-astropy-6
+  (package
+    (inherit python-astropy)
+    (name "python-astropy")
+    (version "6.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "astropy" version))
+       (sha256
+        (base32 "1vspagb4vbmkl6fm3mr78577dgdq992ggwkd5qawpdh6cccaq1d4"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (with-directory-excursion "astropy/extern"
+              (for-each delete-file-recursively '("ply" "configobj")))
+            (with-directory-excursion "cextern"
+              (for-each delete-file-recursively '("expat" "wcslib")))))))
+    ;; tests: 28419 passed, 316 skipped, 233 xfailed, 25 warnings
+    (arguments
+     (substitute-keyword-arguments
+         (package-arguments python-astropy)
+       ((#:test-flags test-flags #~(list))
+        #~(list "--pyargs" "astropy"
+                "--numprocesses" (number->string (min 8 (parallel-job-count)))
+                "-k" (string-join
+                      (list "not test_skip_meta"
+                            "test_all_included"
+                            "test_basic_testing_completeness"
+                            "test_ephemeris_local_file_not_ephemeris"
+                            "test_non_linear_lsq_fitter_with_weights[LMLSQFitter]"
+                            "test_testing_completeness")
+                      " and not ")))))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs python-astropy)
+       (replace "python-jplephem" python-jplephem-2.22)))))
+
 (define-public python-astropy-healpix
   (package
     (name "python-astropy-healpix")
@@ -3228,15 +3312,14 @@ celestial-to-terrestrial coordinate transformations.")
   (package/inherit python-astropy
     (name "python-astropy-minimal")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments python-astropy)
        ((#:tests? _ #t) #f)))
     (native-inputs
      (list nss-certs-for-test
            pkg-config
            python-cython
            python-extension-helpers
-           python-setuptools-scm
-           specification-astropy-data))
+           python-setuptools-scm))
     (propagated-inputs
      (list python-astropy-iers-data
            python-configobj      ;to replace custom module
@@ -6024,6 +6107,33 @@ Astronomical Almanac to within 0.0005 arcseconds (half a @emph{mas} or
 milliarcsecond).")
     (license license:expat)))
 
+;; The last compatible version for python-astropy-6.
+(define-public python-jplephem-2.22
+  (hidden-package
+   (package
+     (inherit python-jplephem)
+     (version "2.22")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "jplephem" version))
+        (sha256
+         (base32 "0b2rgb7pvwnl72pqjryf9c812mmdxr69fwiym7mnz05l2xrcr6hd"))))
+    (arguments
+     (list
+      ;; FIXME: OSError: [Errno 30] Read-only file system:
+      ;; '/gnu/store/<hash>-python-3.11.11/lib/python3.11/@test_43_tmpæ.pyc'
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "python" "-m" "unittest" "discover" "-s" "test")))))))
+    (native-inputs
+     (list python-setuptools
+           python-wheel)))))
+
 (define-public python-jwst
   (package
     (name "python-jwst")
@@ -7155,6 +7265,96 @@ binned galaxy positions or shear) in cylindrical projection, but its core
 functionality is more general.")
     (license license:bsd-3)))
 
+;; XXX: The project is archived, maintained fork is available see
+;; <https://github.com/poliastro/poliastro/issues/1640>.
+;; Maintained fork <https://github.com/pleiszenburg/hapsira>.
+(define-public python-poliastro
+  (package
+    (name "python-poliastro")
+    (version "0.17.0")
+    (source
+     (origin
+       ;; PyPi tarball lacks tests.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/poliastro/poliastro")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1iclyjp0cvm6hp5qf4fzklszxvhj3idkxgb6a9h7xzg9bf5j5gi2"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "-m" "not remote_data"
+              ;; TODO: Review failing tests later when any upstream
+              ;; suggestions are provided:
+              ;; https://github.com/poliastro/poliastro/issues/1618
+              "--ignore=tests/test_czml.py"
+              "-k" (string-append
+                    ;; This fails with "ufunc 'isfinite' not
+                    ;; supported for the input types"
+                    "not test_porkchop_plotting"
+                    " and not test_maneuver_constructor_raises_error_if_invalid_delta_v"))
+      #:phases
+      #~(modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "pyproject.toml"
+               (("5.0,<6") "5.0,<7"))))
+          (add-after 'unpack 'matplotlib-compatibility
+            (lambda _
+              (substitute* "src/poliastro/plotting/static.py"
+                (("import numpy as np.*" m)
+                 (string-append m "\
+import itertools\n"))
+                (("( +)self._ax = ax.*" m indent)
+                 (string-append m indent
+                                "\
+self.colors = itertools.cycle(plt.rcParams[\"axes.prop_cycle\"].by_key()[\"color\"])\n"))
+                (("color = next\\(self._ax._get_lines.prop_cycler\\)\\[\"color\"\\]")
+                 "color = next(self.colors)"))))
+          ;; NOTE: Tests take about 7-10 minutes to pass.
+          (add-before 'check 'prepare-test-environment
+            (lambda _
+              (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list python-coverage
+           python-hypothesis
+           python-mypy
+           python-flit-core
+           python-pytest
+           python-pytest-cov
+           python-pytest-doctestplus
+           python-pytest-mpl
+           python-pytest-mypy))
+    (propagated-inputs
+     (list python-astropy-6
+           python-astroquery
+           python-czml3
+           python-jplephem
+           python-matplotlib
+           python-numba
+           python-numpy
+           python-pandas
+           python-plotly
+           python-pyerfa
+           python-scipy))
+    (home-page "https://www.poliastro.space/")
+    (synopsis "Astrodynamics in Python")
+    (description
+     "POLIASTRO is a Python library for interactive Astrodynamics and Orbital
+Mechanics, with a focus on ease of use, speed, and quick visualization.  It
+provides a simple and intuitive API, and handles physical quantities with
+units.
+
+Some features include orbit propagation, solution of the Lambert's problem,
+conversion between position and velocity vectors and classical orbital
+elements and orbit plotting, among others.  It focuses on interplanetary
+applications, but can also be used to analyze artificial satellites in
+Low-Earth Orbit (LEO).")
+  (license license:expat)))
+
 (define-public python-poppy
   (package
     (name "python-poppy")
@@ -7857,7 +8057,6 @@ Features:
       #~(list "--durations=10" ; report 10 slowest tests
               "--numprocesses" (number->string (min 8 (parallel-job-count)))
               ;; Tests require pysatSpaceWeather which is not packed yet.
-              "-o" "addopts=''"               ; Avoid -p pytest_cov.
               "--ignore=pysat/tests/test_utils_files.py"
               ;; TODO: Report upstream, probably comparability issue with
               ;; Pandas v2.3.3. Tests fail with error:
@@ -7884,6 +8083,9 @@ Features:
               (setenv "HOME" "/tmp")))
           (add-before 'check 'pre-check
             (lambda _
+              ;; Do not run test coverage.
+              (substitute* "pyproject.toml"
+                ((".*addopts.*cov.*") ""))
               (mkdir "pysatData")
               (invoke "python" "-c"
                       "import pysat; pysat.params['data_dirs'] = 'pysatData'"))))))
@@ -10445,7 +10647,7 @@ functionality needed for solar data analysis.")
   (package/inherit python-sunpy
     (name "python-sunpy-minimal")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments python-sunpy)
        ((#:tests? _ #t) #f)))
     (native-inputs
      (list python-setuptools
@@ -11605,7 +11807,7 @@ objects.")
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-           #~(list "CFLAGS=-O2 -g -fcommon")))
+           #~(list "CFLAGS=-fcommon")))
     (inputs
      (list libtiff zlib libjpeg-turbo))
     (home-page "https://www.astromatic.net/software/stiff/")
@@ -11645,6 +11847,75 @@ program to produce realistic astronomical fields.  Stuff is part of the
 @uref{https://www.astromatic.net/projects/efigi, EFIGI} development project.")
       (license license:gpl3+))))
 
+;; TODO: This is not an original source, and currently fails to build:
+;; <https://directory.fsf.org/wiki/Sunclock>
+;;  -> <https://github.com/mdoege/Sunclock> dead link
+;;   -> <http://www.arvernes.com/wiki/index.php/Sunclock> dead link
+;; <https://github.com/nongiach/Sunclock> is unmaintained.
+;;
+;; Maybe use Debian's fork instead
+;; <https://salsa.debian.org/debian/sunclock>, it would need to apply 12
+;; patches from <debian/patches>?
+;; Mark as not public for now.
+(define sunclock
+  (let ((commit "f4106eb0a81f7594726d6b2859efd8fc64cc1225")
+        (revision "1"))
+    (package
+      (name "sunclock")
+      (version (git-version "3.57" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/nongiach/Sunclock")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1rczdpmhvfw57b9r793vq8vqlbdhlkgj52fxwrdfl6cwj95a9kv2"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:make-flags
+         (list (string-append "DESTDIR=" %output)
+               ;; Fix incorrect argument given to gcc. Error message:
+               ;; "gcc: error: DefaultGcc2AMD64Opt: No such file or directory"
+               "CDEBUGFLAGS=")
+         #:phases
+         (modify-phases %standard-phases
+           (replace 'configure
+             (lambda _
+               (chdir "sunclock-3.57")
+               (substitute* "Imakefile"
+                 (("^MANDIR=/X11R6/man/man1")
+                  "MANDIR=/share/man/man1")
+                 (("^BINDIR=/X11R6/bin")
+                  "BINDIR=/bin")
+                 ;; Disable ZLIB support for vmf files because zlib implements
+                 ;; `gzgetc` as a macro instead of a function, which results in
+                 ;; a compilation error.
+                 ((" -DZLIB") "")
+                 ((" -lz") "")
+                 (("cd \\$\\(DESTDIR\\)\\$\\(SHAREDIR\\)/earthmaps/vmf ; \
+gzip -f \\*.vmf")
+                  ""))
+               ;; Generate Makefile.
+               (invoke "xmkmf"))))
+         #:tests? #f))  ; No check target.
+      (inputs
+       (list libjpeg-turbo libpng libx11 libxpm))
+      (native-inputs
+       (list imake))
+      (home-page "https://github.com/nongiach/Sunclock")
+      (synopsis
+       "Map of the Earth that shows which portion is illuminated by the Sun")
+      (description
+       "Sunclock displays a map of the Earth and shows which portion is
+illuminated by the Sun.  It can commute between two states, the \"clock window\"
+and the \"map window\".  The clock window displays a small map of the Earth and
+therefore occupies little space on the screen, while the \"map window\" displays
+a large map and offers more advanced functions: local time of cities, Sun and
+Moon position, etc.")
+      (license license:gpl2+))))
+
 (define-public sunwait
   (package
     (name "sunwait")
@@ -11904,10 +12175,9 @@ See related paper
        (file-name (git-file-name name version))
        (sha256
         (base32 "07hiqr6jxmbw2dasbmyvcjmfxw4hjsn7xp269irjgfijsf8ga68n"))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
     (arguments
      (list
-      #:qtbase qtbase
       #:tests? #f ;no test target
       #:phases
       #~(modify-phases %standard-phases
@@ -11931,7 +12201,6 @@ See related paper
            qtbase
            qtcharts
            qtdeclarative
-           qtwayland
            wcslib
            zstd
            (list zstd "lib")))

gnu/packages/audio.scm

@@ -3083,7 +3083,7 @@ auto-wah.")
   (package (inherit guitarix)
     (name "guitarix-lv2")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments guitarix)
        ((#:configure-flags flags)
         `(cons "--no-standalone" ,flags))))))
 
@@ -4467,7 +4467,6 @@ the current volume level of PulseAudio or PipeWire using libnotify.")
     (inputs
      (list alsa-lib
            jack-2
-           fmt-9
            ganv
            glibmm
            gtkmm-2
@@ -5258,7 +5257,7 @@ stretching and pitch scaling of audio.  This package contains the library.")
           (base32
            "11srnzgpavcj6n70zjdm7488jzrprk71mg9dgr1sa6vwp575hf2m"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments libsbsms)
          ((#:phases phases)
           #~(modify-phases #$phases
               (delete 'fix-ar-lib-path)
@@ -7561,7 +7560,7 @@ minimum.")
     (arguments
      (list #:configure-flags '(list "-Denable_rsvg=true")))
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs ztoolkit)
        (prepend (librsvg-for-system))))
     (synopsis "ZToolkit with SVG support")))
 
@@ -8209,6 +8208,33 @@ but it also helps for other programs.  It offers a patchbay for visualizing
 and editing connections.")
     (license license:gpl2+)))
 
+(define-public streamripper
+  (package
+    (name "streamripper")
+    (version "1.64.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/streamripper"
+                           "/files/streamripper%20(current)/"
+                           version "/streamripper-" version ".tar.gz"))
+       (sha256
+        (base32 "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Delete bundled copy of libmad.
+        '(delete-file-recursively "libmad-0.15.1b"))))
+    (build-system gnu-build-system)
+    (native-inputs (list pkg-config))
+    (inputs (list faad2 glib libmad libvorbis))
+    (home-page "https://streamripper.sourceforge.net")
+    (synopsis "Record audio streams to your hard drive")
+    (description "Streamripper records shoutcast-compatible
+streams.  For shoutcast style streams it finds the “meta data” or track
+separation data, and uses that as a marker for where the track should
+be separated.")
+    (license license:gpl2+)))
+
 (define-public cubeb
   (let ((commit "9e29d728b0025c674904f83f5a13a88d1a6a5edc")
         (revision "1"))

gnu/packages/aux-files/emacs/comp-integrity.el

@@ -1,4 +1,3 @@
-;; -*- lexical-binding: t; -*-
 (require 'ert)
 
 (eval-when-compile

gnu/packages/aux-files/linux-libre/6.18-arm64.conf

@@ -2238,7 +2238,7 @@ CONFIG_PCI_PWRCTRL_SLOT=y
 CONFIG_CXL_BUS=y
 CONFIG_CXL_PCI=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
-CONFIG_CXL_ACPI=m
+CONFIG_CXL_ACPI=y
 CONFIG_CXL_PMEM=m
 CONFIG_CXL_MEM=m
 CONFIG_CXL_FEATURES=y

gnu/packages/aux-files/linux-libre/6.19-arm64.conf

@@ -2269,7 +2269,7 @@ CONFIG_PCI_PWRCTRL_TC9563=m
 CONFIG_CXL_BUS=y
 CONFIG_CXL_PCI=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
-CONFIG_CXL_ACPI=m
+CONFIG_CXL_ACPI=y
 CONFIG_CXL_PMEM=m
 CONFIG_CXL_MEM=m
 CONFIG_CXL_FEATURES=y

gnu/packages/avr-xyz.scm

@@ -4,7 +4,6 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,7 +40,6 @@
   #:use-module (gnu packages elf)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages libusb)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages version-control)
@@ -125,8 +123,7 @@ multipart HEX files.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g"))
-              (patches (search-patches "lufa-fix-incompatible-cast.patch"))))
+                "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g"))))
     (outputs '("bootloaders" "demos" "projects" "doc"))
     (build-system gnu-build-system)
     (arguments
@@ -196,31 +193,6 @@ compatible microcontroller models, as well as the demos and the
 documentation.")
     (license license:expat)))           ;see LUFA/License.txt
 
-(define-public lufa-hid-bootloader-cli
-  (package
-    (inherit lufa)
-    (name "lufa-hid-bootloader-cli")
-    (build-system gnu-build-system)
-    (outputs '("out"))
-    (arguments
-     (list #:tests? #f ;; no tests
-           #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
-                                "-C" "Bootloaders/HID/HostLoaderApp")
-           #:phases
-           #~(modify-phases %standard-phases
-               (delete 'configure)
-               (replace 'install
-                 (lambda _
-                   (install-file "Bootloaders/HID/HostLoaderApp/hid_bootloader_cli"
-                                 (string-append #$output "/bin")))))))
-    (inputs
-     (list libusb-compat))
-    (synopsis "Firmware uploader for the LUFA HID bootloader")
-    (description
-     "The LUFA HID loader program communicates with the LUFA HID bootloader to
-upload new firmware.")
-    (license license:gpl3)))
-
 (define-public microscheme
   (package
     (name "microscheme")

gnu/packages/avr.scm

@@ -60,7 +60,7 @@
       (inherit xgcc)
       (name "avr-gcc")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments xgcc)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH

gnu/packages/backup.scm

@@ -375,7 +375,7 @@ random access nor for in-place modification.  This package provides the
         (base32
          "0wxdr7qws1z1b1gp5jsm7n2ccnjlmrnds52d5wc5xkzagyslgf67"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments libarchive)
        ((#:phases phases)
         #~(modify-phases #$phases
             (delete 'patch-pwd)

gnu/packages/base.scm

@@ -99,14 +99,14 @@
 (define-public hello
   (package
     (name "hello")
-    (version "2.12.3")
+    (version "2.12.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/hello/hello-" version
                                   ".tar.gz"))
               (sha256
                (base32
-                "183a6rxnhixiyykd7qis0y9g9cfqhpkk872a245y3zl28can0pqd"))))
+                "1aqq1379syjckf0wdn9vs6wfbapnj9zfikhiykf29k4jq9nrk6js"))))
     (build-system gnu-build-system)
     (synopsis "Example GNU package")
     (description
@@ -602,7 +602,7 @@ standard.")
                 (base32
                  "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"))))
      (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments coreutils-minimal)
         ((#:phases phases '%standard-phases)
          `(modify-phases ,phases
             (add-before 'check 'disable-broken-test
@@ -756,7 +756,7 @@ included.")
                "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"))
              (patches '())))
    (arguments
-    (substitute-keyword-arguments arguments
+    (substitute-keyword-arguments (package-arguments binutils)
       ((#:make-flags _ #~'()) #~'())))
    (native-inputs '())
    (properties '())))
@@ -774,7 +774,7 @@ included.")
        (sha256
         (base32 "1j64m2czn9ygd5g1cjjcw7q43b18xh6qkrdl1pkm03ncjnj3wwrl"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments binutils)
        ((#:configure-flags flags)
         #~(cons* "--enable-gold=default"
                  (delete "LDFLAGS=-static-libgcc" #$flags)))
@@ -792,7 +792,7 @@ included.")
                          (substitute* "gold/Makefile.in"
                            ((" testsuite") " ")))))
                   #~())))))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs binutils)
                      (append bc)))))
 
 (define-public libbfd
@@ -802,7 +802,7 @@ included.")
      (modify-inputs (package-native-inputs binutils)
        (append texinfo))) ; because makeinfo is needed when building bfd alone
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments binutils)
        ;; Only build as a shared library
        ((#:configure-flags flags)
         #~(append #$flags '("--enable-shared" "--disable-static")))
@@ -1295,7 +1295,7 @@ with the Linux kernel.")
                                        "glibc-hurd-mach-print.patch"
                                        "glibc-hurd-gettyent.patch"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments glibc)
        ((#:configure-flags flags #~'())
         #~(cons* "CFLAGS=-g -O2 -Wno-error=builtin-declaration-mismatch"
                  "--enable-crypt"
@@ -1315,7 +1315,7 @@ with the Linux kernel.")
 
 (define-public glibc-2.33
   (package
-    (inherit glibc)
+    (inherit glibc-2.35)
     (name "glibc")
     (version "2.33")
     (source (origin
@@ -1335,7 +1335,7 @@ with the Linux kernel.")
                                   "glibc-hurd-clock_gettime_monotonic.patch")))
                              (origin-patches (package-source glibc-2.35)))))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments glibc)
        ((#:configure-flags flags #~'())
         #~(cons* #$(string-append
                     "CFLAGS=-g -O2"
@@ -1747,7 +1747,7 @@ and daylight-saving rules.")
   (hidden-package
     (package/inherit tzdata
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments tzdata)
           ((#:phases phases)
            #~(modify-phases #$phases
                (add-after 'post-install 'install-leap-seconds

gnu/packages/bash.scm

@@ -287,7 +287,7 @@ without modification.")
     (outputs (delete "include" (package-outputs bash)))
 
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bash)
        ((#:modules _ '())
         '((guix build gnu-build-system)
           (guix build utils)
@@ -351,7 +351,7 @@ without modification.")
   (package/inherit bash
     (name "bash-with-syslog")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bash)
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
            (add-after 'unpack 'enable-syslogging

gnu/packages/bdw-gc.scm

@@ -117,7 +117,7 @@ C or C++ programs, though that is not its primary goal.")
   (package/inherit
    libgc
    (arguments
-    (substitute-keyword-arguments arguments
+    (substitute-keyword-arguments (package-arguments libgc)
       ((#:configure-flags flags #~'())
        #~(cons "--enable-static" #$flags))))
 
@@ -141,7 +141,7 @@ C or C++ programs, though that is not its primary goal.")
     libgc
     (name "libgc-back-pointers")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments libgc)
        ((#:make-flags _ #~'())
         #~(list "CPPFLAGS=-DKEEP_BACK_PTRS=1"))))
     (synopsis "The BDW garbage collector, with back-pointer tracking")))

gnu/packages/benchmark.scm

@@ -5,7 +5,7 @@
 ;;; Copyright © 2018, 2019, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
-;;; Copyright © 2019, 2021, 2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
 ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
@@ -14,7 +14,6 @@
 ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
-;;; Copyright © 2023 Advanced Micro Devices, Inc.
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +37,6 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix git-download)
-  #:use-module (guix amd-gpu)
   #:use-module (guix search-paths)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -64,7 +62,6 @@
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
-  #:use-module (gnu packages llvm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages opencl)
@@ -79,7 +76,6 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
-  #:use-module (gnu packages rocm)
   #:use-module (gnu packages vulkan)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -282,22 +278,8 @@ tests.")
                 "03lg8rz2a9wgwn9axd6gkjiswgxmp62fbxjvrrcvazmwh6ykplx8"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list perl))
-    (arguments
-     (list
-       #:make-flags #~(list "MORECFLAGS=-std=c++11")
-       #:phases
-       #~(modify-phases %standard-phases
-           (replace 'check
-             (lambda* (#:key tests? #:allow-other-keys)
-               (when tests?
-                 (begin
-                   ;; As seen in ./debian/tests/smoke
-                   (mkdir "test-dir")
-                   (invoke "./bonnie++" "-q"
-                           "-d" "test-dir"
-                           "-s" "-0"
-                           "-n" "1"))))))))
+     (list gcc-10 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")
     (description
@@ -951,52 +933,3 @@ configurable through a set of options.")
      "Microbenchmarks suite to evaluate MPI and PGAS (OpenSHMEM, UPC, and
 UPC++) libraries for CPUs and GPUs.")
     (license license:bsd-3)))
-
-(define-public babelstream-hip
-  (package
-    (name "babelstream-hip")
-    (version "5.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/UoB-HPC/BabelStream.git")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0xkkxkmyi99qly427gkdijm9vwvmhwkgfm283ay6f83r66f712g4"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:build-type "Release"                ;"RelWithDebInfo" is not supported
-      #:tests? #f                           ;no tests
-      #:configure-flags
-      #~(list (string-append "-DMODEL=hip")
-              (string-append "-DCMAKE_CXX_COMPILER="
-                             #$(this-package-input "rocm-hip-runtime")
-                             "/bin/hipcc")
-              (string-append "-DCXX_EXTRA_FLAGS=--offload-arch="
-                             #$(string-join (current-amd-gpu-targets) ",")))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'avoid-native-optimizations
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("-march=native")
-                 "-g")))))))
-    (inputs (list rocm-hip-runtime lld-rocm llvm-rocm))
-    (properties
-     `((amd-gpu-targets . ,%default-amd-gpu-targets)
-       (tunable? . #t)))
-    (synopsis "Memory bandwidth benchmark for AMD GPUs")
-    (description
-     "The BabelStream benchmark measures memory transfer rates between main
-memory and GPUs.  This benchmark is similar in spirit, and based on, John
-D. McCalpin's STREAM benchmark for CPUs.  The version of BabelStream is built
-targeting AMD GPUs using HIP.")
-    (home-page "https://github.com/UoB-HPC/BabelStream.git")
-    (license (license:fsf-free
-              "https://github.com/UoB-HPC/BabelStream/blob/main/LICENSE"
-              "Custom permissive license based on John D. McCalpin's \
-original STREAM benchmark."))))

gnu/packages/bioconductor.scm

@@ -22959,7 +22959,7 @@ accessibility data.")
                  ((".*find_overlapping_ccans works.*" m)
                   (string-append m "skip('guix')"))))))))
       (propagated-inputs
-       (modify-inputs propagated-inputs
+       (modify-inputs (package-propagated-inputs r-cicero)
          (delete "r-monocle")
          (prepend r-monocle3))))))
 

gnu/packages/bioinformatics.scm

@@ -89,7 +89,6 @@
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages cpio)
   #:use-module (gnu packages cran)
-  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -2129,7 +2128,7 @@ Format (GFF) with Biopython integration.")
         (sha256
          (base32 "131hiir94jkm9jj2wfpybwndgzn8k0zc1ji1qjn5cz7w48x3ri13"))))
      (propagated-inputs
-      (modify-inputs propagated-inputs
+      (modify-inputs (package-propagated-inputs python-bcbio-gff)
         (replace "python-biopython" python-biopython-1.73))))))
 
 (define bed-sample-files
@@ -3242,11 +3241,7 @@ and gene expression visualization.")
             (lambda _
               ;; Numba needs a writable dir to cache functions.
               (setenv "NUMBA_CACHE_DIR" "/tmp")
-              (delete-file-recursively "metacells")))
-          (add-before 'sanity-check 'pre-sanity-check
-            (lambda _
-              ;; Numba needs a writable dir to cache functions.
-              (setenv "NUMBA_CACHE_DIR" "/tmp"))))))
+              (delete-file-recursively "metacells"))))))
     (propagated-inputs (list python-anndata
                              python-cvxpy
                              python-fastcluster
@@ -3260,7 +3255,7 @@ and gene expression visualization.")
                              python-threadpoolctl
                              python-umap-learn))
     (native-inputs (list pybind11-2 python-pytest python-setuptools))
-    (home-page "https://github.com/tanaylab/metacells")
+    (home-page "https://github.com/tanaylab/metacells.git")
     (synopsis "Single-cell RNA Sequencing Analysis")
     (description "The metacells package implements the improved metacell
 algorithm for single-cell RNA sequencing (scRNA-seq) data analysis within the
@@ -5203,14 +5198,9 @@ easy-to-perform steps.")
        (sha256
         (base32 "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"))))
     (build-system cmake-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'add-missing-header
-                 (lambda _
-                   (substitute* "src/Bpp/Graph/GlobalGraph.cpp"
-                     (("include <vector>" all)
-                      (string-append all "\n#include <limits>"))))))))
+    ;; XXX: does not build with later GCC:
+    ;; error: ‘numeric_limits’ was not declared in this scope
+    (native-inputs (list gcc-10))
     (home-page "https://pbil.univ-lyon1.fr/bpp-doc/bpp-core/html/index.html")
     (synopsis "C++ libraries for Bioinformatics")
     (description
@@ -5798,7 +5788,7 @@ and more accurate.  BWA-MEM also has better performance than BWA-backtrack for
                 "076c4q0cdqz8jgylb067y9zmvxglppnzi3qiscn0xiypgc6lgb5r"))))
     (build-system gnu-build-system)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bwa)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             (add-after 'unpack 'patch-C-error
@@ -6679,7 +6669,7 @@ meso, or continuum scale.")
     (inherit lammps)
     (name "lammps-serial")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments lammps)
        ((#:configure-flags flags)
         #~(list
         ;; activate all possible lammps packages.
@@ -6708,7 +6698,7 @@ meso, or continuum scale.")
         "-D MLIAP_ENABLE_PYTHON=yes"
         (string-append "-DN2P2_DIR=" #$(this-package-input "n2p2"))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs lammps)
        (delete "pnetcdf")
        (replace "hdf5-parallel-openmpi" hdf5)
        (delete "openmpi")))))
@@ -6846,7 +6836,7 @@ accessing bigWig files.")
 (define-public python-schema-salad
   (package
     (name "python-schema-salad")
-    (version "8.9.20251102115403")
+    (version "8.9.20250723145140")
     (source
       (origin
         (method git-fetch)
@@ -6855,17 +6845,16 @@ accessing bigWig files.")
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "0jcq6yam58q9xic9mzv09075s2mbng5bs0pxsh335i6jfwrp1b6x"))))
+         (base32
+          "1bqsbxx1275129j08aqz7qpzk1nlk4h9psvkm7hzb4liag8nyiql"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       #:test-flags
       #~(list
-         ;; These tests require network access.
-         "--deselect=schema_salad/tests/test_examples.py::test_bad_schemas"
-         "--deselect=schema_salad/tests/test_cg.py::test_load_by_yaml_metaschema"
-         ;; This test requires the cwl-runner binary.
-         "--ignore=schema_salad/tests/test_cwl11.py")
+         ;; Skip failing test, probably innocent.
+         ;; TODO: Remove when upgrading because updated upstream.
+         "--deselect=schema_salad/tests/test_makedoc.py::test_detect_changes_in_html")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'relax-requirements
@@ -6875,7 +6864,23 @@ accessing bigWig files.")
               (substitute* "requirements.txt"
                 (("mistune.*") "mistune"))
               (substitute* "setup.py"
-                (("mistune[^\"]*") "mistune")))))))
+                (("mistune[^\"]*") "mistune"))))
+          (add-before 'check 'skip-failing-tests
+            (lambda _
+              (let ((skip-test
+                     (lambda (test-pattern)
+                       (string-append "@pytest.mark.skip(reason="
+                                      "\"test requires network access\")\n"
+                                      test-pattern))))
+                (substitute* "schema_salad/tests/test_cg.py"
+                  (("^def test_load_by_yaml_metaschema\\(" all)
+                   (skip-test all)))
+                (substitute* "schema_salad/tests/test_cwl11.py"
+                  (("^def test_(secondaryFiles|outputBinding|yaml_tab_error)\\(" all)
+                   (skip-test all)))
+                (substitute* "schema_salad/tests/test_examples.py"
+                  (("^def test_bad_schemas\\(" all)
+                   (skip-test all)))))))))
     (propagated-inputs
      (list python-cachecontrol
            python-mistune
@@ -7083,7 +7088,7 @@ documents.")
 (define-public cwltool
   (package
     (name "cwltool")
-    (version "3.1.20260315121657")
+    (version "3.1.20250925164626")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -7092,7 +7097,7 @@ documents.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "07glkzm9af9n1jsmqk6vgrjkxhgjask9jy56g7zca20sz7hpmiyi"))))
+                "13mv7qcl64gng8bq0y9garp0vvn9851n98vzi75ppl16pjkkziks"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -7110,9 +7115,7 @@ documents.")
                ;; Tries to write to /tmp/guix-build-cwltool-3.fastq
                " and not test_iwdr_writable_secondaryfiles"
                ;; Tries to use cwl-runners.
-               " and not test_v1_0_arg_empty_prefix_separate_false"
-               ;; Tries to connect to the internet.
-               " and not test_issue_1765_print_deps_with_workflows_having_namespace_location_steps"))
+               " and not test_v1_0_arg_empty_prefix_separate_false"))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'loosen-version-restrictions
@@ -7294,14 +7297,14 @@ with Python.")
 (define-public deacon
   (package
     (name "deacon")
-    (version "0.15.0")
+    (version "0.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "deacon" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0wmw8zyr03swbygwifj59samz9srfzxqw1gnm22msa0ng75282z0"))))
+        (base32 "1p7q48ql67mxqi7fv0jaxbfn0js85sb2ai0h3vfvizwd1lfyldxl"))))
     (build-system cargo-build-system)
     (arguments
      (list
@@ -8458,6 +8461,39 @@ reasonable amount of time and memory.  For large alignments, FastTree is
 100-1,000 times faster than PhyML 3.0 or RAxML 7.")
    (license license:gpl2+)))
 
+(define-public fastx-toolkit
+  (package
+    (name "fastx-toolkit")
+    (version "0.0.14")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://github.com/agordon/fastx_toolkit/releases/download/"
+                version "/fastx_toolkit-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "01jqzw386873sr0pjp1wr4rn8fsga2vxs1qfmicvx1pjr72007wy"))))
+    (build-system gnu-build-system)
+    (inputs
+     (list libgtextutils))
+    (native-inputs
+     (list gcc-6 ;; doesn't build with later versions
+           pkg-config))
+    (home-page "http://hannonlab.cshl.edu/fastx_toolkit/")
+    (synopsis "Tools for FASTA/FASTQ file preprocessing")
+    (description
+     "The FASTX-Toolkit is a collection of command line tools for Short-Reads
+FASTA/FASTQ files preprocessing.
+
+Next-Generation sequencing machines usually produce FASTA or FASTQ files,
+containing multiple short-reads sequences.  The main processing of such
+FASTA/FASTQ files is mapping the sequences to reference genomes.  However, it
+is sometimes more productive to preprocess the files before mapping the
+sequences to the genome---manipulating the sequences to produce better mapping
+results.  The FASTX-Toolkit tools perform some of these preprocessing tasks.")
+    (license license:agpl3+)))
+
 (define-public flash
   (package
     (name "flash")
@@ -9774,7 +9810,6 @@ generally slower than modern maximum likelihood approaches.")
      (list bc
            time
            python-wrapper
-           python-setuptools
            pkg-config))
     (inputs
      (list htslib))
@@ -11043,7 +11078,7 @@ viewer.")
      `(#:tests? #f ;no "check" target
        #:make-flags
        (list "LIBCURSES=-lncurses")
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments samtools)
            ((#:modules _ #f)
             '((ice-9 ftw)
               (ice-9 regex)
@@ -11479,9 +11514,9 @@ accessed/downloaded on demand across HTTP.")
                                        "/bin/")))
                (install-file "plink" bin)))))))
     (inputs
-     (list zlib libxcrypt openblas))
+     (list zlib openblas))
     (native-inputs
-     (list unzip gcc-7))
+     (list unzip gcc-8))
     (home-page "http://pngu.mgh.harvard.edu/~purcell/plink/")
     (synopsis "Whole genome association analysis toolset")
     (description
@@ -12329,7 +12364,7 @@ sequences.")
   (package (inherit star)
     (name "starlong")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments star)
        ((#:make-flags flags)
         `(list "STARlong"))
        ((#:phases phases)
@@ -16384,38 +16419,40 @@ browser.")
               "The contents of this package are free for all uses."))))
 
 (define-public skewer
-  (package
-    (name "skewer")
-    (version "0.2.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/relipmoc/skewer")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1b3skfnj3zmd2065fiyxjrg4k6xsxfy6nxz80vmajd830mk6vr69"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:tests? #f
-      #:make-flags
-      #~(list "CXXFLAGS=-std=c++11 -c -O2")
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)
-          (replace 'install
-            (lambda _
-              (install-file "skewer" (string-append #$output "/bin")))))))
-    (home-page "https://github.com/relipmoc/skewer")
-    (synopsis "Bit-masked k-difference matching")
-    (description "Skewer implements the bit-masked k-difference matching
+  (let ((commit "978e8e46cba44595ece623e5387749284a86b74b")
+        (revision "1"))
+    (package
+      (name "skewer")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/relipmoc/skewer")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1b3skfnj3zmd2065fiyxjrg4k6xsxfy6nxz80vmajd830mk6vr69"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'configure)
+            (replace 'install
+              (lambda _
+                (install-file "skewer" (string-append #$output "/bin")))))))
+      ;; XXX Fails to build with GCC 11.
+      (native-inputs (list gcc-10))
+      (home-page "https://github.com/relipmoc/skewer")
+      (synopsis "Bit-masked k-difference matching")
+      (description "Skewer implements the bit-masked k-difference matching
 algorithm dedicated to the task of adapter trimming and it is specially
 designed for processing next-generation sequencing (NGS) paired-end
 sequences.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public f-seq
   (let ((commit "6ccded34cff38cf432deed8503648b4a66953f9b")
@@ -21187,16 +21224,21 @@ polymorphisms) and indels with respect to a reference genome and more.")
 (define-public cnvkit
   (package
     (name "cnvkit")
-    (version "0.9.13")
+    ;; XXX: Compatability with NumPy 2 and Pomegranate 1.
+    (properties '((commit . "52f367bd0edbf55cabaaa2fbcf68c8742dc97b4c")
+                  (revision . "0")))
+    (version (git-version "0.9.12"
+                          (assoc-ref properties 'revision)
+                          (assoc-ref properties 'commit)))
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
               (url "https://github.com/etal/cnvkit")
-              (commit (string-append "v" version))))
+              (commit (assoc-ref properties 'commit))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0w81yl5v37r63d035mxdsycma8fgssyr0857rnvvjfw78wjjnvg9"))))
+        (base32 "0kr5r2nvvlip6mylwczck7ddn31l2xh9aal1xjzx036h71agrv27"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -22726,46 +22768,10 @@ transcriptional derivatives and visualization of the resulting velocity
 patterns.")
       (license license:gpl3))))
 
-(define-public r-voltronstore
-  (let ((commit "781a75ae73571a3a20387cdbf647f23184324a84")
-        (revision "1"))
-    (package
-      (name "r-voltronstore")
-      (version (git-version "0.1.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/BIMSBbioinfo/VoltRonStore")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "19mi9bbvym6jzlqnyqmzy83fv3wpj1jxq2np71j77l7sf1788cwj"))))
-      (properties `((upstream-name . "VoltRonStore")))
-      (build-system r-build-system)
-      (propagated-inputs (list r-basilisk
-                               r-biocparallel
-                               r-bpcells
-                               r-delayedarray
-                               r-delayedmatrixstats
-                               r-hdf5array
-                               r-hdf5dataframe
-                               r-imagearray
-                               r-rarr
-                               r-reticulate
-                               r-rhdf5
-                               r-zarrdataframe))
-      (home-page "https://github.com/BIMSBbioinfo/VoltRonStore")
-      (synopsis "On-Disk support and dependancies for VoltRon")
-      (description
-       "@code{VoltRonStore} provides utilities and a resource for installing
-dependencies of @code{VoltRon} package.")
-      (license license:expat))))
-
 (define-public r-voltron
   (package
     (name "r-voltron")
-    (version "0.2.5")
+    (version "0.2.3")
     (source
      (origin
        (method git-fetch)
@@ -22774,7 +22780,7 @@ dependencies of @code{VoltRon} package.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "057n4yipkq3gnlyrb63l2ryi78nlmaas02avargm352g5ra1xl9s"))))
+        (base32 "15cfszipvsq2c1gqkvvg5xkwndhjvn8hqjg5ymliwfcz9y9cv9xg"))))
     (properties `((upstream-name . "VoltRon")))
     (build-system r-build-system)
     (arguments
@@ -22886,10 +22892,8 @@ guix_python <- \"~a\";"
                              r-summarizedexperiment
                              r-viridislite
                              r-vitesscer
-                             r-voltronstore
                              r-xml
-                             r-zarrdataframe
-                             simpleitk))
+                             r-zarrdataframe))
     (native-inputs (list pkg-config r-testthat))
     (home-page "https://github.com/BIMSBbioinfo/VoltRon")
     (synopsis "VoltRon for spatial data integration and analysis")

gnu/packages/bittorrent.scm

@@ -593,11 +593,11 @@ features.")
       (inherit base)
       (name "qbittorrent-no-x")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:configure-flags configure-flags)
           #~(cons "-DGUI=OFF" #$configure-flags))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (delete "qtsvg"))))))
 
 (define-deprecated-package qbittorrent-nox

gnu/packages/books.scm

@@ -315,7 +315,7 @@ software, with support for multiple texts and languages.")
                          sword
                          util-linux ;for 'uuidgen'
                          (list util-linux "lib") ;for 'libuuid'
-                         webkitgtk-for-gtk3
+                         webkitgtk-with-libsoup2
                          yelp-tools
                          zip))
     (inputs (list dbus dbus-glib libxml2 python python-lxml))

gnu/packages/boost.scm

@@ -272,7 +272,7 @@ across a broad spectrum of applications.")
                (base32
                 "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments boost)
       ((#:make-flags _ #f)
        #~(list "threading=multi" "link=shared"
               ;; Set the RUNPATH to $libdir so that the libs find each other.
@@ -306,7 +306,7 @@ across a broad spectrum of applications.")
     (inherit boost)
     (name "boost-static")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments boost)
        ((#:make-flags flags)
         #~(cons "link=static" (delete "link=shared" #$flags)))))))
 
@@ -324,7 +324,7 @@ across a broad spectrum of applications.")
                (base32
                 "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments boost)
        ((#:configure-flags _ #~'())
         #~(let ((icu (dirname (dirname (search-input-file
                                         %build-inputs "bin/uconv")))))
@@ -358,7 +358,7 @@ across a broad spectrum of applications.")
        ((#:make-flags make-flags)
         #~(cons* "--without-python" #$make-flags))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs boost)
        (delete "python-minimal-wrapper")))
     (properties '((hidden? . #t)))))
 
@@ -367,7 +367,7 @@ across a broad spectrum of applications.")
     (inherit boost-1.83)
     (name "boost-numpy")
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs boost)
        (append python-numpy-1)))))
 
 (define-public boost-with-numpy
@@ -375,7 +375,7 @@ across a broad spectrum of applications.")
     (inherit boost)
     (name "boost-with-numpy")
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs boost)
        (append python-numpy)))
     (synopsis "Boost C++ libraries with inclusion of Boost.NumPy")))
 
@@ -449,10 +449,10 @@ signals and slots system.")
     (inherit boost)
     (name "boost-mpi")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs boost)
        (append openmpi)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments boost)
        ((#:phases phases)
         #~(modify-phases #$phases
             (add-after 'configure 'update-jam
@@ -469,7 +469,7 @@ signals and slots system.")
     (inherit boost-mpi)
     (name "boost-mpi-numpy")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs boost-mpi)
        (append python-numpy)))
     (synopsis "Boost C++ libraries with inclusion of Boost.MPI and Boost.NumPy")))
 

gnu/packages/bootloaders.scm

@@ -312,13 +312,13 @@ menu to select one of the installed operating systems.")
     (inherit grub-pc)
     (name "grub-minimal")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs grub-pc)
        (delete "lvm2" "mdadm" "fuse" "console-setup")))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs grub)
        (delete "help2man" "texinfo" "parted" "qemu" "qemu-minimal" "xorriso")))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments grub-pc)
        ((#:tests? _ #t) #f)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
@@ -338,7 +338,7 @@ menu to select one of the installed operating systems.")
     (inherit base)
     (synopsis "GRand Unified Boot loader (Coreboot payload version)")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments base)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             (add-before 'check 'disable-broken-tests
@@ -401,7 +401,7 @@ menu to select one of the installed operating systems.")
     (inherit base)
     (synopsis "GRand Unified Boot loader (UEFI version)")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs base)
        (prepend efibootmgr mtools)))
     (native-inputs
      (cond ((or (target-x86-64?)
@@ -409,7 +409,7 @@ menu to select one of the installed operating systems.")
                 (target-aarch64?)
                 (target-arm32?))
             ;; We add the firmware needed to run the tests.
-            (modify-inputs native-inputs
+            (modify-inputs (package-native-inputs base)
               (prepend
                 (cond ((target-x86-64?) ovmf-x86-64)
                       ((target-x86-32?) ovmf-i686)
@@ -419,10 +419,10 @@ menu to select one of the installed operating systems.")
            (else
             ;; The tests are skipped in this package so we remove some
             ;; test dependencies.
-            (modify-inputs native-inputs
+            (modify-inputs (package-native-inputs base)
               (delete "parted" "qemu-minimal" "xorriso")))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments base)
        ((#:tests? _ #f) (and (not (%current-target-system))
                              (this-package-native-input "qemu-minimal")))
        ((#:configure-flags flags #~'())
@@ -497,7 +497,7 @@ menu to select one of the installed operating systems.")
     (name "grub-efi32")
     (synopsis "GRand Unified Boot loader (UEFI 32bit version)")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments grub-efi)
        ((#:configure-flags flags #~'())
         #~(cons* #$@(cond ((target-x86?)
                            #~("--target=i386"))
@@ -554,10 +554,10 @@ menu to select one of the installed operating systems.")
     (native-inputs
      (cond
        ((target-x86-64?)
-        (modify-inputs native-inputs
+        (modify-inputs (package-native-inputs grub-efi)
           (replace "ovmf-x86-64" ovmf-i686)))
         ((target-aarch64?)
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs grub-efi)
            (prepend
             (cross-gcc "arm-linux-gnueabihf")
             (cross-binutils "arm-linux-gnueabihf"))
@@ -587,7 +587,7 @@ menu to select one of the installed operating systems.")
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ;; Running the tests isn't supported for this grub platform.
          ((#:tests? _ #t) #f)))
       (synopsis "GRand Unified Boot loader (u-boot version)")
@@ -604,10 +604,10 @@ menu to select one of the installed operating systems.")
     (name "grub-hybrid")
     (synopsis "GRand Unified Boot loader (hybrid version)")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs grub-efi)
        (prepend grub)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments grub-efi)
        ((#:modules modules `((guix build utils)
                              (guix build gnu-build-system)))
         `((ice-9 ftw) ,@modules))
@@ -930,7 +930,7 @@ also initializes the boards (RAM etc).")
                                   (string-append "infodir=" info-dir)
                                   make-flags))))))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs u-boot)
        (append fontconfig
                python-sphinx
                python-sphinx-prompt
@@ -948,12 +948,12 @@ Info manual.")))
     (name "u-boot-tools")
     (native-inputs
      (if (string-match "^x86_64-linux" (%current-system))
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs u-boot)
                           (prepend python-filelock
                                    python-pycryptodomex
                                    python-pytest
                                    python-pytest-xdist))
-           (modify-inputs native-inputs
+           (modify-inputs (package-native-inputs u-boot)
                           (prepend python-filelock
                                    python-pycryptodomex))))
     (inputs (list gnutls ncurses/tinfo))
@@ -1176,7 +1176,7 @@ U-Boot must be used."
                        (package-description u-boot)))
       (build-system gnu-build-system)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments u-boot)
          ((#:target _ #f)
           (and (not (native-build?)) triplet))
          ((#:modules modules '())
@@ -1277,13 +1277,13 @@ CONFIG_TOOLS_KWBIMAGE=n"))))
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
                 (lambda* (#:key inputs #:allow-other-keys)
                   (setenv "BL31" (search-input-file inputs "/bl31.elf"))))))))
-      (inputs (modify-inputs inputs
+      (inputs (modify-inputs (package-inputs base)
                 (append (match soc
                           ('rk3588 arm-trusted-firmware-rk3588)
                           ('rk3399 arm-trusted-firmware-rk3399)
@@ -1317,7 +1317,7 @@ removed so that it fits within common partitioning schemes.")))
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
@@ -1326,10 +1326,10 @@ removed so that it fits within common partitioning schemes.")))
                                  (or native-inputs inputs) "libexec/scp.bin"))
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs base)
          (append (force scp-firmware))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (append arm-trusted-firmware-sun50i-a64))))))
 
 (define-public u-boot-orangepi-zero2w
@@ -1338,7 +1338,7 @@ removed so that it fits within common partitioning schemes.")))
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
@@ -1346,7 +1346,7 @@ removed so that it fits within common partitioning schemes.")))
                   (setenv "SCP" "/dev/null")
                   (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          ;; The Zero 2W uses the slightly revised Allwinner H618.
          (append arm-trusted-firmware-sun50i-h616))))))
 
@@ -1445,7 +1445,7 @@ Documentation} for more information (for example by running @samp{info
   (package
     (inherit base)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments base)
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             (add-after 'install 'symlink-u-boot-command
@@ -1455,7 +1455,7 @@ Documentation} for more information (for example by running @samp{info
                 (symlink (search-input-file outputs "libexec/u-boot")
                          (string-append #$output "/bin/u-boot"))))))))
     ;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL.
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs base)
               (append efitools sdl2)))))
 
 (define-public u-boot-sifive-unleashed
@@ -1463,7 +1463,7 @@ Documentation} for more information (for example by running @samp{info
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
@@ -1471,7 +1471,7 @@ Documentation} for more information (for example by running @samp{info
                   (setenv "OPENSBI" (search-input-file inputs
                                                        "fw_dynamic.bin"))))))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (append opensbi-generic))))))
 
 (define-public u-boot-sifive-unmatched
@@ -1479,7 +1479,7 @@ Documentation} for more information (for example by running @samp{info
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
@@ -1487,7 +1487,7 @@ Documentation} for more information (for example by running @samp{info
                   (setenv "OPENSBI" (search-input-file inputs
                                                        "fw_dynamic.bin"))))))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (append opensbi-generic))))))
 
 (define-public u-boot-starfive-visionfive2
@@ -1498,7 +1498,7 @@ Documentation} for more information (for example by running @samp{info
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
@@ -1511,7 +1511,7 @@ Documentation} for more information (for example by running @samp{info
                                 (string-append #$output
                                                "/libexec/spl"))))))))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs base)
          (append opensbi-for-visionfive2))))))
 
 (define-public u-boot-rock64-rk3328
@@ -1676,7 +1676,7 @@ grub-efi-netboot-removable-bootloader.")
                  (base32
                   "01mja33351hkcs59rmfvppqlxqw4rh9gng7a7hx2cfspqwh2y6kr"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments u-boot)
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'patch-u-boot
@@ -1762,7 +1762,7 @@ grub-efi-netboot-removable-bootloader.")
                   (symlink (string-append #$output "/bin/fw_printenv")
                            (string-append #$output "/bin/fw_setenv"))))))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs u-boot)
          (delete "dtc"))))))            ;otherwise the build fails
 
 ;;; Note: the default cross-build of this package is currently broken on
@@ -1803,7 +1803,7 @@ For more information, refer to
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
               (add-after 'patch-u-boot 'set-default-fdt-file
@@ -2031,10 +2031,10 @@ the features of iPXE without the hassle of reflashing.")
     (native-inputs
      ;; QEMU uses a 64-bit UEFI firmware.
      (if (target-x86-64?)
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs ipxe)
            (prepend edk2-tools))
          (if (target-64bit?)
-           (modify-inputs native-inputs
+           (modify-inputs (package-native-inputs ipxe)
              (prepend edk2-tools
                       (cross-gcc "x86_64-linux-gnu")
                       (cross-binutils "x86_64-linux-gnu")))
@@ -2044,10 +2044,10 @@ the features of iPXE without the hassle of reflashing.")
                      binutils
                      (name "binutils-64-bit-bfd")
                      (arguments
-                       (substitute-keyword-arguments arguments
+                       (substitute-keyword-arguments (package-arguments binutils)
                         ((#:configure-flags flags ''())
                          #~(cons* "--enable-64-bit-bfd" #$flags)))))))
-             (modify-inputs native-inputs
+             (modify-inputs (package-native-inputs ipxe)
                (prepend edk2-tools
                         (make-ld-wrapper "ld-wrapper-64-bit-bfd"
                                          #:binutils binutils)
@@ -2066,7 +2066,7 @@ the features of iPXE without the hassle of reflashing.")
               ("rtl8139"     . ("10ec" . "8139"))
               ("virtio"      . ("1af4" . "1000"))
               ("vmxnet3"     . ("15ad" . "07b0")))))
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments ipxe)
          ((#:modules modules)
           `((ice-9 match) ,@modules))
          ((#:make-flags flags)

gnu/packages/bqn.scm

@@ -295,7 +295,7 @@ by APL.")
                   (install-file "libcbqn.so" lib)
                   (install-file "include/bqnffi.h" include))))))))
     (native-inputs (list cbqn-bootstrap libffi))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs cbqn-bootstrap)
               (prepend bqn-sources)))
     (license (append (package-license cbqn-bootstrap)
                      (list license:isc   ;Singeli module

gnu/packages/build-tools.scm

@@ -537,7 +537,7 @@ other lower-level build files.")
                (base32
                 "0q287af75d6w3c7dbfq7rmbh9isqzs9v30fjpm37lcafs2p7966k"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments premake4)
       ((#:phases phases)
        `(modify-phases ,phases
            (replace 'enter-source

gnu/packages/check.scm

@@ -3283,7 +3283,7 @@ tests.  The output format is JSON.")
 (define-public tidyall
   (package
     (name "tidyall")
-    (version "0.85")
+    (version "0.84")
     (source
      (origin
        (method url-fetch)
@@ -3291,7 +3291,7 @@ tests.  The output format is JSON.")
              "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-" version
              ".tar.gz"))
        (sha256
-        (base32 "1hb3xf07my3szlj5z8my95wcbzv0g17q9dsv7kajc1537g6xc0mr"))))
+        (base32 "1xxil8yfbd4nizwaaris07sp441nhx3ixr4qj13l1x6pxphi9h5k"))))
     (build-system perl-build-system)
     (arguments
      (list
@@ -3310,7 +3310,7 @@ tests.  The output format is JSON.")
                          perl-test-fatal
                          perl-test-warnings
                          perl-lib-relative
-                         php-8.4))
+                         php))
     (inputs (list bash-minimal))
     (propagated-inputs (list perl-capture-tiny
                              perl-config-ini
@@ -3689,6 +3689,31 @@ under test to interact with a fake file system instead of the real file
 system.  The code under test requires no modification to work with pyfakefs.")
     (license license:asl2.0)))
 
+(define-public python-aiounittest
+  (package
+    (name "python-aiounittest")
+    (version "1.5.0")
+    (source
+     (origin
+       (method git-fetch) ;no tets in PyPI archive
+       (uri (git-reference
+              (url "https://github.com/kwarunek/aiounittest.git")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0266i5z589jh75hjzakvwcqx5shgv5zis8mr70qa209v7jjclzfd"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
+    (propagated-inputs
+     (list python-wrapt))
+    (home-page "https://github.com/kwarunek/aiounittest")
+    (synopsis "Test asyncio code more easily")
+    (description "Aiounittest is a library that helps write tests using
+asynchronous code in Python (asyncio).")
+    (license license:expat)))
+
 (define-public python-pytest-datadir
   (package
     (name "python-pytest-datadir")

gnu/packages/chemistry.scm

@@ -1005,7 +1005,7 @@ electromagnetic properties for molecules and crystals.")
               ;; Autogenerated code
               (delete-file-recursively "src/autocode")))))
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:configure-flags flags '())
            #~(cons "-DBUILD_MARCH_NATIVE=OFF"
                    #$flags))
@@ -1015,7 +1015,7 @@ electromagnetic properties for molecules and crystals.")
           ;; Tests require python-pyscf.
           ((#:tests? _ #f) #f)))
        (native-inputs
-        (modify-inputs native-inputs
+        (modify-inputs (package-native-inputs base)
           (prepend (package-source base))))
        (supported-systems '("x86_64-linux"))
        (home-page "https://github.com/sunqm/qcint")

gnu/packages/chez.scm

@@ -534,7 +534,7 @@ version of Chez Scheme.")
                                        "zuo"))))))
     (build-system gnu-build-system)
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs chez-scheme-for-racket)
        (replace "chez-scheme-for-racket-bootstrap-bootfiles"
          chez-scheme-bootstrap-bootfiles)
        ;; for X11 clipboard support in expeditor:
@@ -832,7 +832,7 @@ User's Guix}, among other documents.")
 
 (define-public stex
   (package/inherit stex-bootstrap
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs stex-bootstrap)
               (prepend chez-scheme)))
     (outputs '("out" "doc"))
     (properties '())))

gnu/packages/chromium.scm

@@ -179,10 +179,6 @@
     "third_party/farmhash" ;Expat
     "third_party/fast_float" ;ASL2.0, Boost1.0, Expat
     "third_party/fdlibm" ;non-copyleft
-    "third_party/federated_compute/src/fcp/base" ;ASL2.0
-    "third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
-    "third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
-    "third_party/federated_compute/src/fcp/protos/federatedcompute" ;ASL2.0
     "third_party/ffmpeg" ; LGPL2.1+, GPL2.0+, Expat and BSD
     "third_party/fft2d" ;non-copyleft
     "third_party/flatbuffers" ;ASL2.0
@@ -245,8 +241,6 @@
     "third_party/nasm" ;BSD-2
     "third_party/nearby" ;ASL2.0
     "third_party/node" ;Expat
-    "third_party/oak/chromium/proto" ;ASL2.0
-    "third_party/oak/chromium/proto/attestation" ;ASL2.0
     "third_party/omnibox_proto" ;BSD-3
     "third_party/one_euro_filter" ;BSD-3
     "third_party/openscreen" ;BSD-3
@@ -372,7 +366,7 @@
   ;; run the Blink performance tests, just remove everything to save ~70MiB.
   '("third_party/blink/perf_tests"))
 
-(define %chromium-version "141.0.7390.65")
+(define %chromium-version "140.0.7339.207")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision (string-append "debian/" %ungoogled-revision))
 
@@ -384,7 +378,7 @@
     (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
     (sha256
      (base32
-      "1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))
+      "1kmfsb57cqks84i523ryw2l089gl0iq9hgv3sy8r8441b5nv3yn0"))))
 
 (define %debian-origin
   (origin
@@ -397,7 +391,7 @@
                                 ((_ version) version))))
     (sha256
      (base32
-      "06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))
+      "1hwzxlxs3c0x87rbq3b8p1m2pcjy3b10vyhbia5p3aiqdqgbm97j"))))
 
 (define (origin-file origin file)
   (computed-file
@@ -411,31 +405,31 @@
 (define %debian-patches
   (map debian-patch
        '("bookworm/clang19.patch"
-         "bookworm/foreach.patch"
-         "disable/node-version-ck.patch"
-         "fixes/gentoo-stylesheet.patch"
-         "fixes/libcpp-headers.patch"
-         "fixes/rust-clanglib.patch"
-         "system/openjpeg.patch"
+	 "bookworm/foreach.patch"
+	 "disable/node-version-ck.patch"
+	 "fixes/rust-clanglib.patch"
+	 "system/openjpeg.patch"
+	 ;; adler2 is not part of our rust toolchain, check on next version.
+	 "trixie/adler1.patch"
          ;; Remove after rust is past
          ;; <https://github.com/rust-lang/rust/pull/141061>.
          "trixie/rust-no-alloc-shim.patch")))
 
 (define %guix-patches
   (list (local-file
-         (assume-valid-file-name
+	 (assume-valid-file-name
           (search-patch
            "ungoogled-chromium-extension-search-path.patch")))
-        (local-file
-         (assume-valid-file-name
+	(local-file
+	 (assume-valid-file-name
           (search-patch
-           "ungoogled-chromium-unbundle-icu-target.patch")))
+	   "ungoogled-chromium-unbundle-icu-target.patch")))
         (local-file
-         (assume-valid-file-name
+	 (assume-valid-file-name
           (search-patch
            "ungoogled-chromium-RUNPATH.patch")))
         (local-file
-         (assume-valid-file-name
+	 (assume-valid-file-name
           (search-patch
            "ungoogled-chromium-system-nspr.patch")))))
 
@@ -508,7 +502,7 @@
   (package/inherit opus
     (name "opus+custom")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments opus)
        ((#:configure-flags flags ''())
         ;; Opus Custom is an optional extension of the Opus
         ;; specification that allows for unsupported frame
@@ -516,8 +510,8 @@
         `(cons "--enable-custom-modes"
                ,flags))))))
 
-(define lld-as-ld-wrapper-21
-  (make-lld-wrapper lld-21 #:lld-as-ld? #t))
+(define lld-as-ld-wrapper-19
+  (make-lld-wrapper lld-19 #:lld-as-ld? #t))
 
 (define-public ungoogled-chromium
   (package
@@ -531,7 +525,7 @@
                                   %chromium-version "-lite.tar.xz"))
               (sha256
                (base32
-                "09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
+                "0cbfvdlz8wkzyljf9ri9viivf02dikhd286ahzrcv9752y9hj563"))
               (modules '((guix build utils)))
               (snippet (force ungoogled-chromium-snippet))))
     (build-system gnu-build-system)
@@ -552,7 +546,6 @@
               ;; a developer build.
               "is_official_build=true"
               "clang_use_chrome_plugins=false"
-              "use_clang_modules=false"
               "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
               "optimize_webui=false"
               "safe_browsing_use_unrar=false"
@@ -610,7 +603,7 @@
                              "\"")
 
               (string-append "clang_version="
-                             #$(version-major (package-version clang-21)))
+			     #$(version-major (package-version clang-19)))
 
               (string-append "rust_sysroot_absolute=\""
                              (dirname (dirname (search-input-file %build-inputs
@@ -622,27 +615,11 @@
                              "\"")
 
               (string-append "rustc_version=\"rustc "
-                             #$(package-version rust)
-                             ;; These are 'don't care', but chromium's build parses
-                             ;; the whole string as if returned from 'rustc --version'
-                             ;; invokation and fails if it's just the version number.
-                             " (f6e511eec 2024-10-15) (built from a source tarball)\"")
-
-              ;; Chromium's build/rust/std/BUILD.gn has a hardcoded
-              ;; list of stdlib rlibs (stdlib_files) that GN uses to
-              ;; declare build outputs.  GN requires static output
-              ;; declarations, so the list must exactly match what
-              ;; rlibs exist in the Rust sysroot.  Chromium's list
-              ;; includes unicode_width because their bundled
-              ;; toolchain (Rust 1.89) ships it as a dependency of
-              ;; getopts 0.2.23.  Our Rust 1.93 has getopts 0.2.24
-              ;; which dropped that dependency, so unicode_width is
-              ;; not in our sysroot.  This GN arg removes it from
-              ;; the list.  (Chromium's own use of unicode_width via
-              ;; codespan-reporting is a separate vendored copy under
-              ;; third_party/rust/chromium_crates_io/ and is
-              ;; unaffected.)
-              "removed_rust_stdlib_libs=[\"unicode_width\"]"
+			     #$(package-version rust)
+			     ;; These are 'don't care', but chromium's build parses
+			     ;; the whole string as if returned from 'rustc --version'
+			     ;; invokation and fails if it's just the version number.
+			     " (f6e511eec 2024-10-15) (built from a source tarball)\"")
 
               ;; Prefer system libraries.
               "use_system_freetype=true"
@@ -678,13 +655,13 @@
               (let* ((libopenjp2 (search-input-file inputs "lib/libopenjp2.so"))
                      (openjpeg (dirname (dirname libopenjp2)))
                      (compiler-rt-path (dirname
-                                        (dirname
-                                         (search-input-file (or native-inputs inputs)
-                                                            "/bin/hwasan_symbolize")))))
-                ;; This works on top of debian's 'rust-clanglib.patch'.
-                (substitute* "build/config/clang/BUILD.gn"
-                  (("\\$clang_base_path/lib/clang/\\$clang_version")
-                   compiler-rt-path))
+					(dirname
+					 (search-input-file (or native-inputs inputs)
+							    "/bin/hwasan_symbolize")))))
+		;; This works on top of debian's 'rust-clanglib.patch'.
+		(substitute* "build/config/clang/BUILD.gn"
+		  (("\\$clang_base_path/lib/clang/\\$clang_version")
+		   compiler-rt-path))
 
                 (substitute* "third_party/pdfium/BUILD.gn"
                   ;; This include path is added by Debians openjpeg patch.
@@ -733,7 +710,7 @@
                    "include \"curl"))
 
                 ;; Unknown flags as of clang-19, can be removed when building with
-                ;; newer clang.
+		;; newer clang.
                 (substitute* "build/config/compiler/BUILD.gn"
                   (("-gsimple-template-names") ""))
 
@@ -791,7 +768,7 @@
                         (string-append " -stdlib=libc++"
                                        " -Wl,--stats"))
                 (setenv "CLANG_MVERS" #$(version-major
-                                         (package-version clang-21)))
+					 (package-version clang-19)))
                 (setenv "RUSTC_BOOTSTRAP" "1")
 
                 ;; TODO: pre-compile instead. Avoids a race condition.
@@ -898,6 +875,10 @@
                   (symlink "../lib/chromium" exe)
                   (install-file "chromedriver" bin)
 
+                  (for-each (lambda (so)
+                              (install-file so (string-append lib "/swiftshader")))
+                            (find-files "swiftshader" "\\.so$"))
+
                   (wrap-program exe
                     ;; Avoid file manager crash.  See <https://bugs.gnu.org/26593>.
                     `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk "/share")))
@@ -919,13 +900,13 @@
                    '("24" "48" "64" "128" "256")))))))))
     (native-inputs
      (list bison
-           clang-21
-           clang-runtime-21
-           clang-toolchain-21
+           clang-19
+           clang-runtime-19
+           clang-toolchain-19
            gn
            gperf
-           lld-as-ld-wrapper-21
-           llvm-21
+           lld-as-ld-wrapper-19
+           llvm-19
            ninja
            node-lts
            pkg-config

gnu/packages/cinnamon.scm

@@ -159,7 +159,7 @@ cross-DE solutions.")
            python-setproctitle
            python-setuptools
            python-unidecode
-           python-xdg-base-dirs
+           python-xdg
            python-xlib))
     (home-page "https://github.com/linuxmint/python3-xapp")
     (synopsis "Python 3 XApp library")

gnu/packages/cmake.scm

@@ -386,7 +386,7 @@ and workspaces that can be used in the compiler environment of your choice.")
                 "125yhgkmh5ap14w9yyh442manbb7k96dws4pa3hz32qp7njpjn3n"))))
     (outputs '("out" "doc"))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments cmake-minimal)
        ;; Use cmake-minimal this time.
        ((#:cmake _ #f)
         (if (%current-target-system)
@@ -419,14 +419,14 @@ and workspaces that can be used in the compiler environment of your choice.")
                                     (string-append #$output:doc html))
                   (delete-file-recursively (string-append #$output html)))))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs cmake-minimal)
        (prepend ncurses)                ;required for ccmake
        ;; Avoid circular dependency with (gnu packages debug).
        (prepend (module-ref (resolve-interface '(gnu packages debug))
                             'cppdap))))
     ;; Extra inputs required to build the documentation.
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs cmake-minimal)
        (append python-sphinx
                texinfo)))))
 

gnu/packages/codex.scm

@@ -1,411 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2026 Danny Milosavljevic <dannym@friendly-machines.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/>.
-
-;;; This module is separate from (gnu packages rust-apps) to avoid a
-;;; circular module dependency: (gnu packages rust-sources), which
-;;; defines rust-codex-0.98.0, transitively loads (gnu packages
-;;; rust-apps) through its #:use-module chain.  If the codex package
-;;; lived in rust-apps.scm, loading rust-sources would trigger loading
-;;; rust-apps before rust-codex-0.98.0 is defined, causing an unbound
-;;; variable error.
-
-(define-module (gnu packages codex)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system cargo)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages libunwind)
-  #:use-module (gnu packages llvm)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages rust-sources)
-  #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages version-control))
-
-(define-public codex
-  (package
-    (name "codex")
-    (version (package-version rust-codex-0.98.0))
-    (source
-     (origin
-       (inherit (package-source rust-codex-0.98.0))
-       (patches (search-patches
-                 "codex-0.98.0-remove-patch-sections.patch"
-                 "rust-codex-0.98.0-test-shebangs.patch"
-                 "rust-codex-0.98.0-test-timeout.patch"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:cargo-install-paths '(list "cli" "exec" "exec-server"
-                                   "linux-sandbox" "mcp-server" "network-proxy"
-                                   "app-server" "tui")
-      ;; schema_fixtures_match_generated (upstream fixture is stale:
-      ;; FileChange::Update in codex-protocol gained old_content,
-      ;; new_content, move_path fields but the committed JSON schema
-      ;; fixture was not regenerated).
-      #:cargo-test-flags '(list "--workspace"
-                                "--exclude" "codex-app-server-protocol"
-                                "--"
-                                ;; These tests exercise sandbox denial and
-                                ;; escalation, which requires Landlock to
-                                ;; cleanly deny filesystem access.  Inside the
-                                ;; build container Landlock returns NotEnforced
-                                ;; and the sandbox binary panics instead.
-                                ;; Disabling Landlock would not help either,
-                                ;; since these tests need a working sandbox to
-                                ;; have anything to deny and escalate.
-                                "--skip" "sandbox_denied_shell_returns_original_output"
-                                "--skip" "shell_escalated_permissions_rejected_then_ok"
-                                "--skip" "unified_exec_runs_under_sandbox"
-                                ;; These tests (in codex-exec) directly call
-                                ;; spawn_command_under_linux_sandbox to verify
-                                ;; that python and bash work correctly inside
-                                ;; the Landlock sandbox.  The sandbox binary
-                                ;; (codex-exec) panics with LandlockRestrict
-                                ;; (exit code 101) before the inner command
-                                ;; even starts.
-                                "--skip" "python_getpwuid_works_under_sandbox"
-                                "--skip" "python_multiprocessing_lock_works_under_sandbox"
-                                "--skip" "sandbox_distinguishes_command_and_policy_cwds"
-                                ;; These linux-sandbox tests directly invoke
-                                ;; the Landlock sandbox via
-                                ;; process_exec_tool_call; same root cause.
-                                "--skip" "test_writable_root"
-                                "--skip" "test_timeout"
-                                "--skip" "test_root_read"
-                                "--skip" "test_dev_null_write"
-                                "--skip" "test_no_new_privs_is_enabled"
-                                ;; This test iterates many approval scenarios;
-                                ;; one of them
-                                ;; (danger_full_access_on_request_allows_network)
-                                ;; runs a command through the Landlock sandbox
-                                ;; binary, which panics with LandlockRestrict
-                                ;; inside the build container.  Cargo --skip
-                                ;; cannot target individual scenarios, so we
-                                ;; skip the entire matrix.
-                                "--skip" "approval_matrix_covers_all_modes"
-                                ;; This test verifies session-level patch
-                                ;; approval caching: approve once, skip
-                                ;; future prompts for the same file.  When
-                                ;; Landlock is unavailable (as in the Guix
-                                ;; build container) the sandbox binary panics,
-                                ;; triggering the escalation-retry path, which
-                                ;; interferes with the approval cache and
-                                ;; causes a spurious re-prompt on the second
-                                ;; patch.
-                                "--skip" "approving_apply_patch_for_session_skips_future_prompts_for_same_file"
-                                ;; These tests expect to interrupt a
-                                ;; long-running 'sleep 60' and receive
-                                ;; TurnAborted.  Default test config is
-                                ;; OnRequest + ReadOnly.  What happens:
-                                ;;
-                                ;; 1. ReadOnly wraps the command with
-                                ;;    codex-linux-sandbox (Landlock-based).
-                                ;; 2. Landlock is unavailable in the Guix
-                                ;;    build container, so the sandbox
-                                ;;    binary exits instantly (~1 ms).
-                                ;; 3. Orchestrator gets SandboxErr::Denied.
-                                ;;    wants_no_sandbox_approval(OnRequest)
-                                ;;    returns false (sandboxing.rs:222),
-                                ;;    so no escalation -- denial returned
-                                ;;    directly.
-                                ;; 4. ToolEmitter::finish sends the error
-                                ;;    to the mock model as
-                                ;;    function_call_output.
-                                ;; 5. Second mock SSE response fires,
-                                ;;    turn finishes with TurnComplete.
-                                ;; 6. Op::Interrupt arrives 100 ms later,
-                                ;;    but the turn is already done --
-                                ;;    TurnAborted is never emitted,
-                                ;;    test times out.
-                                ;;
-                                ;; The similar interrupt_long_running_tool_
-                                ;; emits_turn_aborted passes because it
-                                ;; sends the interrupt with no delay and
-                                ;; has only one mock response (so the turn
-                                ;; cannot complete first).
-                                "--skip" "interrupt_persists_turn_aborted_marker_in_next_request"
-                                "--skip" "interrupt_tool_records_history_entries"
-                                ;; Upstream bug: test hardcodes "0.0.0" in the
-                                ;; expected user-agent string but the workspace
-                                ;; version is "0.98.0".
-                                "--skip" "get_user_agent_returns_current_codex_user_agent"
-                                ;; Same upstream bug: mcp-server tests
-                                ;; check the initialize response which
-                                ;; includes "version": "0.0.0" but the
-                                ;; server returns "0.98.0".
-                                "--skip" "test_codex_tool_passes_base_instructions"
-                                "--skip" "test_shell_command_approval_triggers_elicitation"
-                                "--skip" "test_patch_approval_triggers_elicitation"
-                                ;; These codex-exec-server tests need
-                                ;; "dotslash", a Meta tool that lazily
-                                ;; downloads pre-built binaries from a
-                                ;; JSON manifest.  The test helper
-                                ;; create_transport runs
-                                ;; `dotslash -- fetch <path>` to obtain a
-                                ;; custom bash binary described in
-                                ;; exec-server/tests/suite/bash.
-                                ;; dotslash is not available in the build
-                                ;; container.
-                                "--skip" "list_tools"
-                                "--skip" "accept_elicitation_for_prompt_rule"
-                                ;;; Test isolation bug: each test in
-                                ;;; state/src/runtime.rs calls
-                                ;;; unique_temp_dir() to get its own
-                                ;;; temporary directory (and thus its
-                                ;;; own SQLite database).  That function
-                                ;;; names directories using the current
-                                ;;; nanosecond timestamp, so when tests
-                                ;;; run in parallel several can receive
-                                ;;; the same name and open the same
-                                ;;; database.  The initial SQLite
-                                ;;; migration runs CREATE TABLE threads
-                                ;;; (without IF NOT EXISTS), so any init
-                                ;;; after the first panics with "table
-                                ;;; threads already exists".  Any of
-                                ;;; these tests
-                                ;;; can be the victim.
-                                "--skip" "init_removes_legacy_state_db_files"
-                                "--skip" "upsert_and_get_thread_memory"
-                                "--skip" "get_last_n_thread_memories_for_cwd_matches_exactly"
-                                "--skip" "upsert_thread_memory_errors_for_unknown_thread"
-                                "--skip" "get_last_n_thread_memories_for_cwd_zero_returns_empty"
-                                "--skip" "get_last_n_thread_memories_for_cwd_does_not_prefix_match"
-                                "--skip" "deleting_thread_cascades_thread_memory")
-      #:cargo-package-crates
-      ''(;;; Tier 0: No internal deps.
-         "codex-async-utils"
-         "codex-client"
-         "codex-execpolicy"
-         "codex-file-search"
-         "codex-git"
-         "codex-keyring-store"
-         "codex-utils-absolute-path"
-         "codex-utils-cache"
-         "codex-utils-cargo-bin"
-         "codex-utils-home-dir"
-         "codex-utils-json-to-toml"
-         "codex-utils-pty"
-         "codex-utils-readiness"
-         "codex-utils-string"
-         "codex-backend-openapi-models"
-         "codex-process-hardening"
-         "codex-ansi-escape"
-         ;;; Tier 1: Depends on tier 0.
-         "codex-utils-image"
-         "codex-apply-patch"
-         "codex-protocol"
-         "codex-windows-sandbox"
-         "codex-api"
-         "codex-experimental-api-macros"
-         "codex-secrets"
-         "codex-execpolicy-legacy"
-         "codex-debug-client"
-         ;;; Tier 2.
-         "codex-app-server-protocol"
-         "codex-rmcp-client"
-         "codex-otel"
-         "codex-state"
-         "codex-core"
-         "codex-linux-sandbox"
-         "codex-feedback"
-         ;;; Tier 3.
-         "codex-arg0"
-         "codex-lmstudio"
-         "codex-login"
-         "codex-ollama"
-         "codex-common"
-         "codex-mcp-server"
-         "codex-backend-client"
-         "codex-responses-api-proxy"
-         ;;; Tier 4.
-         "codex-cloud-requirements"
-         "codex-exec"
-         "codex-exec-server"
-         "codex-stdio-to-uds"
-         "codex-network-proxy"
-         "codex-chatgpt"
-         "codex-cloud-tasks-client"
-         ;;; Tier 5.
-         "codex-app-server"
-         "codex-app-server-test-client"
-         "codex-tui"
-         ;;; Tier 6.
-         "codex-cloud-tasks"
-         ;; The main executable.
-         "codex-cli")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir-to-workspace
-            (lambda _
-              (chdir "codex-rs")))
-          (add-after 'chdir-to-workspace 'update-version-in-snapshots
-            (lambda _
-              ;; Snapshot test files contain hardcoded v0.0.0 version strings.
-              ;; Update them to match the actual package version.
-              (let ((snap-files (find-files "." "\\.snap$")))
-                (substitute* snap-files
-                  (("\\(v0\\.0\\.0\\) ") "(v0.98.0)")))))
-          (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
-            (lambda _
-              ;; Replace git dependencies with version references so cargo
-              ;; resolves them from the vendored sources.
-              (substitute* "Cargo.toml"
-                (("nucleo = \\{ git = [^}]+\\}")
-                 "nucleo = \"0.5.0\"")
-                (("runfiles = \\{ git = [^}]+\\}")
-                 "runfiles = \"0.1.0\""))))
-          (add-after 'chdir-to-workspace 'add-version-to-workspace-deps
-            (lambda _
-              ;; cargo package requires all dependencies to have versions.
-              ;; cargo package requires all dependencies to have versions.
-              ;; Add version = "0.98.0" to internal path dependencies.
-              (let ((cargo-files (find-files "." "^Cargo\\.toml$")))
-                (substitute* cargo-files
-                  ;; Handle inline deps: name = { path = "..." }
-                  (("(codex-[a-z0-9-]+) = \\{ path = " all name)
-                   (string-append name " = { version = \"0.98.0\", path = "))
-                  ;; Handle inline deps with package: name = { package = "...", path = "..." }
-                  (("(codex-[a-z0-9-]+) = \\{ package = " all name)
-                   (string-append name " = { version = \"0.98.0\", package = "))
-                  ;; Handle section deps: [dependencies.X] with path = "..."
-                  (("^(path = \"\\.\\./[^\"]*\")" all path-line)
-                   (string-append path-line "\nversion = \"0.98.0\""))))))
-          (add-after 'chdir-to-workspace 'patch-hardcoded-paths
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((bash-bin (string-append
-                               (assoc-ref inputs "bash-minimal") "/bin"))
-                    (coreutils-bin (string-append
-                                    (assoc-ref inputs "coreutils") "/bin"))
-                    (git-bin (string-append
-                               (assoc-ref inputs "git-minimal") "/bin"))
-                    (sed-bin (string-append
-                               (assoc-ref inputs "sed") "/bin"))
-                    ;; Include .policy files: the execpolicy-legacy
-                    ;; crate embeds default.policy via include_str!
-                    ;; at compile time, so its paths must also be
-                    ;; patched.
-                    (rs-files (find-files "." "\\.(rs|policy)$")))
-                (substitute* rs-files
-                  (("\"/bin/bash\"")
-                   (string-append "\"" bash-bin "/bash\""))
-                  (("\"/bin/sh\"")
-                   (string-append "\"" bash-bin "/sh\""))
-                  (("\"/usr/bin/bash\"")
-                   (string-append "\"" bash-bin "/bash\""))
-                  (("\"/usr/bin/sh\"")
-                   (string-append "\"" bash-bin "/sh\""))
-                  ;;; bash/sh with inline arguments, e.g. "/bin/bash -i".
-                  (("\"/bin/bash ")
-                   (string-append "\"" bash-bin "/bash "))
-                  (("\"/bin/sh ")
-                   (string-append "\"" bash-bin "/sh "))
-                  ;; coreutils.
-                  (("\"/bin/(cat|cp|date|echo|head|ls|rm|sleep|true|touch)\"" all cmd)
-                   (string-append "\"" coreutils-bin "/" cmd "\""))
-                  ;; coreutils.
-                  (("\"/usr/bin/(cat|cp|head|ls|touch|true)\"" all cmd)
-                   (string-append "\"" coreutils-bin "/" cmd "\""))
-                  ;; coreutils with inline arguments
-                  ;; like "/bin/echo END-EVENT".
-                  (("\"/bin/(cat|cp|date|echo|head|ls|rm|sleep|true|touch) " all cmd)
-                   (string-append "\"" coreutils-bin "/" cmd " "))
-                  (("\"/usr/bin/git\"")
-                   (string-append "\"" git-bin "/git\""))
-                  (("\"/usr/bin/sed\"")
-                   (string-append "\"" sed-bin "/sed\"")))
-                ;; @SHELL@ placeholder from test-shebangs patch
-                (substitute*
-                  (list "rmcp-client/src/program_resolver.rs"
-                        "tui/src/external_editor.rs")
-                  (("@SHELL@")
-                   (string-append bash-bin "/sh")))
-                ;; shebang in test-only file
-                (substitute*
-                  "core/tests/suite/user_notification.rs"
-                  (("#!/bin/bash")
-                   (string-append "#!" bash-bin "/bash"))))))
-          (add-before 'check 'set-home
-            (lambda _
-              (setenv "HOME" "/tmp")
-              (setenv "USER" "nixbld"))))))
-    (native-inputs (list clang              ;bindgen uses libclang to parse BoringSSL's C headers
-                         cmake-minimal    ;BoringSSL is compiled from C source
-                         libunwind        ;BoringSSL tests verify stack unwinding in assembly
-                         perl python-minimal ;for tests
-                         pkg-config))
-    (inputs (cons* bash-minimal coreutils git-minimal sed
-                   openssl sqlite `(,zstd "lib")
-                   (cargo-inputs 'codex)))
-    (home-page "https://github.com/openai/codex")
-    (synopsis "AI-assisted coding CLI and TUI")
-    (description
-     "Codex is an AI-powered coding assistant that runs in the terminal.
-It provides an interactive TUI for conversations with AI models, with
-support for shell command execution, file editing, and code generation.
-Configure providers via @file{~/.codex/config.toml}.")
-    (license license:asl2.0)))
-
-(define-public codex-acp
-  (package
-    (name "codex-acp")
-    (version "0.9.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/zed-industries/codex-acp")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "190sq6s6jfz8dkj1y8305r7x6ln86qqr2j1bnfjci7f1x2wyzmsj"))
-       (patches (search-patches "codex-acp-0.9.2-remove-patch-sections.patch"
-                                "codex-acp-0.9.2-replace-result-flatten.patch"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-codex-deps
-            (lambda _
-              ;; Rewrite git dependencies to use vendored sources from rust-codex
-              (substitute* "Cargo.toml"
-                (("git = \"https://github.com/zed-industries/codex\", branch = \"acp\"")
-                 "version = \"0.0.0\"")))))))
-    (native-inputs (list pkg-config))
-    (inputs (cons* openssl sqlite `(,zstd "lib") (cargo-inputs 'codex-acp)))
-    (home-page "https://github.com/zed-industries/codex-acp")
-    (synopsis "ACP-compatible agent bridging Zed Codex with ACP clients")
-    (description
-     "This package provides an Agent Client Protocol (ACP) compatible agent
-that bridges the Zed Codex runtime with ACP clients over stdio.  It
-supports multiple LLM providers through configuration in
-@file{~/.codex/config.toml} and integrates with MCP servers for filesystem
-operations.")
-    (license license:asl2.0)))

gnu/packages/commencement.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
@@ -1185,7 +1185,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                      ("kernel-headers" ,%bootstrap-linux-libre-headers)
                      ,@(%boot-mesboot-core-inputs)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc-core-mesboot0)
        ((#:phases phases)
         #~(modify-phases #$phases
             (replace 'setenv
@@ -1231,7 +1231,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (name "binutils-mesboot1")
     (native-inputs (%boot-mesboot0-inputs))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments binutils-mesboot0)
        ((#:configure-flags configure-flags)
         #~(let ((out (assoc-ref %outputs "out")))
             `("--disable-nls" "--disable-shared"
@@ -1441,7 +1441,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
              "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9"))))
        ,@(package-native-inputs gcc-core-mesboot1)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc-core-mesboot1)
        ((#:configure-flags configure-flags)
         #~(let ((out (assoc-ref %outputs "out")))
             `("--enable-languages=c,c++"
@@ -1572,7 +1572,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (native-inputs `(("headers" ,mesboot-headers)
                      ,@(%boot-mesboot3-inputs)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments glibc-mesboot0)
        ((#:configure-flags configure-flags)
         #~(let ((out (assoc-ref %outputs "out"))
                 (headers (assoc-ref %build-inputs "headers")))
@@ -1671,7 +1671,7 @@ SHELL := " shell "
                      ,@(%boot-mesboot3-inputs)))
     (arguments
      `(#:validate-runpath? #f ; fails when using --enable-shared
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot)
            ((#:make-flags make-flags)
             #~(let ((bash (assoc-ref %build-inputs "bash")))
                 (list (string-append "SHELL=" bash "/bin/sh"))))
@@ -1768,7 +1768,7 @@ exec " gcc "/bin/" program
                      ,@(%boot-mesboot4-inputs)))
     (arguments
      `(#:validate-runpath? #f
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments gcc-mesboot1)
            ((#:configure-flags configure-flags)
             #~(let ((out (assoc-ref %outputs "out"))
                     (glibc (assoc-ref %build-inputs "libc")))
@@ -1954,7 +1954,7 @@ exec " gcc "/bin/" program
        `(("xz" ,xz-mesboot)
          ("sed" ,sed-mesboot)
          ,@(package-native-inputs pkg)))
-      (arguments (substitute-keyword-arguments arguments
+      (arguments (substitute-keyword-arguments (package-arguments pkg)
                    ((#:configure-flags flags ''())
                     `(cons "--disable-year2038" ,flags)))))))
 
@@ -1987,7 +1987,7 @@ exec " gcc "/bin/" program
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
        #:tests? #f                                ; cannot run "make check"
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments gnu-make)
            ((#:configure-flags flags ''())
             ;; The generated config.status has some problems due to the
             ;; bootstrap environment.  Disable dependency tracking to work
@@ -2090,7 +2090,7 @@ exec " gcc "/bin/" program
        #:guile ,%bootstrap-guile
        ;; The build system assumes we have done a mistake when time_t is 32-bit
        ;; on a 64-bit system.  Ignore that for our bootstrap toolchain.
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments findutils)
            ((#:configure-flags flags ''())
             `(append
                ;; TODO: Figure out exactly with architectures need this.
@@ -2275,7 +2275,7 @@ exec " gcc "/bin/" program
                                                     (remove-triplet-prefix name)))
                                          (scandir "."
                                                   has-triplet-prefix?))))))))
-             (substitute-keyword-arguments arguments
+             (substitute-keyword-arguments (package-arguments binutils)
                ((#:configure-flags cf)
                 #~(append (list #$(string-append "--target="
                                                  (boot-triplet))
@@ -2303,7 +2303,7 @@ exec " gcc "/bin/" program
 
          ,@(match (%current-system)
              ((or "i686-linux" "x86_64-linux")
-              (substitute-keyword-arguments arguments
+              (substitute-keyword-arguments (package-arguments lib)
                 ((#:phases phases)
                  #~(modify-phases #$phases
                      (add-after 'unpack 'workaround-wrapper-bug
@@ -2336,7 +2336,7 @@ exec " gcc "/bin/" program
          ;; XXX: libstdc++.so NEEDs ld.so for some reason.
          #:validate-runpath? #f
 
-         ,@(substitute-keyword-arguments arguments
+         ,@(substitute-keyword-arguments (package-arguments lib)
              ((#:configure-flags flags)
               (if (target-hurd64?)
                   #~(cons* "--disable-shared"
@@ -2405,7 +2405,7 @@ exec " gcc "/bin/" program
                   (ice-9 regex)
                   (srfi srfi-1)
                   (srfi srfi-26))
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments gcc)
         ((#:configure-flags flags)
          #~(append (list #$(string-append "--target=" (boot-triplet))
 
@@ -2557,7 +2557,7 @@ exec " gcc "/bin/" program
 
                    ;; At the very least, this must not depend on GCC & co.
                    #:disallowed-references (list %bootstrap-binutils))
-             (substitute-keyword-arguments arguments
+             (substitute-keyword-arguments (package-arguments perl)
                ((#:phases phases)
                 #~(modify-phases #$phases
                     ;; Pthread support is missing in the bootstrap compiler
@@ -2672,7 +2672,7 @@ memoized as a function of '%current-system'."
     (arguments
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments linux-libre-headers)
            ((#:phases phases)
             `(modify-phases ,phases
                (add-after 'unpack 'lower-version-requirements
@@ -2762,7 +2762,7 @@ memoized as a function of '%current-system'."
                             gnumach-headers-boot0))
        (inputs (list flex-boot0 gnumach-headers-boot0))
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments mig)
           ((#:configure-flags flags '())
            #~(list (string-append "LDFLAGS=-Wl,-rpath="
                                   #$(this-package-native-input "flex")
@@ -2852,7 +2852,7 @@ memoized as a function of '%current-system'."
      `(#:implicit-inputs? #f
        #:guile ,%bootstrap-guile
 
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments expat)
            ((#:configure-flags flags ''())
             ;; Since we're not passing the right -Wl,-rpath flags, build the
             ;; static library to avoid RUNPATH validation failure.
@@ -2986,7 +2986,7 @@ memoized as a function of '%current-system'."
        `(#:guile ,%bootstrap-guile
          #:implicit-inputs? #f
 
-         ,@(substitute-keyword-arguments arguments
+         ,@(substitute-keyword-arguments (package-arguments libc)
              ((#:configure-flags flags)
               `(append (list ,(string-append "--host=" (boot-triplet))
                              ,(string-append "--build="
@@ -3104,7 +3104,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
      `(#:implicit-inputs? #f
        #:guile ,%bootstrap-guile
 
-       ,@(substitute-keyword-arguments arguments
+       ,@(substitute-keyword-arguments (package-arguments static-bash)
            ((#:configure-flags flags #~'())
             ;; Add a '-L' flag so that the pseudo-cross-ld of
             ;; BINUTILS-BOOT0 can find libc.a.
@@ -3236,7 +3236,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                                           ,@(if (target-powerpc? (%current-system))
                                                 (list static-bash-for-glibc)
                                                 '())))
-             (substitute-keyword-arguments arguments
+             (substitute-keyword-arguments (package-arguments binutils)
                ((#:configure-flags flags #~'())
                 ;; For gprofng, tell the build system where to look for libstdc++.
                 #~(append #$flags
@@ -3301,7 +3301,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
                   (srfi srfi-26)
                   ,@%default-gnu-modules)
 
-      ;; TODO: Consider writing 'arguments' instead of (package-arguments gcc).
       (substitute-keyword-arguments (package-arguments gcc)
         ((#:make-flags flags)
          ;; Since $LIBRARY_PATH is not honored, add the relevant flags.
@@ -3428,10 +3427,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
     (package
       (inherit parent)
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs parent)
          (delete "libxcrypt")))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments parent)
          ((#:phases phases #~%standard-phases)
           #~(modify-phases #$phases
               (delete 'add-libxcrypt-reference-pkgconfig))))))))

gnu/packages/compression.scm

@@ -923,7 +923,7 @@ C, forked from the zip manipulation library found in the zlib distribution.")
   (package/inherit minizip-ng
     (name "minizip-ng-compat")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments minizip-ng)
        ((#:configure-flags flags)
         #~(delete "-DMZ_COMPAT=OFF" #$flags))))))
 
@@ -3148,7 +3148,7 @@ exported by the zlib library.")
                 "0672q35vjrpakmsr1gwj9k5fwv5ihzhahm19bq4y74wqpn91p7fw"))
               (patches (search-patches "miniz-for-pytorch.patch"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments miniz)
        ((#:configure-flags flags '())
         ;; The changes break the examples.
         `(cons "-DBUILD_EXAMPLES=OFF" ,flags))))

gnu/packages/containers.scm

@@ -5,7 +5,7 @@
 ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2023 Zongyuan Li <zongyuan.li@c0x0o.me>
 ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2024, 2025, 2026 Tomas Volf <~@wolfsden.cz>
+;;; Copyright © 2024, 2025 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
 ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
 ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz>
@@ -197,55 +197,42 @@ Container Runtime fully written in C.")
 (define-public conmon
   (package
     (name "conmon")
-    (version "2.2.1")
+    (version "2.1.13")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/containers/conmon")
-              (commit (string-append "v" version))))
+             (url "https://github.com/containers/conmon")
+             (commit (string-append "v" version))))
        (sha256
-        (base32 "0n9l6030ibhk7pmsq85rarcf9b0kzglxibd1xnb6vzmkz3ywg1il"))
+        (base32 "0fiixv9h5dycrixs7s3bq81d06p7qs8491mskxj42wqlkdq5diay"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags
            #~(list (string-append "CC=" #$(cc-for-target))
                    (string-append "PREFIX=" #$output))
+           ;; XXX: uses `go get` to download 50 packages, runs a ginkgo test suite
+           ;; then tries to download busybox and use a systemd logging library
+           ;; see also https://github.com/containers/conmon/blob/main/nix/derivation.nix
+           #:tests? #f
            #:test-target "test"
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
-               (add-before 'check 'prepare-tests
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (setenv "RUNTIME_BINARY"
-                           (search-input-file inputs "sbin/runc"))
-
-                   ;; We need to skip all tests requiring journald.
-                   (for-each
-                    (lambda (test file)
-                      (substitute* file
-                        (((string-append "@test \"" test "\" \\{\n$") all)
-                         (string-append all "skip 'no journald in Guix';"))))
-                    '("log driver as journald should pass"
-                      "log driver as journald with short cid should fail"
-                      "multiple log drivers should pass"
-                      "log management: should work with multiple log drivers")
-                    '("test/01-basic.bats"
-                      "test/01-basic.bats"
-                      "test/01-basic.bats"
-                      "test/06-log-management.bats")))))))
+               (add-after 'unpack 'set-env
+                 (lambda _
+                   ;; when running go, things fail because
+                   ;; HOME=/homeless-shelter.
+                   (setenv "HOME" "/tmp"))))))
     (inputs
      (list crun
            glib
            libseccomp))
     (native-inputs
-     (list bats
-           git
-           go-md2man
-           pkg-config
-           socat
-           runc))
+     (list git
+           go
+           pkg-config))
     (home-page "https://github.com/containers/conmon")
     (synopsis "Monitoring tool for Open Container Initiative (OCI) runtime")
     (description
@@ -885,7 +872,7 @@ being rootless and not requiring any daemon to be running.")
 (define-public buildah
   (package
     (name "buildah")
-    (version "1.43.0")
+    (version "1.42.1")
     (source
      (origin
        (method git-fetch)
@@ -893,7 +880,7 @@ being rootless and not requiring any daemon to be running.")
              (url "https://github.com/containers/buildah")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0pwdd0mxhxy530c2sbsz0rnnb1jyl41rvnqn9ywfgb6lz5f4ja2a"))
+        (base32 "1agblw09yw4pc81c2nsjy3j83gznn4micyjyrgpqxlmp93w5w5h0"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments

gnu/packages/cpp.scm

@@ -307,7 +307,7 @@ navigation, and handling of incoming packets.")
 (define-public castxml
 (package
   (name "castxml")
-  (version "0.7.0")
+  (version "0.6.4")
   (source (origin
             (method git-fetch)
             (uri
@@ -316,7 +316,7 @@ navigation, and handling of incoming packets.")
               (commit (string-append "v" version))))
             (file-name (git-file-name name version))
             (sha256
-             (base32 "03l9nyd871c5gk5cdp8fbgyszps5989rhw12wap8dgmr6s6jv3rj"))))
+             (base32 "0l5ys9zmllfgwhjrm897akbsf38iswfcarhxg27xfhiy0bmzcwsg"))))
   (build-system cmake-build-system)
   (arguments
    (list
@@ -327,7 +327,7 @@ navigation, and handling of incoming packets.")
                       #$(version-major
                          (package-version (this-package-native-input "clang")))))))
   (inputs (list libffi))
-  (native-inputs (list clang-21 llvm-21))
+  (native-inputs (list clang-17 llvm-17))
   (home-page "https://github.com/CastXML/CastXML")
   (synopsis "C-family abstract syntax tree XML output")
   (description "CastXML is a C-family abstract syntax tree XML output tool.
@@ -2290,7 +2290,7 @@ Google's C++ code base.")
                 (patches
                  (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:configure-flags flags #~'())
           (if (target-riscv64?)
               #~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic"
@@ -2312,7 +2312,7 @@ Google's C++ code base.")
                                       "absl_symbolize_test|absl_log_format_test")))))
                      #~())))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs base)
          (replace "googletest" googletest))))))
 
 (define-public abseil-cpp-20250127
@@ -2337,7 +2337,7 @@ Google's C++ code base.")
   (hidden-package
    (package/inherit base
      (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments base)
         ((#:configure-flags flags)
          #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD="
                                    (number->string version))
@@ -2348,7 +2348,7 @@ Google's C++ code base.")
     (hidden-package
      (package/inherit base
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:configure-flags flags)
            #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
                     (delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))))
@@ -3172,11 +3172,12 @@ from C++.")
     (arguments
      `(#:configure-flags (list "--disable-static"
                                ;;"--with-external-boost"
-                               "--with-external-expat")
-       #:make-flags (list "CXXFLAGS=-std=c++11 -O2 -g")))
+                               "--with-external-expat")))
     (inputs
      (list ;;("boost ,boost)
            expat))
+    (native-inputs
+     (list gcc-10)) ;does not build with gcc-12
     (home-page "https://www.codesynthesis.com/projects/libcutl/")
     (synopsis "C++ utility library with generic and independent components")
     (description "libcutl is a C++ utility library.  It contains a collection
@@ -3207,8 +3208,7 @@ pointers, containers, compiler building blocks, etc.")
                   (guix build utils))
        #:make-flags (list (string-append "--include-dir="
                                          (assoc-ref %build-inputs "build")
-                                         "/include/")
-                          "cxx_options=-std=c++11 -O2 -g")
+                                         "/include/"))
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
@@ -3222,7 +3222,7 @@ pointers, containers, compiler building blocks, etc.")
                        #:include-regexp ("\\.so$")))
                     args))))))
     (native-inputs
-     (list build))
+     (list build gcc-10))
     (inputs
      `(("libcutl" ,libcutl)
        ("libxerces-c" ,xerces-c)))
@@ -3252,8 +3252,7 @@ and a traversal mechanism.")
                                          (assoc-ref %build-inputs "build")
                                          "/include")
                           (string-append "install_prefix="
-                                         (assoc-ref %outputs "out"))
-                          "cxx_options=-std=c++11 -O2 -g")
+                                         (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch
@@ -3271,7 +3270,7 @@ and a traversal mechanism.")
                 (string-append "edge_dispatcher::" all)))))
          (delete 'configure))))
     (native-inputs
-     (list build))
+     (list build gcc-10))
     (inputs
      (list libcutl))
     (synopsis "C++ Command Line Interface (CLI) definition language")
@@ -3303,8 +3302,7 @@ documentation.")
                                          (assoc-ref %build-inputs "build")
                                          "/include/")
                           (string-append "install_prefix="
-                                         (assoc-ref %outputs "out"))
-                          "cxx_options=-std=c++11 -O2 -g")
+                                         (assoc-ref %outputs "out")))
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'move-doc
                     (lambda* (#:key outputs #:allow-other-keys)
@@ -3316,7 +3314,7 @@ documentation.")
                                                     ,version)))))
                   (delete 'configure))))
     (native-inputs
-     (list build cli))
+     (list build cli gcc-10))
     (inputs
      (list libcutl libnsl libxsd-frontend))
     (propagated-inputs
@@ -3383,7 +3381,7 @@ syntax with variables, conditions, functions and more.")
     (build-system pyproject-build-system)
     (arguments
      (list #:test-flags #~(list "--ignore=case_studies/")))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs jsonnet)
                      (append python-pyyaml python-pytest python-setuptools)))
     (synopsis "Python bindings for Jsonnet, the data templating language")
     (description "This package provides a Python library named @code{_jsonnet}
@@ -3812,7 +3810,7 @@ parsing with only a single memory allocation.")
                          "sajson-for-gemmi-numbers-as-strings.patch")
                         (origin-patches (package-source sajson))))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments sajson)
        ;; This is a modified version used in gemmi, in which numbers are kept
        ;; as strings. Building the tests fails with the modification.
        ((#:tests? _ #f) #f)))
@@ -4061,7 +4059,7 @@ common controls and win32-style extensions.")
     (inherit swell)
     (name "swell-colortheme")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments swell)
        ((#:make-flags flags)
         #~(append #$flags '("libSwell.colortheme")))
        ((#:phases phases)
@@ -4085,7 +4083,7 @@ programs that use @code{swell}.")))
     (inherit swell)
     (name "jnetlib")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments swell)
        ((#:tests? _ #t) #t)
        ((#:phases phases)
         #~(modify-phases #$phases
@@ -4118,7 +4116,7 @@ features:
     (inherit swell)
     (name "eel2")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments swell)
        ((#:tests? _ #t) #f) ;no tests
        ;; FIXME: Remove this flag when this issue will be fixed:
        ;; https://github.com/justinfrankel/WDL/issues/32.
@@ -4187,7 +4185,7 @@ features:
            ladspa
            libx11
            pkg-config
-           webkitgtk-for-gtk3))
+           webkitgtk-with-libsoup2))
     (inputs (list fontconfig freetype libjpeg-turbo libpng))
     (home-page "https://juce.com")
     (synopsis "C++ application framework for audio plugins and plugin hosts")
@@ -4677,7 +4675,7 @@ on @code{.po} files and doesn't need @code{.mo} files pre-generated.")
 (define-public tinygettext-with-sdl2
   (package/inherit tinygettext
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments tinygettext)
        ((#:configure-flags flags)
         #~(list "-DTINYGETTEXT_WITH_SDL=ON" "-DBUILD_TESTS=ON"))))
     (native-inputs (list pkg-config tinycmmc))

gnu/packages/cross-base.scm

@@ -79,7 +79,7 @@
   (package (inherit p)
     (name (string-append (package-name p) "-cross-" target))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments p)
        ((#:configure-flags flags #~'())
         #~(cons #$(string-append "--target=" target)
                 #$flags))))))
@@ -438,7 +438,7 @@ target that libc."
     (name (string-append (package-name gnumach-headers)
                          "-cross-" target))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gnumach-headers)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             ;; Cheat by setting the host_cpu variable manually, since using
@@ -457,7 +457,7 @@ target that libc."
                          "x86_64")))))))))))
     (supported-systems %supported-systems)
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs gnumach-headers)
        (prepend xgcc xbinutils)))))
 
 (define* (cross-mig target
@@ -474,7 +474,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
     (inherit mig)
     (name (string-append "mig-cross"))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments mig)
        ((#:configure-flags flags #~'())
         #~(list #$(string-append "--target=" target)))
        ((#:tests? _ #f)
@@ -490,10 +490,10 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                             '#$%gcc-cross-include-paths))))))))
     (propagated-inputs
      (list xgnumach-headers))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs mig)
               (delete "gnumach-headers")))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs mig)
        (prepend xgcc xbinutils)))))
 
 (define* (cross-kernel-headers* target
@@ -543,7 +543,7 @@ the base compiler.  Use XBINUTILS as the associated cross-Binutils."
                            "-cross-" target))
 
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments hurd-headers)
          ((#:configure-flags flags)
           `(cons* ,(string-append "--build=" (%current-system))
                   ,(string-append "--host=" target)

gnu/packages/crypto.scm

@@ -843,7 +843,7 @@ data on your platform, so the seed itself will be as random as possible.
 (define-public qatlib
   (package
     (name "qatlib")
-    (version "26.02.0")
+    (version "25.08.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -852,10 +852,17 @@ data on your platform, so the seed itself will be as random as possible.
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ly4wjw7mpvgn0270z3242bng7ailvx99mhisymf4qdhq0cvz8n2"))))
+                "1hbhrj0wlr68by7gdvsw4nh35rwg4yngn3m7awkx799pbqsw4iyc"))))
     (build-system gnu-build-system)
     (arguments
-     (list #:configure-flags #~(list "--disable-static"))) ;avoid large .a
+     (list #:configure-flags #~(list "--disable-static") ;avoid large .a
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'bootstrap
+                 (lambda _
+                   ;; The script has a broken shebang (see:
+                   ;; <https://github.com/intel/qatlib/issues/128>).
+                   (invoke "sh" "autogen.sh"))))))
     (native-inputs (list autoconf autoconf-archive automake libtool nasm))
     (inputs (list numactl openssl zlib))
     (propagated-inputs (list openssl))  ;in 'Requires' of libqat.pc
@@ -877,7 +884,7 @@ QuickAssist APIs and sample codes.")
 (define-public crypto++
   (package
     (name "crypto++")
-    (version "8.9.0")
+    (version "8.8.0")
     (source (origin
               (method git-fetch)
               (uri
@@ -889,7 +896,7 @@ QuickAssist APIs and sample codes.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "153jl84s26nw85vw7hlc84plpja7adq6q2cdydr7g2b445yrlpqx"))))
+                "11gfnsqbb531zwgzpm0x9hsgshzcj1j049vg0zqsaqf8lvky03l6"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags
@@ -1290,7 +1297,7 @@ Features:
 (define-public libsecp256k1-bitcoin-cash
   (package
     (name "libsecp256k1-bitcoin-cash")
-    (version "0.27.1")
+    (version "0.22.1")
     (source
      (origin
        (method git-fetch)
@@ -1299,7 +1306,7 @@ Features:
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "00g7zdwdk6ij1wv2l3wf389njq3svg0zz09i1kq77sk7p9larnfs"))))
+        (base32 "1rnif3iny6pz1r3g69bagzr342mm3x0v66b60csnmm1rg44bd5v1"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake libtool))
@@ -1769,7 +1776,7 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.")
    (package/inherit libxcrypt
      (name "libxcrypt-without-failure-tokens")
      (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments libxcrypt)
         ((#:configure-flags flags #~'())
          #~(cons* "--disable-failure-tokens" #$flags)))))))
 

gnu/packages/cryptsetup.scm

@@ -122,7 +122,7 @@ files).  This assumes LIBRARY uses Libtool."
     (inherit library)
     (name (string-append (package-name library) "-static"))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments library)
        ((#:configure-flags flags #~'())
         (let* ((build-system (package-build-system library))
                (static-flags (cond ((eq? build-system cmake-build-system)
@@ -138,7 +138,7 @@ files).  This assumes LIBRARY uses Libtool."
     (inherit cryptsetup-minimal)
     (name "cryptsetup-static")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments cryptsetup-minimal)
        ((#:configure-flags flags ''())
         `(cons* "--disable-shared"
                 "--enable-static-cryptsetup"

gnu/packages/cups.scm

@@ -777,7 +777,7 @@ should only be used as part of the Guix cups-pk-helper service.")
   (package/inherit hplip
     (name "hplip-minimal")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments hplip)
        ((#:configure-flags cf)
         ;; Produce a "light build", meaning that only the printer (CUPS) and
         ;; scanner (SANE) support gets built, without all the 'hp-*'

gnu/packages/curl.scm

@@ -185,11 +185,11 @@ tunneling, and so on.")
 (define-public curl-ssh
   (package/inherit curl
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments curl)
        ((#:configure-flags flags)
         #~(cons "--with-libssh2" #$flags))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs curl)
        (prepend libssh2)))
     (properties `((hidden? . #t)))))
 

gnu/packages/databases.scm

@@ -539,7 +539,7 @@ table-level bloom filters, and updates to the MANIFEST format.")
        ((#:tests? _ #t) #f) ; TODO: Find out why some tests fails to build
        ((#:import-path _) "github.com/cockroachdb/pebble/v2")))
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs go-github-com-cockroachdb-pebble)
        (append go-github-com-cockroachdb-crlib
                go-github-com-cockroachdb-swiss
                go-github-com-minio-minlz
@@ -1491,7 +1491,7 @@ as a drop-in replacement of MySQL.")
   (package/inherit mariadb
     (name "mariadb-embedded")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments mariadb)
        ((#:configure-flags flags)
         #~(append '("-DWITH_EMBEDDED_SERVER=ON") #$flags))))))
 
@@ -1624,9 +1624,9 @@ pictures, sounds, or video.")
                 "0snbxmlygf7m4cxjpscmz3yjn4lnqsw313y9xgpv7vk9k9gm20s4"))
               (patches (search-patches
                         "postgresql-disable-resolve_symlinks.patch"))))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs postgresql-16)
                      (delete "pkg-config")))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs postgresql-16)
               (delete "icu4c")))))
 
 (define-public postgresql-14
@@ -2228,7 +2228,7 @@ data in a single database.  RocksDB is partially based on @code{LevelDB}.")
                 (sha256
                  (base32
                   "0pdy461m9a48x4i829sirpypdlzf3q79p8iw3dng9wd4r4vyv594"))))
-      (arguments (substitute-keyword-arguments arguments
+      (arguments (substitute-keyword-arguments (package-arguments rocksdb)
                    ((#:configure-flags flags ''())
                     #~(cons "-DCMAKE_CXX_FLAGS=-Wno-error=maybe-uninitialized"
                             #$flags)))))))
@@ -3256,7 +3256,7 @@ database.")
        (sha256
         (base32 "1p7jr5048syd9ln0bsh2n5ba6fd7x9wfa1x67b7wychv7a46dfx1"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments valkey-7)
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             (replace 'adjust-tests
@@ -4306,13 +4306,13 @@ on localhost.")
 (define-public python-sqlalchemy
   (package
     (name "python-sqlalchemy")
-    (version "1.4.54")
+    (version "1.4.42")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "SQLAlchemy" version))
       (sha256
-       (base32 "06n36zs280iahxj34fvq1iwq3zjlmvsalfcanwhdqdcc13nznw24"))))
+       (base32 "0qzkxy47y06fqh1m7a0p7q2r9h48x9k5kl3znzhx2vj79j8l2zhp"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-cython ; for C extensions
@@ -4339,13 +4339,13 @@ simple and Pythonic domain language.")
 (define-public python-sqlalchemy-2
   (package
     (name "python-sqlalchemy")
-    (version "2.0.45")
+    (version "2.0.36")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "sqlalchemy" version))
        (sha256
-        (base32 "126fxwlk5kd0vwymw3pfmayl29c8il2n6qxdzl1mglnjm2ys8chn"))))
+        (base32 "1i99kgm8hc38iffgp3wdbixpdc5jfjklabh8lyp9h8vd1dl6f9vz"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -4359,7 +4359,8 @@ simple and Pythonic domain language.")
     (native-inputs
      (list python-cython
            python-pytest
-           python-setuptools))
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-greenlet
            python-typing-extensions))
@@ -4482,30 +4483,38 @@ this library provides functions to facilitate such comparisons.")
 (define-public python-alembic
   (package
     (name "python-alembic")
-    (version "1.18.1")
+    (version "1.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "alembic" version))
        (sha256
-        (base32 "0rmq5z30vmv5x5c355mj2whjz1m086c0k4xqndpq35lm6n0npb43"))))
+        (base32 "0jrh9q4h2jv2bafpd6isx2dvc90rpx6j7fpdvfwd0hin7fsr425h"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       #:test-flags
-      #~(list "--ignore=tests/integration")))
+      #~(list "--ignore=tests/integration"
+              "-k" (string-join
+                    ;; XXX: Tests require fresh python-pytz timezones, remove
+                    ;; when updated.
+                    (list "not test_custom_tz"
+                          "test_custom_tz_lowercase"
+                          "test_custom_tz_utc"
+                          "test_custom_tzdata_tz")
+                    " and not "))))
     (native-inputs
-     (list python-black  ; runs a hook in tests.
-           python-mock
+     (list python-mock
            python-pytest
            python-setuptools
-           python-tzdata))
+           python-wheel))
     (propagated-inputs
-     (list python-mako
+     (list python-dateutil
+           python-editor
+           python-mako
            python-sqlalchemy-2
-           python-tomli
            python-typing-extensions))
-    (home-page "https://github.com/sqlalchemy/alembic")
+    (home-page "https://bitbucket.org/zzzeek/alembic")
     (synopsis "Database migration tool for SQLAlchemy")
     (description
      "Alembic is a lightweight database migration tool for usage with the
@@ -5717,9 +5726,7 @@ simultaneous database connections by using this framework.")
     (build-system gnu-build-system)
     (native-inputs
      (list ;; For tests.
-           inetutils
-           (libc-utf8-locales-for-target (%current-system))
-           mariadb))
+           inetutils glibc-locales mariadb))
     (inputs
      `(("libdbi" ,libdbi)
        ("mariadb:dev" ,mariadb "dev")

gnu/packages/datastructures.scm

@@ -302,7 +302,12 @@ allows multiple concurrent reader and writer threads.")
                 "0ks1mj5r11ir9ssbxgm13pj9wix7gny9g3qfqzrfn4gbjqh1j2w5"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list perl))               ; for tests
+     ;; riscv64 needs >= gcc-13.3.0
+     (append
+       (if (target-riscv64?)
+           (list gcc-14)
+           '())
+       (list perl)))            ; for tests
     (home-page "https://liburcu.org/")
     (synopsis "User-space RCU data synchronisation library")
     (description "liburcu is a user-space @dfn{Read-Copy-Update} (RCU) data

gnu/packages/debug.scm

@@ -14,7 +14,7 @@
 ;;; Copyright © 2023 Andy Tai <atai@atai.org>
 ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com>
-;;; Copyright © 2025-2026 Nguyễn Gia Phong <cnx@loang.net>
+;;; Copyright © 2025 Nguyễn Gia Phong <cnx@loang.net>
 ;;; Copyright © 2025 Robin Templeton <robin@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -54,10 +54,8 @@
   #:use-module (gnu packages c)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages check)
-  #:use-module (gnu packages cmake)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages digest)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
@@ -69,12 +67,10 @@
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages java)
   #:use-module (gnu packages lesstif)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
-  #:use-module (gnu packages mail)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ninja)
@@ -84,16 +80,13 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
-  #:use-module (gnu packages python-science)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages time)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
@@ -312,8 +305,8 @@ tool.")
 
 (define-public qemu-for-aflplusplus
   (let ((base qemu-minimal)
-        (commit "7c3bab75c4a9adaed78cefbe1468a6b49c363f58")
-        (revision "2"))
+        (commit "60ebd5624c60589e276cf287516b925a9ee35b87")
+        (revision "1"))
     (hidden-package
      (package
        (inherit base)
@@ -327,9 +320,9 @@ tool.")
                               (recursive? #t)))
           (file-name (git-file-name name version))
           (sha256
-           (base32 "03352zbp73wgwyk25f26rw7h5yqyjp6fysl2n7nj32wp16vxmlza"))))
+           (base32 "1vz7k1ssfnlimkpc01fqin27r2k4a23cwpxj2bbmsp7d3175bjbz"))))
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:configure-flags _ #~'())
            #~(list (string-append
                     "--target-list="
@@ -382,7 +375,7 @@ tool.")
                             (delete-file "tests/qemu-iotests/127")
                             (delete-file "tests/qemu-iotests/267"))))
                       '())))))
-       (inputs (modify-inputs inputs
+       (inputs (modify-inputs (package-inputs base)
                  (delete "dtc")))
        (home-page "https://github.com/AFLplusplus/qemuafl")
        (synopsis "QEMU for AFL++")))))
@@ -435,7 +428,7 @@ tool.")
                        (delete 'check))))) ; tests are run during 'install phase
     (package
       (name "aflplusplus")
-      (version "4.40c")
+      (version "4.35c")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -444,7 +437,7 @@ tool.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "00v174pxkj74pa2rcgkcbvxdq3sax9la33g3ikpjd3x1ck69mla2"))))
+                  "0mwamvyv2ckfxrrns4cnhx9gf2dn9jjgi9dc1qp3cwjasbghg5lg"))))
       (build-system gnu-build-system)
       (arguments
        (substitute-keyword-arguments arguments-american-fuzzy-lop
@@ -724,7 +717,7 @@ the position of the variable and allows you to modify its value.")
                 "11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n"))
               (patches (search-patches "remake-impure-dirs.patch"))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gnu-make)
        (prepend readline)))
     (home-page "https://bashdb.sourceforge.net/remake/")
     (description "Remake is an enhanced version of GNU Make that adds improved
@@ -1084,112 +1077,6 @@ to aid in debugging.")
     (description "Delve is a debugger for the Go programming language.")
     (license license:expat)))
 
-(define-public fandango
-  (package
-    (name "fandango")
-    (version "1.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/fandango-fuzzer/fandango")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "0ppx8r9isc772y0ahpgl8g5b3yxka7ffqzlcsa920aib5nj39lrg"))
-       (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))))
-            (substitute* "pyproject.toml"
-              ;; Python is linked with GNU readline on all Guix targets.
-              ((".*gnureadline.*") "")
-              ;; TODO: update antlr4.
-              (("antlr4-python3-runtime>=4.13") "antlr4-python3-runtime")
-              ;; PYTHONHASHSEED is set by the build system.
-              ((" --pythonhashseed=1") ""))
-            (delete-all-but "src/fandango/language/cpp_parser"
-              "FandangoLexerBase.cpp"
-              "FandangoLexerBase.h")
-            (delete-all-but "src/fandango/language/parser"
-              "FandangoLexerBase.py")))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      #~(list "--numprocesses" (number->string (parallel-job-count))
-              ;; Skip expensive tests.
-              "-k" "not test_cli_max_2 and not test_soft_value")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'generate-parser
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "CMakeLists.txt"
-                (("(target_link_libraries\\(.*)(\\))" all left right)
-                 (simple-format #f "~a ~a ~a"
-                   left
-                   (search-input-file inputs "lib/libantlr4-runtime.so")
-                   right))
-                (("\\$\\{CPP_PARSER_DIR\\}/antlr4-cpp-runtime")
-                 (search-input-directory inputs "include/antlr4-runtime")))
-              (substitute* "Makefile"
-                ;; Avoid running black.
-                ((".*\\$\\(BLACK\\).*") ""))
-              (invoke "make" "parser")))
-          (add-before 'check 'set-paths
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "evaluation/scriptsizec/scriptsizec_evaluation.py"
-                (("from tccbox import .*")
-                 "")
-                (("tcc_bin_path\\(\\)")
-                 (simple-format #f "~s"
-                   (search-input-file inputs "bin/tcc")))))))))
-    (native-inputs (list antlr4
-                         cmake-minimal
-                         clang           ;for tests
-                         python-aiosmtpd ;for tests
-                         python-dateutil ;for tests
-                         python-docutils ;for tests
-                         python-faker    ;for tests
-                         python-pytest
-                         python-pytest-benchmark
-                         python-pytest-timeout
-                         python-pytest-xdist
-                         python-scikit-build-core
-                         python-speedy-antlr-tool
-                         python-setuptools
-                         tcc))           ;for tests
-    (inputs (list cpp-antlr4-runtime
-                  python-antlr4-runtime
-                  python-astar
-                  python-ansi-styles
-                  python-beartype
-                  python-cachedir-tag
-                  python-dill
-                  python-exrex
-                  python-lxml
-                  python-py010parser
-                  python-regex
-                  python-tdigest
-                  python-thefuzz
-                  python-xdg-base-dirs))
-    (home-page "https://fandango-fuzzer.github.io")
-    (synopsis "Language-based fuzzer")
-    (description
-     "Fandango is a generator of inputs and interactions for software testing.
-Given the specification of a program's input or interaction language,
-Fandango generates myriads of valid sample inputs for testing.
-The specification language combines a grammar with constraints
-written in Python.  Minimization or maximization soft constraints
-and input distributions can also be expressed in Fandango.")
-    (license license:eupl1.2)))
-
 (define-public fiu
   (package
     (name "fiu")

gnu/packages/diffoscope.scm

@@ -79,7 +79,7 @@
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "315")
+    (version "313")
     (source
      (origin
        (method git-fetch)
@@ -88,7 +88,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1q2q60hw36d1capqdrg6gp2220dg87bmxgmk52m7yml4xw13zi2p"))))
+        (base32 "13ib3glsj4xf2bcrlhfhn0411970ih8zn4y56vm2mqbjirqc0qj4"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/digest.scm

@@ -2,7 +2,6 @@
 ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com>
 ;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,41 +29,9 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
-  #:use-module (gnu packages check)
   #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-xyz)
   #:use-module (ice-9 match))
 
-(define-public python-tdigest
-  (package
-    (name "python-tdigest")
-    (version "0.6.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/CamDavidsonPilon/tdigest")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1fqpjw27fc1xfx72c2rjbnmi290f4c262rwm0c2fifsxpwyy54w7"))))
-    (build-system pyproject-build-system)
-    (propagated-inputs (list python-accumulation-tree python-pyudorandom))
-    (native-inputs (list python-numpy
-                         python-pytest
-                         python-pytest-timeout
-                         python-setuptools))
-    (home-page "https://github.com/CamDavidsonPilon/tdigest")
-    (synopsis "Python implementation of the t-digest data structure")
-    (description
-     "This Python package implements @url{https://github.com/tdunning/t-digest,
-Ted Dunning's t-digest data structure}, which is designed around computing
-accurate estimates such as percentiles, quantiles and trimmed means
-from streaming or distributed data.  Two t-digests can be added,
-making the data structure ideal for map-reduce settings, and can be serialized
-into much less than 10 kB, instead of storing the entire list of data.")
-    (license license:expat)))
-
 (define-public wyhash
   (package
     (name "wyhash")

gnu/packages/display-managers.scm

@@ -161,9 +161,9 @@ to create smooth, animated user interfaces.")
   (package
     (inherit sddm)
     (name "sddm-qt5")
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs sddm)
                      (replace "qttools" qttools-5)))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs sddm)
               (replace "qtbase" qtbase-5)
               (replace "qtsvg" qtsvg-5)
               (replace "qtdeclarative" qtdeclarative-5)

gnu/packages/django.scm

@@ -13,7 +13,6 @@
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 jgart <jgart@dismail.de>
-;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -310,7 +309,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
         (sha256
          (base32 "1znc2q1m9p2kxz1rkfkh2hg2sx6i3aqv72zsraad7bci364cvfd4"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments python-django)
        ((#:phases phases)
         #~(modify-phases #$phases (delete 'delete-sitecustomize)))))))
 
@@ -1056,39 +1055,6 @@ applications with a @var{SEARCH_URL} variable.")
 for Django sites.")
     (license license:bsd-3)))
 
-(define-public python-django-mailer
-  (package
-    (name "python-django-mailer")
-    ;; Include switching from lockfile to filelock and other fixes.
-    (properties '((commit . "e350fb04eec052a7ad27aee310e6d4073012ca2f")
-                  (revision . "0")))
-    (version (git-version "2.3.2"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/pinax/django-mailer")
-              (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19d8asqai0sxn0y0bzqz03hgm8rzl95rmp787y3ps2lsm4c1an3y"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-pytest
-           python-pytest-django
-           python-setuptools))
-    (propagated-inputs
-     (list python-django
-           python-filelock-next))
-    (home-page "https://github.com/pinax/django-mailer")
-    (synopsis "Mail queuing and management for Django")
-    (description
-     "This is a reusable Django application for queuing the sending of email.
-It works by storing email in the database for later sending.")
-    (license license:expat)))
-
 (define-public python-django-contrib-comments
   (package
     (name "python-django-contrib-comments")
@@ -1715,7 +1681,7 @@ a single block.")
                  #~(modify-phases %standard-phases
                      (delete 'sanity-check))))
                (propagated-inputs
-                (modify-inputs propagated-inputs
+                (modify-inputs (package-propagated-inputs pkg)
                   (delete "python-django-crispy-forms")))))
            (list python-crispy-bootstrap3 python-crispy-bootstrap4))
       (list python-pytest python-pytest-django python-setuptools)))

gnu/packages/dlang.scm

@@ -450,13 +450,6 @@ integration tests...\n")
                    "dmd/compiler/test/fail_compilation/sarif_test.d"
                    "dmd/compiler/test/fail_compilation/sarifmultiple_test.d"))
 
-                ;; tries to debug 64bit executable
-                ;; not in executable format: file format not recognized
-                #$@(if (target-32bit?)
-                       '((delete-file
-                          "dmd/compiler/test/runnable/gdb_slice_debuginfo_64.d"))
-                       '())
-
                 ;; Locations in stack traces are broken for some reason,
                 ;; causing these tests to fail.
                 ;; XXX: Report upstream.
@@ -582,7 +575,7 @@ compiler for the D programming language.")
                           (format #f "s,~a,~a,g" in-dmd-bootstrap out)
                           out-bin-dmd))))))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs dmd-bootstrap)
        (delete "gdmd")
        (append dmd-bootstrap)))
     (properties

gnu/packages/docbook.scm

@@ -127,7 +127,7 @@ by no means limited to these applications.)  This package provides XML DTDs.")
       (inherit template)
       (arguments
        (let ((dest-dir (format #f "xml/docbook/~a/" version)))
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments template)
            ;; XXX: A default value must be provided otherwise this
            ;; substitution has no effect.
            ((#:install-plan _ #f)
@@ -147,7 +147,7 @@ by no means limited to these applications.)  This package provides XML DTDs.")
       (inherit template)
       (arguments
        (let ((dest-dir (format #f "xml/docbook/~a/" version)))
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments template)
            ((#:install-plan _ #f)
             #~`(("catalog.xml" #$dest-dir)
                 ("docbook.nvdl" #$dest-dir)
@@ -167,7 +167,7 @@ downloading from @var{source}, where @var{version} is a string and
       (inherit base-template)
       (arguments
        (let* ((dest-dir (format #f "xml/docbook/~a/" version)))
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments base-template)
            ((#:phases phases)
             ;; Some programs, such as kdoctools, instead of using
             ;; XML_CATALOG_FILES, prefer to use cmake to locate
@@ -247,7 +247,7 @@ downloading from @var{source}, where @var{version} is a string and
     (package
       (inherit template)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments template)
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'unpack 'copy-catalog-file
@@ -279,7 +279,7 @@ downloading from @var{source}, where @var{version} is a string and
                                "catalog.xml"))
                      (list "rewriteSystem" "rewriteURI")))))))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs template)
          (prepend libxml2))))))
 
 (define-public docbook-mathml-1.0
@@ -800,7 +800,7 @@ DB2LaTeX.")
 (define-public dblatex/stable
   (hidden-package
    (package/inherit dblatex
-     (inputs (modify-inputs inputs
+     (inputs (modify-inputs (package-inputs dblatex)
                (replace "imagemagick" imagemagick/stable)
                (replace "inkscape" inkscape/pinned))))))
 

gnu/packages/docker.scm

@@ -248,11 +248,11 @@ management tool.")
     ;; Integration tests need a running Docker daemon.
     (arguments (list #:tests? #f))
     (native-inputs (list python-setuptools))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs python-docker)
               (prepend python-six)
               (delete "python-urllib3")))
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs python-docker)
        (prepend python-docker-pycreds python-urllib3-1.26)))))
 
 ;; Needed for old v1 of docker-compose; remove once Docker is updated to a

gnu/packages/documentation.scm

@@ -59,12 +59,10 @@
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages flex)
-  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages javascript)
-  #:use-module (gnu packages netpbm)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
@@ -106,7 +104,7 @@
                        (substitute* "cfgcache.pm"
                          (("/usr/local")
                           #$output)))))))
-    (inputs (list perl netpbm ghostscript))
+    (inputs (list perl))
     (synopsis "LaTeX documents to HTML")
     (description "LaTeX2HTML is a utility that converts LaTeX documents to web
 pages in HTML.")

gnu/packages/electronics.scm

@@ -14,7 +14,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-2025 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020, 2021, 2022, 2023, 2024, 2025 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>
@@ -29,7 +29,6 @@
 ;;; Copyright © 2025, 2026 Gabriel Wicki <gabriel@erlikon.ch>
 ;;; Copyright © 2026 Thomas Kramer <thomas@f-si.org>
 ;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
-;;; Copyright © 2018, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,7 +64,6 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
@@ -95,9 +93,7 @@
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graph)
   #:use-module (gnu packages graphviz)
-  #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
-  #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages libedit)
@@ -113,8 +109,6 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
@@ -206,6 +200,10 @@
                   `("GI_TYPELIB_PATH" ":" prefix
                     (,(getenv "GI_TYPELIB_PATH")))))))))
       (native-inputs
+       ;; XXX: Test runner may be migrated to Pytest
+       ;; <https://docs.pytest.org/en/7.1.x/how-to/nose.html> after report to
+       ;; the upstream to modify them, use deprecated Nose test runner for
+       ;; now.
        (list python-pynose
              python-setuptools
              xvfb-run))
@@ -216,7 +214,7 @@
              python-platformdirs
              python-pycairo
              python-pyclip
-             python-pygobject-3.50
+             python-pygobject
              python-pypubsub))
       (home-page "https://github.com/Blokkendoos/AACircuit")
       (synopsis "Draw electronic circuits with ASCII characters")
@@ -350,44 +348,6 @@ supporting gerber, excellon and g-code.  It is part of the RiNgDove EDA
 suite.")
     (license license:gpl2+)))
 
-(define-public charlib
-  (package
-    (name "charlib")
-    (version "2.0.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stineje/CharLib")
-             (commit version)))
-       (sha256
-        (base32 "0phklm6wcpvwdfx00k0q8qvpvdqf6wjvzirkfji7vc7ils7wz2sl"))
-       (file-name (git-file-name name version))))
-    (build-system pyproject-build-system)
-    (inputs
-     (list ngspice
-           pyspice
-           python-liberty-parser
-           python-matplotlib
-           python-numpy
-           python-ply
-           python-pyyaml
-           python-requests
-           python-schema
-           python-scipy
-           python-tqdm))
-    (native-inputs
-     (list python-poetry-core
-           python-pytest
-           python-setuptools))
-    (home-page "https://stineje.github.io/CharLib")
-    (synopsis "CMOS standard-cell characterization")
-    (description
-     "@code{Charlib} is an @acronym{EDA, Electronic Design Automation} tool used to
-extract timing and power characteristics from CMOS combinational and sequential
-standard-cells.  It is compatible with @code{ngspice} and @code{Xyce}.")
-    (license license:gpl2)))
-
 (define-public ciel
   (package
     (name "ciel")
@@ -730,57 +690,6 @@ Simulator Trace} files.")
       ;; Exception against free government use in tcl_np.c and tcl_np.h.
       (license (list license:gpl2+ license:expat license:tcl/tk)))))
 
-(define-public horizon-eda
-  (package
-    (name "horizon-eda")
-    (version "2.7.2")
-    ;; TODO: try to unbundle some of the 3rd parties.
-    ;; We have packages for nlohmann-json, range-v3, catch2 and clipper.
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/horizon-eda/horizon")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "16q22yf407820430cva8i2b3dcmwpjdsbx0wlarj8v2mj5ixs932"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:tests? #f ; no tests
-      #:glib-or-gtk? #t))
-    (native-inputs (list cmake-minimal ;; OpenCASCADE is only found by cmake
-                         `(,glib "bin")
-                         gobject-introspection
-                         pkg-config))
-    (inputs (list boost
-                  cairomm
-                  cppzmq
-                  curl
-                  glib
-                  glibmm
-                  glm
-                  gsettings-desktop-schemas
-                  gtk+
-                  gtkmm-3
-                  libarchive
-                  libgit2-glib
-                  librsvg
-                  libspnav
-                  libzip
-                  opencascade-occt
-                  podofo
-                  sqlite
-                  `(,util-linux "lib")
-                  zeromq))
-    (home-page "https://horizon-eda.org/")
-    (synopsis "@acronym{PCB, Printed Circuit Board} design tool")
-    (description "Horizon is an @acronym{EDA, Electronic Design Automation}
-package supporting an integrated end-to-end workflow for PCB design, including
-from parts management and schematic entry to gerber export.")
-    (license license:gpl3+)))
-
 (define-public iverilog
   (package
     (name "iverilog")
@@ -1053,155 +962,6 @@ It simulates the netlists of the cells with ngspice and writes the
 characterization result in a liberty library file.")
     (license license:agpl3+)))
 
-(define-public lepton-eda
-  (package
-    (name "lepton-eda")
-    (version "1.9.18-20220529")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/lepton-eda/lepton-eda/")
-                     (commit version)))
-              (sha256
-               (base32
-                "06plrcab3s2rpyf0qv2gzc1yp33627xi8105niasgixckk6glnc2"))
-              (file-name (git-file-name name version))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:configure-flags
-      #~(list
-         ;; When running "make", the POT files are built with the build time as
-         ;; their "POT-Creation-Date".  Later on, "make" notices that .pot
-         ;; files were updated and goes on to run "msgmerge"; as a result, the
-         ;; non-deterministic POT-Creation-Date finds its way into .po files,
-         ;; and then in .gmo files.  To avoid that, simply make sure 'msgmerge'
-         ;; never runs.  See <https://bugs.debian.org/792687>.
-         "ac_cv_path_MSGMERGE=true"
-         (string-append "--with-pcb-datadir="
-                        #$(this-package-input "pcb")
-                        "/share")
-         (string-append "--with-pcb-lib-path="
-                        #$(this-package-input "pcb")
-                        "/share/pcb/pcblib-newlib:"
-                        #$(this-package-input "pcb")
-                        "/share/pcb/newlib")
-         "--with-gtk3"
-         "CFLAGS=-fcommon"
-         "--enable-guild"
-         "--enable-contrib")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-tests
-            (lambda _
-              ;; For logs and auto-compilation
-              (setenv "HOME" "/tmp")
-
-              ;; Ensure that readline is found by lepton-shell
-              (substitute* "script.in"
-                (("\\(eval-when \\(expand load eval\\)" m)
-                 (string-append "
-(add-to-load-path \"" #$(this-package-input "guile-readline")
-"/share/guile/site/3.0\")
-(set! %load-compiled-path (cons \""
-#$(this-package-input "guile-readline")
-"/lib/guile/3.0/site-ccache/"
-"\" %load-compiled-path))
-" m)))))
-          (add-before 'build 'fix-dynamic-link
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "liblepton/scheme/lepton/ffi/lib.scm"
-                (("\"liblepton\"")
-                 (string-append "\"" #$output "/lib/liblepton.so" "\""))
-                (("\"libleptonattrib\"")
-                 (string-append "\"" #$output "/lib/libleptonattrib.so" "\""))
-                (("\"libleptongui\"")
-                 (string-append "\"" #$output "/lib/libleptongui.so" "\""))
-                (("\"libglib-2.0\"")
-                 (string-append
-                  "\"" (search-input-file inputs "/lib/libglib-2.0.so") "\""))
-                (("\"libgobject-2.0\"")
-                 (string-append
-                  "\"" (search-input-file inputs "/lib/libgobject-2.0.so") "\""))
-                (("\"libgtk-3\"")
-                 (string-append
-                  "\"" (search-input-file inputs "/lib/libgtk-3.so") "\"")))
-
-              ;; For finding libraries when running tests before installation.
-              (setenv "LIBLEPTONGUI"
-                      (string-append (getcwd)
-                                     "/libleptongui/src/.libs/libleptongui.so"))
-              (setenv "LIBLEPTON"
-                      (string-append (getcwd)
-                                     "/libleptongui/src/.libs/liblepton.so"))
-              (setenv "LD_LIBRARY_PATH"
-                      (string-append (getcwd)
-                                     "/libleptonattrib/src/.libs/:"
-                                     (getenv "LIBRARY_PATH")))))
-          (add-before 'bootstrap 'prepare
-            (lambda _
-              ;; Some of the scripts there are invoked by autogen.sh.
-              (for-each patch-shebang
-                        (find-files "build-tools"))
-
-              ;; Make sure 'msgmerge' can modify the PO files.
-              (for-each (lambda (po)
-                          (chmod po #o666))
-                        (find-files "." "\\.po$"))
-
-              ;; This would normally be created by invoking 'git', but it
-              ;; doesn't work here.
-              (call-with-output-file "version.h"
-                (lambda (port)
-                  (format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
-                          #$(string-drop version
-                                         (+ 1
-                                            (string-index version #\-))))
-                  (format port
-                          "#define PACKAGE_DOTTED_VERSION \"~a\"~%"
-                          #$(string-take version
-                                         (string-index version #\-)))
-                  (format port
-                          "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))))
-          (add-after 'install 'compile-scheme-files
-            (lambda _
-              (unsetenv "LIBLEPTONGUI")
-              (unsetenv "LIBLEPTON")
-              (unsetenv "LD_LIBRARY_PATH")
-              (invoke "make" "precompile"))))))
-    (native-inputs
-     (list autoconf
-           automake
-           desktop-file-utils
-           flex
-           gettext-minimal
-           groff
-           gawk
-           libtool
-           pkg-config
-           m4
-           perl
-           texinfo))
-    (inputs
-     (list glib
-           gtk+
-           gtksheet
-           guile-3.0
-           guile-readline
-           pcb
-           shared-mime-info))
-    (home-page "https://lepton-eda.github.io/")
-    (synopsis
-     "Suite of tools for designing @acronym{PCB, Printed Circuit Boards}")
-    (description
-     "Lepton is an @acronym{EDA, Electronic Design Automation} tool set
-forked from gEDA/gaf in late 2016.  EDA tools are used for electrical circuit
-design, schematic capture, simulation, prototyping, and production.  Lepton
-EDA includes tools for schematic capture, attribute management, bill of
-materials (BOM) generation, netlisting into over 20 netlist formats, analog
-and digital simulation, and PCB layout, and many other features.")
-    (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.
@@ -1762,19 +1522,19 @@ which allows one to install the M8 firmware on any Teensy.")
     (inherit m8c)
     (name "m8c-serial")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments m8c)
        ((#:configure-flags flags)
         #~(cons* "-DUSE_LIBSERIAL=ON"
                  (delete "-DUSE_LIBUSB=ON" #$flags)))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs m8c)
        (replace "libusb" libserialport)))
     (synopsis "Cross-platform M8 tracker headless client - serial backend")))
 
 (define-public magic
   (package
     (name "magic")
-    (version "8.3.625")
+    (version "8.3.613")
     (source
      (origin
        (method git-fetch)
@@ -1783,7 +1543,7 @@ which allows one to install the M8 firmware on any Teensy.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ld238cdq8mzzcx7vgk67aqim0ypbfyks486z59q19yzxpr6c42s"))))
+        (base32 "0mipxrwkcphm67zchr705ab14kv85p0lfb083yicz6myf2fxp2bf"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -2054,7 +1814,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
     (arguments
      (delkw
       #:qtbase
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments nextpnr)
         ((#:configure-flags flags '())
          #~(delete! "-DBUILD_GUI=ON" #$flags)))))
     (synopsis
@@ -2069,7 +1829,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
     (inherit libngspice)
     (name "ngspice")
     (arguments
-     (substitute-keyword-arguments 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"
@@ -2078,7 +1838,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
         #~(modify-phases #$phases
             (delete 'delete-scripts)))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs libngspice)
        (append perl)))
     (inputs (list libngspice readline libxaw libx11))))
 
@@ -2465,7 +2225,6 @@ formats.")
      (list
       #:configure-flags
       #~(list "-DBUILD_GUI=ON"
-              (string-append "-DOPENROAD_VERSION=" #$version)
               "-DBUILD_PYTHON=ON"
               "-DUSE_SYSTEM_ABC=OFF"     ;uses a custom fork
               "-DUSE_SYSTEM_OPENSTA=OFF" ;uses a custom fork
@@ -2507,10 +2266,6 @@ formats.")
            or-tools
            protobuf-6
            python
-           qtcharts-5
-           qtimageformats-5
-           qtsvg-5
-           qtwayland-5
            re2-next
            scip
            spdlog
@@ -2536,13 +2291,10 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
     (arguments
      (delkw
       #:qtbase
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments openroad)
         ((#:configure-flags flags '())
          #~(cons* "-DBUILD_GUI=OFF"
                   (delete! "-DBUILD_GUI=ON" #$flags))))))
-    (inputs
-     (modify-inputs (package-inputs openroad)
-       (delete "qtcharts-5" "qtimageformats-5" "qtsvg-5" "qtwayland-5")))
     (synopsis
      "Collection of tools for semiconductor digital design, cli version.")))
 
@@ -2561,7 +2313,7 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
          "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph"))
        (patches (search-patches "pulseview-qt515-compat.patch"
                                 "pulseview-glib-2.68.patch"))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
     (arguments
      (list
       #:tests? #f ;format_time_minutes_test is failing
@@ -2582,8 +2334,7 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.")
            libsigrok
            libsigrokdecode
            qtbase-5
-           qtsvg-5
-           qtwayland-5))
+           qtsvg-5))
     (home-page "https://www.sigrok.org/wiki/PulseView")
     (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
     (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO
@@ -2691,7 +2442,7 @@ verification.")
        (sha256
         (base32 "1kn18ibvm7bzdyw2d914284wriravyh5qwfarj06pb052x1yblyx"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments osvvm)
        ((#:tests? _ #t)
         #f)
        ((#:phases phases #~%standard-phases)
@@ -2789,7 +2540,7 @@ Chip toolkit.")
     (arguments (list #:test-flags #~(list ".")))
     (native-inputs (list cmake-minimal python-pytest python-minimal-wrapper
                          python-scikit-build-core))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs gdstk)
               (prepend python-numpy)))
     (synopsis "Python module for creation and manipulation of GDSII files")
     (description
@@ -3191,7 +2942,7 @@ testing to @code{cocotb}, removing the need of manipulating Makefiles.")
 (define-public python-cocotbext-axi
   (package
     (name "python-cocotbext-axi")
-    (version "0.1.28")
+    (version "0.1.26")
     (source
      (origin
        (method git-fetch)
@@ -3200,7 +2951,7 @@ testing to @code{cocotb}, removing the need of manipulating Makefiles.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kwdzz0mq134m0kxhwwj0d1nr1cbrzv36844476knna34xi2riyg"))))
+        (base32 "0xgfvvpff9r7g7fiswv1m0dklyw6c8v2r3qpd6qq3rzvnvrhsrin"))))
     (build-system pyproject-build-system)
     (propagated-inputs
      (list python-cocotb python-cocotb-bus))
@@ -4262,7 +4013,7 @@ unique design feature of Trilinos is its focus on packages.")
                          (delete
                           "-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs trilinos-serial-xyce)
        (prepend openmpi)))))
 
 (define-public verilator
@@ -4410,7 +4161,7 @@ parallel computing platforms.  It also supports serial execution.")
                          (delete
                           "-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs xyce-serial)
        (prepend openmpi)
        (replace "trilinos-serial-xyce" trilinos-parallel-xyce)))))
 

gnu/packages/elf.scm

@@ -319,7 +319,7 @@ static analysis of the ELF binaries at hand.")
   (package
     (inherit libelf)
     (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments libelf)
         ((#:make-flags flags #~'())
          #~(append #$flags '("CFLAGS=-fPIC")))))
     (properties `((hidden? . #t) ,@(package-properties libelf)))))
@@ -389,7 +389,7 @@ changed.")
                (base32
                 "0zdby3gpmm8q4735pviaq92zj41i2rdnhwhyrsb3sinc9hzmz4db"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments patchelf)
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             (add-after 'fix-tests 'skip-empty-rpath-test

gnu/packages/emacs-build.scm

@@ -72,9 +72,7 @@ as bold, underscore or italic.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))
-       (patches
-        (search-patches "emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch"))))
+         "09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))))
     (build-system emacs-build-system)
     (arguments
      (list

gnu/packages/emacs-xyz.scm

@@ -896,7 +896,7 @@ e.g. emacs-geiser-guile for Guile.")
 (define-public emacs-gptel
   (package
     (name "emacs-gptel")
-    (version "0.9.9.4")
+    (version "0.9.9.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -905,7 +905,7 @@ e.g. emacs-geiser-guile for Guile.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ffh2mwy9znjd0v9mh065lv122xg4nlnkbxwjfrsaqn1j1q2xc0c"))))
+                "080dk0101imvfkxcqlqhy8wf1wc8p2vqyp3cwdi48wn44y1csqy9"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -944,11 +944,11 @@ e.g. emacs-geiser-guile for Guile.")
         (method git-fetch)
         (uri (git-reference
                (url "https://github.com/karthink/gptel-test")
-               (commit "318c9dda9e6dbb3e61311cf4de23f124c4d2960a")))
+               (commit "5f5275c32ed240a03f38d9edef26d920d4535a41")))
         (file-name "emacs-gptel-test-files")
         (sha256
          (base32
-          "1368qrxxrw5zd2i0gx55r7yvi5xjma1khs8p5f2w76m7c6ms83yg")))))
+          "0sd1y1m5abfqcm5v9x86xmnnx8ab82bfd0m3cgq9ycszxdf7gf3v")))))
     (home-page "https://github.com/karthink/gptel")
     (synopsis "GPTel is a simple ChatGPT client for Emacs")
     (description
@@ -959,36 +959,6 @@ just one-off queries and multiple independent sessions.  It requires an OpenAI
 API key.")
     (license license:gpl3+)))
 
-(define-public emacs-gptel-agent
-  ;; No releases.
-  (let ((commit "79686c56a1a07a8897301ae043d06c6e87084f7e")
-        (revision "1"))
-    (package
-      (name "emacs-gptel-agent")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (uri (git-reference
-                (url "https://github.com/karthink/gptel-agent")
-                (commit commit)))
-         (method git-fetch)
-         (sha256
-          (base32 "1yrhmr8yivqzx7gc7598l33ngd55c2r1x7hp8a96aczgj8i8k39n"))
-         (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f ; no tests
-        #:include #~(cons "agents" %default-include)))
-      (propagated-inputs
-       (list emacs-compat emacs-gptel emacs-orderless emacs-yaml))
-      (home-page "https://github.com/karthink/gptel-agent")
-      (synopsis "Collection of agents for gptel")
-      (description
-       "This package provides a collection of tools and prompts to use Gptel
-agentically, with any LLM.")
-      (license license:gpl3+))))
-
 (define-public emacs-gptel-prompts
   ;; No releases.
   (let ((commit "f1c29208c1f0b62918ac6682038da5db4184fc51")
@@ -4948,79 +4918,77 @@ or unexpected behavior inside an elisp configuration file (typically
 
 (define-public emacs-w3m
   ;; Emacs-w3m follows a "rolling release" model.
-  (let ((commit "ec18c21418bf7c1be159bd3cf7e79a370d4be1f3")
-        (revision "0"))
-    (package
-      (name "emacs-w3m")
-      (version (git-version "20251229" revision commit)) ;commit date
-      (source (origin
-                ;; "Officially" this is still on cvs.namazu.org, but that repo
-                ;; seems to be unreachable.
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/emacs-w3m/emacs-w3m.git")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "00rkvr6cpisma5r6g88bq0im7qh9l30fy8r4g4wgs1k53lai7k68"))))
-      (build-system gnu-build-system)
-      (native-inputs (list autoconf texinfo emacs-minimal))
-      (inputs (list w3m imagemagick))
-      (arguments
-       (list
-        #:modules '((guix build gnu-build-system)
-                    ((guix build emacs-build-system) #:prefix emacs:)
-                    (guix build utils)
-                    (guix build emacs-utils))
-        #:imported-modules `(,@%default-gnu-imported-modules
-                             (guix build emacs-build-system)
-                             (guix build emacs-utils))
-        #:configure-flags
-        #~(list (string-append "--with-lispdir=" (emacs:elpa-directory #$output))
-                (string-append "--with-icondir="
-                               #$output "/share/images/emacs-w3m")
-                ;; Leave .el files uncompressed, otherwise GC can't
-                ;; identify run-time dependencies.  See
-                ;; <http://lists.gnu.org/archive/html/guix-devel/2015-12/msg00208.html>
-                "--without-compress-install")
-        #:tests? #f                       ; no check target
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'autoconf
-              (lambda _
-                (invoke "autoconf")))
-            (add-before 'configure 'support-emacs!
-              (lambda _
-                ;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is
-                ;; unsupported.
-                (substitute* "configure"
-                  (("EMACS_FLAVOR=unsupported") "EMACS_FLAVOR=emacs"))))
-            (add-before 'build 'patch-exec-paths
-              (lambda* (#:key inputs #:allow-other-keys)
-                (make-file-writable "w3m.el")
-                (emacs-substitute-variables "w3m.el"
-                  ("w3m-command" (search-input-file inputs "/bin/w3m"))
-                  ("w3m-touch-command" (search-input-file inputs "/bin/touch"))
-                  ("w3m-icon-directory"
-                   (string-append #$output "/share/images/emacs-w3m")))
-                (make-file-writable "w3m-image.el")
-                (emacs-substitute-variables "w3m-image.el"
-                  ("w3m-imagick-convert-program"
-                   (search-input-file inputs "/bin/convert"))
-                  ("w3m-imagick-identify-program"
-                   (search-input-file inputs "/bin/identify")))))
-            (replace 'install
-              (lambda _
-                (invoke "make" "install" "install-icons")
-                (with-directory-excursion (emacs:elpa-directory #$output)
-                  (for-each delete-file '("ChangeLog" "ChangeLog.1"))
-                  (symlink "w3m-load.el" "w3m-autoloads.el")))))))
-      (home-page "http://emacs-w3m.namazu.org/")
-      (synopsis "Simple Web browser for Emacs based on w3m")
-      (description
-       "Emacs-w3m is an emacs interface for the w3m web browser.")
-      (license license:gpl2+))))
+  (package
+    (name "emacs-w3m")
+    (version "20220508.2259")
+    (source (origin
+              ;; "Officially" this is still on cvs.namazu.org, but that repo
+              ;; seems to be unreachable.
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/emacs-w3m/emacs-w3m.git")
+                    (commit "bbcebbe20ebfa807a3e4beaadf40ce6f4be213e7")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0y892n8jaxzyxi1fgyklc7zfh57ibp4yyywmif69dm28hykj6lmz"))))
+    (build-system gnu-build-system)
+    (native-inputs (list autoconf texinfo emacs-minimal))
+    (inputs (list w3m imagemagick))
+    (arguments
+     (list
+      #:modules '((guix build gnu-build-system)
+                  ((guix build emacs-build-system) #:prefix emacs:)
+                  (guix build utils)
+                  (guix build emacs-utils))
+      #:imported-modules `(,@%default-gnu-imported-modules
+                           (guix build emacs-build-system)
+                           (guix build emacs-utils))
+      #:configure-flags
+      #~(list (string-append "--with-lispdir=" (emacs:elpa-directory #$output))
+              (string-append "--with-icondir="
+                             #$output "/share/images/emacs-w3m")
+              ;; Leave .el files uncompressed, otherwise GC can't
+              ;; identify run-time dependencies.  See
+              ;; <http://lists.gnu.org/archive/html/guix-devel/2015-12/msg00208.html>
+              "--without-compress-install")
+      #:tests? #f                       ; no check target
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'autoconf
+            (lambda _
+              (invoke "autoconf")))
+          (add-before 'configure 'support-emacs!
+            (lambda _
+              ;; For some reason 'AC_PATH_EMACS' thinks that 'Emacs 26' is
+              ;; unsupported.
+              (substitute* "configure"
+                (("EMACS_FLAVOR=unsupported") "EMACS_FLAVOR=emacs"))))
+          (add-before 'build 'patch-exec-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (make-file-writable "w3m.el")
+              (emacs-substitute-variables "w3m.el"
+                ("w3m-command" (search-input-file inputs "/bin/w3m"))
+                ("w3m-touch-command" (search-input-file inputs "/bin/touch"))
+                ("w3m-icon-directory"
+                 (string-append #$output "/share/images/emacs-w3m")))
+              (make-file-writable "w3m-image.el")
+              (emacs-substitute-variables "w3m-image.el"
+                ("w3m-imagick-convert-program"
+                 (search-input-file inputs "/bin/convert"))
+                ("w3m-imagick-identify-program"
+                 (search-input-file inputs "/bin/identify")))))
+          (replace 'install
+            (lambda _
+              (invoke "make" "install" "install-icons")
+              (with-directory-excursion (emacs:elpa-directory #$output)
+                (for-each delete-file '("ChangeLog" "ChangeLog.1"))
+                (symlink "w3m-load.el" "w3m-autoloads.el")))))))
+    (home-page "http://emacs-w3m.namazu.org/")
+    (synopsis "Simple Web browser for Emacs based on w3m")
+    (description
+     "Emacs-w3m is an emacs interface for the w3m web browser.")
+    (license license:gpl2+)))
 
 (define-public emacs-wget
   (package
@@ -5427,16 +5395,16 @@ installed on your machine and launch it.")
     (version "1.8.2")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://www.github.com/tonini/alchemist.el")
-              (commit (string-append "v" version))))
+       (method url-fetch)
+       (uri (string-append "https://stable.melpa.org/packages/"
+                           "alchemist-" version ".tar"))
        (sha256
-        (base32 "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww"))))
+        (base32 "0ygwf9d739zqc8dcckw0j0bqkipw7cmxbrx3l281x237a3d384yw"))))
     (build-system emacs-build-system)
+    (propagated-inputs
+     (list emacs-elixir-mode emacs-dash emacs-company emacs-pkg-info))
     (arguments
      (list
-      #:tests? #f                        ; TODO Tests are failing; investigate
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'install 'install-server
@@ -5444,13 +5412,8 @@ installed on your machine and launch it.")
               (let ((server (string-append (elpa-directory #$output)
                                            "/alchemist-server")))
                 (mkdir-p server)
-                (delete-file-recursively "alchemist-server/test")
-                (copy-recursively "alchemist-server" server)))))))
-    (propagated-inputs
-     (list emacs-company
-           emacs-dash
-           emacs-elixir-mode
-           emacs-pkg-info))
+                (copy-recursively "alchemist-server" server)
+                (delete-file-recursively (string-append server "/test"))))))))
     (home-page "https://www.github.com/tonini/alchemist.el")
     (synopsis "Elixir tooling integration into Emacs")
     (description
@@ -9203,7 +9166,7 @@ something with a bit more flair than the Modus themes.")
 (define-public emacs-doric-themes
   (package
     (name "emacs-doric-themes")
-    (version "1.1.0")
+    (version "1.0.0")
     (source
      (origin
        (method git-fetch)
@@ -9212,20 +9175,9 @@ something with a bit more flair than the Modus themes.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "15mmpab2nh7imdza8p4wy27x4ckfi9dnqjm5a1k9ix02d0i3b3yz"))
-       (modules '((guix build utils)))
-       (snippet #~(begin
-                  ;; This variable is only mentioned in the tests. See
-                  ;; https://github.com/protesilaos/doric-themes/issues/25
-                  (substitute* "tests/doric-themes-test.el"
-                    (("doric-themes-success-background-faces") ""))))))
+        (base32 "1aqmi59lh804rqi0w5n35panqv8jxar5dx3mw25f1n8ip43lp5jc"))))
     (build-system emacs-build-system)
-    (arguments
-     (list #:test-command
-           #~(list "emacs" "--batch" "-Q"
-                   "-l" "tests/doric-themes-test.el"
-                   "-f" "ert-run-tests-batch-and-exit")))
-    (native-inputs (list emacs-ert-runner))
+    (arguments (list #:tests? #f))      ;no tests
     (home-page "https://github.com/protesilaos/doric-themes")
     (synopsis "Highly readable minimalist Emacs themes")
     (description
@@ -13434,36 +13386,6 @@ adds support for interacting with a running Common Lisp process
 for compilation, debugging, documentation lookup, and so on.")
     (license (list license:gpl2+ license:public-domain))))
 
-(define-public emacs-sliver
-  (let ((commit "d08d41947bb943f25ee2de9573459a6c720e027f")
-        (revision "0"))
-    (package
-      (name "emacs-sliver")
-      ;; No tagged releases. Version comes from source code.
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/CSJ7701/Sliver")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "08qycim0mxyiqbik9hjlmzpdggl506bcsv1q1icxzd05bm73sh6n"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:tests? #f))                   ; No tests.
-      (home-page "https://github.com/CSJ7701/Sliver")
-      (synopsis "Modular configuration management for Emacs")
-      (description
-       "Sliver is a small Emacs package for structuring Emacs configurations into
-explicit, modular load units called slivers.  It provides declarative module
-loading, explicit dependency and conflict management, conditional loading and
-a light visualization user interface.  At its core, sliver is a wrapper around
-@code{load-file} with added quality-of-life functionalities.")
-      (license license:gpl3+))))
-
 (define-public emacs-popup
   (package
     (name "emacs-popup")
@@ -14515,7 +14437,7 @@ Features degrade gracefully when viewed from terminal.")
 (define-public emacs-org-supertag
   (package
     (name "emacs-org-supertag")
-    (version "5.8.1")
+    (version "5.6.3")
     (source
      (origin
        (method git-fetch)
@@ -14524,7 +14446,7 @@ Features degrade gracefully when viewed from terminal.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1hdag8kxn2zxwac0fq14c741k4pwzkwvjh5ybwsqc7220vqzhmhm"))))
+        (base32 "0ccr3s4mhk28klizbsb7cqhgg2h3092mpg1qvnzpzf53hwlhds2p"))))
     (build-system emacs-build-system)
     (arguments
      (list #:tests? #f                  ;no tests
@@ -18055,16 +17977,12 @@ strings, and code folding.")
     (version "1.2.0")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/redguardtoo/js-comint")
-              (commit version)))
+       (method url-fetch)
+       (uri (string-append "https://stable.melpa.org/packages/"
+                           "js-comint-" version ".el"))
        (sha256
-        (base32 "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka"))))
+        (base32 "1qin0hclm3ly62nl5ddiim64bcd2k74b1yqsqqc61cf9k2q8k287"))))
     (build-system emacs-build-system)
-    (arguments
-     (list
-      #:tests? #f))                     ; Tests depend on Eask
     (home-page "https://github.com/redguardtoo/js-comint")
     (synopsis "Interacting with a JavaScript interpreter")
     (description
@@ -18239,7 +18157,7 @@ Emacs buffers.")
 (define-public emacs-markdown-mode
   (package
     (name "emacs-markdown-mode")
-    (version "2.8")
+    (version "2.7")
     (source
      (origin
        (method git-fetch)
@@ -18248,26 +18166,10 @@ Emacs buffers.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05xcmp744sm1cp38zal5sqzj463igbsfhjn7vhgpzd97df95h9mp"))))
+        (base32 "1w6y18bg0fpvb5xwr827ynzbj0f0nh3dms3n0xq6hg38dcyly46b"))))
     (build-system emacs-build-system)
-    (arguments
-     (list #:test-command #~(list "make" "test")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'check 'skip-failing-tests
-                 (lambda _
-                   (let ((skip-tests
-                          `("-export/buffer-local-css-path"
-                            "-export/relative-css-path"
-                            "-export/url-css-path"
-                            "/wiki-link-rules"
-                            "/wiki-link-search-under-project")))
-                     (substitute* "tests/markdown-test.el"
-                       (("\\(ert-deftest test-markdown([a-z/-]*) \\(\\)"
-                         all test)
-                        (if (member test skip-tests)
-                            (string-append all "(skip-unless nil)")
-                            all)))))))))
+    (arguments (list #:test-command #~(list "make" "test")
+                     #:tests? #f))      ; XXX: 5 unexpected results
     (home-page "https://jblevins.org/projects/markdown-mode/")
     (synopsis "Emacs Major mode for Markdown files")
     (description
@@ -24528,7 +24430,7 @@ of XELB.")
     (inherit emacs-xelb)
     (name "emacs-xelb-no-x-toolkit")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-xelb)
        ((#:emacs emacs) `,emacs-no-x-toolkit)))))
 
 (define-public emacs-exwm-no-x-toolkit
@@ -24539,7 +24441,7 @@ of XELB.")
     (propagated-inputs
      (list emacs-xelb-no-x-toolkit))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-exwm)
        ((#:emacs emacs) `,emacs-no-x-toolkit)))))
 
 (define-public emacs-switch-window
@@ -26817,26 +26719,23 @@ in a generalized CSV (character-separated values) format.")
     (license license:gpl3+)))
 
 (define-public emacs-transmission
-  ;; No release since 2020-12-08.
-  (let ((commit "ae36637fe63e530c7b8baa59bf566a99e40fbfe4")
-        (revision "0"))
-    (package
-      (name "emacs-transmission")
-      (version (git-version "0.12.2" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/holomorph/transmission")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0ilg549gsza7adfwmivw52z5533zirrv17h41xk3ij6igwg1fk8c"))))
-      (build-system emacs-build-system)
-      (arguments (list #:tests? #f))    ; no tests
-      (home-page "https://github.com/holomorph/transmission")
-      (synopsis "Emacs interface to a Transmission session")
-      (description "This package provides an Emacs interface to interact with a
+  (package
+    (name "emacs-transmission")
+    (version "0.12.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/holomorph/transmission")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc"))))
+    (build-system emacs-build-system)
+    (arguments (list #:tests? #f))      ; no tests
+    (home-page "https://github.com/holomorph/transmission")
+    (synopsis "Emacs interface to a Transmission session")
+    (description "This package provides an Emacs interface to interact with a
 running session of the Transmission Bittorrent client.
 
 Features:
@@ -26848,7 +26747,7 @@ Features:
 contexts.
 @item Toggle downloading and set priorities for individual files.
 @end itemize\n")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-polymode
   (package
@@ -37498,7 +37397,7 @@ utilities.")
       #:tests? #f                       ;no test suite
       #:lisp-directory "src/extra"))
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs emacs-treemacs)
        (append emacs-all-the-icons
                emacs-evil
                emacs-magit
@@ -39235,14 +39134,14 @@ user interfaces for various built-in modes.")
 (define-public emacs-calibre
   (package
     (name "emacs-calibre")
-    (version "1.5.2")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://elpa.gnu.org/packages/calibre-" version
                            ".tar"))
        (sha256
-        (base32 "0iqgd44wca54l5rn8g6c9qak2c1wblbnrx5a0118hkgckimp8c3k"))))
+        (base32 "08rcwrydrlc995sdxn5ssm5f6ighxi5yr6i7bx9a1nf7n91mgbgh"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -39527,13 +39426,11 @@ or regions to a REPL from ~a buffers.") language))))
     (version "1.6")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/diadochos/org-babel-eval-in-repl")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append "https://stable.melpa.org/packages/"
+                           "org-babel-eval-in-repl-" version ".tar"))
        (sha256
-        (base32 "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a"))
+        (base32 "0bdnps6m3kcvsagz8cfm3kf2rvxzl2p252pfggwbdbl43kzvl35h"))
        (modules '((guix build utils)))
        (snippet
         #~(begin (delete-file "eval-in-repl-matlab.el")))))
@@ -44006,7 +43903,7 @@ conversion program}, a Japanese input method on Emacs.")
                        (string-append "LISPDIR=" #$output "/share/emacs/site-lisp")))
             ;; no tests in this subtree
             #:tests? #f)
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments emacs-ddskk)
         ((#:phases phases)
          #~(modify-phases #$phases
              (add-after 'fix-test 'chdir
@@ -47387,31 +47284,28 @@ Emacs.")
       (license license:gpl2+))))
 
 (define-public emacs-fpga
-  ;; Includes support for cadence genus.
-  (let ((commit "48ec1572ab3c96cbc20d0c542cfe56124e05d48b")
-        (revision "0"))
-    (package
-      (name "emacs-fpga")
-      (version (git-version "0.3.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/gmlarumbe/fpga")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0j1573m59iadip4qpg457jdl22gdgx1w41irdd0s300yqsrjxyms"))))
-      (build-system emacs-build-system)
-      ;;there are no tests
-      (arguments
-       (list #:tests? #f))
-      (home-page "https://github.com/gmlarumbe/fpga")
-      (synopsis "Emacs fpga & asic utilities")
-      (description
-       "Emacs-fpga provides emacs facilities to interface with fpga & asic
+  (package
+    (name "emacs-fpga")
+    (version "0.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/gmlarumbe/fpga")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "107vmjwk74iwp2xlpkx3f2q8a9bbygl15p09sfj0h4k9jzl4ia9m"))))
+    (build-system emacs-build-system)
+    ;;there are no tests
+    (arguments
+     (list #:tests? #f))
+    (home-page "https://github.com/gmlarumbe/fpga")
+    (synopsis "Emacs fpga & asic utilities")
+    (description
+     "Emacs-fpga provides emacs facilities to interface with fpga & asic
 tools from major vendors.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-semi-epg
   ;; No release since Dec 24, 2003.

gnu/packages/emacs.scm

@@ -386,7 +386,6 @@
                   (lambda ()
                     (display
                      (string-append
-                      ";; -*- lexical-binding: t; -*-\n"
                       "(setq find-function-C-source-directory \"" dest "\")\n\n"
                       "(provide 'guix-emacs-c-source)")))))))
           (add-after 'install 'install-site-start
@@ -413,7 +412,6 @@
                   (lambda ()
                     (display
                      (string-append
-                      ";; -*- lexical-binding: t; -*-\n"
                       "(when (require 'guix-emacs nil t)\n"
                       "  (guix-emacs-autoload-packages 'no-reload)\n"
                       "  (advice-add 'package-load-all-descriptors"
@@ -498,7 +496,7 @@ languages.")
     (synopsis "The extensible, customizable, self-documenting text
 editor (console only)")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-minimal)
        ((#:configure-flags flags #~'())
         #~(cons* "--with-modules" "--with-native-compilation=aot"
                  (delete "--with-gnutls=no" #$flags)))
@@ -562,7 +560,7 @@ editor (console only)")
                           (search-auxiliary-file "emacs/comp-integrity.el"))
                        "-f" "ert-run-tests-batch-and-exit")))))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs emacs-minimal)
        (prepend gnutls
                 ;; For native compilation
                 libgccjit
@@ -594,7 +592,7 @@ editor (console only)")
     (synopsis "The extensible, customizable, self-documenting text editor")
     (build-system glib-or-gtk-build-system)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-no-x)
        ((#:modules _) (%emacs-modules build-system))
        ((#:configure-flags flags #~'())
         #~(cons* "--with-cairo" #$flags))
@@ -616,7 +614,7 @@ editor (console only)")
                        (pdmp (find-files libexec "\\.pdmp$"))
                        (pdmp-real (find-files libexec "\\.pdmp-real$")))
                   (for-each rename-file pdmp-real pdmp))))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs emacs-no-x)
               (prepend
                cairo
                dbus
@@ -631,8 +629,6 @@ editor (console only)")
                libx11
                libxft
                libxpm
-               libxrender
-               libxt
                libwebp
                pango
                poppler)))))
@@ -641,13 +637,39 @@ editor (console only)")
   (package/inherit emacs
     (name "emacs-pgtk")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs)
        ((#:configure-flags flags #~'())
         #~(cons* "--with-pgtk" #$flags))))
     (synopsis "Emacs text editor with @code{pgtk} frames")
     (description "This Emacs build implements graphical UI purely in terms
 of GTK.")))
 
+(define-public emacs-xwidgets
+  (package/inherit emacs
+    (name "emacs-xwidgets")
+    (synopsis "The extensible, customizable, self-documenting text
+editor (with xwidgets support)")
+    (arguments
+     (substitute-keyword-arguments (package-arguments emacs)
+       ((#:configure-flags flags #~'())
+        #~(cons "--with-xwidgets" #$flags))))
+    (inputs
+     (modify-inputs (package-inputs emacs)
+       (prepend webkitgtk-with-libsoup2 libxcomposite)))))
+
+(define-public emacs-pgtk-xwidgets
+  (package
+    (inherit emacs-pgtk)
+    (name "emacs-pgtk-xwidgets")
+    (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support")
+    (arguments
+     (substitute-keyword-arguments (package-arguments emacs-pgtk)
+       ((#:configure-flags flags #~'())
+        #~(cons "--with-xwidgets" #$flags))))
+    (inputs
+     (modify-inputs (package-inputs emacs-pgtk)
+       (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
+
 (define-public emacs-lucid
   (package/inherit emacs-no-x
     (name "emacs-lucid")
@@ -690,7 +712,7 @@ editor (without X toolkit)" )
               (delete "gtk+")
               (prepend inotify-tools)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-no-x)
        ((#:configure-flags flags #~'())
         #~(cons "--with-x-toolkit=no" #$flags))))))
 
@@ -700,13 +722,13 @@ editor (without X toolkit)" )
     (synopsis "The extensible, customizable, self-documenting text
 editor (with wide ints)" )
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs)
        ((#:configure-flags flags)
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "55c752d631bcadd53e78b0798b813f50f90aefa9")
-        (revision "3"))
+  (let ((commit "509228fc6c026921c67459f21164e0325efc583b")
+        (revision "2"))
   (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -720,7 +742,7 @@ editor (with wide ints)" )
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "06z8hrz3490ja50vh073hi0ff69plhmn1g1p51gsiic3fvyc4dkz"))
+        (base32 "04aalyrx5jysk5fhlka98fhfx23sy99zp8j16i0ils20sflyig6n"))
        (patches
         (search-patches "emacs-next-disable-jit-compilation.patch"
                         "emacs-next-exec-path.patch"
@@ -729,7 +751,7 @@ editor (with wide ints)" )
                         "emacs-next-native-comp-fix-filenames.patch"
                         "emacs-native-comp-pin-packages.patch"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs-minimal)
        ((#:make-flags flags #~'())
         #~(append #$flags (list (string-append "SELECTOR=" #$%emacs-next-selector)))))))))
 
@@ -746,12 +768,13 @@ editor (with wide ints)" )
     (version version)
     (source source)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments emacs)
        ((#:make-flags flags #~'())
         #~(append #$flags (list (string-append "SELECTOR=" #$%emacs-next-selector))))))))
 
 (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)
 
@@ -773,10 +796,10 @@ editor (with wide ints)" )
                  (base32
                   "0ry0dn9xrndpz54hs92dnnsw4xa4qn4lz898ldlh2rs47ah1f4wl"))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs emacs)
          (prepend autoconf automake guile-for-guile-emacs)))
       (inputs
-       (modify-inputs inputs
+       (modify-inputs (package-inputs emacs)
          (prepend imagemagick)))
       (home-page "https://guile-emacs.org")
       (synopsis "Emacs text editor powered by Guile('s elisp implementation)")

gnu/packages/embedded.scm

@@ -168,7 +168,7 @@ embedded-4_9-branch/")
            ("gcc@5" ,gcc-5)
            ,@(package-native-inputs xgcc)))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments xgcc)
            ((#:phases phases)
             #~(modify-phases #$phases
                 (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
@@ -285,7 +285,7 @@ usable on embedded products.")
         (inherit base)
         (name "newlib-nano")
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments base)
            ;; The configure flags are identical to the flags used by the "GCC
            ;; ARM embedded" project.  They optimize newlib for use on small
            ;; embedded systems with limited memory.
@@ -374,11 +374,11 @@ embedded-7-branch/")
                     (search-patches
                      "gcc-7-cross-environment-variables.patch")))))
                (native-inputs
-                (modify-inputs native-inputs
+                (modify-inputs (package-native-inputs xgcc)
                   (delete "isl")
                   (prepend flex isl-0.18)))
                (arguments
-                (substitute-keyword-arguments arguments
+                (substitute-keyword-arguments (package-arguments xgcc)
                   ((#:phases phases)
                    #~(modify-phases #$phases
                        (add-after 'unpack 'expand-version-string
@@ -463,7 +463,7 @@ embedded-7-branch/")
             (base32
              "1dq23fqrk75g1a4v7569fvnnw5q440zawbxi3w0g05n8jlqsmvcy"))))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments base)
            ;; The configure flags are identical to the flags used by the "GCC
            ;; ARM embedded" project.
            ((#:configure-flags flags)
@@ -513,11 +513,11 @@ embedded-7-branch/")
                     (search-patches
                      "gcc-10-cross-environment-variables.patch")))))
                (native-inputs
-                (modify-inputs native-inputs
+                (modify-inputs (package-native-inputs xgcc)
                   (delete "isl")
                   (prepend flex isl-0.18)))
                (arguments
-                (substitute-keyword-arguments arguments
+                (substitute-keyword-arguments (package-arguments xgcc)
                   ((#:phases phases)
                    #~(modify-phases #$phases
                        (add-after 'unpack 'expand-version-string
@@ -602,7 +602,7 @@ embedded-7-branch/")
             (base32
              "095j23mg928rmf4yqmj39wc0nsd207liqrdw4ygh58nygsm4gpmh"))))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments base)
            ;; The configure flags are identical to the flags used by the "GCC
            ;; ARM embedded" project.
            ((#:configure-flags flags)
@@ -645,7 +645,7 @@ embedded-7-branch/")
            (sha256
             (base32 "0r6q0m3d8g3k3rkmnqjw8aw5fcnsrmywf4ispdkxmk1al3whk1vk"))))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments base)
            ((#:phases phases)
             #~(modify-phases #$phases
                 (replace 'expand-version-string
@@ -685,7 +685,7 @@ embedded-7-branch/")
            (sha256
             (base32
              "0drs9v8avh4y2h5bs0ixjn9x662jzkkikx8z034wgl41dxmn6786"))))
-        (arguments (substitute-keyword-arguments arguments
+        (arguments (substitute-keyword-arguments (package-arguments base)
                      ((#:configure-flags flags)
                       #~(cons* "--enable-newlib-mb"
                                "--enable-newlib-reent-check-verify"
@@ -761,7 +761,7 @@ embedded-7-branch/")
       (package
         (inherit base)
         (name "libstdc++-nano-arm-none-eabi")
-        (arguments (substitute-keyword-arguments arguments
+        (arguments (substitute-keyword-arguments (package-arguments base)
                      ((#:make-flags flags)
                       #~(map (lambda (flag)
                                (if (or (string-prefix? "CFLAGS=" flag)
@@ -902,7 +902,7 @@ languages are C and C++.")
       (inherit gdb)
       (name "gdb-arm-none-eabi")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments gdb)
          ((#:configure-flags flags '())
           #~(cons* "--target=arm-none-eabi"
                    "--enable-multilib"
@@ -1069,7 +1069,7 @@ with a layered architecture of JTAG interface and TAP support.")
                     "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck"))
                   (patches '())))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments xbinutils)
            ((#:configure-flags flags)
             #~(cons "--disable-werror" #$flags))
            ;; FIXME: For some reason there are many test failures.  It's not
@@ -1110,7 +1110,7 @@ with a layered architecture of JTAG interface and TAP support.")
                     (origin-patches (package-source gcc-6))
                     (search-patches "gcc-cross-environment-variables.patch")))))
         (native-inputs
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs xgcc)
            (prepend flex)))
         ;; All headers and cross libraries of the propeller toolchain are
         ;; installed under the "propeller-elf" prefix.
@@ -1149,14 +1149,14 @@ with a layered architecture of JTAG interface and TAP support.")
                     (search-patches
                      "gcc-cross-environment-variables.patch")))))
         (arguments
-         (substitute-keyword-arguments arguments
+         (substitute-keyword-arguments (package-arguments xgcc)
            ((#:phases phases)
             #~(modify-phases #$phases
                 (delete 'pre-x86-configure)
                 (add-after 'unpack 'chdir
                   (lambda _ (chdir "gcc")))))))
         (native-inputs
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs xgcc)
            (prepend gcc-5)))
         (home-page "https://github.com/parallaxinc/propgcc")
         (supported-systems (delete "aarch64-linux" %supported-systems))))))
@@ -1626,6 +1626,139 @@ SPI, I2C, JTAG.")
     (home-page "https://hyvatti.iki.fi/~jaakko/pic/picprog.html")
     (license license:gpl3+)))
 
+(define-public fc-host-tools
+  (package
+    (name "fc-host-tools")
+    (version "15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "ftp://ftp.freecalypso.org/pub/GSM/"
+                                  "FreeCalypso/fc-host-tools-r" version ".tar.bz2"))
+              (sha256
+               (base32
+                "17v3xc44mmlvp0irwm1p55zdgzd31ic3nsjxnv8y28a1i85103cv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ; No tests exist.
+       #:make-flags
+       (list (string-append "INSTALL_PREFIX=" %output)
+             (string-append "INCLUDE_INSTALL_DIR=" %output "include/rvinterf"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-installation-paths
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (cons* "miscutil/c139explore"
+                                 "miscutil/pirexplore"
+                                 (find-files "." "^(.*\\.[ch]|Makefile)$"))
+               (("/opt/freecalypso/bin/fc-simtool")
+                "fc-simtool")
+               (("/opt/freecalypso/bin/fc-uicc-tool")
+                "fc-uicc-tool")
+               (("/opt/freecalypso/loadtools")
+                (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
+               (("\\$\\{INSTALL_PREFIX\\}/loadtools")
+                (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
+               (("\\$\\{INSTALL_PREFIX\\}/target-bin")
+                (string-append (assoc-ref outputs "out") "/lib/freecalypso/target-bin"))
+               (("/opt/freecalypso")
+                (assoc-ref outputs "out")))
+             #t))
+         (delete 'configure))))
+    (inputs
+     (list libx11))
+    (synopsis "Freecalypso host tools")
+    (description "This package provides some tools for debugging FreeCalypso phones and the FreeCalypso FCDEV3B dev board.
+
+@enumerate
+@item fc-e1decode: Decodes a binary Melody E1 file into an ASCII source file.
+@item fc-e1gen: Encodes an ASCII Melody E1 file into a binary Melody E1 file.
+@item fc-fr2tch: Converts a GSM 06.10 speech recording from libgsm to hex
+strings of TCH bits to be fed to the GSM 05.03 channel encoder of a TI
+Calypso GSM device.
+@item fc-tch2fr: Converts hex strings of TCH bits to libgsm.
+@item fc-gsm2vm: utility converts a GSM 06.10 speech sample from the libgsm
+source format into a voice memo file that can be uploaded into the FFS of a
+FreeCalypso device and played with the audio_vm_play_start() API or the
+AT@@VMP command that invokes the latter.
+@item fc-rgbconv: Convers RGB 5:6:5 to RGB 8:8:8 and vice versa.
+@item rvinterf: Communicates with a TI Calypso GSM device via RVTMUX.
+@item rvtdump: produces a human-readable dump of all output emitted by a
+TI-based GSM fw on the RVTMUX binary packet interface.
+@item fc-shell: FreeCalypso firmwares have a feature of our own invention
+(not present in any pre-existing ones) to accept AT commands over the RVTMUX
+interface.  It is useful when no second UART is available for a dedicated
+standard AT command interface.  fc-shell is the tool that allows you to send
+AT commands to the firmware in this manner.
+@item fc-memdump: Captures a memory dump from a GSM device.
+@item fc-serterm: Trivial serial terminal.  Escapes binary chars.
+@item fc-fsio: Going through rvinterf, this tool connects to GSM devices and
+allows you to manipulate the device's flash file system.
+@item tiaud-compile: Compiles an audio mode configuration table for TI's
+Audio Service from our own ASCII source format into the binary format for
+uploading into FreeCalypso GSM device FFS with fc-fsio.
+@item tiaud-decomp: Decodes TI's audio mode configuration files read out of
+FFS into our own ASCII format.
+@item tiaud-mkvol: Generates the *.vol binary files which need to accompany
+the main *.cfg ones.
+@item fc-compalram: Allows running programs on the device without writing
+them to flash storage.
+@item fc-xram: Allows running programs on the device without writing them
+to flash storage.
+@item fc-iram: Allows running programs on the device without writing them
+to flash storage.
+@item fc-loadtool: Writes programs to the device's flash storage.
+@item fc-simint: Loads and runs simagent on the phone, then calls fc-simtool
+(see @url{https://www.freecalypso.org/hg/fc-sim-tools,fc-sim-tools
+repository}) on the host to connect to it.
+@item pirffs: Allows listing and extracting FFS content captured as a raw
+flash image from Pirelli phones.
+@item mokoffs: Allows listing and extracting FFS content captured as a raw
+flash image from OpenMoko phones.
+@item tiffs: Allows listing and extracting FFS content captured as a raw
+flash image from TI phones.
+@item c139explore: Run-from-RAM program for C139 phones that
+exercises their peripheral hardware: LCD, keypad backlight, buzzer, vibrator.
+@item pirexplore: Run-from-RAM program for Pirelli DP-L10 phones that
+exercises their peripheral hardware, primarily their LCD.
+@item tfc139: Breaks into Mot C1xx phones via shellcode injection, allowing
+you to reflash locked phones with new firmware with fc-loadtool.
+@item ctracedec: GSM firmwares built in TI's Windows environment have a
+compressed trace misfeature whereby many of the ASCII strings
+in debug trace messages get replaced with numeric indices at
+build time, and these numeric indices are all that gets emitted
+on the RVTMUX serial channel.  This tools decodes these numeric indices
+back to strings in trace output.
+@item fc-cal2text: This utility takes a dump of TI's /gsm/rf flash file system
+directory subtree as input (either extracted in vitro with tiffs
+or read out in vivo with fc-fsio) and converts all RF tables
+found therein into a readable ASCII format.
+@item imei-luhn: Computes or verifies the Luhn check digit of an IMEI number.
+@item fc-dspapidump: Reads and dumps the contents of the DSP API RAM in a
+target Calypso GSM device.
+@item fc-vm2hex: Converts the old-fashioned (non-AMR) voice memo files read
+out of FFS into hex strings.
+@item fc-buzplay: Plays piezoelectic buzzer melodies on an actual
+Calypso device equipped with such a buzzer (Mot C1xx, TI's D-Sample board,
+our planned future HSMBP) by loading a buzplayer agent onto the target and
+feeding melodies to be played to it.
+@item fc-tmsh: TI-based GSM firmwares provide a rich set of Test Mode commands
+that can be issued through the RVTMUX (debug trace) serial channel.
+This program is our test mode shell for sending Test Mode commands to targets
+and displaying decoded target responses.
+@item fcup-smsend: Send a short message via SMS
+@item fcup-smsendmult: Send multiple short messages via SMS in one go
+@item fcup-smsendpdu: Send multiple short messages given in PDU format via SMS
+@item sms-pdu-decode: Decode PDU format messages
+@item fc-dspromdump: Dump DSP ROM.
+@item pcm-sms-decode: Decode /pcm/SMS binary files read out of FFS maintained
+by Pirelli DP-L10.  Display the SMS in human-readable form.
+@item srec-regions: Parse S-record (TI's *.m0), identify the set of
+discontiguous regions into which this SREC image deposits bits, and list
+these identified regions.
+@end enumerate")
+    (home-page "https://www.freecalypso.org/")
+    (license license:public-domain)))
+
 (define-public stcgal
   (package
     (name "stcgal")

gnu/packages/emulators.scm

@@ -28,7 +28,6 @@
 ;;; Copyright © 2025 Laura Kirsch <laurakirsch240406@gmail.com>
 ;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
 ;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
-;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -692,7 +691,7 @@ turbo speed, networked multiplayer, and graphical enhancements.")
                           "libretro-dolphin-emu-libusb-assert.patch"
                           "libretro-dolphin-emu-vulkan-headers.patch"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments dolphin-emu)
          ((#:configure-flags flags ''())
           #~(cons* (string-append "-DCMAKE_CXX_FLAGS="
                                   "-I" (search-input-directory
@@ -1154,19 +1153,19 @@ The following systems are supported:
            (base32
             "1bbcsikgcycf3cp9ciicg4yckjyamdfvgk4fgw079la59q8aw13q"))))
        (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments mgba)
           ((#:configure-flags flags ''())
            ;; Relax error checks to avoid a build failure with GCC 14.
            #~(cons "-DCMAKE_C_FLAGS=-Wno-error=incompatible-pointer-types"
                    #$flags))))
       (inputs
-        (modify-inputs inputs
+        (modify-inputs (package-inputs mgba)
                        (replace "ffmpeg" ffmpeg-6)))))))
 
 (define-public sameboy
   (package
     (name "sameboy")
-    (version "1.0.3")
+    (version "1.0.2")
     (source
      (origin
        (method git-fetch)
@@ -1175,12 +1174,12 @@ The following systems are supported:
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "107k6lfh4y9q73azab0r7pb7hs8fwk46537pfc5liqp38blz6ij5"))))
+        (base32 "0pwnik37c3sgvib5xbadwbq2mjjvgxilhig09rjb3xp5i1d7ykja"))))
     (build-system gnu-build-system)
     (native-inputs
      (list rgbds pkg-config))
     (inputs
-     (list libpng sdl2))
+     (list sdl2))
     (arguments
      `(#:tests? #f                      ; There are no tests
        #:make-flags `(,(string-append "CC=" ,(cc-for-target))
@@ -4249,7 +4248,7 @@ performance, features, and ease of use.")
                  (base32
                   "0z9wqmx351f9160jsmprznqw5sx5lslyisbr41b9igzsr5j94db3"))))
       (build-system gnu-build-system)
-      (arguments (substitute-keyword-arguments arguments
+      (arguments (substitute-keyword-arguments (package-arguments bsnes)
                    ((#:make-flags flags ''())
                     ;; This is needed because the modified bsnes code that
                     ;; bsnes-hd uses is based on an older copy that still
@@ -4280,7 +4279,7 @@ turn into actual gradients (without influencing the sharpness of the artwork).
   (package/inherit bsnes-hd
     (name "libretro-bsnes-hd")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bsnes-hd)
        ((#:make-flags flags ''())
         #~(cons "target=libretro" #$flags))
        ((#:phases phases '%standard-phases)
@@ -4508,7 +4507,7 @@ Advance.")
                  (base32
                   "1sbhq614rvcm01ln7883ivdhni1mg1v4lyyvcwsy92i9wbh8qd9i"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments jg-bsnes)
          ((#:make-flags flags)
           #~(cons* #$(string-append "GIT_VERSION=" version)
                    (string-append "prefix=" #$output)
@@ -4853,7 +4852,7 @@ and Atomiswave emulator derived from reicast.")
 (define-public libretro-flycast
   (package/inherit flycast
     (name "libretro-flycast")
-    (arguments (substitute-keyword-arguments arguments
+    (arguments (substitute-keyword-arguments (package-arguments flycast)
                  ((#:configure-flags flags)
                   #~(cons "-DLIBRETRO=ON" #$flags))))))
 

gnu/packages/engineering.scm

@@ -209,13 +209,12 @@
               (sha256
                (base32
                 "1k67x4l27ac6sb944b42zscm0ffq2fxbghapspgj75g4dr8ip38a"))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
     (arguments
      (list
-      #:qtbase qtbase
       #:tests? #f))                       ;no tests
     (inputs
-     (list qtbase qttools qtserialport qtwayland))
+     (list qtbase qttools qtserialport))
     (home-page "https://gitlab.com/cutecom/cutecom")
     (synopsis "Graphical serial terminal")
     (description
@@ -227,7 +226,7 @@ their devices.")
 (define-public librecad
   (package
     (name "librecad")
-    (version "2.2.1.4")
+    (version "2.2.1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -236,7 +235,7 @@ their devices.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0da17lc3h0j466mwazss9iriy1hf5kfnnz5zyp2pp4r23l3gi93v"))))
+                "1km7n85arh818ka1bgdz0nx7ib48djipgwkml0rm4s5vv2p2kzbb"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -359,6 +358,155 @@ tool to forward annotation from your schematic to layout using PCB; some minor
 utilities.")
     (license license:gpl2+)))
 
+(define-public lepton-eda
+  (package
+    (name "lepton-eda")
+    (version "1.9.18-20220529")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/lepton-eda/lepton-eda/")
+                     (commit version)))
+              (sha256
+               (base32
+                "06plrcab3s2rpyf0qv2gzc1yp33627xi8105niasgixckk6glnc2"))
+              (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list
+         ;; When running "make", the POT files are built with the build time as
+         ;; their "POT-Creation-Date".  Later on, "make" notices that .pot
+         ;; files were updated and goes on to run "msgmerge"; as a result, the
+         ;; non-deterministic POT-Creation-Date finds its way into .po files,
+         ;; and then in .gmo files.  To avoid that, simply make sure 'msgmerge'
+         ;; never runs.  See <https://bugs.debian.org/792687>.
+         "ac_cv_path_MSGMERGE=true"
+         (string-append "--with-pcb-datadir="
+                        #$(this-package-input "pcb")
+                        "/share")
+         (string-append "--with-pcb-lib-path="
+                        #$(this-package-input "pcb")
+                        "/share/pcb/pcblib-newlib:"
+                        #$(this-package-input "pcb")
+                        "/share/pcb/newlib")
+         "--with-gtk3"
+         "CFLAGS=-fcommon"
+         "--enable-guild"
+         "--enable-contrib")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              ;; For logs and auto-compilation
+              (setenv "HOME" "/tmp")
+
+              ;; Ensure that readline is found by lepton-shell
+              (substitute* "script.in"
+                (("\\(eval-when \\(expand load eval\\)" m)
+                 (string-append "
+(add-to-load-path \"" #$(this-package-input "guile-readline")
+"/share/guile/site/3.0\")
+(set! %load-compiled-path (cons \""
+#$(this-package-input "guile-readline")
+"/lib/guile/3.0/site-ccache/"
+"\" %load-compiled-path))
+" m)))))
+          (add-before 'build 'fix-dynamic-link
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "liblepton/scheme/lepton/ffi/lib.scm"
+                (("\"liblepton\"")
+                 (string-append "\"" #$output "/lib/liblepton.so" "\""))
+                (("\"libleptonattrib\"")
+                 (string-append "\"" #$output "/lib/libleptonattrib.so" "\""))
+                (("\"libleptongui\"")
+                 (string-append "\"" #$output "/lib/libleptongui.so" "\""))
+                (("\"libglib-2.0\"")
+                 (string-append
+                  "\"" (search-input-file inputs "/lib/libglib-2.0.so") "\""))
+                (("\"libgobject-2.0\"")
+                 (string-append
+                  "\"" (search-input-file inputs "/lib/libgobject-2.0.so") "\""))
+                (("\"libgtk-3\"")
+                 (string-append
+                  "\"" (search-input-file inputs "/lib/libgtk-3.so") "\"")))
+
+              ;; For finding libraries when running tests before installation.
+              (setenv "LIBLEPTONGUI"
+                      (string-append (getcwd)
+                                     "/libleptongui/src/.libs/libleptongui.so"))
+              (setenv "LIBLEPTON"
+                      (string-append (getcwd)
+                                     "/libleptongui/src/.libs/liblepton.so"))
+              (setenv "LD_LIBRARY_PATH"
+                      (string-append (getcwd)
+                                     "/libleptonattrib/src/.libs/:"
+                                     (getenv "LIBRARY_PATH")))))
+          (add-before 'bootstrap 'prepare
+            (lambda _
+              ;; Some of the scripts there are invoked by autogen.sh.
+              (for-each patch-shebang
+                        (find-files "build-tools"))
+
+              ;; Make sure 'msgmerge' can modify the PO files.
+              (for-each (lambda (po)
+                          (chmod po #o666))
+                        (find-files "." "\\.po$"))
+
+              ;; This would normally be created by invoking 'git', but it
+              ;; doesn't work here.
+              (call-with-output-file "version.h"
+                (lambda (port)
+                  (format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
+                          #$(string-drop version
+                                         (+ 1
+                                            (string-index version #\-))))
+                  (format port
+                          "#define PACKAGE_DOTTED_VERSION \"~a\"~%"
+                          #$(string-take version
+                                         (string-index version #\-)))
+                  (format port
+                          "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))))
+          (add-after 'install 'compile-scheme-files
+            (lambda _
+              (unsetenv "LIBLEPTONGUI")
+              (unsetenv "LIBLEPTON")
+              (unsetenv "LD_LIBRARY_PATH")
+              (invoke "make" "precompile"))))))
+    (native-inputs
+     (list autoconf
+           automake
+           desktop-file-utils
+           flex
+           gettext-minimal
+           groff
+           gawk
+           libtool
+           pkg-config
+           m4
+           perl
+           texinfo))
+    (inputs
+     (list glib
+           gtk+
+           gtksheet
+           guile-3.0
+           guile-readline
+           pcb
+           shared-mime-info))
+    (home-page "https://lepton-eda.github.io/")
+    (synopsis "GPL Electronic Design Automation")
+    (description
+     "Lepton EDA ia an @dfn{electronic design automation} (EDA) tool set
+forked from gEDA/gaf in late 2016.  EDA tools are used for electrical circuit
+design, schematic capture, simulation, prototyping, and production.  Lepton
+EDA includes tools for schematic capture, attribute management, bill of
+materials (BOM) generation, netlisting into over 20 netlist formats, analog
+and digital simulation, and printed circuit board (PCB) layout, and many other
+features.")
+    (license license:gpl2+)))
+
 (define-public pcb
   (package
     (name "pcb")
@@ -537,7 +685,7 @@ multipole-accelerated algorithm.")
                                        "fasthenry-spUtils.patch"
                                        "fasthenry-spSolve.patch"
                                        "fasthenry-spFactor.patch"))))
-    (native-inputs (list gcc-7))
+    (native-inputs (list gcc-9))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list "CC=gcc" "RM=rm" "SHELL=sh" "all")
@@ -1001,7 +1149,7 @@ Emacs).")
 (define-public kicad
   (package
     (name "kicad")
-    (version "9.0.8")
+    (version "9.0.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1009,7 +1157,7 @@ Emacs).")
                     (commit version)))
               (sha256
                (base32
-                "1b995p0qb9cjpj0n3x3szbqr6d7fxwmrp2nbx37y7ym2bc1lpxd8"))
+                "0glsdq5c54d2sif0jmpym79i6vham5w3kzcvcr0yq5nimqig7h0q"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
@@ -1126,7 +1274,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "07g80p1igp8j3kh3qpmqd150i9950w1143yhncwik2ypccwjdfjy"))))
+                "1b03mc5ad0w3lhgig131jkfa243mlkzk9myjyr78lhqw07k7sxk2"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags (list "-DBUILD_FORMATS=html")
@@ -1203,7 +1351,7 @@ libraries.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j26dmgz7xfixlqrzclb1wpc6zkd10n1fq7rmdrgwwx083p3c7a8"))))
+                "1bv1k8i01x7gyayrlkzl3d2nsf7mcdmzx8gjwx1i2va9557rgli9"))))
     (synopsis "Official KiCad 3D model libraries")
     (description "This package contains the official KiCad 3D model libraries.")))
 
@@ -1259,6 +1407,57 @@ in the context of per-cpu data.  The library offers ABI headers to interface
 with the kernel and various utilities such as per-cpu counters.")
       (license (list license:lgpl2.1 license:expat)))))
 
+(define-public horizon-eda
+  (package
+    (name "horizon-eda")
+    (version "2.7.0")
+    ;; TODO: try to unbundle some of the 3rd parties.
+    ;; We have packages for nlohmann-json, range-v3, catch2 and clipper.
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/horizon-eda/horizon")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1sq1d2x9wq168cz91l2rd93gnlq5scknb45bi1njqqcw3jjjhsk3"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no tests
+      #:glib-or-gtk? #t))
+    (native-inputs (list cmake-minimal ;; OpenCASCADE is only found by cmake
+                         `(,glib "bin")
+                         gobject-introspection
+                         pkg-config))
+    (inputs (list boost
+                  cairomm
+                  cppzmq
+                  curl
+                  glib
+                  glibmm
+                  glm
+                  gsettings-desktop-schemas
+                  gtk+
+                  gtkmm-3
+                  libarchive
+                  libgit2-glib
+                  librsvg
+                  libspnav
+                  libzip
+                  opencascade-occt
+                  podofo
+                  sqlite
+                  `(,util-linux "lib")
+                  zeromq))
+    (home-page "https://horizon-eda.org/")
+    (synopsis "Electronic Design Automation package")
+    (description "Horizon EDA is an Electronic Design Automation package
+supporting an integrated end-to-end workflow for printed circuit board design
+including parts management and schematic entry.")
+    (license license:gpl3+)))
+
 (define-public linsmith
   (package
     (name "linsmith")
@@ -1305,15 +1504,13 @@ the 'showing the effect of'-style of operation.")
                                    "tests/test_main.cpp")
                       (("catch\\.hpp")
                        "catch2/catch.hpp"))))))
-    (build-system qt-build-system)
+    (build-system cmake-build-system)
     (arguments
-     (list #:qtbase qtbase
-           #:phases
-           #~(modify-phases %standard-phases
-               (replace 'check
-                 (lambda* (#:key tests? #:allow-other-keys)
-                   (when tests?
-                     (invoke "./valeronoi-tests")))))))
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "./valeronoi-tests")))))))
     (inputs (list boost
                   cgal
                   gmp
@@ -1321,8 +1518,7 @@ the 'showing the effect of'-style of operation.")
                   mpfr
                   openssl
                   qtbase
-                  qtsvg
-                  qtwayland))
+                  qtsvg))
     (native-inputs (list catch2))
     (home-page "https://github.com/ccoors/Valeronoi")
     (synopsis "WiFi mapping companion application for Valetudo")
@@ -2598,35 +2794,30 @@ Microwave engineering.")
 (define-public python-lcapy
   (package
     (name "python-lcapy")
-    (version "1.26")
+    (version "1.24")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "lcapy" version))
        (sha256
-        (base32 "084jbrjzii1n5v91jnqiah0n4m9g3sq4iz4f0d8j7ihsrhsrdz7d"))))
+        (base32 "0lmprghkr274l3ykiq80a31njrzj7qqgm02wifkkwh2935shbk76"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       ;; This test fails by FileNotFoundError (a schematic file), possibly
       ;; because it's not included in PyPI.
-      #:test-flags #~(list "-k" "not test_circuitgraph")
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'remove-importlib
-                     (lambda _
-                       (substitute* "setup.py"
-                         ;; Archived project that exists to maintain Python2
-                         ;; compatibility.
-                         (("'importlib',") "")))))))
+      #:test-flags #~(list "-k" "not test_circuitgraph")))
     (propagated-inputs (list python-ipython
                              python-matplotlib
                              python-networkx
                              python-numpy
                              python-property-cached
                              python-scipy
-                             python-sympy))
+                             python-sympy
+                             python-wheel))
     (native-inputs (list python-pytest
-                         python-setuptools))
+                         python-setuptools
+                         python-wheel))
     (home-page "https://github.com/mph-/lcapy")
     (synopsis "Symbolic linear circuit analysis")
     (description "Lcapy is a Python package for linear circuit analysis.  It
@@ -2815,7 +3006,7 @@ models in the STL and OFF file formats.")
                        ""))))
        (file-name (git-file-name name version))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments openscad)
        ((#:configure-flags flags)
         #~(begin
             (use-modules (srfi srfi-1))
@@ -2845,7 +3036,7 @@ models in the STL and OFF file formats.")
                   (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake")
                    (string-append (assoc-ref inputs "sanitizers-cmake")
                                   "/share/sanitizers-cmake/cmake")))))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs openscad)
               (append curl libfive)))
     (synopsis "Script-based 3D modeling app with Python support")
     (description
@@ -3065,27 +3256,28 @@ extension and customization.")
 (define-public libmedfile
   (package
     (name "libmedfile")
-    (version "6.0.1")
+    (version "4.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://files.salome-platform.org/Salome/medfile/med-"
+             "https://files.salome-platform.org/Salome/other/med-"
              version ".tar.gz"))
        (sha256
         (base32
-         "1a0zbdaj3s459s0cdayq4s3k3vbrfg7y32sf7s7qvi2bhz3fvwgq"))))
+         "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54"))))
     (build-system cmake-build-system)
-    (inputs (list hdf5 zlib))
+    (inputs (list hdf5-1.10))
     (arguments
-     (list
-      #:parallel-tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-        (add-after 'install 'remove-test-output
-          (lambda _
-            (delete-file-recursively
-             (string-append #$output "/bin/testc")))))))
+     `(#:parallel-tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'remove-test-output
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (delete-file-recursively
+                (string-append out "/bin/testc"))
+               #t))))))
     (home-page "https://www.salome-platform.org")
     (synopsis "Library to read and write MED files")
     (description

gnu/packages/fabric-management.scm

@@ -36,7 +36,6 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages rocm)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages tcl))
 
@@ -224,16 +223,14 @@ testing InfiniBand networks.")
                                           #$(this-package-input "rdma-core"))
 
                            (string-append "--with-rdmacm="
-                                          #$(this-package-input "rdma-core"))
-                           (string-append "--with-rocm="
-                                          #$(this-package-input "rocr-runtime")))
+                                          #$(this-package-input "rdma-core")))
 
       ;; Be verbose so that compiler flags are displayed.
       #:make-flags #~'("V=1")))
     (native-inputs
      (list autoconf automake libtool pkg-config))
     (inputs
-     (list numactl rdma-core rocr-runtime))
+     (list numactl rdma-core))
     (synopsis "Optimized communication layer for message passing in HPC")
     (description
      "Unified Communication X (UCX) provides an optimized communication layer

gnu/packages/fcitx5.scm

@@ -310,7 +310,7 @@ IM module for GTK+3 applications.
             (lambda _
               (chdir ".."))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs fcitx5-gtk)
        (delete "gtk+")
        (prepend fcitx5-gtk gtk)))
     (native-search-paths

gnu/packages/file-systems.scm

@@ -894,7 +894,7 @@ performance and other characteristics.")
     (inherit bcachefs-tools-minimal)
     (name "bcachefs-tools-minimal-static")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bcachefs-tools-minimal)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             (add-after 'unpack 'patch-makefile
@@ -931,7 +931,7 @@ performance and other characteristics.")
                 (apply invoke "make" "install"
                        (string-append "PREFIX=" #$output)
                        #$(bcachefs-tools-make-install-flags))))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs bcachefs-tools-minimal)
               (prepend `(,eudev "static")
                        `(,keyutils "static")
                        `(,libscrypt "static")
@@ -1497,9 +1497,7 @@ APFS.")
                                  "@libdir@"))))))))
     (home-page "https://snapper.io")
     (native-inputs
-     (list
-      (libc-locales-for-target (%current-system))
-      autoconf automake libtool pkg-config))
+     (list glibc-locales autoconf automake libtool pkg-config))
     (inputs
      (list btrfs-progs
            e2fsprogs
@@ -2182,7 +2180,7 @@ memory-efficient.")
       #:configure-flags
       #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie"
           "LDFLAGS=-static")
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments squashfuse)
         ((#:phases phases)
          #~(modify-phases #$phases
              (add-after 'install 'install-private-headers
@@ -2199,68 +2197,58 @@ memory-efficient.")
 (define-public tmsu
   (package
     (name "tmsu")
-    ;; XXX: 0.7.5 was released in 2019, since that time master branch
-    ;; accumulated a lot of fixes and support for a fresh Go version, use the
-    ;; latest (2022), commit from master's HEAD. Project closed Issues and
-    ;; Pull Requests, potentially it's abandoned one.
-    (properties '((commit . "0bf4b8031cbeffc0347007d85647062953e90571")
-                  (revision . "0")))
-    (version (git-version "0.7.5"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
+    (version "0.7.5")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/oniony/TMSU")
-              (commit (assoc-ref properties 'commit))))
+             (url "https://github.com/oniony/TMSU")
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1kyncrmbaxhhqys2mhnvbz95zh72arv3an9hfhjbdcxa12b9w6g5"))))
+         "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"))))
     (build-system go-build-system)
     (arguments
      (list
-      #:install-source? #f
+      #:go go-1.23
       #:import-path "github.com/oniony/TMSU"
-      #:build-flags
-      #~(list "-tags=libsqlite3")
-      #:test-flags
-      #~(list "-vet=off" "-tags=libsqlite3")
+      #:install-source? #f
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'install 'fix-bin-name
-            (lambda _
-              (rename-file (string-append #$output "/bin/TMSU")
-                           (string-append #$output "/bin/tmsu"))))
-          (add-after 'install 'install-misc
+          (add-after 'unpack 'adjust-makefile
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
-                (let ((bin (string-append #$output "/bin"))
-                      (sbin (string-append #$output "/sbin")))
-                  (for-each (lambda (f) (install-file f bin))
-                            (list "misc/bin/tmsu-fs-merge"
-                                  "misc/bin/tmsu-fs-mv"
-                                  "misc/bin/tmsu-fs-rm"))
-                  (install-file "misc/bin/mount.tmsu" sbin)))))
-          (add-after 'install 'install-shell-completions
+                (substitute* "Makefile"
+                  (("SHELL=.*") (string-append "SHELL=" (which "sh") "\n"))
+                  ;; Make sure we do not compile 2 more times during the check
+                  ;; phase.
+                  (("unit-test: compile") "unit-test:")
+                  (("integration-test: compile") "integration-test:")
+                  ;; Simplify install path.
+                  (("usr/") "")))))
+          (replace 'build
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
-                (let ((bash (string-append #$output "/etc/bash_completion.d"))
-                      (zsh  (string-append #$output "/share/zsh/site-functions")))
-                  (for-each mkdir-p (list bash zsh))
-                  (copy-file "misc/bash/tmsu" (string-append bash "/tmsu"))
-                  (copy-file "misc/zsh/_tmsu" (string-append zsh "/_tmsu"))))))
-          (add-after 'install 'install-man-pages
+                (invoke "make" "compile"))))
+          (replace 'check
+            (lambda* (#:key import-path tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  ;; Remove shaky test file, see
+                  ;; <https://github.com/oniony/TMSU/issues/281>.
+                  (for-each
+                   (lambda (test-file)
+                     (delete-file test-file))
+                   (find-files "." "^fingerprinter_test.go$"))
+                  (invoke "make" "test")))))
+          (replace 'install
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
-                (install-file "misc/man/tmsu.1"
-                              (string-append #$output "/share/man/man1"))))))))
+                (setenv "DESTDIR" #$output)
+                (invoke "make" "install")))))))
     (inputs
-     (list go-github-com-mattn-go-sqlite3
-           go-github-com-hanwen-go-fuse
-           go-golang-org-x-crypto
-           sqlite))
+     (list go-github-com-mattn-go-sqlite3 go-github-com-hanwen-go-fuse))
     (home-page "https://github.com/oniony/TMSU")
     (synopsis "Tag files and access them through a virtual file system")
     (description

gnu/packages/finance.scm

@@ -236,11 +236,11 @@ line client and a client based on Qt.")
                (base32
                 "04kh88xklyq5w2x0zykfas6ssxajp1z33c2899fq342jnfr510b6"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments bitcoin-core)
        ((#:qtbase original-flags #f)
         qtbase-5)))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs bitcoin-core)
        (delete qttools)
        (append imagemagick
                librsvg
@@ -393,14 +393,14 @@ Accounting.")
 (define-public homebank
   (package
     (name "homebank")
-    (version "5.10")
+    (version "5.9.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.gethomebank.org/public/sources"
                                   "/homebank-" version ".tar.gz"))
               (sha256
                (base32
-                "11j3qnmsyj4bfqzpdxcah8z3k97laka87hfpwl9rg85v5sxxhgvq"))))
+                "0ymp7qj6im1cl66lbf9q2r8dgav3dagbhbipskg8zcgj0kz0ncph"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool))

gnu/packages/firmware.scm

@@ -584,8 +584,8 @@ utilities used to process FCODE, OpenFirmware's byte code, consisting of:
                                            "\\.elf$"))))))))
     (native-inputs
      (append (if (string-prefix? (%current-system) target)
-                 '()
-                 (list (cross-gcc target) (cross-binutils target)))
+                 (list gcc-10)
+                 (list (cross-gcc target #:xgcc gcc-10) (cross-binutils target)))
              (list fcode-utils libxslt which)))
     (home-page "https://openfirmware.info/Welcome_to_OpenBIOS")
     (synopsis "Open Firmware implementation")
@@ -601,7 +601,7 @@ provide OpenFirmware functionality on top of an already running system.")
     (package
       (inherit base)
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ;; No need to cross-compile, package produces reproducible firmware.
          ((#:target _ #f) #f)
          ((#:phases phases)
@@ -787,12 +787,12 @@ source."
     (native-inputs
      (if (member (%current-system) '("i686-linux" "x86_64-linux"))
          (package-native-inputs seabios)
-         (modify-inputs native-inputs
+         (modify-inputs (package-native-inputs seabios)
            (prepend (cross-gcc "i686-linux-gnu")
                     (cross-binutils "i686-linux-gnu")))))
     (supported-systems %supported-systems)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments seabios)
        ((#:modules modules %default-gnu-modules)
         `((ice-9 match)
           (ice-9 threads)
@@ -1186,7 +1186,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
       (inherit base)
       (name "ovmf-x86-64")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (replace 'install
@@ -1226,7 +1226,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
     (package
       (inherit base)
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (replace 'install
@@ -1248,20 +1248,16 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
     (package
       (inherit base)
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (replace 'install
                  (lambda _
-                   (let ((fmw (string-append #$output "/share/firmware"))
-                         (build-dir "Build/ArmVirtQemu-AARCH64/RELEASE_GCC/FV"))
+                   (let ((fmw (string-append #$output "/share/firmware")))
                     (mkdir-p fmw)
-                    ;; QEMU's virt machine requires 64 MiB pflash devices on
-                    ;; AArch64.  Pad the firmware files to match.
-                    (copy-file (string-append build-dir "/QEMU_EFI.fd")
-                               (string-append fmw "/ovmf_aarch64.bin"))
-                    (truncate-file (string-append fmw "/ovmf_aarch64.bin")
-                                   (* 64 1024 1024))))))))))))
+                    (copy-file (string-append "Build/ArmVirtQemu-AARCH64/"
+                                              "RELEASE_GCC/FV/QEMU_EFI.fd")
+                               (string-append fmw "/ovmf_aarch64.bin"))))))))))))
 
 (define-public ovmf-arm
   (let ((base (make-ovmf-firmware "armhf")))
@@ -1269,7 +1265,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
       (inherit base)
       (name "ovmf-arm")
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (replace 'install
@@ -1285,7 +1281,7 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
     (package
       (inherit base)
       (arguments
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            #~(modify-phases #$phases
                (replace 'install
@@ -1384,7 +1380,7 @@ interface standards, such as:
   (let ((base (make-arm-trusted-firmware "rk3399")))
     (package
       (inherit base)
-      (native-inputs (modify-inputs native-inputs
+      (native-inputs (modify-inputs (package-native-inputs base)
                        (prepend (cross-gcc "arm-none-eabi")
                                 (cross-binutils "arm-none-eabi")))))))
 
@@ -1964,7 +1960,7 @@ or passthrough board.")
     (package
       (inherit base)
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs base)
          (replace "xgcc" (make-gcc-arm-none-eabi-12.3.rel1)))))))
 
 (define* (make-qmk-firmware-keychron keyboard keymap
@@ -1997,7 +1993,7 @@ or passthrough board.")
                  (base32
                   "1skj7iq6dad48xhy2ljjmwpbhhdv3gk7cmi28lh3xfsnxphm4v8r"))))
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments base)
          ((#:phases phases)
           #~(modify-phases #$phases
               (replace 'copy-lufa-source
@@ -2050,7 +2046,7 @@ or passthrough board.")
                          "0r501hkk0idwfm6qs09g1wb808ga452gz39dw32x13rmg3a901s6")))
                    "lib/printf")))))))
       (native-inputs
-       (modify-inputs native-inputs
+       (modify-inputs (package-native-inputs base)
          (prepend
           (package
             (inherit (make-qmk-newlib-nano-arm-none-eabi))

gnu/packages/flashing-tools.scm

@@ -11,7 +11,7 @@
 ;;; Copyright © 2021 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
-;;; Copyright © 2018, 2022 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2022 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2023 B. Wilson <x@wilsonb.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
@@ -20,10 +20,6 @@
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Ian Eure <ian@retrospec.tv>
 ;;; Copyright © 2023 Thomas Albers Raviola <thomas@thomaslabs.org>
-;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
-;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
-;;; Copyright © 2026 Clément Lassieur <clement@lassieur.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -63,12 +59,8 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
-  #:use-module (gnu packages bootloaders)
-  #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages cpio)
-  #:use-module (gnu packages disk)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages electronics)
   #:use-module (gnu packages elf)
@@ -82,7 +74,6 @@
   #:use-module (gnu packages libftdi)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages mtools)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
@@ -92,9 +83,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages swig)
-  #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xml)
   #:use-module (srfi srfi-26))
 
@@ -257,106 +246,6 @@ firmware from it.")
     (home-page "https://dfu-util.sourceforge.net/")
     (license license:gpl2+)))
 
-(define-public genimage
-  (package
-    (name "genimage")
-    (version "19")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/pengutronix/genimage")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1n2d4sziq190saa71ms15h0fbk171kqig1jc6kw35pqs4288pnc5"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:modules
-       ((ice-9 match)
-        ,@%default-gnu-imported-modules)
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'guixify
-           (lambda* (#:key inputs #:allow-other-keys)
-             (map (match-lambda
-                    ((input directory regexp)
-                     (substitute* "config.c"
-                       (((format #f "\\.def = \"(~a)\"" regexp) _ command)
-                        (string-append ".def = \"" (assoc-ref inputs input)
-                                       "/" directory "/" command "\"")))))
-                  '(("btrfs-progs"    "bin"  "mkfs.btrfs")
-                    ("cpio"           "bin"  "cpio")
-                    ("coreutils"      "bin"  "dd")
-                    ("e2fsprogs"      "sbin" "debugfs|e2fsck|mke2fs|tune2fs")
-                    ("genext2fs"      "bin"  "genext2fs")
-                    ("cdrkit-libre"   "bin"  "genisoimage")
-                    ("mtools"         "bin"  "mcopy|mmd")
-                    ;; mkcramfs is obsolete.
-                    ("dosfstools"     "sbin" "mkdosfs")
-                    ("mtd-utils"      "sbin" "mkfs.(jffs2|ubifs)|ubinize")
-                    ("f2fs-tools"     "sbin" "(mkfs|sload).f2fs")
-                    ("squashfs-tools" "bin"  "mksquashfs")
-                    ("qemu-minimal"   "bin"  "qemu-img")
-                    ;; rauc and fiptool are unsupported.
-                    ("tar"            "bin"  "tar")
-                    ("u-boot-tools"   "bin"  "mkimage")))
-             (substitute* "util.c"
-               (("\"/bin/sh\"")
-                (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\"")))))
-         (add-before 'check 'fix-failing-tests
-           (lambda _
-             ;; We don't have /etc/passwd so uid 0 is not known as "root".
-             ;; Thus patch it out.
-             (substitute* '("test/ext2test.2.dump"
-                            "test/ext3test.2.dump"
-                            "test/ext4test.2.dump"
-                            "test/ext2test-percent.2.dump"
-                            "test/mke2fs.2.dump"
-                            "test/mke2fs.3.dump")
-               (("root") "unknown"))))
-         (add-before 'check 'setenv-check
-           (lambda _
-             ;; Our container doesn't provide access to /etc/mtab
-             (setenv "EXT2FS_NO_MTAB_OK" "1")
-             ;; Make test reproducible
-             (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U")
-             (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs")))
-         (replace 'check
-           (lambda _
-             (invoke "make" "TEST_LOG_COMPILER=" "check"))))))
-    (native-inputs
-     (list autoconf
-           automake
-           ;;; Note: cramfs is obsolete.
-           dtc ; for the tests
-           pkg-config
-           util-linux)) ; for the tests
-    (inputs
-     (list bash
-           btrfs-progs
-           cdrkit-libre
-           cpio
-           ;; Note: invoked by final executable.
-           coreutils
-           dosfstools
-           e2fsprogs
-           f2fs-tools
-           genext2fs
-           libconfuse
-           mtd-utils
-           mtools
-           qemu-minimal
-           squashfs-tools
-           tar
-           u-boot-tools))
-    (synopsis "Create Flash images according to specification")
-    (description "@command{genimage} creates Flash images according to a
-specification file.")
-    (home-page "https://github.com/pengutronix/genimage")
-    (license license:gpl2)))
-
 (define-public teensy-loader-cli
   (package
     (name "teensy-loader-cli")

gnu/packages/flex.scm

@@ -51,7 +51,7 @@
               (inherit bison)
               (arguments
                ;; Disable tests, since they require flex.
-               (substitute-keyword-arguments arguments
+               (substitute-keyword-arguments (package-arguments bison)
                  ((#:tests? _ #f) #f)))
               (inputs (alist-delete "flex" (package-inputs bison))))))
        `(("bison" ,bison-for-tests))))

gnu/packages/fluidplug.scm

@@ -357,7 +357,7 @@
     (inherit fluidplug-lv2)
     (name (fluidplug-plugin->package-name record))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fluidplug-lv2)
        ((#:make-flags make-flags)
         #~(list (string-append "CC=" #$(cc-for-target))
                 (string-append "DESTDIR=" #$output)

gnu/packages/fonts.scm

@@ -1283,31 +1283,6 @@ ko (Korean) locales for @code{fontconfig}.")
     ;; GPLv2 with font embedding exception.
     (license license:gpl2)))
 
-(define-public font-raleway
-  (package
-    (name "font-raleway")
-    (version "4.101")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/theleagueof/raleway"
-                                  "/releases/download/"
-                                  version "/Raleway-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1sykwr7s7rhny1m2wv8mdn826mwkigr9nqplg4z25d0q4k9p0c2j"))))
-    (build-system font-build-system)
-    (outputs '("out" "ttf" "woff"))
-    (arguments
-     '(#:license-file-regexp "^(OFL.*|README)\\.md$"))
-    (home-page "https://github.com/theleagueof/raleway")
-    (synopsis "Sans-Serif typeface family")
-    (description
-     "Raleway is a display face that features both old style and lining
-numerals, standard and discretionary ligatures, a pretty complete set of
-diacritics, as well as a stylistic alternate inspired by more geometric
-sans-serif typefaces than its neo-grotesque inspired default character set.")
-    (license license:silofl1.1)))
-
 (define-public font-wqy-microhei
   (package
     (name "font-wqy-microhei")

gnu/packages/fontutils.scm

@@ -77,7 +77,6 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages unicode)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
@@ -158,7 +157,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
     (inherit freetype)
     (name "freetype-with-brotli")
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs freetype)
        (prepend brotli)))))
 
 (define-public opentype-sanitizer
@@ -683,7 +682,7 @@ implementing the pen protocol for manipulating glyphs.")
    (package/inherit python-fontpens-bootstrap
      (name "python-fontpens")
      (arguments
-      (substitute-keyword-arguments arguments
+      (substitute-keyword-arguments (package-arguments python-fontpens-bootstrap)
         ((#:tests? _ #f)
          #t)
         ((#:phases phases #~%standard-phases)
@@ -698,7 +697,7 @@ implementing the pen protocol for manipulating glyphs.")
                    ((".*\\(\\(0, 0), \\(50, 20), \\(100, 40)).*") "")
                    ((".*107\\.70329614269009.*") ""))))))))
      (native-inputs
-      (modify-inputs native-inputs
+      (modify-inputs (package-native-inputs python-fontpens-bootstrap)
         (append python-fontparts-bootstrap
                 python-fontpens-bootstrap
                 python-pytest
@@ -739,7 +738,7 @@ process.  FontParts is the successor of RoboFab.")
   (package/inherit python-fontparts-bootstrap
     (name "python-fontparts")
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs python-fontparts-bootstrap)
        (replace "python-defcon-bootstrap" python-defcon)))
     (properties
      (alist-delete 'hidden?
@@ -1464,7 +1463,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
     (name "fontconfig")
     (outputs (cons "doc" (package-outputs fontconfig)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments fontconfig)
        ((#:configure-flags configure-flags)
         #~(delete "--disable-docs" #$configure-flags))
        ((#:phases phases '%standard-phases)
@@ -1489,7 +1488,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
                      (delete-file-recursively source)))
                  '("man3" "man5"))))))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs fontconfig)
        (append docbook-utils)))
     (properties (alist-delete 'hidden? (package-properties fontconfig)))))
 
@@ -1804,8 +1803,7 @@ definitions.")
                (base32 "1y30bk9rdya8bkw4q77y6nq5xfg7nm0qliz5miqdlk8c0r6fr0na"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list pkg-config
-           python-setuptools))
+     (list pkg-config))
     (inputs
      (list cairo
            bash-minimal
@@ -1990,7 +1988,7 @@ UFO3 as described by the UFO font format.")
   (package/inherit python-defcon-bootstrap
     (name "python-defcon")
     (propagated-inputs
-     (modify-inputs propagated-inputs
+     (modify-inputs (package-propagated-inputs python-defcon-bootstrap)
        (replace "python-fontpens-bootstrap" python-fontpens)))
     (properties
      (alist-delete 'hidden?
@@ -2152,8 +2150,7 @@ work well with other GTK desktop environments.")
      `(#:tests? #f ; There are no tests.
        #:configure-flags
        (list (string-append
-              "-DUNICODE_BLOCKS=" (assoc-ref %build-inputs "ucd")
-              "/share/ucd/Blocks.txt"))
+              "-DUNICODE_BLOCKS=" (assoc-ref %build-inputs "unicode-blocks")))
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'set-library-path
@@ -2182,7 +2179,16 @@ work well with other GTK desktop environments.")
        ("perl" ,perl)                   ;needed for pdfoutline
        ("perl-pdf-api2" ,perl-pdf-api2)
        ("perl-libintl-perl" ,perl-libintl-perl)
-       ("ucd" ,ucd)))
+       ("unicode-blocks"
+        ,(let ((version "14.0.0"))
+           (origin
+             (method url-fetch)
+             (uri (string-append "https://unicode.org/Public/"
+                                 version "/ucd/Blocks.txt"))
+             (file-name (string-append "unicode-blocks-" version ".txt"))
+             (sha256
+              (base32
+               "05vzgrvfp35mgxjgkm4wnxjjgzva8n6545i9jxd4pczpvvfp122r")))))))
     (home-page "https://github.com/eugmes/fntsample")
     (synopsis "PDF and PostScript font samples generator")
     (description "This package provides a tool that can be used to make font

gnu/packages/freedesktop.scm

@@ -147,7 +147,6 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages video)
-  #:use-module (gnu packages vim)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages vulkan)
   #:use-module (gnu packages w3m)
@@ -222,13 +221,13 @@ application-centers for distributions.")
   (package/inherit appstream
     (name "appstream-qt")
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs appstream)
        (prepend qttools-5)))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs appstream)
        (prepend qtbase-5)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments appstream)
        ((#:configure-flags flags #~'())
         #~(append '("-Dqt=true" "-Dqt-versions=5") #$flags))))))
 
@@ -236,13 +235,13 @@ application-centers for distributions.")
   (package/inherit appstream
     (name "appstream-qt6")
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs appstream)
        (prepend qttools)))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs appstream)
        (prepend qtbase)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments appstream)
        ((#:configure-flags flags #~'())
         #~(append '("-Dqt=true" "-Dqt-versions=6") #$flags))))))
 
@@ -696,7 +695,7 @@ other applications that need to directly deal with input devices.")
      (fold alist-delete (package-inputs libinput)
            '("cairo" "glib" "gtk+" "libwacom")))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments libinput)
       ((#:configure-flags flags ''())
        `(cons* "-Dlibwacom=false"
                "-Ddebug-gui=false"    ;requires gtk+@3
@@ -1952,7 +1951,7 @@ message bus.")
            docbook-xsl
            gettext-minimal
            `(,glib "bin")               ; for gdbus-codegen, etc.
-           (libc-locales-for-target (%current-system)) ;for tests
+           glibc-locales                    ;for tests
            gobject-introspection
            gtk-doc/stable
            libxslt
@@ -2605,7 +2604,7 @@ to applications simultaneously competing for fingerprint readers.")
 (define-public desktop-file-utils
   (package
     (name "desktop-file-utils")
-    (version "0.28")
+    (version "0.26")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.freedesktop.org/software/"
@@ -2613,10 +2612,10 @@ to applications simultaneously competing for fingerprint readers.")
                                   "desktop-file-utils-" version ".tar.xz"))
               (sha256
                (base32
-                "0w4ai6a3bwrdh86n2pvgv664djlmlds5lfa2hbgc4hnq67id80a4"))))
-    (build-system meson-build-system)
+                "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"))))
+    (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config))
+     (list autoconf automake pkg-config))
     (inputs
      (list glib))
     (home-page "https://www.freedesktop.org/wiki/Software/desktop-file-utils/")
@@ -3174,8 +3173,7 @@ compatible with the well-known scripts of the same name.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1rbqkmvvfig98ig8gsf93waiizrminj7gywxbza15hzx3an3hwh9"))
-              (patches (search-patches "libportal-qt-6.9.patch"))))
+                "1rbqkmvvfig98ig8gsf93waiizrminj7gywxbza15hzx3an3hwh9"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -3198,7 +3196,8 @@ compatible with the well-known scripts of the same name.")
     (inputs
      (list gtk
            gtk+
-           qtbase))
+           qtbase-5
+           qtx11extras))
     (propagated-inputs
      (list glib))
     (home-page "https://github.com/flatpak/libportal")
@@ -3605,37 +3604,3 @@ implements the decoration drawing.")
     (description
      "@code{iio-sensor-proxy} is a daemon which passes IIO sensor data to D-Bus.")
     (license license:gpl3+)))
-
-(define-public rtkit
-  (package
-    (name "rtkit")
-    (version "0.14")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.freedesktop.org/pipewire/rtkit.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "07swd78aglawfddc1zjx5v8scm85q1qpmahjskh8hn6lfr47dpnb"))))
-    (build-system meson-build-system)
-    (inputs (list dbus libcap polkit xxd))
-    (native-inputs (list pkg-config))
-    (arguments
-     (list
-      #:configure-flags
-      #~(list (string-append "-Ddbus_interfacedir="
-                             #$output "/share/dbus-1/interfaces")
-              (string-append "-Ddbus_systemservicedir="
-                             #$output "/share/dbus-1/system-services")
-              (string-append "-Dpolkit_actiondir="
-                             #$output "/share/polkit-1/actions"))))
-    (home-page "https://gitlab.freedesktop.org/pipewire/rtkit")
-    (synopsis "Realtime Policy and Watchdog Daemon")
-    (description
-     "RealtimeKit is a D-Bus system service that changes the scheduling policy
-of user processes and threads to SCHED_RR (i.e. realtime scheduling mode) on
-request.  It is intended to be used as a secure mechanism to allow real-time
-scheduling to be used by normal user processes.")
-    (license license:gpl3)))

gnu/packages/game-development.scm

@@ -22,7 +22,7 @@
 ;;; Copyright © 2020 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
-;;; Copyright © 2020-2022, 2024-2026 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2020-2022, 2024-2025 James Smith <jsubuntuxp@disroot.org>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021, 2026 Andy Tai <atai@atai.org>
 ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
@@ -953,7 +953,7 @@ clone.")
 (define-public trenchbroom
   (package
     (name "trenchbroom")
-    (version "2025.4")
+    (version "2024.2")
     (source
      (origin
        (method git-fetch)
@@ -962,12 +962,16 @@ clone.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0858q0dfr8f3z8aaafgvrx3zbmjlsldjyw6jjic4x4psyw2xfg3h"))))
+        (base32 "18cb3w7wxc9y2izh0flkkl77sg897dh0g49zq7rbhpvw35j4xgaj"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags
            #~(list "-DCMAKE_BUILD_TYPE=Release" "-G" "Unix Makefiles"
                    "-DCMAKE_PREFIX_PATH=cmake/packages"
+                   (string-append "-DFREEIMAGE_INCLUDE_PATH="
+                                  #$freeimage "/include")
+                   (string-append "-DFREEIMAGE_LIBRARY="
+                                  #$freeimage "/lib/libfreeimage.so")
                    (string-append "-Dfreetype_INCLUDE_DIR="
                                   #$freetype "/include/freetype2")
                    (string-append "-Dfreetype_LIBRARY="
@@ -1012,7 +1016,7 @@ clone.")
     (inputs
      (list assimp
            bash-minimal
-           catch2-3.8
+           catch2
            fmt
            freeglut
            freeimage
@@ -1023,8 +1027,8 @@ clone.")
            libxxf86vm
            mesa
            miniz
-           qtbase
-           qtsvg
+           qtbase-5
+           qtsvg-5
            tinyxml2))
     (native-inputs (list git pandoc python p7zip))
     (home-page "https://kristianduske.com/trenchbroom/")
@@ -2285,9 +2289,9 @@ It can convert worlds from Minecraft 1.9 and later.")
       (home-page "https://github.com/listia/mc2mt")
       (license license:expat))))
 
-(define-public mygui-gl
+(define-public mygui
   (package
-    (name "mygui-gl")
+    (name "mygui")
     (version "3.4.3")
     (source
      (origin
@@ -2303,13 +2307,11 @@ It can convert worlds from Minecraft 1.9 and later.")
      (list
       #:tests? #f                       ;no test target
       #:configure-flags
-      #~(list "-DMYGUI_RENDERSYSTEM=4" ; 3 is Ogre, 4 is OpenGL.
-              "-DMYGUI_INSTALL_DOCS=TRUE"
+      #~(list "-DMYGUI_INSTALL_DOCS=TRUE"
               ;; Demos and tools are Windows-specific:
               ;; https://github.com/MyGUI/mygui/issues/24.
               "-DMYGUI_BUILD_DEMOS=FALSE"
-              "-DMYGUI_BUILD_TOOLS=FALSE"
-              "-DMYGUI_DONT_USE_OBSOLETE=TRUE")))
+              "-DMYGUI_BUILD_TOOLS=FALSE")))
     (native-inputs
      (list boost
            doxygen
@@ -2317,14 +2319,11 @@ It can convert worlds from Minecraft 1.9 and later.")
     (inputs
      (list font-dejavu
            freetype
-           glu
            graphviz
-           libglvnd
            libx11
-           mesa
-           ois
-           (sdl-union (list sdl2 sdl2-image))))
-    (synopsis "Fast, flexible and simple GUI (OpenGL backend)")
+           ogre
+           ois))
+    (synopsis "Fast, flexible and simple GUI")
     (description
      "MyGUI is a library for creating Graphical User Interfaces (GUIs) for games
 and 3D applications.  The main goals of MyGUI are: speed, flexibility and ease
@@ -2332,6 +2331,30 @@ of use.")
     (home-page "http://mygui.info/")
     (license license:expat)))
 
+(define-public mygui-gl
+  ;; Closure size is reduced by some 800 MiB.
+  (package/inherit mygui
+    (name "mygui-gl")
+    (arguments
+     (substitute-keyword-arguments (package-arguments mygui)
+       ((#:configure-flags _)
+        `(cons* "-DMYGUI_RENDERSYSTEM=4" ; 3 is Ogre, 4 is OpenGL.
+                ;; We can't reuse the flags because of the mention to Ogre.
+                (list "-DMYGUI_INSTALL_DOCS=TRUE"
+                      ;; Demos and tools are Windows-specific:
+                      ;; https://github.com/MyGUI/mygui/issues/24.
+                      "-DMYGUI_BUILD_DEMOS=FALSE"
+                      "-DMYGUI_BUILD_TOOLS=FALSE"
+                      "-DMYGUI_DONT_USE_OBSOLETE=TRUE")))))
+    (inputs
+     (modify-inputs (package-inputs mygui)
+       (delete "ogre")
+       (prepend glu
+                libglvnd                ; for find_package(… GLX)
+                mesa                    ; for find_package(… OpenGL …)
+                (sdl-union (list sdl2 sdl2-image)))))
+    (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
+
 (define-public openmw
   (package
     (name "openmw")

gnu/packages/games.scm

@@ -834,7 +834,7 @@ fight or flee@dots{}
     (inherit boohu)
     (name "boohu-tk")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments boohu)
        ((#:tests? _ #t) #f)
        ((#:build-flags _ #~())
         #~(list "--tags=tk"))
@@ -2126,7 +2126,7 @@ does not include game data.")
     (arguments
      ;; No tests.  See https://github.com/Keriew/augustus/issues/82.
      `(#:tests? #f))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs julius)
               (prepend expat)))
     (home-page "https://github.com/Keriew/augustus")
     (synopsis "Re-implementation of Caesar III game engine with gameplay changes")
@@ -3433,7 +3433,7 @@ To run, you must put your official game data, @code{Levels} and @code{Help} in
        (modules '((guix build utils)))
        (patches (search-patches
                  "serious-sam-classic-engine-patch-paths.patch"))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs serious-sam-classic)
               (prepend vulkan-loader vulkan-headers)))
     (synopsis
      "SeriousSam engine and Serious Sam: TFE and TSE with Vulkan renderer")
@@ -3488,7 +3488,7 @@ corruption… You hope luck will be on your side!
   (package/inherit shamogu
     (name "shamogu-sdl")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments shamogu)
        ((#:tests? _ #t) #f)
        ((#:build-flags _ #'()) #~(list "--tags=sdl"))
        ((#:phases _ #~%standard-phases)
@@ -3498,7 +3498,7 @@ corruption… You hope luck will be on your side!
                 (rename-file (string-append #$output "/bin/shamogu")
                              (string-append #$output "/bin/shamogu-sdl"))))))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs shamogu)
        (prepend pkg-config)))))
 
 (define-public solarus
@@ -3576,9 +3576,9 @@ in mind.")
           (add-before 'configure 'chdir
             (lambda _
               (chdir "editor"))))))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-inputs solarus)
                      (prepend qttools qlementine)))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs solarus)
               (prepend solarus)
               (append qtbase qtsvg qtwayland)))
     (synopsis "Create and modify quests for the Solarus engine")
@@ -3608,7 +3608,7 @@ quests for the Solarus engine.")))
     (native-inputs (modify-inputs (package-inputs solarus)
                      (prepend qlementine qlementine-icons qtappinstancemanager
                               qttools)))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs solarus)
               (prepend solarus)
               (append qtbase qtsvg qtwayland)))
     (synopsis "Game launcher and browser for Solarus")
@@ -5439,7 +5439,7 @@ next campaign.")
     (native-inputs
      (list pkg-config))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments wesnoth)
        ((#:configure-flags _)
         #~'("-DENABLE_SYSTEM_LUA=ON" "-DENABLE_GAME=OFF"))))
     (synopsis "Dedicated @emph{Battle for Wesnoth} server")
@@ -5811,10 +5811,10 @@ Transport Tycoon Deluxe.")
                     (assoc-ref outputs "out")))
                  (search-path-as-list (list base) (map cdr inputs)))))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs openttd-engine)
        (prepend fluidsynth freepats-gm)))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs openttd-engine)
        (prepend openttd-opengfx openttd-openmsx openttd-opensfx)))))
 
 (define-public openttd-jgrpp
@@ -5831,10 +5831,10 @@ Transport Tycoon Deluxe.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs openttd)
               (append zstd harfbuzz)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments openttd)
        ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
               (add-before 'check 'build-tests
@@ -7559,7 +7559,7 @@ into the Space Age.")
 (define-public no-more-secrets
   (package
     (name "no-more-secrets")
-    (version "1.0.1")
+    (version "0.3.3")
     (source
      (origin
        (method git-fetch)
@@ -7568,7 +7568,7 @@ into the Space Age.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "14h34zpgjldw9bf65chb72gnzw5q88djrdasz2828r3ck6k88l21"))))
+        (base32 "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f
@@ -8247,10 +8247,10 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
            "GAME=crawl-tiles"
            #$flags))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs crawl)
        (prepend font-dejavu freetype glu libpng sdl2 sdl2-image sdl2-mixer)))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs crawl)
        (prepend pngcrush which)))
     (synopsis "Graphical roguelike dungeon crawler game")))
 
@@ -8940,7 +8940,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
                         #t))))
        ,@(strip-keyword-arguments '(#:make-flags #:phases)
                                   (package-arguments quakespasm))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs quakespasm)
               (prepend
                glslang
                spirv-tools
@@ -11470,7 +11470,7 @@ player adaptability for character progression.")
   (package/inherit harmonist
     (name "harmonist-sdl")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments harmonist)
        ((#:tests? _ #t) #f)
        ((#:build-flags _ #'()) #~(list "--tags=sdl"))
        ((#:phases _ #~%standard-phases)
@@ -11481,7 +11481,7 @@ player adaptability for character progression.")
                  (string-append #$output "/bin/harmonist")
                  (string-append #$output "/bin/harmonist-sdl"))))))))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs harmonist)
        (prepend pkg-config)))))
 
 (define-public li-ri
@@ -13433,9 +13433,7 @@ virtual reality devices.")
      (list
       #:configure-flags
       #~(list "-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL")))
-    (native-inputs (list python
-                         (libc-utf8-locales-for-target (%current-system))
-                         googletest))
+    (native-inputs (list python glibc-locales googletest))
     (inputs (list freetype
                   libiconv
                   libpng

gnu/packages/gawk.scm

@@ -110,7 +110,7 @@ including network access, sorting, and large libraries.")
   (package/inherit gawk
     (name "gawk-mpfr")
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gawk)
        (prepend mpfr)))))
 
 ;; Suffixed with -next because, similarly to Emacs, development versions are
@@ -249,7 +249,7 @@ programs can be captured and transferred to systems that have Awk but not
   (package/inherit cppawk
     (name "cppawk-egawk")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments cppawk)
        ((#:phases phases)
         `(modify-phases ,phases
            (replace 'fix-awk-paths
@@ -258,7 +258,7 @@ programs can be captured and transferred to systems that have Awk but not
                  (("awk=gawk") (string-append "awk=" (which "egawk")))
                  (("awk '") (string-append (which "egawk") " '")))))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs cppawk)
        (delete "gawk-mpfr")
        (prepend egawk-next)))
     (synopsis "Wrapper script that adds C preprocessing to Enhanced GNU Awk")))

gnu/packages/gcc.scm

@@ -431,30 +431,36 @@ Go.  It also includes runtime support libraries for these languages.")
                  '("alpha" "bfin" "i386" "m68k"
                    "pa" "sh" "tilepro" "xtensa")))))
     (arguments
-     (if (%current-target-system)
-         arguments
-         ;; For native builds of some GCC versions the C++ include path needs to
-         ;; be adjusted so it does not interfere with GCC's own build processes.
-         (substitute-keyword-arguments arguments
-           ((#:modules modules %default-gnu-modules)
-            `((srfi srfi-1)
-              ,@modules))
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+     ;; Since 'arguments' is a function of the package's version, define
+     ;; 'parent' such that the 'arguments' thunk gets to see the right
+     ;; version.
+     (let ((parent (package
+                     (inherit gcc-base)
+                     (version (package-version this-package)))))
+       (if (%current-target-system)
+           (package-arguments parent)
+           ;; For native builds of some GCC versions the C++ include path needs to
+           ;; be adjusted so it does not interfere with GCC's own build processes.
+           (substitute-keyword-arguments (package-arguments parent)
+             ((#:modules modules %default-gnu-modules)
+              `((srfi srfi-1)
+                ,@modules))
+             ((#:phases phases)
+              `(modify-phases ,phases
+                 (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((libc (assoc-ref inputs "libc"))
+                           (gcc (assoc-ref inputs  "gcc")))
+                       (setenv "CPLUS_INCLUDE_PATH"
+                               (string-join (fold delete
+                                                  (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                                #\:)
+                                                  (list (string-append libc "/include")
+                                                        (string-append gcc "/include/c++")))
+                                            ":"))
+                       (format #t
+                               "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                               (getenv "CPLUS_INCLUDE_PATH")))))))))))
     (supported-systems (fold delete %supported-systems
                              '("aarch64-linux" "riscv64-linux"
                                "powerpc64le-linux" "x86_64-gnu")))))
@@ -485,38 +491,44 @@ Go.  It also includes runtime support libraries for these languages.")
                  '("aarch64" "alpha" "bfin" "i386" "m68k"
                    "pa" "sh" "tilepro" "xtensa")))))
     (arguments
-     (if (%current-target-system)
-         (substitute-keyword-arguments arguments
-           ((#:configure-flags flags '())
-            `(cons "CXX=g++ -std=c++03" ,flags)))
-         (substitute-keyword-arguments arguments
-           ((#:modules modules %default-gnu-modules)
-            `((srfi srfi-1)
-              ,@modules))
-           ((#:configure-flags flags '())
-            `(cons "CXX=g++ -std=c++03" ,flags))
-           ;; For native builds of some GCC versions the C++ include path needs to
-           ;; be adjusted so it does not interfere with GCC's own build processes.
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+     ;; Since 'arguments' is a function of the package's version, define
+     ;; 'parent' such that the 'arguments' thunk gets to see the right
+     ;; version.
+     (let ((parent (package
+                     (inherit gcc-base)
+                     (version (package-version this-package)))))
+       (if (%current-target-system)
+           (substitute-keyword-arguments (package-arguments parent)
+            ((#:configure-flags flags '())
+             `(cons "CXX=g++ -std=c++03" ,flags)))
+           (substitute-keyword-arguments (package-arguments parent)
+             ((#:modules modules %default-gnu-modules)
+              `((srfi srfi-1)
+                ,@modules))
+             ((#:configure-flags flags '())
+              `(cons "CXX=g++ -std=c++03" ,flags))
+             ;; For native builds of some GCC versions the C++ include path needs to
+             ;; be adjusted so it does not interfere with GCC's own build processes.
+             ((#:phases phases)
+              `(modify-phases ,phases
+                 (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((libc (assoc-ref inputs "libc"))
+                           (gcc (assoc-ref inputs  "gcc")))
+                       (setenv "CPLUS_INCLUDE_PATH"
+                               (string-join (fold delete
+                                                  (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                                #\:)
+                                                  (list (string-append libc "/include")
+                                                        (string-append gcc "/include/c++")))
+                                            ":"))
+                       (format #t
+                               "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                               (getenv "CPLUS_INCLUDE_PATH")))))))))))
     (supported-systems (fold delete %supported-systems
                              '("riscv64-linux" "x86_64-gnu")))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gcc-base)
        (prepend isl-0.11 cloog)))))
 
 (define-public gcc-4.9
@@ -548,39 +560,45 @@ Go.  It also includes runtime support libraries for these languages.")
                  '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
                    "pa" "sh" "tilepro" "xtensa")))))
     (arguments
-     (if (%current-target-system)
-         (substitute-keyword-arguments arguments
-           ((#:configure-flags flags '())
-            `(cons "CXX=g++ -std=c++11" ,flags)))
-         (substitute-keyword-arguments arguments
-           ((#:modules modules %default-gnu-modules)
-            `((srfi srfi-1)
-              ,@modules))
-           ((#:configure-flags flags '())
-            `(cons "CXX=g++ -std=c++11" ,flags))
-           ;; For native builds of some GCC versions the C++ include path needs to
-           ;; be adjusted so it does not interfere with GCC's own build processes.
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+     ;; Since 'arguments' is a function of the package's version, define
+     ;; 'parent' such that the 'arguments' thunk gets to see the right
+     ;; version.
+     (let ((parent (package
+                     (inherit gcc-base)
+                     (version (package-version this-package)))))
+       (if (%current-target-system)
+           (substitute-keyword-arguments (package-arguments parent)
+            ((#:configure-flags flags '())
+             `(cons "CXX=g++ -std=c++11" ,flags)))
+           (substitute-keyword-arguments (package-arguments parent)
+             ((#:modules modules %default-gnu-modules)
+              `((srfi srfi-1)
+                ,@modules))
+             ((#:configure-flags flags '())
+              `(cons "CXX=g++ -std=c++11" ,flags))
+             ;; For native builds of some GCC versions the C++ include path needs to
+             ;; be adjusted so it does not interfere with GCC's own build processes.
+             ((#:phases phases)
+              `(modify-phases ,phases
+                 (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((libc (assoc-ref inputs "libc"))
+                           (gcc (assoc-ref inputs  "gcc")))
+                       (setenv "CPLUS_INCLUDE_PATH"
+                               (string-join (fold delete
+                                                  (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                                #\:)
+                                                  (list (string-append libc "/include")
+                                                        (string-append gcc "/include/c++")))
+                                            ":"))
+                       (format #t
+                               "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                               (getenv "CPLUS_INCLUDE_PATH")))))))))))
     ;; Override inherited texinfo-5 with latest version.
     (native-inputs (list perl ;for manpages
                          texinfo))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gcc-base)
        (prepend isl-0.11 cloog)))
     (supported-systems (fold delete %supported-systems
                              '("riscv64-linux" "x86_64-gnu")))))
@@ -626,36 +644,42 @@ Go.  It also includes runtime support libraries for these languages.")
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments
-     (substitute-keyword-arguments arguments
-       ((#:modules modules %default-gnu-modules)
-        `((srfi srfi-1)
-          ,@modules))
-       ((#:configure-flags flags '())
-        `(cons "CXX=g++ -std=c++11" ,flags))
-       ;; For native builds of some GCC versions the C++ include path needs to
-       ;; be adjusted so it does not interfere with GCC's own build processes.
-       ((#:phases phases)
-        (if (%current-target-system)
-            phases
-            `(modify-phases ,phases
-               (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((libc (assoc-ref inputs "libc"))
-                         (gcc (assoc-ref inputs  "gcc")))
-                     (setenv "CPLUS_INCLUDE_PATH"
-                             (string-join (fold delete
-                                                (string-split (getenv "CPLUS_INCLUDE_PATH")
-                                                              #\:)
-                                                (list (string-append libc "/include")
-                                                      (string-append gcc "/include/c++")))
-                                          ":"))
-                     (format #t
-                             "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
-                             (getenv "CPLUS_INCLUDE_PATH"))))))))))
+     ;; Since 'arguments' is a function of the package's version, define
+     ;; 'parent' such that the 'arguments' thunk gets to see the right
+     ;; version.
+     (let ((parent (package
+                     (inherit gcc-base)
+                     (version (package-version this-package)))))
+       (substitute-keyword-arguments (package-arguments parent)
+         ((#:modules modules %default-gnu-modules)
+          `((srfi srfi-1)
+            ,@modules))
+         ((#:configure-flags flags '())
+          `(cons "CXX=g++ -std=c++11" ,flags))
+         ;; For native builds of some GCC versions the C++ include path needs to
+         ;; be adjusted so it does not interfere with GCC's own build processes.
+         ((#:phases phases)
+          (if (%current-target-system)
+              phases
+              `(modify-phases ,phases
+                 (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
+                   (lambda* (#:key inputs #:allow-other-keys)
+                     (let ((libc (assoc-ref inputs "libc"))
+                           (gcc (assoc-ref inputs  "gcc")))
+                       (setenv "CPLUS_INCLUDE_PATH"
+                               (string-join (fold delete
+                                                  (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                                                #\:)
+                                                  (list (string-append libc "/include")
+                                                        (string-append gcc "/include/c++")))
+                                            ":"))
+                       (format #t
+                               "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
+                               (getenv "CPLUS_INCLUDE_PATH")))))))))))
     (native-inputs (list perl ;for manpages
                          texinfo))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gcc-base)
        (prepend ;; GCC5 needs <isl/band.h> which is removed in later versions.
                 isl-0.18)))
     (supported-systems (fold delete %supported-systems
@@ -985,7 +1009,7 @@ It also includes runtime support libraries for these languages.")
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc-11)
        ((#:phases phases #~%standard-phases)
        (if (target-hurd?)
            #~(modify-phases #$phases
@@ -1015,7 +1039,7 @@ It also includes runtime support libraries for these languages.")
                                        "gcc-5.0-libvtv-runpath.patch"))
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
-    (arguments (substitute-keyword-arguments arguments
+    (arguments (substitute-keyword-arguments (package-arguments gcc-13)
                  ((#:phases phases #~%standard-phases)
                   #~(modify-phases #$phases
                       (add-before 'configure 'pre-x86-configure
@@ -1049,7 +1073,7 @@ It also includes runtime support libraries for these languages.")
               (modules '((guix build utils)))
               (snippet gcc-canadian-cross-objdump-snippet)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc-14)
        ((#:phases phases #~%standard-phases)
         #~(modify-phases #$phases
             (add-after 'install 'adjust-modules-file
@@ -1345,7 +1369,7 @@ as the 'native-search-paths' field."
                  (delete "lib" (package-outputs gcc))))
     (native-search-paths search-paths)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc)
        ((#:modules modules %default-gnu-modules)
         `(,@modules
           (srfi srfi-1)
@@ -1411,7 +1435,7 @@ as the 'native-search-paths' field."
   (package
     (inherit gdc)
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gdc)
        ((#:modules modules)
         `(,@modules
           (ice-9 ftw)))
@@ -1484,14 +1508,14 @@ as the 'native-search-paths' field."
                        "^/lib/debug/.*/lib/libgdruntime"
                        "^/lib/debug/.*/lib/libgphobos"))))))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gdc)
        ;; This makes flags like -static-libstdc++ work. Required for using this
        ;; compiler as a bootstrap compiler for GDC 12+.
        ;; Additionally, this allows us to support linking with GCC libraries,
        ;; without building or storing them ourselves.
        (append (list gcc "lib"))))
     (native-inputs
-     (let ((orig native-inputs))
+     (let ((orig (package-native-inputs gdc)))
        (if bootstrap-gdc
            (modify-inputs orig
              ;; Since GCC 12, GDC is self-hosted, requiring a version of itself
@@ -1601,7 +1625,7 @@ also includes the druntime and phobos libraries."
      (package
        (inherit base)
        (native-inputs
-        (modify-inputs native-inputs
+        (modify-inputs (package-native-inputs base)
           (prepend flex)))))))
 
 (define-public (make-libgccjit gcc)
@@ -1611,7 +1635,7 @@ also includes the druntime and phobos libraries."
     (outputs (delete "lib" (package-outputs gcc)))
     (properties (alist-delete 'hidden? (package-properties gcc)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gcc)
        ((#:modules _ '())
         '((guix build gnu-build-system)
           (guix build utils)
@@ -1637,9 +1661,9 @@ also includes the druntime and phobos libraries."
                           (find-files
                            (string-append (assoc-ref outputs "out") "/bin")
                            ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs gcc)
               (delete "libstdc++")))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs gcc)
                      (prepend gcc)))
     (synopsis "GCC library generating machine code on-the-fly at runtime")
     (description
@@ -1672,7 +1696,7 @@ misnomer.")))
         "This package is part of the GNU Compiler Collection and
 provides the GNU compiler for the Go programming language.")
       (arguments
-       (substitute-keyword-arguments arguments
+       (substitute-keyword-arguments (package-arguments gccgo)
          ((#:phases phases)
           #~(modify-phases #$phases
               #$@(if (and (version>=? (package-version gccgo) "12.0")

gnu/packages/gdb.scm

@@ -266,7 +266,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
   (package/inherit gdb
     (name "gdb-multiarch")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gdb)
        ((#:configure-flags flags '())
         #~(cons* "--enable-targets=all"
                  "--enable-multilib"
@@ -292,7 +292,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
   (package/inherit gdb-14
     (name "avr-gdb")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gdb-14)
        ((#:configure-flags flags '())
         #~(cons* "--target=avr"
                  "--disable-nls"
@@ -374,13 +374,13 @@ AMD's commercially available GPU architectures.")
         (base32
          "1msxz5xnm6fl2p9hzjnkaayd8x3dc0dp34ff60asr8mgxwxlcd9c"))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs gdb)
        (prepend rocdbgapi)))
     (native-inputs
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs gdb)
        (prepend bison flex perl)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gdb)
        ((#:configure-flags _ '())
         ''("--program-prefix=roc"
            "--disable-binutils"

gnu/packages/genimage.scm

@@ -0,0 +1,154 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
+;;;
+;;; 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 genimage)
+  #:use-module (guix utils)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build utils)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages bootloaders)
+  #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpio)
+  #:use-module (gnu packages disk)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages mtools)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages virtualization))
+
+(define-public genimage
+  (let ((commit "00009af6e29cfd46909bc8b4180147dda9f82ba8")
+        (revision "0"))
+    (package
+      (name "genimage")
+      (version (git-version "18" revision commit))
+      (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                 (url "https://github.com/pengutronix/genimage")
+                 (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32
+            "1mijyq79cb0yj4jm9ln9smpddq1f6r8cnsa568qca0krcv0p3zag"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:modules
+         ((ice-9 match)
+          ,@%default-gnu-imported-modules)
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'guixify
+             (lambda* (#:key inputs #:allow-other-keys)
+               (map (match-lambda
+                      ((input directory regexp)
+                       (substitute* "config.c"
+                         (((format #f "\\.def = \"(~a)\"" regexp) _ command)
+                          (string-append ".def = \"" (assoc-ref inputs input)
+                                         "/" directory "/" command "\"")))))
+                    '(("cpio"           "bin"  "cpio")
+                      ("coreutils"      "bin"  "dd")
+                      ("e2fsprogs"      "sbin" "debugfs|e2fsck|mke2fs|tune2fs")
+                      ("genext2fs"      "bin"  "genext2fs")
+                      ("cdrkit-libre"   "bin"  "genisoimage")
+                      ("mtools"         "bin"  "mcopy|mmd")
+                      ;; mkcramfs is obsolete.
+                      ("dosfstools"     "sbin" "mkdosfs")
+                      ("mtd-utils"      "sbin" "mkfs.(jffs2|ubifs)|ubinize")
+                      ("f2fs-tools"     "sbin" "(mkfs|sload).f2fs")
+                      ("squashfs-tools" "bin"  "mksquashfs")
+                      ("qemu"           "bin"  "qemu-img")
+                      ;; rauc and fiptool are unsupported.
+                      ("tar"            "bin"  "tar")
+                      ("u-boot-tools"   "bin"  "mkimage")))
+               (substitute* "util.c"
+                 (("\"/bin/sh\"")
+                  (string-append "\"" (assoc-ref inputs "bash") "/bin/sh\"")))))
+           (add-before 'check 'disable-failing-tests
+             (lambda _
+               ;; We don't have /etc/passwd so uid 0 is not known as "root".
+               ;; Thus patch it out.
+               (substitute* '("test/flash.test")
+                 (("test_expect_success \"flash\"")
+                  "test_expect_fail \"flash\""))
+               (substitute* '("test/hdimage.test")
+                 (("test_expect_success fdisk,sfdisk \"hdimage\"")
+                  "test_expect_fail fdisk,sfdisk \"hdimage\"")
+                 (("test_expect_success hexdump \"hdimage no-partition\"")
+                  "test_expect_fail hexdump \"hdimage no-partition\""))))
+           (add-before 'check 'fix-failing-tests
+             (lambda _
+               ;; We don't have /etc/passwd so uid 0 is not known as "root".
+               ;; Thus patch it out.
+               (substitute* '("test/ext2test.2.dump"
+                              "test/ext3test.2.dump"
+                              "test/ext4test.2.dump"
+                              "test/ext2test-percent.2.dump"
+                              "test/mke2fs.2.dump"
+                              "test/mke2fs.3.dump")
+                 (("root") "unknown"))))
+           (add-before 'check 'setenv-check
+             (lambda _
+               ;; Our container doesn't provide access to /etc/mtab
+               (setenv "EXT2FS_NO_MTAB_OK" "1")
+               ;; Make test reproducible
+               (setenv "GENIMAGE_MKFJFFS2" "mkfs.jffs2 -U")
+               (setenv "GENIMAGE_MKE2FS" "mke2fs -E no_copy_xattrs")))
+           (replace 'check
+             (lambda _
+               (invoke "make" "TEST_LOG_COMPILER=" "check"))))))
+      (native-inputs
+       (list autoconf
+             automake
+             ;;; Note: cramfs is obsolete.
+             dtc ; for the tests
+             pkg-config
+             util-linux)) ; for the tests
+      (inputs
+       `(("bash" ,bash)
+         ("cdrkit-libre" ,cdrkit-libre)
+         ("cpio" ,cpio)
+         ;; Note: invoked by final executable.
+         ("coreutils" ,coreutils) ; chmod, dd
+         ("dosfstools" ,dosfstools)
+         ("e2fsprogs" ,e2fsprogs)
+         ("f2fs-tools" ,f2fs-tools)
+         ("genext2fs" ,genext2fs)
+         ("libconfuse" ,libconfuse)
+         ("mtd-utils" ,mtd-utils)
+         ("mtools" ,mtools)
+         ("qemu" ,qemu-minimal)
+         ("squashfs-tools" ,squashfs-tools)
+         ("tar" ,tar)
+         ("u-boot-tools" ,u-boot-tools)))
+      (synopsis "Create Flash images according to specification")
+      (description "@command{genimage} creates Flash images according to a
+specification file.")
+      (home-page "https://github.com/pengutronix/genimage")
+      (license license:gpl2))))

gnu/packages/geo.scm

@@ -24,7 +24,7 @@
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
-;;; Copyright © 2025, 2026 Mattia Bunel <mattia.bunel@ehess.fr>
+;;; Copyright © 2025 Mattia Bunel <mattia.bunel@ehess.fr>
 ;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2025 Lars Bilke <lars.bilke@ufz.de>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
@@ -409,9 +409,58 @@ hierarchical hexagonal geospatial indexing system")
        (sha256
         (base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
     (inputs
-     (modify-inputs inputs
+     (modify-inputs (package-inputs python-h3)
        (replace "h3" h3-3)))))
 
+(define-public memphis
+  (package
+    (name "memphis")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/jiuka/memphis")
+         (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "068c3943pgbpfjq44pmvn5fmkh005ak5aa67vvrq3fn487c6w54q"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:configure-flags
+       (list "--disable-static"
+             "--enable-gtk-doc"
+             "--enable-vala"
+             (string-append "--with-html-dir=" #$output "/share/gtk-doc/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-autogen
+           (lambda _
+             (substitute* "autogen.sh"
+               (("\\./configure \"\\$@\"")
+                "")))))))
+    (native-inputs
+     (list autoconf
+           automake
+           docbook-xml-4.3
+           gobject-introspection
+           gtk-doc/stable
+           libtool
+           libxml2                      ;for XML_CATALOG_FILES
+           pkg-config
+           python-wrapper
+           seed
+           vala))
+    (inputs (list expat glib))
+    (propagated-inputs (list cairo))
+    (synopsis "Map-rendering for OpenSteetMap")
+    (description "Memphis is a map-rendering application and a library for
+OpenStreetMap written in C using eXpat, Cairo and GLib.")
+    (home-page "http://trac.openstreetmap.ch/trac/memphis/")
+    (license license:lgpl2.1+)))
+
 (define-public geos
   (package
     (name "geos")
@@ -927,14 +976,14 @@ hydrology and waste deposition.")
   (package
     (inherit ogs-serial)
     (name "ogs-petsc")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs ogs-serial)
               (prepend openmpi petsc-openmpi)
               (replace "hdf5" hdf5-parallel-openmpi)
               (replace "netcdf-cxx4" netcdf-cxx4-parallel-openmpi)))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs ogs-serial)
                      (prepend pkg-config)))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments ogs-serial)
        ((#:configure-flags flags)
         #~(cons* "-DOGS_USE_PETSC=ON" "-DCMAKE_C_COMPILER=mpicc"
                  "-DCMAKE_CXX_COMPILER=mpic++"
@@ -988,13 +1037,13 @@ lets developers use the functionality of Proj in their own software.")
 (define-public python-obspy
   (package
     (name "python-obspy")
-    (version "1.5.0")
+    (version "1.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "obspy" version))
        (sha256
-        (base32 "0vk6mw06vmx9fhhykk80ndw1pp8821nzifrmdjd7igkdc652s848"))))
+        (base32 "0z1rf1m8dlcwrrc6bwncc6mgdph7vybg0ldm6xwhbgijv9ya34yx"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -1007,7 +1056,8 @@ lets developers use the functionality of Proj in their own software.")
     (native-inputs
      (list python-packaging
            python-pyproj
-           python-pytest))
+           python-pytest
+           python-wheel))
     (propagated-inputs
      (list python-decorator
            python-lxml
@@ -1615,7 +1665,7 @@ development.")
 (define-public pdal
   (package
     (name "pdal")
-    (version "2.10.0")
+    (version "2.9.0")
     (source
      (origin
        (method git-fetch)
@@ -1624,17 +1674,13 @@ development.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kbr084qmfkhc6wm76d1vgn2rvl3brzl588r2rd9441pvb19m9ds"))))
+        (base32 "0gckixcykp9di4j7w6zkbhpj2ji1hvk8z3rw58dlqcvi81xcyjfa"))))
     (build-system cmake-build-system)
     (arguments
      (list
       #:configure-flags #~(list "-DUSE_EXTERNAL_GTEST=ON")
       #:parallel-tests? #f
-      ;; Skip the tests using network to get remote data :
-      ;;     - pdal_io_stac_reader_test
-      ;;     - pdal_io_stac_remote_reader_test
-      ;;     - pdal_io_copc_remote_reader_test
-      #:test-exclude "pdal_io_(stac(_remote)?|copc_remote)_reader_test"))
+      #:test-exclude "pdal_io_(stac|copc)_reader_test"))
     (native-inputs (list python googletest))
     (inputs (list gdal
                   h3
@@ -2935,7 +2981,7 @@ to the OSM opening hours specification.")
 (define-public josm
   (package
     (name "josm")
-    (version "19539")
+    (version "19412")
     (source (origin
               (method svn-fetch)
               (uri (svn-reference
@@ -2944,7 +2990,7 @@ to the OSM opening hours specification.")
                      (recursive? #f)))
               (sha256
                (base32
-                "05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
+                "152pf0ww16jj5cv94ywlv5nb8pvnyqmvmnwsy3w0lf094faqkv5d"))
               (file-name (string-append name "-" version "-checkout"))
               (modules '((guix build utils)))
             (snippet
@@ -2963,6 +3009,7 @@ to the OSM opening hours specification.")
            java-jsr305
            java-metadata-extractor
            java-opening-hours-parser
+           java-openjfx-media
            java-parsson ; runtime dependency
            java-signpost-core
            java-svg-salamander
@@ -3069,7 +3116,6 @@ to the OSM opening hours specification.")
                  (lambda _
                    (display
                      (string-append "#!/bin/sh\n"
-                                    "_JAVA_AWT_WM_NONREPARENTING=1 "
                                     (assoc-ref inputs "openjdk") "/bin/java"
                                     " -cp " out "/share/java/josm.jar:"
                                     ;; CLASSPATH, but remove native inputs

gnu/packages/gettext.scm

@@ -163,7 +163,7 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
                 "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7"))
               (patches (search-patches "gettext-libunicode-update.patch"))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gettext-minimal)
        ((#:phases phases)
         #~(modify-phases #$phases
             (add-after 'unpack 'touch-test
@@ -187,7 +187,7 @@ translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
   (package/inherit gettext-minimal
     (name "gettext")
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments gettext-minimal)
        ((#:phases phases)
         #~(modify-phases #$phases
             (add-after 'install 'add-emacs-autoloads
@@ -349,9 +349,9 @@ areas where they were not expected like documentation.")
     (native-inputs
      ;; Remove test dependencies, primarily to reduce the size of the
      ;; dependency graph of the ‘guix’ package.
-     (modify-inputs native-inputs
+     (modify-inputs (package-native-inputs po4a)
        (delete "docbook-xml" "perl-test-pod" "texlive-local-tree")))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments po4a)
        ((#:tests? _ #t) #f)))
     (properties '((hidden? . #t)))))

gnu/packages/ghostscript.scm

@@ -311,13 +311,13 @@ output file formats and printers.")
 (define-public ghostscript/x
   (package/inherit ghostscript
     (name (string-append (package-name ghostscript) "-with-x"))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs ghostscript)
               (prepend libxext libxt)))))
 
 (define-public ghostscript/cups
   (package/inherit ghostscript
     (name "ghostscript-with-cups")
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs ghostscript)
               (prepend cups-minimal)))))
 
 (define-public ijs

gnu/packages/gimp.scm

@@ -143,10 +143,43 @@
     (home-page "https://code.google.com/archive/p/poly2tri-c/")
     (license license:bsd-3)))
 
+(define-public mrg
+  (package
+    (name "mrg")
+    (version "0.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/hodefoting/mrg")
+         (commit version)))
+       (file-name
+        (git-file-name name version))
+       (sha256
+        (base32 "106qhh0c11576cc5kh90ds0ram72d3r6n9sadw0y4krnhap6dvwk"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
+    (native-inputs
+     (list pkg-config))
+    (propagated-inputs
+     `(("alsa" ,alsa-lib)
+       ("cairo" ,cairo)
+       ("gtk+" ,gtk+)
+       ("mmm" ,mmm)
+       ("x11" ,libx11)))
+    (synopsis "Microraptor GUI")
+    (description "MrG is is a C API for creating user interfaces.  It can be
+used as an application writing environment or as an interactive canvas for part
+of a larger interface.")
+    (home-page "https://github.com/hodefoting/mrg")
+    (license license:lgpl2.0+)))
+
 (define-public babl
   (package
     (name "babl")
-    (version "0.1.124")
+    (version "0.1.114")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "https://download.gimp.org/pub/babl/"
@@ -160,7 +193,7 @@
                                         "/babl-" version ".tar.xz")))
               (sha256
                (base32
-                "1cgisifpxz0bhzp57x7jfg9wds6if9i24xznnnqz42glnr55838v"))))
+                "11v48pnmsbbv9j1xh11gn8bx3lnhc96s6zxwncyp0iz4q637gfxw"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -194,7 +227,7 @@ provided, as well as a framework to add new color models and data types.")
 (define-public gegl
   (package
     (name "gegl")
-    (version "0.4.68")
+    (version "0.4.62")
     (source
      (origin
        (method url-fetch)
@@ -208,7 +241,7 @@ provided, as well as a framework to add new color models and data types.")
                                  (version-major+minor version)
                                  "/gegl-" version ".tar.xz")))
        (sha256
-        (base32 "1qrsn8rllllj3673767rrs3khrym1xa62flbirjn04khkadk00jh"))))
+        (base32 "0v2wa2a3vnz1g4z5h9s8ili5h5kzk95hxlcp0zlxkwgbf5img1sq"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -357,7 +390,7 @@ that is extensible via a plugin system.")
   (package
     (inherit gimp-2)
     (name "gimp")
-    (version "3.2.0")
+    (version "3.0.4")
     (source
      (origin
        (method url-fetch)
@@ -365,15 +398,13 @@ that is extensible via a plugin system.")
                            (version-major+minor version)
                            "/gimp-" version ".tar.xz"))
        (sha256
-        (base32 "10z0n9shpqwny6hkwdin7nmp5vb0707gk7nzjg3f66z52qa3j616"))))
+        (base32 "09dbxim6k7pjkk8lbjkw3r4zi0y0mxvc4jk5fmjk42dzfp12xalc"))))
     (build-system meson-build-system)
     (arguments
      (list #:modules `((ice-9 popen)
                        (ice-9 rdelim)
                        (guix build meson-build-system)
                        (guix build utils))
-           ;; Test tries to connect to the internet and fails.
-           #:test-options #~(list "--no-suite=desktop")
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'remove-gcc-reference
@@ -412,11 +443,9 @@ that is extensible via a plugin system.")
                     (find-files (string-append #$output "/bin")
                                 (lambda (_ stat)
                                   (eq? 'regular (stat:type stat))))))))))
-    (inputs (modify-inputs inputs
+    (inputs (modify-inputs (package-inputs gimp-2)
               (replace "gtk+" gtk+)
-              (replace "mypaint-brushes" mypaint-brushes)
-              (prepend appstream
-                       bash-minimal
+              (prepend bash-minimal
                        libjxl
                        libxmu
                        libxt
@@ -425,7 +454,7 @@ that is extensible via a plugin system.")
                        gjs
                        libxslt
                        xdg-utils)))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs gimp-2)
                      (prepend appstream-glib
                               gi-docgen
                               libarchive

gnu/packages/gl.scm

@@ -309,7 +309,7 @@ also known as DXTn or DXTC) for Mesa.")
       (arguments
        (strip-keyword-arguments
         '(#:make-flags)
-        (substitute-keyword-arguments arguments
+        (substitute-keyword-arguments (package-arguments libva)
           ((#:configure-flags flags)
            '(list "--disable-glx"))))))))
 
@@ -657,7 +657,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
     (source (origin
               (inherit (package-source mesa))))
     (arguments
-     (substitute-keyword-arguments arguments
+     (substitute-keyword-arguments (package-arguments mesa)
        ((#:modules modules)
         (cons '(ice-9 textual-ports) modules))
        ((#:configure-flags flags)
@@ -1088,12 +1088,12 @@ and surfaces, receiving input and events.")
               (sha256
                (base32
                 "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m"))))
-    (native-inputs (modify-inputs native-inputs
+    (native-inputs (modify-inputs (package-native-inputs glfw)
                      (prepend pkg-config)))
     ;; When building out of source, the install phase fails with:
     ;;  file INSTALL cannot find "/tmp/guix-build-glfw-3.4.drv-0/build/docs/html":
     ;;  No such file or directory
-    (arguments (substitute-keyword-arguments arguments
+    (arguments (substitute-keyword-arguments (package-arguments glfw)
                  ((#:out-of-source? _ #f) #f)))))
 
 (define-public nanovg