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.

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

openssl_1_1: use less #196906

Merged
merged 5 commits into from
Nov 10, 2022
Merged

openssl_1_1: use less #196906

merged 5 commits into from
Nov 10, 2022

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Oct 20, 2022 •
edited
Loading

Description of changes

This should hopefully make it so updating openssl_1_1 is not a mass rebuild on linux and and stdenv rebuild on darwin anymore.

Sadly I don't think I documented the specific python packages that motivated me to commit 8dfc998.

Edit: I built nixosTests.openldap on x86_64-linux. See comments for more testing.

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

SuperSandro2000
SuperSandro2000 reviewed Oct 20, 2022
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Not sure when the next python-updates run happens but we could push the cpython change into there to find regressions easy.

pkgs/development/libraries/cyrus-sasl/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/cyrus-sasl/openssl3.patch Outdated Show resolved Hide resolved
@ajs124
Copy link
Member Author

ajs124 commented Oct 21, 2022

Not sure when the next python-updates run happens but we could push the cpython change into there to find regressions easy.

cc @mweinelt

@mweinelt
Copy link
Member

Ideally a minor update run that goes into the next staging-next cycle, but then we'd ideally need to start today.

@ajs124 ajs124 force-pushed the feat/less-openssl_1_1 branch from bb139b2 to f330b22 Compare October 22, 2022 09:40
@ofborg ofborg bot requested review from dasJ, SuperSandro2000 and mweinelt October 22, 2022 11:15
@ajs124 ajs124 marked this pull request as ready for review October 22, 2022 13:58
@SuperSandro2000
Copy link
Member

Verified the python change exemplary with nix build .#python3.pkgs.uamqp .#python3.pkgs.cryptography .#python3.pkgs.m2crypto which all succeeded.

@ajs124 ajs124 force-pushed the feat/less-openssl_1_1 branch from f330b22 to 66e6f6f Compare October 28, 2022 12:15
@ofborg ofborg bot requested a review from SuperSandro2000 October 28, 2022 13:02
@dasJ dasJ removed their request for review November 10, 2022 23:20
@Lassulus Lassulus merged commit 15a4296 into NixOS:staging Nov 10, 2022
@ajs124 ajs124 deleted the feat/less-openssl_1_1 branch November 10, 2022 23:22
vcunat added a commit that referenced this pull request Nov 18, 2022
@vcunat
ceph*: fix build
ee04235 
That's probably due to 017fd89 or around (PR #196906).
@ajs124 ajs124 mentioned this pull request Nov 21, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Atemu Atemu Atemu left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@adevress adevress Awaiting requested review from adevress

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ajs124 @mweinelt @SuperSandro2000 @Atemu @Lassulus