From 17c37b2c4452ca349ab1f19b4b5798892ced2fd3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 14:05:41 +0200
Subject: [PATCH] python311Packages.logbook: 1.5.3 -> 1.6.0

Changelog: https://github.com/getlogbook/logbook/blob/1.6.0/CHANGES
---
 .../python-modules/logbook/default.nix        | 77 +++++++++++++++----
 1 file changed, 60 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix
index f21bf3e1ce25..d8251a40099f 100644
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@@ -1,31 +1,69 @@
 { lib
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-, pytestCheckHook
-, mock
 , brotli
+, buildPythonPackage
+, cython
+, execnet
+, fetchFromGitHub
+, jinja2
+, pytestCheckHook
+, pythonOlder
+, pyzmq
+, redis
+, setuptools
+, sqlalchemy
 }:
 
 buildPythonPackage rec {
   pname = "logbook";
-  version = "1.5.3";
+  version = "1.6.0";
+  format = "setuptools";
 
-  src = fetchPypi {
-    pname = "Logbook";
-    inherit version;
-    sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "getlogbook";
+    repo = "logbook";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo=";
+  };
+
+  nativeBuildInputs = [
+    cython
+    setuptools
+  ];
+
+  passthru.optional-dependencies = {
+    execnet = [
+      execnet
+    ];
+    sqlalchemy = [
+      sqlalchemy
+    ];
+    redis = [
+      redis
+    ];
+    zmq = [
+      pyzmq
+    ];
+    compression = [
+      brotli
+    ];
+    jinja = [
+      jinja2
+    ];
+    all = [
+      brotli
+      execnet
+      jinja2
+      pyzmq
+      redis
+      sqlalchemy
+    ];
   };
 
   nativeCheckInputs = [
     pytestCheckHook
-  ] ++ lib.optionals (!isPy3k) [
-    mock
-  ];
-
-  propagatedBuildInputs = [
-    brotli
-  ];
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;
@@ -34,6 +72,11 @@ buildPythonPackage rec {
     "logbook"
   ];
 
+  disabledTests = [
+    # Test require Redis instance
+    "test_redis_handler"
+  ];
+
   meta = with lib; {
     description = "A logging replacement for Python";
     homepage = "https://logbook.readthedocs.io/";