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

Jump to bottom

pcsx2: 1.4.0 -> unstable-2020-01-05 #75413

Merged
merged 1 commit into from Jan 11, 2020
Merged

pcsx2: 1.4.0 -> unstable-2020-01-05 #75413

merged 1 commit into from Jan 11, 2020

Conversation

aanderse
Copy link
Member

Motivation for this change

#74132

This PR isn't perfect, but this was as much effort as I was willing to put into it. The PR fixes a broken build, so I'd say "better than nothing" at this point 🤷‍♂️

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 nix-review --run "nix-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.
Notify maintainers

cc @

@aanderse
Copy link
Member Author

ping @natemonster321 as someone who has contributed to this package in recent history.

@ofborg ofborg bot requested a review from hrdinka December 10, 2019 02:14
jtojnar
jtojnar reviewed Dec 13, 2019
View reviewed changes
pkgs/top-level/all-packages.nix Show resolved Hide resolved
pkgs/misc/emulators/pcsx2/default.nix Outdated Show resolved Hide resolved
@aanderse aanderse changed the title pcsx2: 1.4.0 -> unstable-2019-11-26 pcsx2: 1.4.0 -> unstable-2020-01-05 Jan 8, 2020
@aanderse aanderse force-pushed the pcsx2 branch 2 times, most recently from a05c111 to 32c8e81 Compare January 8, 2020 02:38
@aanderse aanderse requested a review from jtojnar January 8, 2020 02:39
@aanderse
Copy link
Member Author

aanderse commented Jan 8, 2020

At this point not much more I can do with current motivation levels. This resolves #74132 which in my books is a reasonable motivation to merge. Let me know if anything else is pressing. Thanks again @jtojnar!

@aanderse aanderse force-pushed the pcsx2 branch 2 times, most recently from 0b76fe9 to e8d8725 Compare January 8, 2020 11:33
worldofpeace
worldofpeace approved these changes Jan 8, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

It's the magical good enough 👍

worldofpeace
worldofpeace suggested changes Jan 8, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I stand corrected, always by the CI 🤣
It fails to build.

@aanderse
Copy link
Member Author

aanderse commented Jan 8, 2020

@worldofpeace pardon my git stupidity 😝 Should build now 🤞

@aanderse aanderse merged commit fabd3f5 into NixOS:master Jan 11, 2020
@aanderse aanderse deleted the pcsx2 branch January 11, 2020 15:42
@Omoroca13 Omoroca13 mentioned this pull request Apr 21, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace requested changes

@hrdinka hrdinka Awaiting requested review from hrdinka

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aanderse @jtojnar @worldofpeace