Merge pull request #305016 from pbsds/fix-matchpy-1713430873
python312Packages.{matchpy,uarray}: unbreak
This commit is contained in:
commit
c0387c9db2
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, hopcroftkarp
|
, hopcroftkarp
|
||||||
, multiset
|
, multiset
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
@ -22,6 +23,15 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-n5rXIjqVQZzEbfIZVQiGLh2PR1DHAJ9gumcrbvwnasA=";
|
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 = ''
|
postPatch = ''
|
||||||
sed -i '/pytest-runner/d' setup.cfg
|
sed -i '/pytest-runner/d' setup.cfg
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
, setuptools
|
||||||
|
, setuptools-scm
|
||||||
, matchpy
|
, matchpy
|
||||||
, numpy
|
, numpy
|
||||||
, astunparse
|
, astunparse
|
||||||
|
@ -12,25 +14,17 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "uarray";
|
pname = "uarray";
|
||||||
version = "0.8.2";
|
version = "0.8.8";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Quansight-Labs";
|
owner = "Quansight-Labs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1x2jp7w2wmn2awyv05xs0frpq0fa0rprwcxyg72wgiss0bnzxnhm";
|
hash = "sha256-wTKqOw64b+/kdZpSYLwCJATOuo807BWCtVHB4pH58fY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [(
|
nativeBuildInputs = [ setuptools setuptools-scm ];
|
||||||
# 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";
|
|
||||||
}
|
|
||||||
)];
|
|
||||||
|
|
||||||
nativeCheckInputs = [ pytestCheckHook pytest-cov ];
|
nativeCheckInputs = [ pytestCheckHook pytest-cov ];
|
||||||
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ];
|
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user