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: update deps needed by upstream #103461

Merged
merged 2 commits into from Nov 18, 2020
Merged

Conversation

GovanifY
Copy link
Member

@GovanifY GovanifY commented Nov 11, 2020

Motivation for this change

Upstream now requires more mandatory dependencies. As one of the core developer of upstream I also added myself as a maintainer.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GovanifY GovanifY force-pushed the pcsx2-usb-merge branch 2 times, most recently from 130be09 to 45897bc Compare November 11, 2020 15:29
@samuelgrf
Copy link
Member

The build fails with No system or bundled fmt was found, we have to merge #101251 first and add fmt to deps.

@GovanifY
Copy link
Member Author

@samuelgrf ah right, we only added support for system fmt 3 days ago: PCSX2/pcsx2#3838, before that we ended up using a baked in one. This derivation should still work with the baked in fmt though: No system fmt was found. Using bundled

The build failed before that because I forgot to add myself to maintainers-list.nix

@samuelgrf
Copy link
Member

samuelgrf commented Nov 11, 2020

Ah, seems like you have sandboxing disabled, the build otherwise fails because there's no network connection.
fetchFromGitHub doesn't fetch submodules by default.

@GovanifY
Copy link
Member Author

Sorry for the delay, @samuelgrf I realized I tested on a path that already had submodules, which the fetchGithub one did not have, so that was unrelated to the sandboxing.

As a matter of fact the repository already had submodules so it's a wonder this went unnoticed for so long.

I went ahead and rebased + updated the fetch git. This should be good to merge for now, until we switch to a builtin system fmt.

@hrdinka
Copy link
Contributor

hrdinka commented Nov 13, 2020

Hi @GovanifY,

Thanks for the changes. Great to have an upstream maintainer on board 👍 Just two more things that can be fixed with one interactive rebase (git rebase -i):

  • rename the commit to pcsx2: unstable-2020-10-10 -> unstable-2020-11-13, following our contribution guide
  • change the order of the commits, you must first be added to the maintainers list, else the first commit leaves a broken nixpkgs tree

@GovanifY
Copy link
Member Author

Thanks for the guidance @hrdinka , this should now be good to go!

@hrdinka
Copy link
Contributor

hrdinka commented Nov 13, 2020

Great, I will merge it when ofborg has finished!

@samuelgrf
Copy link
Member

@GovanifY #101251 was just merged, I think it'd be best add the change to this pr instead of opening a new one afterwards.

@GovanifY
Copy link
Member Author

@samuelgrf this should take care of that, although pcsx2 currently requires a specific fmt version. I'll think about removing this version check and simply ensuring major versions sync on upstream later.

@GovanifY
Copy link
Member Author

Anything else I need to do before merging this?

@GovanifY GovanifY mentioned this pull request Nov 13, 2020
10 tasks
@GovanifY
Copy link
Member Author

@samuelgrf As explained in the comments of your review I kept the fetchSubmodules since the current repository already used submodules in some cases and we might introduce more in the future.
Is there anything else I need to change before merging this?

@hrdinka hrdinka merged commit 567c2d8 into NixOS:master Nov 18, 2020
@hrdinka
Copy link
Contributor

hrdinka commented Nov 18, 2020

Great that we got this done, thanks to everyone 👍

@GovanifY GovanifY deleted the pcsx2-usb-merge branch November 18, 2020 11:14
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

4 participants