Skip to content

cpython: cleanup, refactoring, unpin openssl-legacy, use our own libmpdecimal #285158

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.

Sign up for GitHub

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

Jump to bottom
Merged
mweinelt merged 5 commits into from
Feb 3, 2024
Merged

cpython: cleanup, refactoring, unpin openssl-legacy, use our own libmpdecimal #285158

mweinelt merged 5 commits into from
Feb 3, 2024

Conversation

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Jan 31, 2024 •
edited
Loading

Description of changes

Somewhat overdue maintenance work on CPython.

There should be no substantial changes to the overall API.

See the individual commits for a summary of what was done.

Things done

  • Built on platform(s)
    • x86_64-linux up to python311Packages.cryptography and python311Packages.spnego
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@mweinelt mweinelt requested a review from FRidh as a code owner January 31, 2024 03:18
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 31, 2024
@mweinelt mweinelt force-pushed the cpython-refresh branch 2 times, most recently from 87326bb to 59a0249 Compare January 31, 2024 03:23
@mweinelt mweinelt marked this pull request as draft January 31, 2024 03:24
@ajs124 ajs124 mentioned this pull request Jan 31, 2024
Closed
12 tasks
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Feb 1, 2024
@mweinelt mweinelt force-pushed the cpython-refresh branch 2 times, most recently from 7406b40 to 20169cb Compare February 2, 2024 00:43
@github-actions github-actions bot removed the 6.topic: stdenv Standard environment label Feb 2, 2024
@mweinelt mweinelt force-pushed the cpython-refresh branch 2 times, most recently from 0f51707 to 8694666 Compare February 2, 2024 01:08
@FRidh
Copy link
Member

FRidh commented Feb 2, 2024

Thank you for cleaning up the expression.

@mweinelt
cpython: unpin legacy openssl
b22414e 
Various packages failed to build due to the removal of hashes like MD5,
but they now work or have been dropped.
@mweinelt
cpython: resolve substituteStream --replace deprecation
f2f4cf0
@mweinelt
cpython: prune patches and configure flags
97625d0 
- Using the system-provided ffi has been the default since 3.6
@mweinelt
cpython: refactor & clean up
2d6fa6f 
- group dependencies logically
- remove `? null` fallback value
- remove redundant isPy3k conditions
- remove overly broad `with lib` import
- more assertion messages
- move python310 out of sources attrset
@mweinelt
cpython: build with our own libmpdecimal
9b516e4
@mweinelt mweinelt marked this pull request as ready for review February 2, 2024 15:28
@mweinelt
Copy link
Member Author

mweinelt commented Feb 2, 2024

The lib tests complete for me locally.

@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: clean-up This PR removes packages or removes other cruft 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 Feb 2, 2024
@mweinelt mweinelt merged commit 3218a96 into NixOS:staging Feb 3, 2024
@mweinelt mweinelt deleted the cpython-refresh branch February 3, 2024 03:05
vcunat added a commit that referenced this pull request Feb 5, 2024
@vcunat
Revert #281577: mpdecimal: 2.5.1 -> 4.0.0
e0ba609 
This reverts commit c59d406, reversing
changes made to ae73151.

Reverting on staging-next branch, moving to staging.
Unfortunate clash with PR #285158 triggered a stdenv rebuild.
@OPNA2608 OPNA2608 mentioned this pull request Feb 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: clean-up This PR removes packages or removes other cruft 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.

2 participants

@mweinelt @FRidh