diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-04-19 01:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 01:11:49 +0200 |
| commit | c0387c9db27620c4a6ca99e3c31f332e6649f0fc (patch) | |
| tree | 7b243b3d04d6fd2d06edefe71b25bbf9c51fb9fd | |
| parent | 6eba01d634951603b63ec97a3627391f97e0f0ae (diff) | |
| parent | 19777c0e96abfdfd189cd38409dfcb4c68d1379a (diff) | |
Merge pull request #305016 from pbsds/fix-matchpy-1713430873
python312Packages.{matchpy,uarray}: unbreak
| -rw-r--r-- | pkgs/development/python-modules/matchpy/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/python-modules/uarray/default.nix | 18 |
2 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 5b880cfb5b09..259038e7774b 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , hopcroftkarp , multiset , pytestCheckHook @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA="; }; + patches = [ + # https://github.com/HPAC/matchpy/pull/77 + (fetchpatch { + name = "fix-versioneer-py312.patch"; + url = "https://github.com/HPAC/matchpy/commit/965d7c39689b9f2473a78ed06b83f2be701e234d.patch"; + hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU="; + }) + ]; + postPatch = '' sed -i '/pytest-runner/d' setup.cfg diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 7429ed5750ac..d04304cbbfea 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools +, setuptools-scm , matchpy , numpy , astunparse @@ -12,25 +14,17 @@ buildPythonPackage rec { pname = "uarray"; - version = "0.8.2"; - format = "setuptools"; + version = "0.8.8"; + pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = pname; rev = version; - sha256 = "1x2jp7w2wmn2awyv05xs0frpq0fa0rprwcxyg72wgiss0bnzxnhm"; + hash = "sha256-wTKqOw64b+/kdZpSYLwCJATOuo807BWCtVHB4pH58fY="; }; - patches = [( - # Fixes a compile error with newer versions of GCC -- should be included - # in the next release after 0.8.2 - fetchpatch { - url = "https://github.com/Quansight-Labs/uarray/commit/a2012fc7bb94b3773eb402c6fe1ba1a894ea3d18.patch"; - sha256 = "1qqh407qg5dz6x766mya2bxrk0ffw5h17k478f5kcs53g4dyfc3s"; - } - )]; - + nativeBuildInputs = [ setuptools setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; |