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

Several override additions and fixes #1836

Merged
merged 21 commits into from
Oct 28, 2024
Merged

Conversation

cheriimoya
Copy link
Contributor

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"

sed -i 's/"Framework :: MkDocs",//' pyproject.toml
postPatch = old.postPatch or "" + lib.optionalString (old.version == "8.5.4") ''
sed -i 's/filename = "requirements.txt"//' pyproject.toml
sed -i '/\[project\]/a dependencies = ["jinja2>=3.0.2", "markdown>=3.2", "mkdocs>=1.3", "mkdocs-material-extensions>=1.0.3", "pygments>=2.12", "pymdown-extensions>=9.4", "requests>=2.26"]' pyproject.toml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure, why the "Framework :: MkDocs", was seded away, it works without for me. This solution doesn't look pretty, but I don't know how else to solve the problem (see commit message).

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do you have a pyproject.toml that fails without the second sed line?

A simple test derivation that only depends on mkdocs-material = "8.5.4" builds for me with only the line that removes filename = "requirements.txt".

Copy link
Collaborator

Choose a reason for hiding this comment

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

I pushed up a simpler replacement that only replaces filename = "requirements.txt". Let me know if that works for you, and then we can merge this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to double check, if everything works without specifying the dependencies, like coloring of code with pygments, but poetry lock already resolves the dependencies. So I guess it's fine. Yet, I added mkdocs-get-deps and now something on darwin fails. Cannot reproduce locally as I don't have darwin. Can also be merged without the last commit.

@cpcloud
Copy link
Collaborator

cpcloud commented Oct 28, 2024

The issue is with the macOS SDK. It seems like watchdog requires a newer-than-10.12 sdk to build it from source (it works on arm64 macs presumably because the SDK version there is 11.1). Setting only watchdog to preferWheel = true; seems to do the trick.

@cpcloud cpcloud merged commit 4af430d into nix-community:master Oct 28, 2024
190 checks 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