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

openssl: use makeBinaryWrapper instead of makeShellWrapper #340951

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

tie
Copy link
Member

@tie tie commented Sep 10, 2024

Description of changes

This changes openssl to use makeBinaryWrapper since makeWrapper uses non-overridable runtimeShell that causes infinite recursion. That is, fetchurl in pkgs/top-level/all-packages.nix is bootstrapped by overriding dependencies to use stdenv.fetchurlBoot.

Split from #337961

Things done

  • Built on platform(s)
    • x86_64-linux
    • 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.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

This changes openssl to use makeBinaryWrapper since makeWrapper uses
non-overridable runtimeShell that causes infinite recursion. That is,
fetchurl in pkgs/top-level/all-packages.nix is bootstrapped by
overriding dependencies to use stdenv.fetchurlBoot.
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 340951 -p openssl -p openssl_3 -p openssl_3_2 -p openssl_3_3 run on x86_64-linux 1

18 packages built:
  • openssl
  • openssl.bin (openssl.bin.bin ,openssl.bin.debug ,openssl.bin.dev ,openssl.bin.doc ,openssl.bin.man)
  • openssl.debug (openssl.debug.bin ,openssl.debug.debug ,openssl.debug.dev ,openssl.debug.doc ,openssl.debug.man)
  • openssl.dev (openssl.dev.bin ,openssl.dev.debug ,openssl.dev.dev ,openssl.dev.doc ,openssl.dev.man)
  • openssl.doc (openssl.doc.bin ,openssl.doc.debug ,openssl.doc.dev ,openssl.doc.doc ,openssl.doc.man)
  • openssl.man (openssl.man.bin ,openssl.man.debug ,openssl.man.dev ,openssl.man.doc ,openssl.man.man)
  • openssl_3_2
  • openssl_3_2.bin (openssl_3_2.bin.bin ,openssl_3_2.bin.debug ,openssl_3_2.bin.dev ,openssl_3_2.bin.doc ,openssl_3_2.bin.man)
  • openssl_3_2.debug (openssl_3_2.debug.bin ,openssl_3_2.debug.debug ,openssl_3_2.debug.dev ,openssl_3_2.debug.doc ,openssl_3_2.debug.man)
  • openssl_3_2.dev (openssl_3_2.dev.bin ,openssl_3_2.dev.debug ,openssl_3_2.dev.dev ,openssl_3_2.dev.doc ,openssl_3_2.dev.man)
  • openssl_3_2.doc (openssl_3_2.doc.bin ,openssl_3_2.doc.debug ,openssl_3_2.doc.dev ,openssl_3_2.doc.doc ,openssl_3_2.doc.man)
  • openssl_3_2.man (openssl_3_2.man.bin ,openssl_3_2.man.debug ,openssl_3_2.man.dev ,openssl_3_2.man.doc ,openssl_3_2.man.man)
  • openssl_3_3
  • openssl_3_3.bin (openssl_3_3.bin.bin ,openssl_3_3.bin.debug ,openssl_3_3.bin.dev ,openssl_3_3.bin.doc ,openssl_3_3.bin.man)
  • openssl_3_3.debug (openssl_3_3.debug.bin ,openssl_3_3.debug.debug ,openssl_3_3.debug.dev ,openssl_3_3.debug.doc ,openssl_3_3.debug.man)
  • openssl_3_3.dev (openssl_3_3.dev.bin ,openssl_3_3.dev.debug ,openssl_3_3.dev.dev ,openssl_3_3.dev.doc ,openssl_3_3.dev.man)
  • openssl_3_3.doc (openssl_3_3.doc.bin ,openssl_3_3.doc.debug ,openssl_3_3.doc.dev ,openssl_3_3.doc.doc ,openssl_3_3.doc.man)
  • openssl_3_3.man (openssl_3_3.man.bin ,openssl_3_3.man.debug ,openssl_3_3.man.dev ,openssl_3_3.man.doc ,openssl_3_3.man.man)

@tie tie added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Sep 11, 2024
@philiptaron philiptaron merged commit 40319da into NixOS:staging Sep 11, 2024
31 of 33 checks passed
@tie tie deleted the openssl-fetchurl-bootstrap branch September 12, 2024 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants