From a6346d9f5e0d4ea63617c9af20138fe7431604de Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 10:42:34 +0100
Subject: [PATCH 1/4] python312Packages.oslo-log: fix build in darwin sandbox

---
 pkgs/development/python-modules/oslo-log/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 81a9bd5b8e4b..8e3c1514d733 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -56,6 +56,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "oslo_log" ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "oslo.log library";
     mainProgram = "convert-json";

From eeed703362e911be95ece32a568a16e88eaf1ecd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 10:42:53 +0100
Subject: [PATCH 2/4] python312Packages.oslo-log: misc cleaning

---
 .../python-modules/oslo-log/default.nix       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 8e3c1514d733..196f66bf3cbd 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -3,18 +3,23 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  eventlet,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   oslo-config,
   oslo-context,
   oslo-serialization,
   oslo-utils,
-  oslotest,
   pbr,
-  pyinotify,
   python-dateutil,
+  pyinotify,
+
+  # tests
+  eventlet,
+  oslotest,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -22,8 +27,6 @@ buildPythonPackage rec {
   version = "6.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "oslo.log";
     inherit version;
@@ -58,11 +61,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "oslo.log library";
     mainProgram = "convert-json";
     homepage = "https://github.com/openstack/oslo.log";
-    license = licenses.asl20;
-    maintainers = teams.openstack.members;
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.openstack.members;
   };
 }

From 3c9fb90e4575b154217175afee35d6c166dcecb5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 10:45:22 +0100
Subject: [PATCH 3/4] python312Packages.oslo-log: switch to fetchFromGitHub

---
 .../python-modules/oslo-log/default.nix           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 196f66bf3cbd..4ea8636bf14d 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   setuptools,
@@ -27,12 +27,17 @@ buildPythonPackage rec {
   version = "6.1.2";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "oslo.log";
-    inherit version;
-    hash = "sha256-92gEffnXBsSE3WZl3LvqKJAh1Iy3zlq/eh9poJSR9f4=";
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "oslo.log";
+    rev = "refs/tags/${version}";
+    hash = "sha256-uNY+t3mv56F5wZOCWnOpZz8IWVR3+/kWGwu61AIbXbQ=";
   };
 
+  # Manually set version because prb wants to get it from the git upstream repository (and we are
+  # installing from tarball instead)
+  PBR_VERSION = version;
+
   build-system = [ setuptools ];
 
   dependencies = [

From 45d4837c7a8e2e89a1abdb98b6c2f0e11c4e0b58 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 10:46:57 +0100
Subject: [PATCH 4/4] python312Packages.oslo-log: 6.1.2 -> 6.2.0

Diff: https://github.com/openstack/oslo.log/compare/refs/tags/6.1.2...6.2.0
---
 pkgs/development/python-modules/oslo-log/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 4ea8636bf14d..342cf229365e 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "oslo-log";
-  version = "6.1.2";
+  version = "6.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "oslo.log";
     rev = "refs/tags/${version}";
-    hash = "sha256-uNY+t3mv56F5wZOCWnOpZz8IWVR3+/kWGwu61AIbXbQ=";
+    hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs=";
   };
 
   # Manually set version because prb wants to get it from the git upstream repository (and we are