From 82af94db4c991933cf68816dc3f16bcbf1ba0a77 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:09:21 +0200
Subject: [PATCH] python311Packages.pbr: 6.0.0 -> 6.1.0

https://github.com/openstack/pbr/compare/6.0.0...6.1.0
---
 pkgs/development/python-modules/pbr/default.nix | 14 ++++++++++----
 pkgs/development/python-modules/pbr/tests.nix   |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 1c215cb307ca1..bd45d03af8928 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -1,22 +1,28 @@
 {
   lib,
   buildPythonPackage,
+  callPackage,
   fetchPypi,
   setuptools,
-  callPackage,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0TdxIqWgDi+UDuSCmZUY7+FtdF1COmcMJ3c9+8PJp9k=";
+    hash = "sha256-eIGD44Lj0ddwfbCJeCOZZei55OXtQmab9HWBhnNNXyQ=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
+
+  dependencies = [
+    setuptools # for pkg_resources
+    six
+  ];
 
   # check in passthru.tests.pytest to escape infinite recursion with fixtures
   doCheck = false;
diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix
index 70e768814db95..c464983fa31a9 100644
--- a/pkgs/development/python-modules/pbr/tests.nix
+++ b/pkgs/development/python-modules/pbr/tests.nix
@@ -46,6 +46,9 @@ buildPythonPackage {
     pbr.tests.test_core.TestCore.test_console_script_install
     pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument
     pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run
+    # Tests are failing because of fixture timeouts
+    pbr.tests.test_packaging.TestPEP517Support.test_pep_517_support
+    pbr.tests.test_packaging.TestRequirementParsing.test_requirement_parsing
     ")
   '';
 }