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

pkgs/by-name/[abc].+ Migrate to new Darwin SDK #355564

Closed
wants to merge 50 commits into from

Conversation

sarahec
Copy link
Contributor

@sarahec sarahec commented Nov 13, 2024

  1. Removed references to darwin.apple_sdk.frameworks.
  2. Automatically formatted to RFC style.

Tracking: #354146

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.

@sarahec sarahec marked this pull request as draft November 13, 2024 01:10
@sarahec sarahec force-pushed the byname-abc-darwin branch 7 times, most recently from b1ec97d to af62940 Compare November 13, 2024 04:29
@sarahec sarahec marked this pull request as ready for review November 13, 2024 04:42
@sarahec
Copy link
Contributor Author

sarahec commented Nov 13, 2024

Result of nixpkgs-review pr 355564 run on aarch64-darwin 1

3 packages marked as broken and skipped:
  • alcom
  • alexandria
  • insulator2
1 package failed to build:
  • gitbutler
39 packages built:
  • aegisub
  • aiken
  • amp
  • arti
  • attic-client
  • attic-server
  • azurite
  • binsider
  • browsers
  • bunbun
  • c2patool
  • caligula
  • cargo-bump
  • cargo-geiger
  • cargo-information
  • cargo-make
  • cargo-modules
  • cargo-raze
  • cargo-tauri
  • cargo-unfmt
  • cargo-vibe
  • cargo-wasi
  • cargo-xwin
  • citations
  • clipcat
  • code2prompt
  • codeberg-cli
  • committed
  • convco
  • cook-cli
  • crabfit-api
  • crunchy-cli
  • csvlens
  • czkawka
  • czkawka-full
  • en-croissant
  • modrinth-app
  • modrinth-app-unwrapped
  • open-scq30

Comment on lines 95 to 97
++ lib.optionals openalSupport [
(if stdenv.hostPlatform.isDarwin then darwin.apple_sdk.frameworks.OpenAL else openal)
]
Copy link
Contributor

Choose a reason for hiding this comment

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

This is actually kind of subtle (and you might want to extract this into its own PR for clarity):

After the refactor, on Darwin, OpenAL is always present, so this part can simply be:

++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [
  openal
]

But in order to properly disable openal on Darwin, we now need

cmakeFlags = [ "-DWITH_OPENAI=OFF" ];

when openalSupport is false.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like the idea of dropping this in its own PR for clarity. That way we can document the change properly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had to move the patch into here due to conflicts with the new default SDK

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 13, 2024
@sarahec sarahec force-pushed the byname-abc-darwin branch 2 times, most recently from 8a18342 to 399ac19 Compare November 14, 2024 19:18
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 15, 2024
@sarahec sarahec requested a review from tjni November 15, 2024 18:51
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 16, 2024
@gepbird gepbird added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 21, 2024
@sarahec
Copy link
Contributor Author

sarahec commented Dec 6, 2024

Closing, as we have the proof the new SDK structure migrates easily.

@sarahec sarahec closed this Dec 6, 2024
@sarahec sarahec deleted the byname-abc-darwin branch December 6, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants