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

docutils: 0.19 → 0.20.1 #243078

Merged
merged 1 commit into from
Aug 14, 2023
Merged

Conversation

toastal
Copy link
Contributor

@toastal toastal commented Jul 12, 2023

Description of changes

fixes #243069

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.

Maintainer: @AndersonTorres

@AndersonTorres
Copy link
Member

I believe this should be into staging, because of too much rebuilds.

Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

rebase to staging

pkgs/development/python-modules/docutils/default.nix Outdated Show resolved Hide resolved
@AndersonTorres
Copy link
Member

Ping to rebase this over staging.

@toastal
Copy link
Contributor Author

toastal commented Jul 25, 2023

Oops. Something happened. Was git pull --rebase upstream staging not what was needed @AndersonTorres ?

@toastal toastal force-pushed the docutils-0.20.1 branch 2 times, most recently from 7145ed2 to d85ca78 Compare July 25, 2023 16:39
@toastal toastal requested a review from jonringer as a code owner July 25, 2023 16:39
@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 25, 2023

You need to set this on Github too. There is a small tutorial on Contributing.md

(If this is too hard to follow, you can close this PR and open a new one.)

@toastal toastal changed the base branch from master to staging July 25, 2023 16:44
@toastal
Copy link
Contributor Author

toastal commented Jul 25, 2023

@AndersonTorres I think it’s all cleared up (other than pinging like 10 new people). I could start a new merge request if preferable.

In the unlikely event that the tests fail, I’ll open a new merge request.

@AndersonTorres
Copy link
Member

Ok. It was less dramatic than I was thought initially.

I would like someone tested Darwin locally, because ofborg is bailing out.

@toastal
Copy link
Contributor Author

toastal commented Aug 14, 2023

Has anyone tested on Darwin?

@AndersonTorres AndersonTorres merged commit 20642ff into NixOS:staging Aug 14, 2023
23 of 24 checks passed
@trofi
Copy link
Contributor

trofi commented Aug 14, 2023

Bisect says commit 20642ff broke python3Packages.sphinx on staging as:

$ nix build --no-link -f. python3Packages.sphinx -L
...
python3.10-sphinx> ERROR: Could not find a version that satisfies the requirement docutils<0.20,>=0.14 (from sphinx) (from versions: none)
python3.10-sphinx> ERROR: No matching distribution found for docutils<0.20,>=0.14

@AndersonTorres
Copy link
Member

@AndersonTorres
Copy link
Member

#249230

@AndersonTorres
Copy link
Member

@trofi do you prefer a revert?

@trofi
Copy link
Contributor

trofi commented Aug 15, 2023

I have no preference. My system uses sphinx for btrfs-progs (first failing user) and maybe a few other things like ghc.

@toastal
Copy link
Contributor Author

toastal commented Aug 15, 2023

sphinx-doc/sphinx#11411

Sphinx should support 0.20.x

@toastal
Copy link
Contributor Author

toastal commented Aug 15, 2023

I use docutils standalone for my personal stuff & am using 0.20.x features such as support for abstracts.

@toastal
Copy link
Contributor Author

toastal commented Aug 15, 2023

Sphinx is @ 7.1.x, but Nixpkgs unstable @ 5.3.x. IMO this is something that should be raised with Sphinx’s maintainer to update rather than holding back & reverting this stable version. Both this docutils version & that patch to Sphinx have been out since 2023-06.

Edit: already an open issue #249230

@AndersonTorres
Copy link
Member

I believe the best course of action is really a reversion.

AndersonTorres added a commit that referenced this pull request Aug 17, 2023
Revert "docutils: 0.19 → 0.20.1"

This commit reverts #243078

Nixpkgs ships Sphinx 5.3.0, that does not support docutils >= 0.20.
The most recent version available at the upstream is Sphinx 7.1.2; however its update is far from trivial.

In order to bring the system to a consistent state (and hopefully update everything again), this revert is imperative.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update request: docutils 0.19 → 0.20.1
3 participants