colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305016 from pbsds/fix-matchpy-1713430873 

python312Packages.{matchpy,uarray}: unbreak
This commit is contained in:
Peder Bergebakken Sundt 2024-04-19 01:11:49 +02:00 committed by GitHub
parent 6eba01d634 19777c0e96
commit c0387c9db2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/matchpy/default.nix
View File

@ -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

18
pkgs/development/python-modules/uarray/default.nix
View File

@ -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 ];