Skip to content

python310Packages.poetry-core: revert update of vendored dependencies #220252

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

Merged
mweinelt merged 1 commit into from
Mar 10, 2023
Merged

python310Packages.poetry-core: revert update of vendored dependencies #220252

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
16 changes: 16 additions & 0 deletions pkgs/development/python-modules/poetry-core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
, build
, git
Expand All @@ -27,6 +29,20 @@ buildPythonPackage rec {
hash = "sha256-h3d0h+WCrrNlfPOlUx6Rj0aG6untD6MiunqvPj4yT+0=";
};

# revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
Copy link
Member

@SuperSandro2000 SuperSandro2000 Mar 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to apply those on all platforms? It would avoid bit rotting when updating.

Copy link
Member

@mweinelt mweinelt Mar 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to take this upstream either way. We can't keep applying this patch forever. For now it prevents a hefty number of rebuilds on the other three platforms. Also we don't know if this breaks anything else.

(fetchpatch {
url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch";
revert = true;
hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8=";
})
(fetchpatch {
url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch";
revert = true;
hash = "sha256-fXq8L23qjLraLeMzB1bwW1jU0eGd236/GHIoYKwOuL0=";
})
];

propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
Expand Down