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
2026-07-12 22:14:08 +02:00 · 2025-12-28 09:57:09 -08:00
77 changed files with 2133 additions and 7828 deletions
@@ -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
@@ -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.

@@ -91,7 +91,7 @@ each retry."
              ((sleep*) delay)            ;else wait and retry
              (loop (+ 1 attempts)))
            (error "maximum number of retry attempts reached"
-                   (quote (begin body ...)) args))))))
+                   (quote body ...) args))))))


 ;;;
@@ -35,7 +35,7 @@
 # Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 # Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 # Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
-# Copyright © 2020, 2023, 2025 Tanguy Le Carrour <tanguy@bioneland.org>
+# Copyright © 2020, 2023 Tanguy Le Carrour <tanguy@bioneland.org>
 # Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
 # Copyright © 2020, 2023 Vinicius Monego <monego@posteo.net>
@@ -343,7 +343,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/gperf.scm			\
  %D%/packages/gpodder.scm			\
  %D%/packages/gps.scm				\
-  %D%/packages/graal.scm			\
  %D%/packages/graph.scm			\
  %D%/packages/graphics.scm			\
  %D%/packages/graphviz.scm			\
@@ -804,7 +803,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/system/uuid.scm				\
  %D%/system/vm.scm				\
 						\
-  %D%/system/images/a20-olinuxino-lime2.scm			\
  %D%/system/images/hurd.scm			\
  %D%/system/images/novena.scm			\
  %D%/system/images/orangepi-r1-plus-lts-rk3328.scm	\
@@ -1089,7 +1087,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/cdparanoia-fpic.patch			\
  %D%/packages/patches/cdrkit-libre-cross-compile.patch	\
  %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch 	\
-  %D%/packages/patches/ceph-fix-cmake.patch                     \
+  %D%/packages/patches/ceph-disable-cpu-optimizations.patch	\
+  %D%/packages/patches/ceph-fix-for-newer-boost.patch		\
  %D%/packages/patches/cf-tool-add-languages.patch		\
  %D%/packages/patches/chmlib-inttypes.patch			\
  %D%/packages/patches/cl-asdf-config-directories.patch		\
@@ -1524,7 +1523,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/gpaste-fix-paths.patch			\
  %D%/packages/patches/gpm-glibc-2.26.patch			\
  %D%/packages/patches/gpodder-disable-updater.patch		\
-  %D%/packages/patches/graalvm-mx-check-failed-after-join.patch	\
  %D%/packages/patches/grantlee-fix-i586-precision.patch	\
  %D%/packages/patches/grantlee-register-metaenumvariable.patch	\
  %D%/packages/patches/grep-timing-sensitive-test.patch		\
@@ -78,7 +78,6 @@
 ;;; Copyright © 2024 nik gaffney <nik@fo.am>
 ;;; Copyright © 2025 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2025 Luca Kredel <luca.kredel@web.de>
-;;; Copyright © 2025 ROCKTAKEY <rocktakey@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6951,41 +6950,6 @@ with which other processes.  It provides more usable versions of @command{ps},
 network, which causes enabled computers to power on.")
    (license license:gpl2+)))

-(define-public witr
-  (package
-    (name "witr")
-    (version "0.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/pranshuparmar/witr")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "016yiwn0b00ynllka6h2w6gk2yjzj5nx2xf26shb0cz4crdwww0d"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:install-source? #f
-      #:import-path "github.com/pranshuparmar/witr/cmd/witr"
-      #:unpack-path "github.com/pranshuparmar/witr"
-      #:build-flags #~(list "-ldflags"
-                            (string-append "-X main.version=" #$version))))
-    (home-page "https://github.com/pranshuparmar/witr")
-    (synopsis "Utility to show why the process is running")
-    (description
-     "The @dfn{witr} (why-is-this-running), is a utility to show:
-@enumerate
-@item What is running?
-@item How did it start?
-@item What is keeping it running?
-@item What context does it belong to?
-@end enumerate
-It shows which process uses the port, and its information like process tree,
-working directory, user, pid, command, and so on.")
-    (license license:asl2.0)))
-
 (define-public xfel
  (package
    (name "xfel")
@@ -16242,11 +16242,9 @@ applications for tackling some common problems in a user-friendly way.")
                (sha256
                 (base32
                  "07q0alxah6xl1hibaj1kj7pdzq3pg6csyapsihbwlbmqyfmllbgz"))))
-      (build-system pyproject-build-system)
+      (build-system python-build-system)
      (arguments
       (list
-        #:test-backend #~'custom
-        #:test-flags #~(list "test/test_all.py")
        #:phases
        #~(modify-phases %standard-phases
            ;; Scipy 1.12 no longer has binom_test or polyfit
@@ -16275,12 +16273,15 @@ applications for tackling some common problems in a user-friendly way.")
                   (string-append "(\"" #$output
                                  "/etc/bash_completion.d\""))
                  (("extras/\\.bash_completion")
-                   "extras/tadbit")))))))
+                   "extras/tadbit"))))
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (invoke "python3" "test/test_all.py")))))))
      (native-inputs
       (list `(,glib "bin") ;for gtester
             glib
-             pkg-config
-             python-setuptools))
+             pkg-config))
      (inputs
       ;; TODO: add Chimera for visualization
       (list imp
@@ -21060,24 +21061,15 @@ polymorphisms) and indels with respect to a reference genome and more.")
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/etal/cnvkit")
-              (commit (string-append "v" version))))
+             (url "https://github.com/etal/cnvkit")
+             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "090yh17symcahddx399kcx0mcw4gdrcc2jil3p8lb92r8c8kglb5"))))
    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 70 passed, 1 warning
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-pytest-config
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("filterwarnings =.*")
-                 "")))))))
    (propagated-inputs
     (list python-biopython
+           python-future
           python-matplotlib
           python-numpy
           python-pandas
@@ -335,7 +335,7 @@ parallel study, and original language study.")
 (define-public book-emacs-lisp-elements
  (package
    (name "book-emacs-lisp-elements")
-    (version "2.0.1")
+    (version "2.0.0")
    (source
     (origin
       (method git-fetch)
@@ -344,7 +344,7 @@ parallel study, and original language study.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0774zycgx3zspn6f8pszap1751xgrlv2h3x66kksnj589nfnwzil"))))
+        (base32 "0w3jxgkynq37rn7c17pnricykqf3gmq4crsvkz2j2g3hc0ydf6qp"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -8,7 +8,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2020, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019, 2020 Giacomo Leidi <therewasa@fishinthecalculator.me>
@@ -239,21 +239,6 @@ across a broad spectrum of applications.")
    (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
                                "Some components have other similar licences."))))

-(define-public boost-1.88
-  (package
-    (inherit boost)
-    (name "boost")
-    (version "1.88.0")
-    (source (origin
-              (inherit (package-source boost))
-              (uri (string-append
-                    "https://archives.boost.io/release/"
-                    version "/source/boost_"
-                    (version-with-underscores version) ".tar.bz2"))
-              (sha256
-               (base32
-                "0yrgn6syk260ckq9ld44vjv1bl6bamhy3jbp10kikcipcv0d5na6"))))))
-
 (define-public boost-1.83
  (hidden-package (package (inherit boost)
    (name "boost")
@@ -1008,7 +1008,7 @@ has been designed to be fast, light and unintrusive.")
 (define-public kyua
  (package
    (name "kyua")
-    (version "0.14.1")
+    (version "0.13")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -1017,7 +1017,7 @@ has been designed to be fast, light and unintrusive.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0w238ynhnjz7p2v8fbgxv35kl1x7a4vs86227qhb4gxncr75nsbl"))))
+                "1jzdal9smhmivj18683a5gy8jd2p1dbni7kcpaxq4g9jgjdidcrq"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -1042,6 +1042,16 @@ has been designed to be fast, light and unintrusive.")
                 (format #f "chdir(~s)" (dirname (which "ls"))))
                (("\"/bin/ls\"")
                 (string-append "\"" (which "ls") "\"")))))
+          (add-before 'check 'prepare-for-tests
+            (lambda _
+              ;; The test suite expects HOME to be writable.
+              (setenv "HOME" "/tmp")
+              ;; Generate the autom4te-generated testsuite script, which
+              ;; contains a '/bin/sh' shebang.
+              (invoke "make" "bootstrap/testsuite")
+              (substitute* "bootstrap/testsuite"
+                (("/bin/sh")
+                 (which "sh")))))
          (add-after 'unpack 'disable-problematic-tests
            (lambda _
              ;; The stacktrace tests expect core files to be dumped to the
@@ -1050,8 +1060,12 @@ has been designed to be fast, light and unintrusive.")
              ;; https://github.com/freebsd/kyua/issues/214).
              (substitute* "utils/Kyuafile"
                ((".*atf_test_program.*stacktrace_test.*")
-                 "")))))))
-    (native-inputs (list autoconf automake gdb-minimal libtool pkg-config))
+                 ""))))
+          (add-after 'install 'delete-installed-tests
+            (lambda _
+              ;; Delete 200 MiB of tests.
+              (delete-file-recursively (string-append #$output "/tests")))))))
+    (native-inputs (list autoconf automake gdb-minimal pkg-config))
    (inputs (list atf lutok sqlite))
    (home-page "https://github.com/freebsd/kyua")
    (synopsis "Testing framework for infrastructure software")
@@ -855,7 +855,6 @@ dependency graph expansion and the creation of classpaths.")
       #:doc-dirs '()
       ;; FIXME: Could not initialize class org.eclipse.aether.transport.http.SslSocketFactory
       #:tests? #f
-       #:jdk ,openjdk11
       #:phases
       (modify-phases %standard-phases
         ;; FIXME: Currently, the S3 transporter depends on ClojureScript,
@@ -84,7 +84,6 @@
  #:use-module (gnu packages boost)
  #:use-module (gnu packages check)
  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages crypto)
  #:use-module (gnu packages curl)
  #:use-module (gnu packages documentation)
  #:use-module (gnu packages file)
@@ -96,7 +95,6 @@
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages java)
  #:use-module (gnu packages llvm)
-  #:use-module (gnu packages linux)
  #:use-module (gnu packages man)
  #:use-module (gnu packages maths)
  #:use-module (gnu packages perl)
@@ -599,21 +597,6 @@ than gzip and 15 % smaller output than bzip2.")
   (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both
   (home-page "https://tukaani.org/xz/")))

-(define-public xz-for-graal-truffle
-  (package
-   (inherit xz)
-   (name "xz-for-graal-truffle")
-   (version "5.6.2")
-   (source (origin
-            (method url-fetch)
-            (uri (list (string-append "http://tukaani.org/xz/xz-" version
-                                      ".tar.gz")
-                       (string-append "http://multiprecision.org/guix/xz-"
-                                      version ".tar.gz")))
-            (sha256
-             (base32
-              "06a585qzn2qlwdv44w7x6p6x8qmbqrqzlz29y8108vyqw7021zcb"))))))
-
 (define-public heatshrink
  (package
    (name "heatshrink")
@@ -2527,46 +2510,6 @@ download times, and other distribution and storage costs.")
    (properties `((lint-hidden-cve . ("CVE-2023-23456" "CVE-2023-23457"))))
    (license license:gpl2+)))

-(define-public qatzip
-  (package
-    (name "qatzip")
-    (version "1.3.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/intel/QATzip")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0c7kph69cf48gr97j3gzh1zwd58wxmp64vfv34z4r9ixj3lh6ziz"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (replace 'bootstrap
-                 (lambda _
-                   ;; The script has a broken shebang (see:
-                   ;; <https://github.com/intel/QATzip/issues/143>).
-                   (invoke "sh" "autogen.sh"))))))
-    (native-inputs (list autoconf automake libtool))
-    (inputs (list numactl qatlib))
-    (propagated-inputs (list lz4 zlib)) ;in Requires of qatzip.pc
-    (home-page "https://github.com/intel/QATzip")
-    (synopsis "Compression Library accelerated by Intel QuickAssist Technology")
-    (description "QATzip is a library which builds on top of the
- Intel QuickAssist Technology user space library, to provide extended
-accelerated compression and decompression services by offloading the actual
-compression and decompression request(s) to the Intel Chipset Series.  QATzip
-produces data using the standard gzip format (RFC1952) with extended headers
-or lz4 blocks with lz4 frame format.  The data can be decompressed with a
-compliant gzip or lz4 implementation.  QATzip is designed to take full
-advantage of the performance provided by Intel QuickAssist Technology.")
-    (license license:bsd-3)
-    ;; This package only supports hardware that exists on the x86_64 platform,
-    ;; and is not portable.
-    (supported-systems (list "x86_64-linux"))))
-
 (define-public quazip
  (package
    (name "quazip")
@@ -572,7 +572,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.7.1")
+    (version "5.7.0")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
@@ -585,7 +585,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "16lb58r8vkngics6fn1b3six8bl3nrl9awrnq6ivdv1grfgy9z61"))
+        (base32 "0p1hh3sy5m1l1151wsda3q346pd4dm9hgpwjqakdha8yixyicwj8"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -50,7 +50,6 @@
  #:use-module (gnu packages)
  #:use-module (gnu packages admin)
  #:use-module (gnu packages aidc)
-  #:use-module (gnu packages assembly)
  #:use-module (gnu packages attr)
  #:use-module (gnu packages autotools)
  #:use-module (gnu packages base)
@@ -795,47 +794,6 @@ data on your platform, so the seed itself will be as random as possible.
@end enumerate\n")
    (license license:artistic2.0)))

-(define-public qatlib
-  (package
-    (name "qatlib")
-    (version "25.08.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/intel/qatlib/")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1hbhrj0wlr68by7gdvsw4nh35rwg4yngn3m7awkx799pbqsw4iyc"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags #~(list "--disable-static") ;avoid large .a
-           #:phases
-           #~(modify-phases %standard-phases
-               (replace 'bootstrap
-                 (lambda _
-                   ;; The script has a broken shebang (see:
-                   ;; <https://github.com/intel/qatlib/issues/128>).
-                   (invoke "sh" "autogen.sh"))))))
-    (native-inputs (list autoconf autoconf-archive automake libtool nasm))
-    (inputs (list numactl openssl zlib))
-    (propagated-inputs (list openssl))  ;in 'Requires' of libqat.pc
-    (home-page "https://github.com/intel/qatlib")
-    (synopsis "Intel QuickAssist Technology Library (QATlib)")
-    (description "Intel QuickAssist Technology provides hardware acceleration for
-offloading security, authentication and compression services from the CPU,
-thus significantly increasing the performance and efficiency of standard
-platform solutions.  Its services include symmetric encryption and
-authentication, asymmetric encryption, digital signatures, RSA, DH and ECC,
-and lossless data compression.  This package provides user space libraries
-that allow access to Intel QuickAssist devices and expose the Intel
-QuickAssist APIs and sample codes.")
-    (license license:bsd-3)
-    ;; This package only supports hardware that exists on the x86_64 platform,
-    ;; and is not portable.
-    (supported-systems (list "x86_64-linux"))))
-
 (define-public crypto++
  (package
    (name "crypto++")
@@ -2159,27 +2159,6 @@ data in a single database.  RocksDB is partially based on @code{LevelDB}.")
    ;; files carry the 3-clause BSD license.
    (license (list license:gpl2 license:asl2.0 license:bsd-3))))

-(define-public rocksdb-for-ceph
-  (let ((commit "9fa4990159853479a222244574ca41202e4c95c1")
-        (revision "0"))
-    (package
-      (inherit rocksdb)
-      (name "rocksdb-for-ceph")
-      (version (git-version "7.9.2" revision commit))
-      (source (origin
-                (inherit (package-source rocksdb))
-                (uri (git-reference
-                       (url "https://github.com/ceph/rocksdb")
-                       (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0pdy461m9a48x4i829sirpypdlzf3q79p8iw3dng9wd4r4vyv594"))))
-      (arguments (substitute-keyword-arguments (package-arguments rocksdb)
-                   ((#:configure-flags flags ''())
-                    #~(cons "-DCMAKE_CXX_FLAGS=-Wno-error=maybe-uninitialized"
-                            #$flags)))))))
-
 (define-public sparql-query
  (package
    (name "sparql-query")
@@ -215,7 +215,6 @@
  #:use-module (gnu packages emacs)
  #:use-module (gnu packages emacs-build)
  #:use-module (gnu packages enchant)
-  #:use-module (gnu packages file-systems)
  #:use-module (gnu packages fonts)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu packages games)
@@ -2461,7 +2460,7 @@ syntax for short lambda.")
 (define-public emacs-llm
  (package
    (name "emacs-llm")
-    (version "0.28.4")
+    (version "0.27.3")
    (source
     (origin
       (method git-fetch)
@@ -2470,7 +2469,7 @@ syntax for short lambda.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "14y852vddsppf1izsm5jcdhd59rkgj5la2vmxachia5pxicrqlb6"))))
+        (base32 "1yf6gbl5360747zgcnl983gwghgad892arpb07k5yhpa61jw50aa"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -3329,7 +3328,7 @@ you will die.  The game builds the list of words from the active buffer.")
 (define-public emacs-speed-type
  (package
    (name "emacs-speed-type")
-    (version "1.5")
+    (version "1.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -3338,14 +3337,22 @@ you will die.  The game builds the list of words from the active buffer.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0bnn4a0fpjh94xykifqy2j82rgapvmlvs0vllq0xcskjbvibmdc8"))))
+                "1rw3lgm65jxcs7vbj0055ays4wv23mk2kj3xivnqmhnm030vk868"))))
    (build-system emacs-build-system)
    (arguments
     (list
      #:test-command
      #~(list "emacs" "-Q" "--batch" "-L" "."
-              "-l" "test/speed-type-test.el"
-              "-f" "ert-run-tests-batch-and-exit")))
+              "-l" "test-speed-type.el"
+              "-f" "ert-run-tests-batch-and-exit")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'skip-failing-test
+            ;; This test requires an internet connection.
+            (lambda _
+              (substitute* "test-speed-type.el"
+                (("\\(ert-deftest speed-type--retrieve-test .*" all)
+                 (string-append all " (skip-unless nil)"))))))))
    (native-inputs (list emacs-dash))
    (propagated-inputs (list emacs-compat))
    (home-page "https://github.com/dakra/speed-type")
@@ -6857,7 +6864,7 @@ local LLM capabilities from Emacs.")
 (define-public emacs-org-fc
  (package
    (name "emacs-org-fc")
-    (version "0.9.2")
+    (version "0.7.0")
    (source
     (origin
       (method git-fetch)
@@ -6866,7 +6873,7 @@ local LLM capabilities from Emacs.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1f05z9i5sqx4qk25k057pkazd7mqiagp8l035q4i0zpddjqrwhjr"))))
+        (base32 "1bch6dlw3f8zxvfazsndmilizvxvxpcfgrv89nk6id966y3czrpl"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -21675,50 +21682,6 @@ using a convenient notation.")
    (license (list license:gpl3+
                   license:fdl1.3+)))) ;GFDLv1.3+ for the manual

-(define-public emacs-tmsu
-  ;; There are no releases or tags upstream.
-  (let ((commit "c75ae9bed8f3bb2229e873fcc85fe62701e47974")
-        (revision "0"))
-    (package
-      (name "emacs-tmsu")
-      (version (git-version "0.9" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/vifon/tmsu.el")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0mxz9bmdcdxkj7f4ih405i4vpd35c72xgs1i8cbi0132dpnnblpz"))))
-      (build-system emacs-build-system)
-      (arguments
-       (list
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'patch-exec-paths
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((tmsu (search-input-file inputs "bin/tmsu")))
-                  (substitute* (list "tmsu.el" "tmsu-dired.el")
-                    (("\"tmsu\"")
-                     (string-append "\"" tmsu "\"")))))))
-        #:test-command
-        #~(list "emacs"
-                "-batch"
-                "-l"
-                "tmsu-tests.el"
-                "-f"
-                "ert-run-tests-batch-and-exit")))
-      (inputs (list tmsu))
-      (synopsis "Emacs interface to the @code{tmsu} file tagging tool")
-      (description
-       "@code{tmsu.el} focuses on enhancing the @acronym{UX, User Experience}
-of the most common @code{tmsu} operations: tag editing and querying.  It's
-primarily intended to be used from dired, though @code{tmsu-edit} can be used
-separately from it.")
-      (home-page "https://github.com/vifon/tmsu.el")
-      (license license:gpl3+))))
-
 (define-public emacs-beframe
  (let ((commit "c3f4583b0767e7f8c38c83ed29af40af8ba3bdfa")) ;version bump
    (package
@@ -25388,7 +25351,7 @@ functions written in continuation-passing style.")
 (define-public emacs-attrap
  (package
    (name "emacs-attrap")
-    (version "1.2")
+    (version "1.1")
    (source
     (origin
       (method git-fetch)
@@ -25396,7 +25359,7 @@ functions written in continuation-passing style.")
             (url "https://github.com/jyp/attrap")
             (commit version)))
       (sha256
-        (base32 "0ixxgp3fvx67a6a9xm4z25iaw9mbliyijxr30aj8pd3ski6i8c5b"))
+        (base32 "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"))
       (file-name (git-file-name name version))))
    (build-system emacs-build-system)
    (propagated-inputs
@@ -26119,14 +26082,14 @@ want to use it.")
 (define-public emacs-track-changes
  (package
    (name "emacs-track-changes")
-    (version "1.5")
+    (version "1.4")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://elpa.gnu.org/packages/track-changes-"
                           version ".tar"))
       (sha256
-        (base32 "0ylvxd5iijihqa5l9w6k6hmwaf09hw98k4f9g2hxfbn8sifvgb53"))))
+        (base32 "0ygc53dm144ld4f7ig1fh1z345gnkrin7q108kj9d4dhgp8f2381"))))
    (build-system emacs-build-system)
    (arguments (list #:tests? #f)) ; no tests
    (home-page "https://elpa.gnu.org/packages/track-changes.html")
@@ -31539,7 +31502,7 @@ current upstream.")
 (define-public emacs-ultra-scroll
  (package
    (name "emacs-ultra-scroll")
-    (version "0.5")
+    (version "0.4.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -31548,7 +31511,7 @@ current upstream.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "041jfjfck7lkf3zcbm3gkz8v0w8r3bbw0incvriskbl2iws0ap9i"))))
+                "0k1xqkxq89mz8dvzbfpks3jnrcmbd0hcz8a0hib1m3ka55hpczqz"))))
    (build-system emacs-build-system)
    (arguments (list #:tests? #f))      ;no tests
    (home-page "https://github.com/jdtsmith/ultra-scroll")
@@ -35563,7 +35526,7 @@ instances (play/pause, volume control, media selection, etc.) remotely.")
 (define-public emacs-navigel
  (package
    (name "emacs-navigel")
-    (version "1.1.0")
+    (version "1.0.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -35572,7 +35535,7 @@ instances (play/pause, volume control, media selection, etc.) remotely.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "15vzp5s52m5rj27bsxrz73v3vsjgk1n5rk2b68i5vfbbrxirh188"))))
+                "0fszhjf6bj8frvlnim86sfv6sab3qyignxqh8x6i4bqgwnb6svkf"))))
    (build-system emacs-build-system)
    (native-inputs
     (list emacs-ert-runner))
@@ -40200,7 +40163,7 @@ federated microblogging social network.")
 (define-public emacs-org-social
  (package
    (name "emacs-org-social")
-    (version "2.9")
+    (version "2.7.2")
    (source
     (origin
       (method git-fetch)
@@ -40209,7 +40172,7 @@ federated microblogging social network.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1d8hwrpa20524qiqfwwvsk1h10yqk8fzac74n1ls7ixk28db0nvg"))))
+        (base32 "1cj5r00sdb83v356ni2ic1gdychxidgpnvl48b6wq6j11j8yqa12"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -44561,7 +44524,7 @@ provides an easy way to bind keys under a configurable prefix key.")
 (define-public emacs-spacious-padding
  (package
    (name "emacs-spacious-padding")
-    (version "0.8.0")
+    (version "0.7.0")
    (source
     (origin
       (method git-fetch)
@@ -44570,7 +44533,7 @@ provides an easy way to bind keys under a configurable prefix key.")
              (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1vb9nbzjz5bpfbmmsf2ab8dizqmn4bbk0nd95rfv207gyjrgy6hn"))))
+        (base32 "00mwzbvhzlvnhsbc5rki5cx08fnx4s7cmnlz8lqh534wmsmh3wf0"))))
    (build-system emacs-build-system)
    (arguments
     (list
@@ -44578,7 +44541,12 @@ provides an easy way to bind keys under a configurable prefix key.")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'build-info-manual
-            (lambda _ (emacs-makeinfo))))))
+            (lambda _
+              (invoke "emacs"
+                      "--batch"
+                      "--eval=(require 'ox-texinfo)"
+                      "--eval=(find-file \"README.org\")"
+                      "--eval=(org-texinfo-export-to-info)"))))))
    (native-inputs (list texinfo))
    (home-page "https://github.com/protesilaos/spacious-padding")
    (synopsis "Increase the padding or spacing of frames and windows")
@@ -45842,7 +45810,7 @@ Fennel code within Emacs.")
 (define-public emacs-org-modern
  (package
    (name "emacs-org-modern")
-    (version "1.11")
+    (version "1.10")
    (source
     (origin
       (method git-fetch)
@@ -45850,16 +45818,16 @@ Fennel code within Emacs.")
             (url "https://github.com/minad/org-modern")
             (commit version)))
       (sha256
-        (base32 "0s5sh1hiwmnpyj5jvy93wi1aqf85dznz7rr9kbm77zcfsyqhnly2"))
+        (base32 "1vyfv56cgpp5x3sanq6qsxhd6cgjf2n9awcgy1giary1kad455bl"))
       (file-name (git-file-name name version))))
    (build-system emacs-build-system)
    (propagated-inputs (list emacs-compat))
    (home-page "https://github.com/minad/org-modern")
    (synopsis "Modern Org style")
    (description
-     "Org Modern implements a modern style for your Org buffers using font
-locking and text properties.  The package styles headlines, keywords, tables
-and source blocks.")
+     "Org Modern implements a modern style for your Org buffers using font locking
+and text properties.  The package styles headlines, keywords, tables and
+source blocks.")
    (license license:gpl3+)))

 (define-public emacs-org-modern-indent
@@ -46013,7 +45981,7 @@ hacker.")
 (define-public emacs-osm
  (package
    (name "emacs-osm")
-    (version "2.0")
+    (version "1.10")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -46022,7 +45990,7 @@ hacker.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1yldym0ny5y3yjkd5piqk3pnag6xhyickrn8z57vxbwswvwnwaqm"))))
+                "0kn9x8i5lypa8g4gi0kg4rpw0xvmgfmmp22d1iwgavg6lrd1a3qr"))))
    (build-system emacs-build-system)
    (arguments
     (list #:tests? #f                  ;no tests
@@ -1757,20 +1757,24 @@ these identified regions.
  (package
    (name "stcgal")
    (version "1.10")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/grigorig/stcgal")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "04hsj49sw5mb6swhd3sdsm7dzwp1frnzpmq70wgsn5vmjavb1ka8"))))
-    (build-system pyproject-build-system)
-    (propagated-inputs (list python-pyserial python-pyusb python-tqdm))
+    (source (origin
+              ;; The "doc" subdirectory referred to by stcgal's setup.py is
+              ;; missing from the source distribution on PyPI so we fetch
+              ;; directly from the project's git repository instead.
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/grigorig/stcgal")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "04hsj49sw5mb6swhd3sdsm7dzwp1frnzpmq70wgsn5vmjavb1ka8"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     (list python-pyserial python-pyusb python-tqdm))
    (native-inputs
     ;; For tests.
-     (list python-pytest python-pyyaml python-setuptools))
+     (list python-pyyaml))
    (home-page "https://github.com/grigorig/stcgal")
    (synopsis "Programmer for STC 8051-compatible microcontrollers")
    (description "stcgal is a command-line flash-programming tool for STC
@@ -14,7 +14,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
 ;;; Copyright © 2021 Felipe Balbi <balbi@kernel.org>
-;;; Copyright © 2021, 2024, 2025 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2021, 2024 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021, 2024-2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
@@ -1158,7 +1158,7 @@ The following systems are supported:
 (define-public sameboy
  (package
    (name "sameboy")
-    (version "1.0.2")
+    (version "0.16.3")
    (source
     (origin
       (method git-fetch)
@@ -1167,7 +1167,7 @@ The following systems are supported:
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0pwnik37c3sgvib5xbadwbq2mjjvgxilhig09rjb3xp5i1d7ykja"))))
+        (base32 "1jdjg59vzzkbi3c3qaxpsxqx955sb86cd3kcypb0nhjxbnwac1di"))))
    (build-system gnu-build-system)
    (native-inputs
     (list rgbds pkg-config))
@@ -488,7 +488,7 @@ provide serif, sans and monospaced variants.")
 package provides the TrueType (TTF) files.")
    (license
     (license:fsdg-compatible
-      "https://spdx.org/licenses/Bitstream-Vera.html"
+      "https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts"
      "The Font Software may be sold as part of a larger software package but
 no copy of one or more of the Font Software typefaces may be sold by
 itself."))))
@@ -200,18 +200,6 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
               (base32
                "1i940b04404xr44xc66c4r4nk091czqz7zzrmhbpk64aaaax1z5w"))))))

-(define-public gdb-17
-  (package
-    (inherit gdb-14)
-    (version "17.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gdb/gdb-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0xnqqv3j463r5rnfmblj3zwhf0l0lyy4bp1zaid8zxn9fignz68l"))))))
-
 (define-public gdb
  ;; The "default" version.
  gdb-14)
@@ -34,11 +34,10 @@
  #:use-module (gnu packages)
  #:use-module (guix packages)
  #:use-module (guix gexp)
-  #:use-module (guix git-download)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system perl)
-  #:use-module (guix build-system pyproject)
+  #:use-module (guix build-system python)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages check)
  #:use-module (gnu packages docbook)
@@ -49,7 +48,6 @@
  #:use-module (gnu packages perl-check)
  #:use-module (gnu packages tex)
  #:use-module (gnu packages xml)
-  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages sphinx)
  #:use-module (guix utils))
@@ -234,37 +232,17 @@ color, font attributes (weight, posture), or underlining.")
 (define-public mdpo
  (package
    (name "mdpo")
-    (version "0.3.86") ;the last version without Rust
+    (version "0.3.6")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/mondeja/mdpo")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "mdpo" version))
       (sha256
-        (base32 "130g8ggy0xgk5jmlx23569wmv9fz7fhm8qi46cjj7n4fxr0vnmyx"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 91 passed
-      #:test-flags
-      ;; XXX: The Most of the tests fail because 0.3.86 was released in 2022
-      ;; and depends on python-pytest@6.2.4.
-      ;; 
-      ;; OSError: pytest: reading from stdin while output is captured!
-      ;; Consider using `-s`.
-      #~(list "--ignore=test/test_integration/"
-              "--ignore=test/test_unit/test_md2po/"
-              "--ignore=test/test_unit/test_md2po2md/"
-              "--ignore=test/test_unit/test_mdpo2html/"
-              "--ignore=test/test_unit/test_po2md/")))
-    (native-inputs
-     (list python-pytest
-           python-setuptools))
-    (inputs
-     (list python-polib
-           python-pymd4c))
+        (base32 "0kgbm0af7jwpfspa2xxiy9nc2l1r2s1rhbhz4r229zcqv49ak6sq"))))
+    (build-system python-build-system)
+    (native-inputs (list python-bump2version python-pytest python-yamllint))
+    (propagated-inputs
+     (list python-polib python-pymd4c))
    (home-page "https://github.com/mondeja/mdpo")
    (synopsis "Markdown file translation utilities using pofiles")
    (description
@@ -588,10 +588,9 @@ interface (FFI) of Guile.")
              (sha256
               (base32
                "1ji3ynhp36m1ccx7bmaq75dhij9frpn19v9mpi4aajn8csl194il"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
-      #:tests? #f ; No test suite.
      #:phases
      #~(modify-phases %standard-phases
          (add-before 'build 'set-environment
@@ -604,11 +603,12 @@ interface (FFI) of Guile.")
                           "extra_macros = { \"_FILE_OFFSET_BITS\": 64 }")))
                     #~())
              (substitute* "setup.py"
-                (("cc") (which "gcc"))))))))
+                (("cc") (which "gcc"))))))
+      #:tests? #f)) ; No test suite.
    (inputs
     (list gpgme))
    (native-inputs
-     (list swig python-setuptools))
+     (list swig))
    (home-page (package-home-page gpgme))
    (synopsis "Python bindings for GPGME GnuPG cryptography library")
    (description "This package provides Python bindings to the GPGME GnuPG
@@ -46,7 +46,6 @@
 ;;; Copyright © 2025 David Thompson <davet@gnu.org>
 ;;; Copyright © 2025 Danny Milosavljevic <dannym@friendly-machines.com>
 ;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
-;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4599,7 +4598,7 @@ decode/encode structures and slices.")
 (define-public go-github-com-gaissmai-bart
  (package
    (name "go-github-com-gaissmai-bart")
-    (version "0.26.0")
+    (version "0.11.1")
    (source
     (origin
       (method git-fetch)
@@ -4608,7 +4607,7 @@ decode/encode structures and slices.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0w79ns4l7av8c4mzfshc0gyp7nfav2jgg6n2my2nziy8wns1bw33"))))
+        (base32 "1rnbmykmkl0c1fzz4vkv7q72l7hl2xpmalbm41f4lifdjscx5nk7"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -1119,7 +1119,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
  (package
    (inherit go-1.24)
    (name "go")
-    (version "1.25.5")
+    (version "1.25.3")
    (source
     (origin
       (method git-fetch)
@@ -1128,7 +1128,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
              (commit (string-append "go" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "102ngi7q0bwb0q391jag7fix70x7lp2mdmbkkh50fwclga14l842"))))
+        (base32 "037gcrl8nagdsq2kv8irx7n0nijjmlqpz0b0zyj482xz2wzar0fs"))))
    (arguments
     (substitute-keyword-arguments (package-arguments go-1.24)
       ((#:phases phases)
@@ -64,7 +64,28 @@
        (base32 "1zmp7kkldb59fx1y6k4mkff8ngmyb9pflcd3yqb28m9wb9bp4j4h"))
       (file-name (git-file-name name version))
       (patches (search-patches "gpodder-disable-updater.patch"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
+    (native-inputs
+     (list intltool
+           python-coverage
+           python-minimock
+           python-pytest
+           python-pytest-cov
+           python-pytest-httpserver
+           which))
+    (inputs
+     (list bash-minimal
+           gtk+
+           python-pygobject
+           python-pycairo
+           python-requests
+           python-dbus
+           python-html5lib
+           python-mutagen
+           python-mygpoclient
+           python-podcastparser
+           yt-dlp
+           xdg-utils))
    (arguments
     (list
      #:phases
@@ -99,27 +120,6 @@
              (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
                (wrap-program (string-append #$output "/bin/gpodder")
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))))))
-    (native-inputs
-     (list intltool
-           python-minimock
-           python-pytest
-           python-pytest-cov
-           python-pytest-httpserver
-           python-setuptools
-           which))
-    (inputs
-     (list bash-minimal
-           gtk+
-           python-pygobject
-           python-pycairo
-           python-requests
-           python-dbus
-           python-html5lib
-           python-mutagen
-           python-mygpoclient
-           python-podcastparser
-           yt-dlp
-           xdg-utils))
    (home-page "https://gpodder.github.io")
    (synopsis "Simple podcast client")
    (description "gPodder is a podcatcher, i.e. an application that allows
@@ -260,66 +260,6 @@ globalisation support for software applications.  This package contains the
 Java part.")
    (license x11)))

-;; GraalVM Truffle 25.0.1 wants ICU4J 76.1, but ICU stopped publishing
-;; source tarballs with build.xml after 73.2. Version 74+ only provides
-;; Maven-based builds or pre-built JARs. Using 73.2 as a compromise.
-(define-public java-icu4j-for-graal-truffle
-  (package
-    (inherit java-icu4j)
-    (name "java-icu4j-for-graal-truffle")
-    (version "73.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/unicode-org/icu/releases/download/release-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-                    "/icu4j-"
-                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                    ".tgz"))
-              (sha256
-               (base32 "0g4sxanzm5s0axjk2lm1w15gr0gx8jasir6rdjn23yx039brchjb"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments java-icu4j)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (add-after 'build 'create-sources-jar
-             (lambda _
-               ;; Create a sources JAR from the core source files.
-               ;; mx shading needs .java source files, not .class files.
-               (invoke "jar" "cf" "icu4j-sources.jar"
-                       "-C" "main/classes/core/src" "com")))
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((share (string-append (assoc-ref outputs "out")
-                                           "/share/java/")))
-                 (mkdir-p share)
-                 (install-file "icu4j.jar" share)
-                 (install-file "icu4j-sources.jar" share))))))))))
-
-(define-public java-icu4j-charset-for-graal-truffle
-  (package
-    (inherit java-icu4j-for-graal-truffle)
-    (name "java-icu4j-charset-for-graal-truffle")
-    (arguments
-     (substitute-keyword-arguments (package-arguments java-icu4j-for-graal-truffle)
-       ((#:build-target _) "icu4j-charset.jar")
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'create-sources-jar
-             (lambda _
-               ;; Create a sources JAR from the charset source files.
-               (invoke "jar" "cf" "icu4j-charset-sources.jar"
-                       "-C" "main/classes/charset/src" "com")))
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((share (string-append (assoc-ref outputs "out")
-                                           "/share/java/")))
-                 (mkdir-p share)
-                 (install-file "icu4j-charset.jar" share)
-                 (install-file "icu4j-charset-sources.jar" share))))))))
-    (inputs (list java-icu4j-for-graal-truffle))
-    (synopsis "ICU4J charset provider for GraalVM Truffle")))
-
 (define-public icu4c-for-skia
  ;; The current version of skia needs this exact commit
  ;; for its test dependencies.
@@ -1990,16 +1990,11 @@ segmentation.")
      ;; these tests.
      '(list "--ignore=pims/tests/test_common.py"
             "--ignore=pims/tests/test_imseq.py"
-             "--ignore=pims/tests/test_norpix.py")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'relax-requirements
-            (lambda _
-              (substitute* "setup.py"
-                (("'slicerator>=.*',")
-                 "'slicerator',")))))))
+             "--ignore=pims/tests/test_norpix.py")))
    (native-inputs
-     (list python-pytest python-setuptools))
+     (list python-pytest
+           python-setuptools
+           python-wheel))
    (propagated-inputs
     (list python-imageio python-numpy python-slicerator))
    (home-page "https://github.com/soft-matter/pims")
@@ -1069,7 +1069,7 @@ archives.")
 (define-public nomacs
  (package
    (name "nomacs")
-    (version "3.22.0")
+    (version "3.21.1")
    (source
     (origin
       (method git-fetch)
@@ -1079,7 +1079,7 @@ archives.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "1ps68xxdqz9r7w5cpicj461x06w0p6r54x1cbk38idl0vlrq65ya"))))
+         "1by62r1g1clji7g539zyhm5z7h1ssp8pcb6vrm33p2gvz3vba5j5"))))
    (build-system cmake-build-system)
    (arguments
     `(#:build-type "Release" ; fails to build with debug info
@@ -1087,25 +1087,40 @@ archives.")
                               "-DUSE_SYSTEM_QUAZIP=true"
                               "-DENABLE_QUAZIP=true"
                               "-DENABLE_OPENCV=true")
+       #:tests? #f ; no rule for target 'test'
       #:phases
       (modify-phases %standard-phases
-         (add-after 'unpack 'cd-to-source-dir
-           (lambda _ (chdir "ImageLounge")))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests? (invoke "make" "check")))))))
+         (add-after 'unpack 'copy-plugins
+           (lambda* (#:key inputs #:allow-other-keys)
+             (copy-recursively (assoc-ref inputs "plugins")
+                               "ImageLounge/plugins")))
+         (add-after 'copy-plugins 'cd-to-source-dir
+           (lambda _ (chdir "ImageLounge") #t)))))
    (inputs
-     (list
-      exiv2
-      libraw
-      libtiff
-      opencv
-      quazip
-      qt5compat
-      qtbase
-      qtimageformats
-      qtsvg))
-    (native-inputs (list googletest pkg-config qttools))
+     `(("plugins"
+        ,(origin
+           (method git-fetch)
+           (uri (git-reference
+                 ;; The original git repository at
+                 ;; https://github.com/novomesk/nomacs-plugins
+                 ;; is not updated any more, use a maintained fork.
+                 (url "https://github.com/novomesk/nomacs-plugins")
+                 (commit "20101da282f13d3184ece873388e1c234a79b5e7")))
+           (sha256
+            (base32
+             "0nbrsxhggy15idvm5dlhxh2z14gvki7vljxqi90hw98nmbh5ri41"))))
+       ("exiv2" ,exiv2)
+       ("libraw" ,libraw)
+       ("libtiff" ,libtiff)
+       ("opencv" ,opencv)
+       ("quazip" ,quazip)
+       ("qtimageformats" ,qtimageformats)
+       ("qtbase" ,qtbase)
+       ("qt5compat" ,qt5compat)
+       ("qtsvg" ,qtsvg)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("qttools" ,qttools)))
    (synopsis "Image viewer supporting all common formats")
    (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,
@@ -640,7 +640,7 @@ highlighted.
       #:phases
       (modify-phases %standard-phases
         (delete 'configure))))         ; No ./configure script
-    (home-page "https://kirc.dev/")
+    (home-page "https://mcpcpc.github.io/kirc/")
    (synopsis "IRC client written in POSIX C99")
    (description "Kirc is an Internet Relay Chat (IRC) client.  It includes
 support for Simple Authentication and Security Layer (SASL), the
@@ -323,35 +323,6 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} /
 algorithms in Java.")
    (license license:public-domain)))

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

 public class ZstdVersion {
  public static final String VERSION = \"~a\";
-}" ,version)))))
-         (add-before 'install 'generate-pom
-           (lambda _
-             (with-output-to-file "pom.xml"
-               (lambda _
-                 (format #t "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.luben</groupId>
-  <artifactId>zstd-jni</artifactId>
-  <version>~a</version>
-  <packaging>jar</packaging>
-  <name>zstd-jni</name>
-</project>" ,version)))))
-         (replace 'install (install-from-pom "pom.xml")))))
+}" ,version))))))))
    (inputs
     `(("zstd" ,zstd)))
    (home-page "https://github.com/luben/zstd-jni")
@@ -406,47 +363,3 @@ compression needs.  This package provides JNI bindings for Zstd native
 library that provides fast and high compression lossless algorithm for
 Android, Java and all JVM languages.")
    (license license:bsd-2)))
-
-(define-public java-zstd-1.5.7
-  (package
-    (inherit java-zstd)
-    (version "1.5.7")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/luben/zstd-jni")
-                     (commit (string-append "v" version "-6"))))
-              (file-name (git-file-name "java-zstd" version))
-              (sha256
-               (base32
-                "014pmfix7rd1p1kmalvxyigqyiii5q3l7qahfnp32pz886pjd41i"))))
-    (arguments
-     `(#:jar-name "zstd-jni.jar"
-       #:source-dir "src/main/java"
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'generate-version
-           (lambda _
-             (with-output-to-file
-               "src/main/java/com/github/luben/zstd/util/ZstdVersion.java"
-               (lambda _
-                 (format #t "package com.github.luben.zstd.util;
-
-public class ZstdVersion {
-  public static final String VERSION = \"~a\";
-}" ,version)))))
-         (add-before 'install 'generate-pom
-           (lambda _
-             (with-output-to-file "pom.xml"
-               (lambda _
-                 (format #t "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.github.luben</groupId>
-  <artifactId>zstd-jni</artifactId>
-  <version>~a</version>
-  <packaging>jar</packaging>
-  <name>zstd-jni</name>
-</project>" ,version)))))
-         (replace 'install (install-from-pom "pom.xml")))))))
@@ -336,7 +336,7 @@ secondary errors.")
                (dirname
                 (search-input-file
                  inputs
-                  "/lib/m2/org/apache/commons/commons-lang3/3.17.0/commons-lang3-3.17.0.jar")))
+                  "/lib/m2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar")))
               (("\\$\\{apache-commons-text_SOURCE_DIR\\}")
                (dirname
                 (search-input-file
@@ -347,7 +347,7 @@ secondary errors.")
               (("FetchContent_MakeAvailable\\(apache-commons-lang\\)")
                (string-append "set(apache-commons-lang_SOURCE_DIR "
                               (assoc-ref inputs "java-commons-lang3")
-                               "/lib/m2/org/apache/commons/commons-lang3/3.17.0)"))
+                               "/lib/m2/org/apache/commons/commons-lang3/3.12.0)"))
               (("FetchContent_MakeAvailable\\(apache-commons-text\\)")
                (string-append "set(apache-commons-text_SOURCE_DIR "
                               (assoc-ref inputs "java-commons-text")
@@ -48,8 +48,7 @@
  #:use-module ((guix build-system python) #:select (pypi-uri
                                                     package-with-python2
                                                     python-build-system))
-  #:use-module (guix build-system ruby)
-  #:use-module (guix build-system trivial))
+  #:use-module (guix build-system ruby))

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

-(define-public libffi-for-graal-truffle
-  (package
-    (inherit libffi)
-    (name "libffi-for-graal-truffle")
-    (version "3.4.8")
-    (source (origin
-              (method url-fetch)
-              (uri
-               (string-append "https://github.com/libffi/libffi/releases"
-                              "/download/v" version "/libffi-" version ".tar.gz"))
-              (file-name "libffi-src.tar.gz")
-              (sha256
-               (base32
-                "16qias9rs3g3lg3zs9zx76hqzry7pkzc8lhjxnqargwqi2hl565w"))))))
-
 ;; Provide a variant without static trampolines as some packages
 ;; (particularly GHC < 9) cannot handle them.  See
 ;; <https://github.com/libffi/libffi/pull/647> for a discussion.
@@ -2966,33 +2966,39 @@ at login.  Local and dynamic reconfiguration are its key features.")
    (name "python-pamela")
    (version "1.0.0")
    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/minrk/pamela")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0cg3w6np1fbjpvzhv54xg567hpf38szwp2d4gvzb9r736nxbv0vr"))))
-    (build-system pyproject-build-system)
+      (origin
+        ;; Tests not distributed in pypi release.
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/minrk/pamela")
+               (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32
+          "0cg3w6np1fbjpvzhv54xg567hpf38szwp2d4gvzb9r736nxbv0vr"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f ;Test suite isn't designed to be run inside a container.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'hardcode-pam.so
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "pamela.py"
-                (("find_library\\(\"pam\")")
-                 (format #f "~s"
-                         (search-input-file inputs "lib/libpam.so"))))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when (and tests? (file-exists? "test_pamela.py"))
-                (invoke "pytest" "--assert=plain" "test_pamela.py")
-                (invoke "python" "-m" "pamela" "-a" "`whoami`")))))))
-    (inputs (list linux-pam))
-    (native-inputs (list python-pytest python-setuptools))
+     '(#:tests? #f ; Test suite isn't designed to be run inside a container.
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'hardcode-pam.so
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((pam (assoc-ref inputs "linux-pam")))
+               (substitute* "pamela.py"
+                 (("find_library\\(\"pam\")")
+                  (string-append "'" pam "/lib/libpam.so'")))
+               #t)))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (if tests?
+               (if (file-exists? "test_pamela.py")
+                 (invoke "py.test" "--assert=plain" "test_pamela.py")
+                 (invoke "python" "-m" "pamela" "-a" "`whoami`"))
+               #t))))))
+    (inputs
+     (list linux-pam))
+    (native-inputs
+     (list python-pytest))
    (home-page "https://github.com/minrk/pamela")
    (synopsis "PAM interface using ctypes")
    (description "This package provides a PAM interface using @code{ctypes}.")
@@ -4856,20 +4862,20 @@ the command line or a script.")
         (file-name (git-file-name name version))
         (sha256
          (base32 "00h5p8fk1zi237q8mqds8apqbis9iw0yih1hl0pr63dsnyzmmrpw"))))
-      (build-system pyproject-build-system)
+      (build-system python-build-system)
      (arguments
-       (list
-        #:tests? #f  ; No tests.
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'fix-build-with-python3
-              (lambda _
-                (substitute* "setup.py"
-                  (("itervalues")
-                   "values")))))))
-      (native-inputs (list python python-setuptools))
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-build-with-python3
+             (lambda _
+               (substitute* "setup.py"
+                 (("itervalues") "values")))))
+         ;; There are currently no checks in the package.
+         #:tests? #f))
+      (native-inputs (list python))
      (home-page "http://guichaz.free.fr/iotop/")
-      (synopsis "Displays the IO activity of running processes")
+      (synopsis
+       "Displays the IO activity of running processes")
      (description
       "Iotop is a Python program with a top like user interface to show the
 processes currently causing I/O.")
@@ -6318,55 +6318,6 @@ Macros and symbol-macros are fully expanded and all special forms, except
       ;; See <https://github.com/alex-gutev/cl-form-types/issues/22>.
       '(#:tests? #f)))))

-(define-public sbcl-cl-forms
-  (let ((commit "680953089c4a4d6201e639ac8188c46656d3f693")
-        (revision "0"))
-    (package
-      (name "sbcl-cl-forms")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/mmontone/cl-forms")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "19bmcvg89ydgkz1rjds0q0ydrpj4dxcvgnqgjjkbsi1h8yw18fsj"))))
-      (build-system asdf-build-system/sbcl)
-      (native-inputs (list sbcl-fiveam sbcl-trivial-open-browser))
-      (inputs (list sbcl-alexandria
-                    sbcl-cl-ppcre
-                    sbcl-ironclad
-                    sbcl-uuid
-                    sbcl-clavier
-                    sbcl-fmt
-                    sbcl-cl-str
-                    sbcl-cl-base64
-                    sbcl-cl-css
-                    sbcl-cl-who
-                    sbcl-djula
-                    sbcl-hunchentoot
-                    sbcl-lack
-                    sbcl-ningle
-                    sbcl-cl-peppol))
-      (arguments
-       '(#:asd-systems '("cl-forms" "cl-forms.core" "cl-forms.who"
-                         "cl-forms.djula" "cl-forms.ningle" "cl-forms.peppol")))
-      (home-page "https://github.com/mmontone/cl-forms")
-      (synopsis "Web forms handling library for Common Lisp")
-      (description
-       "@code{cl-forms} provides functionality for managing web forms in
-Common Lisp.
-
-It supports various field types (string, boolean, integer, email,
-password, and more) and allows rendering through multiple backends,
-such as @code{cl-who} and @code{djula}.")
-      (license license:expat))))
-
-(define-public cl-forms
-  (sbcl-package->cl-source-package sbcl-cl-forms))
-
 (define-public sbcl-cl-freetype2
  (let ((commit "8bcb232b319a66fb700eaea88d0b308a837bce04")
        (revision "1"))
@@ -9183,39 +9134,6 @@ files.")
 (define-public ecl-cl-pdf
  (sbcl-package->ecl-package sbcl-cl-pdf))

-(define-public sbcl-cl-peppol
-  (let ((commit "d1c9571e58240022929226481526cc268a6c6ac7")
-        (revision "0"))
-    (package
-      (name "sbcl-cl-peppol")
-      (version (git-version "0.0.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/mmontone/cl-peppol")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "076wvjc666v76k3z62h1360qhh3hw4xkrvzhfdz6anvq9vl13klm"))))
-      (build-system asdf-build-system/sbcl)
-      (inputs (list sbcl-cxml sbcl-xpath))
-      (arguments
-       '(#:asd-systems '("peppol")))
-      (home-page "https://github.com/mmontone/cl-peppol")
-      (synopsis "OpenPEPPOL electronic invoicing code lists for Common Lisp")
-      (description
-       "@code{cl-peppol} provides access to code lists extracted from the OpenPEPPOL
-standard for electronic business and invoicing in Europe.")
-      (license license:expat))))
-
-;; No ECL variant: tests fail because xpath returns 11 instead of the
-;; expected 11.0d0. Possible incompatibility in numeric type handling.
-;; This problem also affects dependent packages.
-
-(define-public cl-peppol
-  (sbcl-package->cl-source-package sbcl-cl-peppol))
-
 (define-public sbcl-cl-permutation
  (let ((commit "20c10e9ca56452d2fafc3ec0984dcdf78b4f4b19")
        (revision "0"))
@@ -595,7 +595,7 @@ output), and Binutils.")
    ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la")
    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")
    ("20.1.8" . "0v0lwf58i96vcwsql3hlgy72z3ncfvqwgyghyn26m2ri8vy83k6a")
-    ("21.1.8" . "0v99a90546lrd3cxgam32c0jcnwzi0ljk0ihdvd9xghzss1pq1x6")))
+    ("21.1.5" . "0fwfs8gd5c5r5kw6dkpc4817ihd6r8h3qsyl2c9ffyc9hiqlmrnw")))

 (define %llvm-patches
  '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
@@ -613,7 +613,7 @@ output), and Binutils.")
                 "clang-17.0-link-dsymutil-latomic.patch"))
    ("20.1.8" . ("clang-18.0-libc-search-path.patch"
                 "clang-17.0-link-dsymutil-latomic.patch"))
-    ("21.1.8" . ("clang-18.0-libc-search-path.patch"
+    ("21.1.5" . ("clang-18.0-libc-search-path.patch"
                 "clang-17.0-link-dsymutil-latomic.patch"))))

 (define (llvm-monorepo version)
@@ -1240,7 +1240,7 @@ Library.")
  (make-clang-toolchain clang-20 libomp-20))

 (define-public llvm-21
-  (make-llvm "21.1.8"))
+  (make-llvm "21.1.5"))

 (define-public clang-runtime-21
  (clang-runtime-from-llvm llvm-21))
@@ -1255,7 +1255,7 @@ Library.")
                    (package-version llvm-21)))
     (sha256
      (base32
-       "0ac8qb3ajxh9xnlyk71ar599qvbbf0y8lbif2chvi6ph3drpxnvd")))))
+       "057k2707v4cin44b422r9gi12m41yh4ymqi3vakxx9d08d8q8lqm")))))

 (define-public libomp-21
  (package
@@ -931,7 +931,7 @@ on numbers.")
 (define-public lutok
  (package
    (name "lutok")
-    (version "0.6.2")
+    (version "0.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -940,13 +940,13 @@ on numbers.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1hk8shp1vkxa09qxaafcfrgc9098cr75n5zc192bv8yjyvz0hvc3"))))
+                "0a2vc2wy5hasw69h1mz768ywx6c4ccl9jzzd4ixddwba3z3ha03b"))))
    (build-system gnu-build-system)
    ;; Disable the test suite to avoid a circular dependency on kyua.
    (arguments (list #:tests? #f))
    (native-inputs (list autoconf automake libtool pkg-config))
    (inputs (list atf))
-    (propagated-inputs (list lua-5.4))  ;included in c_gate.hpp
+    (propagated-inputs (list lua-5.2))  ;included in c_gate.hpp
    (home-page "https://github.com/freebsd/lutok")
    (synopsis "Lightweight C++ API for Lua")
    (description "Lutok is a lightweight C++ API library for Lua.
@@ -545,7 +545,7 @@ with a @code{ncurses} user interface similar to @code{alpine} and
 (define-public goimapnotify
  (package
    (name "goimapnotify")
-    (version "2.5.4")
+    (version "2.5.3")
    (source
     (origin
       (method git-fetch)
@@ -554,7 +554,7 @@ with a @code{ncurses} user interface similar to @code{alpine} and
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0jsy172spckdma6p480g2r9nm7z36v5qkmd4919f06yx0nk1w6za"))))
+        (base32 "0k8yqq2fl2z8jv6nh7b826z9j4493x6ifaw8ybjp7ipz9rg9y3dh"))))
    (build-system go-build-system)
    (arguments
     (list
@@ -3661,20 +3661,24 @@ filtering, digest delivery, and more.")
 (define-public python-mailmanclient
  (package
    (name "python-mailmanclient")
-    (version "3.3.5")
+    (version "3.3.3")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "mailmanclient" version))
       (sha256
-        (base32 "0myq9mjsqpmhzb378rgnfvmmhjbal36al5cw90hw1sm79ih1qn33"))))
-    (build-system pyproject-build-system)
+        (base32
+         "0ppqnv84v7npgjykhqdy5c38vanz4l0qw871kpsl27z4fm365zlj"))))
+    (build-system python-build-system)
    (arguments
     `(#:tests? #f)) ; Requires mailman running
-    (native-inputs
-     (list python-setuptools))
    (propagated-inputs
     (list python-requests))
+    ;(native-inputs
+    ; `(("mailman" ,mailman)
+    ;   ("python-falcon" ,python-falcon)
+    ;   ("python-pytest" ,python-pytest)
+    ;   ("python-pytest-services" ,python-pytest-services)))
    (home-page "https://www.list.org/")
    (synopsis "Python bindings for the Mailman 3 REST API")
    (description
@@ -3682,6 +3686,7 @@ filtering, digest delivery, and more.")
 the GNU Mailman 3 REST API.")
    (license license:lgpl3+)))

+
 (define-public mlmmj
  (package
    (name "mlmmj")
@@ -4612,13 +4617,14 @@ IMAP, Atom feeds or HTML archives.")
        (sha256
         (base32
          "1dr5zpqnb54h4f5ax8334l1dcp8j9083d7v4vdi1xqkwmnavklck"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list #:test-backend #~'custom
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
           ;; Run doctests as described in the README.
-           #:test-flags #~(list "-m" "authres" "-v")))
-    (native-inputs
-     (list python-setuptools))
+           (lambda _
+             (invoke "python" "-m" "authres" "-v"))))))
    (home-page "https://launchpad.net/authentication-results-python")
    (synopsis "Authentication-Results email header creator and parser")
    (description
@@ -972,7 +972,7 @@ hypertext navigation, and table-of-contents bookmarks.")
           startup-notification))
    (native-search-paths
     (list (search-path-specification
-             (variable "CAJA_EXTENSION_DIRS")
+             (variable "CAJA_EXTENSIONDIR")
             (files (list "lib/caja/extensions-2.0/**")))))
    (home-page "https://mate-desktop.org/")
    (synopsis "File manager for the MATE desktop")
@@ -2099,13 +2099,13 @@ extremely large and complex data collections.")
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((simple
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar"))
                    (api
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"))
                    (nop
                     (search-input-file
-                      inputs "/lib/m2/org/slf4j/slf4j-nop/1.7.36/slf4j-nop-1.7.36.jar"))
+                      inputs "/lib/m2/org/slf4j/slf4j-nop/1.7.25/slf4j-nop-1.7.25.jar"))
                    (junit
                     (search-input-file
                      inputs "/lib/m2/junit/junit/4.12/junit-4.12.jar"))
@@ -4417,29 +4417,33 @@ self-contained C-extension for Python.")
  (package
    (name "python-cvxopt")
    (version "1.3.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/cvxopt/cvxopt")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0vdfag3rr906w0gk7vxm2yxfy8y92i4wmqxi82cbykpfp5r82i36"))))
-    (build-system pyproject-build-system)
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/cvxopt/cvxopt")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0vdfag3rr906w0gk7vxm2yxfy8y92i4wmqxi82cbykpfp5r82i36"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'find-libraries
-            (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "CVXOPT_BLAS_LIB" "openblas")
-              (setenv "CVXOPT_LAPACK_LIB" "openblas")
-              (setenv "CVXOPT_BUILD_FFTW" "1")
-              (setenv "CVXOPT_BUILD_GLPK" "1")
-              (setenv "CVXOPT_BUILD_GSL" "1"))))))
-    (native-inputs (list python-pytest python-setuptools))
-    (inputs (list fftw glpk gsl openblas suitesparse))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-libraries
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "CVXOPT_BLAS_LIB" "openblas")
+             (setenv "CVXOPT_LAPACK_LIB" "openblas")
+             (setenv "CVXOPT_BUILD_FFTW" "1")
+             (setenv "CVXOPT_BUILD_GLPK" "1")
+             (setenv "CVXOPT_BUILD_GSL" "1")
+             #t)))))
+    (inputs
+     (list fftw
+           glpk
+           gsl
+           openblas
+           suitesparse))
    (home-page "https://www.cvxopt.org")
    (synopsis "Python library for convex optimization")
    (description
@@ -4663,27 +4667,28 @@ can return results in exact arithmetic.")
    (name "python-petsc4py")
    (version "3.24.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "petsc4py" version))
-       (sha256
-        (base32 "06wi2r43drlfj3hml5392pckn2n99rjfb1p1hz75n3d84z5jrj9x"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "petsc4py" version))
+        (sha256
+          (base32
+           "06wi2r43drlfj3hml5392pckn2n99rjfb1p1hz75n3d84z5jrj9x"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'set-PETSC_DIR
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Define path to PETSc installation.
-              (setenv "PETSC_DIR"
-                      (assoc-ref inputs "petsc-openmpi"))))
-          (add-before 'check 'mpi-setup #$%openmpi-setup)
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "python" "test/runtests.py")))))))
-    (native-inputs (list python-cython python-setuptools))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'set-PETSC_DIR
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; Define path to PETSc installation.
+                   (setenv "PETSC_DIR"
+                           (assoc-ref inputs "petsc-openmpi"))))
+               (add-before 'check 'mpi-setup
+                 #$%openmpi-setup)
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "python" "test/runtests.py")))))))
+    (native-inputs (list python-cython))
    (inputs (list petsc-openmpi python-numpy))
    (home-page "https://bitbucket.org/petsc/petsc4py/")
    (synopsis "Python bindings for PETSc")
@@ -4958,39 +4963,37 @@ arising after the discretization of partial differential equations.")
    (name "python-slepc4py")
    (version "3.24.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "slepc4py" version))
-       (sha256
-        (base32 "1wiqcwgr9mq81dd68glsnwn57gqmgahcvcchqqqq3ns7bykvdjah"))))
-    (build-system pyproject-build-system)
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "slepc4py" version))
+        (sha256
+          (base32
+            "1wiqcwgr9mq81dd68glsnwn57gqmgahcvcchqqqq3ns7bykvdjah"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'pre-build
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Define path to PETSc installation.
-              (setenv "PETSC_DIR"
-                      (assoc-ref inputs "petsc-openmpi"))
-              ;; Define path to SLEPc installation.
-              (setenv "SLEPC_DIR"
-                      (assoc-ref inputs "slepc-openmpi"))))
-          (add-before 'check 'mpi-setup
-            #$%openmpi-setup)
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "python" "test/runtests.py")))))))
-    (native-inputs (list python-cython python-setuptools))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'pre-build
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; Define path to PETSc installation.
+                   (setenv "PETSC_DIR" (assoc-ref inputs "petsc-openmpi"))
+                   ;; Define path to SLEPc installation.
+                   (setenv "SLEPC_DIR" (assoc-ref inputs "slepc-openmpi"))))
+               (add-before 'check 'mpi-setup
+                 #$%openmpi-setup)
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "python" "test/runtests.py")))))))
+    (native-inputs (list python-cython))
    (inputs (list python-numpy python-petsc4py petsc-openmpi slepc-openmpi))
    (home-page "https://bitbucket.org/slepc/slepc4py/")
    (synopsis "Python bindings for SLEPc")
-    (description
-     "SLEPc, the Scalable Library for Eigenvalue Problem Computations, is
-based on PETSc, the Portable, Extensible Toolkit for Scientific Computation.
-It employs the MPI standard for all message-passing communication.
-@code{slepc4py} provides Python bindings to almost all functions of SLEPc.")
+    (description "SLEPc, the Scalable Library for Eigenvalue Problem
+Computations, is based on PETSc, the Portable, Extensible Toolkit for
+Scientific Computation.  It employs the MPI standard for all
+message-passing communication.  @code{slepc4py} provides Python
+bindings to almost all functions of SLEPc.")
    (license license:bsd-3)))

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

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

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

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

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

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

 (define-public maven-parent-pom-37
  (make-maven-parent-pom
@@ -431,23 +431,25 @@ TCP sessions from existing clients.")
    (source
     (origin
       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/poezio/poezio")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (uri
+        (git-reference
+         (url "https://codeberg.org/poezio/poezio")
+         (commit
+          (string-append "v" version))))
+       (file-name
+        (git-file-name name version))
       (sha256
        (base32 "15vlmymqlcf94h1g6dvgzjvj15c47dqsm78qs40wl2dlwspvqkxj"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f ;tests fails without the OTR plugin
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch
-            (lambda _
-              (substitute* "setup.py"
-                (("'CC', 'cc'")
-                 "'CC', 'gcc'")))))))
+      (list #:tests? #f ; tests fails without the OTR plugin
+            #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'unpack 'patch
+                  (lambda _
+                    (substitute* "setup.py"
+                      (("'CC', 'cc'")
+                       "'CC', 'gcc'")))))))
    (native-inputs
     (list pkg-config python-setuptools python-sphinx))
    (inputs
@@ -404,6 +404,38 @@ monitoring system.  It can configure and display various aspects of Zabbix
 through a text-based interface.")
    (license license:gpl3+)))

+(define-public python-pyzabbix
+  (package
+    (name "python-pyzabbix")
+    (version "1.2.1")
+    (home-page "https://github.com/lukecyca/pyzabbix")
+    ;; No tests on PyPI, use the git checkout.
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference (url home-page) (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0ad5xac67brmwc3wd0f87pjplly3cqyrz1dp725lzz2hrjgiaqi8"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (if tests?
+                          (invoke "pytest" "-vv" "tests")
+                          (format #t "test suite not run~%")))))))
+    (native-inputs
+     ;; For tests.
+     (list python-requests-mock python-pytest))
+    (propagated-inputs
+     (list python-packaging python-requests))
+    (synopsis "Python interface to the Zabbix API")
+    (description
+     "@code{pyzabbix} is a Python module for working with the Zabbix API.")
+    (license license:lgpl2.1+)))
+
 (define-public darkstat
  (package
    (name "darkstat")
@@ -489,30 +521,16 @@ network/disk rates.")
 (define-public python-whisper
  (package
    (name "python-whisper")
-    (version "1.1.10")
+    (version "1.1.8")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/graphite-project/whisper")
-              (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "whisper" version))
       (sha256
        (base32
-         "182phj3z3mxpbla6m2f0pahyvqfn0jdblprvk6xwx39nc939nw0a"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-python-six-dependency
-            (lambda _
-              (substitute* (find-files "." "\\.py$")
-                (("'six'") "")          ; dependency in setup.py
-                (("six\\.moves") "io")
-                (("from six import assertRegex") "")
-                (("assertRegex") ""))))))) ; effectively disable test
-    (native-inputs (list python-pytest python-setuptools))
+         "1bk29w09zcpsv8hp0g0al7nwrxa07z0ycls3mbh83wfavk83aprl"))))
+    (build-system python-build-system)
+    (native-inputs (list python-six))
    (home-page "https://graphiteapp.org/")
    (synopsis "Fixed size round-robin style database for Graphite")
    (description "Whisper is one of three components within the Graphite
@@ -740,8 +758,6 @@ written in Go with pluggable metric collectors.")
    (license license:asl2.0)))

 (define-public temper-exporter
-  ;; XXX: No release or updates since 2020, consider to remove when starts
-  ;; failing, it might be abandoned project.
  (let ((commit "a87bbab19c05609d62d9e4c7941178700c1ef84d")
        (revision "0"))
    (package
@@ -756,7 +772,7 @@ written in Go with pluggable metric collectors.")
                (sha256
                 (base32
                  "0jk3ydi8s14q5kyl9j3gm2zrnwlb1jwjqpg5vqrgkbm9jrldrabc"))))
-      (build-system pyproject-build-system)
+      (build-system python-build-system)
      (arguments
       '(#:tests? #f                    ; One test failure:
                                        ; test/test_exporter.py:33:
@@ -777,7 +793,7 @@ written in Go with pluggable metric collectors.")
      (inputs
       (list python-prometheus-client python-pyudev))
      (native-inputs
-       (list python-setuptools))
+       (list python-pytest python-pytest-mock python-pytest-runner))
      (home-page "https://github.com/yrro/temper-exporter")
      (synopsis "Prometheus exporter for PCSensor TEMPer sensor devices")
      (description
@@ -727,31 +727,29 @@ FFmpeg, etc.")
 (define-public python-pyacoustid
  (package
    (name "python-pyacoustid")
-    (version "1.3.0")
+    (version "1.2.2")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "pyacoustid" version))
       (sha256
        (base32
-         "0xyikq3lqmqlm6b8nmmi6aijs4vz56svgcbhha8bp7n1j5qlhksz"))))
-    (build-system pyproject-build-system)
+         "0ha15m41r8ckmanc4k9nrlb9hprvhdjxndzw40a1yj3z1b1xjyf2"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f                      ;No tests.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chromaprint-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "chromaprint.py"
-                (("libchromaprint.so.1")
-                 (search-input-file inputs "/lib/libchromaprint.so.1")))
-              (substitute* "acoustid.py"
-                (("(FPCALC_COMMAND.+)fpcalc" _ prefix)
-                 (string-append
-                  prefix (search-input-file inputs "/bin/fpcalc")))))))))
-    (native-inputs
-     (list python-setuptools))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chromaprint-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "chromaprint.py"
+               (("libchromaprint.so.1")
+                (string-append (assoc-ref inputs "chromaprint")
+                               "/lib/libchromaprint.so.1")))
+             (substitute* "acoustid.py"
+               (("'fpcalc'")
+                (string-append "'" (assoc-ref inputs "chromaprint")
+                               "/bin/fpcalc'")))
+             #t)))))
    (inputs (list chromaprint))
    (propagated-inputs
     (list python-audioread python-requests))
@@ -4266,9 +4266,9 @@ MusicBrainz database.")
    ;; 'musicbrainzngs/compat.py' is ISC licensed.
    (license (list license:bsd-2 license:isc))))

-(define-public isrcsubmit
+(define-public python-isrcsubmit
  (package
-    (name "isrcsubmit")
+    (name "python-isrcsubmit")
    (version "2.0.1")
    (source
     (origin
@@ -4277,13 +4277,9 @@ MusicBrainz database.")
       (sha256
        (base32
         "0jh4cni8qhri6dh83cmp0i0m0384vv0vznlygv49wj9xzh1d99qv"))))
-    (build-system pyproject-build-system)
-    ;; tests: 6 passed
-    (native-inputs
-     (list python-setuptools))
+    (build-system python-build-system)
    (propagated-inputs
-     (list python-discid
-           python-musicbrainzngs))
+     (list python-discid python-musicbrainzngs))
    (home-page "https://github.com/JonnyJD/musicbrainz-isrcsubmit")
    (synopsis "Submit ISRCs from CDs to MusicBrainz")
    (description "@code{isrcsubmit} is a tool to extract @dfn{International
@@ -4291,9 +4287,6 @@ Standard Recording Code} (ISRCs) from audio CDs and submit them to
@url{https://musicbrainz.org/, MusicBrainz}.")
    (license license:gpl3+)))

- ;; May be removed after 2026-01-31
-(define-deprecated-package python-isrcsubmit isrcsubmit)
-
 (define-public python-pylast
  (package
    (name "python-pylast")
@@ -4379,24 +4372,26 @@ websites such as Libre.fm.")
    (build-system pyproject-build-system)
    (arguments
     (list
-      ;; tests: 1083 passed, 99 skipped, 1 deselected, 1828 warnings
-      #:test-flags
-      ;; Network access is required.
-      #~(list "-k" "not test_merge_duplicate_album")
      #:phases
      #~(modify-phases %standard-phases
          (add-after 'unpack 'set-HOME
            (lambda _
              (setenv "HOME" (string-append (getcwd) "/tmp"))))
+          (add-after 'unpack 'skip-tests-that-need-internet
+            (lambda _
+              (substitute* "test/test_importer.py"
+                (("^([ \t]+)(def test_merge_duplicate_album\\(self\\):)" _ indentation rest)
+                  (string-append indentation "@pytest.mark.skip()\n" indentation rest)))))
          ;; Wrap the executable, so it can find python-gi (aka
          ;; pygobject) and gstreamer plugins.
          (add-after 'wrap 'wrap-typelib
-            (lambda _
-              (wrap-program (string-append #$output "/bin/beet")
-                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
-                  (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
-                `("GI_TYPELIB_PATH" ":" prefix
-                  (,(getenv "GI_TYPELIB_PATH"))))))
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((prog (string-append #$output "/bin/beet"))
+                    (plugins (getenv "GST_PLUGIN_SYSTEM_PATH"))
+                    (types (getenv "GI_TYPELIB_PATH")))
+                (wrap-program prog
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins))
+                  `("GI_TYPELIB_PATH" ":" prefix (,types))))))
          (add-after 'wrap 'install-completion
            (lambda _
              (let ((completion-path
@@ -4413,9 +4408,11 @@ websites such as Libre.fm.")
           python-poetry-core
           python-py7zr
           python-pytest
+           python-pytest-cov
           python-pytest-flask
           python-setuptools
-           python-responses))
+           python-responses
+           python-wheel))
    (inputs
     (list bash-minimal
           gst-plugins-base
@@ -70,7 +70,6 @@
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
-;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -141,7 +140,6 @@
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gnome)
  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages golang)
  #:use-module (gnu packages golang-build)
  #:use-module (gnu packages golang-check)
  #:use-module (gnu packages golang-crypto)
@@ -785,34 +783,29 @@ It also includes some SCTP-related helper utilities.")
 (define-public python-pysctp
  (package
    (name "python-pysctp")
-    (version "0.7.2")
+    (version "0.6.1")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/p1sec/pysctp")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "pysctp" version))
       (sha256
-        (base32 "03nw6szak7xdcndyg0m62l4lmkv2bl8ixl7pa0ximwlk4v26wc2w"))))
-    (build-system pyproject-build-system)
+        (base32 "14h2qlmfi24bizhvvqkfqfa78pzm3911ibrzy9k94i97xy1978dy"))))
+    (build-system python-build-system)
+    (inputs
+     (list lksctp-tools))
    (arguments
-     (list
-      #:tests? #f ;tests require network
-      #:test-backend #~'unittest
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-setup.py
-            (lambda _
-              (substitute* "setup.py"
-                (("include_dirs\\s*=.*")
-                 (string-append "include_dirs = ['.'] + '"
-                                (getenv "C_INCLUDE_PATH") "'.split(':'),"))
-                (("library_dirs\\s*=.*")
-                 (string-append "library_dirs = '"
-                                (getenv "LIBRARY_PATH") "'.split(':'),"))))))))
-    (native-inputs (list python-setuptools))
-    (inputs (list lksctp-tools))
+     `(#:tests? #f  ;; tests require network
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setup.py
+           (lambda _
+             (substitute* "setup.py"
+               (("include_dirs\\s*=.*")
+                (string-append "include_dirs = ['.'] + '"
+                               (getenv "C_INCLUDE_PATH") "'.split(':'),"))
+               (("library_dirs\\s*=.*")
+                (string-append "library_dirs = '"
+                               (getenv "LIBRARY_PATH") "'.split(':'),"))))))))
    (home-page "https://github.com/p1sec/pysctp")
    (synopsis "Python module for the SCTP protocol stack and library")
    (description "@code{pysctp} implements the SCTP socket API.  You need a
@@ -1296,29 +1289,26 @@ useful for making transparent firewalls.")
 (define-public pproxy
  (package
    (name "pproxy")
-    (version "2.7.9")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference (url "https://github.com/qwj/python-proxy")
-                           (commit version)))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "0crr6b9v5fvy2js1fqjngj3axr962p1yayrxsnf3fpzdc99mnv0d"))))
-    (build-system pyproject-build-system)
+    (version "2.7.8")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pproxy" version))
+              (sha256
+               (base32
+                "1j4nv72i77i2j5nl9ymzpk4m98qih3naihfrqjghrc9b7g0krdzs"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (with-directory-excursion "tests"
-                  (for-each (lambda (file)
-                              (invoke "python" file))
-                            ;; XXX: The api_ tests require network access
-                            ;; so we only run the cipher tests for now.
-                            (find-files "." "^cipher_.*\\.py$")))))))))
-    (native-inputs (list python-setuptools))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (with-directory-excursion "tests"
+                       (for-each (lambda (file)
+                                   (invoke "python" file))
+                                 ;; XXX: The api_ tests require network access
+                                 ;; so we only run the cipher tests for now.
+                                 (find-files "." "^cipher_.*\\.py$")))))))))
    (inputs
     (list python-asyncssh
           python-daemon
@@ -2196,7 +2186,7 @@ application stack itself.")
 (define-public httpstat
  (package
    (name "httpstat")
-    (version "1.3.2")
+    (version "1.3.1")
    (source
     (origin
       (method git-fetch)
@@ -2205,29 +2195,23 @@ application stack itself.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "1z0m00wzbd1y9knypvw425h4qjqyp4x162j7crpgmfic1wpwbqbl"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ; Tests require network access.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'build 'fix-curl-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "httpstat.py"
-                (("ENV_CURL_BIN.get\\('curl'\\)")
-                 (format #f "ENV_CURL_BIN.get(~s)"
-                         (search-input-file inputs "/bin/curl")))
-                ;; "curl -w time_*" units seems to have
-                ;; changed from seconds to nanoseconds.
-                (("d\\[k\\] \\* 1000")
-                 "d[k] / 1000")) #t))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "bash" "httpstat_test.sh")))))))
-    (native-inputs (list python-setuptools))
+        (base32 "0cw8299a080m42slsimz31xs0gjnh833gpbj2dsr4hkcinrn4iyd"))))
+    (build-system python-build-system)
    (inputs (list curl))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-curl-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "httpstat.py"
+               (("ENV_CURL_BIN.get\\('curl'\\)")
+                (string-append "ENV_CURL_BIN.get('"
+                               (assoc-ref inputs "curl")
+                               "/bin/curl')"))
+               ;; "curl -w time_*" units seems to have
+               ;; changed from seconds to nanoseconds.
+               (("d\\[k\\] \\* 1000") "d[k] / 1000"))
+             #t)))))
    (home-page "https://github.com/reorx/httpstat")
    (synopsis "Visualize curl statistics")
    (description
@@ -3289,22 +3273,18 @@ IPFIX, RSPAN, CLI, LACP, 802.1ag).")
  (package
    (name "python-ipy")
    (version "1.01")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/autocracy/python-ipy/")
-             (commit (string-append "IPy-" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "106rirmirlpb5ppznn3fd8189a8z02zf99jvk6j4hcq05ajclfc6"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "IPy" version))
+              (sha256
+               (base32
+                "06nclwafzsbi8ls019ry1xnfhgwc5103g8lgav54mmd2vr0sgv7d"))))
+    (build-system python-build-system)
    (home-page "https://github.com/autocracy/python-ipy/")
    (synopsis "Python class and tools for handling IP addresses and networks")
-    (description
-     "The @code{IP} class allows a comfortable parsing and handling for most
-notations in use for IPv4 and IPv6 addresses and networks.")
+    (description "The @code{IP} class allows a comfortable parsing and
+handling for most notations in use for IPv4 and IPv6 addresses and
+networks.")
    (license license:bsd-3)))

 (define-public speedtest-cli
@@ -4650,23 +4630,18 @@ module @code{batman-adv}, for Layer 2.")
       (file-name (git-file-name name version))
       (sha256
        (base32 "1v14pafdd2nzd63kpf7aijpqf5dribxij3ynx5q1232y1ci4wf14"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     (list
-      #:tests? #f                     ; Tests require extensive configuration.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-man-page
-            (lambda _
-              (invoke "make" "doc/pagekite.1")
-              (install-file "doc/pagekite.1"
-                            (string-append #$output "/share/man/man1"))))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "make" "test")))))))
-    (native-inputs (list perl python-setuptools))
-    (inputs (list python-six python-socksipychain))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-man-page
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man")))
+               (invoke "make" "doc/pagekite.1")
+               (install-file "doc/pagekite.1" (string-append man "/man1"))))))))
+    (inputs
+     (list python-six python-socksipychain))
    (home-page "https://pagekite.net/")
    (synopsis "Make localhost servers publicly visible")
    (description
@@ -5152,7 +5127,7 @@ daemon.")
 (define-public nebula
  (package
    (name "nebula")
-    (version "1.10.0")
+    (version "1.9.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5161,7 +5136,7 @@ daemon.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1x4r8b3ny0vxipf404l8z00m5cs7cfy810670gmznl61jkaq1zd7"))
+                "0mcyakwr0r5lw6qgzib54v73a1j6ccaxrz3jf6dsh8daqwp5nmcj"))
              ;; Remove windows-related binary blobs and files
              (snippet
               #~(begin
@@ -5171,7 +5146,6 @@ daemon.")
    (build-system go-build-system)
    (arguments
     (list
-      #:go go-1.25
      #:install-source? #f
      #:import-path "github.com/slackhq/nebula"
      #:build-flags
@@ -5199,16 +5173,14 @@ daemon.")
           go-github-com-google-gopacket
           go-github-com-kardianos-service
           go-github-com-miekg-dns
-           go-github-com-miekg-pkcs11
           go-github-com-nbrownus-go-metrics-prometheus
           go-github-com-prometheus-client-golang
           go-github-com-rcrowley-go-metrics
           go-github-com-sirupsen-logrus
           go-github-com-skip2-go-qrcode
-           go-github-com-stefanberger-go-pkcs11uri
+           go-github-com-songgao-water
           go-github-com-stretchr-testify
           go-github-com-vishvananda-netlink
-           go-go-yaml-in-yaml-v3
           go-golang-org-x-crypto
           go-golang-org-x-exp
           go-golang-org-x-net
@@ -5217,7 +5189,7 @@ daemon.")
           go-golang-org-x-term
           go-golang-zx2c4-com-wireguard
           go-google-golang-org-protobuf
-           go-gopkg-in-yaml-v3
+           go-gopkg-in-yaml-v2
           go-gvisor-dev-gvisor))
    (home-page "https://github.com/slackhq/nebula")
    (synopsis "Scalable, peer-to-peer overlay networking tool")
@@ -190,7 +190,7 @@ default.  To add support for more languages, the
 (define-public gimagereader
  (package
    (name "gimagereader")
-    (version "3.4.3")
+    (version "3.4.2")
    (source
     (origin
       (method url-fetch)
@@ -199,7 +199,7 @@ default.  To add support for more languages, the
             "/download/v" version "/"
             "gimagereader-" version ".tar.xz"))
       (sha256
-        (base32 "09f4njwhw7xkyq4pjzjrmypzczijckcbimwq8776hb4milzba126"))))
+        (base32 "0r52j5q2d0mvzw6qkds6vrapcqhdgyj2jvp7bh8w9zw6gpjsyk0q"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -212,12 +212,11 @@ default.  To add support for more languages, the
           djvulibre
           leptonica
           podofo
-           poppler-qt6
+           poppler-qt5
           sane
-           qtbase
-           qt5compat
+           qtbase-5
           qtspell
-           quazip
+           quazip-5
           tesseract-ocr))
    (home-page "https://github.com/manisandro/gImageReader")
    (synopsis "Qt front-end to tesseract-ocr")
@@ -421,31 +421,19 @@ Other features include:
 (define-public python-bonsai
  (package
    (name "python-bonsai")
-    (version "1.5.4")
+    (version "1.2.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/noirello/bonsai")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "bonsai" version))
       (sha256
-        (base32 "1p1330cxaxb2j80zw0vvi2hrnyw3qr5vh8fm2wy8ci745dmrs0nl"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      #~(list
-         ;; XXX: Require docker and extensive setup.
-         "--ignore=tests/test_asyncio.py"
-         "--ignore=tests/test_ldapclient.py"
-         "--ignore=tests/test_ldapconnection.py"
-         "--ignore=tests/test_ldapentry.py"
-         "--ignore=tests/test_ldapreference.py"
-         "--ignore=tests/test_pool.py"
-         "-k" "not test_set_async_connect")))
-    (native-inputs (list python-pytest python-setuptools))
-    (inputs (list mit-krb5 cyrus-sasl openldap))
+        (base32
+         "013bl6h1m3f7vg1lk89d4vi28wbf31zdcs4f9g8css7ngx63v6px"))))
+    (build-system python-build-system)
+    (inputs
+     (list mit-krb5 cyrus-sasl openldap))
+    ;; disabling tests, since they require docker and extensive setup
+    (arguments `(#:tests? #f))
    (home-page "https://github.com/noirello/bonsai")
    (synopsis "Access LDAP directory servers from Python")
    (description
@@ -2413,14 +2413,14 @@ the boot loader configuration.")
 (define-public flatpak
  (package
    (name "flatpak")
-    (version "1.16.2")
+    (version "1.16.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
                           version "/flatpak-" version ".tar.xz"))
       (sha256
-        (base32 "1ss3v25bq0ybks6yl3q13cxxf18virgi3w6xws0qzil51ldjs5v9"))
+        (base32 "0ajbz8ms4h5nyjr59hv9z8vaimj4f3p51v8idmy14qnbmmjwa2nb"))
       (patches
        (search-patches "flatpak-fix-fonts-icons.patch"
                        "flatpak-fix-icon-validation.patch"
@@ -0,0 +1,43 @@
+Disable CPU optimizations not supported by all x86_64 systems.
+
+--- a/cmake/modules/SIMDExt.cmake	2017-03-23 22:22:58.254071694 +0100
+++ b/cmake/modules/SIMDExt.cmake	2017-03-23 22:23:22.446848845 +0100
+@@ -5,11 +5,6 @@
+ # HAVE_ARM_NEON
+ # HAVE_INTEL_SSE
+ # HAVE_INTEL_SSE2
+-# HAVE_INTEL_SSE3
+-# HAVE_INTEL_SSSE3
+-# HAVE_INTEL_PCLMUL
+-# HAVE_INTEL_SSE4_1
+-# HAVE_INTEL_SSE4_2
+ #
+ # SIMD_COMPILE_FLAGS
+ #
+@@ -85,26 +80,6 @@
+       if(HAVE_INTEL_SSE2)
+         set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2")
+       endif()
+-      CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3)
+-      if(HAVE_INTEL_SSE3)
+-        set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
+-      endif()
+-      CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
+-      if(HAVE_INTEL_SSSE3)
+-        set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
+-      endif()
+-      CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
+-      if(HAVE_INTEL_PCLMUL)
+-        set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
+-      endif()
+-      CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
+-      if(HAVE_INTEL_SSE4_1)
+-        set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
+-      endif()
+-      CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
+-      if(HAVE_INTEL_SSE4_2)
+-        set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
+-      endif()
+     endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
+   endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le")
@@ -1,22 +0,0 @@
-Upstream-status: Not forwarded yet.
-
-diff -u /tmp/guix-build-ceph-20.3.0.drv-0/source/CMakeLists.txt /tmp/guix-build-ceph-20.3.0.drv-0/source/CMakeLists.txt.orig
--- a/CMakeLists.txt	2025-12-19 13:14:44.050684729 +0900
-+++ b/CMakeLists.txt	2025-12-19 13:15:06.218810041 +0900
-@@ -356,12 +356,12 @@
-   find_package(QatDrv REQUIRED COMPONENTS qat_s usdm_drv_s)
-   set(HAVE_QAT TRUE)
- elseif(WITH_QATLIB)
-  if(NOT WITH_SYSTEM_QAT)
-+  if(NOT WITH_SYSTEM_QATLIB)
-     include(BuildQAT)
-     build_qat()
-   endif()
-   find_package(QAT REQUIRED)
-  if(NOT WITH_SYSTEM_QAT)
-+  if(NOT WITH_SYSTEM_QATLIB)
-     add_dependencies(QAT::qat qatlib_ext)
-     add_dependencies(QAT::usdm qatlib_ext)
-   endif()
-
-Diff finished.  Fri Dec 19 13:15:39 2025
@@ -0,0 +1,50 @@
+Adjust to newer Boost interface.
+
+--- a/src/rgw/rgw_asio_client.cc	1970-01-01 01:00:01.000000000 +0100
+++ b/src/rgw/rgw_asio_client.cc	2024-09-11 08:33:21.723548804 +0200
+@@ -39,11 +39,11 @@
+     const auto& value = header->value();
+ 
+     if (field == beast::http::field::content_length) {
+-      env.set("CONTENT_LENGTH", value.to_string());
+      env.set("CONTENT_LENGTH", std::string(value));
+       continue;
+     }
+     if (field == beast::http::field::content_type) {
+-      env.set("CONTENT_TYPE", value.to_string());
+      env.set("CONTENT_TYPE", std::string(value));
+       continue;
+     }
+ 
+@@ -62,26 +62,26 @@
+     }
+     *dest = '\0';
+ 
+-    env.set(buf, value.to_string());
+    env.set(buf, std::string(value));
+   }
+ 
+   int major = request.version() / 10;
+   int minor = request.version() % 10;
+   env.set("HTTP_VERSION", std::to_string(major) + '.' + std::to_string(minor));
+ 
+-  env.set("REQUEST_METHOD", request.method_string().to_string());
+  env.set("REQUEST_METHOD", std::string(request.method_string()));
+ 
+   // split uri from query
+   auto uri = request.target();
+   auto pos = uri.find('?');
+   if (pos != uri.npos) {
+     auto query = uri.substr(pos + 1);
+-    env.set("QUERY_STRING", query.to_string());
+    env.set("QUERY_STRING", std::string(query));
+     uri = uri.substr(0, pos);
+   }
+-  env.set("SCRIPT_URI", uri.to_string());
+  env.set("SCRIPT_URI", std::string(uri));
+ 
+-  env.set("REQUEST_URI", request.target().to_string());
+  env.set("REQUEST_URI", std::string(request.target()));
+ 
+   char port_buf[16];
+   snprintf(port_buf, sizeof(port_buf), "%d", local_endpoint.port());
@@ -1,16 +0,0 @@
-Author: Danny Milosavljevic <dannym@friendly-machines.com>
-Date: Sun Dec 21 04:41:14 AM CET 2025
-Subject: Fail the entire build on error.
-
--- a/src/mx/_impl/mx.py	2025-12-19 20:15:23.140244258 +0000
-+++ b/src/mx/_impl/mx.py	2025-12-19 20:15:23.142739235 +0000
-@@ -15181,6 +15181,9 @@
-             joinTasks()
-         showProgress()
- 
-+        if len(failed) > 0:
-+            abort(f'{len(failed)} build tasks failed')
-+
-         def dump_task_stats(f):
-             """
-             Dump task statistics CSV. Use R with following commands for visualization:
@@ -1248,20 +1248,18 @@ optimize toolbar for portrait / landscape
 (define-public python-reportlab
  (package
    (name "python-reportlab")
-    (version "4.4.7")
+    (version "4.0.8")
    (source (origin
              (method url-fetch)
              (uri (pypi-uri "reportlab" version))
              (sha256
               (base32
-                "0w5isxc1ds19jhpigfjjyavc6qzkwxskwgwkcikrkrb5z5x2is21"))))
-    (build-system pyproject-build-system)
+                "0lq8fibbgp7bfasxjf33s4hzqr405y655bkxggxmjxqsga0lb68n"))))
+    (build-system python-build-system)
    (arguments
     (list
-      ;; tests: 386 passed
-      #:test-backend #~'custom
-      #:test-flags #~(list "runAll.py")
-      #:configure-flags #~'(("--no-download-t1-files" . ""))
+      #:test-target "tests"
+      #:configure-flags '(list "--no-download-t1-files")
      #:phases
      #~(modify-phases %standard-phases
         (add-after 'unpack 'find-libraries
@@ -1269,14 +1267,7 @@ optimize toolbar for portrait / landscape
             (let ((dlt1 (assoc-ref inputs "font-curve-files")))
               (substitute* "setup.py"
                 (("http://www.reportlab.com/ftp/pfbfer-20180109.zip")
-                  (string-append "file://" dlt1))))))
-         (replace 'check
-           (lambda args
-             ;; KeyError: 'Vera'
-             (delete-file "tests/test_graphics_charts.py")
-             (with-directory-excursion "tests"
-               (apply (assoc-ref %standard-phases 'check) args)))))))
-    (native-inputs (list python-setuptools))
+                  (string-append "file://" dlt1)))))))))
    (inputs
     `(("font-curve-files"
        ,(origin
@@ -1286,7 +1277,7 @@ optimize toolbar for portrait / landscape
            (base32
             "1v0gy4mbx02ys96ssx89420y0njknlrxs2bx64bv4rp8a0al66w5"))))))
    (propagated-inputs
-     (list python-charset-normalizer python-pillow))
+     (list python-chardet python-pillow))
    (home-page "https://www.reportlab.com")
    (synopsis "Python library for generating PDFs and graphics")
    (description "This is the ReportLab PDF Toolkit.  It allows rapid creation
@@ -1308,28 +1299,26 @@ vector formats.")
        (base32
         ;; "0d1d2jxfl9vmy4swcdz660xd4wx91w1i3n07k522pccapwxig294"))))
         "0g15q67f992prkjndrk75hhd601iypfmkafhdx7hijs2byr26c83"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
-      #:tests? #f                       ;No tests.
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'build)
-          (delete 'configure)
-          (replace 'install
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; There's no 'setup.py' so install things manually.
-              (let* ((bin (string-append #$output "/bin"))
-                     (impressive (string-append bin "/impressive"))
-                     (man1 (string-append #$output "/share/man/man1")))
-                (mkdir-p bin)
-                (copy-file "impressive.py" impressive)
-                (chmod impressive #o755)
-                (wrap-program (string-append bin "/impressive")
-                  `("PATH" ":" prefix ;for pdftoppm
-                    (,(search-input-file inputs "bin/xpdf"))))
-                (install-file "impressive.1" man1)))))))
-    (native-inputs (list python-setuptools))
+      #:phases #~(modify-phases %standard-phases
+                   (delete 'build)
+                   (delete 'configure)
+                   (delete 'check)
+                   (replace 'install
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       ;; There's no 'setup.py' so install things manually.
+                       (let* ((bin (string-append #$output "/bin"))
+                              (impressive (string-append bin "/impressive"))
+                              (man1 (string-append #$output "/share/man/man1")))
+                         (mkdir-p bin)
+                         (copy-file "impressive.py" impressive)
+                         (chmod impressive #o755)
+                         (wrap-program (string-append bin "/impressive")
+                           `("PATH" ":" prefix ;for pdftoppm
+                             (,(search-input-file inputs "bin/xpdf"))))
+                         (install-file "impressive.1" man1)))))))
    ;; TODO: Add dependency on pdftk.
    (inputs (list bash-minimal python-pygame python-pillow sdl xpdf))
    (home-page "https://impressive.sourceforge.net")
@@ -179,14 +179,14 @@ exec ~a \"$@\""
 (define-public pkgconf
  (package
    (name "pkgconf")
-    (version "2.5.1")
+    (version "2.4.3")
    (source (origin
              (method url-fetch)
              (uri (string-append  "https://distfiles.dereferenced.org/"
                                   name "/" name "-" version ".tar.xz"))
              (sha256
               (base32
-                "0hy2a058nrgxzwn5ilnf3q0fpj9bh9lj42n18kqfr1lzkdccj1fd"))))
+                "0hasqa1hrg9302mc8sl4w2ac0z0cy4kacz7h9csafgspxncks82i"))))
    (build-system gnu-build-system)
    (arguments
     (list #:phases #~(modify-phases %standard-phases
@@ -58,58 +58,6 @@
  #:use-module (gnu packages rust-apps)
  #:use-module (gnu packages sphinx))

-(define-public python-backports-zstd
-  (package
-    (name "python-backports-zstd")
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/rogdham/backports.zstd")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "08dlr3zfk6fsn9g99msy2ap43c740hmc1l1c4xccigkrkjn9p0sp"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 1249 passed
-      #:test-backend #~'unittest
-      #:test-flags #~(list "discover" "tests")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'use-system-zstd
-            (lambda _
-              (substitute* "setup.py"
-                (("_SYSTEM_ZSTD = False")
-                 "_SYSTEM_ZSTD = True"))))
-          (add-after 'unpack 'skip-copy-of-zstd-license
-            (lambda _
-              (substitute* "setup.py"
-                (("f.write.*read_text.*")
-                 ""))))
-          (add-after 'unpack 'skip-tests-requiring-root
-            (lambda _
-              (substitute* "tests/test/test_tarfile.py"
-                (("import pwd, grp")
-                 "return False"))))
-          (add-before 'check 'pre-check
-            (lambda _
-              ;; Skip tests that may fail when using the system library.
-              (setenv "BACKPORTSZSTD_SKIP_EXTENSION_TEST" "1"))))))
-    (native-inputs
-     (list pythoncapi-compat
-           python-setuptools))
-    (inputs
-     (list (list zstd "lib")))
-    (home-page "https://peps.python.org/pep-0784/")
-    (synopsis "Backport of compression.zstd for Python")
-    (description
-     "This package provides a backport of the compression.zstd module for
-Python versions below 3.14.")
-    (license license:psfl)))
-
 (define-public python-blosc
  (package
    (name "python-blosc")
@@ -596,6 +596,27 @@ numerical solver for convex optimization problems using a novel homogeneous
 embedding.")
    (license license:asl2.0)))

+(define-public python-climin
+  (package
+    (name "python-climin")
+    (version "0.1a1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "climin" version))
+              (sha256
+               (base32
+                "1wpjisd5zzi5yvjff02hnxn84822k8sdxvvd33lil2x79wdb36rv"))))
+    (build-system python-build-system)
+    (native-inputs (list python-nose))
+    (propagated-inputs (list python-numpydoc python-numpy python-scipy))
+    (home-page "https://github.com/BRML/climin")
+    (synopsis "Optimization for machine learning")
+    (description
+     "@command{climin} is a Python package for optimization,
+heavily biased to machine learning scenarios.  It works on top of
+@command{numpy} and (partially) @command{gnumpy}.")
+    (license license:bsd-3)))
+
 (define-public python-cmocean
  (package
    (name "python-cmocean")
@@ -2382,47 +2403,6 @@ well as potentially any library which conforms to a standard API. See the
 documentation for more information.")
    (license license:expat)))

-(define-public python-osfclient
-  (package
-    (name "python-osfclient")
-    (version "0.0.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/osfclient/osfclient")
-              (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1ympjh028xgwkzvhwqa31rack1h8nni7zzn2alp1819m4pm8hysn"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; 2 tests fail with assertion not equal:
-      ;; AssertionError: assert 16 == (4 + (4 * 2))
-      ;; See: <https://github.com/osfclient/osfclient/issues/214>.
-      #~(list "-k"
-              (string-append "not test_recursive_upload"
-                             " and not nottest_recursive_upload_with_subdir"))))
-    (native-inputs
-     (list python-pytest
-           python-mock
-           python-setuptools))
-    (propagated-inputs
-     (list python-requests
-           python-six
-           python-tqdm))
-    (home-page "https://github.com/osfclient/osfclient")
-    (synopsis "Python library and command-line client for file storage on OSF")
-    (description
-     "The @code{osfclient} is a python library and a command-line client for
-up- and downloading files to and from @url{https://osf.io/, Open Science
-Framework} projects.  The @acronym{OSF, Open Science Framework} is an open
-source project which facilitates the open collaboration of researchers on the
-web, by sharing data and other research outputs.")
-    (license license:bsd-3)))
-
 (define-public python-osqp
  (package
    (name "python-osqp")
@@ -3887,11 +3887,7 @@ library.")
       (uri (pypi-uri "slicerator" version))
       (sha256
        (base32 "0ik0bmh18zgffd9kx53254jp3yyih6zcmd8kfb080xnqbizhl0a4"))))
-    (build-system pyproject-build-system)
-    (native-inputs
-     (list python-numpy
-           python-pytest
-           python-setuptools))
+    (build-system python-build-system)
    (home-page "https://github.com/soft-matter/slicerator")
    (synopsis "Lazy-loading, fancy-sliceable iterable")
    (description
@@ -4343,7 +4339,7 @@ state changes.")
 (define-public python-pymd4c
  (package
    (name "python-pymd4c")
-    (version "1.1.2")
+    (version "0.4.6.0b1")
    (source
     (origin
       (method git-fetch)
@@ -4352,7 +4348,7 @@ state changes.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0wr2xg8iqzv3z4m2bknr0pjf3gknzj932li0yy9fmja7mvrawlhw"))))
+        (base32 "0skmdn2bxfc546djxapdgb0bjvlr3c7a3kkv7j3bpx9zw09m0rcs"))))
    (build-system pyproject-build-system)
    (arguments (list #:tests? #f))      ; No tests.
    (inputs (list md4c))
@@ -5758,22 +5754,18 @@ other machines, such as over the network.")
 (define-public python-humanfriendly
  (package
    (name "python-humanfriendly")
-    (version "10.0")
+    (version "8.2")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/xolox/python-humanfriendly")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "humanfriendly" version))
       (sha256
-        (base32 "07di334y2xbyl9bd2c9q55sm0llmvz80a4p7frlkvq2w6l2d47bv"))))
-    (build-system pyproject-build-system)
+        (base32
+         "04ixg8b7p6xc8x8lffhi7wfl77xhszakhd0s6j0cf6a84j8yqlmz"))))
+    (build-system python-build-system)
    (arguments
-     (list
-       ;XXX: Tests depend on coloredlogs, which in turn depends on humanfriendly.
-      #:tests? #f))
-    (native-inputs (list python-setuptools))
+     `(;; XXX: Tests depend on coloredlogs, which in turn depends on humanfriendly.
+       #:tests? #f))
    (home-page "https://humanfriendly.readthedocs.io")
    (synopsis "Human-friendly input and output in Python")
    (description
@@ -6205,19 +6197,19 @@ can be used to:
 (define-public python-capturer
  (package
    (name "python-capturer")
-    (version "3.0")
+    (version "2.4")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/xolox/python-capturer")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "capturer" version))
       (sha256
-        (base32 "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-setuptools))
-    (propagated-inputs (list python-humanfriendly))
+        (base32
+         "05d6ji4j8ipiq0br7bwam38qc6hd9l1djmfxlzrxx19ziyjl4089"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))
+    (propagated-inputs
+     (list python-humanfriendly))
    (home-page "https://capturer.readthedocs.io")
    (synopsis "Capture stdout and stderr streams of the current process")
    (description
@@ -6257,30 +6249,20 @@ for additional processing.")
 (define-public python-coloredlogs
  (package
    (name "python-coloredlogs")
-    (version "15.0.1")
+    (version "10.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/xolox/python-coloredlogs")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "coloredlogs" version))
       (sha256
-        (base32 "1c83h3cvd2qww2m9myxrnqh0lr9fllx8zfb26f64lcvwd3cli1sf"))))
-    (build-system pyproject-build-system)
+        (base32
+         "0dkw6xp0r1dwgz4s2f58npx5nxfq51wf4l6qkm5ib27slgfs4sdq"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-flags
-      #~(list "-k"
-              (string-join
-               (list "not test_auto_install" ; Unclear why this fails.
-                     ;; XXX: Require a "script" executable.
-                     "test_cli_conversion"
-                     "test_empty_conversion"
-                     "test_output_interception")
-               " and not "))))
-    (native-inputs (list python-pytest python-setuptools python-verboselogs))
-    (propagated-inputs (list python-capturer))
+     `(;Tests require some updated modules
+       #:tests? #f))
+    (propagated-inputs
+     (list python-capturer))
    (home-page "https://coloredlogs.readthedocs.io")
    (synopsis "Colored stream handler for Python's logging module")
    (description
@@ -6737,25 +6719,18 @@ videos in a notebook.")
    (version "1.0.4")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/hamiltron/py-simple-audio")
-             (commit version)))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "simpleaudio" version))
       (sha256
-        (base32 "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"))))
-    (build-system pyproject-build-system)
+        (base32
+         "07glihg0fpca0gvbbvqs9q815w8xhflzdvg72yvlsm23j9j8h739"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:test-backend #~'unittest
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'fix-test-run
-            (lambda _
-              (delete-file-recursively "simpleaudio"))))))
-    (native-inputs (list python-setuptools))
-    (inputs (list alsa-lib))
-    (home-page "https://github.com/hamiltron/py-simple-audio")
+     `(#:tests? #f))
+    (inputs
+      (list alsa-lib))
+    (home-page
+     "https://github.com/hamiltron/py-simple-audio")
    (synopsis "Simple, asynchronous audio playback for Python 3")
    (description
     "The @code{simplaudio} package provides cross-platform, dependency-free
@@ -7038,24 +7013,17 @@ other Python program.")
 (define-public python-empy
  (package
    (name "python-empy")
-    (version "3.3.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://www.alcyone.com/software/empy/empy-"
-                           version ".tar.gz"))
-       (sha256
-        (base32 "1cgikljjcqxgz168prpvb0bnirbdxf9wmgj0vlzzhzzwf4a229li"))))
-    (build-system pyproject-build-system)
+    (version "3.3.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://www.alcyone.com/software/empy/empy-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "1mxfy5mgp473ga1pgz2nvm8ds6z4g3hdky8523z6jzvcs9ny6hcq"))))
+    (build-system python-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "./test.sh")))))))
-    (native-inputs (list python-setuptools))
+     `(#:tests? #f))                    ; python2 only
    (home-page "http://www.alcyone.com/software/empy/")
    (synopsis "Templating system for Python")
    (description
@@ -7095,24 +7063,21 @@ matplotlib plots or supply colors for a web application.")
 (define-public python-parse-type
  (package
    (name "python-parse-type")
-    (version "0.6.6")
+    (version "0.6.0")
    (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "parse_type" version))
       (sha256
        (base32
-         "1cmzjw8gryc08lp9znaxrngl6csdifd3610fd46pffa82223ffji"))))
+         "07smqnzc9km7sbvxfyx4gdm9njrx58x8grdw6gs4gva81rk3rd10"))))
    (build-system pyproject-build-system)
-    ;; tests: 332 passed, 2 skipped
    (native-inputs
     (list python-pytest
           python-pytest-html
           python-setuptools
-           python-setuptools-scm))
-    (propagated-inputs
-     (list python-six   ;hard dependency
-           python-parse))
+           python-wheel))
+    (propagated-inputs (list python-six python-parse))
    (home-page "https://github.com/jenisys/parse_type")
    (synopsis "Extended parse module")
    (description "Parse_type extends the python parse module.")
@@ -7121,18 +7086,20 @@ matplotlib plots or supply colors for a web application.")
 (define-public python-parse
  (package
    (name "python-parse")
-    (version "1.20.2")
+    (version "1.18.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/r1chardj0n3s/parse")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0s3dgafh1mz8g32gwk5vp0azdq168yjhbg5liivapgkwyq9zgwcb"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-pytest-cov python-setuptools))
+      (method url-fetch)
+      (uri (pypi-uri "parse" version))
+      (sha256
+       (base32
+        "19063x4xdjpaf7rfxai6jpgm2k4yvkq7wha8aa8cagbjsqr60rli"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _ (invoke "python" "test_parse.py"))))))
    (home-page "https://github.com/r1chardj0n3s/parse")
    (synopsis "Parse strings")
    (description
@@ -7207,26 +7174,20 @@ formats, including:
 (define-public python-polib
  (package
    (name "python-polib")
-    (version "1.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/izimobil/polib/")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "12n2skqj2qydcjp1r2ppzjcfc0fx4l23061x8bfqxx5pdvhnfpyb"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list #:test-backend #~'custom
-           #:test-flags #~(list "tests/tests.py")))
-    (native-inputs (list python-setuptools))
-    (home-page "https://github.com/izimobil/polib/")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "polib" version))
+               (sha256
+                (base32
+                  "0aikb8gcarhifn3sadrbbs5czagih9hjv250gsrgy9v1d49pvn7s"))))
+    (build-system python-build-system)
+    (native-inputs (list python-setuptools-67))
+    (home-page "https://bitbucket.org/izi/polib/wiki/Home")
    (synopsis "Manipulate, create and modify gettext files")
-    (description
-     "Polib can manipulate any gettext format (po, pot and mo) files.  It can
-be used to create po files from scratch or to modify existing ones.")
+    (description "Polib can manipulate any gettext format (po, pot and mo)
+files.  It can be used to create po files from scratch or to modify
+existing ones.")
    (license license:expat)))

 (define-public python-polling2
@@ -7235,18 +7196,14 @@ be used to create po files from scratch or to modify existing ones.")
    (version "0.5.0")
    (source
     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ddmee/polling2")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (pypi-uri "polling2" version))
       (sha256
-        (base32 "17q5nw9wab9p092r2bvmnk5nrzlwg5by6wf5wkbxnsz100nww7la"))))
-    (build-system pyproject-build-system)
-    (arguments
-     ;; XXX: Additional , in string comparison.
-     (list #:test-flags #~(list "-k" "not test_log_error_set_at_debug_level")))
-    (native-inputs (list python-mock python-pytest python-setuptools))
+        (base32 "0hp3238fv6k1qk43gv4jwnv1mwlkmx33akbj560b9nvsry1dmdwh"))))
+    (build-system python-build-system)
+    (arguments '(#:tests? #false)) ; no tests included
+    (native-inputs
+     (list python-mock python-pytest python-pytest-runner))
    (home-page "https://github.com/ddmee/polling2")
    (synopsis "Polling utility with many configurable options")
    (description "Polling2 is a utility used to wait for a function to return
@@ -14840,7 +14797,7 @@ callback signature using a prototype function.")
 (define-public python-pubmed-parser
  (package
    (name "python-pubmed-parser")
-    (version "0.5.1")
+    (version "0.3.1")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -14849,18 +14806,20 @@ callback signature using a prototype function.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hm520pxmbqlfckkdyccagmmsrqwdi0qdsc0l7rgp62jmsv7ppi5"))))
+                "195cmjjg7xdwjj5455h78q7jnxnccia07a19xwndhlkxv7vk9v60"))))
    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ;; Tests require internet
-    (native-inputs
-     (list python-setuptools))
    (propagated-inputs
     (list python-lxml
           python-numpy
           python-requests
-           python-six           ;hard dependency
+           python-six
           python-unidecode))
-    (home-page "https://titipata.github.io/pubmed_parser/")
+    (native-inputs
+     (list python-pytest
+           python-pytest-cov
+           python-setuptools
+           python-wheel))
+    (home-page "https://github.com/titipata/pubmed_parser")
    (synopsis "Parser for Pubmed Open-Access Subset and MEDLINE XML repository")
    (description
     "This package provides a Python parser for Pubmed Open-Access Subset and
@@ -35172,49 +35131,64 @@ of fast and robust hash functions.  This library is a Python extension module
 written in C.")
      (license license:public-domain))))

+;; Scooby requires for its test suite a ‘pyvips’ package that is missing its
+;; VIPS dependency.
+(define python-pyvips-for-python-scooby
+  (package
+    (inherit python-pyvips)
+    (name "python-pyvips-for-python-scooby")
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-pyvips)
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            ;; The checks won't succeed without VIPS.
+            (delete 'check)
+            (delete 'sanity-check)))))
+    (inputs
+     (modify-inputs (package-inputs python-pyvips)
+       (delete "vips")))
+    (synopsis "pyvips for Scooby's test suite")))
+
 (define-public python-scooby
  (package
    (name "python-scooby")
-    (version "0.11.0")
+    (version "0.5.12")
    (source
+     ;; The PyPI tarball does not contain the tests.
     (origin
       (method git-fetch)
       (uri (git-reference
-              (url "https://github.com/banesullivan/scooby")
-              (commit (string-append "v" version))))
+             (url "https://github.com/banesullivan/scooby")
+             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0c47gwcc5kpwx7s8ccp53s174bgraxm4qqrn72yz2ypxah6k3ccj"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      ;; tests: 19 passed, 5 deselected, 1 warning
-      #:test-flags
-      ;; AssertionError: assert 'Module not found' == '0.1.0'
-      #~(list "--deselect=tests/test_scooby.py::test_get_version"
-              ;; ModuleNotFoundError: No module named 'no_version'
-              "--deselect=tests/test_scooby.py::test_tracking"
-              ;; Failed: DID NOT RAISE <class 'OSError'>
-              "--deselect=tests/test_scooby.py::test_import_os_error"
-              ;; FileNotFoundError: [Errno 2] No such file or directory: 'time'
-              "--deselect=tests/test_scooby.py::test_import_time"
-              ;; Errored
-              "--deselect=tests/test_scooby.py::test_cli")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'set-version
-            (lambda _
-              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
+        (base32 "1gkpmz8wl3jg8ylf1na35308sznw2g9wx33zqlyq5i2gpy2ml9mw"))))
+    (build-system python-build-system)
    (native-inputs
     (list python-beautifulsoup4
           python-numpy
           python-pytest
-           python-pyvips
-           python-scipy
-           python-setuptools
-           python-setuptools-scm))
+           python-pytest-cov
+           python-pyvips-for-python-scooby
+           python-scipy))
    (propagated-inputs
     (list python-psutil))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-tests
+           (lambda _
+             (substitute* "tests/test_scooby.py"
+               ;; The test suite uses the no-version PyPI package
+               ;; (https://pypi.org/project/no-version/),
+               ;; but it doesn't seem worth packaging in Guix just for this.
+               (("scooby\\.report\\.VERSION_NOT_FOUND")
+                "scooby.report.MODULE_NOT_FOUND")
+               (("^ +import no_version  # noqa.*") ""))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "pytest")))))))
    (home-page "https://github.com/banesullivan/scooby")
    (synopsis "Report hardware information and Python package versions")
    (description
@@ -3298,7 +3298,7 @@ frontend implemented in QML.")))
 (define-public qtspell
  (package
    (name "qtspell")
-    (version "1.0.2")
+    (version "1.0.1")
    (source
     (origin
       (method git-fetch)
@@ -3307,15 +3307,14 @@ frontend implemented in QML.")))
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "19ivs1pq9mmas731nx77lg63l0cn6c8g61s7a728s9hpxmihdq9s"))))
+        (base32 "19ff6jzm699wrxrk57w3d4kl9qxgdipdikpwls9n4aqv4mw7g969"))))
    (build-system cmake-build-system)
    (arguments
-     `(#:configure-flags (list "-DQT_VER=6")
-       #:tests? #f))                    ;no test
+     `(#:tests? #f))                    ;no test
    (native-inputs
-     (list pkg-config qttools))
+     (list pkg-config qttools-5))
    (inputs
-     (list enchant qtbase))
+     (list enchant qtbase-5))
    (home-page "https://github.com/manisandro/qtspell")
    (synopsis "Spell checking for Qt text widgets")
    (description
@@ -521,11 +521,9 @@ Graph.")
              (sha256
               (base32
                "1b4vg754kcxvinwdv7pjfmwbnmgm50w8mb2naf2lwp27bpyllvkb"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
-     ;; The test suite simply queries external HTTP endpoints.
-     (list #:tests? #f))
-    (native-inputs (list python-setuptools))
+     '(#:tests? #f)) ; The test suite simply queries external HTTP endpoints.
    (propagated-inputs (list python-rdflib))
    (home-page "https://rdflib.dev/sparqlwrapper/")
    (synopsis "SPARQL Endpoint interface to Python")
@@ -46,7 +46,6 @@
  #:use-module (gnu packages protobuf)
  #: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 regex)
  #:use-module (gnu packages tls)
@@ -167,30 +166,6 @@ browsers to backend services.")
 type information of gRPC.")
    (license license:expat)))

-(define-public python-grpcio-status
-  (package
-    (name "python-grpcio-status")
-    ;; XXX: Should follow python-grpcio, but 1.52.0 has been yanked.
-    (version "1.51.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "grpcio-status" version))
-       (sha256
-        (base32 "18lg21jzmwkd3x107ccqb1mwj4fg30l2pg2izvdz1nawapxb65al"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f)) ; No tests in Pypi.
-    (propagated-inputs
-     (list python-googleapis-common-protos
-           python-grpcio
-           python-protobuf-4))
-    (native-inputs (list python-setuptools))
-    (home-page "https://grpc.io")
-    (synopsis "Status proto mapping for gRPC")
-    (description
-     "This package provides status proto mapping for @code{gRPC}.")
-    (license license:asl2.0)))
-
 (define-public python-grpcio
  (package
    (name "python-grpcio")
@@ -675,7 +675,7 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.")
 (define-public capnproto
  (package
    (name "capnproto")
-    (version "1.3.0")
+    (version "1.2.0")
    (source (origin
              (method url-fetch)
              (uri (string-append
@@ -683,7 +683,7 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.")
                    version ".tar.gz"))
              (sha256
               (base32
-                "0211a9c394l9lfb8ixdsimpwh6kj7xxy05xfaryq66js955853q9"))))
+                "1vs2zpk4l55hb4lq4kldbwdqcjnwm1jblhcaqxmii9dxrd7f807d"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -3356,6 +3356,7 @@ files, including Rmarkdown files.")
  (package
    (name "python-pyreadstat")
    (version "1.2.4")
+    ;; No tests in the PyPI tarball.
    (source
     (origin
       (method git-fetch)
@@ -3366,28 +3367,26 @@ files, including Rmarkdown files.")
       (sha256
        (base32 "0zysrzixvqw2lwwykxqg5yj8a0zyv5s2bmk22x30f4rj2hgvq1pv"))
       (patches (search-patches "python-pyreadstat-link-libiconv.patch"))))
-    (build-system pyproject-build-system)
    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'change-home-dir
-            (lambda _
-              ;; test_sav_expand and test_sav_write_basic_expanduser need a
-              ;; home directory with write permissions.
-              (setenv "HOME" "/tmp")))
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                ;; The source also contains tests/test_version.py
-                ;; which checks the version in __init__.py against the
-                ;; one in setup.py. Since this requires texlive
-                ;; dependencies to run and is also not mentioned in
-                ;; how_to_test.md, this test is skipped.
-                (invoke "python" "tests/test_basic.py")))))))
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'change-home-dir
+                    (lambda _
+                      ;; test_sav_expand and test_sav_write_basic_expanduser need a
+                      ;; home directory with write permissions.
+                      (setenv "HOME" "/tmp")))
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        ;; The source also contains tests/test_version.py
+                        ;; which checks the version in __init__.py against the
+                        ;; one in setup.py. Since this requires texlive
+                        ;; dependencies to run and is also not mentioned in
+                        ;; how_to_test.md, this test is skipped.
+                        (invoke "python" "tests/test_basic.py")))))))
+    (build-system python-build-system)
    (propagated-inputs (list python-pandas))
    (inputs (list libiconv zlib))
-    (native-inputs (list python-cython python-setuptools))
+    (native-inputs (list python-cython))
    (home-page "https://github.com/Roche/pyreadstat")
    (synopsis
     "Read and write SAS, SPSS and Stata files into/from Pandas DataFrames")
@@ -5,7 +5,6 @@
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,7 +59,6 @@
  #:use-module (gnu packages networking)
  #:use-module (gnu packages nss)
  #:use-module (gnu packages openldap)
-  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
  #:use-module (gnu packages pretty-print)
  #:use-module (gnu packages python)
@@ -87,208 +85,199 @@
 (define-public ceph
  (package
    (name "ceph")
-    (version "20.3.0")
+    (version "17.2.9")
    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/ceph/ceph")
-                     (commit (string-append "v" version))
-                     ;; There are many source bundled libraries, and the build
-                     ;; system does not yet support using dependencies from
-                     ;; the system for all of them.
-                     (recursive? #t)))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "https://download.ceph.com/tarballs/ceph-"
+                                  version ".tar.gz"))
              (sha256
               (base32
-                "08k7f1nj3g1mb7h8vgw71xgpslz0dhqwr6ldzxs3naf2f73x0mh8"))
-              (patches (search-patches "ceph-fix-cmake.patch"))
+                "04m4zxp9hjvppl679ilnr90zr6ij08wr4ralr0whzldy0fskc8hp"))
+              (patches
+               (search-patches
+                "ceph-disable-cpu-optimizations.patch"
+                "ceph-fix-for-newer-boost.patch" ))
              (modules '((guix build utils)))
              (snippet
-               ;; Delete bundled libraries where feasible.
               '(for-each delete-file-recursively
-                          '( ;; TODO: Unbundle these:
-                            ;;"src/isa-l"
-                            ;;"src/xxHash"
-                            "src/BLAKE3"
+                          '(;; TODO: Unbundle these:
                            "src/arrow"
+                            ;;"src/isa-l"
+                            ;;"src/lua"
+                            ;;"src/xxHash"
+                            ;;"src/zstd"
+                            ;;"src/civetweb"
                            "src/c-ares"
                            "src/fmt"
                            "src/googletest"
-                            "src/jaegertracing"
-                            "src/qatlib"
-                            "src/qatzip"
+                            "src/rapidjson"
                            "src/spdk"
                            "src/rocksdb"
-                            "src/utf8proc"
-                            "src/zstd"
-                            "systemd")))))
+                            "src/boost"
+                            "src/utf8proc")))))
    (build-system cmake-build-system)
    (arguments
     (list
+      #:parallel-build? #f ;because mgr_legacy_options.h is not built in time
      #:configure-flags
-      #~(list (string-append "-DCMAKE_INSTALL_RPATH="
-                             #$output "/lib" ";" #$output "/lib/ceph")
-              "-DENABLE_GIT_VERSION=OFF"
-              "-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
-              "-DBUILD_SHARED_LIBS=ON"
-              "-DCEPHADM_BUNDLED_DEPENDENCIES=none"
-              "-DWITH_SYSTEM_ARROW=ON"
-              "-DWITH_SYSTEM_BOOST=ON"
-              "-DWITH_SYSTEM_FMT=ON"
-              #$@(if (target-x86-64?)
-                     #~("-DWITH_SYSTEM_QATLIB=ON"
-                        "-DWITH_SYSTEM_QATZIP=ON")
-                     #~())
-              "-DWITH_SYSTEM_LIBURING=ON"
-              "-DWITH_SYSTEM_ROCKSDB=ON"
-              "-DWITH_SYSTEM_UTF8PROC=ON"
-              "-DWITH_SYSTEM_ZSTD=ON"
+      '(let* ((out (assoc-ref %outputs "out"))
+              (lib (assoc-ref %outputs "lib"))
+              (libdir (string-append lib "/lib")))
+         (list (string-append "-DCMAKE_INSTALL_PREFIX=" out)
+               (string-append "-DCMAKE_INSTALL_LIBDIR=" libdir)
+               (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
+                              lib "/include")
+               ;; We need both libdir and libdir/ceph in RUNPATH.
+               (string-append "-DCMAKE_INSTALL_RPATH="
+                              libdir ";" libdir "/ceph")
+               (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc")
+               (string-append "-DCMAKE_INSTALL_DATADIR=" lib "/share")
+               (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man")
+               (string-append "-DCMAKE_INSTALL_DOCDIR=" out "/share/ceph/doc")
+               (string-append "-DCMAKE_INSTALL_LIBEXECDIR=" out "/libexec")
+               (string-append "-DKEYUTILS_INCLUDE_DIR="
+                              (assoc-ref %build-inputs "keyutils") "/include")
+               (string-append "-DXFS_INCLUDE_DIR="
+                              (assoc-ref %build-inputs "xfsprogs") "/include")
+               "-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
+               "-DBUILD_SHARED_LIBS=ON"
+               "-DWITH_SYSTEM_ARROW=ON"
+               "-DWITH_SYSTEM_BOOST=ON"
+               "-DWITH_SYSTEM_ROCKSDB=ON"
+               "-DWITH_SYSTEM_UTF8PROC=ON"

-              ;; TODO: Enable these when available in Guix.
-              "-DWITH_MGR=OFF"        ;requires python-rook-client
-              "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ;requires node + nodeenv
-              "-DWITH_BABELTRACE=OFF"
-              "-DWITH_JAEGER=OFF"     ;requires bundled opentelemetry-cpp
-              "-DWITH_LTTNG=OFF"
-              "-DWITH_RADOSGW=OFF"    ;requires bundled libkmip and rgw
-              "-DWITH_SPDK=OFF"
-              "-DWITH_RADOSGW_AMQP_ENDPOINT=OFF"
+               ;; TODO: Enable these when available in Guix.
+               "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ;requires node + nodeenv
+               "-DWITH_BABELTRACE=OFF"
+               "-DWITH_LTTNG=OFF"
+               "-DWITH_SPDK=OFF"
+               "-DWITH_RADOSGW_AMQP_ENDPOINT=OFF"

-              ;; Use jemalloc instead of tcmalloc.
-              "-DALLOCATOR=jemalloc"
+               ;; Use jemalloc instead of tcmalloc.
+               "-DALLOCATOR=jemalloc"

-              ;; Don't install systemd unit files.
-              "-DWITH_SYSTEMD=OFF"
+               ;; Don't install systemd unit files.
+               "-DWITH_SYSTEMD=OFF"

-              ;; Do not bother building the tests; we are not currently running
-              ;; them, and they do not build with system googletest as of 14.2.5.
-              "-DWITH_TESTS=OFF")
-      ;; FIXME: Some of the tests leak Btrfs subvolumes on Btrfs. See
-      ;; <https://bugs.gnu.org/29674> for details. Disable tests until
-      ;; resolved.
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'unbundle-blake3
-            (lambda _
-              ;; Unbundle Blake3.
-              (substitute* "src/CMakeLists.txt"
-                (("add_subdirectory.*BLAKE3.*") ""))))
-          (add-after 'unpack 'relax-fmt-requirement
-            (lambda _
-              (substitute* "src/CMakeLists.txt"
-                (("11.1.4 REQUIRED")
-                 "<12 REQUIRED"))))
-          (add-after 'unpack 'fix-zstd-include
-            (lambda _
-              ;; See <https://tracker.ceph.com/issues/63194>.
-              (substitute* "src/compressor/zstd/ZstdCompressor.h"
-                (("#include \"zstd/lib/zstd.h\"")
-                 "#include \"zstd.h\""))))
-          (add-after 'unpack 'set-source-file-times-to-1980
-            (lambda _
-              (let ((circa-1980 (* 10 366 24 60 60)))
-                (for-each (lambda (f) (utime f circa-1980 circa-1980))
-                          (find-files "src")))))
-          (add-before 'build 'build-legacy-option-header
-            (lambda _
-              ;; Building this target in parallel causes races (see:
-              ;; <https://tracker.ceph.com/issues/63402>), so build it before
-              ;; the main build without parallelism.
-              (invoke "make" "legacy-option-headers")))
+               ;; Do not bother building the tests; we are not currently running
+               ;; them, and they do not build with system googletest as of 14.2.5.
+               "-DWITH_TESTS=OFF"))
+       ;; FIXME: Some of the tests leak Btrfs subvolumes on Btrfs. See
+       ;; <https://bugs.gnu.org/29674> for details. Disable tests until
+       ;; resolved.
+       #:tests? #f
+       #:phases
+       `(modify-phases %standard-phases
          (add-after 'unpack 'patch-source
-            (lambda _
-              (substitute* "cmake/modules/Distutils.cmake"
-                ;; Prevent creation of Python eggs.
-                (("setup.py install")
-                 "setup.py install --single-version-externally-managed --root=/")
-                ;; Inject the -rpath linker argument when linking
-                ;; Python C libraries so RUNPATH gets set up correctly.
-                (("LDFLAGS=(.*)\n" _ flags)
-                 (string-append "LDFLAGS=\\\"" flags
-                                " -Wl,-rpath=" #$output "/lib\\\"\n")))
-              (substitute* "udev/50-rbd.rules"
-                (("/usr/bin/ceph-rbdnamer")
-                 (string-append #$output "/bin/ceph-rbdnamer")))))
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (lib (assoc-ref outputs "lib")))
+
+                (substitute* "src/rgw/store/dbstore/sqlite/CMakeLists.txt"
+                  (("add_library\\(sqlite_db \\$")
+                   "add_library(sqlite_db STATIC $"))
+                (substitute* "src/rgw/store/dbstore/CMakeLists.txt"
+                  (("add_library\\(dbstore \\$")
+                   "add_library(dbstore STATIC $")
+                  (("add_library\\(dbstore_lib \\$")
+                   "add_library(dbstore_lib STATIC $"))
+
+                (substitute* "cmake/modules/Distutils.cmake"
+                  ;; Prevent creation of Python eggs.
+                  (("setup.py install")
+                   "setup.py install --single-version-externally-managed --root=/")
+                  ;; Inject the -rpath linker argument when linking
+                  ;; Python C libraries so RUNPATH gets set up correctly.
+                  (("LDFLAGS=(.*)\n" _ flags)
+                   (string-append "LDFLAGS=\\\"" flags
+                                  " -Wl,-rpath=" lib "/lib\\\"\n")))
+
+                ;; Statically link libcrc32 because it does not get installed,
+                ;; yet several libraries end up referring to it.
+                (substitute* "src/common/CMakeLists.txt"
+                  (("add_library\\(crc32")
+                   "add_library(crc32 STATIC"))
+
+                (substitute* "udev/50-rbd.rules"
+                  (("/usr/bin/ceph-rbdnamer")
+                   (string-append out "/bin/ceph-rbdnamer"))))))
+          (add-before 'install 'set-install-environment
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (py3sitedir
+                      (string-append out "/lib/python"
+                                     ,(version-major+minor
+                                       (package-version python))
+                                     "/site-packages")))
+                ;; The Python install scripts refuses to function if
+                ;; the install directory is not on PYTHONPATH.
+                (setenv "PYTHONPATH" py3sitedir))))
          (add-after 'install 'wrap-python-scripts
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let* ((scripts '("bin/ceph" "bin/cephfs-top" "sbin/ceph-volume"))
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (scripts '("bin/ceph" "bin/cephfs-top" "sbin/ceph-volume"))
                     (dependencies (map (lambda (input)
                                          (assoc-ref inputs input))
                                        '("python-prettytable" "python-pyyaml")))
-                     (site (lambda (package)
-                             (string-append package
-                                            "/lib/python"
-                                            #$(version-major+minor
-                                               (package-version
-                                                (this-package-input "python")))
-                                            "/site-packages")))
-                     (PYTHONPATH (string-join
-                                  (map site (cons #$output dependencies))
-                                  ":")))
-                (for-each (lambda (s)
-                            (wrap-program (string-append #$output "/" s)
-                              `("GUIX_PYTHONPATH" prefix (,PYTHONPATH))))
+                     (sitedir (lambda (package)
+                                (string-append package
+                                               "/lib/python"
+                                               ,(version-major+minor
+                                                 (package-version python))
+                                               "/site-packages")))
+                     (PYTHONPATH (string-join (map sitedir (cons out dependencies))
+                                              ":")))
+                (for-each (lambda (executable)
+                            (wrap-program (string-append out "/" executable)
+                              `("GUIX_PYTHONPATH" ":" prefix (,PYTHONPATH))))
                          scripts)))))))
+    (outputs
+     '("out" "lib"))
    (native-inputs
-     (list pkg-config
-           python
-           python-cython
-           python-sphinx
-           yasm))
+     (list git-minimal gperf pkg-config python-cython python-sphinx yasm))
    (inputs
-     (append
-      (if (target-x86-64?)
-          (list qatlib qatzip)
-          '())
-      (list `(,apache-thrift "lib")
-            `(,apache-thrift "include")
-            `(,apache-arrow "lib")
-            `(,util-linux "lib")
-            bash-minimal
-            boost-1.88
-            cryptsetup-minimal
-            curl
-            eudev
-            expat
-            fcgi
-            fmt-11
-            fuse
-            icu4c
-            jemalloc
-            keyutils
-            leveldb
-            libaio
-            libatomic-ops
-            libcap                      ;for src/extblkdev
-            libcap-ng
-            libblake3
-            libnbd
-            libnl
-            librdkafka
-            liburing
-            lmdb
-            lua
-            lz4
-            ncurses
-            nss
-            oath-toolkit
-            openldap
-            openssl
-            python
-            python-prettytable          ;used by ceph_daemon.py
-            python-pyyaml               ;from python-common/setup.py
-            rapidjson
-            rdma-core
-            rocksdb-for-ceph
-            snappy
-            sqlite
-            utf8proc
-            util-linux
-            xfsprogs
-            zlib
-            `(,zstd "lib"))))
-    (home-page "https://ceph.io/en/")
+     (list `(,apache-thrift "lib")
+           `(,apache-thrift "include")
+           `(,apache-arrow-for-ceph "lib")
+           bash-minimal
+           boost
+           curl
+           cryptsetup-minimal
+           eudev
+           expat
+           fcgi
+           fmt-8
+           fuse-2
+           icu4c
+           jemalloc
+           keyutils
+           leveldb
+           libaio
+           libatomic-ops
+           libcap-ng
+           libnl
+           librdkafka
+           lua
+           lz4
+           oath-toolkit
+           openldap
+           openssl
+           ncurses
+           nss
+           python-prettytable           ;used by ceph_daemon.py
+           python-pyyaml                ;from python-common/setup.py
+           python
+           rapidjson
+           rdma-core
+           rocksdb
+           snappy
+           sqlite
+           utf8proc
+           util-linux
+           `(,util-linux "lib")
+           xfsprogs
+           zlib))
+    (home-page "https://ceph.com/")
    (synopsis "Distributed object store and file system")
    (description
     "Ceph is a distributed storage system designed for reliability and
@@ -300,67 +289,10 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
    ;; not use the GPL code. The source archive includes a number of files
    ;; carrying other licenses; consult COPYING for more information. Note
    ;; that COPYING does not cover third-party bundled software.
-    (license (list license:lgpl2.1 license:gpl2 ;some files are 'or later'
-                   license:cc-by-sa3.0          ;documentation
-                   license:bsd-3                ;isa-l,jerasure,++
-                   license:expat))))            ;java bindings
-
-(define-public libnbd
-  (package
-    (name "libnbd")
-    (version "1.24.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://download.libguestfs.org/" name "/"
-                                  (version-major+minor version) "-stable/"
-                                  name "-" version ".tar.gz"))
-
-              (sha256
-               (base32
-                "1vz62w270p23787v1r51rbcfd9lh73b99mcaf7q27pldc7bazggm"))))
-    (build-system gnu-build-system)
-    (arguments
-     ;; The fork-safe-execvpe test fails for unknown reasons (see:
-     ;; <https://gitlab.com/nbdkit/libnbd/-/issues/14>).
-     (list
-      #:configure-flags
-      #~(list (string-append "--with-python-installdir="
-                             #$output "/lib/python"
-                             #$(package-version (this-package-input
-                                                 "python-minimal"))
-                             "/site-packages"))
-      #:make-flags #~(list "XFAIL_TESTS=test-fork-safe-execvpe.sh")
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'patch-commands
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       (substitute* '("lib/utils.c"
-                                      "sh/nbdsh.in")
-                         (("/bin/sh")
-                          (search-input-file inputs "bin/sh"))))))))
-    (native-inputs (list pkg-config perl))
-    (inputs (list bash-minimal fuse gnutls libxml2
-                  python-minimal))      ;match the python used by libxml2
-    (home-page "https://gitlab.com/nbdkit/libnbd")
-    (synopsis "Network Block Device client library in userspace")
-    (description "@acronym{NBD, Network Block Device} is a protocol
-for accessing block devices (hard disks and disk-like things) over a network.
-This is the NBD client library in userspace, a simple library for writing NBD
-clients.  The key features are:
-@itemize
-@item Synchronous API for ease of use.
-@item Asynchronous API for writing non-blocking, multithreaded clients.
-@item High performance.
-@item Minimal dependencies for the basic library.
-@item Well-documented, stable API.
-@item Bindings in several programming languages.
-@item Shell (nbdsh) for command line and scripting.
-@item Copying tool (nbdcopy) for high performance copying and streaming.
-@item Hexdump tool (nbddump) to print NBD content.
-@item Query tool (nbdinfo) to query NBD servers.
-@item FUSE support (nbdfuse) to mount NBD in the local file system.
-@item Linux ublk support (nbdublk) to create the userspace block device.
-@end itemize")
-    (license license:lgpl2.1+)))
+    (license (list license:lgpl2.1 license:gpl2  ;some files are 'or later'
+                   license:cc-by-sa3.0           ;documentation
+                   license:bsd-3                 ;isa-l,jerasure,++
+                   license:expat))))             ;civetweb,java bindings

 (define-public spdk
  (package
@@ -1154,7 +1154,7 @@ support.")
 (define-public sfeed
  (package
    (name "sfeed")
-    (version "2.3")
+    (version "2.2")
    (source
     (origin
       (method git-fetch)
@@ -1164,7 +1164,7 @@ support.")
         (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "075ywq02pjkywbcndyv8qini4v6p6k7hxx1cd3by0im6rm2w3wsn"))))
+        (base32 "12m471mlrjvr696zbs6w85vl5by58gg2a5xxd0abnxjkhijric2h"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -38,7 +38,6 @@
  #:use-module (guix build-system cmake)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system trivial)
-  #:use-module (guix build-system pyproject)
  #:use-module (guix build-system python)
  #:use-module (gnu packages)
  #:use-module (gnu packages autotools)
@@ -49,8 +48,6 @@
  #:use-module (gnu packages libevent)
  #:use-module (gnu packages ncurses)
  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python-build)
-  #:use-module (gnu packages python-check)
  #:use-module (gnu packages python-xyz)
  #:use-module (gnu packages sphinx)
  #:use-module (gnu packages ssh)
@@ -167,34 +164,39 @@ windows.")
 (define-public python-libtmux
  (package
    (name "python-libtmux")
-    (version "0.53.0")
+    (version "0.10.1")
    (source
     (origin
       (method git-fetch)
+       ;; PyPI source tarball does not include tests.
       (uri (git-reference
             (url "https://github.com/tmux-python/libtmux")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "19l3kglg2yxw4i1czr93071ymlyj0in3d6yhl9nwd5dm7a3bjs4l"))))
-    (build-system pyproject-build-system)
+        (base32 "068vy92f2668vrjvd3laqvxd48cmna66f2msdmwk2hm9qxklgf51"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     (list procps))             ;tests need top
+    (native-inputs
+     (list python-pytest tmux))
    (arguments
-     (list
-      #:test-flags
-      #~(list "-c" "/dev/null" ; Missing development dependency.
-              "-k" "not test_capture_pane_start")  ; Permission denied.
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'check 'configure-tests
-            (lambda _
-              ;; Fix <https://github.com/tmux-python/libtmux/issues/265>.
-              (setenv "LANG" "en_US.utf8"))))))
-    (propagated-inputs (list procps)) ;tests need top
-    (native-inputs (list python-hatchling python-pytest tmux))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             ;; Fix <https://github.com/tmux-python/libtmux/issues/265>.
+             (setenv "LANG" "en_US.utf8")
+             ;; Skip tests that I suspect fail because of a change
+             ;; in behavior in tmux 3 from tmux 2
+             ;; https://github.com/tmux-python/libtmux/issues/281
+             (invoke "pytest" "-vv" "-k"
+                     (string-append "not test_show_option_unknown "
+                                    "and not test_show_window_option_unknown"))
+             #t)))))
    (home-page "https://github.com/tmux-python/libtmux")
    (synopsis "Python API for tmux")
-    (description
-     "Libtmux is the tool behind @command{tmuxp}, a tmux workspace
+    (description "Libtmux is the tool behind @command{tmuxp}, a tmux workspace
 manager in Python.  It creates object mappings to traverse, inspect and interact
 with live tmux sessions.")
    (license license:expat)))
@@ -1853,56 +1853,46 @@ built-in cache to decrease server I/O pressure.  cgit-pink is a fork of
 cgit.")))

 (define-public python-git-multimail
-  (let ((commit "747fad49038b1f0eea12ab4ad453fb404111fe11")
-        (revision "0"))
-    (package
-      (name "python-git-multimail")
-      (version (git-version "1.6.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://github.com/git-multimail/git-multimail")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "101lm3sxdi844bj91x1sqnjw1lmqv1ir1m2dr2nfv9gap94pvaiw"))))
-      (build-system pyproject-build-system)
-      (arguments
-       (list
-        ;; Some tests are failing, but the test suite is not configurable.
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'patch
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "setup.py"
-                  (("'git-multimail', 'README.rst'")
-                   "'README.rst'"))
-                (substitute* "git-multimail/git_multimail.py"
-                  (("GIT_EXECUTABLE = 'git'")
-                   (format #f "GIT_EXECUTABLE = '~a'"
-                           (search-input-file inputs "bin/git")))
-                  (("/usr/sbin/sendmail")
-                   (search-input-file inputs "/sbin/sendmail")))))
-            (replace 'check
-              (lambda* (#:key tests? #:allow-other-keys)
-                (when tests?
-                  (with-directory-excursion "t"
-                    (invoke "make" "test"))))))))
-      (native-inputs (list python-setuptools))
-      (inputs (list git sendmail))
-      (home-page "https://github.com/git-multimail/git-multimail")
-      (synopsis "Send notification emails for Git pushes")
-      (description
-       "This hook sends emails describing changes introduced by pushes to a Git
+  (package
+    (name "python-git-multimail")
+    (version "1.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "git-multimail" version))
+       (sha256
+        (base32
+         "0hwgf2p2dd4z397wj0y558s8xxbkzbsa6yb9n1iax624y7swjng1"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "setup.py"
+               (("'git-multimail', 'README.rst'")
+                "'README.rst'"))
+             (substitute* "git-multimail/git_multimail.py"
+               (("GIT_EXECUTABLE = 'git'")
+                (string-append "GIT_EXECUTABLE = '"
+                               (assoc-ref inputs "git") "/bin/git"
+                               "'"))
+               (("/usr/sbin/sendmail")
+                (search-input-file inputs
+                                   "/sbin/sendmail"))))))))
+    (inputs
+     (list git sendmail))
+    (home-page "https://github.com/git-multimail/git-multimail")
+    (synopsis "Send notification emails for Git pushes")
+    (description
+     "This hook sends emails describing changes introduced by pushes to a Git
 repository.  For each reference that was changed, it emits one ReferenceChange
 email summarizing how the reference was changed, followed by one Revision
 email for each new commit that was introduced by the reference change.

 This script is designed to be used as a post-receive hook in a Git
 repository")
-      (license license:gpl2))))
+    (license license:gpl2)))

 (define-public python-ghp-import
  (package
@@ -2835,12 +2825,12 @@ interface.")
        (sha256
          (base32
            "09rq3hgbb6qjws0kymnh8lbglsc5yjby3b2bc0savs2agf88j83z"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     ;; Tests need mercurial source code.
-     (list #:tests? #f))
-    (native-inputs (list python-setuptools))
-    (propagated-inputs (list mercurial))
+     '(#:tests? #f))
+    (propagated-inputs
+      (list mercurial))
    (home-page "https://www.mercurial-scm.org/doc/evolution/")
    (synopsis "Flexible evolution of Mercurial history")
    (description "Evolve is a Mercurial extension for faster and safer mutable
@@ -2880,7 +2880,7 @@ the last played position, etc.")
       (uri (pypi-uri "jellyfin-mpv-shim" version))
       (sha256
        (base32 "0hcvqskhgwdyi117hqmlhqknsii22qcmiwhzhf50ab5szsy0rg32"))))
-    (build-system pyproject-build-system)
+    (build-system python-build-system)
    (arguments
     (list
      ;; There is no test suite, but the code is ill-behaved and tries
@@ -2923,7 +2923,6 @@ the last played position, etc.")
                                              ".appdata.xml") metainfo)
                 (install-file (string-append desktop-base package-id
                                              ".desktop") apps)))))))
-    (native-inputs (list python-setuptools))
    (inputs (list `(,python "tk")
                  python-jellyfin-apiclient
                  python-jinja2
@@ -3279,33 +3278,32 @@ original project.")
  (package
    (name "you-get")
    (version "0.4.1555")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/soimort/you-get")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0gn86i6nfsw395r9a3i88nv2g08s5bgjps7w4qawb9gvk4h7zqap"))))
-    (build-system pyproject-build-system)
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/soimort/you-get")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0gn86i6nfsw395r9a3i88nv2g08s5bgjps7w4qawb9gvk4h7zqap"))))
+    (build-system python-build-system)
+    (inputs
+     (list ffmpeg))             ; for multi-part and >=1080p videos
    (arguments
-     (list
-      #:tests? #f ;XXX some tests need Internet access
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'qualify-input-references
-            ;; Explicitly invoke the input ffmpeg, instead of whichever one
-            ;; happens to be in the user's $PATH at run time.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((ffmpeg (search-input-file inputs "/bin/ffmpeg")))
-                (substitute* "src/you_get/processor/ffmpeg.py"
-                  ;; Don't blindly replace all occurrences of ‘'ffmpeg'’: the
-                  ;; same string is also used when sniffing ffmpeg's output.
-                  (("(FFMPEG == |\\()'ffmpeg'" _ prefix)
-                   (string-append prefix "'" ffmpeg "'")))))))))
-    (native-inputs (list python-setuptools))
-    (inputs (list ffmpeg)) ;for multi-part and >=1080p videos
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'qualify-input-references
+           ;; Explicitly invoke the input ffmpeg, instead of whichever one
+           ;; happens to be in the user's $PATH at run time.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((ffmpeg (search-input-file inputs "/bin/ffmpeg")))
+               (substitute* "src/you_get/processor/ffmpeg.py"
+                 ;; Don't blindly replace all occurrences of ‘'ffmpeg'’: the
+                 ;; same string is also used when sniffing ffmpeg's output.
+                 (("(FFMPEG == |\\()'ffmpeg'" _ prefix)
+                  (string-append prefix "'" ffmpeg "'")))))))
+       #:tests? #f))                    ; XXX some tests need Internet access
    (synopsis "Download videos, audio, or images from Web sites")
    (description
     "You-Get is a command-line utility to download media contents (videos,
@@ -3944,9 +3942,6 @@ and custom quantization matrices.")
 from sites like Twitch.tv and pipes them into a video player of choice.")
    (license license:bsd-2)))

-;; XXX: This package has not been updated in 6 years, is related to an web
-;; application and is not tested, it's most likely not working, but I haven't
-;; tested it.  Consider removal.
 (define-public twitchy
  (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag
    (package
@@ -3960,28 +3955,31 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0di03h1j9ipp2bbnxxlxz07v87icyg2hmnsr4s7184z5ql8kpzr7"))))
-      (build-system pyproject-build-system)
+          (base32
+           "0di03h1j9ipp2bbnxxlxz07v87icyg2hmnsr4s7184z5ql8kpzr7"))))
+      (build-system python-build-system)
      (arguments
-       (list
-        #:tests? #f                     ; No tests.
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'unpack 'patch-paths
-              (lambda* (#:key inputs #:allow-other-keys)
-                (substitute* "twitchy/twitchy_play.py"
-                  (("\"streamlink ")
-                   (format #f "\"~a "
-                           (search-input-file inputs "/bin/streamlink"))))))
-            (add-before 'check 'check-setup
-              (lambda _
-                (setenv "HOME" (getcwd)))) ;Needs to write to ‘$HOME’.
-            (add-after 'install 'install-rofi-plugin
-              (lambda _
-                (install-file "plugins/rofi-twitchy"
-                              (string-append #$output "/bin")))))))
-      (native-inputs (list python-setuptools))
-      (inputs (list python-requests streamlink))
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "twitchy/twitchy_play.py"
+                 (("\"streamlink ")
+                  (string-append "\"" (assoc-ref inputs "streamlink")
+                                 "/bin/streamlink ")))
+               #t))
+           (add-before 'check 'check-setup
+             (lambda _
+               (setenv "HOME" (getcwd)) ;Needs to write to ‘$HOME’.
+               #t))
+           (add-after 'install 'install-rofi-plugin
+             (lambda* (#:key outputs #:allow-other-keys)
+               (install-file "plugins/rofi-twitchy"
+                             (string-append (assoc-ref outputs "out")
+                                            "/bin"))
+               #t)))))
+      (inputs
+       (list python-requests streamlink))
      (home-page "https://github.com/BasioMeusPuga/twitchy")
      (synopsis "Command-line interface for Twitch.tv")
      (description
@@ -6079,31 +6077,27 @@ multiplexer and demultiplexer, and can mux video and audio in several formats
 using standalone executable files.")
    (license license:isc)))

-;; XXX: This project is not being maintained. Consider removal or patch merges.
 (define-public qtfaststart
  (package
    (name "qtfaststart")
-    (version "1.8.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/danielgtaylor/qtfaststart")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0cgc92dn2r6qmqlvi6d63i0bzsvmcb82301jr1211gsiqi96wmwg"))))
-    (build-system pyproject-build-system)
-    (arguments (list #:tests? #f))      ; No test suite.
-    (native-inputs (list python-setuptools))
+    (version "1.8")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "qtfaststart" version))
+              (sha256
+               (base32
+                "0hcjfik8hhb1syqvyh5c6aillpvzal26nkjflcq1270z64aj6i5h"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; no test suite
    (synopsis "Move QuickTime and MP4 metadata to the beginning of the file")
-    (description
-     "qtfaststart enables streaming and pseudo-streaming of QuickTime and MP4
-files by moving metadata and offset information to the beginning of the file.
-It can also print some useful information about the structure of the file.
-This program is based on qt-faststart.c from the FFmpeg project, which is
-released into the public domain, as well as ISO 14496-12:2005 (the official
-spec for MP4), which can be obtained from the ISO or found online.")
+    (description "qtfaststart enables streaming and pseudo-streaming of
+QuickTime and MP4 files by moving metadata and offset information to the
+beginning of the file.  It can also print some useful information about the
+structure of the file.  This program is based on qt-faststart.c from the FFmpeg
+project, which is released into the public domain, as well as ISO 14496-12:2005
+(the official spec for MP4), which can be obtained from the ISO or found
+online.")
    (home-page "https://github.com/danielgtaylor/qtfaststart")
    (license license:expat)))

@@ -7022,18 +7016,17 @@ for details on how to change this.")
 (define-public svtplay-dl
  (package
    (name "svtplay-dl")
-    (version "4.167")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/spaam/svtplay-dl")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0blpbg5igaahp9x0z31amcjskd2axv4f9458rs2mnby8ajmyyrw8"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list python-pytest python-requests-mock python-setuptools))
+    (version "4.17")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/spaam/svtplay-dl")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0yjxmvldskw4pji3lg69pbx05izvxahz9my7z5p31mkiz6v33dmx"))))
+    (build-system python-build-system)
    (inputs (list ffmpeg python-pyaml python-requests python-pysocks
                  python-cryptography))
    (home-page "https://svtplay-dl.se/")
@@ -1260,60 +1260,6 @@ over FastCGI.  It hopes to provide clean CGI support to Nginx (and other web
 servers that may need it).")
      (license license:expat))))

-(define-public sogogi
-  ;; Using the latest version that is compatible with our packaged version
-  ;; of go-github-com-emersion-go-webdav.  We can update to the latest release
-  ;; once go-github-com-emersion-go-webdav is upgraded.
-  (let ((commit "afabb59eb615853a271c2af8cca03b60a6ca850e")
-        (revision "0"))
-    (package
-      (name "sogogi")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-                (url "https://codeberg.org/emersion/sogogi.git")
-                (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "09pi493xz1nkjd1n05nh09whv1shy0mxxy9p56fjh6r87l5b8dnj"))
-         (modules '((guix build utils)))
-         ;; Update import path of go-scfg, see:
-         ;; <https://codeberg.org/emersion/sogogi/commit/e6fd81c>.
-         (snippet '(substitute* "config.go"
-                    (("git.sr.ht/~emersion/go-scfg")
-                     "codeberg.org/emersion/go-scfg")))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:install-source? #f
-        #:import-path "codeberg.org/emersion/sogogi"
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'install 'install-man-page
-              (lambda* (#:key import-path #:allow-other-keys)
-                (let ((man (string-append #$output "/share/man/man")))
-                  (mkdir-p (string-append man "1"))
-                  (with-input-from-file
-                      (string-append "src/" import-path "/doc/sogogi.1.scd")
-                    (lambda _
-                      (with-output-to-file (string-append man "1/sogogi.1")
-                        (lambda _
-                          (invoke "scdoc")))))))))))
-      (native-inputs
-       (list go-codeberg-org-emersion-go-scfg
-             go-github-com-emersion-go-webdav
-             scdoc))
-      (home-page "https://codeberg.org/emersion/sogogi")
-      (synopsis "Minimalistic WebDav server implementation")
-      (description
-       "This package provides a WebDAV file server based on
-@code{github.com/emersion/go-webdav}.  The server exposes a configured local
-filesystem to remote users via HTTP and supports defining access rights
-on a per-user basis.")
-      (license license:agpl3))))
-
 (define-public starman
  (package
    (name "starman")
@@ -8588,7 +8534,7 @@ container.")))
 (define-public java-jsoup
  (package
    (name "java-jsoup")
-    (version "1.15.3")
+    (version "1.10.3")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -8597,12 +8543,11 @@ container.")))
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1rp35w2138qkmpy7q7sn7yx50v3ks4dabd6ij50i9258yx38x3v9"))))
+                "1hdpdx0x140r5x3yc251v7dj1h4j5a7nh9k885aw9q5vvz49lkf4"))))
    (build-system ant-build-system)
    (arguments
     `(#:jar-name "jsoup.jar"
       #:source-dir "src/main/java"
-       #:tests? #f  ; tests require javax.servlet
       #:phases
       (modify-phases %standard-phases
         (add-before 'build 'copy-resources
@@ -8614,13 +8559,7 @@ container.")))
                               (mkdir-p (dirname dist))
                               (copy-file file dist)))
                   (find-files "." ".*.properties"))))
-             #t))
-         (add-before 'install 'generate-pom
-           (generate-pom.xml "pom.xml" "org.jsoup" "jsoup" ,version))
-         (replace 'install
-           (install-from-pom "pom.xml")))))
-    (inputs
-     (list java-jsr305))
+             #t)))))
    (native-inputs
     (list java-junit java-hamcrest-core java-gson))
    (home-page "https://jsoup.org")
@@ -9885,7 +9824,6 @@ It contains the code shared by all Kiwix ports.")
           pugixml
           qtbase
           qtdeclarative
-           qtsvg
           qtwebchannel
           qtwebengine
           qtwayland
@@ -4577,7 +4577,7 @@ setup of your X Server without any modifications.")
 (define-public darkman
  (package
    (name "darkman")
-    (version "2.2.0")
+    (version "2.1.0")
    (source
     (origin
       (method git-fetch)
@@ -4587,7 +4587,7 @@ setup of your X Server without any modifications.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-         "0pq7csrxs76mlp8i0yxj24s30ynhhr8rs9kcwn01pzi73k3sx6ra"))
+         "039xqi9pll7vl1m8lri5x626s7n0wqrjzyy979kh3wmpqbk8jz3j"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -4595,9 +4595,7 @@ setup of your X Server without any modifications.")
             ;; Avoid building the binary again when installing.
             (("install: build") "install: darkman.1")
             ;; Don't install the systemd service.
-             (("install.*contrib/darkman.service") "true")
-             ;; Don't install the openrc service.
-             (("install.*openrc") "true")
+             ((".@install.*systemd.*") "")
             ;; The binary will be installed by `go install'.
             ((".@install.*bin.*") ""))))))
    (build-system go-build-system)
@@ -4613,10 +4611,14 @@ setup of your X Server without any modifications.")
      #~(modify-phases %standard-phases
          (add-after 'unpack 'patch-paths
            (lambda* (#:key unpack-path #:allow-other-keys)
-              (substitute*
-                  (find-files (string-append "src/" unpack-path "/contrib/dbus/")
-                              "\\.service$")
-                (("/usr") #$output))))
+              (let ((source (string-append "src/" unpack-path "/contrib/dbus/")))
+                (substitute*
+                    (list (string-append
+                           source "nl.whynothugo.darkman.service")
+                          (string-append
+                           source
+                           "org.freedesktop.impl.portal.desktop.darkman.service"))
+                  (("/usr") #$output)))))
          (replace 'install
            (lambda* (#:key unpack-path #:allow-other-keys)
              (with-directory-excursion (string-append "src/" unpack-path)
@@ -4634,11 +4636,11 @@ setup of your X Server without any modifications.")
    (native-inputs
     (list gnu-make
           go-github-com-adrg-xdg
-           go-github-com-goccy-go-yaml
           go-github-com-godbus-dbus-v5
           go-github-com-rxwycdh-rxhash
           go-github-com-sj14-astral
           go-github-com-spf13-cobra
+           go-gopkg-in-yaml-v3
           scdoc))
    (home-page "https://gitlab.com/WhyNotHugo/darkman")
    (synopsis "Control dark-mode and light-mode transitions")
@@ -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)
@@ -463,11 +463,12 @@ DEFAULT."
                           ,@(append-map
                              generate
                              (filter-map
-                                (match-lambda
-                                  ((name config)
-                                   (and (eq? name field-name)
-                                        config)))
-                                sub-documentation)))))
+                               (match-lambda
+                                 ((name config)
+                                  (and (eq? name field-name)
+                                       config)))
+                               (or (assq-ref sub-documentation field-name)
+                                   '()))))))
               fields)))))))
  (stexi->texi `(*fragment* . ,(generate documentation-name))))

@@ -1,69 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Tanguy Le Carrour <tanguy@bioneland.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu system images a20-olinuxino-lime2)
-  #:use-module (gnu bootloader)
-  #:use-module (gnu bootloader u-boot)
-  #:use-module (gnu image)
-  #:use-module (gnu packages linux)
-  #:use-module (guix platforms arm)
-  #:use-module (gnu services)
-  #:use-module (gnu services base)
-  #:use-module (gnu system)
-  #:use-module (gnu system file-systems)
-  #:use-module (gnu system image)
-  #:use-module (srfi srfi-26)
-  #:export (a20-olinuxino-lime2-barebones-os
-            a20-olinuxino-lime2-image-type
-            a20-olinuxino-lime2-barebones-raw-image))
-
-(define a20-olinuxino-lime2-barebones-os
-  (operating-system
-    (host-name "olimex")
-    (timezone "Europe/Paris")
-    (locale "en_GB.utf8")
-    (bootloader (bootloader-configuration
-                 (bootloader u-boot-a20-olinuxino-lime2-bootloader)
-                 (targets '("/dev/mmcblk0"))))
-    (initrd-modules '())
-    (kernel linux-libre-arm-generic)
-    (kernel-arguments '("console=tty1"))
-    (file-systems (cons (file-system
-                          (device (file-system-label "root"))
-                          (mount-point "/")
-                          (type "ext4"))
-                        %base-file-systems))))
-
-(define a20-olinuxino-lime2-image-type
-  (image-type
-   (name 'a20-olinuxino-lime2-raw)
-   (constructor (lambda (os)
-                  (image
-                   (inherit (raw-with-offset-disk-image (* 8192 512)))
-                   (operating-system os)
-                   (platform armv7-linux))))))
-
-(define a20-olinuxino-lime2-barebones-raw-image
-  (image
-   (inherit
-    (os+platform->image a20-olinuxino-lime2-barebones-os armv7-linux
-                        #:type a20-olinuxino-lime2-image-type))
-   (name 'a20-olinuxino-lime2-barebones-raw-image)))
-
-;; Return the default image.
-a20-olinuxino-lime2-barebones-raw-image
@@ -88,35 +88,7 @@

 (define-peg-pattern class-body all (and (* WS) (* (and class-statement (* WS)))))
 (define-peg-pattern class-statement body (or inline-comment comment param-pat
-                                             method-pat class-pat enum-pat))
-;; enum-pat: skip over enum declarations.  Enum contents are irrelevant for
-;; plugin.xml generation which only extracts @Mojo (class-level), @Parameter
-;; and @Component (field-level) annotations from Mojo classes.
-(define-peg-pattern enum-pat none (and (? (and (ignore (or "private" "public" "protected"))
-                                               (* WS)))
-                                       (? (and (ignore "static") (* WS)))
-                                       (ignore "enum") (* WS)
-                                       package-name (* WS)
-                                       (ignore "{") enum-body (ignore "}")))
-;; enum-body: consume everything inside enum braces
-;; Handles: nested braces, strings (which may contain }), and comments (which may contain })
-(define-peg-pattern enum-body none (* (or enum-body-chr
-                                          string-pat
-                                          enum-comment
-                                          enum-single-slash
-                                          (and "{" enum-body "}"))))
-;; enum-body-chr: any char except { } " and /
-;; Excludes: " (34), / (47), { (123), } (125)
-(define-peg-pattern enum-body-chr none (or "\t" "\n" "\r" " " "!"
-                                           (range #\# #\.)   ; 35-46
-                                           (range #\0 #\z)   ; 48-122
-                                           "|"               ; 124
-                                           (range #\~ #\xffff)))
-;; enum-comment: block or line comments that may contain } characters
-(define-peg-pattern enum-comment none (or (and "/*" (* (and (not-followed-by "*/") peg-any)) "*/")
-                                          (and "//" (* (and (not-followed-by "\n") peg-any)) "\n")))
-;; enum-single-slash: a / not followed by * or / (i.e., not starting a comment)
-(define-peg-pattern enum-single-slash none (and "/" (not-followed-by (or "*" "/"))))
+                                             method-pat class-pat))
 (define-peg-pattern param-pat all (and (* (and annotation-pat (* WS)
                                               (? (ignore inline-comment))
                                               (* WS)))
@@ -130,20 +102,15 @@
                                       (? (and (* WS) (ignore "=") (* WS) value))
                                       (ignore ";")))
 (define-peg-pattern value none (or string-pat (+ valuechr)))
-;; Note: Character ranges must come BEFORE comment patterns to avoid
-;; misinterpreting `/*` inside strings like {"**/**"} as comment starts.
-;; The `/` character (ASCII 47) is in range 32-58, so it matches as a
-;; regular character before the comment pattern is tried.
-(define-peg-pattern valuechr none (or "\n" "\t" "\r"
-                                      (range #\  #\:) (range #\< #\xffff)
-                                      comment inline-comment))
+(define-peg-pattern valuechr none (or comment inline-comment "\n"
+                                      "\t" "\r"
+                                      (range #\  #\:) (range #\< #\xffff)))
 (define-peg-pattern param-name all (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9)
                                          "_")))
 (define-peg-pattern type-name all type-pat)
-;; type-pat: Match type names including fully qualified names (e.g., org.example.Foo)
 (define-peg-pattern type-pat body
  (or "?"
-      (and (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9) "_" "."))
+      (and (* (or (range #\a #\z) (range #\A #\Z) (range #\0 #\9) "_"))
           (? "...")
           (? "[]")
           (? type-param))))
@@ -213,23 +213,35 @@ or '= when they denote equal versions."
 use namespaces in tag names.  This procedure takes an @var{sxml} representation
 of a pom file and removes the namespace uses.  It also adds the required bits
 to re-declare the namespaces in the top-level element."
-  (define (strip-ns tag)
-    "Strip the Maven namespace prefix from TAG if present."
-    (let ((tag-str (symbol->string tag))
-          (prefix "http://maven.apache.org/POM/4.0.0:"))
-      (if (string-prefix? prefix tag-str)
-          (string->symbol (substring tag-str (string-length prefix)))
-          tag)))
-
  (define (fix-xml sxml)
    (match sxml
-      ;; Element with attributes
-      (((? symbol? tag) ('@ opts ...) rest ...)
-       `(,(strip-ns tag) (@ ,@opts) ,@(map fix-xml rest)))
-      ;; Element without attributes
-      (((? symbol? tag) rest ...)
-       `(,(strip-ns tag) ,@(map fix-xml rest)))
-      ;; Anything else (strings, whitespace, etc.)
+      ((tag ('@ opts ...) rest ...)
+       (if (> (string-length (symbol->string tag))
+              (string-length "http://maven.apache.org/POM/4.0.0:"))
+         (let* ((tag (symbol->string tag))
+                (tag (substring tag (string-length
+                                      "http://maven.apache.org/POM/4.0.0:")))
+                (tag (string->symbol tag)))
+           `(,tag (@ ,@opts) ,@(map fix-xml rest)))
+         `(,tag (@ ,@opts) ,@(map fix-xml rest))))
+      ((tag (rest ...))
+       (if (> (string-length (symbol->string tag))
+              (string-length "http://maven.apache.org/POM/4.0.0:"))
+         (let* ((tag (symbol->string tag))
+                (tag (substring tag (string-length
+                                      "http://maven.apache.org/POM/4.0.0:")))
+                (tag (string->symbol tag)))
+           `(,tag ,@(map fix-xml rest)))
+         `(,tag ,@(map fix-xml rest))))
+      ((tag rest ...)
+       (if (> (string-length (symbol->string tag))
+              (string-length "http://maven.apache.org/POM/4.0.0:"))
+         (let* ((tag (symbol->string tag))
+                (tag (substring tag (string-length
+                                      "http://maven.apache.org/POM/4.0.0:")))
+                (tag (string->symbol tag)))
+           `(,tag ,@(map fix-xml rest)))
+         `(,tag ,@(map fix-xml rest))))
      (_ sxml)))

  `((*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
@@ -311,48 +323,26 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
              res
              (loop (cons entry res)))))))

-  (define (fix-parent parent-content)
-    ;; Update parent POM version to match what's available in inputs
-    (let* ((artifact (pom-artifactid parent-content))
-           (group (pom-groupid parent-content))
-           (version (or (assoc-ref (assoc-ref local-packages group) artifact)
-                        (find-version inputs group artifact #t)
-                        (pom-version parent-content))))
-      (format (current-error-port) "maven parent: ~a:~a -> ~a~%"
-              group artifact version)
-      (map
-        (lambda (tag)
-          (match tag
-            (('http://maven.apache.org/POM/4.0.0:version _)
-             `(http://maven.apache.org/POM/4.0.0:version ,version))
-            (('version _)
-             `(http://maven.apache.org/POM/4.0.0:version ,version))
-            (tag tag)))
-        parent-content)))
-
  (define fix-pom
    (match-lambda
      ('() '())
      ((tag rest ...)
       (match tag
-         (('http://maven.apache.org/POM/4.0.0:parent parent ...)
-          `((http://maven.apache.org/POM/4.0.0:parent ,@(fix-parent parent))
-            ,@(fix-pom rest)))
         (('http://maven.apache.org/POM/4.0.0:dependencies deps ...)
-          `((http://maven.apache.org/POM/4.0.0:dependencies ,@(fix-deps deps))
+          `((http://maven.apache.org/POM/4.0.0:dependencies ,(fix-deps deps))
            ,@(fix-pom rest)))
         (('http://maven.apache.org/POM/4.0.0:dependencyManagement deps ...)
          `((http://maven.apache.org/POM/4.0.0:dependencyManagement
-              ,@(fix-dep-management deps))
+              ,(fix-dep-management deps))
            ,@(fix-pom rest)))
         (('http://maven.apache.org/POM/4.0.0:build build ...)
          (if with-plugins?
-              `((http://maven.apache.org/POM/4.0.0:build ,@(fix-build build))
+              `((http://maven.apache.org/POM/4.0.0:build ,(fix-build build))
                ,@(fix-pom rest))
              (cons tag (fix-pom rest))))
         (('http://maven.apache.org/POM/4.0.0:modules modules ...)
          (if with-modules?
-              `((http://maven.apache.org/POM/4.0.0:modules ,@(fix-modules modules))
+              `((http://maven.apache.org/POM/4.0.0:modules ,(fix-modules modules))
                ,@(fix-pom rest))
              (cons tag (fix-pom rest))))
         (tag (cons tag (fix-pom rest)))))))
@@ -374,7 +364,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
      ((tag rest ...)
       (match tag
         (('http://maven.apache.org/POM/4.0.0:dependencies deps ...)
-          `((http://maven.apache.org/POM/4.0.0:dependencies ,@(fix-deps deps #t))
+          `((http://maven.apache.org/POM/4.0.0:dependencies ,(fix-deps deps #t))
            ,@(fix-dep-management rest)))
         (tag (cons tag (fix-dep-management rest)))))))

@@ -384,7 +374,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
      ((tag rest ...)
       (match tag
         (('http://maven.apache.org/POM/4.0.0:dependency dep ...)
-          `((http://maven.apache.org/POM/4.0.0:dependency ,@(fix-dep dep optional?))
+          `((http://maven.apache.org/POM/4.0.0:dependency ,(fix-dep dep optional?))
            ,@(fix-deps rest optional?)))
         (tag (cons tag (fix-deps rest optional?)))))))

@@ -395,15 +385,15 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
       (match tag
         (('http://maven.apache.org/POM/4.0.0:pluginManagement management ...)
          `((http://maven.apache.org/POM/4.0.0:pluginManagement
-              ,@(fix-management management))
+              ,(fix-management management))
            ,@(fix-build rest)))
         (('http://maven.apache.org/POM/4.0.0:plugins plugins ...)
          `((http://maven.apache.org/POM/4.0.0:plugins
-              ,@(fix-plugins plugins))
+              ,(fix-plugins plugins))
            ,@(fix-build rest)))
         (('http://maven.apache.org/POM/4.0.0:extensions extensions ...)
          `((http://maven.apache.org/POM/4.0.0:extensions
-              ,@(fix-extensions extensions))
+              ,(fix-extensions extensions))
            ,@(fix-build rest)))
         (tag (cons tag (fix-build rest)))))))

@@ -418,7 +408,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
            (if (member artifact (or (assoc-ref excludes group) '()))
              (fix-extensions rest optional?)
              `((http://maven.apache.org/POM/4.0.0:extension
-                  ,@(fix-plugin extension optional?)); extensions are similar to plugins
+                  ,(fix-plugin extension optional?)); extensions are similar to plugins
                ,@(fix-extensions rest optional?)))))
         (tag (cons tag (fix-extensions rest optional?)))))))

@@ -429,7 +419,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
       (match tag
         (('http://maven.apache.org/POM/4.0.0:plugins plugins ...)
          `((http://maven.apache.org/POM/4.0.0:plugins
-              ,@(fix-plugins plugins #t))
+              ,(fix-plugins plugins #t))
            ,@(fix-management rest)))
         (tag (cons tag (fix-management rest)))))))

@@ -444,7 +434,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
            (if (member artifact (or (assoc-ref excludes group) '()))
              (fix-plugins rest optional?)
              `((http://maven.apache.org/POM/4.0.0:plugin
-                  ,@(fix-plugin plugin optional?))
+                  ,(fix-plugin plugin optional?))
                ,@(fix-plugins rest optional?)))))
         (tag (cons tag (fix-plugins rest optional?)))))))