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.

Sign up for GitHub

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

Jump to bottom

treewide: update own packages to the new apple-sdk pattern #352719

Merged
merged 5 commits into from
Nov 5, 2024
Merged

treewide: update own packages to the new apple-sdk pattern #352719

merged 5 commits into from
Nov 5, 2024

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Oct 31, 2024 •
edited
Loading

Adopted the new SDK pattern for the packages I maintain / co-maintain.

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.

@matteo-pacini matteo-pacini changed the title several: upgradde own packages to apple-sdk pattern several: update own packages to the new apple-sdk pattern Oct 31, 2024
paparodeo
paparodeo reviewed Oct 31, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM except for one switch from lib.optionals -> lib.optional. lib.optional wraps the 2nd arg in a list, which you don't want if the 2nd arg is already a list.

pkgs/games/shipwright/default.nix Outdated
@@ -65,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.hostPlatform.isLinux [
lsb-release
copyDesktopItems
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
] ++ lib.optional stdenv.hostPlatform.isDarwin [
Copy link
Contributor

Choose a reason for hiding this comment

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

lib.optional will wrap the 2nd arg in a list, which you don't want.

Suggested change
] ++ lib.optional stdenv.hostPlatform.isDarwin [
] ++ lib.optionals stdenv.hostPlatform.isDarwin [

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed, thank you!

@ofborg ofborg bot requested review from hughobrien, jchv and Thra11 November 1, 2024 04:16
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 1, 2024
@Aleksanaa Aleksanaa changed the title several: update own packages to the new apple-sdk pattern treewide: update own packages to the new apple-sdk pattern Nov 1, 2024
paparodeo
paparodeo approved these changes Nov 1, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

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

LGTM

@matteo-pacini matteo-pacini added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 1, 2024
@FliegendeWurst FliegendeWurst added the 6.topic: darwin Running or building packages on Darwin label Nov 1, 2024
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/2076

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 1, 2024
@jchv
Copy link
Contributor

jchv commented Nov 2, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 352719

@jchv jchv added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people and removed 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Nov 2, 2024
@jchv
Copy link
Contributor

jchv commented Nov 2, 2024

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

6 packages built:
  • _86Box
  • _86Box-with-roms
  • augustus
  • corsix-th
  • julius
  • shipwright

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/2084

@Aleksanaa Aleksanaa merged commit 5ad8bdf into NixOS:master Nov 5, 2024
37 of 38 checks passed
@matteo-pacini matteo-pacini deleted the apple-sdk-upgrade branch November 5, 2024 11:59
@getchoo getchoo mentioned this pull request Nov 7, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paparodeo paparodeo paparodeo approved these changes

@Aleksanaa Aleksanaa Aleksanaa approved these changes

@hughobrien hughobrien hughobrien approved these changes

@jchv jchv jchv approved these changes

@Thra11 Thra11 Awaiting requested review from Thra11

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@matteo-pacini @nixos-discourse @jchv @hughobrien @Aleksanaa @paparodeo @wegank @FliegendeWurst