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

pcsx2: 1.7.5587 -> 1.7.5779 #305509

Merged
merged 2 commits into from
Jun 9, 2024
Merged

pcsx2: 1.7.5587 -> 1.7.5779 #305509

merged 2 commits into from
Jun 9, 2024

Conversation

SuperSamus
Copy link
Contributor

@SuperSamus SuperSamus commented Apr 20, 2024

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
12 tasks
@ofborg ofborg bot requested review from hrdinka and GovanifY April 20, 2024 10:54
@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

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

@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
@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
13 tasks
@SuperSamus SuperSamus marked this pull request as draft May 7, 2024 10:00
@SuperSamus
Copy link
Contributor Author

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.

@SuperSamus
Copy link
Contributor Author

Rebased, done what was done with DuckStation, and backported upstream patches to fix startup crashes

(Current master requires some stuff that nixpkgs doesn't have yet, like an updated SDL2 and Shaderc. One step at a time, this PR has been open long enough already.)

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.

pkgs/by-name/pc/pcsx2/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/pc/pcsx2/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/pc/pcsx2/package.nix Outdated Show resolved Hide resolved
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

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

@SuperSamus
Copy link
Contributor Author

Anything left to do before this can be merged?

Diff: PCSX2/pcsx2@v1.7.5587...v1.7.5779
@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants