Skip to content

docutils: 0.19 → 0.20.1#243078

Merged
AndersonTorres merged 1 commit intoNixOS:stagingfrom
toastal:docutils-0.20.1
Aug 14, 2023
Merged

docutils: 0.19 → 0.20.1#243078
AndersonTorres merged 1 commit intoNixOS:stagingfrom
toastal:docutils-0.20.1

Conversation

@toastal
Copy link
Contributor

@toastal toastal commented Jul 12, 2023 •
edited
Loading

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

@toastal toastal changed the title docutils: 0.19 → 0.21.1 docutils: 0.19 → 0.20.1 Jul 12, 2023
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jul 12, 2023
@ofborg ofborg bot requested a review from AndersonTorres July 12, 2023 14:59
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 12, 2023
@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 12, 2023

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

AndersonTorres
AndersonTorres suggested changes Jul 13, 2023
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment •
edited
Loading

Choose a reason for hiding this comment

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

rebase to staging

@ofborg ofborg bot requested a review from AndersonTorres July 13, 2023 13:24
@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 21, 2023

Ping to rebase this over staging.

@toastal toastal requested a review from a user July 25, 2023 14:49
@github-actions github-actions bot added 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment labels Jul 25, 2023
@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
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jul 25, 2023
@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 25, 2023 •
edited
Loading

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
@github-actions github-actions bot removed 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment labels Jul 25, 2023
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: vim Advanced text editor labels Jul 25, 2023
@toastal
Copy link
Contributor Author

toastal commented Jul 25, 2023 •
edited
Loading

@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.

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: package (new) This PR adds a new package and removed 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Jul 25, 2023
@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 25, 2023

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
@trofi
Copy link
Contributor

trofi commented Aug 14, 2023 •
edited
Loading

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 commented Aug 15, 2023

It needs to be updated too:

https://github.com/sphinx-doc/sphinx/blob/65fd5be20d0269c47fbf8c5bbc37a6f24324594b/pyproject.toml#L65

@AndersonTorres
Copy link
Member

AndersonTorres commented Aug 15, 2023

#249230

@AndersonTorres
Copy link
Member

AndersonTorres commented Aug 15, 2023

@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 •
edited
Loading

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

AndersonTorres commented Aug 16, 2023

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

@AndersonTorres AndersonTorres mentioned this pull request Aug 16, 2023
Merged
AndersonTorres added a commit that referenced this pull request Aug 17, 2023
@AndersonTorres
Merge pull request #249446 from NixOS/revert-243078-docutils-0.20.1
851d3f6 
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

Reviewers

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@zowoq zowoq Awaiting requested review from zowoq

@winterqt winterqt Awaiting requested review from winterqt

@figsoda figsoda Awaiting requested review from figsoda

@Mic92 Mic92 Awaiting requested review from Mic92

@FRidh FRidh Awaiting requested review from FRidh

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update request: docutils 0.19 → 0.20.1

3 participants

@toastal @AndersonTorres @trofi

Comments