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.

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

overrides: add gdspy, gdstk, update marshmallow, fix pillow 9.5.0 #1588

Merged
merged 4 commits into from
May 1, 2024

Conversation

KoviRobi
Copy link
Contributor

@KoviRobi KoviRobi commented Apr 11, 2024

Contribution checklist (recommended but not always applicable/required):

  • There's an automated test for this change
  • Commit messages or code include references to related issues or PRs (including third parties)
  • Commit messages are conventional - examples from the log include "feat: add changelog files to fixup hook", "fix(contourpy): allow wheel usage", and "test: add sqlalchemy2 test"

The marshmallow one, it now has both flit-core and setuptools, I saw some other code above having both, thought that's probably simpler (might result in an extra unnecessary download/build, but probably not a big problem), than selecting based on version.

The pillow fix should help #1139

Notes

From the README.md

  • This project uses nixpkgs-fmt for formatting the Nix code. You can use nix-shell --run "nixpkgs-fmt ." to format everything.

Seems like there are a couple of unformatted things, when I ran this -- I only used the formatting on the newly added lines, to avoid noise.

@KoviRobi KoviRobi changed the title Tinytapeout deps overrides: add gdspy, gdstk, update marshmallow, fix pillow 9.5.0 Apr 11, 2024
@cpcloud
Copy link
Collaborator

cpcloud commented May 1, 2024

Passing locally for me on {x86_64,aarch64}-darwin,x86_64-linux, merging.

@cpcloud cpcloud merged commit 3070197 into nix-community:master May 1, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants