-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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.
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
python3Packages.flitBuildHook: remove #254309
Conversation
This will likely break many of the overrides defined in poetry2nix |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note the typo in the commit message.
I think I need some pointers on the eval error. I'm not even sure how to reproduce it locally. |
The eval error looks like nixops_unstable, which uses poetry2nix |
@@ -26,6 +27,10 @@ buildPythonPackage rec { | |||
hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; | |||
}; | |||
|
|||
nativeBuildInputs = [ | |||
flit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How come it uses flit instead of flit-core?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Preferred solution here is to patch the pyproject.toml.
@@ -290,3 +290,5 @@ The module update takes care of the new config syntax and the data itself (user | |||
./common/auto-format-root-device.nix ];` When you use the systemd initrd, you | |||
can automatically format the root device by setting | |||
`virtualisation.fileSystems."/".autoFormat = true;`. | |||
|
|||
- `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please see the comment underneath the headline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please elaborate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changelog sections should be randomly sorted and not appeneded
@@ -21,6 +22,19 @@ buildPythonPackage rec { | |||
sha256 = "ExZy5k5RE7k+D0lGmuIkGWrWQ+m24K2oqbUEg4BAVuY="; | |||
}; | |||
|
|||
# patch below won't apply due to different line endings | |||
prePatch = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
prePatch = '' | |
postPatch = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to run before patchPhase
where patches
are applied
Full disclosure, I just discovered #251880, a duplicate effort. I thought it was odd how every time i needed a patch, @tjni seemed to have just submitted one to the upstream. I tried searching for whether he had a nixpkgs pull, but for some reason it did not show up with my search terms. His work also targets additional issues such as darwin compat, while this PR stricly removes flitBuildHook only. |
Unmerged changes in #251880 can be rebased later. |
Description of changes
This change removes all instances of
format = "flit";
, and removesflitBuildHook
.This backward-seeming order is to be git-bisect friendly.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)