Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mypy 0.940+ #575

Merged
merged 1 commit into from
Mar 22, 2022
Merged

Fix mypy 0.940+ #575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions overrides/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,13 +989,18 @@ lib.composeManyExtensions [

mypy = super.mypy.overridePythonAttrs (
old: {
patches = (old.patches or [ ]) ++ lib.optionals (lib.strings.versionAtLeast old.version "0.900") [
# FIXME: Remove patch after upstream has decided the proper solution.
# https://github.com/python/mypy/pull/11143
# FIXME: Remove patch after upstream has decided the proper solution.
# https://github.com/python/mypy/pull/11143
patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [
(pkgs.fetchpatch {
url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch";
sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk=";
})
] ++ lib.optionals (lib.strings.versionAtLeast old.version "0.940") [
(pkgs.fetchpatch {
url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch";
sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";
})
];
buildInputs = (old.buildInputs or [ ]) ++ [
self.types-typed-ast
Expand Down