Merge pull request #172743 from kira64xyz/master

pkgs/applications/emulators/yuzu/default.nix

@@ -1,22 +1,27 @@
 { branch ? "mainline"
 , libsForQt5
 , fetchFromGitHub
+, fetchurl
 }:
 
 let
-  # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-03-23.
+  # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-05-12
   # Please make sure to update this when updating yuzu!
-  compat-list = ./compatibility-list.json;
+  compat-list = fetchurl {
+    name = "yuzu-compat-list";
+    url = "https://web.archive.org/web/20220512184801/https://api.yuzu-emu.org/gamedb";
+    sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw=";
+  };
 in {
   mainline = libsForQt5.callPackage ./generic.nix rec {
     pname = "yuzu-mainline";
-    version = "992";
+    version = "1014";
 
     src = fetchFromGitHub {
       owner = "yuzu-emu";
       repo = "yuzu-mainline";
       rev = "mainline-0-${version}";
-      sha256 = "1x3fwwdw86jvygbzy9k99j6avfsd867ywm2x25izw10jznpsaixs";
+      sha256 = "1x3d1fjssadv4kybc6mk153jlvncsfgm5aipkq5n5i8sr7mmr3nw";
       fetchSubmodules = true;
     };
 
@@ -25,13 +30,13 @@ in {
 
   early-access = libsForQt5.callPackage ./generic.nix rec {
     pname = "yuzu-ea";
-    version = "2690";
+    version = "2725";
 
     src = fetchFromGitHub {
       owner = "pineappleEA";
       repo = "pineapple-src";
       rev = "EA-${version}";
-      sha256 = "0zm06clbdh9cccq9932q9v976q7sjknynkdvvp04h1wcskmrxi3c";
+      sha256 = "1nmcl9y9chr7cdvnra5zs1v42d3i801hmsjdlz3fmp15n04bcjmp";
       fetchSubmodules = true;
     };
 

pkgs/applications/emulators/yuzu/generic.nix

@@ -45,6 +45,12 @@
 stdenv.mkDerivation rec {
   inherit pname version src;
 
+  # Replace icons licensed under CC BY-ND 3.0 with free ones to allow
+  # for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104
+  # The patch hosted on GitHub has the binary information stripped, so
+  # it has been regenerated with "git format-patch --text --full-index --binary"
+  patches = [ ./yuzu-free-icons.patch ];
+
   nativeBuildInputs = [
     cmake
     doxygen
@@ -145,10 +151,11 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     license = with licenses; [
       gpl3Plus
-      # Icons
-      cc-by-nd-30 cc0
+      # Icons. Note that this would be cc0 and cc-by-nd-30 without the "yuzu-free-icons" patch
+      asl20 mit cc0
     ];
     maintainers = with maintainers; [
+      ashley
       ivar
       joshuafern
       sbruder

pkgs/applications/emulators/yuzu/update.sh

@@ -23,21 +23,6 @@ getLocalHash() {
     popd >/dev/null
 }
 
-updateCompatList() {
-    NEW_COMPAT_LIST="$(curl -s "https://api.yuzu-emu.org/gamedb")"
-
-    if [[ "$(cat ./compatibility-list.json)" = "${NEW_COMPAT_LIST}" ]]; then
-        echo "Compatibility list is already up to date!"
-    else
-        local TODAY="$(date +"%Y-%m-%d")"
-
-        echo "Compatibility list: updated to $TODAY"
-        echo "${NEW_COMPAT_LIST}" > ./compatibility-list.json
-
-        sed -i -e "s/last updated .*/last updated $TODAY./" ./default.nix
-    fi
-}
-
 updateMainline() {
     OLD_MAINLINE_VERSION="$(getLocalVersion "yuzu-mainline")"
     OLD_MAINLINE_HASH="$(getLocalHash "yuzu-mainline")"
@@ -90,13 +75,10 @@ updateEarlyAccess() {
 
 if [[ "$BRANCH" = "mainline" ]]; then
     updateMainline
-    updateCompatList
 elif [[ "$BRANCH" = "early-access" ]]; then
     updateEarlyAccess
-    updateCompatList
 else
     KEEP_GOING=1
     updateMainline
     updateEarlyAccess
-    updateCompatList
 fi