From 8df6327267a379035bee5483535a2eeff7162de5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 15:29:13 +0200
Subject: [PATCH 1/2] python312Packages.paragraphs: init at 1.0.1

Module to incorporate long strings

https://github.com/ShayHill/paragraphs
---
 .../python-modules/paragraphs/default.nix     | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/paragraphs/default.nix

diff --git a/pkgs/development/python-modules/paragraphs/default.nix b/pkgs/development/python-modules/paragraphs/default.nix
new file mode 100644
index 000000000000..d9f79769cdee
--- /dev/null
+++ b/pkgs/development/python-modules/paragraphs/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "paragraphs";
+  version = "1.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ShayHill";
+    repo = "paragraphs";
+    rev = "refs/tags/${version}";
+    hash = "sha256-u5/oNOCLdvfQVEIEpraeNLjTUoh3eJQ6qSExnkzTmNw=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [
+    "paragraphs"
+  ];
+
+  meta = {
+    description = "Module to incorporate long strings";
+    homepage = "https://github.com/ShayHill/paragraphs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49045d27c5b8..195d2e1d9b86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9526,6 +9526,8 @@ self: super: with self; {
 
   para = callPackage ../development/python-modules/para { };
 
+  paragraphs = callPackage ../development/python-modules/paragraphs { };
+
   param = callPackage ../development/python-modules/param { };
 
   parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { };

From 8a0179625c8131845582e85c5ef98d3c5da199a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Sep 2024 15:31:50 +0200
Subject: [PATCH 2/2] python312Packages.docx2python: 2.11.0 -> 3.0.0

Diff: https://github.com/ShayHill/docx2python/compare/refs/tags/2.11.0...3.0.0

Changelog: https://github.com/ShayHill/docx2python/blob/refs/tags/3.0.0/CHANGELOG.md
---
 .../python-modules/docx2python/default.nix    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix
index 5ee6990ff93b..374a840050e1 100644
--- a/pkgs/development/python-modules/docx2python/default.nix
+++ b/pkgs/development/python-modules/docx2python/default.nix
@@ -2,15 +2,18 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  poetry-core,
   lxml,
+  paragraphs,
+  setuptools,
+  setuptools-scm,
   pytestCheckHook,
+  pythonOlder,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "docx2python";
-  version = "2.11.0";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,22 +22,29 @@ buildPythonPackage rec {
     owner = "ShayHill";
     repo = "docx2python";
     rev = "refs/tags/${version}";
-    hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k=";
+    hash = "sha256-ucLDdfmLAWcGunOKvh8tBQknXTPI1qOqyXgVGjQOGoQ=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [ lxml ];
+  dependencies = [
+    lxml
+    paragraphs
+    typing-extensions
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "docx2python" ];
 
   meta = with lib; {
-    homepage = "https://github.com/ShayHill/docx2python";
     description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images";
+    homepage = "https://github.com/ShayHill/docx2python";
     changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md";
-    maintainers = [ ];
     license = licenses.mit;
+    maintainers = [ ];
   };
 }