From 476f3f27883c526e919d6b7a3cc7b0fd20b09896 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jun 2023 08:34:10 +0200
Subject: [PATCH 1/2] python311Packages.loguru: unstable-2023-01-20 -> 0.7.0

Diff: Delgan/loguru@07f94f3...0.7.0

Changelog: https://github.com/Delgan/loguru/releases/tag/0.7.0
---
 .../python-modules/loguru/default.nix          | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index f89741e527af..28e6a9d172d8 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, aiocontextvars
 , buildPythonPackage
 , colorama
 , fetchpatch
@@ -13,24 +12,18 @@
 
 buildPythonPackage rec {
   pname = "loguru";
-  # No release since Jan 2022, only master is compatible with Python 3.11
-  # https://github.com/Delgan/loguru/issues/740
-  version = "unstable-2023-01-20";
+  version = "0.7.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.5";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Delgan";
     repo = pname;
-    rev = "07f94f3c8373733119f85aa8b9ca05ace3325a4b";
-    hash = "sha256-lMGyQbBX3z6186ojs/iew7JMrG91ivPA679T9r+7xYw=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-JwhJPX58KrPdX237L43o77spycLAVFv3K9njJiRK30Y=";
   };
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
-    aiocontextvars
-  ];
-
   nativeCheckInputs = [
     pytestCheckHook
     colorama
@@ -54,8 +47,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/Delgan/loguru";
     description = "Python logging made (stupidly) simple";
+    homepage = "https://github.com/Delgan/loguru";
+    changelog = "https://github.com/delgan/loguru/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum rmcgibbo ];
   };

From b333c3f133cc275e85f8ab3fafe4223e00765b15 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 16 Jun 2023 10:58:17 +0200
Subject: [PATCH 2/2] python311Packages.ciscoconfparse: relax loguru constraint

---
 .../development/python-modules/ciscoconfparse/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix
index 83035774d05a..edf15661dfec 100644
--- a/pkgs/development/python-modules/ciscoconfparse/default.nix
+++ b/pkgs/development/python-modules/ciscoconfparse/default.nix
@@ -1,13 +1,14 @@
 { lib
 , buildPythonPackage
-, dnspython
 , deprecat
+, dnspython
 , fetchFromGitHub
 , loguru
 , passlib
 , poetry-core
 , pytestCheckHook
 , pythonOlder
+, pythonRelaxDepsHook
 , toml
 }:
 
@@ -25,12 +26,17 @@ buildPythonPackage rec {
     hash = "sha256-vL/CQdYcOP356EyRToviWylP1EBtxmeov6qkhfQNZ2Y=";
   };
 
+  pythonRelaxDeps = [
+    "loguru"
+  ];
+
   postPatch = ''
     patchShebangs tests
   '';
 
   nativeBuildInputs = [
     poetry-core
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = [