From 1fb7326f59b92e21013c31dd9a3ae034dec88be0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Mar 2023 12:13:03 +0200
Subject: [PATCH 1/2] python310Packages.mkdocs-jupyter: add changelog to meta

---
 pkgs/development/python-modules/mkdocs-jupyter/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
index e285ed008312..d187280d3a92 100644
--- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
@@ -36,16 +36,19 @@ buildPythonPackage rec {
     ipykernel
   ];
 
-  pythonImportsCheck = [ "mkdocs_jupyter" ];
-
   nativeCheckInputs = [
     pytest-cov
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [
+    "mkdocs_jupyter"
+  ];
+
   meta = with lib; {
     description = "Use Jupyter Notebook in mkdocs";
     homepage = "https://github.com/danielfrg/mkdocs-jupyter";
+    changelog = "https://github.com/danielfrg/mkdocs-jupyter/blob/${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ net-mist ];
   };

From 486e3211dc047cb1fec97ee6f9ae67b36a84522b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Mar 2023 12:23:21 +0200
Subject: [PATCH 2/2] python310Packages.mkdocs-jupyter: 0.22.0 -> 0.24.1

Changelog: https://github.com/danielfrg/mkdocs-jupyter/blob/0.24.1/CHANGELOG.md
---
 .../python-modules/mkdocs-jupyter/default.nix | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
index d187280d3a92..fb0640719d5a 100644
--- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix
@@ -1,43 +1,56 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
+, hatchling
 , ipykernel
 , jupytext
-, lib
 , mkdocs
 , mkdocs-material
 , nbconvert
 , pygments
 , pytestCheckHook
-, pytest-cov
+, pythonOlder
+, pythonRelaxDepsHook
 }:
 
 buildPythonPackage rec {
   pname = "mkdocs-jupyter";
-  version = "0.22.0";
+  version = "0.24.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-WFzGm+pMufr2iYExl43JqbIlCR7UtghPWrZWUqXhIYU=";
+    pname = "mkdocs_jupyter";
+    inherit version;
+    hash = "sha256-lncDf7fpMSaPPfdZn8CCjCYSR989FXW87TILqLfR1G0=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "nbconvert>=6.2.0,<7.0.0" "nbconvert>=6.2.0"
+    sed -i "/--cov/d" pyproject.toml
     substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \
-          --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\","
+      --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\","
   '';
 
+  pythonRelaxDeps = [
+    "nbconvert"
+  ];
+
+  nativeBuildInputs = [
+    hatchling
+    pythonRelaxDepsHook
+  ];
+
   propagatedBuildInputs = [
-    nbconvert
+    ipykernel
     jupytext
     mkdocs
     mkdocs-material
+    nbconvert
     pygments
-    ipykernel
   ];
 
   nativeCheckInputs = [
-    pytest-cov
     pytestCheckHook
   ];