Skip to content

pcsx2: 1.7.5587 -> 1.7.5779#305509

Merged
hrdinka merged 2 commits intoNixOS:masterfrom
SuperSamus:pcsx2-update
Jun 9, 2024
Merged

pcsx2: 1.7.5587 -> 1.7.5779#305509
hrdinka merged 2 commits intoNixOS:masterfrom
SuperSamus:pcsx2-update

Conversation

@SuperSamus
Copy link
Contributor

@SuperSamus SuperSamus commented Apr 20, 2024 •
edited
Loading

Description of changes

Diff: PCSX2/pcsx2@v1.7.5587...v1.7.5779

Depends on #305508 (which is the base of this branch). Merged.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@SuperSamus SuperSamus mentioned this pull request Apr 20, 2024
Merged
12 tasks
@ofborg ofborg bot requested review from GovanifY and hrdinka April 20, 2024 10:54
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 20, 2024
@SuperSamus SuperSamus changed the title pcsx2: 1.7.5587 -> 1.7.5719 pcsx2: 1.7.5587 -> 1.7.5733 Apr 23, 2024
@SuperSamus SuperSamus changed the title pcsx2: 1.7.5587 -> 1.7.5733 pcsx2: 1.7.5587 -> 1.7.5756 Apr 29, 2024
@nixos-discourse
Copy link

nixos-discourse commented Apr 29, 2024

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/3849

@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Apr 29, 2024
@SuperSamus SuperSamus force-pushed the pcsx2-update branch 2 times, most recently from 95f4067 to 49cc58d Compare May 1, 2024 09:42
@SuperSamus SuperSamus changed the title pcsx2: 1.7.5587 -> 1.7.5756 pcsx2: 1.7.5587 -> 1.7.5764 May 1, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels May 1, 2024
@SuperSamus SuperSamus changed the title pcsx2: 1.7.5587 -> 1.7.5764 pcsx2: 1.7.5587 -> 1.7.5769 May 2, 2024
@SuperSamus SuperSamus changed the title pcsx2: 1.7.5587 -> 1.7.5769 pcsx2: 1.7.5587 -> 1.7.5779 May 4, 2024
@SuperSamus SuperSamus mentioned this pull request May 6, 2024
Merged
13 tasks
@SuperSamus SuperSamus marked this pull request as draft May 7, 2024 10:00
@SuperSamus
Copy link
Contributor Author

SuperSamus commented May 7, 2024

Waiting to know whether it's better to patch shaderc inside the package or in all-packages. (#309064)

@hrdinka
Copy link
Contributor

hrdinka commented May 7, 2024

@SuperSamus thanks a lot for continuously updating this package! As always I am very happy about your contribution.

Regarding the shaderc patch: IMHO it should be overriden in all-packages.nix. There are many other packages doing it this way as well. The pcsx2 derivation should be agnostic of its input and not try to override them, it cannot know what exact derivations are passed as input. It should basically just ask for a shaderc package and be happy with whatever it gets. The caller should make sure to pass the right one. If a package needs a special version of an input, it is always done via callPackage in all-packages.nix and this here is not different.

Further a fetch* variant should be preferred and used whenever possible like in the duckstation PR to not bloat nixpkgs unnecessarily.

I would however not be happy about moving it to the bottom in all-packages.nix like it was proposed in the duckstation PR. I appreciate its good intentions but in the end this will mess up the ordering in all-packages.nix even more since I expect only few people to notice and adhere to it. In the light of RCF140, eventually all default package calls will be removed from all-packages.nix anyway.

@github-actions github-actions bot removed the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label May 29, 2024
AndersonTorres
AndersonTorres reviewed May 31, 2024
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Some minor cleanup.

AndersonTorres
AndersonTorres approved these changes May 31, 2024
View reviewed changes
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Besides, LGTM

@SuperSamus SuperSamus force-pushed the pcsx2-update branch 2 times, most recently from 52273b4 to ed9fb5c Compare May 31, 2024 22:50
@AndersonTorres
Copy link
Member

AndersonTorres commented Jun 4, 2024

P.S.: we should have a team for emulators.

@SuperSamus
Copy link
Contributor Author

SuperSamus commented Jun 5, 2024

Anything left to do before this can be merged?

AndersonTorres
AndersonTorres reviewed Jun 6, 2024
View reviewed changes
@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Jun 6, 2024
@ofborg ofborg bot requested a review from hrdinka June 6, 2024 09:54
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jun 6, 2024
@hrdinka hrdinka merged commit 926be01 into NixOS:master Jun 9, 2024
@hrdinka
Copy link
Contributor

hrdinka commented Jun 9, 2024

Tested locally. Thanks to everyone and thanks @SuperSamus for maintaining pcsx2 🙂

I had to dismiss the outdated review which blocked the merge.

@SuperSamus SuperSamus deleted the pcsx2-update branch June 11, 2024 22:41
@AndersonTorres AndersonTorres mentioned this pull request Jun 23, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GovanifY GovanifY Awaiting requested review from GovanifY

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@hrdinka hrdinka Awaiting requested review from hrdinka

1 more reviewer

@AndersonTorres AndersonTorres AndersonTorres approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SuperSamus @nixos-discourse @hrdinka @AndersonTorres @SuperSandro2000