gnu: python-blacksheep: Update to 2.4.1.

Blacksheep 2.4.1, among other changes, removes dateutil package dependency
and improves compatibility with newer versions of pytest-asyncio. The
latter allows to run all unit tests with python-pytests-asyncio 1.0
(current version in Guix).

* gnu/packages/python-web.scm (python-blacksheep): Update to 2.4.1.
  [arguments] <#:test-flags>: Remove ignore for tests/clients directory.
  [native-inputs]: Add nss-certs-for-test.
  [propagated-inputs]: Remove python-dateutil.

Change-Id: I7f391a6f15b1563e28a10197a8444441b3f2e7a7
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

.dir-locals.el

@@ -606,7 +606,6 @@
    (eval . (put 'restic-backup-job 'scheme-indent-function 0))
    (eval . (put 'rngd-configuration 'scheme-indent-function 0))
    (eval . (put 'rootless-podman-configuration 'scheme-indent-function 0))
-   (eval . (put 'rottlog-configuration 'scheme-indent-function 0))
    (eval . (put 'rpcbind-configuration 'scheme-indent-function 0))
    (eval . (put 'rshiny-configuration 'scheme-indent-function 0))
    (eval . (put 'rspamd-configuration 'scheme-indent-function 0))

doc/guix.texi

@@ -21476,7 +21476,6 @@ is also prefixed by a timestamp by GNU Shepherd.
 @node Log Rotation
 @subsection Log Rotation
 
-@cindex rottlog
 @cindex log rotation
 @cindex logging
 Log files such as those found in @file{/var/log} tend to grow endlessly,
@@ -21557,119 +21556,6 @@ Size in bytes below which a log file is @emph{not} rotated.
 
 @c %end of fragment
 
-@subheading Rottlog
-
-An alternative log rotation service relying on GNU@tie{}Rot[t]log, a log
-rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual}), is also
-provided.
-
-@quotation Warning
-The Rottlog service presented here is deprecated in favor of
-@code{log-rotation-service-type} (see above).  The
-@code{rottlog-service-type} variable and related tools will be removed
-after 2025-06-15.
-@end quotation
-
-The example below shows how to extend it with an additional
-@dfn{rotation}, should you need to do that (usually, services that
-produce log files already take care of that):
-
-@lisp
-(use-modules (guix) (gnu))
-(use-service-modules admin)
-
-(define my-log-files
-  ;; Log files that I want to rotate.
-  '("/var/log/something.log" "/var/log/another.log"))
-
-(operating-system
-  ;; @dots{}
-  (services (cons (simple-service 'rotate-my-stuff
-                                  rottlog-service-type
-                                  (list (log-rotation
-                                         (frequency 'daily)
-                                         (files my-log-files))))
-                  %base-services)))
-@end lisp
-
-@defvar rottlog-service-type
-This is the type of the Rottlog service, whose value is a
-@code{rottlog-configuration} object.
-
-Other services can extend this one with new @code{log-rotation} objects
-(see below), thereby augmenting the set of files to be rotated.
-
-This service type can define mcron jobs (@pxref{Scheduled Job
-Execution}) to run the rottlog service.
-@end defvar
-
-@deftp {Data Type} rottlog-configuration
-Data type representing the configuration of rottlog.
-
-@table @asis
-@item @code{rottlog} (default: @code{rottlog})
-The Rottlog package to use.
-
-@item @code{rc-file} (default: @code{(file-append rottlog "/etc/rc")})
-The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,,
-rottlog, GNU Rot[t]log Manual}).
-
-@item @code{rotations} (default: @code{%default-rotations})
-A list of @code{log-rotation} objects as defined below.
-
-@item @code{jobs}
-This is a list of gexps where each gexp corresponds to an mcron job
-specification (@pxref{Scheduled Job Execution}).
-@end table
-@end deftp
-
-@deftp {Data Type} log-rotation
-Data type representing the rotation of a group of log files.
-
-Taking an example from the Rottlog manual (@pxref{Period Related File
-Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be
-defined like this:
-
-@lisp
-(log-rotation
-  (frequency 'daily)
-  (files '("/var/log/apache/*"))
-  (options '("storedir apache-archives"
-             "rotate 6"
-             "notifempty"
-             "nocompress")))
-@end lisp
-
-The list of fields is as follows:
-
-@table @asis
-@item @code{frequency} (default: @code{'weekly})
-The log rotation frequency, a symbol.
-
-@item @code{files}
-The list of files or file glob patterns to rotate.
-
-@vindex %default-log-rotation-options
-@item @code{options} (default: @code{%default-log-rotation-options})
-The list of rottlog options for this rotation (@pxref{Configuration
-parameters,,, rottlog, GNU Rot[t]log Manual}).
-
-@item @code{post-rotate} (default: @code{#f})
-Either @code{#f} or a gexp to execute once the rotation has completed.
-@end table
-@end deftp
-
-@defvar %default-rotations
-Specifies weekly rotation of @code{%rotated-files} and of
-@file{/var/log/guix-daemon.log}.
-@end defvar
-
-@defvar %rotated-files
-The list of syslog-controlled files to be rotated.  By default it is:
-@code{'("/var/log/messages" "/var/log/secure" "/var/log/debug" \
-"/var/log/maillog")}.
-@end defvar
-
 Some log files just need to be deleted periodically once they are old,
 without any other criterion and without any archival step.  This is the
 case of build logs stored by @command{guix-daemon} under

gnu/local.mk

@@ -993,7 +993,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/antiword-CVE-2014-8123.patch			\
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch	\
   %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch	\
-  %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
   %D%/packages/patches/apr-fix-atomics.patch			\
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
   %D%/packages/patches/aria-maestosa-scons-python3.patch	\
@@ -2186,6 +2185,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pytorch-system-libraries.patch	\
   %D%/packages/patches/python-pytorch-without-kineto.patch	\
   %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
+  %D%/packages/patches/python-scipy-i686.patch 			\
   %D%/packages/patches/python-vaex-core-fix-tsl-use.patch	\
   %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch	\
   %D%/packages/patches/python-versioneer-guix-support.patch	\
@@ -2238,6 +2238,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/raptor2-libxml2.patch			\
   %D%/packages/patches/racket-rktio-bin-sh.patch		\
   %D%/packages/patches/re2c-Use-maximum-alignment.patch         \
+  %D%/packages/patches/readymedia-ffmpeg7.patch         \
   %D%/packages/patches/reduce-unbundle-libffi.patch             \
   %D%/packages/patches/remake-impure-dirs.patch			\
   %D%/packages/patches/restartd-update-robust.patch             \

gnu/packages/check.scm

@@ -2694,7 +2694,8 @@ based on the Haskell library, Quickcheck, and is designed to integrate
 seamlessly into your existing Python unit testing work flow.")
     (license license:mpl2.0)))
 
-(define-public python-hypothesis-next python-hypothesis)
+(define-deprecated/public-alias python-hypothesis-next
+  python-hypothesis)                   ;may be removed after 2025-12-01
 
 ;; WARNING: This package is a dependency of mesa.
 (define-public python-lit

gnu/packages/django.scm

@@ -139,6 +139,66 @@ a system that allows you to easily communicate between processes, and separate
 your project into different processes.")
     (license license:bsd-3)))
 
+(define-public python-crispy-bootstrap3
+  (package
+    (name "python-crispy-bootstrap3")
+    (version "2024.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/django-crispy-forms/crispy-bootstrap3")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ncf8hz3yf8h0asvyi1g54ds0glp46zfcr6sklhsynbqzmcqd463"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "PYTHONPATH" "."))))))
+    (propagated-inputs (list python-django python-django-crispy-forms))
+    (native-inputs (list python-pytest python-pytest-django python-setuptools))
+    (home-page "https://github.com/django-crispy-forms/crispy-bootstrap3")
+    (synopsis "Bootstrap3 template pack for django-crispy-forms")
+    (description
+     "This package provides a bootstrap3 template pack for
+@code{python-django-crispy-forms}.")
+    (license license:expat)))
+
+(define-public python-crispy-bootstrap4
+  (package
+    (name "python-crispy-bootstrap4")
+    (version "2025.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/django-crispy-forms/crispy-bootstrap4")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0kyyyrg39ckqw3pmsq67g5xzgmcd7xjgz7vpsr97gaai1frnsvnr"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "PYTHONPATH" "."))))))
+    (propagated-inputs (list python-django python-django-crispy-forms))
+    (native-inputs (list python-pytest python-pytest-django python-setuptools))
+    (home-page "https://github.com/django-crispy-forms/crispy-bootstrap4")
+    (synopsis "Bootstrap4 template pack for django-crispy-forms")
+    (description
+     "This package provides a bootstrap4 template pack for
+@code{python-django-crispy-forms}.")
+    (license license:expat)))
+
 (define-public python-django
   (package
     (name "python-django")
@@ -734,17 +794,27 @@ queries done via the Django ORM, SQLAlchemy generated queries are displayed.")
     (version "1.4.5")
     (source
      (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (pypi-uri "django-gravatar2" version))
+       (uri (git-reference
+             (url "https://github.com/twaddington/django-gravatar")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
+        (base32 "0brh1176gx758cimkz36g8v760a1hadxspqanp8kc59kvx50qvm0"))))
-         "0r03m1qkh56g92x136xdq8n92mj7gbi1fh0djarxhp9rbr35dfrd"))))
+    (build-system pyproject-build-system)
-    (build-system python-build-system)
     (arguments
-     '(;; TODO: The django project for the tests is missing from the release.
+     (list
-       #:tests? #f))
+      #:phases
-    (inputs
+      #~(modify-phases %standard-phases
-     (list python-django))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion "example_project"
+                  (invoke "python" "./manage.py" "test"
+                          "-k" "not test_has_gravatar"
+                          "django_gravatar"))))))))
+    (native-inputs (list python-setuptools))
+    (inputs (list python-django))
     (home-page "https://github.com/twaddington/django-gravatar")
     (synopsis "Gravatar support for Django, improved version")
     (description
@@ -947,20 +1017,27 @@ for Django sites.")
 (define-public python-django-contrib-comments
   (package
     (name "python-django-contrib-comments")
-    (version "1.9.2")
+    (version "2.2.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (pypi-uri "django-contrib-comments" version))
+       (method git-fetch)
-              (sha256
+       (uri (git-reference
-               (base32
+             (url "https://github.com/django/django-contrib-comments")
-                "0ccdiv784a5vnpfal36km4dyg12340rwhpr0riyy0k89wfnjn8yi"))))
+             (commit version)))
-    (build-system python-build-system)
+       (file-name (git-file-name name version))
-    (propagated-inputs
+       (sha256
-     (list python-django python-six))
+        (base32 "17mymw64bm5f19iq6dlpcbbycamy2a0wrnfzrbnw8diysc3fsnpr"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-backend #~'custom
+      #:test-flags #~(list "tests/runtests.py")))
+    (native-inputs (list python-setuptools tzdata-for-tests))
+    (propagated-inputs (list python-django))
     (home-page "https://github.com/django/django-contrib-comments")
     (synopsis "Comments framework")
     (description
-      "Django used to include a comments framework; since Django 1.6 it's been
+     "Django used to include a comments framework; since Django 1.6 it's been
 separated to a separate project.  This is that project.  This framework can be
 used to attach comments to any model, so you can use it for comments on blog
 entries, photos, book chapters, or anything else.")
@@ -1530,22 +1607,43 @@ a single block.")
 (define-public python-django-crispy-forms
   (package
     (name "python-django-crispy-forms")
-    (version "1.9.2")
+    (version "2.4")
     (source
      (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (pypi-uri "django-crispy-forms" version))
+       (uri (git-reference
+             (url "https://github.com/django-crispy-forms/django-crispy-forms")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
+        (base32 "1xrrcsv534p989hh1jgy4nk6sxay7g913z6zxwgpgnadzr9dfpk1"))))
-         "0fxlf233f49hjax786p4r650rd0ilvhnpyvw8hv1d1aqnkxy1wgj"))))
+    (build-system pyproject-build-system)
-    (build-system python-build-system)
     (arguments
-     '(;; No included tests
+     (list
-       #:tests? #f))
+      #:phases
-    (propagated-inputs
+      #~(modify-phases %standard-phases
-     (list python-django))
+          (add-before 'check 'pre-check
-    (home-page
+            (lambda _
-     "http://github.com/maraujop/django-crispy-forms")
+              (setenv "PYTHONPATH" "."))))))
+    (native-inputs
+     (append
+      ;; XXX: python-crispy-boostrap packages and this package have a
+      ;; circular dependency.  Get a bootstrap version for them.
+      (map (lambda (pkg)
+             (package/inherit pkg
+               (arguments
+                (list
+                 #:tests? #f
+                 #:phases
+                 #~(modify-phases %standard-phases
+                     (delete 'sanity-check))))
+               (propagated-inputs
+                (modify-inputs (package-propagated-inputs pkg)
+                  (delete "python-django-crispy-forms")))))
+           (list python-crispy-bootstrap3 python-crispy-bootstrap4))
+      (list python-pytest python-pytest-django python-setuptools)))
+    (propagated-inputs (list python-django))
+    (home-page "https://github.com/django-crispy-forms/django-crispy-forms")
     (synopsis "Tool to control Django forms without custom templates")
     (description
      "@code{django-crispy-forms} lets you easily build, customize and reuse
@@ -1660,27 +1758,27 @@ Amazon S3, Dropbox, local file storage or any Django storage.")
 (define-public python-django-override-storage
   (package
     (name "python-django-override-storage")
-    (version "0.3.0")
+    (version "0.3.2")
-    (home-page "https://github.com/danifus/django-override-storage")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url home-page)
+             (url "https://github.com/danifus/django-override-storage")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "081kzfk7mmybhihvc92d3hsdg0r2k20ydq88fs1fgd348sq1ax51"))))
+        (base32 "1zxfzawhcm1lnxl0d025z6ipgfarvqr2jyl4cg7680gs73m5ikw5"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
+     (list
-                  (replace 'check
+      #:phases
-                    (lambda _
+      #~(modify-phases %standard-phases
-                      (invoke "python" "runtests.py"))))))
+          (replace 'check
-    (native-inputs
+            (lambda _
-     (list python-mock))
+              (invoke "python" "runtests.py"))))))
-    (propagated-inputs
+    (native-inputs (list python-mock python-setuptools))
-     (list python-django))
+    (propagated-inputs (list python-django))
+    (home-page "https://github.com/danifus/django-override-storage")
     (synopsis "Django test helpers to manage file storage side effects")
     (description
      "This project provides tools to help reduce the side effects of using
@@ -1771,19 +1869,25 @@ backends in a single library.")
 (define-public python-django-logging-json
   (package
     (name "python-django-logging-json")
-    (version "1.15")
+    (version "1.16")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (pypi-uri "django-logging-json" version))
+       (method git-fetch)
-              (sha256
+       (uri (git-reference
-               (base32
+             (url "https://github.com/cipriantarta/django-logging")
-                "06041a8icazzp73kg93c7k1ska12wvkq7fpcad0l0sm1qnxx5yx7"))))
+             (commit version)))
-    (build-system python-build-system)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1big7mv0274wgbr06v2qlq61pzh7h2rcn0la212shnh5b4fvhg56"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:tests? #f                      ;no tests
+     (list
-       #:phases (modify-phases %standard-phases
+      #:tests? #f ;no tests
-                  ;; Importing this module requires a Django project.
+      #:phases
-                  (delete 'sanity-check))))
+      #~(modify-phases %standard-phases
+          ;; Importing this module requires a Django project.
+          (delete 'sanity-check))))
+    (native-inputs (list python-setuptools))
     (propagated-inputs
      (list python-certifi python-django python-elasticsearch python-six))
     (home-page "https://github.com/cipriantarta/django-logging")
@@ -1798,14 +1902,30 @@ to ElasticSearch.")
   (package
     (name "python-django-netfields")
     (version "1.3.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (pypi-uri "django-netfields" version))
+       (method git-fetch)
-              (sha256
+       (uri (git-reference
-               (base32
+             (url "https://github.com/jimfunk/django-postgresql-netfields")
-                "0q2s6b689hwql4qcw02m3zj2fwsx1w4ffhw81yvp71dq3dh46jg5"))))
+             (commit (string-append "v" version))))
-    (build-system python-build-system)
+       (file-name (git-file-name name version))
-    (arguments '(#:tests? #f))      ;XXX: Requires a running PostgreSQL server
+       (sha256
+        (base32 "176dmdlhd6bka4k6b4mlha3ags6mqf2qy3rxvpgnk9v5nncqm7l9"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f                   ;XXX: Requires a running PostgreSQL server
+      ;; XXX: Requires rest_framework.
+      #:test-flags
+      #~(list "--ignore=test/tests/test_rest_framework_fields.py")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'pre-check
+            (lambda _
+              (setenv "DJANGO_SETTINGS_MODULE" "testsettings")
+              (setenv "PYTHONPATH" "."))))))
+    (native-inputs
+     (list python-pytest python-pytest-django python-setuptools))
     (propagated-inputs
      (list python-django python-netaddr python-psycopg2 python-six))
     (home-page "https://github.com/jimfunk/django-postgresql-netfields")
@@ -1819,48 +1939,46 @@ to ElasticSearch.")
   (package
     (name "python-django-url-filter")
     (version "0.3.15")
-    (home-page "https://github.com/miki725/django-url-filter")
+    (source
-    (source (origin
+     (origin
-              (method git-fetch)
+       (method git-fetch)
-              (uri (git-reference (url home-page) (commit version)))
+       (uri (git-reference
-              (file-name (git-file-name name version))
+             (url "https://github.com/miki725/django-url-filter")
-              (sha256
+             (commit version)))
-               (base32
+       (file-name (git-file-name name version))
-                "0r4zhqhs8y6cnplwyvcb0zpijizw1ifnszs38n4w8138657f9026"))
+       (sha256
-              (modules '((guix build utils)))
+        (base32 "0r4zhqhs8y6cnplwyvcb0zpijizw1ifnszs38n4w8138657f9026"))))
-              (snippet
+    (build-system pyproject-build-system)
-               ;; Patch for Django 4.0 compatibility, taken from upstream pull
-               ;; request: https://github.com/miki725/django-url-filter/pull/103
-               '(substitute* "url_filter/validators.py"
-                  ((" ungettext_lazy")
-                   " ngettext_lazy")))))
-    (build-system python-build-system)
     (arguments
-     '(#:tests? #f            ;FIXME: Django raises "Apps aren't loaded yet"!?
+     (list
-       #:phases (modify-phases %standard-phases
+      #:tests? #f ;FIXME: Django raises "Apps aren't loaded yet"!?
-                  (add-after 'unpack 'loosen-requirements
+      #:test-flags #~(list "--doctest-modules" "tests/" "url_filter/")
-                    (lambda _
+      #:phases
-                      ;; Do not depend on compatibility package for old
+      #~(modify-phases %standard-phases
-                      ;; Python versions.
+          (add-after 'unpack 'loosen-requirements
-                      (substitute* "requirements.txt"
+            (lambda _
-                        (("enum-compat") ""))))
+              ;; Do not depend on compatibility package for old
-                  (replace 'check
+              ;; Python versions.
-                    (lambda* (#:key tests? #:allow-other-keys)
+              (substitute* "requirements.txt"
-                      (if tests?
+                (("enum-compat")
-                          (begin
+                 ""))
-                            (setenv "DJANGO_SETTINGS_MODULE"
+              ;; Patch for Django 4.0 compatibility, taken from upstream pull
-                                    "test_project.settings")
+              ;; request: https://github.com/miki725/django-url-filter/pull/103
-                            (invoke "pytest" "-vv" "--doctest-modules"
+              (substitute* "url_filter/validators.py"
-                                    "tests/" "url_filter/"))
+                ((" ungettext_lazy")
-                          (format #t "test suite not run~%")))))))
+                 " ngettext_lazy"))))
-    (propagated-inputs
+          (add-before 'check 'configure-tests
-     (list python-cached-property python-django python-six))
+            (lambda _
+              (setenv "DJANGO_SETTINGS_MODULE" "test_project.settings"))))))
+    (native-inputs (list python-mock python-pytest python-setuptools python-sqlalchemy))
+    (propagated-inputs (list python-cached-property python-django python-six))
+    (home-page "https://github.com/miki725/django-url-filter")
     (synopsis "Filter data via human-friendly URLs")
     (description
      "The main goal of Django URL Filter is to provide an easy URL interface
 for filtering data.  It allows the user to safely filter by model attributes
-and also specify the lookup type for each filter (very much like
+and also specify the lookup type for each filter (very much like Django's
-Django's filtering system in ORM).")
+filtering system in ORM).")
     (license license:expat)))
 
 (define-public python-django-svg-image-form-field
@@ -1876,7 +1994,9 @@ Django's filtering system in ORM).")
        (file-name (git-file-name name version))
        (sha256
         (base32 "131m545khn8l20j4x2bvlvz36dlbnhj9pc98i2dw72s3bw8pgws0"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments (list #:tests? #f))      ; No tests.
+    (native-inputs (list python-setuptools))
     (propagated-inputs
      (list python-defusedxml python-django python-pillow))
     (home-page "https://github.com/artrey/django-svg-image-form-field")

gnu/packages/easyrpg.scm

@@ -20,9 +20,12 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages easyrpg)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages compression)
@@ -116,3 +119,37 @@ data.")
     ;; and WAV audio loader and writer (public-domain):
     ;;   src/external/dr_wav.h
     (license license:gpl3+)))
+
+(define-public libretro-easyrpg
+  (let ((libretro-common
+         (origin
+           (method git-fetch)
+           (uri (git-reference
+                  (url "https://github.com/libretro/libretro-common")
+                  (commit "668749ae38a9e85744d1c15a652a1e8db8ab9e82")))
+           (file-name "libretro-common-checkout")
+           (sha256
+            (base32
+             "007hd1ys3ikyjx4zigkxl2h0172p7d9p9vj09739yqfkvxkwlbl2")))))
+    (package
+      (inherit easyrpg-player)
+      (name "libretro-easyrpg")
+      (source (origin
+                (inherit (package-source easyrpg-player))
+                (modules '((guix build utils)))
+                (snippet
+                 #~(begin
+                     (copy-recursively #$libretro-common
+                                       "builds/libretro/libretro-common")))))
+      (build-system cmake-build-system)
+      (arguments
+       (list #:tests? #f                ;no tests
+             #:configure-flags #~'("-DPLAYER_TARGET_PLATFORM=libretro")
+             #:phases
+             #~(modify-phases %standard-phases
+                 (replace 'install
+                   (lambda _
+                     (install-file
+                      "easyrpg_libretro.so"
+                      (string-append #$output "/lib/libretro/")))))))
+      (synopsis "Libretro core to play RPG Maker 2000 and 2003 games"))))

gnu/packages/electronics.scm

@@ -975,7 +975,7 @@ which allows one to install the M8 firmware on any Teensy.")
 (define-public nvc
   (package
     (name "nvc")
-    (version "1.17.2")
+    (version "1.18.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -984,7 +984,7 @@ which allows one to install the M8 firmware on any Teensy.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hr5y9ys5kf096x18mh10wwqa0hbzlmdj7pyayc6szsjla1d3mk0"))))
+                "1b8bsmxv2p9v8g7yzdj8s22l5bx9n58kmbklgnj17gd362lai51y"))))
     (build-system gnu-build-system)
     (arguments
      (list #:out-of-source? #t
@@ -1299,7 +1299,7 @@ GUI for sigrok.")
 (define-public osvvm
   (package
     (name "osvvm")
-    (version "2025.06")
+    (version "2025.06a")
     (source
      (origin
        (method git-fetch)
@@ -1311,7 +1311,7 @@ GUI for sigrok.")
               (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08mfh7pyrb26mp8wx3xjns79slb3yf1c78nf8y1awvxc1p8q1wq4"))))
+        (base32 "1dq56h51ydfpffd00qz9qkcg6sddlqixiixls9vvxczfkp9l21ws"))))
     (outputs
      '("out" "common" "scripts" "uart" "axi4"))
     (properties
@@ -1726,6 +1726,10 @@ to enforce it.")
     (build-system pyproject-build-system)
     (arguments
      (list
+      #:modules '((guix build pyproject-build-system)
+                  (guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-ghdl-jit
@@ -1751,14 +1755,27 @@ to enforce it.")
                  (string-append site-packages "osvvm")))))
           (add-after 'check 'run-examples
             ;; Run examples as an extra check.
-            (lambda* (#:key inputs outputs #:allow-other-keys)
+            (lambda* (#:key tests? #:allow-other-keys)
-              (with-directory-excursion "examples/vhdl"
+              (when tests?
-                (for-each
+                (with-directory-excursion "examples/vhdl"
-                 (lambda (dir)
+                  (for-each
-                   (invoke "python3" (string-append dir "/run.py")))
+                   (lambda (dir)
-                 (list
+                     (invoke "python3" (string-append dir "/run.py"))
-                  "array" "check" "composite_generics" "json4vhdl" "logging"
+                     (delete-file-recursively "vunit_out"))
-                  "logging" "uart" "vhdl_configuration"))))))
+                   (scandir "."
+                            (negate
+                             (cut member <>
+                                  '("coverage"  ;unsupported feature in nvc
+                                    "data_types"  ;no run.py
+                                    "docker_runall.sh"  ;not a test
+                                    "vivado" ;requires external tool
+                                    ;; Fails with nvc
+                                    "array_axis_vcs"
+                                    "osvvm_log_integration"
+                                    "run"
+                                    "third_party_integration"
+                                    "user_guide"
+                                    "." ".."))))))))))
       #:test-flags
       ;; Skip lint tests which require python-pycodestyle, python-pylint and
       ;; python-mypy to reduce closoure size; some lint test fails, see

gnu/packages/emacs-xyz.scm

@@ -5287,6 +5287,33 @@ customizability and asynchronous upgrading.")
 listing type errors via Flycheck, as well as REPL support for Carp.")
       (license license:asl2.0))))
 
+(define-public emacs-cond-let
+  (package
+    (name "emacs-cond-let")
+    (version "0.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/tarsius/cond-let/")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hsxl42dysbrkmgnbd954zjv28cms73r7nask5ip4f07qzgaj1gi"))))
+    (build-system emacs-build-system)
+    (arguments
+     (list
+      #:test-command
+      #~(list "emacs" "--batch"
+              "-l" "cond-let-tests.el"
+              "-f" "ert-run-tests-batch-and-exit")))
+    (home-page "https://github.com/tarsius/cond-let/")
+    (synopsis "Additional and improved binding conditionals")
+    (description "This package implements binding conditionals @code{and-let}
+and @code{while-let*}, and the original @code{cond-let}, @code{cond-let*},
+@code{and$} and @code{and>}.")
+    (license license:gpl3+)))
+
 (define-public emacs-coterm
   (package
     (name "emacs-coterm")
@@ -36132,7 +36159,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
 (define-public emacs-forge
   (package
     (name "emacs-forge")
-    (version "0.5.3")
+    (version "0.6.0")
     (source
      (origin
        (method git-fetch)
@@ -36141,28 +36168,30 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1vr7qrrcj2vdh5h3w43jzqym33ax58218jq3idjrr8wnlh7vdj18"))))
+        (base32 "17x7rvlnpdk6f0c96x0m3lgd89znzysqc9184m442w9p9swp93j1"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:tests? #f                     ;no tests
+     (list
-       #:lisp-directory "lisp"
+      #:tests? #f                     ;no tests
-       #:phases
+      #:lisp-directory "lisp"
-       (modify-phases %standard-phases
+      #:phases
-         (add-after 'unpack 'build-info-manual
+      #~(modify-phases %standard-phases
-           (lambda _
+          (add-after 'unpack 'build-info-manual
-             (with-directory-excursion ".."
+            (lambda _
-               (invoke "make" "info")
+              (with-directory-excursion ".."
-               ;; Move the info file to lisp so that it gets installed by the
+                (invoke "make" "info")
-               ;; emacs-build-system.
+                ;; Move the info file to lisp so that it gets installed by the
-               (rename-file "docs/forge.info" "lisp/forge.info")))))))
+                ;; emacs-build-system.
+                (rename-file "docs/forge.info" "lisp/forge.info")))))))
     (native-inputs
      (list texinfo))
     (propagated-inputs
      (list emacs-closql
+           emacs-compat
+           emacs-cond-let
            emacs-emacsql
            emacs-ghub
            emacs-llama
-           emacs-let-alist
            emacs-magit
            emacs-markdown-mode
            emacs-yaml))

gnu/packages/finance.scm

@@ -1617,7 +1617,7 @@ Luhn and family of ISO/IEC 7064 check digit algorithms.")
         (base32 "1ysh9b5lzg053hv4iw3zbn7hid05qssiwmrl8sir8qlk958r8x60"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-poetry-core-next
+     (list python-poetry-core
            python-pytest))
     (propagated-inputs
      (list python-base58

gnu/packages/image-processing.scm

@@ -816,7 +816,6 @@ the OpenCV-Python library.")
            libpng
            (librsvg-for-system)
            libtiff
-           libxml2
            libwebp
            matio
            openexr

gnu/packages/machine-learning.scm

@@ -4979,7 +4979,7 @@ in the audio domain.")
              python-xxhash))
       (native-inputs
        (list openssl
-             python-flit-core-next
+             python-flit-core
              python-pytest
              python-pytest-cov))
       (home-page "https://pyg.org")

gnu/packages/mp3.scm

@@ -656,14 +656,14 @@ command-line tool.")
 (define-public chromaprint
   (package
     (name "chromaprint")
-    (version "1.5.1")
+    (version "1.6.0")
     (source (origin
       (method url-fetch)
       (uri (string-append
             "https://github.com/acoustid/chromaprint/releases/download/v"
             version "/chromaprint-" version ".tar.gz"))
       (sha256
-       (base32 "072y6c7ijkm6r674f6z089rbdazrmxzpdcsm6y6vf64b7gxdiam1"))))
+       (base32 "1nj0rfr3vf926802jgd6p3il7yirc4vjqx6nl0vrlf51aqp4hcwx"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; tests require googletest *sources*
@@ -672,7 +672,7 @@ command-line tool.")
     (inputs
      ;; requires one of FFmpeg (prefered), FFTW3 or vDSP
      ;; use the same ffmpeg version as for acoustid-fingerprinter
-     (list ffmpeg-4 boost))
+     (list ffmpeg boost))
     (home-page "https://acoustid.org/chromaprint")
     (synopsis "Audio fingerprinting library")
     (description "Chromaprint is a library for calculating audio

gnu/packages/music.scm

@@ -4052,7 +4052,7 @@ event-based scripts for scrobbling, notifications, etc.")
      (list gettext-minimal python-dateutil))
     (inputs
      (list chromaprint
-           python-charset-normalizer-3
+           python-charset-normalizer
            python-discid
            python-pyqt
            python-mutagen

gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch

@@ -1,38 +0,0 @@
-This patch was borrowed from Debian's package:
-https://salsa.debian.org/debian-astro-team/aoflagger/-/blob/0484ef75a663e3e07738550cdade46f433a53dac/debian/patches/Use-system-provided-pybind11.patch
-Description: Use system provided pybind11
-Author: Ole Streicher <olebole@debian.org>
-Origin: Debian
-Last-Update: Mon, 30 Aug 2021 11:05:37 +0200
----
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 655ea5e..824ee2a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,11 +62,6 @@ foreach(ExternalSubmodule IN LISTS ExternalSubmoduleDirectories)
-   endif()
- endforeach()
- 
--# Include aocommon/pybind11 headers
--include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include")
--add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11")
--include_directories(SYSTEM ${pybind11_INCLUDE_DIR})
--
- find_package(
-   HDF5
-   COMPONENTS C CXX
-@@ -101,6 +96,11 @@ find_package(PythonInterp REQUIRED)
- message(STATUS "Using python version ${PYTHON_VERSION_STRING}")
- include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS})
- 
-+# Include pybind11 headers
-+find_package(pybind11 REQUIRED)
-+include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include")
-+include_directories(${pybind11_INCLUDE_DIR})
-+
- # boost::alignment requires Boost 1.56
- find_package(Boost 1.56.0 REQUIRED COMPONENTS date_time filesystem system
-                                               unit_test_framework)

gnu/packages/patches/python-scipy-i686.patch

@@ -0,0 +1,49 @@
+From https://github.com/scipy/scipy/pull/20135
+
+From 53796772ed735c1564863fc7ca8d902acb628167 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers <ralf.gommers@gmail.com>
+Date: Thu, 22 Feb 2024 09:10:46 +0100
+Subject: [PATCH] MAINT: interpolate: define `F_INT` as `int` rather than
+ `npy_int32`
+
+This fixes an incompatible pointer issue that shows up as a warning in
+Windows CI jobs, and is reported to break the build with GCC 14 on
+Fedora 40 in gh-19993.
+
+Using `#define F_INT int` is done in several other submodules; this
+was the only instance of using `npy_int32`.
+
+Closes gh-19993
+---
+ scipy/interpolate/src/_fitpackmodule.c | 4 ++--
+ scipy/interpolate/src/fitpack.pyf      | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scipy/interpolate/src/_fitpackmodule.c b/scipy/interpolate/src/_fitpackmodule.c
+index 0e913d1c7e43..dc79b2b28833 100644
+--- a/scipy/interpolate/src/_fitpackmodule.c
++++ b/scipy/interpolate/src/_fitpackmodule.c
+@@ -28,8 +28,8 @@ static PyObject *fitpack_error;
+ 
+ #else
+ 
+-#define F_INT npy_int32
+-#define F_INT_NPY NPY_INT32
++#define F_INT int
++#define F_INT_NPY NPY_INT
+ #define F_INT_MAX NPY_MAX_INT32
+ #if NPY_BITSOF_SHORT == 32
+ #define F_INT_PYFMT   "h"
+diff --git a/scipy/interpolate/src/fitpack.pyf b/scipy/interpolate/src/fitpack.pyf
+index 08cb0c141c98..a9535a83f479 100644
+--- a/scipy/interpolate/src/fitpack.pyf
++++ b/scipy/interpolate/src/fitpack.pyf
+@@ -16,7 +16,7 @@ python module dfitpack ! in
+ #ifdef HAVE_ILP64
+ typedef npy_int64 F_INT;
+ #else
+-typedef npy_int32 F_INT;
++typedef int F_INT;
+ #endif
+ 
+ static double dmax(double* seq, F_INT len) {

gnu/packages/patches/readymedia-ffmpeg7.patch

@@ -0,0 +1,15 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/minidlna/-/raw/affcf0dd1e6f8e33d0ba90b2b0733736fa1aeb71/ffmpeg7.patch
+
+diff --git a/libav.h b/libav.h
+index b69752c..aed9d18 100644
+--- a/libav.h
++++ b/libav.h
+@@ -174,7 +174,7 @@ lav_get_interlaced(AVStream *s)
+ #define lav_codec_tag(s) s->codecpar->codec_tag
+ #define lav_sample_rate(s) s->codecpar->sample_rate
+ #define lav_bit_rate(s) s->codecpar->bit_rate
+-#define lav_channels(s) s->codecpar->channels
++#define lav_channels(s) s->codecpar->ch_layout.nb_channels
+ #define lav_width(s) s->codecpar->width
+ #define lav_height(s) s->codecpar->height
+ #define lav_profile(s) s->codecpar->profile

gnu/packages/pdf.scm

@@ -1484,7 +1484,7 @@ converter using the Poppler and Cairo libraries.")
                     " and not "))))
     (native-inputs
      (list python-flit
-           python-flit-core-next
+           python-flit-core
            python-pytest
            python-pytest-socket
            python-pytest-timeout

gnu/packages/python-build.scm

@@ -36,6 +36,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system pyproject)
   #:use-module (guix gexp)
+  #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix packages))
@@ -237,7 +238,8 @@ Included are implementations of:
 @end enumerate\n")
     (license license:psfl)))
 
-(define-public python-typing-extensions-next python-typing-extensions)
+(define-deprecated/public-alias python-typing-extensions-next
+  python-typing-extensions)            ;may be removed after 2025-12-01
 
 
 ;;;
@@ -349,7 +351,8 @@ facilitate packaging Python projects, where packaging includes:
     (native-inputs
      (list python-wheel-0.40))))
 
-(define-public python-setuptools-next python-setuptools)
+(define-deprecated/public-alias python-setuptools-next
+  python-setuptools)                   ;may be removed after 2025-12-01
 
 (define-public python-wheel
   (package
@@ -560,7 +563,8 @@ a light weight, fully compliant, self-contained package allowing PEP 517
 compatible build front-ends to build Poetry managed projects.")
     (license license:expat)))
 
-(define-public python-poetry-core-next python-poetry-core)
+(define-deprecated/public-alias python-poetry-core-next
+  python-poetry-core)                  ;may be removed after 2025-12-01
 
 ;;; This package exists to bootstrap python-tomli.
 (define-public python-flit-core-bootstrap
@@ -614,7 +618,8 @@ specified by PEP 517, @code{flit_core.buildapi}.")
        (delete "python-toml")
        (prepend python-tomli)))))
 
-(define-public python-flit-core-next python-flit-core)
+(define-deprecated/public-alias python-flit-core-next
+  python-flit-core)                    ;may be removed after 2025-12-01
 
 (define-public python-flit-scm
   (package
@@ -682,7 +687,8 @@ system, then @code{flit_core} to build the package.")
 them as the version argument or in a SCM managed file.")
     (license license:expat)))
 
-(define-public python-setuptools-scm-next python-setuptools-scm)
+(define-deprecated/public-alias python-setuptools-scm-next
+  python-setuptools-scm)               ;may be removed after 2025-12-01
 
 (define-public python-editables
   (package

gnu/packages/python-check.scm

@@ -1834,6 +1834,31 @@ data arrays produced during tests, in particular in cases where the arrays
 are too large to conveniently hard-code them in the tests.")
     (license license:bsd-3)))
 
+(define-public python-pytest-asdf-plugin
+  (package
+    (name "python-pytest-asdf-plugin")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest_asdf_plugin" version))
+       (sha256
+        (base32 "0bcfl1s7yrnr2rlpr3hswcg9jyq6gnj0ppmpzppw9xgj796ycfb5"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:tests? #f         ;to avoid import astronomy module
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'sanity-check))))
+    (native-inputs
+     (list python-setuptools-next
+           python-setuptools-scm-next))
+    (home-page "https://github.com/asdf-format/pytest-asdf-plugin")
+    (synopsis "Pytest plugin for testing ASDF schemas")
+    (description
+     "This package provides a Pytest plugin for testing ASDF schemas.")
+    (license license:bsd-3)))
+
 (define-public python-pytest-astropy
   (package
     (name "python-pytest-astropy")
@@ -3758,7 +3783,7 @@ possibly work.")
     (native-inputs
      (list python-ddt
            python-iso8601
-           python-flit-core-next ;requires >=3.12
+           python-flit-core
            python-setuptools))
     (propagated-inputs
      (list python-cliff-bootstrap

gnu/packages/python-crypto.scm

@@ -627,7 +627,7 @@ OpenSSL library.")
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests? (invoke "python" "test_ed25519_kat.py")))))))
-    (native-inputs (list python-setuptools-next))
+    (native-inputs (list python-setuptools))
     (home-page "https://github.com/warner/python-ed25519")
     (synopsis "Ed25519 public-key signatures")
     (description

gnu/packages/python-science.scm

@@ -3108,6 +3108,15 @@ cross-validation.")
      (list
       #:phases
       #~(modify-phases %standard-phases
+          #$@(if (target-x86-32?)
+                 #~((add-after 'unpack 'apply-i686-patch
+                      (lambda _
+                        (let ((patch-file
+                               #$(local-file
+                                  (search-patch "python-scipy-i686.patch"))))
+                          (invoke "patch" "--force" "-p1" "-i"
+                                  patch-file)))))
+                 #~())
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?

gnu/packages/python-web.scm

@@ -80,6 +80,7 @@
 ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
 ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2025 Hugo Buddelmeijer <hugo@buddelmeijer.nl>
+;;; Copyright © 2025 Artur Wroblewski <wrobell@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -102,6 +103,7 @@
   #:use-module (guix build-system copy)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
+  #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
@@ -250,7 +252,7 @@ SNS, Gotify, etc.")
 (define-public python-blacksheep
   (package
     (name "python-blacksheep")
-    (version "2.4.0")
+    (version "2.4.1")
     (source
      (origin
        (method git-fetch)
@@ -259,20 +261,16 @@ SNS, Gotify, etc.")
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1iwlj6vl0rnvddbn9zsdgpya88z0lifr86wz3ci1d67li7w5bjiq"))))
+        (base32 "0znkqj4cipdr1qdsdlbb48b82cpvj24dqiwi0nyiy50b8nd7g5np"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 1443 passed, 3 skipped
+      ;; tests: 1609 passed, 3 skipped
       ;;
-      ;; 1. Ignore integration tests.
+      ;; Run all unit tests, but do not run integration tests from `itests`
-      ;; 2. Client tests use test fixture no longer available in
+      ;; directory.
-      ;; pytest-asyncio,
-      ;;
-      ;; See: <https://github.com/Neoteroi/BlackSheep/issues/596>.
       #:test-flags
-      #~(list "--ignore=itests"
+      #~(list "tests")
-              "--ignore=tests/client")
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'build 'cythonize
@@ -282,7 +280,8 @@ SNS, Gotify, etc.")
                             (invoke "cython" "-3" file "-I" "."))
                           (find-files "." ".*\\.pyx$"))))))))
     (native-inputs
-     (list python-cython
+     (list nss-certs-for-test
+           python-cython
            python-flask
            python-jinja2
            python-pydantic
@@ -292,7 +291,6 @@ SNS, Gotify, etc.")
            python-setuptools))
     (propagated-inputs
      (list python-certifi
-           python-dateutil
            python-essentials-openapi
            python-guardpost
            python-itsdangerous))
@@ -5603,7 +5601,8 @@ APIs.")
 than Python’s urllib2 library.")
     (license license:asl2.0)))
 
-(define-public python-requests-next python-requests)
+(define-deprecated/public-alias python-requests-next
+  python-requests)                     ;may be removed after 2025-12-01
 
 (define-public python-requests-kerberos
   (package
@@ -6024,7 +6023,8 @@ can reuse the same socket connection for multiple requests, it can POST files,
 supports url redirection and retries, and also gzip and deflate decoding.")
     (license license:expat)))
 
-(define-public python-urllib3-next python-urllib3)
+(define-deprecated/public-alias python-urllib3-next
+  python-urllib3)                      ;may be removed after 2025-12-01
 
 (define-public python-urllib3-1.25
   (package
@@ -8619,7 +8619,7 @@ for HTTP/2 is planned.")
      (list python-pytest
            python-setuptools))
     (propagated-inputs
-     (list python-charset-normalizer-3
+     (list python-charset-normalizer
            python-ruamel.yaml
            python-weblate-language-data))
     (home-page "https://weblate.org/")

gnu/packages/python-xyz.scm

@@ -411,7 +411,7 @@ APIs to detect, query, and compare them.")
                 (("from click") "from asyncclick")))))))
     (native-inputs
      (list python-anyio
-           python-flit-core-next
+           python-flit-core
            python-pytest
            python-trio))
     (home-page "https://github.com/python-trio/asyncclick")
@@ -19853,7 +19853,8 @@ taking a new approach.  All IANA character set names for which the Python core
 library provides codecs are supported.")
     (license license:expat)))
 
-(define-public python-charset-normalizer-3 python-charset-normalizer)
+(define-deprecated/public-alias python-charset-normalizer-3
+  python-charset-normalizer)           ;may be removed after 2025-12-01
 
 (define-public python-docopt
   (package

gnu/packages/qt.scm

@@ -4372,9 +4372,9 @@ Python.")
     (arguments
      (list #:tests? #f))        ; No test system found.
     (native-inputs
-     (list python-setuptools-next python-setuptools-scm-next python-wheel))
+     (list python-setuptools python-setuptools-scm python-wheel))
     (propagated-inputs
-     (list python-packaging python-setuptools-next python-tomli))
+     (list python-packaging python-setuptools python-tomli))
     (home-page "https://www.riverbankcomputing.com/software/sip/intro")
     (synopsis "Python binding creator for C and C++ libraries")
     (description
@@ -4724,8 +4724,8 @@ set of three modules.")))
         (base32
          "1g40j5iyad8bw8113rsxxkbkdi7g1lcjj0lb1j7pma442i3fmpsn"))))
     (build-system pyproject-build-system)
-    (native-inputs (list python-setuptools-next
+    (native-inputs (list python-setuptools
-                         python-setuptools-scm-next
+                         python-setuptools-scm
                          python-wheel))
     (inputs
      (list python-sip))

gnu/packages/textutils.scm

@@ -1317,7 +1317,7 @@ OpenDocument presentations (*.odp).")
            python-pytest
            python-pytest-asyncio
            python-pytest-textual-snapshot
-           python-setuptools-next))
+           python-setuptools))
     (propagated-inputs
      (list python-beautifulsoup4
            python-bibtexparser

gnu/packages/upnp.scm

@@ -148,7 +148,8 @@ and others.")
                       "v" (string-replace-substring version "." "_")))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2"))))
+        (base32 "1al04jx72bxwqch1nv9lx536mb6pvj7pgnqzy6lm32q6xa114yr2"))
+       (patches (search-patches "readymedia-ffmpeg7.patch"))))
     (build-system gnu-build-system)
     (arguments
      (list

gnu/packages/video.scm

@@ -1902,7 +1902,7 @@ audio/video codec library.")
 
 (define-public ffmpeg-5
   (package
-    (inherit ffmpeg)
+    (inherit ffmpeg-6)
     (version "5.1.6")
     (source (origin
               (method url-fetch)
@@ -1912,7 +1912,7 @@ audio/video codec library.")
                (base32
                 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg)
+     (substitute-keyword-arguments (package-arguments ffmpeg-6)
        ((#:modules modules %default-gnu-modules)
         `((srfi srfi-1) ,@modules))
        ((#:phases phases)
@@ -1926,7 +1926,7 @@ audio/video codec library.")
             phases))
        ((#:configure-flags flags ''())
         #~(fold delete #$flags '("--enable-libplacebo")))))
-    (inputs (modify-inputs (package-inputs ffmpeg)
+    (inputs (modify-inputs (package-inputs ffmpeg-6)
               (delete "libplacebo")))))
 
 (define-public ffmpeg-4
@@ -1940,8 +1940,6 @@ audio/video codec library.")
              (sha256
               (base32
                "05q6bpid5hfr9djp6cf3sq8majkjiqnl3v9i2y0an23w8qgld412"))))
-    (inputs (modify-inputs (package-inputs ffmpeg-5)
-              (replace "sdl2" sdl2-2.0)))
     (arguments
      (substitute-keyword-arguments (package-arguments ffmpeg-5)
        ((#:configure-flags flags ''())

gnu/services/admin.scm

@@ -57,26 +57,6 @@
             log-rotation-configuration-size-threshold
             log-rotation-service-type
 
-            %default-rotations
-            %rotated-files
-
-            log-rotation
-            log-rotation?
-            log-rotation-frequency
-            log-rotation-files
-            log-rotation-options
-            log-rotation-post-rotate
-            %default-log-rotation-options
-
-            rottlog-configuration
-            rottlog-configuration?
-            rottlog-configuration-rottlog
-            rottlog-configuration-rc-file
-            rottlog-configuration-rotations
-            rottlog-configuration-jobs
-            rottlog-service
-            rottlog-service-type
-
             log-cleanup-service-type
             log-cleanup-configuration
             log-cleanup-configuration?
@@ -218,149 +198,6 @@ log-rotation} to list files subject to log rotation.")
                        log-files)))))
    (default-value (log-rotation-configuration))))
 
-
-;;;
-;;; Rottlog + mcron.
-;;;
-
-(define-record-type* <log-rotation> log-rotation make-log-rotation
-  log-rotation?
-  (files       log-rotation-files)                ;list of strings
-  (frequency   log-rotation-frequency             ;symbol
-               (default 'weekly))
-  (post-rotate log-rotation-post-rotate           ;#f | gexp
-               (default #f))
-  (options     log-rotation-options               ;list of strings
-               (default %default-log-rotation-options)))
-
-(define %default-log-rotation-options
-  ;; Default log rotation options: append ".gz" to file names.
-  '("storefile @FILENAME.@COMP_EXT"
-    "notifempty"))
-
-(define %rotated-files
-  ;; Syslog files subject to rotation.
-  '("/var/log/messages" "/var/log/secure" "/var/log/debug"
-    "/var/log/maillog" "/var/log/mcron.log"))
-
-(define %default-rotations
-  (list (log-rotation                             ;syslog files
-         (files %rotated-files)
-
-         (frequency 'weekly)
-         (options `(;; These files are worth keeping for a few weeks.
-                    "rotate 16"
-                    ;; Run post-rotate once per rotation
-                    "sharedscripts"
-
-                    ,@%default-log-rotation-options))
-         ;; Restart syslogd after rotation.
-         (post-rotate #~(let ((pid (call-with-input-file "/var/run/syslog.pid"
-                                     read)))
-                          (kill pid SIGHUP))))
-        (log-rotation
-         (files '("/var/log/guix-daemon.log"))
-         (options `("rotate 4"                    ;don't keep too many of them
-                    ,@%default-log-rotation-options)))))
-
-(define (log-rotation->config rotation)
-  "Return a string-valued gexp representing the rottlog configuration snippet
-for ROTATION."
-  (define post-rotate
-    (let ((post (log-rotation-post-rotate rotation)))
-      (and post
-           (program-file "rottlog-post-rotate.scm" post))))
-
-  #~(let ((post #$post-rotate))
-      (string-append (string-join '#$(log-rotation-files rotation) ",")
-                     " {"
-                     #$(string-join (log-rotation-options rotation)
-                                    "\n  " 'prefix)
-                     (if post
-                         (string-append "\n  postrotate\n    " post
-                                        "\n  endscript\n")
-                         "")
-                     "\n}\n")))
-
-(define (log-rotations->/etc-entries rotations)
-  "Return the list of /etc entries for ROTATIONS, a list of <log-rotation>."
-  (define (frequency-file frequency rotations)
-    (computed-file (string-append "rottlog." (symbol->string frequency))
-                   #~(call-with-output-file #$output
-                       (lambda (port)
-                         (for-each (lambda (str)
-                                     (display str port))
-                                   (list #$@(map log-rotation->config
-                                                 rotations)))))))
-
-  (let* ((frequencies (delete-duplicates
-                       (map log-rotation-frequency rotations)))
-         (table       (fold (lambda (rotation table)
-                              (vhash-consq (log-rotation-frequency rotation)
-                                           rotation table))
-                            vlist-null
-                            rotations)))
-    (map (lambda (frequency)
-           `(,(symbol->string frequency)
-             ,(frequency-file frequency
-                              (vhash-foldq* cons '() frequency table))))
-         frequencies)))
-
-(define (default-jobs rottlog)
-  (list #~(job '(next-hour '(0))                  ;midnight
-               #$(file-append rottlog "/sbin/rottlog"))
-        #~(job '(next-hour '(12))                 ;noon
-               #$(file-append rottlog "/sbin/rottlog"))))
-
-(define-record-type* <rottlog-configuration>
-  rottlog-configuration make-rottlog-configuration
-  rottlog-configuration?
-  (rottlog            rottlog-configuration-rottlog             ;file-like
-                      (default rottlog))
-  (rc-file            rottlog-configuration-rc-file             ;file-like
-                      (default (file-append rottlog "/etc/rc")))
-  (rotations          rottlog-configuration-rotations           ;list of <log-rotation>
-                      (default %default-rotations))
-  (jobs               rottlog-configuration-jobs                ;list of <mcron-job>
-                      (default #f)))
-
-(define (rottlog-etc config)
-  `(("rottlog"
-     ,(file-union "rottlog"
-                  (cons `("rc" ,(rottlog-configuration-rc-file config))
-                        (log-rotations->/etc-entries
-                         (rottlog-configuration-rotations config)))))))
-
-(define (rottlog-jobs-or-default config)
-  (or (rottlog-configuration-jobs config)
-      (default-jobs (rottlog-configuration-rottlog config))))
-
-;; TODO: Deprecated; remove sometime after 2025-06-15.
-(define-deprecated rottlog-service-type
-  log-rotation-service-type
-  (service-type
-   (name 'rottlog)
-   (description
-    "Periodically rotate log files using GNU@tie{}Rottlog and GNU@tie{}mcron.
-Old log files are removed or compressed according to the configuration.
-
-This service is deprecated and slated for removal after 2025-06-15.")
-   (extensions (list (service-extension etc-service-type rottlog-etc)
-                     (service-extension mcron-service-type
-                                        rottlog-jobs-or-default)
-
-                     ;; Add Rottlog to the global profile so users can access
-                     ;; the documentation.
-                     (service-extension profile-service-type
-                                        (compose list rottlog-configuration-rottlog))))
-   (compose concatenate)
-   (extend (lambda (config rotations)
-             (rottlog-configuration
-              (inherit config)
-              (rotations (append (rottlog-configuration-rotations config)
-                                 rotations)))))
-   (default-value (rottlog-configuration))))
-
 
 ;;;
 ;;; Build log removal.