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/[ab].+: migrate to new apple sdk #354097

Merged
merged 11 commits into from
Nov 7, 2024

Conversation

sarahec
Copy link
Contributor

@sarahec sarahec commented Nov 6, 2024

Validating the new apple sdk by migrationg low-risk packages:

  • At most 1 downstream dependency
  • Only replacing Darwin-specific BuildInputs
  • No impact on other platforms
  1. Replaced darwin dependency with apple-sdk_11
  2. Replaced all references to darwin.apple_sdk.frameworks.* with single apple-sdk_11
  3. Reformatted with current nixfmt (rfc style)
  4. Minor fixes as needed such as dropping "with lib;"

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 force-pushed the apple-sdk-migration branch 2 times, most recently from 770809d to 0533b22 Compare November 6, 2024 22:46
@sarahec
Copy link
Contributor Author

sarahec commented Nov 6, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 354097


x86_64-linux

@sarahec sarahec force-pushed the apple-sdk-migration branch from 0533b22 to 012de1e Compare November 6, 2024 23:50
pkgs/by-name/ag/agate/package.nix Outdated Show resolved Hide resolved
@sarahec sarahec force-pushed the apple-sdk-migration branch from 012de1e to cd8beb6 Compare November 7, 2024 00:01
@sarahec sarahec force-pushed the apple-sdk-migration branch from cd8beb6 to ceb4fb3 Compare November 7, 2024 02:25
@sarahec sarahec requested a review from emilazy November 7, 2024 02:28
@sarahec
Copy link
Contributor Author

sarahec commented Nov 7, 2024

@emilazy That should be everything

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Thanks, looks good now! I did a survey of OpenSSL dependencies:

  • agate uses tokio-rustls with ring and therefore shouldn’t require OpenSSL on any platform AFAIK; can you drop the buildInputs entirely?

  • asfa uses ssh2 which requires OpenSSL, so that seems fine.

  • asm-lsp uses reqwest which uses native TLS by default; OpenSSL dependency should be conditioned on !stdenv.hostPlatform.isDarwin.

I won’t block this PR on this if you don’t feel like doing it, but it’d be nice to get these cleaned up.

@sarahec sarahec force-pushed the apple-sdk-migration branch from ceb4fb3 to 31a776f Compare November 7, 2024 04:05
@sarahec
Copy link
Contributor Author

sarahec commented Nov 7, 2024

Thanks, looks good now! I did a survey of OpenSSL dependencies:

  • agate uses tokio-rustls with ring and therefore shouldn’t require OpenSSL on any platform AFAIK; can you drop the buildInputs entirely?

If I do so, it fails looking for <openssl/opensslv.h>. So it needs the headers at least.

  • asfa uses ssh2 which requires OpenSSL, so that seems fine.
  • asm-lsp uses reqwest which uses native TLS by default; OpenSSL dependency should be conditioned on !stdenv.hostPlatform.isDarwin.

Done.

Copy link
Member

@emilazy emilazy 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 354097 run on aarch64-linux 1

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 354097


aarch64-darwin

✅ 13 packages built:
  • agate
  • anchor
  • asfa
  • asfa.man
  • asm-lsp
  • atac
  • attract-mode
  • avbroot
  • bacon
  • biome
  • buckle
  • bulloak
  • commafeed

Thank you!

@emilazy emilazy merged commit 85f7e66 into NixOS:master Nov 7, 2024
10 of 11 checks passed
@tomodachi94 tomodachi94 added the 6.topic: darwin Running or building packages on Darwin label Nov 7, 2024
@sarahec sarahec deleted the apple-sdk-migration branch November 8, 2024 20:23
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants