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.5779 -> 1.7.5919 #324113

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Jul 2, 2024

Description of changes

This includes work from @SuperSamus 's original PR (#322142) with the addition of x86_64-darwin hash.

Changes propagated from the previous PR:

Diff: https://github.com/PCSX2/pcsx2/compare/v1.7.5779...v1.7.5919

Also pinned Shaderc (didn't do it in a separate commit because I'd first have to pin it to 2024.0, then update it).
Upstream decided that Shaderc is now a dynamic library.

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.

@devusb
Copy link
Contributor

devusb commented Jul 3, 2024

Result of nixpkgs-review pr 324113 run on x86_64-linux 1

1 package built:
  • pcsx2

@devusb
Copy link
Contributor

devusb commented Jul 3, 2024

Tested through to a game -- seemed to launch and play fine.

pkgs/by-name/pc/pcsx2/linux.nix Outdated Show resolved Hide resolved
pkgs/by-name/pc/pcsx2/linux.nix Outdated Show resolved Hide resolved
@matteo-pacini
Copy link
Contributor Author

@getchoo thanks for the feedback, ready for re-review 🙏🏻

Copy link
Contributor

@Pandapip1 Pandapip1 left a comment

Choose a reason for hiding this comment

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

Diff LGTM. Two non-blocking nits.

src = fetchFromGitHub {
owner = "google";
repo = "shaderc";
rev = "v${version}";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
rev = "v${version}";
rev = "refs/tags/v${version}";

Copy link
Member

Choose a reason for hiding this comment

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

Is this causing bugs?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, but "v${version}" could refer to a branch if one were created with that name.

Copy link
Member

Choose a reason for hiding this comment

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

Upstream could also just force‐push a different tag pointer if they wanted to break things, right? Not objecting to the principle, just wondering if this has ever come up in practice.

Copy link
Contributor

Choose a reason for hiding this comment

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

My concern is more about the ambiguity than the possibility of breaking stuff. If they wanted to guarantee a breakage, they could delete the repo.

Copy link
Member

Choose a reason for hiding this comment

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

I remember this happening a long time ago with nickel.
But I think we should not be overzealous with this.

@@ -55,23 +54,12 @@ llvmPackages_17.stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
fetchSubmodules = true;
rev = "v${finalAttrs.version}";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
rev = "v${finalAttrs.version}";
rev = "refs/tags/v${finalAttrs.version}";

Copy link
Contributor

Choose a reason for hiding this comment

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

What is the meaningful difference of adding refs/tags/ here? (Since v${version} works.)

Copy link
Member

Choose a reason for hiding this comment

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

That refs/tags/ is not ambiguous, just using v${version} could also mean a branch.

@matteo-pacini matteo-pacini mentioned this pull request Jul 8, 2024
13 tasks
@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/1805

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.

LGeTM

@SuperSandro2000 SuperSandro2000 merged commit 6cdec38 into NixOS:master Jul 9, 2024
28 checks passed
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

10 participants