From 076630e24a01d319f794909988847f925288c66e Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 22 Nov 2025 19:40:47 +0000
Subject: [PATCH] gnu: Deprecate python-pbr-next by python-pbr.

* gnu/packages/python-xyz.scm (python-pbr-next): Deprecate variable.

* gnu/packages/openstack.scm (python-os-service-types)
(python-os-service-types-bootstrap, python-oslo-log)[native-inputs]:
Remove python-pbr-next; add python-pbr.

Change-Id: I2a3deab358cada0f793e2b84697fca8fbc15be44
---
 gnu/packages/openstack.scm  |  6 +++---
 gnu/packages/python-xyz.scm | 12 ++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 99d3431af95eaca3fc07f66988017e07db11060f..8a5b0d62cccab37b00d863b29368a8318c35ee9c 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -230,7 +230,7 @@ to docs.openstack.org and developer.openstack.org.")
     (native-inputs
      (list python-keystoneauth1
            python-oslotest
-           python-pbr-next
+           python-pbr
            python-requests-mock
            python-setuptools
            python-stestr
@@ -257,7 +257,7 @@ is for some reason not possible and local caching of the fetched data.")
          #~(modify-phases #$phases
              (delete 'sanity-check)))))
      (native-inputs
-      (list python-pbr-next python-setuptools python-wheel)))))
+      (list python-pbr python-setuptools python-wheel)))))
 
 (define-public python-os-testr
   (let ((commit "0ba674d8c5d34890698e4e8ff9f71b24c389e109")
@@ -723,7 +723,7 @@ in an application or library.")
          python-eventlet
          python-fixtures
          python-oslotest-bootstrap
-         python-pbr-next
+         python-pbr
          python-setuptools
          python-stestr
          python-testtools
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d209bfe46f60f84bcce3f6c9d7031ed6eacbacad..3187fc868b7397b948f52933ebf8a96b7e048381 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7539,16 +7539,8 @@ versions, process requirements files and generate AUTHORS and ChangeLog file
 from git information.")
     (license license:asl2.0)))
 
-(define-public python-pbr-next
-  (hidden-package
-   (package/inherit python-pbr
-     (version "6.1.1")
-     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pbr" version))
-        (sha256
-         (base32 "0szp9dy7ksvpqddfzzca2a4assag8whmgxyhk7njxsw9d7775slk")))))))
+;; It may be removed after 2025-12-22.
+(define-deprecated/public-alias python-pbr-next python-pbr)
 
 (define-public python-pyrsistent
   (package