diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index d2845bb7a70a..5a4e475d7645 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, cython, fetchFromGitHub, - fetchpatch, gmpy2, hypothesis, mpmath, numpy, pexpect, pytest-cov-stub, - pytest-timeout, pytest-xdist, pytestCheckHook, scipy, @@ -29,14 +27,6 @@ buildPythonPackage rec { hash = "sha256-uQvAYSURDhuAKcX0WVMk4y2ZXiiq0lPZct/7A5n5t34="; }; - patches = [ - (fetchpatch { - name = "remove-pip-from-build-dependencies.patch"; - url = "https://github.com/diofant/diofant/commit/117e441808faa7c785ccb81bf211772d60ebdec3.patch"; - hash = "sha256-MYk1Ku4F3hAv7+jJQLWhXd8qyKRX+QYuBzPfYWT0VbU="; - }) - ]; - build-system = [ setuptools-scm ]; dependencies = [ mpmath ]; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index a78d24afe9d2..01c2299b1d8c 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,25 +5,31 @@ gmpy2, isPyPy, setuptools, + setuptools-scm, pytestCheckHook, - + pytest-xdist, + hypothesis, + pexpect, # Reverse dependency sage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mpmath"; - version = "1.3.0"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "mpmath"; repo = "mpmath"; - tag = version; - hash = "sha256-9BGcaC3TyolGeO65/H42T/WQY6z5vc1h+MA+8MGFChU="; + tag = finalAttrs.version; + hash = "sha256-ykfKrpDri+4n9Y26S7nFl6nF0CV6V0A11ijmt8/apvg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; optional-dependencies = { gmpy = lib.optionals (!isPyPy) [ gmpy2 ]; @@ -33,7 +39,12 @@ buildPythonPackage rec { inherit sage; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + hypothesis + pexpect + ]; meta = { homepage = "https://mpmath.org/"; @@ -42,4 +53,4 @@ buildPythonPackage rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +})