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

duckstation-bin: init at 0.1-7294 #336021

Merged
merged 1 commit into from
Oct 30, 2024
Merged

duckstation-bin: init at 0.1-7294 #336021

merged 1 commit into from
Oct 30, 2024

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Aug 20, 2024 •
edited
Loading

Description of changes

  • Added a new derivation for the binary distribution of DuckStation, as this cannot be compiled from source on Darwin (requires compilation of Metal shaders, that in turn requires Xcode).
  • Also added a r-ryantm bot friendly update script

Same approach that has been adopted for pcsx2 - pcsx2 is the Linux version, built from source, and pcsx2-bin is the Darwin version (binary redist).

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.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 20, 2024
@matteo-pacini matteo-pacini added 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.05 Backport PR automatically labels Aug 20, 2024
@matteo-pacini matteo-pacini added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Aug 20, 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/1915

@SuperSandro2000
Copy link
Member

Why don't alias duckstation to duckstation-bin for darwin?

@matteo-pacini
Copy link
Contributor Author

matteo-pacini commented Aug 20, 2024 •
edited
Loading

@SuperSandro2000 To be fair, I don't mind the -bin extension , I think it makes it explicit that it is a binary distribution.

Happy to change it if you think it would be better!

@matteo-pacini
Copy link
Contributor Author

@SuperSandro2000 simplified the update script as seen in #334081 also.

@AndersonTorres
Copy link
Member

Why don't alias duckstation to duckstation-bin for darwin?

They are different packages. It is not a good idea to mix them, even by alias.

@matteo-pacini
Copy link
Contributor Author

@AndersonTorres I agree, also, the -bin extension seems to be used for quite a few packages already, thus it shouldn't feel "alien" to users.

https://search.nixos.org/packages?channel=24.05&from=0&size=50&sort=relevance&type=packages&query=-bin

@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Aug 31, 2024
@matteo-pacini
Copy link
Contributor Author

@AndersonTorres @SuperSandro2000 friendly ping so we can progress / or amend this one. 🙏🏻

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Sep 9, 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/1951

@matteo-pacini matteo-pacini mentioned this pull request Sep 15, 2024
Open
@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/1957

@Aleksanaa Aleksanaa merged commit 0c6e072 into NixOS:master Oct 30, 2024
27 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-24.05:

@github-actions github-actions bot mentioned this pull request Oct 30, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s0me1newithhand7s s0me1newithhand7s s0me1newithhand7s approved these changes

@Aleksanaa Aleksanaa Aleksanaa approved these changes

@AndersonTorres AndersonTorres AndersonTorres approved these changes

@guibou guibou Awaiting requested review from guibou

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 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: 2 This PR was reviewed and approved by two reputable people backport release-24.05 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@matteo-pacini @nixos-discourse @SuperSandro2000 @AndersonTorres @Aleksanaa @s0me1newithhand7s @wegank