From 9f85b88644b40d348a49188776a8fbf2f814aaa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 May 2025 02:00:40 +0200 Subject: [PATCH] Revert "python313Packages.clldutils: 3.21.0 -> 3.24.2" This reverts commit 2b7b3ac43732af79ca31bbbede53edd13f3fef77. Requires a beta version of bibtexparser, which in turn breaks other packages. --- .../python-modules/clldutils/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 7bc64edbebe6..0018a2744d9c 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -1,7 +1,6 @@ { lib, attrs, - bibtexparser, buildPythonPackage, colorlog, fetchFromGitHub, @@ -12,7 +11,6 @@ mock, postgresql, pylatexenc, - pytest-cov-stub, pytest-mock, pytestCheckHook, python-dateutil, @@ -23,7 +21,7 @@ buildPythonPackage rec { pname = "clldutils"; - version = "3.24.2"; + version = "3.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,14 +29,18 @@ buildPythonPackage rec { owner = "clld"; repo = pname; rev = "v${version}"; - hash = "sha256-xIs6Lq9iDdcM3j51F27x408oUldvy5nlvVdbrAS5Jz0="; + hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo="; }; + patchPhase = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov" "" + ''; + nativeBuildInputs = [ setuptools ]; - dependencies = [ + propagatedBuildInputs = [ attrs - bibtexparser colorlog lxml markdown @@ -51,7 +53,6 @@ buildPythonPackage rec { nativeCheckInputs = [ mock postgresql - pytest-cov-stub pytest-mock pytestCheckHook git