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.apple_sdk.frameworks.CoreSymbolication: expose under SDK 11.0 #129292

Merged

Conversation

lukegb
Copy link
Contributor

@lukegb lukegb commented Jul 5, 2021

Motivation for this change

This is used by the root package, and otherwise prevents the nixpkgs.tarball build from succeeding (e.g. https://hydra.nixos.org/build/146838433) - because we need CoreSymbolication for aarch64-darwin builds.

I haven't actually tested to see if root will now build on aarch64-darwin, but it does at least instantiate (and nixpkgs.tarball is part of tested, so it does need to evaluate)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Relase 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.

This is used by the `root` package, and otherwise prevents the
nixpkgs.tarball build from succeeding (e.g.
https://hydra.nixos.org/build/146838433).
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 5, 2021
@lukegb
Copy link
Contributor Author

lukegb commented Jul 5, 2021

Needed for #128467.

@lukegb
Copy link
Contributor Author

lukegb commented Jul 5, 2021

There's also a darwin.CoreSymbolication that might fit the mold here too, but I figured it was safer to use the version from the SDK, even if it is a private framework...

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jul 5, 2021
@domenkozar domenkozar merged commit f468ad4 into NixOS:staging-next Jul 5, 2021
@lukegb lukegb deleted the staging-next-coresymbolication branch July 5, 2021 13:38
vcunat added a commit that referenced this pull request Jul 5, 2021
This reverts commit c52d06b.
It was no longer needed here; I missed merge f468ad4 (PR #129292).
@github-actions
Copy link
Contributor

github-actions bot commented Jul 5, 2021

Backport failed for release-21.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-129292-to-release-21.05 origin/release-21.05
cd .worktree/backport-129292-to-release-21.05
git checkout -b backport-129292-to-release-21.05
ancref=$(git merge-base f8bebb9a94781ac55d73e0992b60b3d2b640503f a7be563707ef20bec6741baa2083b293e360ec31)
git cherry-pick -x $ancref..a7be563707ef20bec6741baa2083b293e360ec31

@vcunat
Copy link
Member

vcunat commented Jul 5, 2021

Uh, it isn't the only evaluation issue on 21.05. I'm not sure if it makes much sense to really try keeping the property unless some check is running somewhere – at least in the tarball job; hopefully OfBorg as well in future.

@domenkozar
Copy link
Member

#129427

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 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants