From 8471a1e87c8c733eb80a947d1839a9a55e06584c Mon Sep 17 00:00:00 2001 From: nocent Date: Sun, 3 Jun 2018 09:36:36 +0200 Subject: [PATCH 1/5] rpcs3: 0.0.4-8032 -> 0.0.5-6884 --- pkgs/misc/emulators/rpcs3/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 140149bde495d..c72683b7fc8fd 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig -, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -7,12 +7,15 @@ stdenv.mkDerivation rec { name = "rpcs3-${version}"; - version = "2018-02-23"; + version = "0.0.5-6884"; src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; - sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x"; + rev = "dcd7f442fac3b9b45ecaddf5460ecb8f7238df2e"; + sha256 = "0fqdwd6lr5yb4lffmvw4abhdfr70bl4jfdc95cmpc0zzdld0lb0a"; + branchName = "master"; # Prevent default 'fetchgit' branch from appearing in version info + deepClone = true; # Required for git describe to return commit count in version info + leaveDotGit = true; # Required for version header file generation }; cmakeFlags = [ @@ -21,10 +24,10 @@ stdenv.mkDerivation rec { "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase openal glew llvm_4 vulkan-loader libpng ffmpeg libevdev + qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; @@ -34,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar nocent ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; From 6beac41ea978e06e3302decd7b44dd5812a71cd6 Mon Sep 17 00:00:00 2001 From: nocent Date: Sun, 3 Jun 2018 13:04:16 +0000 Subject: [PATCH 2/5] rpcs3: update hash --- pkgs/misc/emulators/rpcs3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index c72683b7fc8fd..7a2874bd392eb 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; rev = "dcd7f442fac3b9b45ecaddf5460ecb8f7238df2e"; - sha256 = "0fqdwd6lr5yb4lffmvw4abhdfr70bl4jfdc95cmpc0zzdld0lb0a"; + sha256 = "1zjkv7vj110r19vjwhnzqz9l92cv00z02vkwi2fhi26m7avbhr3y"; branchName = "master"; # Prevent default 'fetchgit' branch from appearing in version info deepClone = true; # Required for git describe to return commit count in version info leaveDotGit = true; # Required for version header file generation From e0100ff617383454448165207f9ac484c1495195 Mon Sep 17 00:00:00 2001 From: nocent Date: Sat, 9 Jun 2018 22:29:34 +0000 Subject: [PATCH 3/5] rpcs3: 0.0.5-6884 -> 0.0.5-6925 --- pkgs/misc/emulators/rpcs3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 7a2874bd392eb..d89367a7b7663 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "rpcs3-${version}"; - version = "0.0.5-6884"; + version = "0.0.5-6925"; src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "dcd7f442fac3b9b45ecaddf5460ecb8f7238df2e"; - sha256 = "1zjkv7vj110r19vjwhnzqz9l92cv00z02vkwi2fhi26m7avbhr3y"; + rev = "db9a6113d7155eb14cb2770bbd6af46b26797fd9"; + sha256 = "0jyj9z1x44vi86gabmryigggbsmm0vfvivw4krppxxqiirgr8bli"; branchName = "master"; # Prevent default 'fetchgit' branch from appearing in version info deepClone = true; # Required for git describe to return commit count in version info leaveDotGit = true; # Required for version header file generation From f59e3749e4d9d8888841b71f3688ec2198b4223c Mon Sep 17 00:00:00 2001 From: nocent Date: Tue, 12 Jun 2018 20:47:58 +0000 Subject: [PATCH 4/5] rpcs3: 0.0.5-6925 -> 0.0.5-6938 --- pkgs/misc/emulators/rpcs3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index d89367a7b7663..a59e5c149e51d 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "rpcs3-${version}"; - version = "0.0.5-6925"; + version = "0.0.5-6938"; src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "db9a6113d7155eb14cb2770bbd6af46b26797fd9"; - sha256 = "0jyj9z1x44vi86gabmryigggbsmm0vfvivw4krppxxqiirgr8bli"; + rev = "4db0cf005bbd030dc001b41e480a739db77db601"; + sha256 = "1hcafhlz6y1hkbfklszf4hbdiciwgswkwwdpw9j3kvyvgs2bwhfl"; branchName = "master"; # Prevent default 'fetchgit' branch from appearing in version info deepClone = true; # Required for git describe to return commit count in version info leaveDotGit = true; # Required for version header file generation From fa573c9b6a9b629141cee9dd57130424711892fa Mon Sep 17 00:00:00 2001 From: nocent Date: Fri, 22 Jun 2018 14:10:44 +0000 Subject: [PATCH 5/5] rpcs3: 0.0.5-6938 -> 0.0.5-6980 Manually write version header instead of generating it with git, which required leaveDotGit to be enabled. This caused some hash mismatches (see #8567) has thus been disabled. --- pkgs/misc/emulators/rpcs3/default.nix | 47 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index a59e5c149e51d..732a5971ed3c2 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,22 +1,31 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, git -, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "0.0.5-6938"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "4db0cf005bbd030dc001b41e480a739db77db601"; - sha256 = "1hcafhlz6y1hkbfklszf4hbdiciwgswkwwdpw9j3kvyvgs2bwhfl"; - branchName = "master"; # Prevent default 'fetchgit' branch from appearing in version info - deepClone = true; # Required for git describe to return commit count in version info - leaveDotGit = true; # Required for version header file generation - }; +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +let + majorVersion = "0.0.5"; + gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) +in +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "${majorVersion}-${gitVersion}"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; + sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; + }; + + preConfigure = '' + cat > ./rpcs3/git-version.h <