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

meson: remove unnecessary stuff #373812

Draft
wants to merge 6 commits into
base: staging
Choose a base branch
from
Draft

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Jan 14, 2025

Meson changes should be good if they build, but I’d like Randy’s feedback on the stdenv stuff.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jan 14, 2025
@nix-owners nix-owners bot requested review from toonn and reckenrode January 14, 2025 19:06
@emilazy emilazy marked this pull request as draft January 14, 2025 19:14
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

LGTM, especially the net line count : )

Apple ships a 13‐year‐old fork of OpenLDAP. The very few things
that use it, like Meson tests, have been adding dependencies on
our up‐to‐date OpenLDAP package to get headers. That’s not
reliable to mix with the `.tbd` Apple ships, and pulls OpenLDAP into
the bootstrap unnecessarily.

We continue to strip the `.dylib`s to avoid accidental dependencies
on the old version. Packages can still link to Apple’s version with
`-framework LDAP`. As very little seems to want the system version,
hopefully this won’t have any major compatibility impact.
No longer necessary now that the SDK retains the Apple OpenLDAP
fork headers.
Should no longer be necessary now that we’re using Apple’s
`cctools` again.
We no longer ship Python < 3.9.
This wasn’t being built in the bootstrap anyway, and we no longer
need to skip the Meson tests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants