Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 81902419ddb8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63acac64354d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 22, 2020

  1. pcsx2 unstable-2020-01-05 -> 1.6.0-rc

    @Omoroca13
    Omoroca13 committed Apr 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 325649BCA6D53027
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    56ab879 View commit details

  2. Merge pull request #85679 from Omoroca13/pcsx2 

    pcsx2: unstable-2020-01-05 -> 1.6.0-rc
    @hrdinka
    hrdinka authored Apr 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63acac6 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/misc/emulators/pcsx2/default.nix
6 changes: 3 additions & 3 deletions pkgs/misc/emulators/pcsx2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "pcsx2";
version = "unstable-2020-01-05";
version = "1.6.0-rc";

src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
rev = "9c12937351c51b921e1f28d44b019bc52e747c51";
sha256 = "0y1f5v99a6njmf6hyvl4z5xnrm7351rkyw2fn4f09hqn92r7zmi5";
rev = "v${version}";
sha256 = "1mdv1dgwawb4k6bs1jh6j2jaaxg168fbssm1lwnlk5di0gz31h23";
};

postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp";