tests/pack: Fix rpm tests.

The rpm-for-tests would no longer build, due to the parent package having
migrated to CMake. Use the --dbpath argument instead of a variant test
package.

* tests/pack.scm (rpm-for-tests): Delete variable.
(rpm archive can be installed/uninstalled): Invoke rpm, not rpm-for-tests, but
with the --dbpath location specified.

Change-Id: I1b578db3ef8f1309c32c6ef92615814ca49fd22c

gnu/local.mk

@@ -2468,7 +2468,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch	\
   %D%/packages/patches/xfce4-settings-defaults.patch		\
   %D%/packages/patches/xgboost-use-system-dmlc-core.patch	\
-  %D%/packages/patches/xinit-startx-mcookie-path.patch		\
   %D%/packages/patches/xiphos-glib.patch                        \
   %D%/packages/patches/xmonad-dynamic-linking.patch		\
   %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch		\

gnu/packages/easyrpg.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
+;;; Copyright © 2018, 2025 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
@@ -30,6 +30,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
@@ -42,7 +43,7 @@
 (define-public liblcf
   (package
     (name "liblcf")
-    (version "0.8")
+    (version "0.8.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -50,34 +51,26 @@
                     "/liblcf-" version ".tar.gz"))
               (sha256
                (base32
-                "0kskflh2izc8q5p5x0rfxw8xa3591xfkmqf74rj72ff34xri4nj1"))))
+                "1b68yhs14b4ql1wfbm0jzklyqyi3b2wm3pm9zhx0ij2a98c8cnli"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
     (propagated-inputs
      ;; Required by 'liblcf.pc'.
-     (list expat icu4c))
+     (list expat icu4c libinih))
     (home-page "https://easyrpg.org/")
     (synopsis "Library to handle RPG Maker 2000 and 2003 game data")
     (description
      "@code{liblcf} is a library to handle RPG Maker 2000 and 2003 game data.
 It can read and write LCF and XML files.")
-    ;; It includes a copy of Boost Preprocessor Cat and Stringize (boost-1.0):
+    ;; It includes a copy of span-lite (boost-1.0):
-    ;;   src/boost/preprocessor/config.hpp
+    ;;   src/lcf/third_party/span.h
-    ;;   src/boost/preprocessor/cat.hpp
-    ;;   src/boost/preprocessor/stringize.hpp
-    ;; and a copy of inih (bsd-3):
-    ;;   src/ini.h
-    ;;   src/ini.cpp
-    ;;   src/inireader.h
-    ;;   src/inireader.cpp
-    ;; TODO: Unbundle them.
     (license license:expat)))
 
 (define-public easyrpg-player
   (package
     (name "easyrpg-player")
-    (version "0.8")
+    (version "0.8.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -85,7 +78,7 @@ It can read and write LCF and XML files.")
                     "/easyrpg-player-" version ".tar.gz"))
               (sha256
                (base32
-                "1brx2iix9d5i2lyjjcs03pq1xgl1gyh0yas8avazahgd9sn47696"))))
+                "0aa60568cvhxf93065wn2r6js7xh81vhsl2nw3bhs5g3l1smq28z"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
@@ -107,7 +100,6 @@ It can read and write LCF and XML files.")
            mpg123
            opusfile
            pixman
-           sdl2-mixer
            sdl2
            speexdsp
            wildmidi
@@ -121,7 +113,6 @@ data.")
     ;; It bundles FMMidi YM2608 FM synthesizer emulator (bsd-3):
     ;;   src/midisynth.h
     ;;   src/midisynth.cpp
-    ;; and PicoJSON JSON parser/serializer (bsd-2):
+    ;; and WAV audio loader and writer (public-domain):
-    ;;   src/picojson.h
+    ;;   src/external/dr_wav.h
-    ;; TODO: Unbundle them.
     (license license:gpl3+)))

gnu/packages/emacs-build.scm

@@ -524,64 +524,62 @@ Lisp.")
     (license license:expat)))
 
 (define-public makel
-  (let ((commit "2c831098c28a1f581b016532fa1f6e1c596b8ed1")
+  (package
-        (revision "0"))
+    (name "makel")
-    (package
+    (version "1.0.0")
-      (name "makel")
+    (source
-      (version (git-version "0.8.0" revision commit))
+     (origin
-      (source
+       (method git-fetch)
-       (origin
+       (uri (git-reference
-         (method git-fetch)
+              (url "https://github.com/DamienCassou/makel")
-         (uri (git-reference
+              (commit (string-append "v" version))))
-               (url "https://github.com/DamienCassou/makel")
+       (file-name (git-file-name name version))
-               (commit commit)))
+       (sha256
-         (file-name (git-file-name name version))
+        (base32 "143bdy4c81jbmp5sk1arnlmpc4dsw85n601x9rii2dgyn186l8si"))))
-         (sha256
+    (build-system copy-build-system)
-          (base32 "0lmfl27rqh1530j8g4z2k6y6mc25n54bjkqriqdkw3703kliyvry"))))
+    (arguments
-      (build-system copy-build-system)
+     (list
-      (arguments
+      #:modules
-       (list
+      #~((guix build copy-build-system)
-        ;; Some tests are currently broken, see
+         (guix build utils)
-        ;; https://github.com/DamienCassou/makel/issues/6
+         (srfi srfi-1)
-        #:tests? #f
+         (srfi srfi-26)
-        #:modules
+         (ice-9 ftw))
-        '((guix build copy-build-system)
+      #:install-plan
-          (guix build utils)
+      #~'(("makel.mk" "include/")
-          (srfi srfi-1)
+          ("README.org" "share/docs/"))
-          (srfi srfi-26)
+      #:phases
-          (ice-9 ftw))
+      #~(modify-phases %standard-phases
-         #:install-plan ''(("makel.mk" "include/")
+          (add-before 'install 'inject-deps
-                           ("README.org" "share/docs/"))
+            (lambda _
-         #:phases
+              (substitute* "makel.mk"
-         #~(modify-phases %standard-phases
+                (("^MAKEL_LOAD_PATH=(.*)$" all rest)
-             (add-before 'install 'inject-deps
+                 (string-append
-               (lambda _
+                  "MAKEL_LOAD_PATH=-L "
-                 (substitute* "makel.mk"
+                  (string-join
-                   (("^MAKEL_LOAD_PATH=(.*)$" all rest)
+                   (filter-map
-                    (string-append
+                    (lambda (dir)
-                     "MAKEL_LOAD_PATH=-L "
+                      (let ((path (scandir dir)))
-                     (string-join
+                        (and (eq? (length path) 3) ; removes emacs
-                      (filter-map
+                             (string-append dir "/" (last path)))))
-                       (lambda (dir)
+                    (string-split (getenv "EMACSLOADPATH") #\:))
-                         (let ((path (scandir dir)))
+                   " -L ")
-                           (and (eq? (length path) 3) ; removes emacs
+                  " " rest)))))
-                                (string-append dir "/" (last path)))))
+          (add-before 'install 'check
-                       (string-split (getenv "EMACSLOADPATH") #\:))
+            (lambda* (#:key tests? #:allow-other-keys)
-                      " -L ")
+              (if tests?
-                     " " rest)))))
+                  (with-directory-excursion "test"
-             (add-before 'install 'check
+                    (invoke "bash" "run-tests.sh"))
-               (lambda* (#:key tests? #:allow-other-keys)
+                  (format #f "Test suite not run.~%")))))))
-                 (if tests?
+    (native-inputs
-                     (with-directory-excursion "test"
+     (list bash-minimal emacs-minimal))
-                       (invoke "bash" "run-tests.sh"))
+    (inputs
-                     (format #f "Test suite not run.~%")))))))
+     (list emacs-buttercup emacs-package-lint))
-      (native-inputs (list bash-minimal emacs-minimal))
+    (home-page "https://github.com/DamienCassou/makel")
-      (inputs (list emacs-buttercup emacs-package-lint))
+    (synopsis "Makefile to help checking Emacs packages")
-      (home-page "https://github.com/DamienCassou/makel")
+    (description
-      (synopsis "Makefile to help checking Emacs packages")
+     "This package provides a Makefile to help checking Emacs packages.")
-      (description "This package provides a makefile to help checking Emacs
+    (license license:gpl3+)))
-packages.")
-      (license license:gpl3+))))
 
 ;; This is an alternative version patches for internal Guix tests.
 ;; The user-facing version is in emacs-xyz.scm

gnu/packages/emacs-xyz.scm

@@ -34442,7 +34442,7 @@ from Emacs.")
 (define-public emacs-libmpdel
   (package
     (name "emacs-libmpdel")
-    (version "2.0.0")
+    (version "2.1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -34451,10 +34451,20 @@ from Emacs.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4"))))
+                "1indy1y31g68i3a4j6nbx3idybn5b11bjvlx9vkibraf622s2bls"))))
     (build-system emacs-build-system)
+    (arguments
+     (list
+      ;; XXX: "check" includes "lint-package-lint", which raises errors.
+      #:test-command #~(list "make" "test")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'inject-makel
+            (lambda* (#:key inputs #:allow-other-keys)
+              (symlink (search-input-file inputs "/include/makel.mk")
+                       "makel.mk"))))))
     (native-inputs
-     (list emacs-ert-runner))
+     (list emacs-ert-runner makel))
     (home-page "https://github.com/mpdel/libmpdel")
     (synopsis "Emacs library to communicate with Music Player Daemon (MPD)")
     (description
@@ -34466,7 +34476,7 @@ music.")
 (define-public emacs-mpdel
   (package
     (name "emacs-mpdel")
-    (version "2.1.0")
+    (version "2.1.1")
     (source
      (origin
        (method git-fetch)
@@ -34476,19 +34486,19 @@ music.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900"))))
+         "1i7ymg0ls984vjmzjz0sbg280i47c6j79vr725x94xdpj6ci35qr"))))
     (build-system emacs-build-system)
     (arguments
      (list
-      ;; XXX: ‘check’ includes ‘lint-package-lint’, which raises errors.
+      ;; XXX: "check" includes "lint-package-lint", which raises errors.
-      #:test-command #~(list "make" "test" "lint-checkdoc")
+      #:test-command #~(list "make" "test")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'inject-makel
             (lambda* (#:key inputs #:allow-other-keys)
               (symlink (search-input-file inputs "/include/makel.mk")
                        "makel.mk"))))))
-    (inputs (list makel))
+    (native-inputs (list makel))
     (propagated-inputs
      (list emacs-libmpdel emacs-navigel))
     (home-page "https://gitea.petton.fr/mpdel/mpdel")

gnu/packages/gnome.scm

@@ -180,7 +180,6 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
-  #:use-module (gnu packages ninja)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages ocr)
   #:use-module (gnu packages openldap)
@@ -11624,7 +11623,7 @@ text views, and buttons to choose the language.")
 (define-public gnome-planner
   (package
     (name "gnome-planner")
-    (version "0.14.6")
+    (version "0.14.92")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/planner/"
@@ -11632,30 +11631,34 @@ text views, and buttons to choose the language.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k"))))
+                "0cyqs1ly6cp96pjw0yjk1r0dshp0c3869wgknxpp97dnbppsg8px"))))
-    (build-system glib-or-gtk-build-system)
+    (build-system meson-build-system)
     (arguments
-     ;; Disable the Python bindings because the Planner program functions
+     (list
-     ;; without them, and (as of 2017-06-13) we have not packaged all of
+      #:glib-or-gtk? #t
-     ;; packages that are necessary for building the Python bindings.
+      #:configure-flags
-     `(#:configure-flags
+      ;; Otherwise, the RUNPATH will lack the final 'planner' path component
-       (list "--disable-python"
+      ;; (see: <https://gitlab.gnome.org/World/planner/-/issues/274>).
-             ,@(if (string=? "aarch64-linux" (%current-system))
+      #~(list (string-append "-Dc_link_args=-Wl,-rpath="
-                   '("--build=aarch64-unknown-linux-gnu")
+                             #$output "/lib/planner"))
-                   '()))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson_post_install.sh"
+                (("gtk-update-icon-cache") (which "true"))))))))
     (inputs
-     (list libgnomecanvas
+     (list gconf
-           libgnomeui
+           glib
-           libglade
-           gnome-vfs
-           gconf
-           libxml2
-           libxslt
            gtk+
-           glib))
+           libxml2
+           libxslt))
     (native-inputs
-     (list intltool scrollkeeper pkg-config))
+     (list `(,glib "bin")               ;for glib-genmarshal, etc.
-    (home-page "https://wiki.gnome.org/Apps/Planner")
+           desktop-file-utils           ;for update-desktop-database
+           gettext-minimal
+           pkg-config))
+    (home-page "https://gitlab.gnome.org/World/planner")
     (synopsis "Project management software for the GNOME desktop")
     (description
      "GNOME Planner is a project management tool based on the Work Breakdown

gnu/packages/gnunet.scm

@@ -193,7 +193,7 @@ authentication and support for SSL3 and TLS.")
 (define-public gnunet
   (package
     (name "gnunet")
-    (version "0.25.0")
+    (version "0.25.1")
     (source
      (origin
        (method url-fetch)
@@ -201,7 +201,7 @@ authentication and support for SSL3 and TLS.")
                            ".tar.gz"))
        (sha256
         (base32
-         "1zrn5j12c2vfp3vfx3kirknsvzb4r832hbgh5a2lcnb0x0p6dsid"))))
+         "0p4gcv67rh9832vgi5k31pgpq6hmv6198dfmbyfizyaprlb6qcr1"))))
     (build-system meson-build-system)
     (inputs
      (list bluez

gnu/packages/graphics.scm

@@ -462,7 +462,7 @@ objects!")
                           qt)))))))))
     (inputs
      (list expat
-           ffmpeg-for-friction ;version 4.2 is recommended; does not work with version 7+.
+           ffmpeg-6
            fontconfig
            freetype
            gperftools-for-friction
@@ -826,7 +826,20 @@ and export to various formats including the format used by Magicavoxel.")
                    (substitute* "test/CMakeLists.txt"
                      ;; Leave the test binary where ctest will look for it.
                      (("TARGET_USE_COMMON_OUTPUT_DIRECTORY\\(unit\\)")
-                      "")))))))
+                      ""))
+
+                   ;; Some tests fail on aarch64:
+                   ;; <https://github.com/assimp/assimp/issues/6246>.
+                   (when #$(target-aarch64?)
+                     (substitute* "test/unit/AssimpAPITest_aiMatrix3x3.cpp"
+                       (("aiMatrix3FromToTest")
+                        "DISABLED_aiMatrix3FromToTest"))
+                     (substitute* "test/unit/AssimpAPITest_aiMatrix4x4.cpp"
+                       (("aiMatrix4FromToTest")
+                        "DISABLED_aiMatrix4FromToTest"))
+                     (substitute* "test/unit/AssimpAPITest_aiQuaternion.cpp"
+                       (("aiQuaternionFromNormalizedQuaternionTest")
+                        "DISABLED_aiQuaternionFromNormalizedQuaternionTest"))))))))
     (build-system cmake-build-system)
     (inputs
      (list zlib))

gnu/packages/haskell-apps.scm

@@ -623,6 +623,29 @@ with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX,
 and mIRC chat codes.")
     (license license:bsd-3)))
 
+(define-public lhs2tex
+  (package
+    (name "lhs2tex")
+    (version "1.25")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "lhs2tex" version))
+       (sha256
+        (base32 "0cf66z6mgadgqd1xs5b6gw8l9rkwgbfsc5czwdiapn7ichi26qyj"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "lhs2tex")))
+    (inputs (list ghc-regex-compat))
+    (home-page "https://github.com/kosmikus/lhs2tex")
+    (synopsis "Preprocessor for typesetting Haskell sources with LaTeX")
+    (description
+     "This tool is primarily intended for people who want to write articles or
+books using LaTeX that contain some Haskell code.  It works on literate Haskell
+documents where the non-Haskell parts form essentially a valid LaTeX document,
+then processes the Haskell code in the document and replaces it with formatted
+LaTeX output.")
+    (license license:gpl2+)))
+
 (define-public kmonad
   ;; Project is active, but no new releases exist. Pick current master
   ;; HEAD as of 2024-08-18.

gnu/packages/image-processing.scm

@@ -92,6 +92,7 @@
   #:use-module (gnu packages lua)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages opencl)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
@@ -1865,6 +1866,7 @@ and Scan Tailor Enhanced versions as well as including many more bug fixes.")
     (native-inputs
      (list googletest
            lua
+           nss-certs-for-test           ;for 'pip install'
            python-numpy                 ;for tests
            python-pip
            python-setuptools

gnu/packages/image-viewers.scm

@@ -32,6 +32,7 @@
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2025 Mathieu Laparie <mlaparie@disr.it>
 ;;; Copyright © 2025 Joaquín Aguirrezabalaga <kinote@kinote.org>
+;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -69,6 +70,7 @@
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
@@ -77,6 +79,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages djvu)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
@@ -90,9 +93,13 @@
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-pim)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
@@ -110,6 +117,8 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages scanner)
   #:use-module (gnu packages suckless)
   #:use-module (gnu packages stb)
   #:use-module (gnu packages terminals)
@@ -1150,6 +1159,128 @@ synchronization of multiple instances.")
      "xzgv is a fast image viewer that provides extensive keyboard support.")
     (license license:gpl2+)))
 
+(define-public digikam
+  (package
+    (name "digikam")
+    (version "8.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/digikam/"
+                                  version "/digiKam-" version ".tar.xz"))
+              (sha256
+               (base32 "0bx0kpzgq47pj3msrnd7gxr8n2qbak0cjird6bw4r4s31b15xqvr"))))
+    (build-system qt-build-system)
+    (home-page "https://www.digikam.org/download/git/")
+    (arguments (list
+                #:tests? #f
+                #:build-type "Release"
+                #:configure-flags #~(list "-DENABLE_MEDIAPLAYER=ON" ; for video playback
+                                          "-DENABLE_QWEBENGINE=ON" ; for web content
+                                          "-DENABLE_KFILEMETADATASUPPORT=ON"
+                                          "-DENABLE_AKONADICONTACTSUPPORT=ON"
+                                          "-DBUILD_WITH_QT6=ON"
+                                          "-DENABLE_APPSTYLES=ON")
+                #:phases
+                #~(modify-phases %standard-phases
+                    (add-after 'unpack 'copy-test-data
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (copy-recursively (assoc-ref inputs "digikam-test-data")
+                                          "test-data")))
+                    (add-after 'install 'wrap-binary
+                      (lambda* (#:key inputs outputs #:allow-other-keys)
+                        (wrap-program (string-append (assoc-ref outputs "out")
+                                                     "/bin/digikam")
+                          `("PATH" ":" prefix
+                            (,(dirname
+                               (search-input-file inputs "/bin/exiftool"))))))))))
+    (native-search-paths
+     (list (search-path-specification
+             (variable "DK_PLUGIN_PATH")
+             (separator ";")
+             (files '("lib/qt6/plugins/digikam")))))
+    (inputs (list
+             akonadi-contacts
+             bash-minimal
+             boost
+             ecm
+             eigen
+             exiv2-static ; digikam only wants to statically link against exiv2
+             ffmpeg
+             glib
+             ijg-libjpeg
+             imagemagick
+             jasper
+             kcalendarcore
+             kconfig
+             kcoreaddons
+             kfilemetadata
+             ki18n
+             kiconthemes
+             kio
+             knotifications
+             knotifyconfig
+             kservice
+             kwindowsystem
+             kxmlgui
+             lcms
+             lensfun
+             libgphoto2
+             libheif
+             libjpeg-turbo
+             libjxl
+             libksane
+             libpng
+             libtiff
+             libxml2
+             libxslt
+             marble-qt
+             mesa
+             opencv
+             perl-image-exiftool
+             python-wrapper
+             qtimageformats
+             qtmultimedia
+             qtnetworkauth
+             qtscxml
+             qtsvg
+             qtwebengine
+             ruby
+             sane-backends
+             solid
+             sonnet
+             threadweaver
+             x265))
+    (native-inputs (list
+                    (origin
+                      (method git-fetch)
+                      (uri (git-reference
+                             (url "https://invent.kde.org/graphics/digikam-test-data/")
+                             (commit "83efefdfc7fffa35e5e260d3b5a4aec01ebbdb40")))
+                      (file-name "digikam-test-data")
+                      (sha256
+                       (base32
+                        "0mf7rzwhy5yyj47xh4vs0i841m8885yy9qganli04d8skikl0s6z")))
+                    appstream
+                    bison
+                    doxygen
+                    extra-cmake-modules
+                    flex
+                    graphviz         ; for inheritance graphs in documentation
+                    perl
+                    pkg-config))
+    (synopsis "Photo management, organizing and editing suite")
+    (description "digiKam is an advanced open-source digital photo management
+application.  It provides a comprehensive set of tools for importing,
+managing, editing, and sharing photos and RAW files.
+
+You can use digiKam's import capabilities to easily transfer photos, RAW
+files, and videos directly from your camera and external storage devices (SD
+cards, USB disks, etc.).  The application allows you to configure import
+settings and rules that process and organize imported items on-the-fly.")
+    (license (list license:bsd-3        ; cmake scripts
+                   license:cc0          ; test data
+                   license:gpl2+))))    ; code
+
 (define-public hydrus-network
   (package
     (name "hydrus-network")

gnu/packages/image.scm

@@ -11,7 +11,7 @@
 ;;; Copyright © 2016-2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016, 2017, 2020, 2021, 2022 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016, 2017, 2020, 2021, 2022, 2025 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2017,2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -95,6 +95,7 @@
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ragel)
@@ -1677,6 +1678,15 @@ and XMP metadata of images in various formats.")
     ;;   <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
     (license license:gpl2+)))
 
+(define-public exiv2-static
+  (package
+    (inherit exiv2)
+    (arguments
+     (substitute-keyword-arguments (package-arguments exiv2)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (delete 'delete-static-libraries)))))))
+
 (define-public devil
   (package
     (name "devil")
@@ -2940,7 +2950,7 @@ Wacom-style graphics tablets.")
 (define-public phockup
   (package
     (name "phockup")
-    (version "1.9.2")
+    (version "1.13.0")
     (source
      (origin
        (method git-fetch)
@@ -2949,7 +2959,7 @@ Wacom-style graphics tablets.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0j4mnsy12bhsmd80vgqknv004xbqd165y8gpalw87gp8i8xv172r"))))
+        (base32 "1kwz2qy8mx0j25g3gyda08qaz5rgwm6vycsrqhgkd5cqqz76bbmc"))))
     (build-system copy-build-system)
     (arguments
      `(#:install-plan '(("src" "share/phockup/")
@@ -2963,13 +2973,14 @@ Wacom-style graphics tablets.")
                (("'exiftool")
                 (string-append "'" (search-input-file inputs "bin/exiftool"))))))
          (add-before 'install 'check
-           (lambda _
+           (lambda* (#:key tests? #:allow-other-keys)
-             ;; Test without PATH to make sure ‘exiftool’ is properly found.
+             (when tests?
-             (let ((path (getenv "PATH"))
+               ;; Test without PATH to make sure ‘exiftool’ is properly found.
-                   (pytest (which "pytest")))
+               (let ((path (getenv "PATH"))
-               (setenv "PATH" "")
+                     (pytest (which "pytest")))
-               (invoke pytest)
+                 (setenv "PATH" "")
-               (setenv "PATH" path))))
+                 (invoke pytest)
+                 (setenv "PATH" path)))))
          (add-after 'install 'install-bin
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -2986,7 +2997,7 @@ Wacom-style graphics tablets.")
     (inputs
      (list bash-minimal perl-image-exiftool python python-tqdm))
     (native-inputs
-     (list python-pytest python-pytest-mock))
+     (list python-pytest python-pytest-mock python-pytest-socket))
     (home-page "https://github.com/ivandokov/phockup")
     (synopsis "Organize photos and videos in folders")
     (description "Phockup is a media sorting tool that uses creation date and

gnu/packages/kde-office.scm

@@ -42,11 +42,13 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages ocr)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages serialization)
+  #:use-module (gnu packages speech)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages wm)
@@ -152,16 +154,102 @@ Advanced plugins:
 @end itemize")
     (license (list license:lgpl2.0+ license:gpl2+))))
 
+(define-public crow-translate
+  (package
+    (name "crow-translate")
+    (version "4.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/crow-translate/" version
+                           "/crow-translate-" version ".tar.gz"))
+       (sha256
+        (base32 "0lrpxdgicbg0wj2cf0lif99pz5kiqck53qkm5385vymzn1w8wjz2"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete bundled breeze-icons, espeak-ng and qhotkey.
+           (for-each delete-file-recursively
+                     '("data/icons/3rdparty/breeze-icons"
+                       "src/3rdparty/espeak-ng"
+                       "src/3rdparty/qhotkey"))
+           ;; Use system libraries instead.
+           (substitute* "CMakeLists.txt"
+             ((".*icon-theme\\.qrc.*$") "")
+             (("WITH_PIPER_TTS") "WITH_BUNDLED_ESPEAK_NG")
+             (("(.*WITH_BUNDLED_ESPEAK_NG.* )ON" all start)
+              (string-append start "OFF"))
+             (("Enable Piper neural TTS provider.*\"")
+              "Build bundled espeak-ng (requires onnxruntime)\"")
+             (("Piper TTS support disabled.*\"")
+              "Piper TTS support enabled with system espeak-ng\"")
+             (("add_subdirectory.*qhotkey.*")
+              (string-append "\nfind_package(PkgConfig)\n"
+                             "pkg_check_modules(eSpeak_NG REQUIRED espeak-ng)"
+                             "\nfind_package(QHotkey REQUIRED)\n"))
+             (("QHotkey::QHotkey") "qhotkey")
+             (("( *)Qt6::TextToSpeech" all indent)
+              (string-append all "\n" indent "espeak-ng")))
+           ;; Link Qt6::Widgets.
+           (substitute* "CMakeLists.txt"
+             (("Qt6::TextToSpeech" all) (string-append all "\n    Qt6::Widgets")))
+           ;; Include QGuiApplication in main.cpp.
+           (substitute* "src/main.cpp"
+             (("#include <QtCore>" all)
+              (string-append all "\n#include <QtGui/QGuiApplication>")))))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:tests? #f ; no tests
+           #:configure-flags
+           #~(list (string-append "-DCMAKE_CXX_FLAGS=-isystem "
+                                  #$(this-package-input "qtbase")
+                                  "/include/qt6/QtWidgets"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'unbundle-singleapplication
+                 (lambda _
+                   (delete-file-recursively "src/3rdparty/singleapplication")
+                   (substitute* "CMakeLists.txt"
+                     (("add_subdirectory.*singleapplication.*$") "")
+                     (("SingleApplication::SingleApplication")
+                      (string-append #$(this-package-input
+                                        "single-application")
+                                     "/lib/libSingleApplication.a"))))))))
+    (inputs
+     (list breeze-icons
+           espeak-ng
+           kwayland
+           qhotkey
+           qtbase
+           qtsvg
+           qtmultimedia
+           qtscxml
+           qtspeech
+           single-application
+           tesseract-ocr))
+    (native-inputs
+     (list pkg-config
+           extra-cmake-modules
+           qttools))
+    (home-page "https://invent.kde.org/office/crow-translate")
+    (synopsis "Application for translating text")
+    (description
+     "Crow Translate is an application written in C++/Qt for translating
+and speaking text which relies on Mozhi to interface with various
+translation engines.")
+    (license license:gpl3+)))
+
 (define-public ghostwriter
   (package
     (name "ghostwriter")
-    (version "25.04.0")
+    (version "25.08.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/release-service/" version
                                   "/src/ghostwriter-" version ".tar.xz"))
               (sha256
-               (base32 "0vx6zd6js4anz2cmvljbp0dyq1gj58j28a1vx0fa7m01m8kxbsl6"))))
+               (base32 "0hlc039pkrn0l3k4vzvlvwnbzv46vnkacpaasn2lj5rfs3spxcmj"))))
     (build-system qt-build-system)
     (arguments
      (list #:qtbase qtbase
@@ -193,7 +281,7 @@ cmark processors if they are installed.")
 (define-public tellico
   (package
     (name "tellico")
-    (version "4.1.1")
+    (version "4.1.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -201,7 +289,7 @@ cmark processors if they are installed.")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0jx512rgrbc8n8p2gnk543l3k53gf30a0zjixp8ly2z70w6qp2br"))
+               (base32 "0930jh6b9cl3jvhmfv00l6566vsnpwkf6shz5w0hn67j0vpvhk7s"))
               (modules '((guix build utils)))
               (snippet
                ;; Fix including QtPrintSupport.

gnu/packages/kde.scm

@@ -93,7 +93,6 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages mp3)
-  #:use-module (gnu packages ocr)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
@@ -142,38 +141,6 @@
 This package contains GUI widgets for baloo.")
     (license license:lgpl2.0+)))
 
-(define-public crow-translate
-  (package
-    (name "crow-translate")
-    (version "3.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/stable/crow-translate/" version
-                           "/crow-translate-v" version ".tar.gz"))
-       (sha256
-        (base32 "18f7i5sxrvqp6h7zj77sdxyy9rlbw0rv3w7akf1j14072ala9bwc"))))
-    (build-system qt-build-system)
-    (arguments '(#:tests? #f)) ; there are no tests.
-    (inputs
-     (list qtbase-5
-           qtx11extras
-           qtsvg-5
-           qtmultimedia-5
-           tesseract-ocr
-           kwayland-5))
-    (native-inputs
-     (list pkg-config
-           extra-cmake-modules
-           qttools-5))
-    (home-page "https://invent.kde.org/office/crow-translate")
-    (synopsis "Application for translating text")
-    (description
-     "Crow Translate is an application written in C++/Qt for translating
-and speaking text which relies on Mozhi to interface with various
-translation engines.")
-    (license license:gpl3+)))
-
 (define-public futuresql
   (package
     (name "futuresql")

gnu/packages/linphone.scm

@@ -1053,7 +1053,7 @@ WebRTC codec.  It includes features from WebRTC, such as, iSAC and AECM.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "05s8czh84qc63pmgwvwb39w07zy47145dl85397pnymsx8wv7r7q"))))
+          (base32 "0zp5vmhgp18812j2pbys7g3v0slkc70q9qp7k26bk7iddg1yy9x2"))))
       (build-system cmake-build-system)
       (arguments
        (list

gnu/packages/mate.scm

@@ -538,7 +538,6 @@ assorted menu related utility programs.")
            intltool
            libxslt
            yelp-tools
-           scrollkeeper
            gettext-minimal
            docbook-xml
            gobject-introspection))
@@ -1412,7 +1411,6 @@ can be used as backgrounds in the MATE Desktop environment.")
            libice
            libsm
            pkg-config
-           scrollkeeper
            xorgproto
            yelp-tools))
     (inputs
@@ -1591,7 +1589,6 @@ can be used as backgrounds in the MATE Desktop environment.")
            packagekit
            pango
            python
-           scrollkeeper
            startup-notification))
     (home-page "https://mate-desktop.org/")
     (synopsis "Text Editor for MATE")

gnu/packages/package-management.scm

@@ -18,7 +18,7 @@
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
-;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2023 jgart <jgart@dismail.de>
@@ -1043,7 +1043,7 @@ features of Stow with some extensions.")
     (build-system cmake-build-system)
     (arguments
      (list
-      #:tests? #f                       ; TEST need fhs envirnment.
+      #:tests? #f                       ;tests require FHS environment
       #:configure-flags
       #~(list
          ;; TODO: Add rpm-sequoia
@@ -1073,7 +1073,16 @@ features of Stow with some extensions.")
                    site)))
               (substitute* "plugins/CMakeLists.txt"
                 (("\\$[{]dbus-1_DATADIR[}]")
-                 (string-append #$output "/share"))))))))
+                 (string-append #$output "/share")))))
+          (add-after 'install 'install-macros-file
+            (lambda _
+              (define macros (string-append #$output "/etc/rpm/macros"))
+              (mkdir-p (dirname macros))
+              (call-with-output-file macros
+                (lambda (p)
+                  (format p "\
+%_var			/var
+%_localstatedir		/var~%"))))))))
     (native-inputs
      (list pkg-config
            python

gnu/packages/patches/libvirt-add-install-prefix.patch

@@ -1,6 +1,6 @@
 Patch from NixOS:
 
-  https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+  https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
 
 From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001
 From: Euan Kemp <euank@euank.com>
@@ -406,10 +406,10 @@ index 3b859ea7b4..ccddb3e805 100644
    ]
  endif
 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
-index b9257c816d..98701755d8 100644
+index 09d9fac02c..ee0c74ceec 100644
 --- a/src/security/apparmor/meson.build
 +++ b/src/security/apparmor/meson.build
-@@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles
+@@ -20,16 +20,16 @@ foreach name : apparmor_gen_profiles
      output: name,
      configuration: apparmor_gen_profiles_conf,
      install: true,
@@ -417,39 +417,25 @@ index b9257c816d..98701755d8 100644
 +    install_dir: install_prefix + apparmor_dir,
    )
  endforeach
- 
+
-@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
+ install_data(
-     command: apparmor_gen_cmd,
+   [ 'libvirt-qemu', 'libvirt-lxc' ],
-     capture: true,
+-  install_dir: apparmor_dir / 'abstractions',
-     install: true,
++  install_dir: install_prefix + apparmor_dir / 'abstractions',
--    install_dir: apparmor_dir / 'abstractions',
+ )
-+    install_dir: install_prefix + apparmor_dir / 'abstractions',
+
-   )
- endforeach
- 
  install_data(
    [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
 -  install_dir: apparmor_dir / 'libvirt',
 +  install_dir: install_prefix + apparmor_dir / 'libvirt',
  )
- 
- if not conf.has('WITH_APPARMOR_3')
-@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
-   # files in order to limit the amount of filesystem clutter.
-   install_data(
-     'usr.lib.libvirt.virt-aa-helper.local',
--    install_dir: apparmor_dir / 'local',
-+    install_dir: install_prefix + apparmor_dir / 'local',
-     rename: 'usr.lib.libvirt.virt-aa-helper',
-   )
- endif
 diff --git a/src/storage/meson.build b/src/storage/meson.build
 index 404d6a6941..fb4e67a0a8 100644
 --- a/src/storage/meson.build
 +++ b/src/storage/meson.build
 @@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE')
    }
- 
+
    virt_install_dirs += [
 -    confdir / 'storage',
 -    confdir / 'storage' / 'autostart',
@@ -459,20 +445,27 @@ index 404d6a6941..fb4e67a0a8 100644
 +    install_prefix + runstatedir / 'libvirt' / 'storage',
    ]
  endif
- 
+
 diff --git a/tools/meson.build b/tools/meson.build
-index 1bb84be0be..e04a4e986d 100644
+index a099148d3c..d0d6510f17 100644
 --- a/tools/meson.build
 +++ b/tools/meson.build
-@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL')
+@@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL')
      install_rpath: libvirt_rpath,
    )
- 
+
 -  install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
 +  install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
+
+   # Install the sysuser config for the setgid binary
+   install_data(
+     'libvirt-login-shell.sysusers.conf',
+-    install_dir: sysusersdir,
++    install_dir: install_prefix + sysusersdir,
+     rename: [ 'libvirt-login-shell.conf' ],
+   )
  endif
- 
+
- if host_machine.system() == 'windows'
 diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build
 index e9f312fa25..95d5d8fe0b 100644
 --- a/tools/ssh-proxy/meson.build

gnu/packages/patches/xinit-startx-mcookie-path.patch

@@ -1,23 +0,0 @@
-This patch fixes two bugs in upstream mcookie detection: 1) If mcookie is not
-detected, we still need to set HAS_COOKIE_HANDLER and MK_COOKIE, and 2) the
-value for MK_COOKIE must be a string in order to disallow further preprocessor
-expansions.
-
-In particular for 2, if we fail to surround the path in quotes, our path
-contains the token "linux", which gcc further expands, creating an invalid
-path.
-
---- a/configure.ac	2025-03-08 16:48:34.476791744 +0900
-+++ b/configure.ac	2025-03-08 16:48:30.208791623 +0900
-@@ -157,8 +157,10 @@
-     fi
- fi
- if test "x$MCOOKIE" != x ; then
--	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"'
-+	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="'"'"'$(MCOOKIE)'"'"'"'
- 	AC_MSG_NOTICE([startx will depend on "$MCOOKIE" to generate xauth cookies])
-+else
-+	STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE='
- fi
- AC_SUBST(STARTX_COOKIE_FLAGS)
- 

gnu/packages/php.scm

@@ -4,7 +4,7 @@
 ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2020, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
 ;;;
@@ -27,6 +27,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages aspell)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
@@ -55,6 +56,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:))
@@ -62,302 +64,316 @@
 (define-public php
   (package
     (name "php")
-    (version "8.3.12")
+    (version "8.3.26")
     (home-page "https://www.php.net/")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (string-append home-page "distributions/"
+       (method url-fetch)
-                                  "php-" version ".tar.xz"))
+       (uri (string-append home-page "distributions/" "php-" version ".tar.xz"))
-              (sha256
+       (sha256
-               (base32
+        (base32 "1lnbcc3b9k1j4c85a7sabvwp3iyl9xfg41qdc6a0qh1cl3pjwlig"))
-                "0cfi9g97lnmh3b3cn4a33dyzhgwyxicawkbz372whvz26f3f4x7p"))
+       (modules '((guix build utils)))
-              (modules '((guix build utils)))
+       (snippet
-              (snippet
+        '(with-directory-excursion "ext"
-               '(with-directory-excursion "ext"
+           (for-each delete-file-recursively
-                  (for-each delete-file-recursively
+                     ;; Some of the bundled libraries have no proper upstream.
-                            ;; Some of the bundled libraries have no proper upstream.
+                     ;; Ideally we'd extract these out as separate packages:
-                            ;; Ideally we'd extract these out as separate packages:
+                     ;; "mbstring/libmbfl"
-                            ;;"mbstring/libmbfl"
+                     ;; "date/lib"
-                            ;;"date/lib"
+                     ;; "bcmath/libbcmath"
-                            ;;"bcmath/libbcmath"
+                     ;; "fileinfo/libmagic" ; a patched version of libmagic
-                            ;;"fileinfo/libmagic" ; a patched version of libmagic
+                     '("gd/libgd" "pcre/pcre2lib"))))))
-                            '("gd/libgd"
-                              "pcre/pcre2lib"))))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
+     (list
-       (let-syntax ((with (syntax-rules ()
+      #:configure-flags
-                            ((_ option input)
+      #~(let-syntax ((with (syntax-rules ()
-                             (string-append option "="
+                             ((_ option input)
-                                            (assoc-ref %build-inputs input))))))
+                              (string-append
-         (list (with "--with-bz2" "bzip2")
+                               option "="
-               (with "--with-curl" "curl")
+                               (assoc-ref %build-inputs input))))))
-               (with "--with-gdbm" "gdbm")
+          (list (with "--with-bz2" "bzip2")
-               (with "--with-gettext" "libc")  ; libintl.h
+                (with "--with-curl" "curl")
-               (with "--with-gmp" "gmp")
+                (with "--with-gdbm" "gdbm")
-               (with "--with-ldap" "openldap")
+                (with "--with-gettext" "libc") ;libintl.h
-               (with "--with-ldap-sasl" "cyrus-sasl")
+                (with "--with-gmp" "gmp")
-               (with "--with-pdo-pgsql" "postgresql")
+                (with "--with-ldap" "openldap")
-               (with "--with-pdo-sqlite" "sqlite")
+                (with "--with-ldap-sasl" "cyrus-sasl")
-               (with "--with-pgsql" "postgresql")
+                (with "--with-pdo-pgsql" "postgresql")
-               ;; PHP’s Pspell extension, while retaining its current name,
+                (with "--with-pdo-sqlite" "sqlite")
-               ;; now uses the Aspell library.
+                (with "--with-pgsql" "postgresql")
-               (with "--with-pspell" "aspell")
+                ;; PHP’s Pspell extension, while retaining its current name,
-               (with "--with-readline" "readline")
+                ;; now uses the Aspell library.
-               (with "--with-sodium" "libsodium")
+                (with "--with-pspell" "aspell")
-               (with "--with-sqlite3" "sqlite")
+                (with "--with-readline" "readline")
-               (with "--with-tidy" "tidy")
+                (with "--with-sodium" "libsodium")
-               (with "--with-xsl" "libxslt")
+                (with "--with-sqlite3" "sqlite")
-               (with "--with-zlib-dir" "zlib")
+                (with "--with-tidy" "tidy-html")
-               ;; We could add "--with-snmp", but it requires netsnmp that
+                (with "--with-xsl" "libxslt")
-               ;; we don't have a package for. It is used to build the snmp
+                (with "--with-zlib-dir" "zlib")
-               ;; extension of php.
+                ;; We could add "--with-snmp", but it requires netsnmp that
-               "--with-external-pcre"
+                ;; we don't have a package for. It is used to build the snmp
-               "--with-external-gd"
+                ;; extension of php.
-               "--with-iconv"
+                "--with-external-pcre"
-               "--with-openssl"
+                "--with-external-gd"
-               "--with-mysqli"          ; Required for, e.g. wordpress
+                "--with-iconv"
-               "--with-pdo-mysql"
+                "--with-openssl"
-               "--with-zip"
+                "--with-mysqli"         ;Required for, e.g. wordpress
-               "--with-zlib"
+                "--with-pdo-mysql"
-               "--enable-bcmath"        ; Required for, e.g. Zabbix frontend
+                "--with-zip"
-               "--enable-calendar"
+                "--with-zlib"
-               "--enable-dba=shared"
+                "--enable-bcmath"       ;Required for, e.g. Zabbix frontend
-               "--enable-exif"
+                "--enable-calendar"
-               "--enable-flatfile"
+                "--enable-dba=shared"
-               "--enable-fpm"
+                "--enable-exif"
-               "--enable-ftp"
+                "--enable-flatfile"
-               "--enable-gd"
+                "--enable-fpm"
-               "--enable-inifile"
+                "--enable-ftp"
-               "--enable-intl"
+                "--enable-gd"
-               "--enable-mbstring"
+                "--enable-inifile"
-               "--enable-pcntl"
+                "--enable-intl"
-               "--enable-sockets"
+                "--enable-mbstring"
-               "--enable-sysvsem"     ; Required for, e.g. Nextcloud
+                "--enable-pcntl"
-               "--enable-embed"       ; Required for embed SAPI
+                "--enable-sockets"
-               "--enable-zts"
+                "--enable-sysvsem"      ;Required for, e.g. Nextcloud
-               "--disable-zend-signals"
+                "--enable-embed"        ;Required for embed SAPI
-               "--enable-zend-max-execution-timers"))
+                "--enable-zts"
-       #:phases
+                "--disable-zend-signals"
-       (modify-phases %standard-phases
+                "--enable-zend-max-execution-timers"))
-         (add-after 'unpack 'do-not-record-build-flags
+      #:phases
-           (lambda _
+      #~(modify-phases %standard-phases
-             ;; Prevent configure flags from being stored and causing
+          (add-after 'unpack 'do-not-record-build-flags
-             ;; unnecessary runtime dependencies.
+            (lambda _
-             (substitute* "scripts/php-config.in"
+              ;; Prevent configure flags from being stored and causing
-               (("@CONFIGURE_OPTIONS@") "")
+              ;; unnecessary runtime dependencies.
-               (("@PHP_LDFLAGS@") ""))
+              (substitute* "scripts/php-config.in"
-             ;; This file has ISO-8859-1 encoding.
+                (("@CONFIGURE_OPTIONS@")
-             (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                 "")
-               (substitute* "main/build-defs.h.in"
+                (("@PHP_LDFLAGS@")
-                 (("@CONFIGURE_COMMAND@") "(omitted)")))))
+                 ""))
-         (add-before 'build 'patch-/bin/sh
+              ;; This file has ISO-8859-1 encoding.
-           (lambda _
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
-             (substitute* '("run-tests.php" "ext/standard/proc_open.c")
+                (substitute* "main/build-defs.h.in"
-               (("/bin/sh") (which "sh")))))
+                  (("@CONFIGURE_COMMAND@")
-         (add-before 'check 'prepare-tests
+                   "(omitted)")))))
-           (lambda _
+          (add-before 'build 'patch-/bin/sh
-             ;; Some of these files have ISO-8859-1 encoding, whereas others
+            (lambda _
-             ;; use ASCII, so we can't use a "catch-all" find-files here.
+              (substitute* '("run-tests.php"
-             (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                             "ext/standard/proc_open.c")
-               (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt"
+                (("/bin/sh")
-                              "ext/mbstring/tests/mb_send_mail04.phpt"
+                 (which "sh")))))
-                              "ext/mbstring/tests/mb_send_mail05.phpt"
+          (add-before 'check 'prepare-tests
-                              "ext/mbstring/tests/mb_send_mail06.phpt")
+            (lambda* (#:key parallel-tests? #:allow-other-keys)
-                 (("/bin/cat") (which "cat"))))
+              ;; Some of these files have ISO-8859-1 encoding, whereas others
-             (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt"
+              ;; use ASCII, so we can't use a "catch-all" find-files here.
-                            "ext/mbstring/tests/mb_send_mail03.phpt"
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
-                            "ext/mbstring/tests/bug52681.phpt"
+                (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt"
-                            "ext/standard/tests/general_functions/bug34794.phpt"
+                               "ext/mbstring/tests/mb_send_mail04.phpt"
-                            "ext/standard/tests/general_functions/bug44667.phpt"
+                               "ext/mbstring/tests/mb_send_mail05.phpt"
-                            "ext/standard/tests/general_functions/proc_open.phpt")
+                               "ext/mbstring/tests/mb_send_mail06.phpt")
-               (("/bin/cat") (which "cat")))
+                  (("/bin/cat")
+                   (which "cat"))))
+              (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt"
+                             "ext/mbstring/tests/mb_send_mail03.phpt"
+                             "ext/mbstring/tests/bug52681.phpt"
+                             "ext/standard/tests/general_functions/bug34794.phpt"
+                             "ext/standard/tests/general_functions/bug44667.phpt"
+                             "ext/standard/tests/general_functions/proc_open.phpt")
+                (("/bin/cat")
+                 (which "cat")))
 
-             ;; The encoding of this file is not recognized, so we simply drop it.
+              ;; The encoding of this file is not recognized, so we simply drop it.
-             (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
+              (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
 
-             (substitute* "ext/standard/tests/streams/bug60602.phpt"
+              (substitute* "ext/standard/tests/streams/bug60602.phpt"
-               (("'ls'") (string-append "'" (which "ls") "'")))
+                (("'ls'")
+                 (string-append "'"
+                                (which "ls") "'")))
 
-             ;; Drop tests known to fail on different architectures:
+              ;; Drop tests known to fail on different architectures:
-             (for-each delete-file
+              (for-each
-             ,(cond
+               delete-file
-                ((target-arm32?)
+               #$(cond
-                 `(list "ext/calendar/tests/unixtojd_error1.phpt"
+                  ((target-arm32?)
-                        "ext/opcache/tests/preload_006.phpt"
+                   '(list
-                        "ext/opcache/tests/preload_011.phpt"
+                     "ext/calendar/tests/unixtojd_error1.phpt"
-                        ;; arm can be a lot slower, so a time-related test fails
+                     "ext/opcache/tests/preload_006.phpt"
-                        "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
+                     "ext/opcache/tests/preload_011.phpt"
-                        "ext/pcntl/tests/pcntl_unshare_01.phpt"
+                     ;; arm can be a lot slower, so a time-related test fails
-                        "ext/pcre/tests/bug76514.phpt"
+                     "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
-                        "ext/pcre/tests/preg_match_error3.phpt"
+                     "ext/pcntl/tests/pcntl_unshare_01.phpt"
-                        "ext/pcre/tests/cache_limit.phpt"
+                     "ext/pcre/tests/bug76514.phpt"
-                        "ext/sockets/tests/socket_getopt.phpt"
+                     "ext/pcre/tests/preg_match_error3.phpt"
-                        "ext/sockets/tests/socket_sendrecvmsg_error.phpt"
+                     "ext/pcre/tests/cache_limit.phpt"
-                        "ext/standard/tests/general_functions/var_export-locale.phpt"
+                     "ext/sockets/tests/socket_getopt.phpt"
-                        "ext/standard/tests/general_functions/var_export_basic1.phpt"
+                     "ext/sockets/tests/socket_sendrecvmsg_error.phpt"
-                        "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
+                     "ext/standard/tests/general_functions/var_export-locale.phpt"
-                        "ext/intl/tests/timezone_getOffset_error.phpt"
+                     "ext/standard/tests/general_functions/var_export_basic1.phpt"
-                        "sapi/cli/tests/cli_process_title_unix.phpt"
+                     "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
-                        "Zend/tests/concat_003.phpt"))
+                     "ext/intl/tests/timezone_getOffset_error.phpt"
-                ((target-x86-32?)
+                     "sapi/cli/tests/cli_process_title_unix.phpt"
-                 `(list "ext/dba/tests/dba_gdbm.phpt"))
+                     "Zend/tests/concat_003.phpt"))
-                ((target-ppc32?)
+                  ((target-x86-32?)
-                 `(list "sapi/phpdbg/tests/watch_001.phpt"
+                   '(list "ext/dba/tests/dba_gdbm.phpt"))
-                        "sapi/phpdbg/tests/watch_003.phpt"
+                  ((target-ppc32?)
-                        "sapi/phpdbg/tests/watch_004.phpt"))
+                   '(list "sapi/phpdbg/tests/watch_001.phpt"
-                ((target-ppc64le?)
+                          "sapi/phpdbg/tests/watch_003.phpt"
-                 `(list
+                          "sapi/phpdbg/tests/watch_004.phpt"))
-                    ;; phpdbg watchpoints don't work.
+                  ((target-ppc64le?)
-                    ;; Bug tracked upstream at:
+                   '(list
-                    ;; https://bugs.php.net/bug.php?id=81408
+                     ;; phpdbg watchpoints don't work.
-                    "sapi/phpdbg/tests/watch_001.phpt"
+                     ;; Bug tracked upstream at:
-                    "sapi/phpdbg/tests/watch_003.phpt"
+                     ;; https://bugs.php.net/bug.php?id=81408
-                    "sapi/phpdbg/tests/watch_004.phpt"
+                     "sapi/phpdbg/tests/watch_001.phpt"
-                    "sapi/phpdbg/tests/watch_005.phpt"
+                     "sapi/phpdbg/tests/watch_003.phpt"
-                    "sapi/phpdbg/tests/watch_006.phpt"))
+                     "sapi/phpdbg/tests/watch_004.phpt"
-                (else `'())))
+                     "sapi/phpdbg/tests/watch_005.phpt"
+                     "sapi/phpdbg/tests/watch_006.phpt"))
+                  (else ''())))
 
-             ;; Drop tests that are known to fail.
+              ;; Drop tests that are known to fail.
-             (for-each delete-file
+              (for-each
-                       '("ext/posix/tests/posix_getgrgid.phpt"    ; Requires /etc/group.
+               delete-file
-                         "ext/posix/tests/posix_getgrnam_basic.phpt" ; Requires /etc/group.
+               '("ext/posix/tests/posix_getgrgid.phpt" ;Requires /etc/group.
-                         "ext/sockets/tests/bug63000.phpt"        ; Fails to detect OS.
+                 "ext/posix/tests/posix_getgrnam_basic.phpt" ;Requires /etc/group.
-                         ;; These need exotic locales.
+                 "ext/sockets/tests/bug63000.phpt" ;Fails to detect OS.
-                         "ext/standard/tests/strings/setlocale_basic1.phpt"
+                 ;; These need exotic locales.
-                         "ext/standard/tests/strings/setlocale_basic2.phpt"
+                 "ext/standard/tests/strings/setlocale_basic1.phpt"
-                         "ext/standard/tests/strings/setlocale_basic3.phpt"
+                 "ext/standard/tests/strings/setlocale_basic2.phpt"
-                         "ext/standard/tests/strings/setlocale_variation1.phpt"
+                 "ext/standard/tests/strings/setlocale_basic3.phpt"
-                         ;; This bug should have been fixed in gd 2.2.2.
+                 "ext/standard/tests/strings/setlocale_variation1.phpt"
-                         ;; Is it a regression?
-                         "ext/gd/tests/bug65148.phpt"
-                         ;; This bug should have been fixed in the gd 2.2
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug66590.phpt"
-                         ;; This bug should have been fixed in the php-5.5
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug70102.phpt"
-                         ;; This bug should have been fixed in the php-5.6
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug73869.phpt"
-                         ;; Some WebP related tests fail.
-                         "ext/gd/tests/webp_basic.phpt"
-                         "ext/gd/tests/imagecreatefromstring_webp.phpt"
-                         ;; TODO: Enable these when libgd is built with xpm support.
-                         "ext/gd/tests/xpm2gd.phpt"
-                         "ext/gd/tests/xpm2jpg.phpt"
-                         "ext/gd/tests/xpm2png.phpt"
-                         ;; AVIF support disabled
-                         "ext/gd/tests/avif_decode_encode.phpt"
-                         ;; Typo in expected outputs
-                         "ext/gd/tests/bug72339.phpt"
-                         ;; AVIF support disabled
-                         "ext/gd/tests/imagecreatefromstring_avif.phpt"
 
-                         ;; These tests fail due to issues in upstream gd
+                 ;; This test fails for unknown reason (see:
-                         ;; 2.3.3 around BICUBIC interpolation.  See
+                 ;; <https://github.com/php/php-src/issues/19996>).
-                         ;; https://github.com/libgd/libgd/issues/847
+                 "ext/gd/tests/gh16559.phpt"
-                         "ext/gd/tests/bug79676.phpt"
-                         "ext/gd/tests/imageinterpolation_basic.phpt"
-                         "ext/gd/tests/imagescale_preserve_ratio.phpt"
 
-                         ;; XXX: These test failures appear legitimate, needs investigation.
+                 ;; Some WebP related tests fail.
-                         ;; open_basedir() restriction failure.
+                 "ext/gd/tests/webp_basic.phpt"
-                         "ext/curl/tests/curl_setopt_ssl.phpt"
+                 "ext/gd/tests/imagecreatefromstring_webp.phpt"
+                 ;; TODO: Enable these when libgd is built with xpm support.
+                 "ext/gd/tests/xpm2gd.phpt"
+                 "ext/gd/tests/xpm2jpg.phpt"
+                 "ext/gd/tests/xpm2png.phpt"
+                 ;; AVIF support disabled
+                 "ext/gd/tests/avif_decode_encode.phpt"
+                 ;; Typo in expected outputs
+                 "ext/gd/tests/bug72339.phpt"
+                 ;; AVIF support disabled
+                 "ext/gd/tests/imagecreatefromstring_avif.phpt"
 
-                         ;; Fail because there is no "root" in the build container's
+                 ;; These tests fail due to issues in upstream gd
-                         ;; /etc/passwd
+                 ;; 2.3.3 around BICUBIC interpolation.  See
-                         "sapi/fpm/tests/bug68591-conf-test-group.phpt"
+                 ;; https://github.com/libgd/libgd/issues/847
-                         "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt"
+                 "ext/gd/tests/bug79676.phpt"
-                         "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt"
+                 "ext/gd/tests/imageinterpolation_basic.phpt"
+                 "ext/gd/tests/imagescale_preserve_ratio.phpt"
 
-                         ;; The test expects an Array, but instead get the contents(?).
+                 ;; XXX: These test failures appear legitimate, needs investigation.
-                         "ext/gd/tests/bug43073.phpt"
+                 ;; open_basedir() restriction failure.
-                         ;; imagettftext() returns wrong coordinates.
+                 "ext/curl/tests/curl_setopt_ssl.phpt"
-                         "ext/gd/tests/bug48732-mb.phpt"
-                         "ext/gd/tests/bug48732.phpt"
-                         ;; Similarly for imageftbbox().
-                         "ext/gd/tests/bug48801-mb.phpt"
-                         "ext/gd/tests/bug48801.phpt"
-                         ;; Different expected output from imagecolorallocate().
-                         "ext/gd/tests/bug53504.phpt"
-                         ;; Wrong image size after scaling an image.
-                         "ext/gd/tests/bug73272.phpt"
-                         ;; PCRE with/without JIT gives different result
-                         "ext/pcre/tests/gh11374.phpt"
-                         "ext/pcre/tests/gh11956.phpt"
-                         ;; reported bug only seems to affect windows
-                         "ext/standard/tests/directory/bug74589_utf8.phpt"
-                         ;; this test seems to be unreliable/flaky
-                         "sapi/cli/tests/php_cli_server_pdeathsig.phpt"
-                         ;; This test fails on most architectures.
-                         "sapi/cli/tests/upload_2G.phpt"))
 
-             ;; Accomodate two extra openssl errors flanking the expected one:
+                 ;; Fail because there is no "root" in the build container's
-             ;; random number generator:RAND_{load,write}_file:Cannot open file
+                 ;; /etc/passwd
-             ;; This is due to an invalid $HOME, but changing it in the test
+                 "sapi/fpm/tests/bug68591-conf-test-group.phpt"
-             ;; still prints the first one & changing it globally is overkill.
+                 "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt"
-             (substitute* "ext/openssl/tests/bug80747.phpt"
+                 "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt"
-               ((".*error:%s:key size too small.*" match)
-                (string-append "%s\n" match "%s\n")))
 
-             ;; Skip tests requiring network access.
+                 ;; The test expects an Array, but instead get the contents(?).
-             (setenv "SKIP_ONLINE_TESTS" "1")
+                 "ext/gd/tests/bug43073.phpt"
-             ;; Without this variable, 'make test' passes regardless of failures.
+                 ;; imagettftext() returns wrong coordinates.
-             (setenv "REPORT_EXIT_STATUS" "1")
+                 "ext/gd/tests/bug48732-mb.phpt"
-             ;; Skip tests requiring I/O facilities that are unavailable in the
+                 "ext/gd/tests/bug48732.phpt"
-             ;; build environment
+                 ;; Similarly for imageftbbox().
-             (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
+                 "ext/gd/tests/bug48801-mb.phpt"
-       #:test-target "test"))
+                 "ext/gd/tests/bug48801.phpt"
+                 ;; Different expected output from imagecolorallocate().
+                 "ext/gd/tests/bug53504.phpt"
+                 ;; This test sometimes exit with Termsig=11 (see:
+                 ;; <https://github.com/php/php-src/issues/19996>).
+                 "ext/gd/tests/bug65148.phpt"
+                 ;; Wrong image size after scaling an image.
+                 "ext/gd/tests/bug73272.phpt"
+                 ;; PCRE with/without JIT gives different result
+                 "ext/pcre/tests/gh11374.phpt"
+                 "ext/pcre/tests/gh11956.phpt"
+                 ;; reported bug only seems to affect windows
+                 "ext/standard/tests/directory/bug74589_utf8.phpt"
+                 ;; This test is flaky, appears racy when the test suite runs
+                 ;; in parallel (see:
+                 ;; <https://github.com/php/php-src/issues/19998>).
+                 "ext/standard/tests/file/bug46347.phpt"
+                 ;; this test seems to be unreliable/flaky
+                 "sapi/cli/tests/php_cli_server_pdeathsig.phpt"
+                 ;; This test fails on most architectures.
+                 "sapi/cli/tests/upload_2G.phpt"))
+
+              ;; Accomodate two extra openssl errors flanking the expected one:
+              ;; random number generator:RAND_{load,write}_file:Cannot open file
+              ;; This is due to an invalid $HOME, but changing it in the test
+              ;; still prints the first one & changing it globally is overkill.
+              (substitute* "ext/openssl/tests/bug80747.phpt"
+                ((".*error:%s:key size too small.*" match)
+                 (string-append "%s\n" match "%s\n")))
+
+              ;; Skip tests requiring network access.
+              (setenv "SKIP_ONLINE_TESTS" "1")
+              ;; Without this variable, 'make test' passes regardless of failures.
+              (setenv "REPORT_EXIT_STATUS" "1")
+              ;; Skip tests requiring I/O facilities that are unavailable in the
+              ;; build environment
+              (setenv "SKIP_IO_CAPTURE_TESTS" "1")
+              ;; Run tests in parallel.
+              (setenv "TEST_PHP_ARGS"
+                      (format #f "-j~a" (if parallel-tests?
+                                            (parallel-job-count)
+                                            1))))))
+      #:test-target "test"))
     (inputs
-     `(("aspell" ,aspell)
+     (list aspell
-       ("bzip2" ,bzip2)
+           bzip2
-       ("curl" ,curl)
+           curl
-       ("cyrus-sasl" ,cyrus-sasl)
+           cyrus-sasl
-       ("freetype" ,freetype)
+           fontconfig
-       ("fontconfig" ,fontconfig)
+           freetype
-       ("libjpeg-turbo" ,libjpeg-turbo)
+           gd
-       ("libpng" ,libpng)
+           gdbm
-       ("gd" ,gd)
+           gmp
-       ("gdbm" ,gdbm)
+           gnutls
-       ("gmp" ,gmp)
+           icu4c
-       ("gnutls" ,gnutls)
+           libgcrypt
-       ("icu4c" ,icu4c)
+           libjpeg-turbo
-       ("libgcrypt" ,libgcrypt)
+           libpng
-       ("libpng" ,libpng)
+           libpng
-       ("libsodium" ,libsodium)
+           libsodium
-       ("libxml2" ,libxml2)
+           libx11
-       ("libxslt" ,libxslt)
+           libxml2
-       ("libx11" ,libx11)
+           libxslt
-       ("libzip" ,libzip)
+           libzip
-       ("oniguruma" ,oniguruma)
+           oniguruma
-       ("openldap" ,openldap)
+           openldap
-       ("openssl" ,openssl)
+           openssl
-       ("pcre" ,pcre2)
+           pcre2
-       ("postgresql" ,postgresql)
+           postgresql
-       ("readline" ,readline)
+           readline
-       ("sqlite" ,sqlite)
+           sqlite
-       ("tidy" ,tidy-html)
+           tidy-html
-       ("zlib" ,zlib)))
+           zlib))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     (list autoconf                     ;to save the test report
-       ("bison" ,bison)
+           bison
-       ("gettext" ,gettext-minimal)
+           gettext-minimal
-       ("procps" ,procps)))             ; for tests
+           pkg-config
+           procps))                     ;for tests
     (synopsis "PHP programming language")
     (description
      "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting
 language designed primarily for web development but is also used as
 a general-purpose programming language.  PHP code may be embedded into
 HTML code, or it can be used in combination with various web template
-systems, web content management systems and web frameworks." )
+systems, web content management systems and web frameworks.")
-    (license (list
+    (license (list (license:non-copyleft "file://LICENSE") ;The PHP license.
-              (license:non-copyleft "file://LICENSE")       ; The PHP license.
+                   (license:non-copyleft "file://Zend/LICENSE") ;The Zend license.
-              (license:non-copyleft "file://Zend/LICENSE")  ; The Zend license.
+                   license:lgpl2.1      ;ext/mbstring/libmbfl
-              license:lgpl2.1                               ; ext/mbstring/libmbfl
+                   license:lgpl2.1+     ;ext/bcmath/libbcmath
-              license:lgpl2.1+                              ; ext/bcmath/libbcmath
+                   license:bsd-2        ;ext/fileinfo/libmagic
-              license:bsd-2                                 ; ext/fileinfo/libmagic
+                   license:expat))))                             ; ext/date/lib
-              license:expat))))                             ; ext/date/lib

gnu/packages/qt.scm

@@ -5940,6 +5940,35 @@ simple editor for binary data, just like @code{QPlainTextEdit} is for text
 data.")
     (license license:lgpl2.1)))
 
+(define-public qhotkey
+  (package
+    (name "qhotkey")
+    (version "1.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Skycoder42/QHotkey")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0glzh4l532xk4v9mphsdf96v1557pyvg5al3ha0vr3244bfh9hcf"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f ;no tests
+           #:configure-flags
+           #~(list "-DQT_DEFAULT_MAJOR_VERSION=6"
+                   "-DBUILD_SHARED_LIBS=ON"
+                   "-DQHOTKEY_EXAMPLES=ON")))
+    (inputs (list libx11 qtbase))
+    (home-page "https://github.com/Skycoder42/QHotkey")
+    (synopsis "Global shortcut key for Qt desktop applications")
+    (description
+     "This package provides @code{QHotKey} class that can be used to create
+hotkeys/global shortcuts, aka shortcuts that work everywhere, independent of
+the application state.")
+    (license license:bsd-3)))
+
 (define-public qthttpserver
   (package
     (name "qthttpserver")

gnu/packages/suckless.scm

@@ -267,7 +267,7 @@ a custom raw video format with a simple container.")
                  (string-append apps "/dwm.desktop")
                  #:name "dwm"
                  #:generic-name #$synopsis
-                 #:exec (string-append #$output "/bin/dwm %U")
+                 #:exec (string-append #$output "/bin/dwm")
                  #:comment
                  `(("en" ,#$synopsis)
                    (#f ,#$synopsis)))))))))

gnu/packages/task-runners.scm

@@ -3,6 +3,7 @@
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,8 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages mail)
+  #:use-module (gnu packages scheme)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix download)
@@ -33,6 +36,31 @@
   #:use-module (guix packages)
   #:use-module (guix utils))
 
+(define-public faber
+  (package
+    (name "faber")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/Junker/faber")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17xjg92vwg7n06lx4xbsnd7wvsgqcw8h10ha5365rsfs49bd3cyf"))))
+    (inputs (list gauche))
+    (build-system copy-build-system)
+    (arguments
+     '(#:install-plan '(("faber" "bin/"))))
+    (synopsis "Task runner with power of Scheme")
+    (description "Faber is a CLI task runner designed to leverage the power and
+flexibility of Gauche Scheme.
+Unlike other build systems that rely on custom formats, Faber uses Gauche
+Scheme, allowing you to write build scripts using familiar Scheme syntax.")
+    (home-page "https://github.com/Junker/faber")
+    (license license:expat)))
+
 (define-public run
   (package
     (name "run")

gnu/packages/video.scm

@@ -1986,33 +1986,6 @@ audio/video codec library.")
                                    " -Wno-error=int-conversion ")))))))))
      (inputs '()))))
 
-(define-public ffmpeg-for-friction
-  (package
-    (inherit ffmpeg-4)
-    (version "4.2.10")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
-                                 version ".tar.xz"))
-             (sha256
-              (base32
-               "01jc8ygbazk37wbb7qj24zi9sbfrxrvzhyk527bbas19gxpdrk64"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg-4)
-       ((#:modules modules %default-gnu-modules)
-        `((srfi srfi-1) ,@modules))
-       ((#:configure-flags flags ''())
-        #~(fold delete #$flags
-                '("--enable-avresample"
-                  "--enable-libaom"
-                  "--enable-libdav1d"
-                  "--enable-librav1e"
-                  "--enable-libsrt"
-                  "--enable-libsvtav1"
-                  "--enable-vulkan")))))
-    (inputs (modify-inputs (package-inputs ffmpeg-4)
-              (delete "dav1d" "libaom" "rav1e" "srt")))))
-
 ;;; Custom ffmpeg package used by Jami, which incorporates custom patches.
 (define-public ffmpeg-jami
   (let ((ffmpeg ffmpeg-6))

gnu/packages/virtualization.scm

@@ -1630,14 +1630,14 @@ It started as a side project of LXC but can be used by any run-time.")
 (define-public libvirt
   (package
     (name "libvirt")
-    (version "11.0.0")
+    (version "11.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://libvirt.org/sources/libvirt-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0vl0lgzw3x4fkghhw7nfxk8fxj3bbn9f17y0hg7miba283zpd881"))
+        (base32 "08r4sxchhh639a8h346795971zz615j86v9z9vxf5q9q0pbbjqrb"))
        (patches (search-patches "libvirt-add-install-prefix.patch"
                                 "libvirt-respect-modules-path.patch"))))
     (build-system meson-build-system)
@@ -1794,14 +1794,14 @@ three libraries:
 (define-public python-libvirt
   (package
     (name "python-libvirt")
-    (version "11.0.0")
+    (version "11.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://libvirt.org/sources/python/libvirt-python-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1y26104zgylz0v9d6xc0bm6m13is94shn9dlhjycaf347jjjbs6f"))))
+        (base32 "08xcnzmahmb72rv9cw8dxwnjmrdgmm5j4bbxpwsnhll9qsgdiak9"))))
     (build-system pyproject-build-system)
     (inputs
      (list libvirt))

gnu/packages/xorg.scm

@@ -44,6 +44,7 @@
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2025 宋文武 <iyzsong@envs.net>
 ;;; Copyright © 2025 B. Wilson <elaexuotee@wilsonb.com>
+;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6202,16 +6203,13 @@ The XCB util-wm module provides the following libraries:
 (define-public xinit
   (package
     (name "xinit")
-    (version "1.4.3")
+    (version "1.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/app/xinit-"
                                   version ".tar.xz"))
               (sha256
-               (base32
+               (base32 "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"))))
-                "0npx32mi035xkz26gp7raps5xsq4v7rgayy1q794h4d3lqhryh46"))
-              (patches
-                (search-patches "xinit-startx-mcookie-path.patch"))))
     (build-system gnu-build-system)
     (inputs (list libx11 util-linux xorgproto))
     (native-inputs (list pkg-config))

gnu/services/networking.scm

@@ -64,6 +64,7 @@
   #:use-module (gnu packages usb-modeswitch)
   #:use-module (gnu packages messaging)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages ntp)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages ipfs)
@@ -1307,7 +1308,13 @@ HiddenServicePort ~a ~a~%"
                                     (writable? #t))
                                    (file-system-mapping
                                     (source torrc)
-                                    (target source)))
+                                    (target source))
+
+                                   ;; Transport plugins like the lyrebird
+                                   ;; webtunnel need X.509 certificates.
+                                   (file-system-mapping
+                                     (source (file-append nss-certs "/etc/ssl/certs"))
+                                     (target "/etc/ssl/certs")))
                              (map (lambda (plugin)
 				    (file-system-mapping
 				     (source (tor-plugin-program plugin))

gnu/system/linux-initrd.scm

@@ -349,7 +349,7 @@ FILE-SYSTEMS."
                     ("btrfs" => '("btrfs"))
                     ("iso9660" => '("isofs"))
                     ("jfs" => '("jfs"))
-                    ("f2fs" => '("f2fs" "crc32_generic"))
+                    ("f2fs" => '("f2fs" "crc32_cryptoapi"))
                     ("xfs" => '("xfs"))
                     (else '())))
 

tests/builders.scm

@@ -140,6 +140,7 @@
          (lambda (dir)
            (with-directory-excursion dir
              (unpack #:source file)
+             (sync)
              (call-with-input-file name get-string-all))))))))
  compressors)
 

tests/pack.scm

@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017-2021, 2023, 2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
 ;;;
@@ -61,17 +61,6 @@
 
 (define %ar-bootstrap %bootstrap-binutils)
 
-;;; This is a variant of the RPM package configured so that its database can
-;;; be created on a writable location readily available inside the build
-;;; container ("/tmp").
-(define rpm-for-tests
-  (package
-    (inherit rpm)
-    (arguments (substitute-keyword-arguments (package-arguments rpm)
-                 ((#:configure-flags flags '())
-                  #~(cons "--localstatedir=/tmp"
-                          (delete "--localstatedir=/var" #$flags)))))))
-
 
 (test-begin "pack")
 
@@ -517,14 +506,15 @@
                  (use-modules (guix build utils))
 
                  (define fakeroot #+(file-append fakeroot "/bin/fakeroot"))
-                 (define rpm #+(file-append rpm-for-tests "/bin/rpm"))
+                 (define rpm #+(file-append rpm "/bin/rpm"))
-                 (mkdir-p "/tmp/lib/rpm")
+                 (define dbpath (string-append (getcwd) "/var/lib/rpm"))
+                 (mkdir-p dbpath)
 
                  ;; Install the RPM package.  This causes RPM to validate the
                  ;; signatures, header as well as the file digests, which
                  ;; makes it a rather thorough test.
                  (mkdir "test-prefix")
-                 (invoke fakeroot rpm "--install"
+                 (invoke fakeroot rpm "--dbpath" dbpath "--install"
                          (string-append "--prefix=" (getcwd) "/test-prefix")
                          #$rpm-pack)
 
@@ -532,7 +522,8 @@
                  (invoke "./test-prefix/bin/guile" "--version")
 
                  ;; Uninstall the RPM package.
-                 (invoke fakeroot rpm "--erase" "guile-bootstrap")
+                 (invoke fakeroot rpm "--dbpath" dbpath
+                         "--erase" "guile-bootstrap")
 
                  ;; Required so the above is run.
                  (mkdir #$output))))))