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.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
Contributor

@aanderse aanderse commented Dec 10, 2019

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
Contributor Author

@aanderse aanderse commented Dec 10, 2019

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

@aanderse aanderse requested a review from worldofpeace Dec 10, 2019
@ofborg ofborg bot requested a review from hrdinka Dec 10, 2019
@aanderse aanderse requested a review from jtojnar Dec 13, 2019
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 aanderse:pcsx2 branch 2 times, most recently from a05c111 to 32c8e81 Jan 8, 2020
@aanderse aanderse requested a review from jtojnar Jan 8, 2020
@aanderse
Copy link
Contributor Author

@aanderse 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 aanderse:pcsx2 branch 2 times, most recently from 0b76fe9 to e8d8725 Jan 8, 2020
Copy link
Member

@worldofpeace worldofpeace left a comment

It's the magical good enough 👍

Copy link
Member

@worldofpeace worldofpeace left a comment

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

@aanderse aanderse force-pushed the aanderse:pcsx2 branch from e8d8725 to d30de78 Jan 8, 2020
@aanderse
Copy link
Contributor Author

@aanderse aanderse commented Jan 8, 2020

@worldofpeace pardon my git stupidity 😝 Should build now 🤞

@aanderse aanderse merged commit fabd3f5 into NixOS:master Jan 11, 2020
16 checks passed
16 checks passed
pcsx2 on aarch64-linux No attempt
Details
pcsx2 on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
pcsx2 on x86_64-linux Success
Details
@aanderse aanderse deleted the aanderse:pcsx2 branch Jan 11, 2020
@Omoroca13 Omoroca13 mentioned this pull request Apr 21, 2020
0 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.