sphinx: 5.3.0 -> 7.2.6#259350
Merged
mweinelt merged 12 commits intoNixOS:staging-nextfrom Oct 26, 2023
Merged
Conversation
github-actions
bot
added
the
6.topic: python
Member
Author
|
@ofborg build python311Packages.wrapt |
ofborg
bot
added
10.rebuild-darwin-stdenv
Diff: sphinx-doc/sphinx@v5.3.0...v7.2.6 Changelog: https://www.sphinx-doc.org/en/master/changes.html#release-7-2-6-released-sep-13-2023 Co-authored-by: Theodore Ni <3806110+tjni@users.noreply.github.com> Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com> Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
….pth This change fixes the import error reported in the following comment. It is caused by the legacy setuptools namespace. NixOS#210338 (comment)
natsukium
force-pushed
the
sphinx-update
branch
from
63a2fb9 to
652fdc8
Compare
Contributor
|
|
Member
|
Hydra shows the same log for ghc: |
Member
|
cc @sternenseemann for ghc We already had a patch for that iirc. Edit: Looks like that was 2278f9e, and it still gets applied. Looks like ghc is affected by the same change as libcamera: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 |
Member
|
That's a new issue, I think, the patch was for 6.0 and is either applied in nixpkgs or upstreamed into GHC. I've opened https://gitlab.haskell.org/ghc/ghc/-/issues/24129 for now, since I can't look into it myself atm. |
Member
13 tasks
12 tasks
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Diff: sphinx-doc/sphinx@v5.3.0...v7.2.6
Changelog: https://www.sphinx-doc.org/en/master/changes.html#release-7-2-6-released-sep-13-2023
A successor to #244625
The commit 1eb8fcf085f39f4ea478b6c3daa707b1df9f6d29 adds
pythonNamespacesto allsphinxcontrib-*packages in order to fix the import error reported in the following comment.#210338 (comment)
This is an existing approach that fixes the legacy setuptools namespace issue that @tjni investigated.
I also picked a commit to standardize the pname, as noted in this comment.
#244625 (comment)
related PRs
cc @AndersonTorres @mweinelt @ncfavier @SuperSandro2000 @tjni
Things done
sandbox = trueset 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/)