From dcf5dd70041883040fbe489365fdf35d09843b82 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:41:26 +0300
Subject: [PATCH 01/15] python3.pkgs.pymorphy2-dicts-ru: move expression to
 correct place

---
 .../{pymorphy2/dicts-ru.nix => pymorphy2-dicts-ru/default.nix}  | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/python-modules/{pymorphy2/dicts-ru.nix => pymorphy2-dicts-ru/default.nix} (100%)

diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pymorphy2/dicts-ru.nix
rename to pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9523371a1569..6ef06f66617d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13557,7 +13557,7 @@ self: super: with self; {
 
   pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
 
-  pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
+  pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2-dicts-ru { };
 
   pymorphy3 = callPackage ../development/python-modules/pymorphy3 { };
 

From 1ddbadf1ea8b4134991b86de6fefb703c6c8a7ab Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:42:16 +0300
Subject: [PATCH 02/15] python3.pkgs.pymorphy3-dicts-ru: move expression to
 correct place

---
 .../{pymorphy3/dicts-ru.nix => pymorphy3-dicts-ru/default.nix}  | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/python-modules/{pymorphy3/dicts-ru.nix => pymorphy3-dicts-ru/default.nix} (100%)

diff --git a/pkgs/development/python-modules/pymorphy3/dicts-ru.nix b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pymorphy3/dicts-ru.nix
rename to pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ef06f66617d..135b5115fdd6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13561,7 +13561,7 @@ self: super: with self; {
 
   pymorphy3 = callPackage ../development/python-modules/pymorphy3 { };
 
-  pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3/dicts-ru.nix { };
+  pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3-dicts-ru { };
 
   pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { };
 

From a9ff7f7ea69fc38e8f9ac57cdc190c33ca2a0a3e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:42:35 +0300
Subject: [PATCH 03/15] python3.pkgs.pymorphy3-dicts-uk: move expression to
 correct place

---
 .../{pymorphy3/dicts-uk.nix => pymorphy3-dicts-uk/default.nix}  | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/python-modules/{pymorphy3/dicts-uk.nix => pymorphy3-dicts-uk/default.nix} (100%)

diff --git a/pkgs/development/python-modules/pymorphy3/dicts-uk.nix b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
similarity index 100%
rename from pkgs/development/python-modules/pymorphy3/dicts-uk.nix
rename to pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 135b5115fdd6..46dd121b4385 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13563,7 +13563,7 @@ self: super: with self; {
 
   pymorphy3-dicts-ru = callPackage ../development/python-modules/pymorphy3-dicts-ru { };
 
-  pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3/dicts-uk.nix { };
+  pymorphy3-dicts-uk = callPackage ../development/python-modules/pymorphy3-dicts-uk { };
 
   pympler = callPackage ../development/python-modules/pympler { };
 

From c3193e2a0b51d788dc177a4def42ed77d109dfac Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:43:23 +0300
Subject: [PATCH 04/15] python3.pkgs.pymorphy2-dicts-ru: no with lib; in meta

---
 .../development/python-modules/pymorphy2-dicts-ru/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
index 2bab523c30c1..cbf27c7bdc32 100644
--- a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
+++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
@@ -16,10 +16,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymorphy2_dicts_ru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Russian dictionaries for pymorphy2";
     homepage = "https://github.com/kmike/pymorphy2-dicts/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 48f627f1c887d256f8145f0538ab00ee96f3ddc0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:44:58 +0300
Subject: [PATCH 05/15] python3.pkgs.pymorphy3-dicts-ru: no with lib; in meta

---
 .../python-modules/pymorphy3-dicts-ru/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
index 83a91b0f6aae..39a85139f39e 100644
--- a/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
@@ -19,10 +19,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymorphy3_dicts_ru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Russian dictionaries for pymorphy3";
     homepage = "https://github.com/no-plagiarism/pymorphy3-dicts";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }

From 897d2e7ef210f39c675df22d62b90660f18d9fca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:46:15 +0300
Subject: [PATCH 06/15] python3.pkgs.pymorphy3-dicts-uk: no with lib; in meta

---
 .../python-modules/pymorphy3-dicts-uk/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
index 9a755f1559d7..3815a75ad139 100644
--- a/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
@@ -19,10 +19,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymorphy3_dicts_uk" ];
 
-  meta = with lib; {
+  meta = {
     description = "Ukrainian dictionaries for pymorphy3";
     homepage = "https://github.com/no-plagiarism/pymorphy3-dicts";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }

From c604a0e318a727fb14a24a627410027b8aee6aa6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:46:53 +0300
Subject: [PATCH 07/15] python3.pkgs.pymorphy2-dicts-ru: explicitly set doCheck

---
 pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
index cbf27c7bdc32..9155377b120a 100644
--- a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
+++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
@@ -14,6 +14,9 @@ buildPythonPackage rec {
     hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY=";
   };
 
+  # has no tests
+  doCheck = false;
+
   pythonImportsCheck = [ "pymorphy2_dicts_ru" ];
 
   meta = {

From b2a38b0bfadb10e503bb07cc9a8a117a461455bb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:47:43 +0300
Subject: [PATCH 08/15] python3.pkgs.pymorphy2-dicts-ru: use pyproject
 attribute

---
 .../python-modules/pymorphy2-dicts-ru/default.nix        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
index 9155377b120a..b273ef8eef7e 100644
--- a/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
+++ b/pkgs/development/python-modules/pymorphy2-dicts-ru/default.nix
@@ -2,18 +2,25 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pymorphy2-dicts-ru";
   version = "2.4.417127.4579844";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # has no tests
   doCheck = false;
 

From bcf30ec0bde4469b74e517e89b80fe5d6942e91b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:48:02 +0300
Subject: [PATCH 09/15] python3.pkgs.pymorphy3-dicts-ru: use pyproject
 attribute

---
 .../python-modules/pymorphy3-dicts-ru/default.nix          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
index 39a85139f39e..c30e31b6efb8 100644
--- a/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-ru/default.nix
@@ -2,6 +2,9 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -14,6 +17,10 @@ buildPythonPackage rec {
     hash = "sha256-Oas3nUypBbr+1Q9a/Do95vlkNgV3b7yrxNMIjU7TgrA=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # has no tests
   doCheck = false;
 

From 2589b36ba99db937e2e9b2007c456ca72c1fcd5c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 11:48:18 +0300
Subject: [PATCH 10/15] python3.pkgs.pymorphy3-dicts-uk: use pyproject
 attribute

---
 .../python-modules/pymorphy3-dicts-uk/default.nix          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
index 3815a75ad139..0ce1254dfa37 100644
--- a/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
+++ b/pkgs/development/python-modules/pymorphy3-dicts-uk/default.nix
@@ -2,6 +2,9 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+
+  # build-system
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -14,6 +17,10 @@ buildPythonPackage rec {
     hash = "sha256-s5RaNBNuGTgGzeZXuicdiKYHYedRN8E9E4qNFCqNEqw=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # has no tests
   doCheck = false;
 

From cc5fd04d8d6199ff707d8474395b722853656b3a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 08:22:53 +0300
Subject: [PATCH 11/15] python3.pkgs.pymorphy3: no with lib; in meta

---
 pkgs/development/python-modules/pymorphy3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index f44bd9a8f353..b0a319fc7b2b 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -35,11 +35,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymorphy3" ];
 
-  meta = with lib; {
+  meta = {
     description = "Morphological analyzer/inflection engine for Russian and Ukrainian";
     mainProgram = "pymorphy";
     homepage = "https://github.com/no-plagiarism/pymorphy3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }

From a4d32962431ec03798e0c6c075313152b4c3e678 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 08:27:46 +0300
Subject: [PATCH 12/15] python3.pkgs.dawg-python: no with lib; in meta

---
 pkgs/development/python-modules/dawg-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index 997600122d01..eab79418b8b5 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -17,10 +17,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dawg_python" ];
 
-  meta = with lib; {
+  meta = {
     description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension";
     homepage = "https://github.com/pytries/DAWG-Python";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 12f7b1ce3da647d5fbae81d1488d85f32acce485 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 08:33:48 +0300
Subject: [PATCH 13/15] python312Packages.dawg2-python: init at 0.9.0

---
 .../python-modules/dawg2-python/default.nix   | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/dawg2-python/default.nix

diff --git a/pkgs/development/python-modules/dawg2-python/default.nix b/pkgs/development/python-modules/dawg2-python/default.nix
new file mode 100644
index 000000000000..9b3775b51a16
--- /dev/null
+++ b/pkgs/development/python-modules/dawg2-python/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  typing-extensions,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dawg2-python";
+  version = "0.9.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pymorphy2-fork";
+    repo = "DAWG-Python";
+    tag = version;
+    hash = "sha256-45k7QmozbMt7qYdDFRSL5JDeEtqdMHBoEXXQkLDoGfE=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "dawg_python"
+  ];
+
+  meta = {
+    description = "Pure-python reader for DAWGs created by dawgdic C++ library or DAWG Python extension. Fork of  https://github.com/pytries/DAWG-Python";
+    homepage = "https://github.com/pymorphy2-fork/DAWG-Python";
+    changelog = "https://github.com/pymorphy2-fork/DAWG-Python/blob/${src.tag}/CHANGES.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46dd121b4385..8320985c321d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3450,6 +3450,8 @@ self: super: with self; {
 
   dawg-python = callPackage ../development/python-modules/dawg-python { };
 
+  dawg2-python = callPackage ../development/python-modules/dawg2-python { };
+
   dazl = callPackage ../development/python-modules/dazl { };
 
   db-dtypes = callPackage ../development/python-modules/db-dtypes { };

From 1b8b13db3812f81bb571840746944d509a348936 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 08:24:44 +0300
Subject: [PATCH 14/15] python3.pkgs.pymorphy3: modernize attributes

---
 .../python-modules/pymorphy3/default.nix      | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index b0a319fc7b2b..2dae40f22cb5 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -2,18 +2,25 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  click,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   dawg-python,
   docopt,
-  pytestCheckHook,
   pymorphy3-dicts-ru,
   pymorphy3-dicts-uk,
+
+  # tests
+  pytestCheckHook,
+  click,
 }:
 
 buildPythonPackage rec {
   pname = "pymorphy3";
   version = "2.0.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "no-plagiarism";
@@ -22,16 +29,27 @@ buildPythonPackage rec {
     hash = "sha256-Ula2OQ80dcGeMlXauehXnlEkHLjjm4jZn39eFNltbEA=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     dawg-python
     docopt
     pymorphy3-dicts-ru
     pymorphy3-dicts-uk
   ];
 
-  optional-dependencies.CLI = [ click ];
+  optional-dependencies = {
+    CLI = [
+      click
+    ];
+  };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.CLI;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pymorphy3" ];
 

From 69f35351053c4981dccf2d54a9554ffa60865d08 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 07:52:12 +0300
Subject: [PATCH 15/15] python3Packages.pymorphy3: 2.0.4 -> 2.0.6

Diff: https://github.com/no-plagiarism/pymorphy3/compare/2.0.4...2.0.6
---
 pkgs/development/python-modules/pymorphy3/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index 2dae40f22cb5..a2273ea72efa 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -7,8 +7,7 @@
   setuptools,
 
   # dependencies
-  dawg-python,
-  docopt,
+  dawg2-python,
   pymorphy3-dicts-ru,
   pymorphy3-dicts-uk,
 
@@ -19,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pymorphy3";
-  version = "2.0.4";
+  version = "2.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "no-plagiarism";
     repo = "pymorphy3";
     tag = version;
-    hash = "sha256-Ula2OQ80dcGeMlXauehXnlEkHLjjm4jZn39eFNltbEA=";
+    hash = "sha256-5s5v6+vMCeyn/73G5uUfRtTGkkqa7RNW8/r1v3Ay4us=";
   };
 
   build-system = [
@@ -34,8 +33,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    dawg-python
-    docopt
+    dawg2-python
     pymorphy3-dicts-ru
     pymorphy3-dicts-uk
   ];