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

darwin: add darwin-aliases.nix #299360

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Conversation

reckenrode
Copy link
Contributor

@reckenrode reckenrode commented Mar 27, 2024

Description of changes

Darwin needs a way to deprecate and move packages in the darwin scope. This is needed to support transitioning to upstream packages for libiconv and icu. It’s also useful for moving things out of darwin to by-name.

This PR also moves two packages to darwin-aliases.nix:

  • builder (moved from an ad hoc alias)
  • moltenvk (moved to by-name)

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.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.

@reckenrode
Copy link
Contributor Author

If I did this right, there shouldn’t be any rebuilds.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Mar 27, 2024
@reckenrode
Copy link
Contributor Author

I dropped the MoltenVK move. I’ll do it as part of the 1.2.8 update once this is merged (or post update depending on timing). It was causing the by-name check to fail due to using apple_sdk_11_0.callPackage. Unfortunately, switching it to use overrideSDK would cause rebuilds (defeating the goal of doing this PR without rebuilds).

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 27, 2024
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM.

testing:

  • added alias with a throw and it threw
  • added alias to another package and got other package
  • ran meta checks locally and validated that the aliases were not used.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 27, 2024
@reckenrode reckenrode merged commit 2944f24 into NixOS:master Mar 27, 2024
23 checks passed
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/darwin-updates-news/42249/5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants