python310Packages.amaranth: make compatible with newer setuptools
This commit is contained in:
parent
b25da1da69
commit
9d1e84f712
1 changed files with 18 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, setuptools
|
, setuptools
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
, pyvcd
|
, pyvcd
|
||||||
|
@ -31,6 +32,23 @@ buildPythonPackage rec {
|
||||||
sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0=";
|
sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-for-setuptools-64.0.2-preparation.patch";
|
||||||
|
url = "https://github.com/amaranth-lang/amaranth/commit/64771a065a280fa683c1e6692383bec4f59f20fa.patch";
|
||||||
|
hash = "sha256-Rsh9vVvUQj9nIcrsRirmR6XwFrfZ2VMaYJ4RCQ8sBE0=";
|
||||||
|
# This commit removes support for Python 3.6, which is unnecessary to fix
|
||||||
|
# the build when using new setuptools. Include only one file, which has a
|
||||||
|
# harmless comment change so that the subsequent patch applies cleanly.
|
||||||
|
includes = ["amaranth/_toolchain/cxx.py"];
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-for-setuptools-64.0.2.patch";
|
||||||
|
url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch";
|
||||||
|
hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
|
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue