Skip to content

cobang: minor fix to patch replacing poetry with poetry-core#249841

Merged
natsukium merged 1 commit intoNixOS:masterfrom
tjni:cobang
Aug 18, 2023
Merged

cobang: minor fix to patch replacing poetry with poetry-core#249841
natsukium merged 1 commit intoNixOS:masterfrom
tjni:cobang

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 17, 2023

Description of changes

As I was working on migrating Python builds to use build, it flagged that the patch being used to replace poetry with poetry-core was missing one replacement. I've fixed that here.

Note that cobang is still broken on master after the pillow update. How it should be fixed is updated to v0.10.1, after which the current poetry patch can be removed, and then also patched to work with pillow v10. However, I would like to merge this small fix in the meantime because it changes the error signature to what is really wrong, which is that support for the new major version of pillow needs to be added.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 17, 2023
@tjni tjni requested a review from WolfangAukang August 18, 2023 01:19
@natsukium natsukium merged commit dddb4cd into NixOS:master Aug 18, 2023
@tjni tjni deleted the cobang branch August 18, 2023 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants