Skip to content

expat: 2.4.6 -> 2.4.7#162889

Merged
mweinelt merged 4 commits intoNixOS:stagingfrom
vcunat:p/expat
Mar 6, 2022
Merged

expat: 2.4.6 -> 2.4.7#162889
mweinelt merged 4 commits intoNixOS:stagingfrom
vcunat:p/expat

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Mar 5, 2022 •
edited
Loading

Motivation for this change

This primarily fixes regressions in various other packages after the expat security fixes.

I'm unsure if this should go to staging-next (current iteration) or the next one (staging branch). It rebuilds stdenv on all platforms, but it also fixes some regressions from the expat security update. Note that the commits are based in a way to allow easy merging to either/both branches.

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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

vcunat added 2 commits March 5, 2022 08:18
@vcunat
expat: 2.4.6 -> 2.4.7
48a0073 
This primarily fixes regressions in various other packages
after the expat security fixes.
@vcunat
Revert "python3Packages.xmltodict: disable incompatible expat tests"
c18eab5 
This reverts commit 0451c28.
Now it's not needed anymore.
@vcunat vcunat requested review from FRidh and jonringer as code owners March 5, 2022 13:18
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Mar 5, 2022
@vcunat
Copy link
Member Author

vcunat commented Mar 5, 2022

Oh and the revert in this PR... might better get adjusted? @jonringer: the nose parts should remain?

@vcunat vcunat mentioned this pull request Mar 5, 2022
Merged
13 tasks
@vcunat
Copy link
Member Author

vcunat commented Mar 5, 2022 •
edited
Loading

On stable it's already being built. b80b398c16

@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. 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 Mar 5, 2022
@risicle
Copy link
Contributor

risicle commented Mar 5, 2022

If python3Packages.xmltodict is easily broken by expat, it's worth adding it to expat's passthru.tests.

@vcunat
Copy link
Member Author

vcunat commented Mar 5, 2022

Well we could, but as expat rebuilds all stdenvs, the usual workflows won't work so well.

@risicle
Copy link
Contributor

risicle commented Mar 5, 2022

No but it would give manual reviewers a hint that it might be worth checking that package.

@mweinelt
Copy link
Member

mweinelt commented Mar 5, 2022

Feel free to push that change. In the meantime I've tested these changes on my local python-updates tree and it fixes a few regressions of the xml.parsers.expat.ExpatError: out of memory: line 1, column 0 here and there.

@risicle
expat: add python3Packages.xmltodict to passthru.tests
d88dc97 
as it has revealed compatibility issues in the past
@mweinelt mweinelt merged commit 45da5a8 into NixOS:staging Mar 6, 2022
@mweinelt
Copy link
Member

mweinelt commented Mar 6, 2022

Can always decide to pick this up for staging-next, but I want this for python-updates now because the number of failing tests is annoying and us hotpatching everything is not going to happen.

@vcunat vcunat deleted the p/expat branch March 6, 2022 06:25
@vcunat
Copy link
Member Author

vcunat commented Mar 21, 2022

I suspect that this regression is related to expat updates, in case someone wanted to have a closer look: https://hydra.nixos.org/build/169724144

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mweinelt mweinelt mweinelt approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 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. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vcunat @risicle @mweinelt