From 074b333898343b3458cf9e4cc39f44704ef53d81 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 28 Jun 2025 11:49:57 +0200
Subject: [PATCH 1/3] python3Packages.bibtexparser_2: init at 2.0.0b8

---
 .../python-modules/bibtexparser/2.nix         | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/bibtexparser/2.nix

diff --git a/pkgs/development/python-modules/bibtexparser/2.nix b/pkgs/development/python-modules/bibtexparser/2.nix
new file mode 100644
index 000000000000..8b776e551c13
--- /dev/null
+++ b/pkgs/development/python-modules/bibtexparser/2.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pylatexenc,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "bibtexparser";
+  version = "2.0.0b8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sciunto-org";
+    repo = "python-bibtexparser";
+    tag = "v${version}";
+    hash = "sha256-531Mh/5DUYayXm1H0v4dPX0P9mRcqcQcU/A+f4wwqxg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pylatexenc ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "bibtexparser" ];
+
+  meta = {
+    description = "Bibtex parser for Python";
+    homepage = "https://github.com/sciunto-org/python-bibtexparser";
+    changelog = "https://github.com/sciunto-org/python-bibtexparser/blob/${src.tag}/CHANGELOG";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.amadejkastelic ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 660922c1f2f8..feaa6186584a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1817,6 +1817,8 @@ self: super: with self; {
 
   bibtexparser = callPackage ../development/python-modules/bibtexparser { };
 
+  bibtexparser_2 = callPackage ../development/python-modules/bibtexparser/2.nix { };
+
   bidict = callPackage ../development/python-modules/bidict { };
 
   bids-validator = callPackage ../development/python-modules/bids-validator { };

From 5293ede2b611cfe21599928934b2a1932b8542f7 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 28 Jun 2025 11:51:04 +0200
Subject: [PATCH 2/3] python3Packages.clldutils: 3.21.0 -> 3.24.2

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

diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 70800b121f5b..1bd3336cca43 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -4,11 +4,11 @@
   buildPythonPackage,
   colorlog,
   fetchFromGitHub,
+  bibtexparser_2,
   git,
   lxml,
   markdown,
   markupsafe,
-  mock,
   postgresql,
   pylatexenc,
   pytest-cov-stub,
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "clldutils";
-  version = "3.21.0";
+  version = "3.24.2";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
@@ -30,13 +30,14 @@ buildPythonPackage rec {
     owner = "clld";
     repo = "clldutils";
     rev = "v${version}";
-    hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
+    hash = "sha256-xIs6Lq9iDdcM3j51F27x408oUldvy5nlvVdbrAS5Jz0=";
   };
 
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
     attrs
+    bibtexparser_2
     colorlog
     lxml
     markdown
@@ -47,7 +48,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    mock
     postgresql
     pytest-cov-stub
     pytest-mock

From e185b875739cb99f86c585af2c274bf0f925c332 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 28 Jun 2025 11:51:58 +0200
Subject: [PATCH 3/3] python3Packages.clldutils: modernize

---
 .../python-modules/clldutils/default.nix          | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 1bd3336cca43..1dc7cc8de508 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -24,18 +24,17 @@ buildPythonPackage rec {
   pname = "clldutils";
   version = "3.24.2";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "clld";
     repo = "clldutils";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-xIs6Lq9iDdcM3j51F27x408oUldvy5nlvVdbrAS5Jz0=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     bibtexparser_2
     colorlog
@@ -55,11 +54,11 @@ buildPythonPackage rec {
     git
   ];
 
-  meta = with lib; {
-    changelog = "https://github.com/clld/clldutils/blob/${src.rev}/CHANGES.md";
+  meta = {
+    changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md";
     description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
     homepage = "https://github.com/clld/clldutils";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ melling ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ melling ];
   };
 }