gnu: services: Support channels when extending guix-service-type.

Most of the configuration for guix-service-type can be extended (build
machines, substitutes, etc), but channels currently cannot.  This commit adds
support for that.

* gnu/services/base.scm (guix-extension): Add `channels'.
(guix-extension-merge): Merge channels.
(guix-service-type): Add extension channels.
* doc/guix.texi (Getting Substitutes from Other Servers): Use a service
extension instead of modify-services.
(Base Services, guix-extension): Document channel field.

Change-Id: I26cd0556a536f49ecc61662fc10af080d6c6dc9f

CODEOWNERS

@@ -129,7 +129,7 @@ guix/build/gnu-build-system\.scm                   @guix/core-packages
 guix/build/utils\.scm                              @guix/core-packages
 guix/build-system/gnu\.scm                         @guix/core-packages
 
-gnu/packages/crypto\.scm                           @guix/crypto
+gnu/packages/(.*-|)crypto\.scm$                    @guix/crypto
 gnu/packages/gnupg\.scm                            @guix/crypto
 gnu/packages/nettle\.scm                           @guix/crypto
 gnu/packages/password-utils\.scm                   @guix/crypto

doc/contributing.texi

@@ -134,7 +134,11 @@ C++11 standard.
 @section Building from Git
 
 If you want to hack Guix itself, it is recommended to use the latest
-version from the Git repository:
+version from the Git repository@footnote{
+Guix uses @code{master} as the default branch name. A proposal in 2025 to
+change the default branch name to @code{main} did not reach consensus.
+See @uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/003-rename-default-branch.md,
+Guix Consensus Document 003}.}:
 
 @example
 git clone https://git.guix.gnu.org/guix.git

doc/guix.texi

@@ -4018,12 +4018,9 @@ them in the specified order.  You also need to explicitly authorize the
 public keys of substitute servers to instruct Guix to accept the
 substitutes they sign.
 
-On Guix System, this is achieved by modifying the configuration of the
-@code{guix} service.  Since the @code{guix} service is part of the
-default lists of services, @code{%base-services} and
-@code{%desktop-services}, you can use @code{modify-services} to change
-its configuration and add the URLs and substitute keys that you want
-(@pxref{Service Reference, @code{modify-services}}).
+On Guix System, this is achieved by extending the configuration of the
+@code{guix} service.  @pxref{Service Composition, Service extensions}
+allow users to easily add new configuration information.
 
 As an example, suppose you want to fetch substitutes from
 @code{guix.example.org} and to authorize the signing key of that server,
@@ -4035,18 +4032,13 @@ configuration will look something like:
 (operating-system
   ;; @dots{}
   (services
-    ;; Assume we're starting from '%desktop-services'.  Replace it
-    ;; with the list of services you're actually using.
-    (modify-services %desktop-services
-      (guix-service-type config =>
-                        (guix-configuration
-                          (inherit config)
-                          (substitute-urls
-                            (append (list "https://guix.example.org")
-                                    %default-substitute-urls))
-                          (authorized-keys
-                            (append (list (local-file "./key.pub"))
-                                    %default-authorized-guix-keys)))))))
+    (cons
+     (simple-service
+      'my-guix-configuration guix-service-type
+      (guix-extension
+        (substitute-urls (list "https://guix.example.org"))
+        (authorized-keys (list (local-file "./key.pub")))))
+     %desktop-services)))
 @end lisp
 
 This assumes that the file @file{key.pub} contains the signing key of
@@ -18941,8 +18933,8 @@ given location at the time of the unlock attempt.
 ;; Following definition would be equivalent to running:
 ;;   cryptsetup open --key-file /crypto.key /dev/sdb1 data
 (mapped-device
- (source "/dev/sdb1)
- (target "data)
+ (source "/dev/sdb1")
+ (target "data")
  (type luks-device-mapping)
  (arguments '(#:key-file "/crypto.key")))
 @end lisp
@@ -20702,6 +20694,9 @@ a guix service extension.
 @xref{Service Composition}, for more information.
 
 @table @asis
+@item @code{channels} (default: @code{'()})
+A list of objects where each element is a channel record.
+
 @item @code{authorized-keys} (default: @code{'()})
 A list of file-like objects where each element contains a public key.
 

etc/teams.scm

@@ -977,14 +977,13 @@ release."
         #:name "Crypto team"
         #:description
         "Secrets, passwords, cryptography and security related packages."
-        #:scope (list
-                 "gnu/packages/crypto.scm"
-                 "gnu/packages/gnupg.scm"
-                 "gnu/packages/nettle.scm"
-                 "gnu/packages/password-utils.scm"
-                 "gnu/packages/security-token.scm"
-                 "gnu/packages/ssh.scm"
-                 "gnu/packages/tls.scm")))
+        #:scope (list (make-regexp* "^gnu/packages/(.*-|)crypto\\.scm$")
+                      "gnu/packages/gnupg.scm"
+                      "gnu/packages/nettle.scm"
+                      "gnu/packages/password-utils.scm"
+                      "gnu/packages/security-token.scm"
+                      "gnu/packages/ssh.scm"
+                      "gnu/packages/tls.scm")))
 
 (define-team science
   (team 'science

gnu/local.mk

@@ -1880,8 +1880,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mpc123-initialize-ao.patch		\
   %D%/packages/patches/mpg321-CVE-2019-14247.patch		\
   %D%/packages/patches/mpg321-gcc-10.patch			\
-  %D%/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch		\
-  %D%/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch	\
   %D%/packages/patches/modglue-fix-build.patch		\
   %D%/packages/patches/modem-manager-fix-test-wrapper.patch	\
   %D%/packages/patches/module-init-tools-moduledir.patch	\
@@ -2483,7 +2481,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/wmctrl-64-fix.patch			\
   %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
   %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch	\
-  %D%/packages/patches/woof-doom-unbundle-spng-miniz.patch	\
   %D%/packages/patches/wordnet-CVE-2008-2149.patch			\
   %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch			\
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch			\

gnu/packages/acl.scm

@@ -30,10 +30,13 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages python-build)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (gnu packages)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix utils))
 
@@ -95,33 +98,28 @@
 (define-public python-pylibacl
   (package
     (name "python-pylibacl")
-    (version "0.6.0")
+    (version "0.7.3")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pylibacl" version))
-        (sha256
-          (base32
-            "1zyrk2m20p5b6bdwxhrwib273i6i71zyr5hzssbxfqis5qra9848"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pylibacl" version))
+       (sha256
+        (base32 "08pr5cbipij3j591bihh72r5h14lyrspy24qwmfjsn0c1rcgp7wx"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-tests
-           (lambda* (#:key outputs inputs #:allow-other-keys)
-             ;; These tests operate on real files, but our tmpfs does not support
-             ;; ACLs.
-             (substitute* "tests/test_acls.py"
-               (("( *)def test_applyto(_extended(_mixed)?)?" match indent)
-                (string-append indent "@pytest.mark.skip(reason=\"guix\")\n"
-                               match)))))
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (invoke "pytest" "tests")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-tests
+            (lambda* (#:key outputs inputs #:allow-other-keys)
+              ;; These tests operate on real files, but our tmpfs does not support
+              ;; ACLs.
+              (substitute* "tests/test_acls.py"
+                (("( *)def test_applyto(_extended(_mixed)?)?" match indent)
+                 (string-append indent "@pytest.mark.skip(reason=\"guix\")\n"
+                                match))))))))
     (inputs (list acl))
-    (native-inputs (list python-pytest))
+    (native-inputs (list python-pytest python-setuptools))
     (home-page "https://pylibacl.k1024.org/")
     (synopsis "POSIX.1e @acronym{ACLs, access control lists} for Python")
     (description

gnu/packages/aidc.scm

@@ -300,6 +300,38 @@ barcodes of the modern ECC200 variety.  libdmtx is a shared library, allowing
 C/C++ programs to use its capabilities without restrictions or overhead.")
     (license license:bsd-3)))
 
+(define-public dmtx-utils
+  (package
+    (name "dmtx-utils")
+    (version "0.7.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dmtx/dmtx-utils/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4")))
+    (build-system gnu-build-system)
+    (native-inputs (list autoconf automake libtool pkg-config))
+    (inputs (list libdmtx imagemagick libjpeg-turbo))
+    (home-page "https://github.com/dmtx/dmtx-utils/")
+    (synopsis "Utilities for working with Data Matrix barcodes")
+    (description
+     "libdmtx is a software library that enables programs to read and write Data
+Matrix barcodes of the modern ECC200 variety.  This package, dmtx-utils,
+provides command line utilities that allow scripts and command line users to
+use libdmtx functionality.
+
+This package includes the following programs:
+@enumerate
+@item @code{dmtxquery}: Extract information from dmtxread output.
+@item @code{dmtxread}: Scan Data Matrix barcodes.
+@item @code{dmtxwrite}: Create Data Matrix barcodes.
+@end enumerate")
+    (license (list license:lgpl2.1 license:gpl2))))
+
 ;; XXX: qt variant utils are broken: zbarcam-qt fails with segmentation fault.
 (define-public zbar
   (package

gnu/packages/astronomy.scm

@@ -5043,6 +5043,9 @@ astronomy-specific functionality")
        (sha256
         (base32 "062l4bhh1dvsazrlnjc4kr3qj9g3s8qmcs0kqb1libiimy6rdbkk"))))
     (build-system pyproject-build-system)
+    (arguments
+     ;; XXX: This test is flaky, it can fail if the CI system is slow.
+     (list #:test-flags #~(list "-k" "not test_combine_slices_hypot")))
     (native-inputs
      (list python-pytest
            python-pytest-mpl

gnu/packages/audio.scm

@@ -4654,21 +4654,21 @@ tempo and pitch of an audio recording independently of one another.")
 (define-public rtmidi
   (package
     (name "rtmidi")
-    (version "5.0.0")
+    (version "6.0.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://www.music.mcgill.ca/~gary/rtmidi"
+              (uri (string-append "https://caml.music.mcgill.ca/~gary/rtmidi"
                                   "/release/rtmidi-" version ".tar.gz"))
               (file-name (string-append "rtmidi-" version ".tar.gz"))
               (sha256
                (base32
-                "1ff2yfq3k4l209fr71v3w98fpjjv1chs09vkbmxj03lcikahxns8"))))
+                "0nyvck6qlncbfpplgxspjk77fmi05w78ik0cf8039hj29gvcqq2r"))))
     (build-system gnu-build-system)
     (inputs
      (list alsa-lib jack-2))
     (native-inputs
      (list autoconf automake libtool pkg-config))
-    (home-page "https://www.music.mcgill.ca/~gary/rtmidi")
+    (home-page "https://caml.music.mcgill.ca/~gary/rtmidi")
     (synopsis "Cross-platform MIDI library for C++")
     (description
      "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific
@@ -6194,6 +6194,41 @@ the following features:
 ")
     (license license:lgpl3+)))
 
+(define-public normalize
+  (package
+    (name "normalize")
+    (version "0.7.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://download.savannah.gnu.org/releases/normalize/normalize-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-shell-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "test/Makefile.in"
+                (("/bin/sh")
+                 (search-input-file inputs "/bin/sh"))))))))
+    (inputs (list libmad))
+    (home-page "https://normalize.nongnu.org/")
+    (synopsis "Audio track volume normalizer")
+    (description
+     "@code{normalize} is an audio track normalizer.
+For a collection of tracks with varying volumes, it is able to
+make the loudness consistent between them.  This is helpful
+when making mixtapes, for example.
+It can work with WAV and MP3 files.")
+    (license license:gpl2)))
+
 (define-public lv2-speech-denoiser
   (let ((commit "04cfba929630404f8d4f4ca5bac8d9b09a99152f")
         (revision "1"))

gnu/packages/backup.scm

@@ -574,13 +574,13 @@ rsnapshot uses hard links to deduplicate identical files.")
 (define-public borg
   (package
     (name "borg")
-    (version "1.4.1")
+    (version "1.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgbackup" version))
        (sha256
-        (base32 "0f9qj05i02aj17lhk97fqyknb1jx3h9xr8d569mhp44xq7qziyxq"))
+        (base32 "07s4jqcv03s98hi6lvqpvmnnhl532qnvv11mjy2xc08rbmsgmfvr"))
        (snippet
         #~(begin
             ;; Delete files generated by Cython.  We used to have a regex that
@@ -1209,39 +1209,42 @@ compression parameters used by Gzip.")
 (define-public borgmatic
   (package
     (name "borgmatic")
-    (version "2.0.7")
+    (version "2.0.13")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "borgmatic" version))
+       ;; PyPI archive does not contain NEWS file needed for one test.
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://projects.torsion.org/borgmatic-collective/borgmatic")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "01l44ny2zyn7x1hhbvhhhwr12jipcjxl3j1cz13kf6c3bdfwms8y"))))
+        (base32
+         "05w3j4knhsg4w0a0yrz8c7lvz3vp3nf95ddmql9i8mqknjqddm1v"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; XXX: all tests fail with error: AttributeError: module
-      ;; '_pytest.runner' has no attribute 'call_runtest_hook'.
-      #:tests? #f
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'configure
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       ;; Set absolute store path to borg.
-                       (substitute* "borgmatic/commands/borgmatic.py"
-                         (("\\.get\\('local_path', 'borg'\\)")
-                          (string-append ".get('local_path', '"
-                                         (search-input-file inputs "bin/borg")
-                                         "')")))
-                       (substitute* "tests/unit/commands/test_borgmatic.py"
-                         (("(module.get_local_path.+ == )'borg'" all start)
-                          (string-append start "'"
-                                         (search-input-file inputs "bin/borg")
-                                         "'")))))
-                   (add-before 'check 'set-path
-                     (lambda _
-                         ;; Tests require the installed executable.
-                         (setenv "PATH"
-                                 (string-append #$output "/bin" ":"
-                                                (getenv "PATH"))))))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Set absolute store path to borg.
+              (substitute* "borgmatic/commands/borgmatic.py"
+                (("\\.get\\('local_path', 'borg'\\)")
+                 (string-append ".get('local_path', '"
+                                (search-input-file inputs "bin/borg")
+                                "')")))
+              (substitute* "tests/unit/commands/test_borgmatic.py"
+                (("(module.get_local_path.+ == )'borg'" all start)
+                 (string-append start "'"
+                                (search-input-file inputs "bin/borg")
+                                "'")))))
+          (add-before 'check 'set-path
+            (lambda _
+              ;; Tests require the installed executable.
+              (setenv "PATH"
+                      (string-append #$output "/bin" ":"
+                                     (getenv "PATH"))))))))
     (native-inputs
      (list python-flexmock
            python-pytest
@@ -1266,7 +1269,7 @@ borgmatic is powered by borg.")
 (define-public vorta
   (package
     (name "vorta")
-    (version "0.10.3")
+    (version "0.11.1")
     ;; The test folder is not included in the PyPI archive.
     (source (origin
               (method git-fetch)
@@ -1276,7 +1279,7 @@ borgmatic is powered by borg.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0b4042a0lpbmwlmbh5559b2x9vr2055w6jjrs7088n45d7rkn4sn"))))
+                "16r9ch80i6nfngah634id16fqnmn62ayh60j62zxn5cfivcn3wsq"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/bittorrent.scm

@@ -226,7 +226,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
 (define-public stig
   (package
     (name "stig")
-    (version "0.14.0a0")
+    (version "0.14.1a0")
     (source
      (origin
        (method git-fetch)
@@ -235,7 +235,18 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jfcgncva94pyzjifar1l6wlmb7aylg0l4fxljc83rkbj1a2aan0"))))
+        (base32 "0196brcasdyn0mx3h2cqlgrx8x9fyv2n7bmx13nj58vnf3y4c1hg"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;tests require network access
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'loosen-version-restrictions
+            (lambda _
+              (substitute* "setup.py"
+                (("urwidtrees==1.0.3")
+                 "urwidtrees>=1.0.3")))))))
     (propagated-inputs
      (list python-urwid
            python-urwidtrees
@@ -246,20 +257,12 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
            python-natsort
            python-async-timeout
            python-setproctitle))
-    (arguments
-     (list
-      #:tests? #f ;tests require network access
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'loosen-version-restrictions
-                     (lambda _
-                       (substitute* "setup.py"
-                         (("urwidtrees==1.0.3") "urwidtrees>=1.0.3")))))))
     (inputs (list python))
-    (build-system python-build-system)
+    (native-inputs (list python-setuptools))
     (synopsis "TUI and CLI for the BitTorrent client Transmission")
     (description
-     "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command Line
-Interface} client for the BitTorrent client Transmission.")
+     "Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
+Line Interface} client for the BitTorrent client Transmission.")
     (home-page "https://github.com/rndusr/stig")
     (license l:gpl3)))
 
@@ -537,20 +540,6 @@ focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
     (license l:bsd-2)))
 
-(define-public libtorrent-rasterbar-1.2
-  (package
-    (inherit libtorrent-rasterbar)
-    (version "1.2.20")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://github.com/arvidn/libtorrent/"
-                       "releases/download/v" version "/"
-                       "libtorrent-rasterbar-" version ".tar.gz"))
-       (sha256
-        (base32 "1z5rdynzxcm6wb7v48ssfbwjairbjacb8rjix5fn70fw4668xgyc"))))))
-
 (define-public qbittorrent
   (package
     (name "qbittorrent")

gnu/packages/books.scm

@@ -159,9 +159,6 @@ core computer science concepts such as abstraction in programming,
 metalinguistic abstraction, recursion, interpreters, and modular programming.")
       (license license:cc-by-sa4.0))))
 
-;; It may be removed after 2025-12-19.
-(define-deprecated/public-alias sicp book-sicp)
-
 (define-public book-sparc
   (package
     (name "book-sparc")

gnu/packages/bqn.scm

@@ -2,6 +2,7 @@
 ;;; Copyright © 2022 Christopher Rodriguez <yewscion@gmail.com>
 ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2025 Lee Thompson <lee.p.thomp@gmail.com>
+;;; © 2025 case_lambda <case_lambda@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,77 +37,71 @@
   #:use-module (gnu packages compression))
 
 (define-public dbqn
-  (let ((commit "88f2b43966a75cc2c382421218eb30003bb16f4a")
-        (revision "1"))
-    (package
-      (name "dbqn")
-      (version (git-version "0.2.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/dzaima/BQN")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "06mzvv7kmandhgwb6jwz3rivsj4ic549sy8afnb5zr6mfn5isyg5"))))
-      (build-system gnu-build-system)
-      (arguments
-       (list
-        #:imported-modules `(,@%default-gnu-imported-modules
-                             (guix build ant-build-system))
-        #:modules `((guix build gnu-build-system)
-                    ((guix build ant-build-system)
-                     #:prefix ant:)
-                    (guix build utils))
-        #:phases #~(modify-phases %standard-phases
-                     (delete 'configure)
-                     (replace 'build
-                       (lambda* _
-                         (invoke "./build")
-                         (chmod "./BQN" #o755)))
-                     (replace 'check
-                       (lambda* (#:key tests? #:allow-other-keys)
-                         (when tests?
-                           (system "./BQN ./test/test"))))
-                     (add-after 'install 'reorder-jar-content
-                       (lambda* (#:key outputs #:allow-other-keys)
-                         (apply (assoc-ref ant:%standard-phases
-                                           'reorder-jar-content)
-                                #:outputs (list outputs))))
-                     (add-after 'reorder-jar-content 'jar-indices
-                       (lambda* (#:key outputs #:allow-other-keys)
-                         (apply (assoc-ref ant:%standard-phases
-                                           'generate-jar-indices)
-                                #:outputs (list outputs))))
-                     (add-after 'jar-indices 'fix-jar-timestamps
-                       (lambda* (#:key outputs #:allow-other-keys)
-                         (apply (assoc-ref ant:%standard-phases
-                                           'reorder-jar-content)
-                                #:outputs (list outputs))))
-                     (replace 'install
-                       (lambda* (#:key outputs #:allow-other-keys)
-                         (let* ((out (assoc-ref outputs "out"))
-                                (dest-bin (string-append out "/bin"))
-                                (dest-jar (string-append out "/share/java")))
-                           (mkdir-p dest-bin)
-                           (mkdir-p dest-jar)
-                           (rename-file "BQN" "dbqn")
-                           (install-file "dbqn" dest-bin)
-                           (install-file "BQN.jar" dest-jar)
-                           (substitute* (string-append dest-bin "/dbqn")
-                             (("BQN.jar")
-                              (string-append dest-jar "/BQN.jar")))))))))
-      (native-inputs (list `(,icedtea-8 "jdk") zip))
-      (inputs (list icedtea-8 bash-minimal))
-      (synopsis "BQN implementation based on dzaima/APL")
-      (description
-       "dbqn is a Java implementation of the
+  (package
+    (name "dbqn")
+    (version "0.2.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/dzaima/BQN")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1zy3y9wbmaw0mrd2sp7d1r912gvs9k0mzw5d3drgmbzkbvpd6iq1"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:imported-modules `((guix build ant-build-system)
+                           ,@%default-gnu-imported-modules)
+      #:modules '((guix build gnu-build-system)
+                  ((guix build ant-build-system)
+                   #:prefix ant:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (replace 'build
+            (lambda _
+              (invoke "./build")))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (if tests?
+                  (invoke "./BQN" "./test/test")
+                  (begin
+                    (display "test suite not run")
+                    (newline)))))
+          (add-after 'install 'reorder-jar-content
+            (assoc-ref ant:%standard-phases
+                       'reorder-jar-content))
+          (add-after 'reorder-jar-content 'generate-jar-indices
+            (assoc-ref ant:%standard-phases
+                       'generate-jar-indices))
+          (add-after 'generate-jar-indices 'strip-jar-timestamps
+            (assoc-ref ant:%standard-phases
+                       'strip-jar-timestamps))
+          (replace 'install
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((dest-jar (string-append #$output "/share/java")))
+                (rename-file "BQN" "dbqn")
+                (substitute* "dbqn"
+                  (("java")
+                   (search-input-file inputs "/bin/java"))
+                  (("BQN.jar")
+                   (string-append dest-jar "/BQN.jar")))
+                (install-file "BQN.jar" dest-jar)
+                (install-file "dbqn"
+                              (string-append #$output "/bin"))))))))
+    (native-inputs (list `(,icedtea-8 "jdk") zip))
+    (inputs (list bash-minimal icedtea-8))
+    (synopsis "BQN implementation based on dzaima/APL")
+    (description
+     "dbqn is a Java implementation of the
 @uref{https://mlochbaum.github.io/BQN/, BQN programming language} that does
 not need to be bootstrapped, based on an earlier Java implementation of APL by
 the same author.")
-      (home-page "https://github.com/dzaima/BQN")
-      (license license:expat))))
+    (home-page "https://github.com/dzaima/BQN")
+    (license license:expat)))
 
 (define bqn-sources
   ;; Aside from dbqn above, the main bqn repository is used by other

gnu/packages/c.scm

@@ -51,6 +51,7 @@
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix store)
   #:use-module (gnu packages)
@@ -72,6 +73,7 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gettext)
@@ -466,23 +468,26 @@ language as input.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1rihvlg11nzk70kfzz4i3gi5izcy46w05ismcx04p5j1hlim0brb"))))
-    (build-system python-build-system)
+        (base32 "1rihvlg11nzk70kfzz4i3gi5izcy46w05ismcx04p5j1hlim0brb"))))
+    (build-system pyproject-build-system)
     (arguments
      (list
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'unbundle-ply
-                     (lambda _
-                       (rmdir "pcpp/ply")
-                       (substitute* "setup.py"
-                         (("'pcpp/ply/ply'") "")))))))
-    (native-inputs (list python-pytest))
+      #:test-backend #~'unittest
+      #:test-flags #~(list "discover" "-s" "tests" "-p" "*.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'unbundle-ply
+            (lambda _
+              (rmdir "pcpp/ply")
+              (substitute* "setup.py"
+                (("'pcpp/ply/ply'")
+                 "")))))))
+    (native-inputs (list python-setuptools))
     (propagated-inputs (list python-ply))
     (home-page "https://github.com/ned14/pcpp")
     (synopsis "C99 preprocessor written in Python")
-    (description "This package provides a C99 preprocessor written in pure
-Python.")
+    (description
+     "This package provides a C99 preprocessor written in pure Python.")
     (license license:bsd-3)))
 
 (define-public aml

gnu/packages/check.scm

@@ -3165,57 +3165,6 @@ non-technical or business participants in a software project.  Behave uses
 tests written in a natural language style, backed up by Python code.")
     (license license:x11)))
 
-(define-public python-behave-web-api
-  (package
-    (name "python-behave-web-api")
-    (version "2.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "behave-web-api" version))
-       (sha256
-        (base32
-         "04p5sp6wck3mafj634w1fpvfhxm170l5q3hfb9d06pi71ql606n6"))))
-    (build-system pyproject-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-dependencies
-           (lambda _
-             (substitute* "setup.py"
-               (("'wheel'") "")                ; We don't use it.
-               (("'ordereddict==1.1'") ""))    ; Python >= 2.7 has it built-in.
-             #t)))))
-    (native-inputs
-     (list python-pytest
-           python-setuptools
-           python-wheel))
-    (propagated-inputs
-     (list behave python-requests))
-    (home-page "https://github.com/jefersondaniel/behave-web-api")
-    (synopsis "Provides testing for JSON APIs with Behave for Python")
-    (description "This package provides testing utility modules for testing
-JSON APIs with Behave.")
-    (license license:expat)))
-
-(define-public python-nose-timer
-  (package
-    (name "python-nose-timer")
-    (version "0.7.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "nose-timer" version))
-        (sha256
-          (base32 "05wzkc88vbzw62pqkvhl33211b90kns0lny70b7qw62rcg4flzk4"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-nose python-termcolor))
-    (home-page "https://github.com/mahmoudimus/nose-timer")
-    (synopsis "Timer plugin for nosetests")
-    (description "Shows how much time was needed to run individual tests.")
-    (license license:expat)))
-
 (define-public python-freezegun
   (package
     (name "python-freezegun")

gnu/packages/cmake.scm

@@ -46,6 +46,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system emacs)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
   #:use-module (gnu packages)
@@ -460,14 +461,40 @@ and workspaces that can be used in the compiler environment of your choice.")
        (uri (pypi-uri "cmakelang" version))
        (sha256
         (base32 "0zz6g1ignqanl4ja9f5nrlk5f3mvv7cp5y9yswjd0m06n23jx603"))))
-    (build-system python-build-system)
-    (arguments (list #:tests? #f        ;no test data in pypi archive
-                     #:phases #~(modify-phases %standard-phases
-                                  (add-after 'unpack 'adjust-setup.py
-                                    (lambda _
-                                      (substitute* "setup.py"
-                                        (("cmakelang/doc/README.rst")
-                                         "README.rst")))))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f        ;no test data in pypi archive
+      #:modules '((guix build pyproject-build-system)
+                  (guix build utils)
+                  (ice-9 textual-ports))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'adjust-setup.py
+            (lambda _
+              (substitute* "setup.py"
+                (("cmakelang/doc/README.rst")
+                 "README.rst"))
+              ;; XXX: setup.py has multiple setup() calls, breaking the 'build
+              ;; phase ; in this case the package is wrong, but conveniently
+              ;; our goal is the first setup() call, so discard what comes from
+              ;; the second one.
+              (rename-file "setup.py" "setup.py.bak")
+              (call-with-input-file "setup.py.bak"
+                (lambda (in)
+                  (call-with-output-file "setup.py"
+                    (lambda (out)
+                      (let loop ((line (get-line in))
+                                 (setup-seen #f))
+                        (unless (or (eof-object? line)
+                                    (and (string-prefix? "setup(" line)
+                                         setup-seen))
+                          (display line out)
+                          (newline out)
+                          (loop (get-line in)
+                                (or setup-seen
+                                    (string-prefix? "setup(" line))))))))))))))
+    (native-inputs (list python-setuptools))
     (inputs (list python-jinja2 python-pyyaml python-six))
     (home-page "https://github.com/cheshirekow/cmake_format/")
     (synopsis "Language tools for CMake (format, lint, etc.)")

gnu/packages/databases.scm

@@ -4345,26 +4345,53 @@ framework.")
 (define-public python-sqlalchemy-utils
   (package
     (name "python-sqlalchemy-utils")
-    (version "0.38.3")
+    (version "0.42.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "SQLAlchemy-Utils" version))
-        (sha256
-         (base32 "0k8z0mjhvdv302kn0nhci8b2dgw4cn2akprsf37ma1540ykgp6lz"))))
-    (build-system python-build-system)
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kvesteri/sqlalchemy-utils")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ny1p352p0dlgrf9fnmzj7ld1rga5zj698qpla1kdaliwwh6xawn"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:tests? #f)) ; FIXME: Many tests require a running database server.
-       ;; #:phases
-       ;; (modify-phases %standard-phases
-       ;;   (replace 'check
-       ;;     (lambda _
-       ;;       (zero? (system* "py.test" "sqlalchemy_utils" "tests")))))
-    (propagated-inputs
-     (list python-six python-sqlalchemy))
+     (list
+      #:test-flags
+      ;; XXX: These tests require additional inputs.
+      #~(list "--deselect=tests/test_views.py::TestMySqlTrivialView"
+              "--deselect=tests/functions/test_database.py::\
+TestDatabasePostgresPg8000::test_create_and_drop"
+              "--deselect=tests/functions/test_database.py::\
+TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-postgresql
+            (lambda* (#:key inputs tests? #:allow-other-keys)
+              (when tests?
+                (setenv "TZDIR" (search-input-directory inputs
+                                                        "share/zoneinfo"))
+                (let ((dbdir (string-append (getcwd) "/../pgdir")))
+                  (setenv "SQLALCHEMY_UTILS_TEST_POSTGRESQL_USER"
+                          "nixbld")
+                  (invoke "initdb" "-D" dbdir)
+                  (invoke "pg_ctl" "-D" dbdir
+                          "-o" (string-append "-k " dbdir)
+                          "-l" (string-append dbdir "/db.log")
+                          "start")
+	          (invoke "psql" "-h" dbdir "-d" "postgres"
+                          "-c" "CREATE DATABASE sqlalchemy_utils_test;"))))))))
+    (propagated-inputs (list python-six python-sqlalchemy))
     (native-inputs
-     (list python-dateutil python-flexmock python-psycopg2 python-pytest
-           python-pytz))
+     (list postgresql
+           python-dateutil
+           python-flexmock
+           python-psycopg2
+           python-pytest
+           python-pytz
+           python-setuptools
+           tzdata-for-tests))
     (home-page "https://github.com/kvesteri/sqlalchemy-utils")
     (synopsis "Various utility functions for SQLAlchemy")
     (description
@@ -4466,19 +4493,23 @@ SQLAlchemy Database Toolkit for Python.")
   (package
     (name "python-sqlite-fts4")
     (version "1.0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "sqlite-fts4" version))
-              (sha256
-               (base32
-                "034kx0ac556sywy1p4qcrc36l24w3q0xwswqv2z9s3k8yvm5xc3q"))))
-    (build-system python-build-system)
-    (native-inputs (list python-pytest))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/simonw/sqlite-fts4")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "05c69n4nrc9srkbih1q1wxlw6n9mb3dm7ysb47ipqjn3rp1aif11"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
     (home-page "https://github.com/simonw/sqlite-fts4")
     (synopsis "Python functions for working with SQLite FTS4 search")
-    (description "This package provides custom SQLite functions written
-in Python for ranking documents indexed using the SQLite's FTS4 full
-text search extension.")
+    (description
+     "This package provides custom SQLite functions written in Python for
+ranking documents indexed using the SQLite's FTS4 full text search
+extension.")
     (license license:asl2.0)))
 
 (define-public python-sqlite-utils
@@ -4671,18 +4702,41 @@ libraries with SQLALchemy.")
 (define-public python-psycopg2
   (package
     (name "python-psycopg2")
-    (version "2.9.6")
+    (version "2.9.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "psycopg2" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/psycopg/psycopg2")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "04chl9f7v7k1zssa40pmk06jvpyqiss2lpjq50dq69nqix0mhlgi"))))
-    (build-system python-build-system)
+        (base32 "04l2yzbl15nrw1pcjfkqycvqn6h9phcdh1xx9ynfy3dzfscq5ly5"))))
+    (build-system pyproject-build-system)
     (arguments
-     ;; Tests would require a postgresql database "psycopg2_test"
-     ;; and a running postgresql database management service.
-     '(#:tests? #f)) ; TODO re-enable after providing a test-db.
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-postgresql
+            (lambda* (#:key inputs tests? #:allow-other-keys)
+              (when tests?
+                (setenv "TZDIR" (search-input-directory inputs
+                                                        "share/zoneinfo"))
+                (let ((dbdir (string-append (getcwd) "/../pgdir")))
+                  (setenv "PSYCOPG2_TESTDB_USER" "nixbld")
+                  (setenv "PSYCOPG2_TESTDB_HOST" dbdir)
+                  (invoke "initdb" "-D" dbdir)
+                  (invoke "pg_ctl" "-D" dbdir
+                          "-o" (string-append "-k " dbdir)
+                          "-l" (string-append dbdir "/db.log")
+                          "start")
+	          (invoke "psql" "-h" dbdir "-d" "postgres"
+                          "-c" "CREATE DATABASE psycopg2_test;"))))))))
+    (native-inputs
+     (list postgresql
+           python-pytest
+           python-setuptools
+           tzdata-for-tests))
     (inputs
      (list postgresql)) ; libpq
     (home-page "https://www.psycopg.org/")
@@ -4704,14 +4758,16 @@ libraries with SQLALchemy.")
               (sha256
                (base32
                 "1pkx7nj1mhacwpna7ldzqfqxd1xg8826600r0bs9ad1h93f429yh"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     (list #:tests? #f                  ;run for psycopg below
-           #:phases
-           #~(modify-phases %standard-phases
-               ;; This module requires 'psycopg', however psycopg needs this
-               ;; for its tests.  Disable sanity check to break the cycle.
-               (delete 'sanity-check))))
+     (list
+      #:tests? #f                  ;run for psycopg below
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; This module requires 'psycopg', however psycopg needs this
+          ;; for its tests.  Disable sanity check to break the cycle.
+          (delete 'sanity-check))))
+    (native-inputs (list python-setuptools))
     (home-page "https://www.psycopg.org/")
     (synopsis "Connection pooler for psycopg")
     (description
@@ -4822,23 +4878,49 @@ from a SQLAlchemy model (or directly from the database).")
 (define-public yoyo-migrations
   (package
     (name "yoyo-migrations")
-    (version "8.2.0")
+    (version "9.0.0")
     (source
      (origin
-       ;; We use the upstream repository, as the tests are not included in the
-       ;; PyPI releases.
        (method hg-fetch)
        (uri (hg-reference
              (url "https://hg.sr.ht/~olly/yoyo")
              (changeset (string-append "v" version "-release"))))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "1al030ix0w63hr4s3mqry6s0mlqdj8p242pdqks06br7c25nx3yj"))))
-    (build-system python-build-system)
+        (base32 "0bn4n043y0n4dh7axwavfims2krap5dcmdaxswbadzmis3a4hxyb"))))
+    (build-system pyproject-build-system)
     (arguments
-     ;; XXX: Tests require a connection to some pgsql database and psycopg
-     ;; fails to connect to it.
-     '(#:tests? #f))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-postgresql
+            (lambda* (#:key inputs tests? #:allow-other-keys)
+              (when tests?
+                (delete-file "test_databases.ini")
+                (call-with-output-file "test_databases.ini"
+                  (lambda (port)
+                    (format port "[DEFAULT]
+postgresql = postgresql://nixbld@/yoyo_test~%")))
+                (setenv "TZDIR" (search-input-directory inputs
+                                                        "share/zoneinfo"))
+                (let ((dbdir (string-append (getcwd) "/../pgdir")))
+                  (setenv "PGHOST" dbdir)
+                  (setenv "PGUSER" "nixbld")
+                  (invoke "initdb" "-D" dbdir)
+                  (invoke "pg_ctl" "-D" dbdir
+                          "-o" (string-append "-k " dbdir)
+                          "-l" (string-append dbdir "/db.log")
+                          "start")
+	          (invoke "psql" "-h" dbdir "-d" "postgres"
+                          "-c" "CREATE DATABASE yoyo_test;"))))))))
+    (native-inputs
+     (list postgresql
+           python-freezegun
+           python-psycopg2
+           python-pytest
+           python-setuptools
+           tms
+           tzdata-for-tests))
     (propagated-inputs
      (list python-sqlparse python-tabulate python-importlib-metadata))
     (home-page "https://ollycope.com/software/yoyo/latest/")
@@ -5531,7 +5613,7 @@ algorithm implementations.")
   (package
     (inherit apache-arrow)
     (name "python-pyarrow")
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
       ;; XXX: Test data is distributed separately in
@@ -5541,7 +5623,6 @@ algorithm implementations.")
       #:tests? #f
       #:phases
       #~(modify-phases %standard-phases
-          (delete 'build) ; XXX the build is performed again during the install phase
           (add-after 'unpack 'enter-source-directory
             (lambda _ (chdir "python")))
           (add-after 'enter-source-directory 'set-version
@@ -5585,7 +5666,8 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple))))))
            python-cython
            python-pytest
            python-pytest-runner
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-setuptools))
     (outputs '("out"))
     (home-page "https://arrow.apache.org/docs/python/")
     (synopsis "Python bindings for Apache Arrow")
@@ -5671,16 +5753,31 @@ and @code{intake-parquet}.  It supports the following compression algorithms:
 (define-public python-crate
   (package
     (name "python-crate")
-    (version "0.23.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "crate" version))
-              (sha256
-               (base32
-                "0ngmlvi320c5gsxab0s7qgq0ck4jdlcwvb6lbjhnfprafdp56vvx"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-urllib3))
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/crate/crate-python")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kk84wf7awgspdijycvhkbqvm5llp3wmwxa9n4w3qda861xn6krb"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "--ignore=tests/testing/test_layer.py" ; Requires crate binary.
+              "--ignore=tests/client/test_http.py"))) ; XXX: fails collection.
+    (native-inputs
+     (list python-orjson
+           python-pytest
+           python-pytz
+           python-setuptools
+           python-sqlalchemy
+           python-verlib2
+           tzdata-for-tests))
+    (propagated-inputs (list python-urllib3))
     (home-page "https://github.com/crate/crate-python")
     (synopsis "CrateDB Python client")
     (description

gnu/packages/dav.scm

@@ -116,13 +116,23 @@ clients.")
 (define-public xandikos
   (package
     (name "xandikos")
-    (version "0.2.12")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "xandikos" version))
-       (sha256 (base32 "0x6g5s9pkippxg429r9agp3w0xsid2vv1h45wfc3xzdfvgj6ygsr"))))
-    (build-system python-build-system)
+       (sha256
+        (base32 "10j7qmwcrwql4ah6q8si3nf1ljwrx99w8ipiy85bzjd3qz2vackj"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-backend #~'unittest
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
+    (native-inputs (list python-setuptools))
     (propagated-inputs
      (list python-aiohttp
            python-defusedxml
@@ -131,13 +141,6 @@ clients.")
            python-jinja2
            python-multidict
            python-vobject))
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'check-setup
-            (lambda _
-              (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
     (home-page "https://www.xandikos.org/")
     (synopsis "Lightweight CalDAV/CardDAV server")
     (description

gnu/packages/dictionaries.scm

@@ -2,7 +2,7 @@
 ;;; Copyright © 2014-2016, 2018, 2021, 2024, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016-2018, 2020-2023, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
-;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017-2019, 2021, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -411,17 +411,17 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
 (define-public grammalecte
   (package
     (name "grammalecte")
-    (version "2.1.1")
+    (version "2.3.0")
     (source
      (origin
        (method url-fetch/zipbomb)
-       (uri (string-append "https://grammalecte.net/grammalecte/zip/"
+       (uri (string-append "https://grammalecte.net/zip/"
                            "Grammalecte-fr-v" version ".zip"))
        (sha256
-        (base32 "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn"))))
+        (base32 "0kv8h0116sfcrqnpd3jv2b098ychda7v27fciq1phxw50jbj395a"))))
     (build-system pyproject-build-system)
     (arguments
-     (list #:tests? #f)) ;no tests provided with the project
+     (list #:test-backend #~'unittest))
     (native-inputs
      (list python-setuptools))
     (home-page "https://grammalecte.net")

gnu/packages/disk.scm

@@ -855,7 +855,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
               (sha256
                (base32
                 "1ji5sq9jf0p44982zkb5dj2d3mrpy675k0mkyg3r17q5syz0wbia"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:tests? #f ;XXX: root access is required, see: <scripts/tests/test.sh>
@@ -970,24 +970,31 @@ reformatted.  It can recover lost files from at least:
     (license license:gpl2+)))
 
 (define-public pydf
-  (package
-    (name "pydf")
-    (version "12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pydf" version))
-       (sha256
-        (base32
-         "0f8ly8xyp93i2hm9c0qjqd4y86nz73axw2f09z01mszwmg1sfivz"))))
-  (build-system python-build-system)
-  (home-page "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/")
-  (synopsis "Colourised @command{df} clone")
-  (description "All-singing, all-dancing, fully colourised @command{df} clone
-written in Python.  It displays the amount of disk space available on the
-mounted file systems, using different colours for different types of file
-systems.  Output format is completely customizable.")
-  (license license:public-domain)))
+  (let ((commit "af38bb3b7aacbcc32271e6dafa8b8b0a77ffead8")
+        (revision "0"))
+    (package
+      (name "pydf")
+      (version (git-version "15" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/garabik/pydf")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "18ljigg8zm9pc3qg3alpyh3n4a4f1wcza4p36cchjn2vd4466jf4"))))
+      (build-system pyproject-build-system)
+      (arguments (list #:tests? #f)) ; No tests.
+      (native-inputs (list python-setuptools))
+      (home-page "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/")
+      (synopsis "Colourised @command{df} clone")
+      (description
+       "All-singing, all-dancing, fully colourised @command{df} clone written
+in Python.  It displays the amount of disk space available on the mounted file
+systems, using different colours for different types of file systems.  Output
+format is completely customizable.")
+      (license license:public-domain))))
 
 (define-public f3
   (package

gnu/packages/django.scm

@@ -695,16 +695,16 @@ them do this.")
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")
-    (version "65.7.0")
+    (version "65.9.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pennersr/django-allauth")
+              (url "https://codeberg.org/allauth/django-allauth")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1k5b3x7pdysb21vbqx7pxi9cm72yj057mm1clg19ymiqj4kq8yfl"))))
+        (base32 "03a7175748533rw6h3grfpv86i3qb31ixw0kb2kj90gc77sh1sw2"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -740,7 +740,7 @@ them do this.")
            python-pytest-asyncio
            python-pytest-django
            python-setuptools))
-    (home-page "https://github.com/pennersr/django-allauth")
+    (home-page "https://codeberg.org/allauth/django-allauth")
     (synopsis "Set of Django applications addressing authentication")
     (description
      "Integrated set of Django applications addressing authentication,

gnu/packages/docker.scm

@@ -253,10 +253,10 @@ management tool.")
        (file-name (git-file-name name version))
        (sha256
         (base32 "0m5ifgxdhcf7yci0ncgnxjas879sksrf3im0fahs573g268farz9"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     ;; Integration tests need a running Docker daemon.
     (arguments (list #:tests? #f))
-    (native-inputs '())
+    (native-inputs (list python-setuptools))
     (inputs (modify-inputs (package-inputs python-docker)
               (prepend python-six)
               (delete "python-urllib3")))
@@ -264,6 +264,9 @@ management tool.")
      (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
+;; more recent version which has the command "docker compose" built-in, see:
+;; <https://codeberg.org/guix/guix/milestone/30347>.
 (define-public python-dockerpty
   (package
     (name "python-dockerpty")
@@ -275,9 +278,11 @@ management tool.")
        (sha256
         (base32
          "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f)) ; XXX: Requires outdated python-expects
     (native-inputs
-     (list python-six))
+     (list python-setuptools python-six))
     (home-page "https://github.com/d11wtq/dockerpty")
     (synopsis "Python library to use the pseudo-TTY of a Docker container")
     (description "Docker PTY provides the functionality needed to operate the
@@ -298,7 +303,7 @@ client.")
        (sha256
         (base32
          "1dq9kfak61xx7chjrzmkvbw9mvj9008k7g8q7mwi4x133p9dk32c"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     ;; TODO: Tests require running Docker daemon.
     (arguments
      (list
@@ -310,6 +315,7 @@ client.")
               (substitute* "setup.py"
                 ((", < 6")
                  "")))))))
+    (native-inputs (list python-setuptools))
     (inputs
      (list python-cached-property
            python-distro

gnu/packages/documentation.scm

@@ -581,7 +581,10 @@ calendars, equations, and other features as extensions of Markdown syntax.")
                  (replace 'build
                    (lambda _
                      (invoke #$(cc-for-target)
-                             "-O2" "-g" "-o" "stddoc" "stddoc.c")
+                             "-O2" "-g"
+                             ;; XXX: Relax gcc 14 strictness.
+                             "-Wno-int-conversion"
+                             "-o" "stddoc" "stddoc.c")
                      (with-input-from-file "stddoc.c"
                        (lambda _
                          (with-output-to-file "stddoc.c.html"

gnu/packages/education.scm

@@ -66,6 +66,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
@@ -88,6 +89,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
@@ -376,47 +378,48 @@ to open the application in a web browser, for offline usage.")
        (uri (list
              ;; XXX: Upstream does not exist anymore.
              ;; (string-append "http://www.bipede.fr/downloads/logiciels/"
-             ;;                "ToutEnClic-" version "-src.zip")
-             (string-append "https://archive.org/download/tout-en-clic-" version
-                            "-src/ToutEnClic-" version "-src.zip")))
+             ;; "ToutEnClic-" version "-src.zip")
+             (string-append "https://archive.org/download/tout-en-clic-"
+                            version "-src/ToutEnClic-" version "-src.zip")))
        (sha256
         (base32 "0xg24p925rl5bfqsq3jb2lrkidb0f3kbmay5iyxxmjsn3ra0blyh"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f                      ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build)
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (share (string-append out "/share/toutenclic"))
-                    (pixmaps (string-append out "/share/pixmaps"))
-                    (doc (string-append out "share/doc/" ,name "-" ,version))
-                    (bin (string-append out "/bin"))
+     (list
+      #:tests? #f ;no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'build)
+          (replace 'install
+            (lambda _
+              (let ((share (string-append #$output "/share/toutenclic"))
+                    (bin (string-append #$output "/bin"))
                     (executable "toutenclic"))
-               ;; Install icon.
-               (install-file "toutenclic.png" pixmaps)
-               ;; Move files into "share/" directory.
-               (for-each (lambda (f) (install-file f share))
-                         (find-files "." "\\.py$"))
-               ;; Install documentation.
-               (install-file "ToutEnClic.pdf" doc)
-               ;; Create executable in "bin/".
-               (mkdir-p bin)
-               (with-directory-excursion bin
-                 (symlink (string-append share "/" executable ".py")
-                          executable)))))
-         (add-after 'install 'create-desktop-file
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (applications (string-append out "/share/applications")))
-               (mkdir-p applications)
-               (call-with-output-file
-                   (string-append applications "/toutenclic.desktop")
-                 (lambda (file)
-                   (format file
-                           "[Desktop Entry]~@
+                ;; Install icon.
+                (install-file "toutenclic.png"
+                              (string-append #$output "/share/pixmaps"))
+                ;; Move files into "share/" directory.
+                (for-each (lambda (f)
+                            (install-file f share))
+                          (find-files "." "\\.py$"))
+                ;; Install documentation.
+                (install-file "ToutEnClic.pdf"
+                              (string-append #$output "share/doc/"
+                                             #$name "-" #$version))
+                ;; Create executable in "bin/".
+                (mkdir-p bin)
+                (with-directory-excursion bin
+                  (symlink (string-append share "/" executable ".py")
+                           executable)))))
+          (add-after 'install 'create-desktop-file
+            (lambda _
+              (let ((applications (string-append #$output "/share/applications")))
+                (mkdir-p applications)
+                (call-with-output-file (string-append applications
+                                                      "/toutenclic.desktop")
+                  (lambda (file)
+                    (format file
+                     "[Desktop Entry]~@
                             Name=ToutEnClic~@
                             Comment=For schooling without difference~@
                             Exec=~a/bin/toutenclic~@
@@ -424,18 +427,16 @@ to open the application in a web browser, for offline usage.")
                             Terminal=false~@
                             Icon=toutenclic~@
                             Type=Application~%"
-                           out)))))))))
-    (native-inputs
-     (list unzip))
-    (inputs
-     (list python-pyqt))
+                     #$output)))))))))
+    (native-inputs (list unzip python-setuptools))
+    (inputs (list python-pyqt))
     (synopsis "School tools for physically disabled children")
-    (description "ToutEnClic is intended to facilitate the schooling
-of physically disabled children in ordinary schools.  It is both
-a multi-page virtual exercise book and a kit including pencil,
-scissors, glue, ruler, compass, protractor and square.  A virtual
-keyboard is also available if the child does not have any other
-specialized device.")
+    (description
+     "ToutEnClic is intended to facilitate the schooling of physically
+disabled children in ordinary schools.  It is both a multi-page virtual
+exercise book and a kit including pencil, scissors, glue, ruler, compass,
+protractor and square.  A virtual keyboard is also available if the child does
+not have any other specialized device.")
     (home-page "https://bipede.fr/contrib/")
     (license license:gpl3)))
 
@@ -1004,7 +1005,7 @@ learning for programming languages.")
 (define-public mazo
   (package
     (name "mazo")
-    (version "1.1.0")
+    (version "1.2.1")
     (source
      (origin
        (method git-fetch)
@@ -1013,43 +1014,37 @@ learning for programming languages.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "14nk3qsj6lg7wp2ws8lxhb4hyjnczvw1cn9f3m466dkkfimp7ygf"))))
-    (build-system python-build-system)
+        (base32 "0mwhd8y3xs57rbaarpi1ams5i0kndizdpns4ym7dmnnn7s9g1xq8"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:use-setuptools? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build)
-         (replace 'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
-             (when tests?
-               (let* ((out (assoc-ref outputs "out"))
-                      (home (string-append out "/tmp")))
-                 (add-installed-pythonpath inputs outputs)
-                 (setenv "HOME" home)
-                 (invoke "python3" "manage.py" "test")))))
-         (replace 'install
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (script (string-append bin "/mazo"))
-                    (share (string-append out "/share"))
-                    (help (string-append share "/help/C/mazo"))
-                    (icons (string-append
-                            share
-                            "/icons/hicolor/scalable/apps"))
-                    (apps (string-append share "/applications"))
-                    (site (string-append
-                           (site-packages inputs outputs)
-                           "/mazo")))
-               (mkdir-p help)
-               (mkdir-p bin)
-               (copy-file "mazo.py" script)
-               (chmod script #o555)
-               (install-file "icons/mazo.svg" icons)
-               (install-file "lugare.ulkeva.Mazo.desktop" apps)
-               (copy-recursively "help/C/mazo" help)
-               (copy-recursively "mazo" site)))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+              (when tests?
+                (setenv "HOME" (getcwd))
+                (invoke "python3" "manage.py" "test"))))
+          (replace 'install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((bin (string-append #$output "/bin"))
+                     (script (string-append bin "/mazo"))
+                     (share (string-append #$output "/share"))
+                     (help (string-append share "/help/C/mazo")))
+                (mkdir-p help)
+                (mkdir-p bin)
+                (copy-file "mazo.py" script)
+                (chmod script #o555)
+                (install-file "icons/mazo.svg"
+                              (string-append share
+                                             "/icons/hicolor/scalable/apps"))
+                (install-file "lugare.ulkeva.Mazo.desktop"
+                              (string-append share "/applications"))
+                (copy-recursively "help/C/mazo" help)
+                (copy-recursively "mazo"
+                                  (string-append (site-packages inputs outputs)
+                                                 "/mazo"))))))))
     (native-inputs
      (list python-django
            python-django-cleanup
@@ -1071,8 +1066,9 @@ learning for programming languages.")
            yelp))
     (home-page "https://luis-felipe.gitlab.io/mazo/")
     (synopsis "Memorize concepts using multimedia flash cards")
-    (description "Mazo is a learning application that helps you memorize
-simple concepts using multimedia flash cards and spaced reviews.")
+    (description
+     "Mazo is a learning application that helps you memorize simple concepts
+using multimedia flash cards and spaced reviews.")
     (license license:public-domain)))
 
 (define-public hardv

gnu/packages/electronics.scm

@@ -737,6 +737,110 @@ used in the declarative section of design units.")
       (native-inputs
        '()))))
 
+(define-public klayout
+  (package
+    (name "klayout")
+    (version "0.30.5")
+    (source
+     (origin (method git-fetch)
+             (uri (git-reference
+                    (url "https://github.com/KLayout/klayout")
+                    (commit (string-append "v" version))))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "1ixl8wzpiaw6frb28x9y9jy3fvhjclmn4xl77i72rs37rf4i2a2s"))))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:install-plan
+      #~'(("output/klayout" "bin/")
+          ("output/" "bin/" #:include-regexp ("strm.*"))
+          ("output/" "lib/" #:include-regexp ("lib.*\\.so.*"))
+          ("output/pymod" "lib/"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'patch-build-script ;; ensure reproducibility
+            (lambda _
+              (substitute* "build.sh"
+                (("KLAYOUT_VERSION_DATE=\"\\$KLAYOUT_VERSION_DATE\"")
+                 "KLAYOUT_VERSION_DATE=1970-01-01"))))
+          (add-after 'patch-build-script 'disable-failing-tests
+            (lambda _
+              (substitute* "src/tl/unit_tests/unit_tests.pro"
+                ;; These need internet connection.
+                (("  tlWebDAVTests\\.cc")
+                 "# tlWebDAVTests.cc \\")
+                (("  tlGitTests\\.cc")
+                 "# tlGitTests.cc \\")
+                (("  tlHttpStreamTests\\.cc")
+                 "# tlHttpStreamTests.cc \\")
+                ;; The threaded tests are reportedly flaky.
+                (("  tlThreadedWorkersTests\\.cc")
+                 "# tlThreadedWorkersTests\\.cc \\"))
+              (substitute* "src/rba/rba.pro"
+                ;; There are issues of non-detereminism involved with Ruby's GC
+                ;; implementation. https://github.com/KLayout/klayout/issues/2251
+                (("SUBDIRS = rba unit_tests")
+                 "SUBDIRS = rba")
+                (("unit_tests.depends += rba")
+                 ""))))
+          (add-after 'disable-failing-tests 'build
+            (lambda _
+              (invoke "bash" "build.sh"
+                      "-prefix" "output"
+                      "-option"
+                      (string-append "-j" (number->string (parallel-job-count))))))
+          (add-after 'install 'patch-elfs
+            (lambda _
+              (let* ((lib (string-append #$output "/lib"))
+                     (layout-lib (string-append lib "/lay_plugins"))
+                     (db-lib (string-append lib "/db_plugins"))
+                     (bin (string-append #$output "/bin"))
+                     (executables (filter executable-file? (find-files #$output)))
+                     (ut-runner "build-release/ut_runner")
+                     (unit-tests (cons* ut-runner
+                                        (find-files "build-release" "\\.ut")))
+                     (patchem (lambda (elf)
+                                (when (not (string-suffix? ".py" elf))
+                                  (invoke "patchelf" "--add-rpath" lib elf)
+                                  (invoke "patchelf" "--add-rpath" layout-lib elf)
+                                  (invoke "patchelf" "--add-rpath" db-lib elf)))))
+                (map patchem executables)
+                (map patchem unit-tests)
+                (patchem ut-runner))))
+          (add-after 'patch-elfs 'check-after-install
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion "build-release"
+                  (mkdir "testtmp")
+                  (setenv "TESTTMP" "testtmp")
+                  (setenv "TESTSRC" "..")
+                  (setenv "LD_LIBRARY_PATH" ".")
+                  (setenv "QT_QPA_PLATFORM" "offscreen")
+                  (setenv "HOME" "/tmp/home") ;; Fontconfig needs a writable cache.
+                  (invoke "./ut_runner"))))))))
+    (native-inputs (list perl python qtsvg ruby tcl))
+    (inputs
+     (list bash-minimal
+           libgit2
+           patchelf
+           qt5compat
+           qtbase
+           qtmultimedia
+           qtsvg
+           qttools))
+    (home-page "https://www.klayout.de")
+    (synopsis "Mask layout editor")
+    (description "KLayout is @acronym{EDA, Electronic Design Automation}
+software.  It is a scriptable @acronym{VLSI, Very Large Scale Integration}
+layout editor used for visualizing and editing mask data, transcoding between
+different file formats (GDSII and OASIS), executing @acronym{DRC, Design rule
+checking}, @acronym{LVS, Layout Versus Schematic} verification, and drawing of
+chip cross-sections basked on mask data.")
+    ;; The license version will be clarified with the next version bump.
+    (license license:gpl3+)))
+
 (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.

gnu/packages/emacs-xyz.scm

@@ -163,6 +163,7 @@
 ;;; Copyright @ 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright @ 2025 Nik Gaffney <nik@fo.am>
 ;;; Copyright © 2025 Untrusem <mysticmoksh@riseup.net>
+;;; Copyright © 2025 case_lambda <case_lambda@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -311,6 +312,7 @@
   #:use-module (gnu packages ocaml)
   #:use-module (gnu packages erlang)
   #:use-module (gnu packages search)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages telegram)
@@ -713,6 +715,33 @@ files, provide Age encrypted authentication information out of
 @file{.authinfo.age}, open/edit/save Age encrypted files via Tramp...")
     (license license:gpl3+)))
 
+(define-public emacs-balanced-windows
+  (let ((commit "1da5354ad8a9235d13928e2ee0863f3642ccdd13")
+        (revision "0"))
+    (package
+      (name "emacs-balanced-windows")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+            (url "https://github.com/wbolster/emacs-balanced-windows")
+            (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l"))))
+      (build-system emacs-build-system)
+      (arguments (list #:tests? #f)) ;there are no tests
+      (home-page "https://github.com/wbolster/emacs-balanced-windows/")
+      (synopsis "Automatically balance Emacs windows")
+      (description
+       "This Emacs package provides a global minor mode to automatically
+balance windows (keeping them roughly the same size) whenever the window
+configuration changes, e.g. after splitting or deleting a window.")
+      (license license:bsd-3))))
+
 (define-public emacs-bookmark-plus
   (package
     (name "emacs-bookmark-plus")
@@ -11272,11 +11301,11 @@ not hang at all.")
     (license license:gpl3+)))
 
 (define-public emacs-elastic-modes
-  (let ((commit "ea49bb03b78cb9fd17655990223e3095f137a3ce")
-        (revision "1"))
+  (let ((commit "c577e8921a4d9bd77742729707152bc557fae3e2")
+        (revision "2"))
     (package
       (name "emacs-elastic-modes")
-      (version "1.0.0")
+      (version (git-version "1.0.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -11285,7 +11314,7 @@ not hang at all.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1dkigkjw4i9nz5rl0dnic16ljdnp5cyz2xic3hc2myqnjlqnc6z6"))))
+                  "0r40g7zgz9072x74qbnv8lmql0gajsz2p8b8jckmgyniakmln69v"))))
       (build-system emacs-build-system)
       (arguments (list #:tests? #false)) ;no tests
       (propagated-inputs (list emacs-dash))
@@ -22780,6 +22809,91 @@ window (using the fringe, by default), allows you to jump between the hunks
 and revert them selectively.")
     (license license:gpl3+)))
 
+(define-public emacs-difftastic
+  ;; No releases or tags.
+  (let ((commit "5a23176610b7181f52b7088cbdf1d2a95691b27e")
+        (revision "0"))
+    (package
+      (name "emacs-difftastic")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/pkryger/difftastic.el/")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0nl1kcaxgq67338knfhmxxmxl5npsvjvvs3z7s8m5z4wpknsn1rd"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:test-command
+        #~(list "emacs" "--batch"
+                "-l" "test/difftastic.t.el"
+                "-l" "test/difftastic-bindings.t.el"
+                "-f" "ert-run-tests-batch-and-exit")
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'check 'unpack-el-mock
+              (lambda _
+                (install-file
+                 (string-append
+                  #$(this-package-native-input "el-mock") "/el-mock.el")
+                 ".")))
+            ;; 11/435 tests fail.
+            (add-before 'check 'skip-failing-tests
+              (lambda _
+                (let ((skip-tests
+                       `("-forge-pullreq-show-diff-args:buffer-post-object"
+                         "-forge-pullreq-show-diff-args:current-topic"
+                         ,(string-append
+                           "-forge-pullreq-show-diff-args"
+                           ":new-pullreq-with-base-and-head")
+                         "-forge-pullreq-show-diff-args:single-prefix-argument"
+                         "-magit-diff-buffer-file:no-file"
+                         "-forge-pullreq-show-diff-args:triple-prefix-argument"
+                         "forge-create-pulreq-show-diff:basic"
+                         "forge-pullreq-show-diff:basic"
+                         "forge-pullreq-show-diff:double-prefix-arg"
+                         "forge-pullreq-show-diff:single-prefix-arg"
+                         "forge-pullreq-show-diff:triple-prefix-arg")))
+                  (substitute* "test/difftastic.t.el"
+                    (("\\(ert-deftest difftastic-([a-z:-]*) \\(\\)" all test)
+                     (if (member test skip-tests)
+                         (string-append all "(skip-unless nil)")
+                         all))))))
+            (add-after 'unpack 'substitute-python-path
+              (lambda* (#:key inputs #:allow-other-keys)
+                (emacs-substitute-variables "difftastic.el"
+                  ("difftastic-executable"
+                   (search-input-file inputs "/bin/difft"))))))))
+      (inputs
+       (list difftastic))
+      (propagated-inputs
+       (list emacs-compat emacs-magit))
+      (native-inputs
+       (list
+        ;; This package uses a custom version of el-mock for the tests.
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                 (url "https://github.com/pkryger/el-mock.el")
+                 (commit "8fb750784faf07445033441bd86485fecfdb9413")))
+          (file-name "el-mock")
+          (sha256
+           (base32
+            "1qbcj952hrrpr26rh8q77vf5i35nzkbsrqdvj7rrc307dp0n2gsv")))))
+      (home-page "https://github.com/pkryger/difftastic.el/")
+      (synopsis "Wrapper interface for @code{difft} command line tool")
+      (description
+       "This package integrates @code{difftastic} structural diff tool into
+Emacs.  It automatically displays @code{difftastic} output within Emacs using
+faces from the user theme, ensuring consistency with overall coding
+environment.")
+      (license license:gpl3+))))
+
 (define-public emacs-diminish
   ;; XXX: Upstream did not tag last release.
   (let ((commit "fd486ef76e4c1d8211ae337a43b8bba106d4bca7")
@@ -38790,6 +38904,44 @@ global minor mode whose purpose is to automatically feed TRAMP sub-processes
 with passwords for paths matching regexps.")
       (license license:gpl3+))))
 
+(define-public emacs-ssh-tunnels
+  ;; There are no tags or releases upstream.
+  (let ((commit "5010d779edef33f869065231b99d74723c9c7eaf")
+        (revision "0"))
+    (package
+      (name "emacs-ssh-tunnels")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/death/ssh-tunnels")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "15pwgc9s7f5fjmx2savjrpwr6qcpp0s9iy0y10abpy63np4krc62"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f                     ;no tests
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'set-ssh-location
+              (lambda* (#:key inputs #:allow-other-keys)
+                (emacs-substitute-variables "ssh-tunnels.el"
+                  ("ssh-tunnels-program"
+                   (search-input-file inputs "/bin/ssh"))))))))
+      (inputs (list openssh))
+      (propagated-inputs (list emacs-helm))
+      (home-page "https://github.com/death/ssh-tunnels")
+      (synopsis "Manipulate @code{ssh} tunnels from Emacs")
+      (description "This package provides an Emacs interface to modify,
+run and kill @code{ssh} tunnels.  It lets customise descriptions of the
+tunnels configurations, and includes an @code{emacs-helm} interface to modify
+and act on tunnels.")
+      (license license:expat))))
+
 (define-public emacs-eacl
   (package
     (name "emacs-eacl")
@@ -43502,8 +43654,8 @@ org-mode templates.")
     (license license:gpl3+)))
 
 (define-public emacs-org-glossary
-  (let ((commit "1b9b7fd3d1e6c214c34463e568daaba6df00ec27")
-        (revision "0"))
+  (let ((commit "97827bc323765a5f70213c62800bed50d75c2822")
+        (revision "1"))
     (package
       (name "emacs-org-glossary")
       (version (git-version "0.0.1" revision commit))
@@ -43515,7 +43667,7 @@ org-mode templates.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "09mg8aqxamnxx8kpdyk074wf2wkm4rx62z7q66azw70hjr1ggwa3"))))
+          (base32 "0qd1ikc602nnhhm0czv4gn9b1g4jqhjbnnz93ba2pjimgssmb58w"))))
       (build-system emacs-build-system)
       (arguments
        (list
@@ -45514,27 +45666,35 @@ buffer.")
     (license license:gpl3+)))
 
 (define-public emacs-setup
-  (package
-    (name "emacs-setup")
-    (version "1.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://elpa.gnu.org/packages/setup-"
-                            version ".tar"))
-        (sha256
-          (base32 "184g3kd9caxyhwq41w94spkjs1j45vblg4sqfb5h5pqb5h9p95n5"))))
-    (build-system emacs-build-system)
-    (home-page "https://git.sr.ht/~pkal/setup")
-    (synopsis "Helpful configuration macro")
-    (description
-"The @code{setup} macro simplifies repetitive configuration patterns, by
-providing context-sensitive local macros in @code{setup} bodies.  These macros
-can be mixed with regular elisp code without any issues, allowing for
-flexible and terse configurations.  The list of local macros can be
-extended by the user via @code{setup-define}.  A list of currently known
-local macros are documented in the docstring for @code{setup}.")
-    (license license:gpl3+)))
+  ;; No tagged releases; this commit reflects the version bump on the source
+  (let ((commit "5a69dab9bb79d8bebaaa9bc14795cbaafd1c2423"))
+    (package
+      (name "emacs-setup")
+      (version "1.5.0")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://codeberg.org/pkal/setup.el")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1pa5k36pkgvp8als0ngxgy17x0gja9j26qydw3wwawkslssl5kbx"))))
+      (build-system emacs-build-system)
+      (arguments
+       (list
+        #:tests? #f))                   ; No tests.
+      (home-page "https://codeberg.org/pkal/setup.el")
+      (synopsis "Helpful configuration macro")
+      (description
+       "The @code{setup} macro simplifies repetitive configuration patterns,
+by providing context-sensitive local macros in @code{setup} bodies.  These
+macros can be mixed with regular elisp code without any issues, allowing for
+flexible and terse configurations.  The list of local macros can be extended
+by the user via @code{setup-define}.  A list of currently known local macros
+are documented in the docstring for @code{setup}.")
+      (license license:gpl3+))))
 
 (define-public emacs-tomelr
   (package

gnu/packages/emacs.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2017, 2019, 2021-2022, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@@ -464,19 +464,22 @@ editor (console only)")
                           (string-append (getenv "LIBRARY_PATH")
                                          ":" libgccjit-libdir)))))
             (add-after 'unpack 'patch-compilation-driver
-              (lambda _
+              (lambda* (#:key inputs #:allow-other-keys)
                 (substitute* "lisp/emacs-lisp/comp.el"
                   (("\\(defcustom native-comp-driver-options nil")
                    (format
                     #f "(defcustom native-comp-driver-options '(~@{~s~^ ~})"
                     (string-append
-                     "-B" #$(this-package-input "binutils") "/bin/")
+                     "-B" (dirname (search-input-file inputs "/bin/nm")))
                     (string-append
-                     "-B" #$(this-package-input "glibc") "/lib/")
+                     "-B" (dirname (search-input-file inputs "/lib/libc.so")))
                     (string-append
-                     "-B" #$(this-package-input "libgccjit") "/lib/")
+                     "-B" (dirname (search-input-file inputs "/lib/libgccjit.so")))
                     (string-append
-                     "-B" #$(this-package-input "libgccjit") "/lib/gcc/"))))))
+                     "-B" (string-append
+                           (dirname
+                            (search-input-file inputs "/lib/libgccjit.so"))
+                           "/gcc")))))))
             (add-after 'build 'build-trampolines
               (lambda* (#:key make-flags #:allow-other-keys)
                 (apply invoke "make" "trampolines" make-flags)))
@@ -498,11 +501,7 @@ editor (console only)")
     (inputs
      (modify-inputs (package-inputs emacs-minimal)
        (prepend gnutls
-                ;; To "unshadow" ld-wrapper in native builds
-                (make-ld-wrapper "ld-wrapper" #:binutils binutils)
                 ;; For native compilation
-                binutils
-                (libc-for-target)
                 libgccjit
 
                 ;; Avoid Emacs's limited movemail substitute that retrieves POP3

gnu/packages/emulators.scm

@@ -91,6 +91,7 @@
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages image-processing)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libusb)
@@ -109,9 +110,12 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages robotics)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages stb)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
@@ -3725,6 +3729,165 @@ hardware states and PS2 system memory.  This allows you to play PS2 games on
 your PC, with many additional features and benefits.")
     (license license:gpl3+)))
 
+(define-public rpcs3
+  ;; NB: When updating to a new release, don't forget to check if any more
+  ;; libraries can be linked dynamically, and to update the commits for any
+  ;; specialized sources included in native-inputs so that they match the
+  ;; sub-modules in ./3rdparty.
+  (package
+    (name "rpcs3")
+    (version "0.0.38")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/RPCS3/rpcs3")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0dwrfjs9b3ldwyn68nmyf0qip4hm1w8c3picdl3zk7z76j7rrhal"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list
+         ;; -fexceptions is needed to compile part of yaml-cpp.
+         "-DCMAKE_CXX_FLAGS=-fexceptions"
+         ;; "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native,
+         ;; which is useful for local builds, but not good for packages."
+         "-DUSE_NATIVE_INSTRUCTIONS=OFF"
+         "-DWITH_LLVM=ON"
+         "-DBUILD_LLVM=OFF"
+         "-DSTATIC_LINK_LLVM=OFF"
+         "-DUSE_FAUDIO=ON"
+         "-DUSE_LIBEVDEV=ON"
+         "-DUSE_DISCORD_RPC=OFF"
+         "-DUSE_VULKAN=ON"
+         "-DUSE_PRECOMPILED_HEADERS=OFF"
+         "-DUSE_SDL=ON"
+         "-DUSE_SYSTEM_CUBEB=ON"
+         "-DUSE_SYSTEM_CURL=ON"
+         "-DUSE_SYSTEM_FAUDIO=ON"
+         "-DUSE_SYSTEM_FFMPEG=ON"
+         "-DUSE_SYSTEM_FLATBUFFERS=ON"
+         "-DUSE_SYSTEM_GLSLANG=ON"
+         "-DUSE_SYSTEM_HIDAPI=ON"
+         "-DUSE_SYSTEM_LIBPNG=ON"
+         "-DUSE_SYSTEM_LIBUSB=ON"
+         "-DUSE_SYSTEM_MINIUPNPC=ON"
+         "-DUSE_SYSTEM_OPENAL=ON"
+         "-DUSE_SYSTEM_OPENCV=ON"
+         "-DUSE_SYSTEM_PUGIXML=ON"
+         "-DUSE_SYSTEM_RTMIDI=ON"
+         "-DUSE_SYSTEM_SDL=ON"
+         "-DUSE_SYSTEM_VULKAN_MEMORY_ALLOCATOR=ON"
+         "-DUSE_SYSTEM_WOLFSSL=ON"
+         "-DUSE_SYSTEM_ZLIB=ON"
+         "-DUSE_SYSTEM_ZSTD=ON"
+         "-DBUILD_RPCS3_TESTS=ON"
+         "-DRUN_RPCS3_TESTS=ON"
+         ;; "Choose whether to enable GameMode features or not."
+         ;; Off, for now, because GameMode requires systemd to work.
+         "-DUSE_GAMEMODE=OFF")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'add-some-submodules
+            ;; TODO: Remove as many of these as possible.
+            (lambda* (#:key inputs #:allow-other-keys)
+              (with-directory-excursion "3rdparty"
+                (rmdir "fusion/fusion")
+                (symlink (string-append
+                          (search-input-directory inputs "Fusion") "/../")
+                         "fusion/fusion")
+                (rmdir "SoundTouch/soundtouch")
+                (symlink (dirname
+                          (search-input-file inputs "soundtouch.pc.in"))
+                         "SoundTouch/soundtouch")
+                (rmdir "asmjit/asmjit")
+                (symlink (string-append
+                          (search-input-directory inputs "src/asmjit")
+                          "/../../")
+                         "asmjit/asmjit")
+                (rmdir "yaml-cpp/yaml-cpp")
+                (symlink (dirname
+                          (search-input-file inputs "yaml-cpp.pc.in"))
+                         "yaml-cpp/yaml-cpp")
+                (rmdir "stblib/stb")
+                (symlink (dirname
+                          (search-input-file inputs "stb_c_lexer.h"))
+                         "stblib/stb")))))))
+    (inputs
+     (append
+      (list cubeb
+            curl
+            eudev
+            faudio
+            ;; RPCS3 v0.0.38 uses symbols that are deprecated in ffmpeg 8.
+            ;; See https://github.com/RPCS3/rpcs3/issues/17461
+            ffmpeg-6
+            flatbuffers
+            glew
+            glslang
+            glu
+            hidapi
+            jack-2
+            libevdev
+            libglvnd
+            libpng
+            libusb-next
+            llvm-18
+            mesa
+            miniupnpc-next
+            openal
+            opencv
+            pugixml-next
+            pulseaudio
+            qtbase
+            qtmultimedia
+            qtsvg
+            rtmidi
+            sdl3
+            spirv-tools
+            vulkan-loader
+            wayland
+            wolfssl-for-rpcs3
+            zlib
+            `(,zstd "lib"))))
+    (native-inputs
+     (list
+      googletest
+      pkg-config
+      vulkan-memory-allocator
+      (package-source asmjit)
+      (package-source fusion)
+      (package-source stb)
+      (origin
+        (file-name "rpcs3-soundtouch-source")
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/RPCS3/soundtouch")
+               (commit "3982730833b6daefe77dcfb32b5c282851640c17")))
+        (sha256
+         (base32 "07q514mx69jkrz7i58c45iwj3zql88vdsa1sah7immwr1005i91y")))
+      (origin
+        (file-name "rpcs3-yaml-cpp-source")
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/RPCS3/yaml-cpp")
+               (commit "456c68f452da09d8ca84b375faa2b1397713eaba")))
+        (sha256
+         (base32 "0spp91yz1bvr9dljc7zgjf2sqw49d8b9yinlncykjwzxm7ap7jys")))))
+    (home-page "https://rpcs3.net/")
+    (synopsis "PlayStation 3 emulator")
+    (description "RPCS3 is an emulator and debugger for the Sony
+@acronym{PS3,PlayStation 3}.")
+    (license
+     (list license:gpl2                 ;core, pine_server.h
+           license:bsd-3                ;FindWayland.cmake, FindFFMPEG.cmake
+           ;;flow_layout.h, sse2neon.h, unordered_dense.h, ffx_fsr1.h,
+           ;;ffx_a.h, bcdec.hpp, LUrlParser.h, khrplatform.h
+           license:expat))))
+
 (define-public gens-gs
   (package
     (name "gens-gs")

gnu/packages/engineering.scm

@@ -4420,11 +4420,19 @@ G-codes to binary and vice versa.")
                  (lambda _
                    (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp"
                      (("#include <libigl/igl/qslim.h>")
-                      "#include <igl/qslim.h>")))))))
+                      "#include <igl/qslim.h>"))))
+               (add-after 'install 'wrap-program
+                 (lambda _
+                   (wrap-program (string-append #$output "/bin/prusa-slicer")
+                     ;; For GtkFileChooserDialog.
+                     `("GSETTINGS_SCHEMA_DIR" =
+                       (,(string-append #$(this-package-input "gtk+")
+                                        "/share/glib-2.0/schemas")))))))))
     (native-inputs
      (list pkg-config catch2-3.8))
     (inputs
-     (list boost-1.83
+     (list bash-minimal
+           boost-1.83
            cereal
            cgal
            curl

gnu/packages/enlightenment.scm

@@ -392,50 +392,56 @@ embedded systems.")
 (define-public python-efl
   (package
     (name "python-efl")
-    (version "1.26.0")
+    (version "1.26.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://download.enlightenment.org/rel/bindings/"
-                            "python/python-efl-" version ".tar.xz"))
-        (sha256
-         (base32
-          "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"))
-        (modules '((guix build utils)))
-        ;; Remove files generated by Cython
-        (snippet
-         '(begin
-            (for-each (lambda (file)
-                        (let ((generated-file
-                                (string-append (string-drop-right file 3) "c")))
-                          (when (file-exists? generated-file)
-                            (delete-file generated-file))))
-                      (find-files "efl" "\\.pyx$"))
-            (delete-file "efl/eo/efl.eo_api.h")))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.enlightenment.org/rel/bindings/"
+                           "python/python-efl-" version ".tar.xz"))
+       (sha256
+        (base32 "1mr80vgbcs03rs5lbmg8pxj8hifkrzrwdrw01plik2h729z3knyw"))
+       (modules '((guix build utils)))
+       ;; Remove files generated by Cython
+       (snippet
+        '(begin
+           (for-each (lambda (file)
+                       (let ((generated-file
+                              (string-append (string-drop-right file 3) "c")))
+                         (when (file-exists? generated-file)
+                           (delete-file generated-file))))
+                     (find-files "efl" "\\.pyx$"))
+           (delete-file "efl/eo/efl.eo_api.h")))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'build
-           (lambda _
-             (setenv "ENABLE_CYTHON" "1")
-             (invoke "python" "setup.py" "build")))
-        (add-before 'build 'set-flags
-          (lambda _
-            (setenv "CFLAGS"
-                    (string-append "-I" (assoc-ref %build-inputs "python-dbus")
-                                   "/include/dbus-1.0"))))
-        (add-before 'check 'set-environment
-          (lambda _
-            ;; Some tests require write access to HOME.
-            (setenv "HOME" "/tmp")
-            ;; These tests try to connect to the internet.
-            (delete-file "tests/ecore/test_09_file_download.py")
-            (delete-file "tests/ecore/test_11_con.py"))))))
+     (list
+      #:test-flags
+      #~(list "tests"
+              ;; These tests try to connect to the internet.
+              "--ignore=tests/ecore/test_09_file_download.py"
+              "--ignore=tests/ecore/test_11_con.py"
+              ;; The above test ignorance probably breaks this one.
+              "--deselect=tests/ecore/test_08_exe.py::TestExe::testInit"
+              ;; This test requires access to a running Xorg server,
+              ;; /var/lib/dbus and /etc.
+              "--ignore=tests/dbus/test_01_basics.py"
+              ;; XXX: RuntimeWarning: Setting standard icon failed
+              "--ignore=tests/elementary/test_02_image_icon.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'set-flags
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((include-dir (search-input-directory inputs
+                                                         "include/dbus-1.0")))
+                (setenv "CFLAGS" (string-append "-I" include-dir)))))
+          (add-before 'check 'configure-tests
+            (lambda _
+              (setenv "HOME" "/tmp")))))) ;needed by tests
     (native-inputs
-     (list pkg-config python-cython-0))
-    (inputs
-     (list efl python-dbus python-packaging))
+     (list pkg-config
+           python-cython-0
+           python-pytest
+           python-setuptools))
+    (inputs (list efl python-dbus python-packaging))
     (home-page "https://www.enlightenment.org/")
     (synopsis "Python bindings for EFL")
     (description

gnu/packages/fcitx5.scm

@@ -692,3 +692,25 @@ as well as those for Chinese dialects.  It has the ability to compose phrases
 and sentences intelligently and provide very accurate traditional Chinese
 output.")
     (license license:lgpl2.1+)))
+
+(define-public fcitx5-hangul
+  (package
+    (name "fcitx5-hangul")
+    (version "5.1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fcitx/fcitx5-hangul")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02lkbwg25jr4hazjyxcy69midfsmxc0ksbdrfwbmqcfa3kz5d9gb"))))
+    (build-system cmake-build-system)
+    (native-inputs (list extra-cmake-modules pkg-config gettext-minimal))
+    (inputs (list fcitx5 libhangul))
+    (home-page "https://github.com/fcitx/fcitx5-hangul")
+    (synopsis "Hangul support for Fcitx5")
+    (description
+     "This package provides the Hangul (Korean) input method engine for Fcitx5.")
+    (license license:lgpl2.1+)))

gnu/packages/finance.scm

@@ -354,14 +354,14 @@ Accounting.")
 (define-public homebank
   (package
     (name "homebank")
-    (version "5.9.4")
+    (version "5.9.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.gethomebank.org/public/sources"
                                   "/homebank-" version ".tar.gz"))
               (sha256
                (base32
-                "1gwzj3x3rnd3f5z1fzvrl740zhpnxjcsbxlmabwgkw22l6226i4c"))))
+                "0ymp7qj6im1cl66lbf9q2r8dgav3dagbhbipskg8zcgj0kz0ncph"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list pkg-config intltool))
@@ -1257,29 +1257,6 @@ of Bitcoin BIP-0039.")
 Ledger Blue/Nano S.")
     (license license:asl2.0)))
 
-(define-public python-btchip-python
-  (package
-    (name "python-btchip-python")
-    (version "0.1.32")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "btchip-python" version))
-        (sha256
-          (base32
-            "0mcg3gfd0qk8lhral3vy9cfd4pii9kzs42q71pf6b3y0c70y1x9l"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f)) ; those require PyQt4
-    (propagated-inputs
-      (list python-ecdsa python-hidapi))
-    (home-page "https://github.com/LedgerHQ/btchip-python")
-    (synopsis "Python library to communicate with Ledger Nano dongle")
-    (description
-      "This package provides a Python library to communicate with Ledger
-Nano dongle.")
-    (license license:asl2.0)))
-
 (define-public python-trezor
   (package
     (name "python-trezor")

gnu/packages/flashing-tools.scm

@@ -44,6 +44,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix build-system qt)
   #:use-module (guix download)
@@ -78,6 +79,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages swig)
@@ -490,29 +492,31 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
   (package
     (name "me-cleaner")
     (version "1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/corna/me_cleaner")
-                     (commit (string-append "v" version))))
-              (sha256
-               (base32
-                "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"))
-              (file-name (git-file-name name version))))
-    (build-system python-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/corna/me_cleaner")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"))
+       (file-name (git-file-name name version))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-documentation
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man/man1")))
-               (install-file "man/me_cleaner.1" man)
-               #t))))))
+     (list
+      #:tests? #f ; No tests.
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-documentation
+            (lambda _
+              (install-file "man/me_cleaner.1"
+                            (string-append #$output "/share/man/man1")))))))
+    (native-inputs (list python-setuptools))
     (home-page "https://github.com/corna/me_cleaner")
     (synopsis "Intel ME cleaner")
-    (description "This package provides tools for disabling Intel
-ME as far as possible (it only edits ME firmware image files).")
+    (description
+     "This package provides tools for disabling Intel ME as far as possible
+(it only edits ME firmware image files).")
     (license license:gpl3+)
 
     ;; This is an Intel thing.

gnu/packages/fonts.scm

@@ -576,6 +576,61 @@ intended to be optimally legible for readers who are partially visually impaired
 all characters maximally distinguishable from one another.")
       (license license:silofl1.1))))
 
+(define-public font-atkinson-hyperlegible-next
+  (let ((commit "7925f50f649b3813257faf2f4c0b381011f434f1")
+        (revision "0"))
+    (package
+      (name "font-atkinson-hyperlegible-next")
+      (version (git-version "2.001" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url
+                "https://github.com/googlefonts/atkinson-hyperlegible-next/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "01m59xl35xvjv07d0qwli1czgfjg2wfgv676xi71is2rirh1y71f"))))
+      (build-system font-build-system)
+      (home-page "https://www.brailleinstitute.org/freefont/")
+      (synopsis
+       "Typeface designed to increase legibility for low vision readers")
+      (description
+       "Atkinson Hyperlegible Next is an improvement of the typeface Atkinson
+Hyperlegible, including new characters, improved glyphs, and improved kerning.
+Additionally, the two previous weights has increased to six, all in upright
+and italic, allowing for greater flexibility in use.")
+      (license license:silofl1.1))))
+
+(define-public font-atkinson-hyperlegible-mono
+  (let ((commit "154d50362016cc3e873eb21d242cd0772384c8f9")
+        (revision "0"))
+    (package
+      (name "font-atkinson-hyperlegible-mono")
+      (version (git-version "2.001" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url
+                "https://github.com/googlefonts/atkinson-hyperlegible-next-mono/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0bdhp70zniqnj14raw9krb034zrvvxhzimzqys713p8ksrndck2p"))))
+      (build-system font-build-system)
+      (home-page "https://www.brailleinstitute.org/freefont/")
+      (synopsis
+       "Monospace typeface designed to increase legibility for low vision readers")
+      (description
+       "Atkinson Hyperlegible Mono is an entirely new typeface inspired by
+Atkinson Hyperlegible.  The characters in a monospace typeface all occupy the
+same width, allowing for them to be scanned quickly in table-based and coding
+environments.  The glyphs in Atkinson Hyperlegible Mono are newly created for
+this variation, and unique to the typeface.")
+      (license license:silofl1.1))))
+
 (define-public font-lato
   (package
     (name "font-lato")

gnu/packages/game-development.scm

@@ -38,6 +38,7 @@
 ;;; Copyright © 2025 Arnaud Lechevallier <arnaud.lechevallier@free.fr>
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
+;;; Copyright © 2025 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -569,38 +570,78 @@ types (revolute, prismatic, wheel, etc.).")
     (license license:zlib)))
 
 (define-public python-anvil-parser
-  (let ((commit "27544bb41f035617be130a209a84371cbaf837cc")
+  ;; Github project does not have tags.
+  (let ((commit "91a7eda55f0fb55a948d1072896430c29d906809")
         (revision "0"))
   (package
     (name "python-anvil-parser")
-    (version (git-version "0.9.0" revision commit))
+    (version (git-version "0.10.6" revision commit))
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/0xTiger/anvil-parser")
+             (url "https://github.com/0xTiger/anvil-parser2")
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "196nli36pz4sllx1m8jlys661hgbxhcxr2c4545fqb4nd27hhwy7"))))
-    (build-system python-build-system)
+        (base32 "16j7kv6v782nz1fafkxkb7v2vpwfhpi1a66ak04xawg9h1fz7vkc"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest python-setuptools))
     (propagated-inputs (list python-frozendict python-nbt))
-    (home-page "https://github.com/0xTiger/anvil-parser")
+    (home-page "https://github.com/0xTiger/anvil-parser2")
     (synopsis "Anvil file format parser")
     (description "This package provides an Anvil file format parser.")
     (license license:expat))))
 
+;;~4MiB of test files.
+(define python-nbt-testdata
+  (file-union
+   "python-nbt-testdata"
+   (list
+    (let ((file "Sample_World.tar.gz"))
+      `(,file
+        ,(origin
+           (method url-fetch)
+           (uri (string-append
+                 "https://github.com/twoolie/NBT/files/13199373/"
+                 file))
+           (sha256
+            (base32
+             "1s58g5zicx8ghdai2qix2aqq0fc675vfajica4h78c397crwjrl9"))))))))
+
 (define-public python-nbt
   (package
     (name "python-nbt")
     (version "1.5.1")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "NBT" version))
-              (sha256
-               (base32
-                "1i9ncrzy5zcfnxzkh2j31n9ayzxfncckzwa6fkz9vjq5fq9v4fys"))))
-    (build-system python-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/twoolie/NBT")
+              (commit (string-append "version-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a3mj7c18m1n5iqzwwvvlk7n65kxp3xbmccsqyap36apwpbbxyd9"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "tests/regiontests.py" "tests/nbttests.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'fake-download
+            ;; Fake the download of the test tarball.
+            (lambda _
+              (substitute*
+                  "tests/downloadsample.py"
+                (("tar_file = .*")
+                 (string-append
+                  "tar_file = '"
+                  #+python-nbt-testdata
+                  "/Sample_World.tar.gz'"))))))))
+    (native-inputs
+     (list python-pytest python-setuptools))
     (home-page "https://github.com/twoolie/NBT")
     (synopsis "Named Binary Tag reader and writer")
     (description
@@ -1949,6 +1990,43 @@ programming languages.")
 visual novel engine, explaining all of its features.")
     (license license:expat)))
 
+(define-public rpatool
+  ;; XXX: No releases or version tags, see:
+  ;; <https://codeberg.org/shiz/rpatool/issues/28>.
+  (let ((revision "0")
+        (commit "74f26d5dfdd645483e02552aa766ca447ad6b191"))
+    (package
+      (name "rpatool")
+      (version (git-version "0.8" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://codeberg.org/shiz/rpatool")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "10dm8bak0dm84d1ciwzw6jd5y64invddlmcdnawnpp7jn3wrg1jb"))))
+      (build-system pyproject-build-system)
+      (arguments
+       (list
+        #:tests? #f ;no tests
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'build)
+            (replace 'install
+              (lambda _
+                (install-file "rpatool"
+                              (string-append #$output "/bin")))))))
+      (home-page "https://codeberg.org/shiz/rpatool")
+      (synopsis "Tool to work with Ren'Py archives")
+      (description
+       "@samp{rpatool} is a simple tool allowing you to create, modify and
+extract @url{https://www.renpy.org/,Ren'Py} Archive files
+(@code{.rpa}/@code{.rpi}).  Currently, only writing RPAv2/RPAv3 archives is
+supported.")
+      (license license:wtfpl2))))
+
 (define-public python-pyxel
   ;; Note to updaters: Use commit and revision even if you're bumping
   ;; to a release, as upstream is known to "reuse" tags.
@@ -2094,36 +2172,40 @@ robust and compatible with many systems and operating systems.")
     (license license:zlib)))
 
 (define-public mc2mt
+  ;; No tags in the repository.
   (let ((commit "039dbc26466a430e03c646dc5a9bd0822637a87a")
         (revision "0"))
-  (package
-    (name "mc2mt")
-    (version (git-version "0.1" revision commit))
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/listia/mc2mt")
-             (commit commit)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i"))
-       (patches (search-patches "mc2mt-add-packaging-support.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        #~(begin
-            (substitute* "mc2mtlib/argument_parser.py"
-              (("mineclone2") "mineclone"))))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-setuptools))
-    (propagated-inputs (list python-anvil-parser))
-    (arguments
-     (list #:tests? #f)) ; no tests
-    (synopsis "Minecraft to Minetest world converter")
-    (description "@code{mc2mt} is a Minecraft to Minetest world converter.
+    (package
+      (name "mc2mt")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/listia/mc2mt")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i"))
+         (patches (search-patches "mc2mt-add-packaging-support.patch"))
+         (modules '((guix build utils)))))
+      (build-system pyproject-build-system)
+      (arguments
+       (list
+        #:tests? #f ; no tests
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-code
+              (lambda* _
+                (substitute* "mc2mtlib/argument_parser.py"
+                  (("mineclone2") "mineclone")))))))
+      (native-inputs (list python-pytest python-setuptools))
+      (propagated-inputs (list python-anvil-parser))
+      (synopsis "Minecraft to Minetest world converter")
+      (description "@code{mc2mt} is a Minecraft to Minetest world converter.
 It can convert worlds from Minecraft 1.9 and later.")
-    (home-page "https://github.com/listia/mc2mt")
-    (license license:expat))))
+      (home-page "https://github.com/listia/mc2mt")
+      (license license:expat))))
 
 (define-public mygui
   (package

gnu/packages/games.scm

@@ -1544,7 +1544,7 @@ practise.")
 (define-public doom-runner
   (package
     (name "doom-runner")
-    (version "1.8.3")
+    (version "1.9.1")
     (source
      (origin
        (method git-fetch)
@@ -1553,10 +1553,13 @@ practise.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0rpywq95zy9w0wj1262x4rf84c52wg1rgf0by549qph6fybn34rn"))))
+        (base32 "19jq5cj6rc8d5ghd9321a2f3v0b7z928990d7dj6ynyhkpcj769p"))
+       (modules '((guix build utils)))
+       (snippet #~(delete-file-recursively "Screenshots")))) ;Save 1.4MiB.
     (build-system qt-build-system)
     (arguments
      (list
+      #:qtbase qtbase
       #:tests? #f                       ;no tests
       #:modules '((guix build qt-build-system)
                   ((guix build gnu-build-system) #:prefix gnu:)
@@ -1565,37 +1568,37 @@ practise.")
       #~(modify-phases %standard-phases
           (replace 'configure
             (lambda _
-              (substitute* "DoomRunner.pro"
-                (("/usr")
-                 #$output))
               (invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++"
-                      "\"CONFIG+=release\"")))
+                      "\"CONFIG+=release\""
+                      (string-append "INSTALL_DIR=" #$output))))
           (replace 'build (assoc-ref gnu:%standard-phases 'build))
           (replace 'install (assoc-ref gnu:%standard-phases 'install))
           (add-after 'install 'install-xdg
             (lambda _
+              (with-directory-excursion #$output
+                (install-file "DoomRunner" "bin/")
+                (delete-file "DoomRunner"))
               (with-directory-excursion "Install/XDG"
                 (install-file "DoomRunner.desktop"
-                              (string-append #$output
-                                             "/share/applications"))
-                (let ((install-icon
-                       (lambda (size)
-                         (install-file (simple-format
-                                        #f "DoomRunner.~sx~s.png"
-                                        size size)
-                                       (simple-format
-                                        #f "~a/share/icons/hicolor/~sx~s/apps"
-                                        #$output size size)))))
-                  (for-each install-icon
-                            '(16 24 32 48 64 128)))))))))
+                              (string-append #$output "/share/applications"))
+                (install-file "io.github.Youda008.DoomRunner.appdata.xml"
+                              (string-append #$output "/share/metainfo"))
+                (for-each
+                 (lambda (size)
+                   (let ((filename (simple-format #f "DoomRunner.~sx~s.png"
+                                                  size size)))
+                     (chmod filename #o444)
+                     (install-file
+                      filename
+                      (simple-format #f "~a/share/icons/hicolor/~sx~s/apps"
+                                     #$output size size))))
+                 '(16 24 32 48 64 128))))))))
     (home-page "https://github.com/Youda008/DoomRunner")
     (synopsis "Launcher for Doom engine games")
-    (description
-     "Doom Runner is yet another launcher of common Doom source ports (like
-GZDoom, Zandronum, PrBoom, ...) with graphical user interface.  It is
-written in C++ and Qt, and it is designed around the idea of presets
-for various multi-file modifications to allow one-click switching
-between them and minimize any repetitive work.")
+    (description "Doom Runner is yet another launcher of common Doom source
+ports (e.g.  GZDoom, Zandronum, PrBoom) with a graphical user interface.  It
+is written in C++ and Qt, and it is designed around the idea of presets for
+various multi-file modifications to allow one-click switching between them.")
     (license license:gpl3)))
 
 (define-public falltergeist
@@ -9235,7 +9238,7 @@ original.")
 (define-public woof-doom
   (package
     (name "woof-doom")
-    (version "15.2.0")
+    (version "15.3.0")
     (source
      (origin
        (method git-fetch)
@@ -9244,22 +9247,29 @@ original.")
              (commit (string-append "woof_" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04c7hm4jnr9aiz6w4520zww6b7j86qv9xaf87hdv48cjc9sp2ljk"))
+        (base32 "0ki7wqjhqhjxci04aksh9m8m35gi2db89475v79rjzdgk00b3mqv"))
        (modules '((guix build utils)))
        (snippet '(begin
                    (with-directory-excursion "third-party"
                      (delete-file-recursively "miniz")
                      (delete-file-recursively "yyjson")
-                     (delete-file-recursively "spng"))
+                     (delete-file-recursively "spng")
+                     (substitute* "CMakeLists.txt"
+                       (("add_library\\(miniz.+")
+                        "find_package(miniz REQUIRED)")
+                       (("target_.+\\(miniz.+$") "")
+                       (("add_library\\(spng.+")
+                        "find_package(PkgConfig)
+pkg_search_module(spng REQUIRED spng)")
+                       (("target_.+\\(spng.+$") "")))
                    (delete-file-recursively "win32")
                    (substitute* (find-files "src" ".")
-                     (("miniz.h") "miniz/miniz.h"))))
-       (patches (search-patches "woof-doom-unbundle-spng-miniz.patch"))))
+                     (("miniz.h") "miniz/miniz.h"))))))
     (build-system cmake-build-system)
     (arguments
      (list
       #:tests? #f)) ;'demotest' requires internet access.
-    (native-inputs (list python))
+    (native-inputs (list pkg-config python))
     (inputs (list libebur128
                   libsndfile
                   libxmp
@@ -9270,8 +9280,8 @@ original.")
                   spng
                   yyjson
                   fluidsynth))
-    (home-page "https://github.com/fabiangreffrath/woof")
-    (synopsis "MBF-style Doom source port targeted at modern systems")
+    (home-page "https://fabiangreffrath.github.io/woof/")
+    (synopsis "MBF-lineage Doom source port")
     (description
      "Woof! is a continuation of the MBF lineage of Doom source ports, with
 modern features such as dynamic resolution scaling, uncapped framerates,
@@ -9284,7 +9294,6 @@ UMAPINFO, DEHEXTRA, and DSDHacked specifictions.")
      (list (license:non-copyleft
             "https://bitbucket.org/jpommier/pffft/src/master/pffft.h"
             "FFTPACK license")
-           license:bsd-2
            license:bsd-3
            license:cc-by3.0
            license:cc0

gnu/packages/gps.scm

@@ -205,7 +205,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
 (define-public gpxsee
   (package
     (name "gpxsee")
-    (version "13.22")
+    (version "15.6")
     (source
      (origin
        (method git-fetch)
@@ -214,7 +214,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "15m5rqky2fwsq5n6x531350x39wwhpv1hz56m1yfaxj7acxhb2p5"))))
+        (base32 "0kfbx7vv740fkx96v3m1gywl0mdfs3mxq84hmipjksm59qi4s3yy"))))
     (build-system qt-build-system)
     (arguments
      (list

gnu/packages/graphviz.scm

@@ -428,21 +428,17 @@ graphs in Graphviz's DOT language, written in pure Python.")
               (sha256
                (base32
                 "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv" "tests"
-                        ;; The test_semicolon test fails for unknown reason
-                        ;; (see:
-                        ;; https://github.com/kjellmf/dot2tex/issues/94).
-                        "-k" "not test_semicolon")))))))
+      ;; tests: 57 passed, 1 deselected
+      #:test-flags
+      ;; The test_semicolon test fails for unknown reason, see:
+      ;; <https://github.com/kjellmf/dot2tex/issues/94>.
+      #~(list "--deselect=tests/test_dot2tex.py::MultipleStatements::test_semicolon")))
     (native-inputs
      (list python-pytest
+           python-setuptools
            (texlive-local-tree
             (list texlive-pgf
                   texlive-preview
@@ -469,28 +465,35 @@ This approach allows:
 (define-public gprof2dot
   (package
     (name "gprof2dot")
-    (version "2021.02.21")
+    (version "2025.04.14")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jrfonseca/gprof2dot")
-             (commit version)))
+              (url "https://github.com/jrfonseca/gprof2dot")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic"))))
-    (build-system python-build-system)
+        (base32 "0yil32pbcarwsfmhgn2zhldjj985v9p80f2yi2shkaxzfc4w6zwi"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (invoke "python" "tests/test.py")))))))
+     (list
+      #:test-backend #~'custom
+      #:test-flags
+      #~(list "tests/test.py"
+              "--python=bash"
+              "--max-acceptable=0"
+              (string-append "--gprof2dot=" #$output "/bin/gprof2dot"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-tests
+            ;; Prevent irrelevant errors that cause test output mismatches:
+            ;; ‘Fontconfig error: No writable cache directories’
+            (lambda _
+              (setenv "XDG_CACHE_HOME" "/tmp"))))))
     (native-inputs
-     (list graphviz))
+     (list graphviz
+           python-setuptools))
     (home-page "https://github.com/jrfonseca/gprof2dot")
     (synopsis "Generate a dot graph from the output of several profilers")
     (description "This package provides a Python script to convert the output

gnu/packages/guile-xyz.scm

@@ -1030,7 +1030,7 @@ invocations."))))
 (define-public guile-dsv
   (package
     (name "guile-dsv")
-    (version "0.8.0")
+    (version "0.8.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1039,7 +1039,7 @@ invocations."))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0mc4najwji8144xzhpnrljrmh7m9iiykf3bp3lzksrwqyhz8np2k"))))
+                "0hpdl2x0lp0dqpx23l29a45lvn5c2qpd4bzrl8d46vm4nraqi7aa"))))
     (build-system gnu-build-system)
     (native-inputs (list autoconf
                          automake
@@ -1053,29 +1053,28 @@ invocations."))))
     (inputs (list bash-minimal guile-3.0))
     (propagated-inputs (list guile-lib guile-smc))
     (arguments
-     `(#:modules (((guix build guile-build-system)
-                   #:select (target-guile-effective-version))
-                  ,@%default-gnu-modules)
-       #:imported-modules ((guix build guile-build-system)
-                           ,@%default-gnu-imported-modules)
-       #:phases (modify-phases %standard-phases
-                  (delete 'strip)
-                  (add-after 'install 'wrap-program
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out"))
-                             (bin (string-append out "/bin"))
-                             (guile-lib (assoc-ref inputs "guile-lib"))
-                             (version (target-guile-effective-version))
-                             (scm (string-append "/share/guile/site/" version))
-                             (go (string-append "/lib/guile/" version
-                                                "/site-ccache")))
-                        (wrap-program (string-append bin "/dsv")
-                          `("GUILE_LOAD_PATH" prefix
-                            (,(string-append out scm) ,(string-append
-                                                        guile-lib scm)))
-                          `("GUILE_LOAD_COMPILED_PATH" prefix
-                            (,(string-append out go) ,(string-append guile-lib
-                                                       go))))) #t)))))
+     (list #:modules `(((guix build guile-build-system)
+                        #:select (target-guile-effective-version))
+                       ,@%default-gnu-modules)
+           #:imported-modules `((guix build guile-build-system)
+                                ,@%default-gnu-imported-modules)
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'strip)
+                        (add-after 'install 'wrap-program
+                          (lambda* (#:key inputs #:allow-other-keys)
+                            (let* ((bin (string-append #$output "/bin"))
+                                   (guile-lib (assoc-ref inputs "guile-lib"))
+                                   (version (target-guile-effective-version))
+                                   (scm (string-append "/share/guile/site/" version))
+                                   (go (string-append "/lib/guile/" version
+                                                      "/site-ccache")))
+                              (wrap-program (string-append bin "/dsv")
+                                `("GUILE_LOAD_PATH" prefix
+                                  (,(string-append #$output scm)
+                                   ,(string-append guile-lib scm)))
+                                `("GUILE_LOAD_COMPILED_PATH" prefix
+                                  (,(string-append #$output go)
+                                   ,(string-append guile-lib go))))))))))
     (home-page "https://github.com/artyom-poptsov/guile-dsv")
     (synopsis "DSV module for Guile")
     (description

gnu/packages/hare-xyz.scm

@@ -88,6 +88,69 @@
     (description "This package provides JSON support for Hare.")
     (license license:mpl2.0)))
 
+(define-public hare-lex
+  (package
+    (name "hare-lex")
+    (version "0.25.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~stacyharper/hare-lex")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06jlkb1q8ybr6yx56c6ikxv5ywz44k04dpwxcc796cnpzpkgqlyf"))))
+    (build-system hare-build-system)
+    (supported-systems %hare-supported-systems)
+    (home-page "https://git.sr.ht/~stacyharper/hare-lex")
+    (synopsis "General purpose lexical tokenization machinery for Hare")
+    (description "This module provides a general purpose lexer machine for Hare.")
+    (license license:mpl2.0)))
+
+(define-public hare-irc
+  (package
+    (name "hare-irc")
+    (version "0.25.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~sircmpwn/hare-irc")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ani8prdwjsfh8iqn5kfmkiim9ihl8dvbr28g69c037f6gbdb08v"))))
+    (build-system hare-build-system)
+    (supported-systems %hare-supported-systems)
+    (home-page "https://sr.ht/~sircmpwn/hare-irc")
+    (synopsis "IRC client protocol implementation for Hare")
+    (description "This package provides an implementation of the IRC client
+protocol for Hare programs, based on the @url{ircdocs.horse} specifications.")
+    (license license:mpl2.0)))
+
+(define-public hare-scfg
+  (package
+    (name "hare-scfg")
+    (version "0.25.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~chrisppy/hare-scfg")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1nj9gqvnvmwh3j39rj1h856p5qzghv5in01rxi4x74mqirl5q2ch"))))
+    (build-system hare-build-system)
+    (supported-systems %hare-supported-systems)
+    (home-page "https://git.sr.ht/~chrisppy/hare-scfg")
+    (synopsis "Hare library for a simple configuration file format")
+    (description "This package provides a Hare library for parsing
+@uref{https://git.sr.ht/~emersion/scfg, scfg}, a simple configuration file
+format with one directive per line.")
+    (license license:mpl2.0)))
+
 (define-public hare-ssh
   (package
     (name "hare-ssh")
@@ -109,6 +172,28 @@
 and agent protocols in pure Hare.")
     (license license:mpl2.0)))
 
+(define-public hare-template
+  (package
+    (name "hare-template")
+    (version "0.25.2.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~stacyharper/hare-template")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0mfg3ijfmii7vag1cgvr0n76hd7cic6vdf37gd05c5ilnb31ial6"))))
+    (build-system hare-build-system)
+    (inputs (list hare-lex))
+    (supported-systems %hare-supported-systems)
+    (home-page "https://git.sr.ht/~stacyharper/hare-template")
+    (synopsis "Templating tool and library for Hare")
+    (description "This package aims to offer a good and simple templating
+system for Hare, using code generation.")
+    (license license:mpl2.0)))
+
 (define-public hare-gi
   (package
     (name "hare-gi")
@@ -221,3 +306,23 @@ language.")
     (description "This package is a set of gtk-layer-shell bindings for the Hare
 language.")
     (license license:mpl2.0)))
+
+(define-public hare-xml
+  (package
+    (name "hare-xml")
+    (version "0.25.2.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~sircmpwn/hare-xml")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1h216z59piz1g7a0iiy1qic1wj8lbajw3mw5zw9nid0bz2vx81b0"))))
+    (build-system hare-build-system)
+    (supported-systems %hare-supported-systems)
+    (home-page "https://git.sr.ht/~sircmpwn/hare-xml")
+    (synopsis "XML support for Hare")
+    (description "This package provides XML support for Hare.")
+    (license license:mpl2.0)))

gnu/packages/ibus.scm

@@ -41,6 +41,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system meson)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -70,6 +71,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python-web)
@@ -1173,15 +1175,11 @@ and does not rely on an online service.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f)) ; No tests
-    (propagated-inputs
-     (list python-tinycss2 python-pygobject))
-    (native-inputs
-     `(("gettext" ,gettext-minimal)))
+        (base32 "0i8vwnikwd1bfpv4xlgzc51gn6s18q58nqhvcdiyjzcmy3z344c2"))))
+    (build-system pyproject-build-system)
+    (arguments (list #:tests? #f)) ; No tests
+    (propagated-inputs (list python-tinycss2 python-pygobject))
+    (native-inputs (list gettext-minimal python-setuptools))
     (home-page "https://github.com/openSUSE/IBus-Theme-Tools")
     (synopsis "Tool for IBus Themes")
     (description "IBus Theme Tools can extract IBus-specific settings from

gnu/packages/image-processing.scm

@@ -856,14 +856,14 @@ due to its architecture which automatically parallelises the image workflows.")
 (define-public gmic
   (package
     (name "gmic")
-    (version "3.5.5")
+    (version "3.6.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://gmic.eu/files/source/gmic_"
                            version ".tar.gz"))
        (sha256
-        (base32 "1wyzq5g8kfnglb5l8ipzh6lhf4667vmcd88gd9vf55fdnvdrjygp"))))
+        (base32 "16hncbj7isxcw5al3zf62n8iwpsvbnmfclihdbgq4fnwci6yb1q9"))))
     (build-system cmake-build-system)
     (arguments
      (list

gnu/packages/image.scm

@@ -3,7 +3,7 @@
 ;;; Copyright © 2013, 2015, 2016, 2025 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2014, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2014, 2016, 2017, 2018, 2019, 2025 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
 ;;; Copyright © 2014, 2017 John Darrington <jmd@gnu.org>
@@ -2891,12 +2891,25 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
        #:modules ((guix build python-build-system)
                   ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                   (guix build utils))
+       ;; XXX: Tests are not discovered.
+       #:tests? #false
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'python3.11-compatibility
            (lambda _
              (substitute* "setup.py"
-               (("\"rU\"") "\"r\""))))
+               (("\"rU\"") "\"r\"")
+               (("test_suite='tests'.*") ""))
+             (substitute* "setup.cfg"
+               (("install-") "install_"))
+             ;; This file makes Python confuse it for a module, so we rename
+             ;; it.
+             (rename-file "lib/xml.py" "lib/xmlo.py")
+             (substitute* (find-files "." "\\.py$")
+               (("lib.xml") "lib.xmlo"))
+             ;; This procedure has been removed.
+             (substitute* "lib/gettext_setup.py"
+               (("c = gettext.bind_textdomain_codeset.*") "c = True\n"))))
          (add-after 'install 'glib-or-gtk-wrap
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
          (add-after 'install 'wrap-program
@@ -2904,6 +2917,10 @@ GIF, TIFF, WEBP, BMP, PNG, XPM formats.")
              (let* ((out (assoc-ref outputs "out"))
                     (gdk-pixbuf (assoc-ref inputs "gdk-pixbuf"))
                     (gtk+ (assoc-ref inputs "gtk+")))
+               ;; This is replaced with an invalid shebang.
+               (substitute* (string-append out "/bin/mypaint")
+                 (("#!python")
+                  (string-append "#!" (which "python3"))))
                (wrap-program (string-append out "/bin/mypaint")
                  `("GI_TYPELIB_PATH" ":" prefix
                    (,(getenv "GI_TYPELIB_PATH")))))))

gnu/packages/language.scm

@@ -870,7 +870,7 @@ noun phrases, verb phrases, etc.).")
 (define-public praat
   (package
     (name "praat")
-    (version "6.4.47")
+    (version "6.4.49")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -879,7 +879,7 @@ noun phrases, verb phrases, etc.).")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0iyzdmgb56w80lgd4kb1cw9a0skxfbwj00q25idz7mkjij522fhi"))))
+                "1h49ffxjrc3pxamm0b77n6jirl5pp9xm09fvb16mx1qwr0cnzi2q"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags #~(list (string-append "CC="

gnu/packages/lean.scm

@@ -4,6 +4,7 @@
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2025 Luca Di Sera <disera.luca@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -139,6 +140,9 @@ interactive and automated theorem proving.")
               (substitute* "src/lean.mk.in"
                (("SHELL = /usr/bin/env bash")
                 "SHELL = bash"))
+              (substitute* "src/stdlib.make.in"
+               (("/usr/bin/env bash")
+                "bash"))
               (setenv "SHELL" "bash -euo pipefail")))
           (replace 'check
             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)

gnu/packages/libusb.scm

@@ -92,6 +92,20 @@
 devices on various operating systems.")
     (license license:lgpl2.1+)))
 
+(define-public libusb-next
+  (package
+    (inherit libusb)
+    (name "libusb-next")
+    (version "1.0.29")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/libusb/libusb/"
+                           "releases/download/v" version
+                           "/libusb-" version ".tar.bz2"))
+       (sha256
+        (base32 "118alz1rzqp6qaq486wn5hygs27qnc38rm4vxb69a4wd1yazqxsr"))))))
+
 (define-public libusb-compat
   (package
     (name "libusb-compat")

gnu/packages/lisp-xyz.scm

@@ -48,6 +48,7 @@
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 vga <v@vgz.li>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17171,6 +17172,40 @@ Lisp.")
 (define-public ecl-flute
   (sbcl-package->ecl-package sbcl-flute))
 
+(define-public sbcl-fmt
+  (let ((commit "91a29ec31e317bd6bd67d693acebc1d50bf0ac5e")
+        (revision "0"))
+    (package
+      (name "sbcl-fmt")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/mmontone/fmt")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs (list sbcl-fiveam sbcl-local-time))
+      (inputs (list sbcl-alexandria))
+      (home-page "https://github.com/mmontone/fmt")
+      (synopsis "Extensible text formatting facility for Common Lisp using
+s-expressions")
+      (description
+       "@code{fmt} provides an alternative to the Common Lisp @code{format}
+function by utilizing s-expressions for formatting directives instead
+of control strings.")
+      (license license:expat))))
+
+(define-public cl-fmt
+  (sbcl-package->cl-source-package sbcl-fmt))
+
+;; TODO: Not reproducible.
+;; (define-public ecl-fmt
+;;   (sbcl-package->ecl-package sbcl-fmt))
+
 (define-public sbcl-fn
   (let ((commit "8d8587d03a7b5e26b306fc90018e385d9e5acc2c")
         (revision "1"))

gnu/packages/machine-learning.scm

@@ -2543,20 +2543,17 @@ data by providing clean labels during training.")
 (define-public python-cma
   (package
     (name "python-cma")
-    (version "4.2.0")
+    (version "4.4.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "cma" version))
               (sha256
                (base32
-                "17wv4r80av3cpr3dqad7jf7bwnjahk4bgagqlkqxjp8zfmg60s0q"))))
+                "1n17shbcmy7h7k105ar9yhj2zmgykx1wv9fhwd5kbwrcypa221mz"))))
     (build-system pyproject-build-system)
     (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (replace 'check
-                          (lambda* (#:key tests? #:allow-other-keys)
-                            (when tests?
-                              (invoke "python" "-m" "cma.test")))))))
+     (list #:test-backend #~'custom
+           #:test-flags #~'("cma/test.py")))
     (native-inputs (list python-pytest python-setuptools))
     (propagated-inputs (list python-numpy))
     (home-page "https://github.com/CMA-ES/pycma")
@@ -3740,31 +3737,6 @@ in a fast and accurate way.")
      (list python-numpy python-scipy))
     (synopsis "Python interface for the XGBoost library")))
 
-(define-public python-iml
-  (package
-    (name "python-iml")
-    (version "0.6.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "iml" version))
-       (sha256
-        (base32
-         "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l"))))
-    (build-system pyproject-build-system)
-    (propagated-inputs
-     (list python-ipython python-numpy python-pandas python-scipy))
-    (native-inputs
-     (list python-nose python-setuptools))
-    (home-page "https://github.com/interpretable-ml/iml")
-    (synopsis "Interpretable Machine Learning (iML) package")
-    (description "Interpretable ML (iML) is a set of data type objects,
-visualizations, and interfaces that can be used by any method designed to
-explain the predictions of machine learning models (or really the output of
-any function).  It currently contains the interface and IO code from the Shap
-project, and it will potentially also do the same for the Lime project.")
-    (license license:expat)))
-
 (define-public gloo
   (let ((version "0.0.0")                         ; no proper version tag
         (commit "54cbae0d3a67fa890b4c3d9ee162b7860315e341")

gnu/packages/mail.scm

@@ -326,14 +326,14 @@ completely independent from the extension API.")
 (define-public mailutils
   (package
     (name "mailutils")
-    (version "3.20")
+    (version "3.21")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/mailutils/mailutils-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0ag8d9fafzyjk53iyknzvb82risv1jf4wgnann5ii9fx3smzmwx8"))
+               "1sgmgslmifs8kpi4y2gjw4c7z0xfhhxdnxxwzmsnd3cvd7f1wz74"))
              (patches
               (search-patches "mailutils-variable-lookup.patch"))))
     (build-system gnu-build-system)
@@ -1341,86 +1341,67 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
       (license license:bsd-3))))
 
 (define-public mu
-  ;; this commit fixes nondeterministic test failing the build
-  ;; revert back to a tagged release next time
-  ;; <https://github.com/djcb/mu/commit/46f91ab7b7641caac992a41264ac41a76c001c87>
-  (let ((commit "46f91ab7b7641caac992a41264ac41a76c001c87")
-        (revision "1"))
-    (package
-      (name "mu")
-      (version (git-version "1.12.13" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/djcb/mu")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1dbadvpl0fwy975f4i58rq7n85gfjhv92lcdmkv1w3h1mjn2v0sd"))))
-      (build-system meson-build-system)
-      (native-inputs
-       (list pkg-config
-             emacs-minimal
-             gnupg                      ; for tests
-             tzdata-for-tests           ; for tests
-             texinfo))
-      (inputs
-       (list glib gmime guile-3.0 xapian readline python))
-      (arguments
-       (list
-        #:modules '((guix build meson-build-system)
-                    (guix build emacs-utils)
-                    ((guix build guile-build-system)
-                     #:select (target-guile-effective-version))
-                    (guix build utils))
-        #:imported-modules `(,@%meson-build-system-modules
-                             (guix build guile-build-system)
-                             (guix build emacs-utils))
-        #:configure-flags
-        #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; This phase can be removed in the next major release of mu.
-            ;; <https://github.com/djcb/mu/commit/f237a2b9905475fb95da6a04e318d10cab61ddeb>
-            ;; <https://github.com/djcb/mu/commit/fc4d5b01a703e8c8cc390cfea135f08d3b45ccab>
-            (add-after 'unpack 'patch-bin-references
-              (lambda _
-                (substitute* '("guile/tests/test-mu-guile.cc"
-                               "mu/tests/test-mu-query.cc")
-                  (("/bin/sh") (which "sh")))
-                (substitute* '("lib/tests/bench-indexer.cc"
-                               "lib/utils/mu-utils-file.cc"
-                               "lib/utils/mu-test-utils.cc")
-                  (("/bin/rm") (which "rm")))
-                (substitute* '("lib/mu-maildir.cc")
-                  (("/bin/mv") (which "mv")))))
-            (add-after 'install 'fix-ffi
-              (lambda _
-                (substitute* (find-files #$output "mu\\.scm")
-                  (("\"libguile-mu\"")
-                   (format #f "\"~a/lib/libguile-mu\"" #$output)))))
-            (add-after 'install 'install-emacs-autoloads
-              (lambda _
-                (emacs-generate-autoloads
-                 "mu4e"
-                 (string-append #$output
-                                "/share/emacs/site-lisp/mu4e"))))
-            (add-after 'install 'wrap-executable
-              (lambda _
-                (let* ((bin (string-append #$output "/bin"))
-                       (version (target-guile-effective-version))
-                       (scm (string-append #$output "/share/guile/site/" version)))
-                  (wrap-program (string-append bin "/mu")
-                    `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
-      (home-page "https://www.djcbsoftware.nl/code/mu/")
-      (synopsis "Quickly find emails")
-      (description
-       "Mu is a tool for dealing with e-mail messages stored in the
+  (package
+    (name "mu")
+    (version "1.12.14")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/djcb/mu")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "188l9h2smmq6x16l9kjbjk4rbyxgz552kiwr3j1y981cl0nndli2"))))
+    (build-system meson-build-system)
+    (native-inputs
+     (list pkg-config
+           emacs                      ; TODO: use emacs-minimal next release
+           gnupg                      ; for tests
+           tzdata-for-tests           ; for tests
+           texinfo))
+    (inputs
+     (list glib gmime guile-3.0 xapian readline python))
+    (arguments
+     (list
+      #:modules '((guix build meson-build-system)
+                  (guix build emacs-utils)
+                  ((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
+                  (guix build utils))
+      #:imported-modules `(,@%meson-build-system-modules
+                           (guix build guile-build-system)
+                           (guix build emacs-utils))
+      #:configure-flags
+      #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'fix-ffi
+            (lambda _
+              (substitute* (find-files #$output "mu\\.scm")
+                (("\"libguile-mu\"")
+                 (format #f "\"~a/lib/libguile-mu\"" #$output)))))
+          (add-after 'install 'install-emacs-autoloads
+            (lambda _
+              (emacs-generate-autoloads
+               "mu4e"
+               (string-append #$output
+                              "/share/emacs/site-lisp/mu4e"))))
+          (add-after 'install 'wrap-executable
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (version (target-guile-effective-version))
+                     (scm (string-append #$output "/share/guile/site/" version)))
+                (wrap-program (string-append bin "/mu")
+                  `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
+    (home-page "https://www.djcbsoftware.nl/code/mu/")
+    (synopsis "Quickly find emails")
+    (description
+     "Mu is a tool for dealing with e-mail messages stored in the
 Maildir format.  Mu's purpose in life is to help you to quickly find the
 messages you need; in addition, it allows you to view messages, extract
 attachments, create new maildirs, and so on.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public alot
   (package

gnu/packages/maths.scm

@@ -3840,13 +3840,13 @@ ASCII text files using Gmsh's own scripting language.")
 (define-public veusz
   (package
     (name "veusz")
-    (version "4.1")
+    (version "4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "veusz" version))
        (sha256
-        (base32 "0idg249sg367rxp69nwpsib5dwb0bbznb8hak004573ygc7dmd5k"))))
+        (base32 "1vc5zmjzhjkmfy2417xs8h1bix8xyd0gvikskp3k3qgf9wz22a4g"))))
     (build-system pyproject-build-system)
     (arguments
      (list

gnu/packages/mp3.scm

@@ -61,6 +61,7 @@
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages linux)               ;alsa-lib
+  #:use-module (gnu packages textutils)           ;utfcpp
   #:use-module (gnu packages video)               ;ffmpeg
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -281,6 +282,24 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
     ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1.
     (license (list license:lgpl2.1 license:mpl1.1))))
 
+(define-public taglib-next
+  (package
+    (inherit taglib)
+    (name "taglib")
+    (version "2.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/taglib/taglib")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
+    (inputs
+     (list utfcpp
+           zlib))))
+
 (define-public minimp3
   ;; The latest commit is used as there is no release.
   (let ((commit   "afb604c06bc8beb145fecd42c0ceb5bda8795144")
@@ -744,39 +763,36 @@ fingerprinting library and the Acoustid API.")
 (define-public python-pytaglib
   (package
     (name "python-pytaglib")
-    (version "1.4.6")
+    (version "3.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytaglib" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/supermihi/pytaglib")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0li970qslfymz4vk1wrij2nfqw3l15cpc3fjjci48mpvg17gbnhn"))
-       ;; Delete file generated by Cython.
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (delete-file "src/taglib.cpp")))))
-    (build-system python-build-system)
+        (base32 "178vvc0rq932w9hmzb1cxlzhzfs5npibrpx41r0zidmhcpv4gr03"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         ;; Ensure that the Cython file is regenerated.
-         (add-after 'unpack 'setup-environment
-           (lambda _
-             (setenv "PYTAGLIB_CYTHONIZE" "1"))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; Ensure that the Cython file is regenerated.
+          (add-after 'unpack 'setup-environment
+            (lambda _
+              (setenv "PYTAGLIB_CYTHONIZE" "1"))))))
     (native-inputs
-     (list python-cython python-pytest))
+     (list python-cython
+           python-pytest
+           python-setuptools))
     (inputs
-     (list taglib))
-    (home-page
-     "https://github.com/supermihi/pytaglib")
-    (synopsis
-     "Python bindings for taglib")
+     (list taglib-next))
+    (home-page "https://github.com/supermihi/pytaglib")
+    (synopsis "Python bindings for taglib")
     (description
-     "This package is a Python audio tagging library.  It is
-cross-platform, works with all Python versions, and is very
-simple to use yet fully featured.")
+     "This package is a Python audio tagging library.  It is cross-platform,
+ works with all Python versions, and is very simple to use yet fully featured.")
     (license license:gpl3)))
 
 (define-public wavbreaker

gnu/packages/mpd.scm

@@ -58,6 +58,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages readline)
@@ -524,16 +525,25 @@ MPRIS 2 support.")
 (define-public cantata
   (package
     (name "cantata")
-    (version "3.3.1")
+    (version "3.4.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/nullobsi/cantata")
-                    (commit (string-append "v" version))))
+                     (url "https://github.com/nullobsi/cantata")
+                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0x5bm8s9cl68ybdv37w65kjlxyz40s42ddyf0cv4351vxxiiyng2"))))
+                "1hjq73w5lnh2gj51bnaqym0lds82zzlwjr2ndz2m8xrcv2w2q0lg"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(begin
+                   (with-directory-excursion "3rdparty"
+                     (for-each delete-file-recursively
+                               '("karchive"
+                                 "kcategorizedview"
+                                 "qtsingleapplication")))
+                   (delete-file-recursively "support/fonts")))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f)) ; No test suite
@@ -543,16 +553,13 @@ MPRIS 2 support.")
      (list avahi
            eudev
            ffmpeg
+           karchive
+           kitemviews
            libcddb
            libcdio-paranoia
-           libmusicbrainz
-           libebur128
-           libmtp
-           mpg123
            qtbase
            qtmultimedia
            qtsvg
-           taglib
            zlib))
     (synopsis "Graphical MPD Client")
     (description "Cantata is a graphical client for the Music Player Daemon

gnu/packages/networking.scm

@@ -1569,6 +1569,50 @@ between different versions of ØMQ.")
 files contain direct mappings of the abstractions provided by the ØMQ C API.")
     (license license:expat)))
 
+(define-public libcoap
+  (package
+    (name "libcoap")
+    (version "4.3.5a")
+    (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/obgm/libcoap")
+                      (commit (string-append "v" version))))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "078bi6i6115wyhx9qssh30kf5ziv8sn7ch5fg31rf7qr7pypbfxa"))))
+    (outputs (list "out" "doc"))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+       #:configure-flags
+       #~(list "--enable-tests"
+               "--with-openssl")
+       #:phases
+       #~(modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "./tests/testdriver")))))))
+    (native-inputs (list asciidoc
+                         autoconf
+                         automake
+                         doxygen
+                         libtool
+                         pkg-config
+                         which))
+    (inputs (list cunit openssl))
+    (home-page "https://libcoap.net/")
+    (synopsis "Implementation of the CoAP application protocol")
+    (description
+      "This package provides a C implementation of a lightweight
+application-protocol for devices that are constrained their resources such as
+computing power, RF range, memory, bandwidth, or network packet sizes.  This
+protocol, @acronym{CoAP, Constrained Application Protocol}, is standardized by
+the IETF as @url{https://www.rfc-editor.org/rfc/rfc7252, RFC 7252}.")
+    (license license:bsd-2)))
+
 (define-public libnatpmp
   ;; Install the latest commit as it provides a pkg-config (.pc) file.
   (let ((base-version "20230423")

gnu/packages/nutrition.scm

@@ -27,6 +27,7 @@
   #:use-module (guix licenses)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
@@ -48,30 +49,28 @@
 (define-public python-scrape-schema-recipe
   (package
     (name "python-scrape-schema-recipe")
-    (version "0.2.0")
-    ;; The PyPI archive lacks a VERSION file as well as the test suite.
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/micahcochran/scrape-schema-recipe")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "044c6qwhb4c710ksgiw29cd0qcp84h1m4y8yr2g4c8vdlm3kkqh5"))))
-    (build-system python-build-system)
+    (version "0.2.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/micahcochran/scrape-schema-recipe")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yrqawnxp1k9ps0c920qjbbaxpmz3cf8bzyjs1kimvlxym78b614"))))
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'check
+          (add-before 'check 'configure-tests
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?
                 (substitute* "test_scrape.py"
                   (("DISABLE_NETWORK_TESTS = False")
-                   "DISABLE_NETWORK_TESTS = True"))
-                (invoke "pytest" "-vv")))))))
-    (native-inputs (list python-pytest))
+                   "DISABLE_NETWORK_TESTS = True"))))))))
+    (native-inputs (list python-pytest python-setuptools))
     (propagated-inputs
      (list python-extruct
            python-importlib-resources
@@ -101,32 +100,20 @@ in the @url{https://schema.org/Recipe} format.")
           (base32
            "08fbw6zp32ws6w9czwy2sqc9c9izlkglsskshj2114d0l79z4gj8"))
          (patches (search-patches "gourmet-sqlalchemy-compat.patch"))))
-      (build-system python-build-system)
+      (build-system pyproject-build-system)
       (arguments
        (list
-        #:modules `((guix build utils)
-                    (guix build python-build-system)
-                    (ice-9 ftw)
-                    (srfi srfi-26))
+        #:test-flags
+        ;; XXX: Some tests in deeper directories or otherwise discovered by
+        ;; Pytest are broken.
+        #~(list "--ignore-glob=gourmet/tests/**/*.py")
         #:phases
         #~(modify-phases %standard-phases
-            (add-before 'check 'prepare-x
-              ;; Both the tests and the sanity-check phase need an X server to
-              ;; succeed.
+            (add-before 'check 'configure-tests
               (lambda _
+                (setenv "HOME" "/tmp") ;needed by tests
                 (system "Xvfb &")
                 (setenv "DISPLAY" ":0")))
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (setenv "HOME" "/tmp") ;needed by tests
-                  (apply invoke "pytest" "-vv"
-                         ;; XXX: This is needed because some tests in deeper
-                         ;; directories or otherwise discovered by Pytest are
-                         ;; broken.
-                         (map (cut string-append "gourmet/tests/" <>)
-                              (scandir "gourmet/tests"
-                                       (cut string-prefix? "test_" <>)))))))
             (add-after 'install 'install-dekstop-file-and-icons
               (lambda _
                 (define share (string-append #$output "/share"))
@@ -138,6 +125,7 @@ in the @url{https://schema.org/Recipe} format.")
        (list python-dogtail
              python-pytest
              python-selenium
+             python-setuptools
              xorg-server-for-tests))
       (inputs
        (list gtk+

gnu/packages/opencl.scm

@@ -42,6 +42,7 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-science)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages ruby)
@@ -268,18 +269,22 @@ pocl.")
 (define-public python-pytools
   (package
     (name "python-pytools")
-    (version "2021.2.7")
+    (version "2025.2.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytools" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/inducer/pytools")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1yyr4k6sqx859gjhc02633l2vxwdnj6m2f5blmf7dgq0gzzgcf05"))))
-    (build-system python-build-system)
-    (arguments `(#:tests? #f)) ; Tests depend on packages not present in Guix.
-    (propagated-inputs
-     (list python-appdirs python-numpy))
-    (home-page "https://pypi.org/project/pytools/")
+        (base32 "1sym2vbkw068ldkjqi3qj1dkbvd047bk5ir028qqbv0g7z3dwk31"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f)) ;Tests depend on packages not present in Guix.
+    (native-inputs (list python-hatchling))
+    (propagated-inputs (list python-appdirs python-numpy))
+    (home-page "https://github.com/inducer/pytools")
     (synopsis "Assorted tools for Python")
     (description
      "Pytools is a bag of things that are ``missing'' from the Python standard

gnu/packages/orange.scm

@@ -258,9 +258,10 @@ data analysis, data mining and data visualization.")
        (uri (pypi-uri "serverfiles" version))
        (sha256
         (base32 "1qgbzgnaxj4wsp2rdas53qxsh0j7xpibq25w6lviwyaqwwrgq42y"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-requests))
+    (build-system pyproject-build-system)
+    (arguments (list #:test-backend #~'unittest))
+    (native-inputs (list python-setuptools))
+    (propagated-inputs (list python-requests))
     (home-page "https://github.com/biolab/serverfiles")
     (synopsis "Utility to access files on a HTTP server and store them locally")
     (description

gnu/packages/package-management.scm

@@ -412,6 +412,19 @@ $(prefix)/etc/openrc\n")))
                           (substitute* "tests/guix-environment-container.sh"
                             (("guix environment --version")
                              "exit 77\n")))))
+                    ,@(if (target-arm32?)
+                          `((add-after
+                                'disable-failing-tests
+                                'disable-failing-tests-on-arm32
+                              ;; XXX FIXME: These tests fail on armhf architecture,
+                              ;; see <https://codeberg.org/guix/guix/issues/5078>.
+                              (lambda _
+                                (substitute* "tests/syscalls.scm"
+                                  (("^\\(test-equal \"safe-clone and unshare succeeds\"" all)
+                                   (string-append "(test-skip 1)\n" all))
+                                  (("^\\(test-equal \"clone and unshare triggers EINVAL\"" all)
+                                   (string-append "(test-skip 1)\n" all))))))
+                          '())
                     (add-before 'check 'set-SHELL
                       (lambda _
                         ;; 'guix environment' tests rely on 'SHELL' having a

gnu/packages/patches/mc2mt-add-packaging-support.patch

@@ -77,7 +77,7 @@ index 0000000..cf9a70d
 +[project]
 +name = 'mc2mt'
 +version = '0.1'
-+dependencies = ['anvil-parser']
++dependencies = ['anvil-parser2']
 +
 +[project.scripts]
 +mc2mt = 'mc2mtlib:mc2mt.mc2mt'

gnu/packages/patches/mpv-0.40.0-fix-ffmpeg-8.0.patch

@@ -1,40 +0,0 @@
-Patch obtained from https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
-See https://github.com/mpv-player/mpv/issues/16176 for discussion. Next version
-of mpv will have this fixed, but upstream is not planning to release a patch
-release.
-
-From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
-Date: Fri, 28 Mar 2025 19:12:01 +0100
-Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
- removal
-
-See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
----
- demux/demux_mkv.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
-index 135edcc23d82b..cc7ce3e98f4f6 100644
---- a/demux/demux_mkv.c
-+++ b/demux/demux_mkv.c
-@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
-             // [0x30..0x37] are component tags utilized for
-             // non-mobile captioning service ("profile A").
-             if (component_tag >= 0x30 && component_tag <= 0x37)
--                lav->profile = FF_PROFILE_ARIB_PROFILE_A;
-+                lav->profile = AV_PROFILE_ARIB_PROFILE_A;
-             break;
-         case 0x0012:
-             // component tag 0x87 signifies a mobile/partial reception
-             // (1seg) captioning service ("profile C").
-             if (component_tag == 0x87)
--                lav->profile = FF_PROFILE_ARIB_PROFILE_C;
-+                lav->profile = AV_PROFILE_ARIB_PROFILE_C;
-             break;
-         }
--        if (lav->profile == FF_PROFILE_UNKNOWN)
-+        if (lav->profile == AV_PROFILE_UNKNOWN)
-             MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
-                     component_tag, data_component_id);
-     }

gnu/packages/patches/mpv-0.40.0-fix-wayland-cpu-usage.patch

@@ -1,34 +0,0 @@
-Upstream-status: https://github.com/mpv-player/mpv/pull/16140
-
-From d20ded876d27497d3fe6a9494add8106b507a45c Mon Sep 17 00:00:00 2001
-From: llyyr <llyyr.public@gmail.com>
-Date: Fri, 28 Mar 2025 15:34:33 +0530
-Subject: [PATCH] clipboard-wayland: prevent reading from hung up fd
-
-This causes mpv to use up 100% of a core if there's an offer for a
-mime_type that mpv doesn't accept with ext_data_control clipboard
-backend.
----
- player/clipboard/clipboard-wayland.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/player/clipboard/clipboard-wayland.c b/player/clipboard/clipboard-wayland.c
-index c4a5e50472..bd8ac35af2 100644
---- a/player/clipboard/clipboard-wayland.c
-+++ b/player/clipboard/clipboard-wayland.c
-@@ -348,6 +348,12 @@ static bool clipboard_wayland_dispatch_events(struct clipboard_wayland_priv *wl,
-     if (fds[1].revents & POLLIN)
-         return false;
- 
-+    if (fds[2].revents & (POLLERR | POLLHUP | POLLNVAL))
-+        destroy_offer(wl->selection_offer);
-+
-+    if (fds[3].revents & (POLLERR | POLLHUP | POLLNVAL))
-+        destroy_offer(wl->primary_selection_offer);
-+
-     if (fds[2].revents & POLLIN)
-         get_selection_data(wl, wl->selection_offer, false);
- 
--- 
-2.51.0
-

gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch

@@ -1,26 +0,0 @@
-Unbundle spng, miniz
-*** a/third-party/CMakeLists.txt
---- b/third-party/CMakeLists.txt
-@@ -4,20 +4,13 @@
- target_woof_settings(md5)
- target_include_directories(md5 INTERFACE md5)
- 
--add_library(miniz STATIC miniz/miniz.c)
--target_woof_settings(miniz)
--target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME)
--target_include_directories(miniz INTERFACE miniz)
-+find_package(miniz)
- 
- add_library(pffft STATIC pffft/pffft.c)
- target_woof_settings(pffft)
- target_include_directories(pffft INTERFACE pffft)
- 
--add_library(spng STATIC spng/spng.c)
--target_woof_settings(spng)
--target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC)
--target_include_directories(spng INTERFACE spng)
--target_link_libraries(spng miniz)
-+find_package(spng)
- 
- if(NOT yyjson_FOUND)
-     add_library(yyjson STATIC yyjson/yyjson.c)

gnu/packages/photo.scm

@@ -590,7 +590,7 @@ photographic equipment.")
 (define-public darktable
   (package
     (name "darktable")
-    (version "5.2.1")
+    (version "5.4.0")
     (source
      (origin
        (method url-fetch)
@@ -598,7 +598,7 @@ photographic equipment.")
              "https://github.com/darktable-org/darktable/releases/"
              "download/release-" version "/darktable-" version ".tar.xz"))
        (sha256
-        (base32 "04gfcislcq2wymfqcir5bpwqfarcz5gynkn3ajyffj9rx6damw82"))))
+        (base32 "05ivr9ma83k6zlkyklhrxs1kmq3ry428hgf3177layfjg3mbmw1b"))))
     (build-system cmake-build-system)
     (arguments
      (list

gnu/packages/prolog.scm

@@ -189,7 +189,7 @@ it.")
 (define-public trealla
   (package
     (name "trealla")
-    (version "2.88.1")
+    (version "2.88.3")
     (source
      (origin
        (method git-fetch)
@@ -198,7 +198,7 @@ it.")
          (url "https://github.com/trealla-prolog/trealla")
          (commit (string-append "v" version))))
        (sha256
-        (base32 "1dim7y3ylm9mclabmcd4nc19hwg7hfgm02vw94jdwpwh6zh77aph"))
+        (base32 "07wa3sxig64zq317jmisf43z9wzpx7jrlv78vl84lrn0gxmfa5lq"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (native-inputs

gnu/packages/python-check.scm

@@ -64,7 +64,9 @@
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
+  #:use-module (gnu packages docker)
   #:use-module (gnu packages jupyter)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
@@ -90,6 +92,7 @@
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix hg-download)
   #:use-module (guix packages)
   #:use-module (guix utils))
 
@@ -2256,10 +2259,13 @@ are too large to conveniently hard-code them in the tests.")
        (uri (pypi-uri "pytest-astropy" version))
        (sha256
         (base32 "1d9rcxnc57rjp96xag1gq725pwl11b3k5hdaz7c3w5lixncsmbjf"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments (list #:tests? #f)) ; there are no tests
     (native-inputs
-     (list python-attrs python-pytest-mock python-setuptools-scm))
+     (list python-attrs
+           python-pytest-mock
+           python-setuptools
+           python-setuptools-scm))
     (propagated-inputs
      (list python-hypothesis
            python-pytest-arraydiff
@@ -2389,23 +2395,41 @@ functions.")
 (define-public python-pytest-celery
   (package
     (name "python-pytest-celery")
-    (version "0.0.0")
+    (version "1.2.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest-celery" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/celery/pytest-celery")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
-    (build-system python-build-system)
+        (base32 "04s5j456rl2lj4zxrzkynx1lb09bb8qrkn82pladj2q89pzqxh8k"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f ; no tests and circular dependency on python-celery
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'sanity-check)))) ; checks for celery
-    (home-page "https://github.com/graingert/pytest-celery")
-    (synopsis "Shim pytest plugin to enable @code{celery.contrib.pytest}")
+     (list
+      #:test-flags
+      ;; Disable tests that require docker/rabbit/redis running.
+      #~(list "--deselect=tests/integration"
+              "-k" "not rabbit and not redis")))
+    (native-inputs
+     (list python-celery-minimal
+           python-memcached             ;optional dependency, needed for tests
+           python-poetry-core
+           python-pytest
+           python-pytest-cov            ;coverage options in pyproject.toml
+           python-redis                 ;optional dependency, needed for tests
+           python-requests))            ;for python-docker
+    (propagated-inputs
+     (list python-psutil
+           python-pytest-docker-tools
+           python-tenacity))
+    (home-page "https://github.com/celery/pytest-celery")
+    (synopsis "Pytest plugin designed for Celery application developers")
     (description
-     "This package provides a shim Pytest plugin to enable a Celery marker.")
+     "This package enables dynamic orchestration of Celery environments for
+testing tasks in isolated conditions, leveraging Docker & pytest-docker-tools
+for environment simulation.")
     (license license:bsd-3)))
 
 (define-public python-pytest-check
@@ -2638,6 +2662,40 @@ to mark some tests as dependent from other tests.  These tests will then be
 skipped if any of the dependencies did fail or has been skipped.")
     (license license:asl2.0)))
 
+(define-public python-pytest-docker-tools
+  (package
+    (name "python-pytest-docker-tools")
+    (version "3.1.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Jc2k/pytest-docker-tools")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06w89kvxqma5ns6gndmk6g048qpv10wdwf61ynii1mm1n0xy11sr"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; All other tests seem to require docker daemon running.
+      #~(list "tests/test_utils.py")))
+    (native-inputs
+     (list python-pytest
+           python-requests
+           python-setuptools))
+    (propagated-inputs
+     (list python-docker))
+    (home-page "https://github.com/Jc2k/pytest-docker-tools")
+    (synopsis "Test your built docker image")
+    (description
+     "This package is a set of opinionated helpers for creating py.test fixtures
+for your smoke testing and integration testing.  It strives to keep your
+environment definition declarative, like a docker-compose.yml.  It embraces
+ py.test fixture overloading.")
+    (license license:asl2.0)))
+
 (define-public python-pytest-doctest-custom
   (package
     (name "python-pytest-doctest-custom")
@@ -4173,28 +4231,31 @@ framework.")
 (define-public python-pytest-xvfb
   (package
     (name "python-pytest-xvfb")
-    (version "2.0.0")
+    (version "3.1.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest-xvfb" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/The-Compiler/pytest-xvfb")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"))))
-    (build-system python-build-system)
+        (base32 "0p27h1idqja2lz2xnk4fsb9c8kafvgy1zpa84lg9d1hlamr221ja"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:test-target "pytest"
+     (list
        #:phases
-       (modify-phases %standard-phases
+       #~(modify-phases %standard-phases
          (add-before 'build 'prepare-tests
            (lambda _
              (system "Xvfb &")
              (setenv "DISPLAY" ":0")
-
              ;; This test is meant to run on Windows.
-             (delete-file "tests/test_xvfb_windows.py")
-             #t)))))
+             (delete-file "tests/test_xvfb_windows.py"))))))
     (native-inputs
-     (list python-pytest python-pytest-runner xorg-server-for-tests))
+     (list python-pytest
+           python-setuptools
+           xorg-server-for-tests))
     (propagated-inputs
      (list python-pyvirtualdisplay))
     (home-page "https://github.com/The-Compiler/pytest-xvfb")
@@ -4214,9 +4275,11 @@ framework.")
        (sha256
         (base32
          "1i17xh4dy238ibrjdgh8vn78fk5q6dj37mcznpvdfzidj57js7ca"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:tests? #f))                  ;the mini test suite fails
+    (native-inputs
+     (list python-pytest python-setuptools))
     (home-page "https://github.com/farizrahman4u/pyux")
     (synopsis "Utility to check API integrity in Python libraries")
     (description "The pyux utility detects API changes in Python
@@ -4939,7 +5002,7 @@ unused.")
        (uri (pypi-uri "xunitparser" version))
        (sha256
         (base32 "00lapxi770mg7jkw16zy3a91hbdfz4a9h43ryczdsgd3z4cl6vyf"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -4949,7 +5012,9 @@ unused.")
              (substitute* "xunitparser.py"
                (("(^ +)self.stderr = None" m indent)
                 (string-append m "\n" indent "self._cleanup = False\n"))))))))
-    (home-page "http://git.p.engu.in/laurentb/xunitparser/")
+    (native-inputs
+     (list python-pytest python-setuptools))
+    (home-page "https://gitlab.com/woob/xunitparser/")
     (synopsis "Read JUnit/XUnit XML files and map them to Python objects")
     (description "xunitparser reads a JUnit/XUnit XML file and maps it to
 Python objects.  It tries to use the objects available in the standard
@@ -4959,14 +5024,16 @@ Python objects.  It tries to use the objects available in the standard
 (define-public python-xvfbwrapper
   (package
     (name "python-xvfbwrapper")
-    (version "0.2.9")
+    (version "0.2.16")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "xvfbwrapper" version))
               (sha256
                (base32
-                "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w"))))
-    (build-system python-build-system)
+                "01gqp740hkb2asnfpvb0fjpjqj88rylhx4b1r2c0wzrknwshp016"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest python-setuptools))
     (propagated-inputs (list xorg-server-for-tests))
     (home-page "https://github.com/cgoldberg/xvfbwrapper")
     (synopsis "Python module for controlling virtual displays with Xvfb")
@@ -4976,3 +5043,27 @@ the X11 display server protocol.  It runs in memory and does not require a
 physical display.  Only a network layer is necessary.  Xvfb is useful for
 running acceptance tests on headless servers.")
     (license license:expat)))
+
+(define-public tms
+  (package
+    (name "tms")
+    (version "0.1.2")
+    (source
+     (origin
+       (method hg-fetch)
+       (uri (hg-reference
+              (url "https://hg.sr.ht/~olly/tms")
+              (changeset (string-append "v" version))))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32 "1k8v8vx0klz3zfj81g9d1rancn819sv51lgs5j94x69kqzgn3fsw"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-backend #~'custom
+           #:test-flags #~(list "tests.py")))
+    (native-inputs (list python-setuptools))
+    (home-page "https://hg.sr.ht/~olly/tms")
+    (synopsis "Test Match Special for test assertions")
+    (description
+     "This package provides match data structures and types in test code.")
+    (license license:bsd-2)))

gnu/packages/python-compression.scm

@@ -188,9 +188,6 @@ to access its data, so it can be used as a drop-in replacement.")
 package, an implementation of the Brotli lossless compression algorithm.")
     (license license:expat)))
 
-(define-deprecated-package python-google-brotli
-  python-brotli)
-
 (define-public python-multivolumefile
   (package
     (name "python-multivolumefile")
@@ -795,9 +792,6 @@ for improving compression, as well as a python/C package that implements this
 algorithm within the Numpy framework.")
     (license license:expat)))
 
-(define-deprecated-package bitshuffle
-  python-bitshuffle)
-
 (define-public bitshuffle-for-snappy
   (package/inherit python-bitshuffle
     (name "bitshuffle-for-snappy")

gnu/packages/python-crypto.scm

@@ -810,15 +810,10 @@ ECB and OFB).")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1qsg06qrqnzixmrm65ibg503y2gffd675h1si4jgh92s315w1jrk"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (when tests?
-                        (invoke "python" "run.py" "tests")))))))
+        (base32 "1qsg06qrqnzixmrm65ibg503y2gffd675h1si4jgh92s315w1jrk"))))
+    (build-system pyproject-build-system)
+    (arguments (list #:test-backend #~'unittest))
+    (native-inputs (list python-setuptools))
     (home-page "https://github.com/wbond/asn1crypto")
     (synopsis "ASN.1 parser and serializer in Python")
     (description
@@ -873,16 +868,12 @@ of improving usability, security and speed.")
               (sha256
                (base32
                 "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                ;; As per the Unit Testing subsection in the README.
-                (invoke "python" "-m" "crcmod.test")))))))
+      #:test-backend #~'custom
+      #:test-flags #~(list "-m" "crcmod.test")))
+    (native-inputs (list python-setuptools))
     (synopsis "CRC generator for Python")
     (description "Python module for generating objects that compute the
 Cyclic Redundancy Check.")
@@ -892,33 +883,26 @@ Cyclic Redundancy Check.")
 (define-public python-blurhash
   (package
     (name "python-blurhash")
-    (version "1.1.4")
+    (version "1.1.5")
     (source
       (origin
-        ;; Tests not included in pypi release and releases not tagged in git repo.
         (method git-fetch)
         (uri (git-reference
                (url "https://github.com/halcy/blurhash-python")
-               (commit "22e081ef1c24da1bb5c5eaa2c1d6649724deaef8")))
+               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32
-          "1qq6mhydlp7q3na4kmaq3871h43wh3pyfyxr4b79bia73wjdylxf"))))
-    (build-system python-build-system)
+         (base32 "16xcjxiya773fp7bxs9i6y1wsjx88pdvlwj6bqyy9vf3ckcffcwm"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (delete-file "setup.cfg")
-             (invoke "pytest"))))))
+     (list #:test-flags #~(list "-c" "/dev/null")))
     (native-inputs
-     (list python-numpy python-pillow python-pytest))
+     (list python-numpy python-pillow python-pytest python-setuptools))
     (home-page "https://github.com/halcy/blurhash-python")
-    (synopsis
-     "Pure-Python implementation of the blurhash algorithm")
+    (synopsis "Pure-Python implementation of the blurhash algorithm")
     (description
-     "Pure-Python implementation of the blurhash algorithm.")
+     "This package provides a pure Python implementation of the blurhash
+algorithm.")
     (license license:expat)))
 
 (define-public python-ecpy
@@ -987,19 +971,42 @@ Python.")
 (define-public python-pycryptodome
   (package
     (name "python-pycryptodome")
-    (version "3.21.0")
+    (version "3.23.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pycryptodome" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Legrandin/pycryptodome")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "15vjyjy686kgm4fnpwlah1wvxxy0wvr4q5vnp1iygnlv8q6pwy7p"))
+        (base32 "0j1dk55y0q7gqmig1l5b8774w63w2i7qrii1xzkpzz0c3i229i67"))
        (modules '((guix build utils)))
        (snippet pycryptodome-unbundle-tomcrypt-snippet)))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; tests: 42912 passed
+      #:test-backend #~'custom
+      ;; As seen in
+      ;; <https://github.com/Legrandin/pycryptodome/blob/v3.23.0/INSTALL.rst>.
+      #:test-flags
+      #~(list "-m" "Crypto.SelfTest")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-gmp-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "lib/Crypto/Math/_IntegerGMP.py"
+                (("load_lib\\(\"gmp\"")
+                 (format #f "load_lib(~s"
+                         (search-input-file inputs "/lib/libgmp.so.10")))))))))
+    (native-inputs
+     (list python-pycryptodome-test-vectors
+           python-setuptools))
     (inputs
-     (list libtomcrypt libtommath))
+     (list gmp
+           libtomcrypt
+           libtommath))
     (home-page "https://www.pycryptodome.org")
     (synopsis "Low-level cryptographic Python library")
     (description
@@ -1040,18 +1047,44 @@ PyCryptodome variants, the other being python-pycryptodomex.")
     (license (list license:bsd-2
                    license:public-domain)))) ; code inherited from PyCrypto
 
-(define-public python-pycryptodomex
-  (package (inherit python-pycryptodome)
-    (name "python-pycryptodomex")
-    (version (package-version python-pycryptodome))
+(define-public python-pycryptodome-test-vectors
+  (package
+    (name "python-pycryptodome-test-vectors")
+    (version "1.0.22")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "pycryptodomex" version))
+       (uri (pypi-uri "pycryptodome_test_vectors" version))
        (sha256
-        (base32 "0v4y03ha7rm9kdcv9fkrmc94425z3q3mq1nn5p1jbpc1ag80nb92"))
-       (modules '((guix build utils)))
-       (snippet pycryptodome-unbundle-tomcrypt-snippet)))
+        (base32 "19bn19fpnkj39nki2dp8k26is5fpqa3q7agkhk9rvfqfvzvgx3nn"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f))        ;no tests
+    (native-inputs
+     (list python-setuptools)) 
+    (home-page "https://www.pycryptodome.org")
+    (synopsis "Test vectors for PyCryptodome")
+    (description
+     "This package provides test vectors for @code{PyCryptodome}.")
+    (license (list license:bsd-2
+                   license:asl2.0))))
+
+(define-public python-pycryptodomex
+  (package/inherit python-pycryptodome
+    (name "python-pycryptodomex")
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-pycryptodome)
+       ((#:test-flags _)
+        #~(list "-m" "Cryptodome.SelfTest"))
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-before 'build 'set-separate-namespace
+              (lambda _
+                ;; This changes the build logic, see setup.py.
+                (with-output-to-file ".separate_namespace"
+                  (lambda _ (display "")))))))))
+    (synopsis
+     "Low-level cryptographic Python library independent of the old PyCrypto")
     (description
      "PyCryptodome is a self-contained Python package of low-level
 cryptographic primitives.  It's not a wrapper to a separate C library like
@@ -1119,41 +1152,28 @@ through the Engine interface.")
 (define-public python-pykeepass
   (package
     (name "python-pykeepass")
-    (version "3.2.1")
+    (version "4.1.1.post1")
     (source
      (origin
        (method git-fetch)
-       ;; Source tarball on PyPI doesn't include tests.
        (uri (git-reference
-             (url "https://github.com/libkeepass/pykeepass")
-             (commit version)))
+              (url "https://github.com/libkeepass/pykeepass")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1symxf4ahylynihnp9z4z3lh2vy65ipvg8s4hjrnn936hcaaxghk"))))
-    (build-system python-build-system)
+        (base32 "1ayvgklq3naydx01m7hyvf44ywczk5yzy2pk48bpfayl7bgk7q8d"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-kdbx-writable
-           ;; Tests have to write to the .kdbx files in the test directory.
-           (lambda _
-             (with-directory-excursion "tests"
-               (for-each make-file-writable (find-files "."))
-               #t)))
-         (add-before 'build 'patch-requirements
-           (lambda _
-             ;; Update requirements from dependency==version
-             ;; to dependency>=version.
-             (substitute* "setup.py"
-               (("==") ">="))
-             #t)))))
+     ;; tests: 115 passed
+     (list #:test-backend #~'unittest))
+    (native-inputs
+     (list python-setuptools))
     (propagated-inputs
      (list python-argon2-cffi
            python-construct
-           python-dateutil
-           python-future
            python-lxml
-           python-pycryptodomex))
+           python-pycryptodomex
+           python-pyotp))
     (home-page "https://github.com/libkeepass/pykeepass")
     (synopsis "Python library to interact with keepass databases")
     (description
@@ -1421,20 +1441,20 @@ Password-Authenticated Key Exchange algorithm.")
        (method url-fetch)
        (uri (pypi-uri "keyutils" version))
        (sha256
-        (base32
-         "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9"))))
-    (build-system python-build-system)
+        (base32 "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'regenerate-c-file
+            (lambda _
+              (invoke "cython" "keyutils/_keyutils.pyx"))))))
     (native-inputs
-     (list python-cython python-pytest python-pytest-runner))
+     (list python-cython python-pytest python-setuptools))
     (inputs
      (list keyutils))
-    (arguments
-     (list #:tests? #f
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'build 'regenerate-c-file
-                 (lambda _
-                   (invoke "cython" "keyutils/_keyutils.pyx"))))))
     (home-page "https://github.com/sassoftware/python-keyutils")
     (synopsis "Python bindings for keyutils")
     (description
@@ -1689,19 +1709,10 @@ implementation of the Argon2 password hashing algorithm.")
                (commit "2838db3df239797c71bddacc48a4c49a83f35747")))
         (file-name (git-file-name name version))
         (sha256
-         (base32
-          "1m32dh5fqc8cy7jyf1z5fs6zvmdkbq5fi98hr609gbl7s0l0y0i9"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "python" "-m" "pytest"))))))
-    (native-inputs
-     (list python-pytest))
-    (propagated-inputs
-     (list python-argon2-cffi python-cryptography))
+         (base32 "1m32dh5fqc8cy7jyf1z5fs6zvmdkbq5fi98hr609gbl7s0l0y0i9"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
+    (propagated-inputs (list python-argon2-cffi python-cryptography))
     (home-page "https://www.dropbox.com/developers")
     (synopsis "Library to password-protect your data")
     (description
@@ -1745,12 +1756,19 @@ can also encrypt and decrypt messages using RSA and ECDH.")
     (version "0.1.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pyu2f" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/pyu2f/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0srhzdbgdsqwpcw7awqm19yg3xbabqckfvrp8rbpvz2232hs7jm3"))))
-    (build-system python-build-system)
-    (arguments '(#:tests? #f))          ;none included
+        (base32 "1jlpplw7hlrh8bgmp37g18panij0p7ism6r4d981my4dc73lbwik"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; This test requires the fakefs package.
+      #:test-flags #~(list "--ignore=pyu2f/tests/hid/linux_test.py")))
+    (native-inputs (list python-mock python-pytest python-setuptools))
     (propagated-inputs (list python-six))
     (home-page "https://github.com/google/pyu2f/")
     (synopsis "U2F host library for interacting with a U2F device over USB")
@@ -1794,24 +1812,27 @@ supply a handful of python functions as methods to a class.")
 (define-public python-starkbank-ecdsa
   (package
     (name "python-starkbank-ecdsa")
-    (version "2.0.3")
+    (version "2.2.0")
     (home-page "https://github.com/starkbank/ecdsa-python")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1k9h4p0frkgj76vrqfjim4mik98g09mivdxxcmxr6raa5jwr83sh"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "01zy16csrbyfhjl0kay9rbpbwc3dpr7kh2qkrbdy5a1n644fbahx"))))
     (arguments
-     (list #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'remove-broken-test
-                          (lambda _
-                            (delete-file "tests/testOpenSSL.py"))))))
-    (build-system python-build-system)
-    (native-inputs (list python-pytest))
+     (list
+      #:test-backend #~'unittest
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-broken-test
+            (lambda _
+              (delete-file "tests/testOpenSSL.py"))))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools))
     (synopsis "Python ECDSA library")
     (description "This package provides a Python ECDSA library, optimized for
 speed but without C extensions.")

gnu/packages/python-science.scm

@@ -3942,16 +3942,45 @@ library.")
 (define-public python-tspex
   (package
     (name "python-tspex")
-    (version "0.6.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "tspex" version))
-              (sha256
-               (base32
-                "0x64ki1nzhms2nb8xpng92bzh5chs850dvapr93pkg05rk22m6mv"))))
-    (build-system python-build-system)
+    ;; 0.6.3 is not tagged; must be this one, as it is the latest, from the
+    ;; day of the release, and the commit message is "Bump to 0.6.3".
+    (properties '((commit . "d393ff497b7c14d673e792bd6c84ddd734be1239")
+                  (revision . "0")))
+    (version (git-version "0.6.3"
+                          (assoc-ref properties 'revision)
+                          (assoc-ref properties 'commit)))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/apcamargo/tspex")
+              (commit (assoc-ref properties 'commit))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0khhnahhn0jp9y14q6wgq0xqadqszwn1iq3y562bhfmv09f4j1ik"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-coverage
+            (lambda _
+              (substitute* "pytest.ini"
+                (("--cov.*") ""))))
+          ;; The seaborn styles have different names.
+          (add-after 'unpack 'fix-seaborn
+            (lambda _
+              (substitute* (find-files "." ".py$")
+                (("seaborn-") "seaborn-v0_8-")))))))
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
     (propagated-inputs
-     (list python-matplotlib python-numpy python-pandas python-xlrd))
+     (list python-matplotlib
+           python-numpy
+           python-pandas
+           python-seaborn
+           python-xlrd))
     (home-page "https://apcamargo.github.io/tspex/")
     (synopsis "Calculate tissue-specificity metrics for gene expression")
     (description
@@ -5068,6 +5097,7 @@ objects.")
     (build-system pyproject-build-system)
     (arguments
      (list
+      ;; tests: 1437 passed, 111 skipped, 11 deselected, 8 xfailed, 154 warnings
       #:test-flags
       ;; XXX: Full test suite takes about 20-30min to complete in single
       ;; thread, attempt to run tests in parallel with pytest-xdist fails even
@@ -5091,6 +5121,9 @@ objects.")
               "--ignore" "tests/link/numba/test_basic.py"
               "--ignore" "tests/link/numba/test_blockwise.py"
               "--ignore" "tests/link/numba/test_elemwise.py"
+              ;; XXX: Tests fail with AssertionError.
+              "--ignore" "tests/graph/rewriting/"
+              "--deselect" "tests/graph/test_destroyhandler.py::test_misc"
               "-k" (string-join
                     ;; Skip benchmark tests.
                     (list "not test_elemwise_speed"
@@ -5102,11 +5135,7 @@ objects.")
                           ;; Assertion fails in tests.
                           "test_choose_signature"
                           "test_fgraph_to_python_names")
-                    " and not ")
-              ;; Tests collection selects pytensor, which does not contain
-              ;; tests and fails to pass; manually provide a test directory
-              ;; instead.
-              "tests")
+                    " and not "))
       #:phases
       #~(modify-phases %standard-phases
           ;; Replace version manually because pytensor uses
@@ -5121,23 +5150,24 @@ objects.")
             (lambda _
               ;; It is required for most tests.
               (setenv "HOME" "/tmp")
-              ;; Cython extensions have to be built before running the tests.
-              (invoke "python" "setup.py" "build_ext" "--inplace"))))))
+              ;; This would otherwise interfere with finding the installed
+              ;; pytensor when running tests.
+              (delete-file-recursively "pytensor"))))))
     (native-inputs (list python-cython
                          python-pytest
                          python-pytest-mock
                          python-versioneer
-                         python-setuptools
-                         python-wheel))
+                         python-setuptools))
     (propagated-inputs (list python-cons
                              python-etuples
                              python-filelock
                              python-logical-unification
                              python-minikanren
-                             python-numba
                              python-numpy
                              python-scipy
-                             python-typing-extensions))
+                             ;; [optinal]
+                             ;; python-jax
+                             python-numba))
     (home-page "https://pytensor.readthedocs.io/en/latest/")
     (synopsis
      "Library for mathematical expressions in multi-dimensional arrays")
@@ -5716,7 +5746,11 @@ quite useful when you desire to update your plot in real-time.")
        (uri (pypi-uri "SimpleSpectral" version))
        (sha256
         (base32 "0qh3xwdv9cwcqdamvglrhm586p4yaq1hd291py1fvykhk2a2d4w6"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f))                ;No tests, also not in git repository.
+    (native-inputs
+     (list python-setuptools))
     (propagated-inputs
      (list python-numpy python-scipy))
     (home-page "https://github.com/xmikos/simplespectral")
@@ -5921,27 +5955,33 @@ numerical computation.")
 (define-public python-pylems
   (package
     (name "python-pylems")
-    (version "0.6.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "PyLEMS" version))
-              (sha256
-               (base32
-                "074azbyivjbwi61fs5p8z9n6d8nk8xw6fmln1www13z1dccb3740"))))
-    (build-system python-build-system)
-    (propagated-inputs (list python-lxml))
+    (version "0.6.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/LEMS/pylems")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0gimdx89cdla1b6zzkdrmj979nn2zy2475qvpwxxas0iv27ql0vj"))))
+    (build-system pyproject-build-system)
+    (arguments
+     ;; Disable tests that require networking
+     (list #:test-flags #~(list "./lems/test" "-k" "not test_load_write_xml")))
+    (native-inputs (list python-setuptools python-pytest))
+    (propagated-inputs (list python-lxml python-matplotlib))
     (home-page "https://github.com/LEMS/pylems")
     (synopsis
      "Python support for the Low Entropy Model Specification language (LEMS)")
-    (description
-     "A LEMS simulator written in Python which can be used to run
-NeuroML2 models.")
+    (description "A @acronym{LEMS, Low Entropy Model Specification} simulator
+written in Python which can be used to run NeuroML2 models.")
     (license license:lgpl3)))
 
 (define-public python-pynrrd
   (package
     (name "python-pynrrd")
-    (version "1.0.0")
+    (version "1.1.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5950,10 +5990,12 @@ NeuroML2 models.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "09gdyi4kbi3512ydgqxkgr4j7b9a95qh83fk2n9s41bns4id9xj7"))))
-    (build-system python-build-system)
+                "1l0hjbqzf5i1bmpxpblpyyqkhci3mb5n07x6hqf2a91hggfyrvda"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest python-setuptools))
     (propagated-inputs
-     (list python-nptyping python-numpy python-typing-extensions))
+     (list python-numpy))
     (home-page "https://github.com/mhe/pynrrd")
     (synopsis "Python module for reading and writing NRRD files")
     (description

gnu/packages/python-web.scm

@@ -86,6 +86,7 @@
 ;;; Copyright © 2025 Hugo Buddelmeijer <hugo@buddelmeijer.nl>
 ;;; Copyright © 2025 Artur Wroblewski <wrobell@riseup.net>
 ;;; Copyright © 2025 Allan Adair <allan@adair.no>
+;;; Copyright © 2025 Aaron Covrig <aaron.covrig.us@ieee.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -309,6 +310,32 @@ broad range of notification services, such as Telegram, Discord, Slack, Amazon
 SNS, Gotify, etc.")
     (license license:bsd-2)))
 
+(define-public python-behave-web-api
+  (package
+    (name "python-behave-web-api")
+    (version "2.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/jefersondaniel/behave-web-api")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1r8yx8gb5m599cpdqfvk6z9ax3qj26fpvczdr84z8jya0dxfch4p"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
+    (propagated-inputs
+     (list behave
+           python-requests))
+    (home-page "https://github.com/jefersondaniel/behave-web-api")
+    (synopsis "Provides testing for JSON APIs with Behave for Python")
+    (description "This package provides testing utility modules for testing
+JSON APIs with Behave.")
+    (license license:expat)))
+
 (define-public python-blacksheep
   (package
     (name "python-blacksheep")
@@ -8330,16 +8357,17 @@ authentication for Flask routes.")
 (define-public python-uritemplate
   (package
     (name "python-uritemplate")
-    (version "4.1.1")
+    (version "4.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "uritemplate" version))
        (sha256
         (base32
-         "1w14a775d92mx9pdhb5zimifpfr2lfcn0vfdpjagcy9vbkyfsij3"))))
-    (build-system python-build-system)
-    (home-page "https://uritemplate.readthedocs.org")
+         "03lxxkk0kjn6z7z1f9hqvsaqfrny1qds7vi36f35b2c7h38jw328"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
+    (home-page "https://uritemplate.readthedocs.io/")
     (synopsis "Library to deal with URI Templates")
     (description "@code{uritemplate} provides Python library to deal with URI
 Templates.")
@@ -10676,6 +10704,39 @@ Swagger.")
      "Manuel lets you mix and match traditional doctests with custom test syntax.")
     (license license:asl2.0)))
 
+(define-public python-marshmallow-jsonapi
+  (package
+    (name "python-marshmallow-jsonapi")
+    (version "0.26.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              ;; XXX: Deprecated upstream: This repository has been archived
+              ;; by the owner on Jun 6, 2024. It is now read-only.
+              ;; Using a maintained fork. The pypi name of this fork
+              ;; is marshmallow-jsonapi-minfork.
+             (url "https://github.com/tadams42/marshmallow-jsonapi")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "07sizh4m03rrk1139ci3psh5npk42cdsdfsdp574pz1fd5ncrq91"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-faker
+           python-flask
+           python-pytest
+           python-setuptools))
+    (propagated-inputs (list python-marshmallow))
+    (home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
+    (synopsis "JSON:API 1.0 formatting with Marshmallow")
+    (description
+     "The marshmallow-jsonapi package provides a simple way to produce
+@uref{https://jsonapi.org, JSON:API}-compliant data in any Python Web
+framework.  It includes optional utilities to integrate with Flask.  This is a
+forked version whose pypi name is @code{marshmallow_jsonapi_minfork}.")
+    (license license:expat)))
+
 (define-public python-pecan
   (package
     (name "python-pecan")
@@ -12131,60 +12192,80 @@ provides well-defined APIs to talk to websites lacking one.")
     (license license:lgpl3+)))
 
 (define-public python-flask-combo-jsonapi
-  (package
-    (name "python-flask-combo-jsonapi")
-    (version "1.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/AdCombo/flask-combo-jsonapi")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "07fhcjiyif80z1vyh35za29sqx1mmqh568jrbrrs675j4a797sj1"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'loosen-requirements
-           (lambda _
-             ;; Don't pin specific versions of dependencies.
-             (substitute* "requirements.txt"
-               (("^sqlalchemy[=<>].*") "sqlalchemy\n")
-               (("^marshmallow[=<>].*") "marshmallow\n")
-               (("^Flask[=<>].*") "Flask\n"))))
-         (replace 'check
-           (lambda _
-             (invoke "pytest" "-vv" "-k"
-                     ;; The following test fails for unknown reasons (see:
-                     ;; https://github.com/AdCombo/flask-combo-jsonapi/issues/66).
-                     "not test_get_list_with_simple_filter_\
-relationship_custom_qs_api"))))))
-    (propagated-inputs
-     (list python-flask
-           python-marshmallow
-           python-marshmallow-jsonapi
-           python-simplejson
-           python-sqlalchemy
-           python-apispec
-           python-simplejson
-           python-six))
-    (native-inputs
-     (list python-coverage
-           python-coveralls
-           python-pytest
-           python-pytest-runner))
-    (home-page "https://github.com/AdCombo/flask-combo-jsonapi")
-    (synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
-    (description
-     "Flask-COMBO-JSONAPI is a Python Flask extension for building REST Web APIs
-compliant with the @uref{https://jsonapi.org, JSON:API 1.0} specification.
+  (let ((commit "3cfff98ecdbadc45d25a3fd443ad67d3743be6f5")
+        (revision "0"))
+    (package
+      (name "python-flask-combo-jsonapi")
+      (version (git-version "1.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/AdCombo/flask-combo-jsonapi")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1lp81v96qh9hdj3c95kvfaq0vy5vd8cm55j03aszc93bs8z5jg7h"))))
+      (build-system pyproject-build-system)
+      (arguments
+       (list
+        #:test-flags
+        #~(list
+           "-k"
+           (string-join
+            (list
+             ;; XXX: This tests a feature that doesn't make sense when dropping
+             ;; marshmallow < 3 support.
+             "not test_compute_schema_propagate_context"
+             ;; The following tests fail for unknown reasons (see:
+             ;; https://github.com/AdCombo/flask-combo-jsonapi/issues/66).
+             "test_get_list_with_simple_filter_relationship_custom_qs_api"
+             "test_get_list_with_simple_filter_relationship_error")
+            " and not "))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'loosen-requirements
+              (lambda _
+                ;; Don't pin specific versions of dependencies.
+                (substitute* "requirements.txt"
+                  (("^(sqlalchemy|marshmallow|Flask)[=<>].*" _ dep)
+                   (string-append dep "\n"))
+                  (("^marshmallow_jsonapi[=<>].*")
+                   "marshmallow_jsonapi_minfork\n"))
+                ;; Drop support for marshmallow < 3.
+                (substitute* (list "flask_combo_jsonapi/data_layers/alchemy.py"
+                                   "flask_combo_jsonapi/schema.py")
+                  (("from marshmallow\\.base import SchemaABC")
+                   "from marshmallow import Schema")
+                  (("if isinstance\\(related_schema_cls, SchemaABC\\):")
+                   "if isinstance(related_schema_cls, Schema):"))
+                (substitute* "tests/test_sqlalchemy_data_layer.py"
+                  (("default=None")
+                   "dump_default=None")
+                  (("missing=")
+                   "load_default=")))))))
+      (propagated-inputs
+       (list python-flask
+             python-marshmallow
+             python-marshmallow-jsonapi
+             python-simplejson
+             python-sqlalchemy
+             python-apispec
+             python-simplejson
+             python-six))
+      (native-inputs
+       (list python-pytest python-setuptools))
+      (home-page "https://github.com/AdCombo/flask-combo-jsonapi")
+      (synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
+      (description
+       "Flask-COMBO-JSONAPI is a Python Flask extension for building REST Web
+APIs compliant with the @uref{https://jsonapi.org, JSON:API 1.0}
+specification.
 
 It tries to combine the power of Flask-Restless with the flexibility of
 Flask-RESTful to quickly build APIs that fit the complexity of existing
 real-life projects with legacy data and diverse storage providers.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public python-mwparserfromhell
   (package
@@ -12485,23 +12566,29 @@ mining to monitoring and automated testing.")
     (license license:bsd-3)))
 
 (define-public python-jstyleson
-  (package
+  (let ((commit "8c47cc9e665b3b1744cccfaa7a650de5f3c575dd")
+        (revision "0"))
+    (package
     (name "python-jstyleson")
-    (version "0.0.2")
+    (version (git-version "0.0.2" revision commit))
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "jstyleson" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/linjackson78/jstyleson")
+              (commit commit)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "13ihw6jqwkg3ai4xb83kw39pvh73b2wg6ld3wvj5jaasn7rh6038"))))
-    (build-system python-build-system)
-    (arguments (list #:tests? #f))      ;no tests in pypi release
+        (base32 "0r72mq7h294w5icpdbjd202w25kwr1dz7nh79f6m74xisc9cixia"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-setuptools))
     (home-page "https://github.com/linjackson78/jstyleson")
     (synopsis "JSON parser supporting js-style comments")
-    (description "@code{jstyleson} is a Python library to parse JSON.
-Contrary to the standard Python @code{json} library, it understands js-style
-comments.  Trailing comma is also supported.")
-    (license license:expat)))
+    (description
+     "@code{jstyleson} is a Python library to parse JSON.  Contrary to the
+standard Python @code{json} library, it understands js-style comments.
+Trailing comma is also supported.")
+    (license license:expat))))
 
 (define-public python-html-text
   (package
@@ -12722,28 +12809,29 @@ possible, supporting most common functionality.")
   (package
     (name "python-http-client")
     (version "3.3.7")
-    (home-page "https://github.com/sendgrid/python-http-client")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0z0ziw3f4zw5fj4spiwhhs2x8qs3i5999ry2p6a5sc8b1lkkj2zi"))
-              (snippet #~(begin
-                           (use-modules (guix build utils))
-                           (delete-file "tests/profile.py")))))
-    (build-system python-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/sendgrid/python-http-client")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0z0ziw3f4zw5fj4spiwhhs2x8qs3i5999ry2p6a5sc8b1lkkj2zi"))))
+    (build-system pyproject-build-system)
     (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-tests
-                 (lambda _
-                   ;; The test expects the copyright to be updated each year.
-                   (substitute* "tests/test_daterange.py"
-                     (("time\\.strftime\\(\"%Y\"\\)") "2022")))))))
+     (list
+      #:test-backend #~'unittest
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              ;; The test expects the copyright to be updated each year.
+              (substitute* "tests/test_daterange.py"
+                (("time\\.strftime\\(\"%Y\"\\)") "2022")))))))
+    (native-inputs
+     (list python-setuptools))
+    (home-page "https://github.com/sendgrid/python-http-client")
     (synopsis "HTTP REST client for Python")
     (description
      "This package provides access to any RESTful or RESTful-like API.")
@@ -12753,20 +12841,34 @@ possible, supporting most common functionality.")
   (package
     (name "python-sendgrid")
     (version "6.9.7")
-    (home-page "https://github.com/sendgrid/sendgrid-python/")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0kvp4gm3bpcsj2mkv05pgvlcv1jlsfhcljcv61wz5kq9d273h7rg"))))
-    (build-system python-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/sendgrid/sendgrid-python")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kvp4gm3bpcsj2mkv05pgvlcv1jlsfhcljcv61wz5kq9d273h7rg"))))
+    (build-system pyproject-build-system)
     (arguments
-     (list #:tests? #f))       ;241/340 tests fail due to attempted web access
-    (propagated-inputs (list python-http-client python-starkbank-ecdsa))
+     (list
+      #:test-flags
+      #~(list "--ignore=test/integ"
+              ;; Network access is required.
+              "--ignore=live_test.py")))
+    (native-inputs
+     (list python-pytest
+           python-setuptools))
+    (propagated-inputs
+     (list python-cryptography
+           python-http-client
+           python-flask
+           python-pyyaml
+           python-six                            ;hard dependency
+           python-starkbank-ecdsa
+           python-werkzeug))
+    (home-page "https://github.com/sendgrid/sendgrid-python/")
     (synopsis "SendGrid API library for Python")
     (description
      "The @code{sendgrid} Python library allows access to the
@@ -13248,7 +13350,7 @@ tool for generating Github-style badges as SVG images.")
 (define-public python-grid5000
   (package
     (name "python-grid5000")
-    (version "1.2.3")
+    (version "1.2.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -13256,12 +13358,12 @@ tool for generating Github-style badges as SVG images.")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               "097pm8b68ihk29xz9zv29b1x0bhgjb4lfj8zxk2grbsh7wr9dipg")))
-    (build-system python-build-system)
-    (native-inputs (list python-wheel))
-    (propagated-inputs (list python-requests python-ipython python-pyyaml))
+               "0px5dr6kn7i5dyy4g42vqap1zpkc4hdvg7prrxdkkl57lfhz5w61")))
+    (build-system pyproject-build-system)
     (arguments
      (list #:tests? #f)) ; No tests.
+    (native-inputs (list python-setuptools))
+    (propagated-inputs (list python-requests python-ipython python-pyyaml))
     (home-page "https://pypi.org/project/python-grid5000/")
     (synopsis "Grid5000 python client")
     (description

gnu/packages/python-xyz.scm

@@ -8193,22 +8193,40 @@ something else) to Python data-types.")
 (define-public python-kitchen
   (package
     (name "python-kitchen")
-    (version "1.2.5")
+    (version "1.2.6")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "kitchen" version))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/fedora-infra/kitchen")
+              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1zakh6l0yjvwic9p0nkvmbidpnkygkxbigh2skmb5gccyrhbp7xg"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-chardet))
+        (base32 "1wf2m4yx5467vxg4scgzihb0q9q3k7fasgxanhrnxpp1a5l8l93n"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list "kitchen3"
+              ;; XXX: Unclear why these tests fail.
+              "-e" "test_invalid_fallback_no_raise"
+              "-e" "test_internal_generate_combining_table"
+              "-e" "test_lgettext"
+              "-e" "test_lngettext"
+              "-e" "test_easy_gettext_setup_non_unicode")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'delete-broken-test-files
+            (lambda _
+              (delete-file "kitchen3/tests/test__all__.py")
+              (delete-file "kitchen3/tests/test_deprecation_py3.py"))))))
+    (native-inputs (list python-pynose python-setuptools))
     (home-page "https://github.com/fedora-infra/kitchen")
     (synopsis "Python API for snippets")
-    (description "@code{kitchen} module provides a python API for all sorts of
-little useful snippets of code that everybody ends up writing for their projects
-but never seem big enough to build an independent release.  Use kitchen and stop
+    (description
+     "@code{kitchen} module provides a python API for all sorts of little
+useful snippets of code that everybody ends up writing for their projects but
+never seem big enough to build an independent release.  Use kitchen and stop
 cutting and pasting that code over and over.")
     (license (list license:lgpl2.1+
                    ;; subprocess.py, test_subprocess.py,
@@ -20614,6 +20632,16 @@ Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
     (license license:bsd-3)))
 
+;; A bare minimal package, mainly to use in tests and reduce closure
+;; size. Tests are left out in the main package to slim down native-inputs.
+(define-public python-celery-minimal
+   (package/inherit python-celery
+     (name "python-celery-minimal")
+     (arguments
+      (list #:tests? #f))
+     (native-inputs
+      (list python-setuptools))))
+
 (define-public python-anyqt
   (package
     (name "python-anyqt")
@@ -25473,36 +25501,6 @@ to and from native Python datatypes.")
      (list python-packaging))))
 
 
-;; XXX: Deprecated upstream: This repository has been archived by the owner on
-;; Jun 6, 2024. It is now read-only.
-;; Consider to remove when nothing is depend on it.
-(define-public python-marshmallow-jsonapi
-  (package
-    (name "python-marshmallow-jsonapi")
-    (version "0.24.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "marshmallow-jsonapi" version))
-       (sha256
-        (base32 "1d9pxcgmln4gls99vwj1h24qv0lz7fb2jqmqrsiv1pid1snc125x"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-faker
-           python-flask
-           python-pytest
-           python-setuptools
-           python-wheel))
-    (propagated-inputs
-     (list python-marshmallow))
-    (home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
-    (synopsis "JSON:API 1.0 formatting with Marshmallow")
-    (description
-     "The marshmallow-jsonapi package provides a simple way to produce
-@uref{https://jsonapi.org, JSON:API}-compliant data in any Python Web
-framework.  It includes optional utilities to integrate with Flask.")
-    (license license:expat)))
-
 (define-public python-apispec
   (package
     (name "python-apispec")
@@ -32634,28 +32632,24 @@ and BMI2).")
 (define-public python-cart
   (package
     (name "python-cart")
-    (version "1.2.2")
+    (version "1.2.3")
     (source
      (origin
-       ;; No source releases available on pypi, hence fetching from GitHub.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/CybercentreCanada/cart")
-             (commit (string-append "v" version))))
+              (url "https://github.com/CybercentreCanada/cart")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zycv620iljrsval5rai1wsn0hr25ddx9xhjsyy6xxrgprfxvlfi"))))
+        (base32 "1064swqylim0nx0msynkqbz6n57n5yy4mmqxl7wd9bsg5mmrxrd1"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:phases
-      '(modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "python" "-m" "unittest" "discover")))))))
-    (propagated-inputs (list python-pycryptodome))
-    (native-inputs (list python-setuptools python-wheel))
+      #:test-backend #~'unittest))
+    (native-inputs
+     (list python-setuptools))
+    (propagated-inputs
+     (list python-pycryptodome))
     (home-page "https://github.com/CybercentreCanada/cart")
     (synopsis "Library for interacting with the CaRT file format")
     (description
@@ -40069,6 +40063,30 @@ and highlight matching sections.")
 add the log levels NOTICE, SPAM, SUCCESS and VERBOSE.")
     (license license:expat)))
 
+(define-public python-verlib2
+  (package
+    (name "python-verlib2")
+    (version "0.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pyveci/verlib2")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xp0qfzy4l4fs1rn1670fbf7d7xv1p2s3rplspx8xqszjd5j0n8c"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-importlib-metadata))
+    (native-inputs
+     (list python-pretend python-pytest python-pytest-cov python-setuptools))
+    (home-page "https://github.com/pyveci/verlib2")
+    (synopsis "Python versioning utilities")
+    (description
+     "This package provides a standalone variant of @code{distutils.version} and
+@code{packaging.version}, without anything else.")
+    (license license:bsd-2)))
+
 ;; XXX: No updates since 2018, consider to remove when fails to build, it's a
 ;; leaf package.
 (define-public python-version

gnu/packages/qt.scm

@@ -6071,6 +6071,35 @@ of the InventorXt GUI component toolkit.")
 various hypr* apps.")
     (license license:bsd-3)))
 
+(define-public hyprland-qt-support
+  (package
+    (name "hyprland-qt-support")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hyprwm/hyprland-qt-support")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rxdj8l985bvsg3gca79jb4rf0dy066x5cmxsyyavlcp7yz6irps"))))
+    (build-system qt-build-system)
+    (arguments
+     (list
+      #:tests? #f ;There are no tests.
+      #:qtbase qtbase
+      #:configure-flags
+      #~(list "-DINSTALL_QML_PREFIX=lib/qt6/qml")))
+    (native-inputs (list pkg-config))
+    (inputs (list qtbase qtdeclarative hyprlang))
+    (home-page "https://github.com/hyprwm/hyprland-qt-support")
+    (synopsis "QML style provider for Hyprland applications")
+    (description
+     "This package provides a QML style that can be used by setting the
+@code{QT_QUICK_CONTROLS_STYLE} variable to the string
+@code{org.hyprland.style} (or passing it to @code{QQuickStyle::setStyle}).")
+    (license license:bsd-3)))
 
 (define-public libdbusmenu-qt
   (package

gnu/packages/robotics.scm

@@ -22,6 +22,7 @@
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
+  #:use-module (guix gexp)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages base)
   #:use-module (gnu packages cpp)
@@ -72,3 +73,34 @@ hundred times faster than real-time.")
       ;; citation, but that sentence is written as not being part of the
       ;; license (fortunately).
       (license license:gpl2+))))
+
+(define-public fusion
+  (package
+    (name "fusion")
+    (version "1.2.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/xioTechnologies/Fusion")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k5p9fc3zg49c9l8cfm08sgnzwkbz2brv7yfwsly2yfipl38w6xx"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:tests? #f
+      #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'install
+            (lambda _ (install-file "Fusion/libFusion.so"
+                                    (string-append #$output "/lib")))))))
+    (home-page "https://github.com/xioTechnologies/Fusion")
+    (synopsis "Sensor fusion library for embedded systems")
+    (description "Fusion is a sensor fusion library implementing the Attitude
+and Heading Reference System (AHRS) algorithm, which combines available
+gyroscope, accelerometer, and magnetometer data into a single measurement of
+orientation relative to the Earth.")
+    (license license:expat)))

gnu/packages/rpc.scm

@@ -38,6 +38,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages flex)
@@ -145,14 +146,19 @@ browsers to backend services.")
 (define-public python-grpc-stubs
   (package
     (name "python-grpc-stubs")
-    (version "1.24.11")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "grpc-stubs" version))
-              (sha256
-               (base32
-                "19dkm365g38lvxm799d29dnzg60g8in8251c18qkvsv4n92h8axh"))))
-    (build-system python-build-system)
+    (version "1.53.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shabbyrobe/grpc-stubs")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k2h787dk411sprdmx71kpwjpghmgfv0jyl84irl6s5szmqhy2y3"))))
+    (build-system pyproject-build-system)
+    (arguments (list #:tests? #f)) ;No tests.
+    (native-inputs (list python-setuptools))
     (propagated-inputs (list python-grpcio python-typing-extensions))
     (home-page "https://github.com/shabbyrobe/grpc-stubs")
     (synopsis "Typing stubs for Python")

gnu/packages/ruby-xyz.scm

@@ -854,15 +854,19 @@ But the true aim of Serverspec is to help refactoring infrastructure code.")
 (define-public ruby-base64
   (package
     (name "ruby-base64")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (rubygems-uri "base64" version))
+       (method git-fetch) ; The gem lacks the test files.
+       (uri (git-reference
+              (url "https://github.com/ruby/base64")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"))))
+        (base32
+         "08n9hnbqf8hsci22zgq7ha3jxnxmw0plydc3l9zahvfawm6jplnx"))))
     (build-system ruby-build-system)
-    (arguments '(#:tests? #f))  ; No tests bundled.
+    (native-inputs (list ruby-rake ruby-test-unit))
     (synopsis "Base64 encoding/decoding in Ruby")
     (description
      "This package provides support for encoding and decoding binary data

gnu/packages/rust-crates.scm

@@ -382,6 +382,10 @@
   (crate-source "anstream" "0.6.14"
                 "0nx1vnfs2lil1sl14l49i6jvp6zpjczn85wxx4xw1ycafvx7b321"))
 
+(define rust-anstream-0.6.15
+  (crate-source "anstream" "0.6.15"
+                "09nm4qj34kiwgzczdvj14x7hgsb235g4sqsay3xsz7zqn4d5rqb4"))
+
 (define rust-anstream-0.6.18
   (crate-source "anstream" "0.6.18"
                 "16sjk4x3ns2c3ya1x28a44kh6p47c7vhk27251i015hik1lm7k4a"))
@@ -430,6 +434,10 @@
   (crate-source "anstyle-parse" "0.2.4"
                 "1m121pa4plpcb4g7xali2kv9njmgb3713q3fxf60b4jd0fli2fn0"))
 
+(define rust-anstyle-parse-0.2.5
+  (crate-source "anstyle-parse" "0.2.5"
+                "1jy12rvgbldflnb2x7mcww9dcffw1mx22nyv6p3n7d62h0gdwizb"))
+
 (define rust-anstyle-parse-0.2.6
   (crate-source "anstyle-parse" "0.2.6"
                 "1acqayy22fwzsrvr6n0lz6a4zvjjcvgr5sm941m7m0b2fr81cb9v"))
@@ -446,6 +454,10 @@
   (crate-source "anstyle-query" "1.0.3"
                 "1x9pyl231rry5g45dvkdb2sfnl2dx2f4qd9a5v3ml8kr9ryr0k56"))
 
+(define rust-anstyle-query-1.1.1
+  (crate-source "anstyle-query" "1.1.1"
+                "0aj22iy4pzk6mz745sfrm1ym14r0y892jhcrbs8nkj7nqx9gqdkd"))
+
 (define rust-anstyle-query-1.1.2
   (crate-source "anstyle-query" "1.1.2"
                 "036nm3lkyk43xbps1yql3583fp4hg3b1600is7mcyxs1gzrpm53r"))
@@ -482,6 +494,10 @@
   (crate-source "anstyle-wincon" "3.0.3"
                 "06gv2vbj4hvwb8fxqjmvabp5kx2w01cjgh86pd98y1mpzr4q98v1"))
 
+(define rust-anstyle-wincon-3.0.4
+  (crate-source "anstyle-wincon" "3.0.4"
+                "1y2pkvsrdxbcwircahb4wimans2pzmwwxad7ikdhj5lpdqdlxxsv"))
+
 (define rust-anstyle-wincon-3.0.7
   (crate-source "anstyle-wincon" "3.0.7"
                 "0kmf0fq4c8yribdpdpylzz1zccpy84hizmcsac3wrac1f7kk8dfa"))
@@ -1018,6 +1034,10 @@
   (crate-source "async-task" "4.7.1"
                 "1pp3avr4ri2nbh7s6y9ws0397nkx1zymmcr14sq761ljarh3axcb"))
 
+(define rust-async-trait-0.1.81
+  (crate-source "async-trait" "0.1.81"
+                "01w10ad3984czxrmc8ckdrabhmsv80aynfxibjnqwz1dr3f2h33f"))
+
 (define rust-async-trait-0.1.88
   (crate-source "async-trait" "0.1.88"
                 "1dgxvz7g75cmz6vqqz0mri4xazc6a8xfj1db6r9fxz29lzyd6fg5"))
@@ -1218,6 +1238,15 @@
   (crate-source "aws-lc-rs" "1.14.0"
                 "11i7l7pddlw808xidvm5fb0qi2qnc2lclh9nlmnv2myd15ngzf4l"))
 
+(define rust-aws-lc-rs-1.8.1
+  (crate-source "aws-lc-rs" "1.8.1"
+                "0xxdyn1zcc4jiy0n3bfn56486djbsfd76w0pzn50wlx7s2dlvrsa"))
+
+(define rust-aws-lc-sys-0.20.1
+  ;; TODO: Check bundled sources.
+  (crate-source "aws-lc-sys" "0.20.1"
+                "00q73wwzbcp9v1sn155d5gajj5ki9mqlpj9d1hj2vbf6529283hg"))
+
 (define rust-aws-lc-sys-0.28.0
   ;; TODO: Unbundle aws-lc.
   (crate-source "aws-lc-sys" "0.28.0"
@@ -1445,6 +1474,10 @@
   (crate-source "bindgen" "0.66.1"
                 "19yj6fsb08x0l1pg871vvfvlx1mglamz8hyjpazhfc90zh34xf7j"))
 
+(define rust-bindgen-0.69.4
+  (crate-source "bindgen" "0.69.4"
+                "18194611hn3k1dkxlha7a52sr8vmfhl9blc54xhj08cahd8wh3d0"))
+
 (define rust-bindgen-0.69.5
   (crate-source "bindgen" "0.69.5"
                 "1240snlcfj663k04bjsg629g4wx6f83flgbjh5rzpgyagk3864r7"))
@@ -1553,6 +1586,10 @@
   (crate-source "bitflags" "2.5.0"
                 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg"))
 
+(define rust-bitflags-2.6.0
+  (crate-source "bitflags" "2.6.0"
+                "1pkidwzn3hnxlsl8zizh0bncgbjnw7c41cx7bby26ncbzmiznj5h"))
+
 (define rust-bitflags-2.9.0
   (crate-source "bitflags" "2.9.0"
                 "1gb5w7pxnmx8l2bjz1i6rkbwbm2167k294rhy6cl1y3vbc8i90jw"))
@@ -2450,6 +2487,10 @@
   (crate-source "cc" "1.1.30"
                 "0icr3vn2r5scpgylbplffd5mh7jcdivqh9dfgsxymnc13fk06s5i"))
 
+(define rust-cc-1.1.8
+  (crate-source "cc" "1.1.8"
+                "0jbmjhn4y94l2cjcpmbsnrkcqix1v0gl1nbynp417k7j8z0xwjsh"))
+
 (define rust-cc-1.2.1
   (crate-source "cc" "1.2.1"
                 "0izavwg0w3ahhp8jhajy97adv53r6ggv11g6czyz6pjx43rfk7gx"))
@@ -3131,6 +3172,10 @@
                 "1an1vcala24grlyhvk71ikxk2kmgcbal9kgrzzpjcl9z7i74ahw5"
                 #:snippet '(delete-file-recursively "tests")))
 
+(define rust-cmake-0.1.50
+  (crate-source "cmake" "0.1.50"
+                "0c3i3548mqbizpgbff94jjgkcd2p6q9fxjjh89zzf5dqcfaph753"))
+
 (define rust-cmake-0.1.54
   (crate-source "cmake" "0.1.54"
                 "1w41ma28yzad9x757s9sfq1wigjs9j902hbzc0nbxpc9vvws7jp7"))
@@ -3238,6 +3283,10 @@
   (crate-source "colorchoice" "1.0.0"
                 "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc"))
 
+(define rust-colorchoice-1.0.2
+  (crate-source "colorchoice" "1.0.2"
+                "1h18ph538y8yjmbpaf8li98l0ifms2xmh3rax9666c5qfjfi3zfk"))
+
 (define rust-colorchoice-1.0.3
   (crate-source "colorchoice" "1.0.3"
                 "1439m3r3jy3xqck8aa13q658visn71ki76qa93cy55wkmalwlqsv"))
@@ -5221,6 +5270,10 @@
   (crate-source "env_filter" "0.1.0"
                 "1spp4jx0fissi0bg00d8nn4vnjwf6y3hr7d0vmcq65gb214al2d0"))
 
+(define rust-env-filter-0.1.2
+  (crate-source "env_filter" "0.1.2"
+                "1avnnd60ig6q5ixxxbwicwkxpqjg8bl9x7qn8c7wbvkcvb794b2g"))
+
 (define rust-env-filter-0.1.3
   (crate-source "env_filter" "0.1.3"
                 "1l4p6f845cylripc3zkxa0lklk8rn2q86fqm522p6l2cknjhavhq"))
@@ -5237,6 +5290,10 @@
   (crate-source "env_logger" "0.10.2"
                 "1005v71kay9kbz1d5907l0y7vh9qn2fqsp2yfgb8bjvin6m0bm2c"))
 
+(define rust-env-logger-0.11.5
+  (crate-source "env_logger" "0.11.5"
+                "13812wq68kybv2vj6rpnhbl7ammlhggcb7vq68bkichzp4cscgz1"))
+
 (define rust-env-logger-0.11.8
   (crate-source "env_logger" "0.11.8"
                 "17q6zbjam4wq75fa3m4gvvmv3rj3ch25abwbm84b28a0j3q67j0k"))
@@ -5322,6 +5379,10 @@
   (crate-source "errno" "0.3.2"
                 "0kqg5zahxlyz1pzd8m7kgr7xcligr5n7dlkk2riz27lnlxlzcc3b"))
 
+(define rust-errno-0.3.9
+  (crate-source "errno" "0.3.9"
+                "1fi0m0493maq1jygcf1bya9cymz2pc1mqxj26bdv7yjd37v5qk2k"))
+
 (define rust-errno-dragonfly-0.1.2
   (crate-source "errno-dragonfly" "0.1.2"
                 "1grrmcm6q8512hkq5yzch3yv8wafflc2apbmsaabiyk44yqz2s5a"))
@@ -8684,6 +8745,10 @@
   (crate-source "humantime" "1.3.0"
                 "0krwgbf35pd46xvkqg14j070vircsndabahahlv3rwhflpy4q06z"))
 
+(define rust-humantime-2.1.0
+  (crate-source "humantime" "2.1.0"
+                "1r55pfkkf5v0ji1x6izrjwdq9v6sc7bv99xj6srywcar37xmnfls"))
+
 (define rust-humantime-2.2.0
   (crate-source "humantime" "2.2.0"
                 "17rz8jhh1mcv4b03wnknhv1shwq2v9vhkhlfg884pprsig62l4cv"))
@@ -10242,6 +10307,10 @@
   (crate-source "libc" "0.2.148"
                 "16rn9l8s5sj9n2jb2pw13ghqwa5nvjggkh9q3lp6vs1jfghp3p4w"))
 
+(define rust-libc-0.2.155
+  (crate-source "libc" "0.2.155"
+                "0z44c53z54znna8n322k5iwg80arxxpdzjj5260pxxzc9a58icwp"))
+
 (define rust-libc-0.2.169
   (crate-source "libc" "0.2.169"
                 "02m253hs8gw0m1n8iyrsc4n15yzbqwhddi7w1l0ds7i92kdsiaxm"))
@@ -10393,6 +10462,10 @@
                 "17wbccnjvhjd9ibh019xcd8kjvqws8lqgq86lqkpbgig7gyq0wxn"
                 #:snippet '(delete-file-recursively "tests")))
 
+(define rust-libloading-0.8.5
+  (crate-source "libloading" "0.8.5"
+                "194dvczq4sifwkzllfmw0qkgvilpha7m5xy90gd6i446vcpz4ya9"))
+
 (define rust-libloading-0.8.6
   (crate-source "libloading" "0.8.6"
                 "0d2ccr88f8kv3x7va2ccjxalcjnhrci4j2kwxp7lfmbkpjs4wbzw"
@@ -11567,6 +11640,10 @@
   (crate-source "mio" "0.6.23"
                 "1i2c1vl8lr45apkh8xbh9k56ihfsmqff5l7s2fya7whvp7sndzaa"))
 
+(define rust-mio-1.0.1
+  (crate-source "mio" "1.0.1"
+                "1r5g65s5acsx440m0a3pylclbrd0dqz93hg15k9crpllsdbf8sa5"))
+
 (define rust-mio-1.0.2
   (crate-source "mio" "1.0.2"
                 "1v1cnnn44awxbcfm4zlavwgkvbyg7gp5zzjm8mqf1apkrwflvq40"))
@@ -11587,6 +11664,10 @@
   (crate-source "miow" "0.6.1"
                 "023g6jamln6hmspcllgrm99ri38ypbm8w945jh36579hgb9zlssk"))
 
+(define rust-mirai-annotations-1.12.0
+  (crate-source "mirai-annotations" "1.12.0"
+                "1lfkgarmzd7mdr739s9yidh0xhc9d3g4jjiwh246mwmkq5i0ign9"))
+
 (define rust-mockall-0.9.1
   (crate-source "mockall" "0.9.1"
                 "1m9kpv4523503v48ahyzk9g2rabvbjl70mlbkc8mkfzr4fni9mhq"))
@@ -12857,6 +12938,10 @@
   (crate-source "object" "0.35.0"
                 "0pnv84mx3f3p847hfnsp4znivnwkc1x53maq459a92w42fw7mv5q"))
 
+(define rust-object-0.36.3
+  (crate-source "object" "0.36.3"
+                "1nggchwvjgilrxarwcmfcisa9fq1phg382y672aa6lb86ir4kdi7"))
+
 (define rust-object-0.36.4
   (crate-source "object" "0.36.4"
                 "02h7k38dwi8rndc3y81n6yjxijbss99p2jm9c0b6ak5c45c1lkq8"))
@@ -14156,6 +14241,10 @@
   (crate-source "portable-atomic" "1.11.1"
                 "10s4cx9y3jvw0idip09ar52s2kymq8rq9a668f793shn1ar6fhpq"))
 
+(define rust-portable-atomic-1.7.0
+  (crate-source "portable-atomic" "1.7.0"
+                "0rbjqv7lw120k6avb3fbsg58zg69m0wrmjg926lqglph33i4wm6s"))
+
 (define rust-portable-atomic-1.9.0
   (crate-source "portable-atomic" "1.9.0"
                 "1cmd87qj90panwsi350djb8lsxdryqkkxmimjcz7a1nsysini76c"))
@@ -14296,6 +14385,10 @@
   (crate-source "prettyplease" "0.1.25"
                 "11lskniv8pf8y8bn4dc3nmjapfhnibxbm5gamp2ad9qna3lld1kc"))
 
+(define rust-prettyplease-0.2.20
+  (crate-source "prettyplease" "0.2.20"
+                "0pk4vm9fir1p0bl11p9fkgl9r1x9vi4avv8l7flb1wx2i1a364jz"))
+
 (define rust-prettyplease-0.2.32
   (crate-source "prettyplease" "0.2.32"
                 "1xmdmwhsvqc8l5ns029vzjida4k3lp5ynin0xra43qsiki0wakk6"))
@@ -14752,6 +14845,10 @@
                 "0wm8z6jgg18z2cgr99wc34mbkffhcnb50igmq5d1ff6ghpyvyy3p"
                 #:snippet '(delete-file-recursively "branding")))
 
+(define rust-pyo3-0.24.0
+  (crate-source "pyo3" "0.24.0"
+                "11jyd625m0r2kjdq9vqxy1af82libzn1n9mj9pb6818jj4snq73z"))
+
 (define rust-pyo3-0.24.1
   (crate-source "pyo3" "0.24.1"
                 "0abjav5868avfgb8fjfvz2dbpm916zmhm8xvxzfgns5hhq033nhp"
@@ -14765,6 +14862,14 @@
   (crate-source "pyo3" "0.25.1"
                 "0ak85gkxs2ylrpbgyq1ksk24asvbsxgzqxh38gis6a06zs5afw49"))
 
+(define rust-pyo3-async-runtimes-0.24.0
+  (crate-source "pyo3-async-runtimes" "0.24.0"
+                "1gzq3mdd679mpy0jmzx3clxpd68cbzbdm041sd81zm7r8bf862yx"))
+
+(define rust-pyo3-async-runtimes-macros-0.24.0
+  (crate-source "pyo3-async-runtimes-macros" "0.24.0"
+                "1k8b6gs64np4g1n4k85h5m5hgazv62c9pvfr4a01xfrg0sj3n46g"))
+
 (define rust-pyo3-build-config-0.15.2
   (crate-source "pyo3-build-config" "0.15.2"
                 "0414biclhrxv6y0bjm6s9fq9z6yah393ffkd8748pqdq83y3k4kp"))
@@ -14793,6 +14898,10 @@
   (crate-source "pyo3-build-config" "0.23.5"
                 "1yqhw1k466k65rqvy2d4xz2shl0hzkry1xlxinciigzkdvlcpxll"))
 
+(define rust-pyo3-build-config-0.24.0
+  (crate-source "pyo3-build-config" "0.24.0"
+                "0yhacb3yqnhz2rgy75a70xm8i1gbpbpil0676zm2f57p9jrw5dp9"))
+
 (define rust-pyo3-build-config-0.24.1
   (crate-source "pyo3-build-config" "0.24.1"
                 "1hazmb2hm7qad5xcy9gajwj3231hqjnndfcb145014ypkf46awg2"))
@@ -14829,6 +14938,10 @@
   (crate-source "pyo3-ffi" "0.23.5"
                 "13fxvxijl59vilv39akdzwqd1l7fb6c70f53n27irfy0672b9wg9"))
 
+(define rust-pyo3-ffi-0.24.0
+  (crate-source "pyo3-ffi" "0.24.0"
+                "171s5hfn4y5r8my19jbl2d7hdxhr0gfh5k82vb6k4r540qcna1sm"))
+
 (define rust-pyo3-ffi-0.24.1
   (crate-source "pyo3-ffi" "0.24.1"
                 "1g5a5w7rsq2afb5zamz1jjx5834cnwlg4gig0qhb9xnvw4k0aa05"))
@@ -14873,6 +14986,10 @@
   (crate-source "pyo3-macros" "0.23.5"
                 "1nm9i19aff7zn245v35qb0lbr3cxr19zdgcayq84fg7n509j1hpv"))
 
+(define rust-pyo3-macros-0.24.0
+  (crate-source "pyo3-macros" "0.24.0"
+                "0hkgzvpg5k1crmmxski93ngx7fmsmv90vfrnhga9g3gxnjsr9lxh"))
+
 (define rust-pyo3-macros-0.24.1
   (crate-source "pyo3-macros" "0.24.1"
                 "0i2zrpazxwgfbpmzvrcqhdgg3j97l5i0q455b4rzdlx4d9lfag2w"))
@@ -14913,6 +15030,10 @@
   (crate-source "pyo3-macros-backend" "0.23.5"
                 "0a10yxj41kvjhh9vywzd2zj3h6iwm4bg3mlkw2frrnpks1m759pw"))
 
+(define rust-pyo3-macros-backend-0.24.0
+  (crate-source "pyo3-macros-backend" "0.24.0"
+                "13kwma61zgm262m53pdsywypgqpp5r6h47v21w4b2hx9rw4xlwpx"))
+
 (define rust-pyo3-macros-backend-0.24.1
   (crate-source "pyo3-macros-backend" "0.24.1"
                 "0m9q9zlwn5s0pa2819z3a13yn94pmq1q3swvx04fvc5z1jm6zkzl"))
@@ -15129,6 +15250,10 @@
   (crate-source "quote" "1.0.33"
                 "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj"))
 
+(define rust-quote-1.0.36
+  (crate-source "quote" "1.0.36"
+                "19xcmh445bg6simirnnd4fvkmp6v2qiwxh5f6rw4a70h76pnm9qg"))
+
 (define rust-quote-1.0.37
   (crate-source "quote" "1.0.37"
                 "1brklraw2g34bxy9y4q1nbrccn7bv36ylihv12c9vlcii55x7fdm"))
@@ -15568,6 +15693,10 @@
   (crate-source "regalloc2" "0.11.2"
                 "16k30jbh1ag5vb4l6p43jik1dzq8pymjbiwblkj189hl32ryc1nw"))
 
+(define rust-regex-1.10.6
+  (crate-source "regex" "1.10.6"
+                "06cnlxwzyqfbw1za1i7ks89ns4i2kr0lpg5ykx56b8v7dd6df6a2"))
+
 (define rust-regex-1.11.1
   (crate-source "regex" "1.11.1"
                 "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m"
@@ -15605,6 +15734,10 @@
   (crate-source "regex-automata" "0.3.8"
                 "1587iyw9x0r33b23vwn4s7cgzavqkkp6dv7qaqxnj82jjps03x62"))
 
+(define rust-regex-automata-0.4.7
+  (crate-source "regex-automata" "0.4.7"
+                "1pwjdi4jckpbaivpl6x4v5g4crb37zr2wac93wlfsbzgqn6gbjiq"))
+
 (define rust-regex-automata-0.4.8
   (crate-source "regex-automata" "0.4.8"
                 "18wd530ndrmygi6xnz3sp345qi0hy2kdbsa89182nwbl6br5i1rn"
@@ -15647,6 +15780,10 @@
   (crate-source "regex-syntax" "0.7.5"
                 "1nhjmqdlakfi4yb8lh7vbbh71dsy90jjvrjvvnrih6larldgpdfv"))
 
+(define rust-regex-syntax-0.8.4
+  (crate-source "regex-syntax" "0.8.4"
+                "16r0kjy20vx33dr4mhasj5l1f87czas714x2fz6zl0f8wwxa0rks"))
+
 (define rust-regex-syntax-0.8.5
   (crate-source "regex-syntax" "0.8.5"
                 "0p41p3hj9ww7blnbwbj9h7rwxzxg0c1hvrdycgys8rxyhqqw859b"))
@@ -16284,6 +16421,10 @@
                       (string-append "//" all)))
                    (copy-file "Cargo.toml.orig" "Cargo.toml"))))
 
+(define rust-rustix-0.38.34
+  (crate-source "rustix" "0.38.34"
+                "03vkqa2ism7q56rkifyy8mns0wwqrk70f4i4fd53r97p8b05xp3h"))
+
 (define rust-rustix-0.38.42
   (crate-source "rustix" "0.38.42"
                 "11fvprv3p450ggyqacp7sdpjbbsgm5zvfjwnzy8bfbmbrf7c6ggr"))
@@ -16417,6 +16558,10 @@
                 "1324n5bcns0rnw6vywr5agff3rwfvzphi7rmbyzwnv6glkhclx0w"
                 #:snippet '(delete-file-recursively "tests")))
 
+(define rust-rustls-pemfile-2.1.3
+  (crate-source "rustls-pemfile" "2.1.3"
+                "09bl873pkibmb2da49kkbm9jlagscjvzrv257q6k01p101my2vqr"))
+
 (define rust-rustls-pemfile-2.2.0
   (crate-source "rustls-pemfile" "2.2.0"
                 "0l3f3mrfkgdjrava7ibwzgwc4h3dljw3pdkbsi9rkwz3zvji9qyw"
@@ -16437,6 +16582,10 @@
                 "0yjzsnpv1sjbnfxbbmrnyimd23jip48nav6l9hr1rjd06vcjl64l"
                 #:snippet '(delete-file-recursively "tests")))
 
+(define rust-rustls-pki-types-1.8.0
+  (crate-source "rustls-pki-types" "1.8.0"
+                "1w6a1x8h61p5ddlnijfvj5fvs516h5xr5rw1pc0m8rgq8vk2q2pw"))
+
 (define rust-rustls-platform-verifier-0.3.4
   (crate-source "rustls-platform-verifier" "0.3.4"
                 "145lhjn9w5khp0fn4lagaa8qqyjyhfqn2dg6llva6qyzvy5qgfxg"
@@ -16911,10 +17060,22 @@
   (crate-source "send_wrapper" "0.6.0"
                 "0wrxzsh9fzgkkkms621ydnz8mj30ilyq299a8cf65jn1y72hw2yd"))
 
+(define rust-serde-1.0.204
+  (crate-source "serde" "1.0.204"
+                "04kwpwqz559xlhxkggmm8rjxqgywy5swam3kscwsicnbw1cgaxmw"))
+
 (define rust-serde-bytes-0.11.19
   (crate-source "serde_bytes" "0.11.19"
                 "1a1y1v0r9akqyvprxnmpgc0i8wybqqpvgi01mi8qxn3rkrq41m55"))
 
+(define rust-serde-derive-1.0.204
+  (crate-source "serde_derive" "1.0.204"
+                "08p25262mbmhsr2cg0508d5b1wvljj956rvpg0v3qgg6gc8pxkg0"))
+
+(define rust-serde-json-1.0.122
+  (crate-source "serde_json" "1.0.122"
+                "1nk8phyvwmhrmcbwdr8rbjd9bqp8np62dcbnhisgymqwjl1n4jvq"))
+
 (define rust-serde-spanned-1.0.0
   (crate-source "serde_spanned" "1.0.0"
                 "10rv91337k8x8zmfir4h8aiwmwgkq07gdv7h0jxhcwwgk10lqws0"))
@@ -18991,6 +19152,10 @@
   (crate-source "test-case-macros" "3.3.1"
                 "1yvgky3qax73bic6m368q04xc955p4a91mddd6b5fk7d04mfg2aw"))
 
+(define rust-test-log-0.2.16
+  (crate-source "test-log" "0.2.16"
+                "14xv5d7b3w072hh78xafsc795ygrg6s7ck8mg3i7np1b7kbcxzrx"))
+
 (define rust-test-log-0.2.17
   (crate-source "test-log" "0.2.17"
                 "03ydax0mamyhn5n6x0l8d2kz76fly7jv3xmnwmk12611sa1n1x77"))
@@ -18999,6 +19164,10 @@
   (crate-source "test-log" "0.2.18"
                 "0yxywma018rfr4mb409b1yz4ppg8ir9rg87bd08vx81fb25bjcqy"))
 
+(define rust-test-log-macros-0.2.16
+  (crate-source "test-log-macros" "0.2.16"
+                "1xd3490hvpa6fk5sqnmyzbz5xwndfpmmshjfpa8k221jm97f56ar"))
+
 (define rust-test-log-macros-0.2.17
   (crate-source "test-log-macros" "0.2.17"
                 "0gsmmdsi8aqgxbr16n78sf1m6x5s29gfvlk0n7d0yg5mdly0r3c8"))
@@ -19059,6 +19228,10 @@
   (crate-source "thiserror" "1.0.49"
                 "1m3yalbcx89bx397igc1ckypw8hiwq9jbzc56pgazrzdsz3fhxqi"))
 
+(define rust-thiserror-1.0.63
+  (crate-source "thiserror" "1.0.63"
+                "092p83mf4p1vkjb2j6h6z96dan4raq2simhirjv12slbndq26d60"))
+
 (define rust-thiserror-1.0.69
   (crate-source "thiserror" "1.0.69"
                 "0lizjay08agcr5hs9yfzzj6axs53a2rgx070a1dsi3jpkcrzbamn"))
@@ -19091,6 +19264,10 @@
   (crate-source "thiserror-impl" "1.0.49"
                 "1k643ga9sbqpcb873n299n3zjzc4srfakyv98xwqi4ly0412yw8h"))
 
+(define rust-thiserror-impl-1.0.63
+  (crate-source "thiserror-impl" "1.0.63"
+                "0qd21l2jjrkvnpr5da3l3b58v4wmrkn6aa0h1z5dg6kb8rc8nmd4"))
+
 (define rust-thiserror-impl-1.0.69
   (crate-source "thiserror-impl" "1.0.69"
                 "1h84fmn2nai41cxbhk6pqf46bxqq1b344v8yz089w1chzi76rvjg"))
@@ -19348,6 +19525,10 @@
   (crate-source "tokenizers" "0.19.1"
                 "1zg6ffpllygijb5bh227m9p4lrhf0pjkysky68kddwrsvp8zl075"))
 
+(define rust-tokio-1.39.2
+  (crate-source "tokio" "1.39.2"
+                "1cb7yhba7nnf00cylcywk7rai5kkdb8b4jzwrc26zgbqqwdzp96s"))
+
 (define rust-tokio-1.44.1
   (crate-source "tokio" "1.44.1"
                 "06n90q5hh1yd844s6nf4j3fwbrkm2bnq533kp3a488l4bdhxm0pk"))
@@ -19380,6 +19561,10 @@
   (crate-source "tokio-graceful" "0.1.6"
                 "1rqd6klnc4l4y3iih2k9hv6pxm3jbs4iqh030rs19knblkda8yv2"))
 
+(define rust-tokio-macros-2.4.0
+  (crate-source "tokio-macros" "2.4.0"
+                "0lnpg14h1v3fh2jvnc8cz7cjf0m7z1xgkwfpcyy632g829imjgb9"))
+
 (define rust-tokio-macros-2.5.0
   (crate-source "tokio-macros" "2.5.0"
                 "1f6az2xbvqp7am417b78d1za8axbvjvxnmkakz9vr8s52czx81kf"))
@@ -20806,6 +20991,10 @@
   (crate-source "validator" "0.15.0"
                 "1mgfpwry40fcsfabx7vziy0a7j9kxn6b49mvbv1hy770j09hlyzh"))
 
+(define rust-valuable-0.1.0
+  (crate-source "valuable" "0.1.0"
+                "0v9gp3nkjbl30z0fd56d8mx7w1csk86wwjhfjhr400wh9mfpw2w3"))
+
 (define rust-valuable-0.1.1
   (crate-source "valuable" "0.1.1"
                 "0r9srp55v7g27s5bg7a2m095fzckrcdca5maih6dy9bay6fflwxs"))
@@ -21792,6 +21981,10 @@
                 "1agpayg5zzf7m1a01q30jahlgmn5nwggbabdhq0in008pf5c66sj"
                 #:snippet '(delete-file-recursively "tests")))
 
+(define rust-webpki-roots-0.26.6
+  (crate-source "webpki-roots" "0.26.6"
+                "0n5985cgqrzm2a1si6rii5jrp3z7y3cfizgy9lfqywbpy6znf744"))
+
 (define rust-webpki-roots-0.26.8
   (crate-source "webpki-roots" "0.26.8"
                 "1jf54brni9lk4ak5pkma2pn18hli22gr7i7wp9zn2lzayy8v4412"
@@ -42020,6 +42213,29 @@
                                     rust-windows-x86-64-msvc-0.48.5
                                     rust-windows-x86-64-msvc-0.52.6
                                     rust-winnow-0.7.11))
+                     (pendulum =>
+                               (list rust-autocfg-1.4.0
+                                     rust-cc-1.2.19
+                                     rust-cfg-if-1.0.0
+                                     rust-heck-0.5.0
+                                     rust-indoc-2.0.6
+                                     rust-libc-0.2.172
+                                     rust-memoffset-0.9.1
+                                     rust-once-cell-1.21.3
+                                     rust-portable-atomic-1.11.0
+                                     rust-proc-macro2-1.0.95
+                                     rust-pyo3-0.24.1
+                                     rust-pyo3-build-config-0.24.1
+                                     rust-pyo3-ffi-0.24.1
+                                     rust-pyo3-macros-0.24.1
+                                     rust-pyo3-macros-backend-0.24.1
+                                     rust-python3-dll-a-0.2.13
+                                     rust-quote-1.0.40
+                                     rust-shlex-1.3.0
+                                     rust-syn-2.0.100
+                                     rust-target-lexicon-0.13.2
+                                     rust-unicode-ident-1.0.18
+                                     rust-unindent-0.2.4))
                      (pijul =>
                             (list rust-addr2line-0.24.2
                                   rust-adler2-2.0.0
@@ -44303,6 +44519,179 @@
                                           rust-target-lexicon-0.12.11
                                           rust-unicode-ident-1.0.11
                                           rust-version-check-0.9.4))
+                     (python-proton-vpn-local-agent =>
+                                                    (list
+                                                     rust-addr2line-0.22.0
+                                                     rust-adler-1.0.2
+                                                     rust-aho-corasick-1.1.3
+                                                     rust-anstream-0.6.15
+                                                     rust-anstyle-1.0.8
+                                                     rust-anstyle-parse-0.2.5
+                                                     rust-anstyle-query-1.1.1
+                                                     rust-anstyle-wincon-3.0.4
+                                                     rust-asn1-rs-0.6.2
+                                                     rust-asn1-rs-derive-0.5.1
+                                                     rust-asn1-rs-impl-0.2.0
+                                                     rust-async-trait-0.1.81
+                                                     rust-autocfg-1.3.0
+                                                     rust-aws-lc-rs-1.8.1
+                                                     rust-aws-lc-sys-0.20.1
+                                                     rust-backtrace-0.3.73
+                                                     rust-base64-0.22.1
+                                                     rust-bincode-1.3.3
+                                                     rust-bindgen-0.69.4
+                                                     rust-bitflags-2.6.0
+                                                     rust-bytes-1.7.1
+                                                     rust-cc-1.1.8
+                                                     rust-cexpr-0.6.0
+                                                     rust-cfg-if-1.0.0
+                                                     rust-clang-sys-1.8.1
+                                                     rust-cmake-0.1.50
+                                                     rust-colorchoice-1.0.2
+                                                     rust-data-encoding-2.9.0
+                                                     rust-der-parser-9.0.0
+                                                     rust-deranged-0.5.3
+                                                     rust-displaydoc-0.2.5
+                                                     rust-dunce-1.0.5
+                                                     rust-either-1.13.0
+                                                     rust-env-filter-0.1.2
+                                                     rust-env-logger-0.11.5
+                                                     rust-errno-0.3.9
+                                                     rust-fs-extra-1.3.0
+                                                     rust-futures-0.3.31
+                                                     rust-futures-channel-0.3.31
+                                                     rust-futures-core-0.3.31
+                                                     rust-futures-executor-0.3.31
+                                                     rust-futures-io-0.3.31
+                                                     rust-futures-macro-0.3.31
+                                                     rust-futures-sink-0.3.31
+                                                     rust-futures-task-0.3.31
+                                                     rust-futures-util-0.3.31
+                                                     rust-getrandom-0.2.15
+                                                     rust-gimli-0.29.0
+                                                     rust-glob-0.3.1
+                                                     rust-heck-0.5.0
+                                                     rust-hermit-abi-0.3.9
+                                                     rust-home-0.5.9
+                                                     rust-humantime-2.1.0
+                                                     rust-indoc-2.0.5
+                                                     rust-is-terminal-polyfill-1.70.1
+                                                     rust-itertools-0.12.1
+                                                     rust-itoa-1.0.11
+                                                     rust-jobserver-0.1.32
+                                                     rust-lazy-static-1.5.0
+                                                     rust-lazycell-1.3.0
+                                                     rust-libc-0.2.155
+                                                     rust-libloading-0.8.5
+                                                     rust-linux-raw-sys-0.4.14
+                                                     rust-lock-api-0.4.12
+                                                     rust-log-0.4.22
+                                                     rust-matchers-0.1.0
+                                                     rust-memchr-2.7.4
+                                                     rust-memoffset-0.9.1
+                                                     rust-minimal-lexical-0.2.1
+                                                     rust-miniz-oxide-0.7.4
+                                                     rust-mio-1.0.1
+                                                     rust-mirai-annotations-1.12.0
+                                                     rust-nom-7.1.3
+                                                     rust-nu-ansi-term-0.46.0
+                                                     rust-num-bigint-0.4.6
+                                                     rust-num-conv-0.1.0
+                                                     rust-num-integer-0.1.46
+                                                     rust-num-traits-0.2.19
+                                                     rust-object-0.36.3
+                                                     rust-oid-registry-0.7.1
+                                                     rust-once-cell-1.19.0
+                                                     rust-overload-0.1.1
+                                                     rust-parking-lot-0.12.3
+                                                     rust-parking-lot-core-0.9.10
+                                                     rust-paste-1.0.15
+                                                     rust-pin-project-lite-0.2.14
+                                                     rust-pin-utils-0.1.0
+                                                     rust-portable-atomic-1.7.0
+                                                     rust-powerfmt-0.2.0
+                                                     rust-prettyplease-0.2.20
+                                                     rust-proc-macro2-1.0.94
+                                                     rust-pyo3-0.24.0
+                                                     rust-pyo3-async-runtimes-0.24.0
+                                                     rust-pyo3-async-runtimes-macros-0.24.0
+                                                     rust-pyo3-build-config-0.24.0
+                                                     rust-pyo3-ffi-0.24.0
+                                                     rust-pyo3-macros-0.24.0
+                                                     rust-pyo3-macros-backend-0.24.0
+                                                     rust-quote-1.0.36
+                                                     rust-redox-syscall-0.5.3
+                                                     rust-regex-1.10.6
+                                                     rust-regex-automata-0.1.10
+                                                     rust-regex-automata-0.4.7
+                                                     rust-regex-syntax-0.6.29
+                                                     rust-regex-syntax-0.8.4
+                                                     rust-ring-0.17.8
+                                                     rust-rustc-demangle-0.1.24
+                                                     rust-rustc-hash-1.1.0
+                                                     rust-rusticata-macros-4.1.0
+                                                     rust-rustix-0.38.34
+                                                     rust-rustls-0.23.12
+                                                     rust-rustls-pemfile-2.1.3
+                                                     rust-rustls-pki-types-1.8.0
+                                                     rust-rustls-webpki-0.102.6
+                                                     rust-ryu-1.0.18
+                                                     rust-scopeguard-1.2.0
+                                                     rust-serde-1.0.204
+                                                     rust-serde-derive-1.0.204
+                                                     rust-serde-json-1.0.122
+                                                     rust-sharded-slab-0.1.7
+                                                     rust-shlex-1.3.0
+                                                     rust-signal-hook-registry-1.4.2
+                                                     rust-slab-0.4.9
+                                                     rust-smallvec-1.13.2
+                                                     rust-socket2-0.5.7
+                                                     rust-spin-0.9.8
+                                                     rust-static-assertions-1.1.0
+                                                     rust-subtle-2.6.1
+                                                     rust-syn-2.0.100
+                                                     rust-synstructure-0.13.2
+                                                     rust-target-lexicon-0.13.2
+                                                     rust-test-log-0.2.16
+                                                     rust-test-log-macros-0.2.16
+                                                     rust-thiserror-1.0.63
+                                                     rust-thiserror-impl-1.0.63
+                                                     rust-thread-local-1.1.8
+                                                     rust-time-0.3.43
+                                                     rust-time-core-0.1.6
+                                                     rust-time-macros-0.2.24
+                                                     rust-tokio-1.39.2
+                                                     rust-tokio-macros-2.4.0
+                                                     rust-tokio-rustls-0.26.0
+                                                     rust-tracing-0.1.41
+                                                     rust-tracing-core-0.1.33
+                                                     rust-tracing-log-0.2.0
+                                                     rust-tracing-subscriber-0.3.19
+                                                     rust-unicode-ident-1.0.12
+                                                     rust-unindent-0.2.3
+                                                     rust-untrusted-0.9.0
+                                                     rust-utf8parse-0.2.2
+                                                     rust-valuable-0.1.0
+                                                     rust-wasi-0.11.0+wasi-snapshot-preview1
+                                                     rust-webpki-0.22.4
+                                                     rust-webpki-roots-0.26.6
+                                                     rust-which-4.4.2
+                                                     rust-winapi-0.3.9
+                                                     rust-winapi-i686-pc-windows-gnu-0.4.0
+                                                     rust-winapi-x86-64-pc-windows-gnu-0.4.0
+                                                     rust-windows-sys-0.52.0
+                                                     rust-windows-targets-0.52.6
+                                                     rust-windows-aarch64-gnullvm-0.52.6
+                                                     rust-windows-aarch64-msvc-0.52.6
+                                                     rust-windows-i686-gnu-0.52.6
+                                                     rust-windows-i686-gnullvm-0.52.6
+                                                     rust-windows-i686-msvc-0.52.6
+                                                     rust-windows-x86-64-gnu-0.52.6
+                                                     rust-windows-x86-64-gnullvm-0.52.6
+                                                     rust-windows-x86-64-msvc-0.52.6
+                                                     rust-x509-parser-0.16.0
+                                                     rust-zeroize-1.8.1
+                                                     rust-zeroize-derive-1.4.2))
                      (python-pydantic-core =>
                                            (list rust-ahash-0.8.11
                                             rust-aho-corasick-1.1.3

gnu/packages/security-token.scm

@@ -635,7 +635,7 @@ PCSC API Python wrapper module.")
        (sha256
         (base32
          "0kiv5j67h66bm1d12ny6aw5sqnan33vbs2q4w4ms6f6a709c0xyl"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      (list
       #:tests? #f ; there are no tests
@@ -655,6 +655,7 @@ PCSC API Python wrapper module.")
             (lambda _
               (invoke "make" "install"
                       (string-append "PREFIX=" #$output)))))))
+    (native-inputs (list python-setuptools))
     (inputs
      (list dmenu
            libnotify
@@ -795,22 +796,24 @@ your existing infrastructure.")
 (define-public python-fido2
   (package
     (name "python-fido2")
-    (version "1.1.1")
-    (source (origin
-              (method url-fetch)
-              (uri
-               (string-append
-                "https://github.com/Yubico/python-fido2/releases/download/"
-                version "/fido2-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1hwz0xagkmy6hhcyfl66dxf2vfa69lqqqjrv70vw7harik59bi2x"))
-              (snippet
-               ;; Remove bundled dependency.
-               '(delete-file "fido2/public_suffix_list.dat"))))
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Yubico/python-fido2")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "043ldwaxryndh6nwi0j4ysk6phzpkzdik8i15mmahnx3gl1qibif"))
+       (snippet
+        ;; Remove bundled dependency.
+        '(delete-file "fido2/public_suffix_list.dat"))))
     (build-system pyproject-build-system)
     (arguments
      (list
+      ;; XXX: Tests timeout without this flag.
+      #:test-flags #~(list "--no-device")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'install-public-suffix-list

gnu/packages/selinux.scm

@@ -28,10 +28,12 @@
   #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages flex)
@@ -42,6 +44,8 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
+  #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages swig)
@@ -304,7 +308,7 @@ based on required access.")
 (define-public python-setools
   (package
     (name "python-setools")
-    (version "4.4.0")
+    (version "4.5.0")
     (source
      (origin
        (method git-fetch)
@@ -313,11 +317,12 @@ based on required access.")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5"))))
-    (build-system python-build-system)
+        (base32 "0wm79r0lg0rk6dycf7kjp6gzmbykmq0g0qvz5cdqbwyf3n318bp3"))))
+    (build-system pyproject-build-system)
     (arguments
      (list
-      #:tests? #f ; the test target causes a rebuild
+      #:tests? #f ; Most tests require access to /usr/bin/checkpolicy
+      #:test-flags #~(list "tests")
       #:phases
       #~(modify-phases %standard-phases
           (delete 'portability)
@@ -325,24 +330,26 @@ based on required access.")
             (lambda* (#:key inputs #:allow-other-keys)
               (setenv "SEPOL"
                       (search-input-file inputs "/lib/libsepol.a"))))
-          (add-after 'unpack 'remove-Werror
-            (lambda _
-              (substitute* "setup.py"
-                (("'-Werror',") ""))))
           (add-after 'unpack 'fix-target-paths
             (lambda _
               (substitute* "setup.py"
                 (("join\\(sys.prefix")
-                 (string-append "join(\"" #$output "/\""))))))))
+                 (string-append "join(\"" #$output "/\"")))))
+          (add-before 'check 'fix-tests
+            (lambda _
+              (delete-file-recursively "setools"))))))
     (native-inputs
      (list bison
            flex
            python-cython-0
-           swig))
+           swig
+           python-pytest
+           python-pytest-qt
+           python-setuptools))
     (inputs
      (list libsepol
            libselinux
-           python-pyqt))
+           python-pyqt-6))
     (propagated-inputs
      (list python-networkx))
     (home-page "https://github.com/SELinuxProject/setools")

gnu/packages/serialization.scm

@@ -416,21 +416,21 @@ that implements both the msgpack and msgpack-rpc specifications.")
 (define-public libscfg
   (package
     (name "libscfg")
-    (version "0.1.1")
-    (home-page "https://git.sr.ht/~emersion/libscfg")
+    (version "0.2.0")
+    (home-page "https://codeberg.org/emersion/libscfg")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://git.sr.ht/~emersion/libscfg")
+             (url "https://codeberg.org/emersion/libscfg")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1b1ps7wba4anm3x1yndnd730dwl6rdz3zwjgxmsyq31fnjrjydv9"))))
+        (base32 "05csd5923yc6yknyvyr95wkhway65app69a3w5c0mmk61wf42sk5"))))
     (build-system meson-build-system)
     (synopsis "Scfg library written in C")
     (description
-     "This package provides a C library for to parse
+     "This package provides a C library for parsing
 @uref{https://git.sr.ht/~emersion/scfg, scfg}, a simple configuration file
 format with one directive per line.")
     (license license:expat)))
@@ -1016,15 +1016,19 @@ Python.")
     (name "python-feather-format")
     (version "0.4.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "feather-format" version))
-        (sha256
-         (base32
-          "00w9hwz7sj3fkdjc378r066vdy6lpxmn6vfac3qx956k8lvpxxj5"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "feather-format" version))
+       (sha256
+        (base32 "00w9hwz7sj3fkdjc378r066vdy6lpxmn6vfac3qx956k8lvpxxj5"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f)) ;no tests in PyPI or Git
+    (native-inputs
+     (list python-setuptools))
     (propagated-inputs
-     (list python-pandas python-pyarrow))
+     (list python-pandas
+           python-pyarrow))
     (home-page "https://github.com/wesm/feather")
     (synopsis "Python wrapper to the Feather file format")
     (description "This package provides a Python wrapper library to the

gnu/packages/sphinx.scm

@@ -980,30 +980,6 @@ Sphinx documentation system.  It's the default theme of Sphinx.")
 argparse commands and options")
     (license license:expat)))
 
-;;; FIXME: Currently broken by Jinja >= 3.10 (see:
-;;; https://foss.heptapod.net/doc-utils/cloud_sptheme/-/issues/47).
-(define-public python-sphinx-cloud-sptheme
-  (package
-    (name "python-sphinx-cloud-sptheme")
-    (version "1.10.1")
-    (source (origin
-              (method hg-fetch)
-              (uri (hg-reference
-                    (url "https://foss.heptapod.net/doc-utils/cloud_sptheme")
-                    (changeset version)))
-              (file-name (hg-file-name name version))
-              (sha256
-               (base32
-                "0k0pgi0vcn8vdy3k6x11fpp4mqp7p3l6n6pjfi3mir3vwjhdfz7l"))))
-    (build-system python-build-system)
-    (native-inputs (list python-mock))
-    (propagated-inputs (list python-sphinx))
-    (home-page "https://foss.heptapod.net/doc-utils/cloud_sptheme")
-    (synopsis "Cloud theme for Sphinx")
-    (description "This package contains the @emph{Cloud} theme for Sphinx and
-some related extensions.")
-    (license license:bsd-3)))
-
 (define-public python-guzzle-sphinx-theme
   (package
     (name "python-guzzle-sphinx-theme")

gnu/packages/statistics.scm

@@ -1219,20 +1219,21 @@ algorithms for evaluating Bayesian evidence.")
                             (substitute* "setup.py"
                               (("version=versioneer.get_version\\(),")
                                (format #f "version=~s," #$version)))))
-                        ;; To create the compiledir for tests.
-                        (add-before 'check 'write-permissions
-                          (lambda* (#:key tests? #:allow-other-keys)
-                            (when tests?
-                              (setenv "HOME" "/tmp")))))))
-    (native-inputs (list python-pytest-cov python-versioneer))
+                        (add-after 'unpack 'relax-requirements
+                          (lambda _
+                            (substitute* "requirements.txt"
+                              (("scipy>=.*")
+                               "scipy\n")))))))
+    (native-inputs (list python-setuptools python-versioneer))
     (propagated-inputs (list python-arviz
                              python-cachetools
                              python-cloudpickle
-                             python-fastprogress
                              python-numpy
                              python-pandas
                              python-pytensor
+                             python-rich
                              python-scipy
+                             python-threadpoolctl
                              python-typing-extensions))
     (home-page "https://github.com/pymc-devs/pymc")
     (synopsis "Library for probabilistic programming in Python")
@@ -1355,14 +1356,17 @@ Meier, Nelson Aalen and regression.")
 (define-public python-mapie
   (package
     (name "python-mapie")
-    (version "1.0.1")
+    (version "1.2.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "mapie" version))
               (sha256
                (base32
-                "1bkikqjya6gkds3n4qj6svvyz6czkwrc5s66ffb62l6wi4v2f89a"))))
+                "1ykmm3wgnxfk2yspb82bnqmm700nnsxrdj6fqccp6gh6fnbd2cnn"))))
     (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags #~(list "--pyargs" "mapie")))
     (native-inputs (list python-pandas python-pytest python-setuptools
                          python-wheel))
     (propagated-inputs (list python-numpy python-scikit-learn))

gnu/packages/stb.scm

@@ -26,7 +26,7 @@
   #:use-module (guix build-system trivial)
   #:use-module ((guix licenses) #:select (expat public-domain)))
 
-(define stb
+(define-public stb
   ;; stb is a collection of libraries developed within the same repository.
   ;; When updating this, remember to change versions below as appropriate.
   (let ((commit "2e2bef463a5b53ddf8bb788e25da6b8506314c08")

gnu/packages/sync.scm

@@ -339,65 +339,6 @@ Memory requirements and CPU utilization are kept at minimum.
 See also: megacmd, the official tool set by MEGA.")
     (license license:gpl2)))
 
-(define-public owncloud-client
-  (package
-    (name "owncloud-client")
-    (version "2.9.0.5150")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://download.owncloud.com/desktop/ownCloud/stable/"
-                           version "/source/ownCloud-" version ".tar.xz"))
-       (sha256
-        (base32 "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"))
-       (patches (search-patches "owncloud-disable-updatecheck.patch"))))
-    ;; TODO: unbundle qprogessindicator, qlockedfile, qtokenizer and
-    ;; qtsingleapplication which have not yet been packaged, but all are
-    ;; explicitly used from the 3rdparty folder during build.
-    (build-system cmake-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'delete-failing-tests
-           ;; "Could not create autostart folder"
-           (lambda _
-             (substitute* "test/CMakeLists.txt"
-                          (("owncloud_add_test\\(Utility\\)" test)
-                           (string-append "#" test)))
-             #t))
-         (add-after 'unpack 'dont-embed-store-path
-           (lambda _
-             (substitute* "src/common/utility_unix.cpp"
-               (("QCoreApplication::applicationFilePath\\()") "\"owncloud\""))
-             #t))
-         (delete 'patch-dot-desktop-files))
-       #:configure-flags `("-DUNIT_TESTING=ON"
-                           ;; build without qtwebkit, which causes the
-                           ;; package to FTBFS while looking for QWebView.
-                           "-DNO_SHIBBOLETH=1"
-                           ;; Fix sync-exclude.list problem, see
-                           ;; <https://github.com/owncloud/client/issues/8373>
-                           ;; <https://issues.guix.gnu.org/47672>
-                           ,(string-append "-DSYSCONF_INSTALL_DIR="
-                                           (assoc-ref %outputs "out")
-                                           "/etc"))))
-    (native-inputs
-     `(("cmocka" ,cmocka)
-       ("extra-cmake-modules" ,extra-cmake-modules)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools-5)))
-    (inputs
-     (list qtbase-5 qtkeychain sqlite zlib))
-    (home-page "https://owncloud.org")
-    (synopsis "Folder synchronization with an ownCloud server")
-    (description "The ownCloudSync system lets you always have your latest
-files wherever you are.  Just specify one or more folders on the local machine
-to and a server to synchronize to.  You can configure more computers to
-synchronize to the same server and any change to the files on one computer will
-silently and reliably flow across to every other.")
-    (license license:gpl2+)))
-
 (define-public onedrive
   (package
     (name "onedrive")

gnu/packages/syndication.scm

@@ -349,41 +349,37 @@ a simple interface that makes it easy to organize and browse feeds.")
     (name "rtv")
     (version "1.27.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "rtv" version))
-        (sha256
-         (base32 "0hvw426y09l3yzwv2zkb9hifpfbg9wd1gg0y3z3pxcli6n3ii2wl"))))
-    (build-system python-build-system)
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/michael-lazar/rtv")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'set-environment-variables
-           (lambda* (#:key inputs #:allow-other-keys)
-             (setenv "HOME" (getcwd))
-             (setenv "TERM" "linux")
-             (setenv "TERMINFO"
-                     (search-input-directory inputs "share/terminfo"))))
-         ;; Loading this as a library requires a controlling terminal, etc.
-         (delete 'sanity-check))
-       #:tests? #f)) ; tests fail: _curses.error: nocbreak() returned ERR
-    (propagated-inputs
-     (list python-beautifulsoup4 python-decorator python-kitchen
-           python-requests python-six))
-    (native-inputs
-     (list ncurses
-           python-coveralls
-           python-coverage
-           python-mock
-           python-pylint
-           python-pytest
-           python-vcrpy))
+     (list
+      #:tests? #f ;tests fail: _curses.error: nocbreak() returned ERR
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-environment-variables
+            (lambda* (#:key inputs #:allow-other-keys)
+              (setenv "HOME"
+                      (getcwd))
+              (setenv "TERM" "linux")
+              (setenv "TERMINFO"
+                      (search-input-directory inputs "share/terminfo"))))
+          ;; Loading this as a library requires a controlling terminal, etc.
+          (delete 'sanity-check))))
+    (propagated-inputs (list python-beautifulsoup4 python-decorator
+                             python-requests python-six))
+    (native-inputs (list ncurses python-mock python-pytest python-setuptools))
     (home-page "https://github.com/michael-lazar/rtv")
     (synopsis "Terminal viewer for Reddit (Reddit Terminal Viewer)")
     (description
      "RTV provides a text-based interface to view and interact with Reddit.")
-    (license (list license:expat
-                   license:gpl3+)))) ; rtv/packages/praw
+    (license (list license:expat license:gpl3+)))) ; rtv/packages/praw
 
 (define-public tuir
   (package

gnu/packages/time.scm

@@ -57,9 +57,12 @@
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages rust)
+  #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system pyproject)
@@ -199,21 +202,28 @@ applications, and several support tools.")
     (version "2020.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytzdata" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sdispater/pytzdata")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0h0md0ldhb8ghlwjslkzh3wcj4fxg3n43bj5sghqs2m06nri7yiy"))))
-    (build-system python-build-system)
-    ;; XXX: The PyPI distribution contains no tests, and the upstream
-    ;; repository lacks a setup.py!  How to build from git?
-    (arguments '(#:tests? #f))
-    (propagated-inputs
-     (list python-cleo))
+        (base32 "1idzpps56wx2lqvflxhpb1isz1ijn9y91ffd6hfg6qv1zikj9xa4"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'use-poetry-core
+            (lambda _
+              ;; Patch to use the core poetry API.
+              (substitute* "pyproject.toml"
+                (("poetry.masonry.api") "poetry.core.masonry.api")))))))
+    (native-inputs (list python-poetry-core python-pytest))
+    (propagated-inputs (list python-cleo))
     (home-page "https://github.com/sdispater/pytzdata")
     (synopsis "Timezone database for Python")
-    (description
-     "This library provides a timezone database for Python.")
+    (description "This library provides a timezone database for Python.")
     (license expat)))
 
 (define-public python-tzdata
@@ -306,48 +316,55 @@ saving time.  Almost all of the Olson timezones are supported.")
 (define-public python-pendulum
   (package
     (name "python-pendulum")
-    (version "2.1.2")
+    (version "3.1.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pendulum" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/sdispater/pendulum")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "01zjc245w08j0xryrgrq9vng59q1cl5ry0hcpw5rj774pyhhqsmh"))))
-    (build-system python-build-system)
-    ;; XXX: The PyPI distribution lacks tests, and the upstream repository
-    ;; lacks a setup.py!
+        (base32 "0rhh5hnrjbi1ams5ylnymari522k4v2kdk82qzafvmykkcvild36"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; Add setup.py to fix the build. Otherwise, the build will fail with
-         ;; "no setup.py found".
-         ;;
-         ;; Upstream uses Poetry to build python-pendulum, including parts
-         ;; written in C. Here, we simply add a setup.py file and do not build
-         ;; the parts written in C. This is possible because python-pendulum
-         ;; falls back on pure Python code when the C parts are not available
-         ;; (reference: build.py).
-         (add-after 'unpack 'add-setup.py
-           (lambda _
-             (call-with-output-file "setup.py"
-               (lambda (port)
-                 (format port
-                         "from setuptools import find_packages, setup
-setup(name='pendulum',
-      version='~a',
-      packages=find_packages())
-"
-                         ,version))))))
-       ;; XXX: The PyPI distribution lacks tests.
-       #:tests? #f))
-    (propagated-inputs
-     (list python-dateutil python-pytzdata))
+     (list
+      #:imported-modules `(,@%cargo-build-system-modules
+                           ,@%pyproject-build-system-modules)
+      #:modules '(((guix build cargo-build-system)
+                   #:prefix cargo:)
+                  (guix build pyproject-build-system)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'prepare-cargo-build-system
+            (lambda args
+              (with-directory-excursion "rust"
+                (for-each (lambda (phase)
+                            (format #t "Running cargo phase: ~a~%" phase)
+                            (apply (assoc-ref cargo:%standard-phases phase)
+                                   #:cargo-target #$(cargo-triplet) args))
+                          '(unpack-rust-crates configure
+                                               check-for-pregenerated-files
+                                               patch-cargo-checksums))))))))
+    (native-inputs
+     (list maturin
+           python-pytest
+           python-pytest-benchmark
+           python-pytz
+           python-setuptools
+           python-time-machine
+           rust
+           `(,rust "cargo")))
+    (inputs (cargo-inputs 'pendulum))
+    (propagated-inputs (list python-dateutil python-tzdata))
     (home-page "https://github.com/sdispater/pendulum")
     (synopsis "Alternate API for Python datetimes")
-    (description "Pendulum is a drop-in replacement for the standard
-@code{datetime} class, providing an alternative API.  As it inherits from the
-standard @code{datetime} all @code{datetime} instances can be replaced by
-Pendulum instances.")
+    (description
+     "Pendulum is a drop-in replacement for the standard @code{datetime}
+class, providing an alternative API.  As it inherits from the standard
+@code{datetime} all @code{datetime} instances can be replaced by Pendulum
+instances.")
     (license expat)))
 
 (define-public python-dateutil

gnu/packages/tls.scm

@@ -1200,6 +1200,21 @@ ciphers such as ChaCha20, Curve25519, NTRU, and Blake2b.")
     (home-page "https://www.wolfssl.com/")
     (license license:gpl2+))) ; Audit
 
+(define-public wolfssl-for-rpcs3
+  (package/inherit wolfssl
+    (name "wolfssl-for-rpcs3")
+    (arguments
+     (substitute-keyword-arguments (package-arguments wolfssl)
+       ((#:configure-flags flags ''())
+        #~(cons* "--enable-des3"
+                 "--enable-pwdbased"
+                 "--enable-fastmath"
+                 "--enable-opensslextra"
+                 "--disable-harden"
+                 "--enable-altcertchains"
+                 "--enable-writedup"
+                 #$flags))))))
+
 (define-public aws-lc
   (package
     (name "aws-lc")

gnu/packages/toolkits.scm

@@ -23,12 +23,14 @@
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages sdl)
   #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix git-download))
 
@@ -190,46 +192,49 @@ standard operating system features.")
     (name "nuklear")
     (version "4.12.0")
     (home-page "https://github.com/Immediate-Mode-UI/Nuklear")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "13cswwdys4hqdvbm4g4b9l269i16s7c4204j16v67ghj3b4mjifg"))
-              (snippet #~(begin (delete-file "nuklear.h")
-                                (delete-file "doc/index.html")))))
-    (build-system python-build-system)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "13cswwdys4hqdvbm4g4b9l269i16s7c4204j16v67ghj3b4mjifg"))
+       (snippet #~(begin
+                    (delete-file "nuklear.h")
+                    (delete-file "doc/index.html")))))
+    (build-system pyproject-build-system)
     (arguments
-     (list #:tests? #f ;no tests
-           #:phases #~(modify-phases %standard-phases
-                        (delete 'configure)
-                        (replace 'build
-                          (lambda _
-                            (with-directory-excursion "src"
-                              (invoke "./paq.sh"))
-                            (with-directory-excursion "doc"
-                              (with-input-from-file "../nuklear.h"
-                                (lambda _
-                                  (with-output-to-file "index.html"
-                                    (lambda _
-                                      (invoke "stddoc"))))))))
-                        (replace 'install
-                          (lambda* (#:key outputs #:allow-other-keys)
-                            (install-file "nuklear.h"
-                                          (string-append #$output "/include"))
-                            (install-file "doc/index.html"
-                                          (string-append #$output
-                                                         "/share/doc")))))))
-    (native-inputs (list stddoc))
+     (list
+      #:tests? #f ;no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (replace 'build
+            (lambda _
+              (with-directory-excursion "src"
+                (invoke "./paq.sh"))
+              (with-directory-excursion "doc"
+                (with-input-from-file "../nuklear.h"
+                  (lambda _
+                    (with-output-to-file "index.html"
+                      (lambda _
+                        (invoke "stddoc"))))))))
+          (replace 'install
+            (lambda _
+              (install-file "nuklear.h"
+                            (string-append #$output "/include"))
+              (install-file "doc/index.html"
+                            (string-append #$output "/share/doc")))))))
+    (native-inputs (list stddoc python-setuptools))
     (synopsis "Graphical user interface toolkit written in ANSI C")
-    (description "This package provides an immediate-mode graphical user
-interface toolkit.  It was designed as an embeddable user interface
-for applications and does not have any dependencies, a default render backend
-or OS window/input handling.  The library is self contained in one single header
-file and can be used either in header only mode or in implementation mode.")
+    (description
+     "This package provides an immediate-mode graphical user interface
+toolkit.  It was designed as an embeddable user interface for applications and
+does not have any dependencies, a default render backend or OS window/input
+handling.  The library is self contained in one single header file and can be
+used either in header only mode or in implementation mode.")
     (license (list license:unlicense license:expat))))
 
 (define-public implot

gnu/packages/tor.scm

@@ -438,32 +438,24 @@ host websites, and chat with friends using the Tor network.")))
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
-        (base32
-         "02rrlllz2ci6i6cs3iddyfns7ang9a54jrlygd2jw1f9s6418ll8"))))
-    (build-system python-build-system)
-    (inputs
-     (list python-stem))
+        (base32 "02rrlllz2ci6i6cs3iddyfns7ang9a54jrlygd2jw1f9s6418ll8"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-man-page
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man")))
-               (install-file "nyx.1" (string-append man "/man1"))
-               #t)))
-         (add-after 'install 'install-sample-configuration
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version)))
-               (install-file "web/nyxrc.sample" doc)
-               #t))))
-       ;; XXX The tests seem to require more of a real terminal than the build
-       ;; environment provides:
-       ;;   _curses.error: setupterm: could not find terminal
-       ;; With TERM=linux, the tests try to move the cursor and still fail:
-       ;;   _curses.error: cbreak() returned ERR
-       #:tests? #f))
+     (list
+      #:test-backend #~'unittest
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-man-page
+            (lambda _
+              (install-file "nyx.1"
+                            (string-append #$output "/share/man/man1"))))
+          (add-after 'install 'install-sample-configuration
+            (lambda _
+              (install-file "web/nyxrc.sample"
+                            (string-append #$output "/share/doc/"
+                                           #$name "-" #$version)))))))
+    (native-inputs (list python-setuptools))
+    (inputs (list python-stem))
     (home-page "https://nyx.torproject.org/")
     (synopsis "Tor relay status monitor")
     (description

gnu/packages/upnp.scm

@@ -105,6 +105,19 @@ over IRC, instant messaging, network games, and most server software.")
     (license
      (license:x11-style "file://LICENSE" "See 'LICENSE' file in the distribution"))))
 
+(define-public miniupnpc-next
+  (package
+    (inherit miniupnpc)
+    (name "miniupnpc-next")
+    (version "2.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://miniupnp.tuxfamily.org/files/"
+                           "miniupnpc-" version ".tar.gz"))
+       (sha256
+        (base32 "06mx6kk42px0f08k5pazmjawbj19gnpg3pwxrj4c1mjac7x0lanm"))))))
+
 (define-public libupnp
   (package
     (name "libupnp")

gnu/packages/video.scm

@@ -2732,7 +2732,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
 (define-public mpv
   (package
     (name "mpv")
-    (version "0.40.0")
+    (version "0.41.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2740,11 +2740,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0w0qk61ll0mddbkiwavqfx048sacyvp6fwglms58ypw869rh7iy7"))
-              (patches
-               (search-patches
-                "mpv-0.40.0-fix-ffmpeg-8.0.patch"
-                "mpv-0.40.0-fix-wayland-cpu-usage.patch"))))
+               (base32 "1myphqbzr4xynhzmc9ic34mqwb2yc0v37xh8js517sy4ydzam5c0"))))
     (build-system meson-build-system)
     (arguments
      (list

gnu/packages/vim.scm

@@ -556,10 +556,7 @@ similar to CoqIDE or ProofGeneral.")
     (native-inputs
      (modify-inputs (package-native-inputs vim-coqtail)
        (replace "vim-vader" neovim-vader)
-       (append python-minimal python-pynvim)))
-    (propagated-inputs
-     (modify-inputs (package-propagated-inputs vim-coqtail)
-       (append python-pynvim)))))
+       (append python-minimal)))))
 
 (define-public vim-fugitive
   (package
@@ -1032,23 +1029,29 @@ With the package comes a plugin to use vifm as a vim file selector.")
 (define-public python-pynvim
   (package
     (name "python-pynvim")
-    (version "0.4.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "pynvim" version))
-              (sha256
-               (base32
-                "13qgwkqbx012j5spis1aw8rb120rw0zphgjy1j58irax8r6j1ikb"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-greenlet python-msgpack))
-    (arguments
-     `(#:tests? #f))
+    (version "0.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/neovim/pynvim")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list neovim
+           python-pytest
+           python-pytest-timeout
+           python-setuptools))
+    (propagated-inputs (list python-greenlet python-msgpack))
     (home-page "https://github.com/neovim/pynvim")
     (synopsis "Python client and plugin host for neovim")
-    (description "Pynvim implements support for python plugins in neovim.  It
-also works as a library for connecting to and scripting neovim processes
-through its msgpack-rpc API.")
+    (description
+     "Pynvim implements support for python plugins in neovim.  It also works
+as a library for connecting to and scripting neovim processes through its
+msgpack-rpc API.")
     (license license:asl2.0)))
 
 (define-public vim-guix-vim

gnu/packages/virtualization.scm

@@ -2254,25 +2254,27 @@ any other utility or application that speaks QMP.")
 (define-public qmpbackup
   (package
     (name "qmpbackup")
-    (version "0.23")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/abbbi/qmpbackup")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0x9v81z0b2qr2y6m46rfnl4kl5jnixsdrl1c790iwl6pq9kzzvzg"))))
-    (build-system python-build-system)
+    (version "0.52")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/abbbi/qmpbackup")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0wf9ryc7jiwkkqjpl1y5k814zzr0cbxib2ivl6lvs8vnq6pgbzw6"))))
+    (build-system pyproject-build-system)
     ;; The test suite requires to download a 241 MiB QEMU image; skip it.
     (arguments (list #:tests? #f))
+    (native-inputs (list python-setuptools))
     (inputs (list python-qemu-qmp))
     (home-page "https://github.com/abbbi/qmpbackup")
     (synopsis "Backup and restore QEMU machines")
-    (description "@command{qmpbackup} is designed to create and restore full
-and incremental backups of running QEMU virtual machines via QMP, the QEMU
-Machine Protocol.")
+    (description
+     "@command{qmpbackup} is designed to create and restore full and
+incremental backups of running QEMU virtual machines via QMP, the QEMU Machine
+Protocol.")
     (license license:gpl3+)))
 
 (define-public looking-glass-client
@@ -2951,17 +2953,20 @@ created virtual machines and the respective ssh-parameters.")
 (define-public python-vagrant
   (package
     (name "python-vagrant")
-    (version "0.5.15")
+    (version "1.1.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "python-vagrant" version))
-        (sha256
-         (base32
-          "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg"))))
-    (build-system python-build-system)
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/todddeluca/python-vagrant")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "032g398vddnaxhkvhdz0x1fxvp8qbgjqiigza1racqq8gp6di6va"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:tests? #f)) ; tests involve running vagrant.
+     (list #:tests? #f)) ;tests involve running vagrant.
+    (native-inputs (list python-setuptools))
     (home-page "https://github.com/todddeluca/python-vagrant")
     (synopsis "Python bindings for Vagrant")
     (description

gnu/packages/vpn.scm

@@ -47,6 +47,7 @@
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
@@ -77,6 +78,8 @@
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
+  #:use-module (gnu packages groff)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
@@ -93,6 +96,7 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages samba)
+  #:use-module (gnu packages security-token)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
@@ -835,63 +839,287 @@ security protocol that utilizes SSL/TLS for key exchange.  It is capable of
 traversing network address translators (@dfn{NAT}s) and firewalls.")
     (license license:gpl2)))
 
-(define-public protonvpn-cli
+(define-public python-proton-core
   (package
-    (name "protonvpn-cli")
-    (version "2.2.6")
+    (name "python-proton-core")
+    (version "0.7.0")
+    (home-page "https://github.com/ProtonVPN/python-proton-core")
     (source
      (origin
-       ;; PyPI has a ".whl" file but not a proper source release.
-       ;; Thus, fetch code from Git.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ProtonVPN/linux-cli")
+              (url home-page)
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0j8pl2cx676g6akz110j0093bw6mg8g0p3nnng340y3kka9cngv5"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      #~(list ;; XXX: Require network access.
+         "--ignore=tests/test_alternativerouting.py"
+         "--ignore=tests/test_session.py"
+         "--ignore=tests/test_tlsverification.py"
+         "-k"  "not test_auto_works_on_prod")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'prepare-tests
+            (lambda _
+              (setenv "HOME" (getcwd))
+              (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/.run")))))))
+    (native-inputs
+     (list gnupg
+           python-pyotp
+           python-pytest
+           python-pytest-cov
+           python-pyxdg
+           python-setuptools))
+    (propagated-inputs
+     (list python-aiohttp
+           python-bcrypt
+           python-gnupg
+           python-pyopenssl
+           python-requests))
+    (synopsis "Core logic used by the other Proton components")
+    (description
+     "This package is a core library used by other @code{python-proton-}
+packages.")
+    (license license:gpl3+)))
+
+(define-public python-proton-keyring-linux
+  (package
+    (name "python-proton-keyring-linux")
+    (version "0.2.1")
+    (home-page "https://github.com/ProtonVPN/python-proton-keyring-linux")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url home-page)
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0a2q10z44x75fvz6rmhki0vn6500v0ybi50hbhikhkpfr3a5vsbm"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest
+           python-pytest-cov
+           python-setuptools))
+    (propagated-inputs
+     (list python-keyring
+           python-proton-core))
+    (synopsis "Proton keyring plugin")
+    (description
+     "This package provides a keyring plugin for Proton technologies.")
+    (license license:gpl3+)))
+
+(define-public python-proton-vpn-api-core
+  (package
+    (name "python-proton-vpn-api-core")
+    (version "4.14.1")
+    (home-page "https://github.com/ProtonVPN/python-proton-vpn-api-core")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url home-page)
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0s7qasxiwd924dps1696vlnxr7626li5c31kv2kb3c4sqk6s6867"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'prepare-tests
+            (lambda _
+              (setenv "HOME" (getcwd))
+              (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/.run")))))))
+    (native-inputs
+     (list python-pytest
+           python-pytest-asyncio
+           python-pytest-cov
+           python-pyxdg
+           python-setuptools
+           network-manager
+           network-manager-openvpn))
+    (propagated-inputs
+     (list python-cryptography
+           python-distro
+           python-fido2
+           python-sentry-sdk
+           python-pynacl
+           python-packaging
+           python-proton-core
+           python-proton-vpn-local-agent
+           python-pygobject
+           python-pycairo
+           python-jinja2))
+    (synopsis "Core logic used by the other Proton VPN components")
+    (description
+     "This package is a core library used by other @code{python-proton-vpn-}
+packages.")
+    (license license:gpl3+)))
+
+(define-public python-proton-vpn-local-agent
+  (let* ((name "python-proton-vpn-local-agent")
+         (version "1.6.0")
+         (local-agent-version "0.10.1")
+         (home-page "https://github.com/ProtonVPN/local-agent-rs")
+         (base-origin
+          (origin
+            (method git-fetch)
+            (uri (git-reference
+                   (url home-page)
+                   (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32 "13ym2hhb5ndiffc8z551bb2hk2rdkld2r8cwhyq3nl5lma5z0kdf")))))
+    (package
+      (name name)
+      (version version)
+      (home-page home-page)
+      (source base-origin)
+      (build-system cargo-build-system)
+      (arguments
+       (list
+        #:install-source? #false
+        #:imported-modules `(,@%cargo-build-system-modules
+                             ,@%pyproject-build-system-modules)
+        #:modules '((guix build cargo-build-system)
+                    ((guix build pyproject-build-system) #:prefix py:)
+                    (guix build utils))
+        #:phases
+        (with-extensions (list (pyproject-guile-json))
+          #~(modify-phases %standard-phases
+              (add-after 'unpack 'chdir
+                (lambda _
+                  (chdir "python-proton-vpn-local-agent")))
+              ;; XXX: Inject the local_agent_rs crate as a vendored dependency
+              ;; instead of using path=. Otherwise the 'package phase is broken.
+              (add-after 'chdir 'patch-local-agent-rs-version
+                (lambda _
+                  (substitute* "Cargo.toml"
+                    (("\\{ (path = \"\\.\\./local_agent_rs\") \\}")
+                     (format #f "{ version = ~s }" #$local-agent-version)))))
+              ;; XXX: There is currently no proper way to install a wheel.
+              (add-after 'install 'prepare-python-module-with-flit
+                (lambda _
+                  (define (touch file)
+                    (call-with-output-file file (const #t)))
+                  (mkdir-p "python/proton/vpn/")
+                  (for-each touch '("python/proton/__init__.py"
+                                    "python/proton/vpn/__init__.py"))
+                  (copy-file "target/release/libpython_proton_vpn_local_agent.so"
+                             ;; XXX: Install as .py or flit fails to do so.
+                             "python/proton/vpn/local_agent.py")
+                  (call-with-output-file "python/pyproject.toml"
+                    (lambda (port)
+                      (format port "\
+[build-system]
+requires = [\"flit_core\"]
+build-backend = \"flit_core.buildapi\"
+
+[project]
+name = ~s
+version = ~s
+description = ~s
+
+[tool.flit.module]
+name = ~s~%"
+                              "proton_vpn_local_agent"
+                              #$version
+                              #$(package-description this-package)
+                              "proton.vpn.local_agent")))
+                  (chdir "python")))
+              (add-after 'prepare-python-module-with-flit 'build-python-module
+                (assoc-ref py:%standard-phases 'build))
+              (add-after 'build-python-module 'install-python-module
+                (assoc-ref py:%standard-phases 'install))
+              (add-after 'install-python-module 'fix-python-installation
+                (lambda* (#:key inputs outputs #:allow-other-keys)
+                  (with-directory-excursion (py:site-packages inputs outputs)
+                    (rename-file "proton/vpn/local_agent.py"
+                                 "proton/vpn/local_agent.so")
+                    (substitute* (find-files "." "RECORD")
+                      (("proton/vpn/local_agent\\.py")
+                       "proton/vpn/local_agent.so")))))
+              (add-after 'fix-python-installation 'add-install-to-pythonpath
+                (assoc-ref py:%standard-phases 'add-install-to-pythonpath))
+              (add-after 'add-install-to-pythonpath 'python-check
+                (lambda args
+                  (chdir "..")
+                  (apply (assoc-ref py:%standard-phases 'check)
+                         (cons* #:test-flags (list) args))))))))
+      (native-inputs
+       (list python-flit-core
+             python-pytest
+             python-pytest-asyncio))
+      (inputs
+       (cons*
+        (origin
+          (inherit base-origin)
+          (file-name (git-file-name "local_agent_rs" local-agent-version))
+          (modules '((guix build utils)
+                     (ice-9 ftw)))
+          (snippet
+           #~(begin
+               ;; Delete everything except for local_agent_rs itself:
+               (for-each (lambda (file)
+                           (unless (member file '("." ".." "local_agent_rs"))
+                             (delete-file-recursively file)))
+                         (scandir "."))
+               (for-each
+                (lambda (file)
+                  (unless (member file '("." ".."))
+                    (rename-file (string-append "local_agent_rs/" file) file)))
+                (scandir "local_agent_rs")))))
+        python-wrapper
+        (cargo-inputs 'python-proton-vpn-local-agent)))
+      (synopsis "Communicate with a Proton LocalAgent")
+      (description
+       "This package contains a rust crate for communicating with a Proton
+LocalAgent, server, and python-bindings for that crate.")
+      (license license:gpl3+))))
+
+(define-public proton-vpn-cli
+  (package
+    (name "proton-vpn-cli")
+    (version "0.1.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ProtonVPN/proton-vpn-cli")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"))))
-    (build-system python-build-system)
+        (base32 "1kckgdqx9mgayyj3dh2fgd9brzw2s4wrxl6ajsfssnfmpqnz2zhy"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:tests? #f ; no tests in repo
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'wrap 'wrap-wrapper
-           ;; Wrap entrypoint with paths to its hard dependencies.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((entrypoint (string-append (assoc-ref outputs "out")
-                                              "/bin/protonvpn")))
-               (wrap-program entrypoint
-                            #:sh (search-input-file inputs "bin/bash")
-                            `("PATH" ":" prefix
-                              ,(map (lambda (name)
-                                      (let ((input (assoc-ref inputs name)))
-                                        (string-append input "/bin:"
-                                                       input "/sbin")))
-                                    (list "dialog"
-                                          "iproute2"
-                                          "iptables"
-                                          "ncurses"
-                                          "openvpn"
-                                          "procps"
-                                          "which")))))))
-         ;; The `protonvpn' script wants to write to `~user' to initialize its
-         ;; logger, so simply setting HOME=/tmp won't cut it.  Remove
-         ;; sanity-check.
-         (delete 'sanity-check))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'prepare-tests
+            (lambda _
+              (setenv "HOME" (getcwd))
+              (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/.run")))))))
     (native-inputs
-     (list python-docopt))
-    (inputs
-     (list bash-minimal
-           dialog
-           iproute
-           iptables
-           ncurses
-           openvpn
-           procps
-           python-dialog
-           python-jinja2
-           python-requests
-           which))
+     (list python-pytest
+           python-pytest-asyncio
+           python-pytest-cov
+           python-pyxdg
+           python-setuptools))
+    (propagated-inputs
+     (list python-click
+           python-dbus-fast
+           python-proton-core
+           python-proton-vpn-api-core
+           python-proton-vpn-local-agent
+           python-proton-keyring-linux
+           python-sentry-sdk))
     (synopsis "Command-line client for ProtonVPN")
     (description
      "This is the official command-line interface for ProtonVPN, a secure
@@ -901,6 +1129,8 @@ VPN.  The gratis tier offers unlimited bandwidth for up to 10 devices.")
     (home-page "https://github.com/ProtonVPN/linux-cli")
     (license license:gpl3+)))
 
+(define-deprecated-package protonvpn-cli proton-vpn-cli)
+
 (define-public tinc
   (package
     (name "tinc")

gnu/packages/web.scm

@@ -79,6 +79,7 @@
 ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
 ;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
 ;;; Copyright © 2025 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5511,17 +5512,13 @@ Integration Center (4DN-DCIC).")
        (sha256
         (base32 "1mc4856draxac5s7acywq060a0awng195cpbs1js1wn6cixl1l69"))
        (patches (search-patches "python-feedparser-missing-import.patch"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     (list python-sgmllib3k))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               (add-installed-pythonpath inputs outputs)
-               (invoke "python" "tests/runtests.py")))))))
+     (list
+      #:test-backend #~'custom
+      #:test-flags #~(list "tests/runtests.py")))
+    (native-inputs (list python-setuptools))
+    (propagated-inputs (list python-sgmllib3k))
     (home-page "https://github.com/kurtmckee/feedparser")
     (synopsis "Parse feeds in Python")
     (description
@@ -9165,23 +9162,34 @@ easy, fast, and effective.")
 (define-public buku
   (package
     (name "buku")
-    (version "4.6")
+    (version "5.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "buku" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jarun/buku")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1n4d1mkjyvzdxbyq067p1p9skb3iwx0msd86nzr224dlqrfh9675"))))
-    (build-system python-build-system)
+        (base32 "0krg13q2fa3r29knrl7ngq28dgzzxc9gif12gxkkm4djma2c1v7d"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f                     ; FIXME: many tests need network access
-       #:phases
-       (modify-phases %standard-phases
-         ;; XXX: missing inputs, e.g. python-flask-admin
-         (delete 'sanity-check))))
-    (inputs
-     (list python-beautifulsoup4 python-certifi python-cryptography
-           python-flask python-html5lib python-urllib3))
+     (list
+      ;; XXX: missing inputs for bukuserver
+      #:test-flags
+      #~(list "--ignore=tests/test_server.py"
+              "--ignore=tests/test_views.py"
+              "--deselect=tests/test_buku.py::test_fetch_data_with_url")
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'sanity-check))))
+    (native-inputs (list python-pytest python-pyyaml python-setuptools))
+    (inputs (list python-beautifulsoup4
+                  python-certifi
+                  python-cryptography
+                  python-flask
+                  python-html5lib
+                  python-urllib3))
     (home-page "https://github.com/jarun/buku")
     (synopsis "Bookmark manager")
     (description
@@ -9300,16 +9308,11 @@ program and as a web server.")
               (sha256
                (base32
                 "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv" "tests.py" "anonip.py")))))))
+     (list #:test-flags #~(list "tests.py" "anonip.py")))
     (native-inputs
-     (list python-pytest python-pytest-cov))
+     (list python-pytest python-pytest-cov python-setuptools))
     (home-page "https://github.com/DigitaleGesellschaft/Anonip")
     (synopsis "Anonymize IP addresses in log files")
     (description
@@ -9989,6 +9992,32 @@ and read AWS CloudWatch logs.  The same functionality is available from
 @code{aws logs tail}.")
     (license license:bsd-3)))
 
+(define-public lexbor
+  (package
+    (name "lexbor")
+    (version "2.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/lexbor/lexbor")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "033hna4b9lh0675vri140nhnqbyj4vsa02j5r17fmdza6594islp"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags #~(list "-DLEXBOR_BUILD_TESTS=ON"
+                                     "-DLEXBOR_BUILD_TESTS_CPP=ON")))
+    (home-page "https://lexbor.com/")
+    (synopsis "@code{HTML} and @code{CSS} renderer written in @code{C}")
+    (description
+     "This package provides @code{Lexbor}, a high-performance, lightweight
+@code{HTML}/@code{CSS} engine implemented entirely in @code{C99} with no external
+dependencies.  It's primarily usage is intended for projects that need to process
+web content, but don't require a full browser environment.")
+    (license license:asl2.0)))
+
 (define-public orcania
   (package
     (name "orcania")

gnu/packages/wireservice.scm

@@ -119,26 +119,31 @@ previously known as journalism.")
 (define-public python-agate-sql
   (package
     (name "python-agate-sql")
-    (version "0.7.2")
+    (version "0.7.3")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wireservice/agate-sql")
-             (commit version)))
+              (url "https://github.com/wireservice/agate-sql")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "03pvya65jm4s5sxwz0msj5dwjr6mk7dja3wdyh7hmf31dpczkjm8"))))
+        (base32 "04rcrcv57wdbkg90k1s0rwhlw223nm9fhw9x6xkl8nwxr0n6zyk0"))))
     (build-system pyproject-build-system)
     ;; XXX: Documentation requires <https://github.com/pradyunsg/furo> which
     ;; is not packaged yet and depends on some missing Node.js packages
+    (arguments
+     (list
+      #:test-flags
+      ;; TODO: sqlalchemy.exc.NoSuchModuleError: Can't load plugin:
+      ;; sqlalchemy.dialects:crate
+      #~(list "-k" "not test_to_sql_create_statement_with_dialects")))
     (native-inputs
      (list python-pytest
-           python-setuptools
-           python-wheel))
+           ;; python-sqlalchemy-cratedb  ;not packaged, long journey
+           python-setuptools))
     (propagated-inputs
      (list python-agate
-           python-crate
            python-sqlalchemy))
     (home-page "https://agate-sql.rtfd.org")
     (synopsis "SQL read/write support to agate")

gnu/packages/wm.scm

@@ -983,29 +983,28 @@ window managers.")
              (url "https://github.com/ziberna/i3-py")
              (commit "27f88a616e9ecc340e7d041d3d00782f8a1964c1")))
        (sha256
-        (base32
-         "1nm719dc2xqlll7vj4c4m7mpjb27lpn3bg3c66gajvnrz2x1nmxs"))
+        (base32 "1nm719dc2xqlll7vj4c4m7mpjb27lpn3bg3c66gajvnrz2x1nmxs"))
        (file-name (string-append name "-" version "-checkout"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f ; no tests yet
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'install-doc
-                    ;; Copy readme file to documentation directory.
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((doc (string-append (assoc-ref outputs "out")
-                                                "/share/doc/" ,name)))
-                        (install-file "README.md" doc)
-                        ;; Avoid unspecified return value.
-                        #t))))))
-    (propagated-inputs
-     (list i3-wm))
+     (list
+      #:tests? #f ;no tests yet
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-doc
+            ;; Copy readme file to documentation directory.
+            (lambda _
+              (install-file "README.md"
+                            (string-append #$output "/share/doc/" #$name)))))))
+    (native-inputs (list python-setuptools))
+    (propagated-inputs (list i3-wm))
     (home-page "https://github.com/ziberna/i3-py")
     (synopsis "Python interface to the i3 window manager")
-    (description "This package allows you to interact from a Python program
-with the i3 window manager via its IPC socket.  It can send commands and other
-kinds of messages to i3, select the affected containers, filter results and
-subscribe to events.")
+    (description
+     "This package allows you to interact from a Python program with the i3
+window manager via its IPC socket.  It can send commands and other kinds of
+messages to i3, select the affected containers, filter results and subscribe
+to events.")
     (license license:gpl3+)))
 
 (define-public qtile

gnu/packages/xdisorg.scm

@@ -1096,30 +1096,6 @@ including drivers for chipsets produced by 3DFX, AMD (formerly ATI), Intel
 and Matrox.")
     (license license:x11)))
 
-(define-public libdrm-armada-novena
-  (package
-    (name "libdrm-armada-novena")
-    (version "2.0.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/novena-next/libdrm-armada.git")
-                     (commit (string-append "novena/" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0d770rxn1zzndzxxh9bcmn2p9yapvmyam0rvyjhv5ngq527ykm4p"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config automake autoconf libtool))
-    (inputs
-     (list libdrm))
-    (synopsis "libdrm for i.MX6 graphics")
-    (description "This package provides an accelerated X server library for
-i.MX6.")
-    (home-page "https://github.com/novena-next/libdrm-armada")
-    (license license:gpl2+)))
-
 (define-public mtdev
   (package
     (name "mtdev")

gnu/packages/xml.scm

@@ -1127,6 +1127,19 @@ different Unicode encodings which happen automatically during
 parsing/saving.")
     (license license:expat)))
 
+(define-public pugixml-next
+  (package
+    (inherit pugixml)
+    (name "pugixml-next")
+    (version "1.15")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://github.com/zeux/pugixml/releases/download/v"
+                          version "/pugixml-" version ".tar.gz"))
+      (sha256
+       (base32 "06ji1pcm74y7i0gxs5fl8nqxsjq6nl9h36pbq8hv8gvhz9bxwnk5"))))))
+
 (define-public python-pyxb-x
   (package
     (name "python-pyxb-x")
@@ -1463,7 +1476,7 @@ elements to their parents
 (define-public xlsx2csv
   (package
     (name "xlsx2csv")
-    (version "0.7.8")
+    (version "0.8.3")
     (source
      (origin
        (method git-fetch)
@@ -1472,19 +1485,21 @@ elements to their parents
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1p10571295f8zw1lsma8k5z07hrk9aspar0lsz8zpgjl7v35zcq7"))))
-    (build-system python-build-system)
+        (base32 "0cg2zf6dqnxdcsw0bpjz49sa7360iz9bvc9j7c50qhp9ms81vfs8"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (substitute* "test/run"
-               ;; Run tests with `python' only.
-               (("^(PYTHON_VERSIONS = ).*" all m)
-                (string-append m "['']")))
-             (when tests?
-               (invoke "test/run")))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (substitute* "test/run"
+                ;; Run tests with `python' only.
+                (("^(PYTHON_VERSIONS = ).*" all m)
+                 (string-append m "['']")))
+              (when tests?
+                (invoke "test/run")))))))
+    (native-inputs (list python-setuptools))
     (home-page "https://github.com/dilshod/xlsx2csv")
     (synopsis "XLSX to CSV converter")
     (description

gnu/packages/xorg.scm

@@ -2790,51 +2790,6 @@ X server.")
      "xf86-video-ark is an Ark Logic video driver for the Xorg X server.")
     (license license:x11)))
 
-(define-public xf86-video-armada-novena
-  (package
-    (name "xf86-video-armada-novena")
-    (version "1.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/novena-next/xf86-video-armada.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "01h27ck9s9rxyi9n8v9lqpd9aacln0w5pd5zlfgj740060q3wf30"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags
-           #~(list "--disable-vivante" "--disable-etnaviv"
-                   (string-append "--with-etnaviv-source="
-                                  (assoc-ref %build-inputs "etna-viv")))
-           #:phases
-           #~(modify-phases %standard-phases
-               (replace 'bootstrap
-                 (lambda _
-                   (mkdir "m4")
-                   (invoke "autoreconf" "--install"))))))
-    (inputs
-     (list xorg-server libdrm-armada-novena))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("automake" ,automake)
-       ("autoconf" ,autoconf)
-       ("libtool" ,libtool)
-       ("etna-viv" ,(origin
-                      (method git-fetch)
-                      (uri (git-reference
-                            (url "https://github.com/laanwj/etna_viv.git")
-                            (commit "d4c87f61bdcd15f98d4bdbea8c34788bb71fbad9")))
-                      (sha256
-                       (base32
-                        "0qfzwsmcq1lcwng707vlfql8nnkqqyhspfydxpfs03gn8w0l2cm2"))))))
-    (synopsis "Xorg driver for Freescale i.MX6")
-    (description "This package provides Xorg support for Freescale i.MX6.")
-    (home-page "https://github.com/novena-next/xf86-video-armada")
-    (license license:gpl2)))
-
 (define-public xf86-video-ast
   (package
     (name "xf86-video-ast")

gnu/packages/zig-xyz.scm

@@ -43,64 +43,6 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages zig))
 
-(define-public beanbag
-  (package
-    (name "beanbag")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/bwbuhse/beanbag")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1d2h5bqicqnyawswdq7bg1w9frjk0ra2sva1as2qgc5s7pjclyql"))
-       (snippet (rename-zig-dependencies '(("clap" . "zig-clap")
-                                           ("zigimg" . "zig-zigimg"))))))
-    (build-system zig-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:zig-release-type "safe"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-deps
-            (lambda* (#:key inputs #:allow-other-keys)
-              (delete-file-recursively "protocol")
-              (substitute* "build.zig"
-                (("protocol/(wlr-layer-shell-unstable-v1.xml)" _ file)
-                 (string-append
-                  (search-input-file
-                   inputs
-                   (in-vicinity "share/wlr-protocols/unstable/" file)))))))
-          ;; TODO: Support test-target when changing zig-build-system next time.
-          (replace 'check
-            (lambda* (#:key tests? zig-test-flags target parallel-tests?
-                      #:allow-other-keys)
-              (when (and tests? (not target))
-                (let ((old-destdir (getenv "DESTDIR")))
-                  (setenv "DESTDIR" "test-out") ;; Avoid colisions with the build output
-                  (let ((call `("zig" "build" "check" "--verbose"
-                                ,(string-append
-                                  "-j" (if parallel-tests?
-                                           (number->string (parallel-job-count))
-                                           "1"))
-                                ,@zig-test-flags)))
-                    (format #t "running: ~s~%" call)
-                    (apply invoke call))
-                  (if old-destdir
-                      (setenv "DESTDIR" old-destdir)
-                      (unsetenv "DESTDIR")))))))))
-    (inputs (list wlr-protocols zig-clap zig-pixman zig-wayland zig-zigimg))
-    (native-inputs (list pkg-config))
-    (home-page "https://codeberg.org/bwbuhse/beanbag")
-    (synopsis "Wallpaper application for Wayland compositors")
-    (description
-     "@command{beanbag} is a wallpaper application for Wayland compositors,
-heavily inspired by @code{wbg}.")
-    (license license:gpl3+)))
-
 (define-public poop
   (package
     (name "poop")

gnu/services/base.scm

@@ -241,6 +241,7 @@
             guix-extension
             guix-extension?
             guix-extension-authorized-keys
+            guix-extension-channels
             guix-extension-substitute-urls
             guix-extension-chroot-directories
 
@@ -2428,6 +2429,8 @@ guix-daemon have the right ownership."))
 (define-record-type* <guix-extension>
   guix-extension make-guix-extension
   guix-extension?
+  (channels guix-extension-channels     ;list of channel
+            (default '()))
   (authorized-keys guix-extension-authorized-keys ;list of file-like
                     (default '()))
   (substitute-urls guix-extension-substitute-urls ;list of strings
@@ -2439,6 +2442,8 @@ guix-daemon have the right ownership."))
 
 (define (guix-extension-merge a b)
   (guix-extension
+   (channels (append (guix-extension-channels a)
+                     (guix-extension-channels b)))
    (authorized-keys (append (guix-extension-authorized-keys a)
                             (guix-extension-authorized-keys b)))
    (substitute-urls (append (guix-extension-substitute-urls a)
@@ -2464,6 +2469,8 @@ guix-daemon have the right ownership."))
    (extend (lambda (config extension)
              (guix-configuration
               (inherit config)
+              (channels (append (guix-extension-channels extension)
+                                (guix-configuration-channels config)))
               (authorized-keys (append (guix-extension-authorized-keys extension)
                                        (guix-configuration-authorized-keys config)))
               (substitute-urls (append (guix-extension-substitute-urls extension)
@@ -4029,6 +4036,7 @@ to handle."
      config-file-name
      "[general]\n"
      "source_profile = " (if source-profile? "true" "false") "\n"
+     "runfile = /run/greetd/runfiles/greetd-" terminal-vt ".run\n"
      "[terminal]\n"
      "vt = " terminal-vt "\n"
      "switch = " (if terminal-switch "true" "false") "\n"
@@ -4050,6 +4058,14 @@ to handle."
           (check? #f)
           (flags '(no-suid no-dev no-exec))
           (options "mode=0755")
+          (create-mount-point? #t))
+        (file-system
+          (device "none")
+          (mount-point "/run/greetd/runfiles")
+          (type "tmpfs")
+          (check? #f)
+          (flags '(no-suid no-dev no-exec))
+          (options "mode=0755")
           (create-mount-point? #t))))
 
 (define %greetd-pam-mount-rules

gnu/services/cuirass.scm

@@ -500,7 +500,16 @@ CONFIG."
                                    (string-append "--private-key="
                                                   private-key))
                                   '()))
-                    #:log-file #$log-file))
+
+                     ;; Work around
+                     ;; <https://codeberg.org/guile/fibers/issues/83>.
+                     ;; TODO: Remove when using Guile > 3.0.9.
+                     #:environment-variables
+                     (if (string-prefix? "aarch64-" %host-type)
+                         '("GUILE_JIT_THRESHOLD=-1")
+                         '())
+
+                     #:log-file #$log-file))
            (stop #~(make-kill-destructor))))))
 
 (define cuirass-remote-worker-service-type