retroarch: 1.19.1 -> 1.20.0 (#372719)

NixOS · Jan 11, 2025 · e9b1bb0 · e9b1bb0
2 parents 555bf90 + d4eecb6
commit e9b1bb0
Show file tree

Hide file tree

Showing 31 changed files with 91 additions and 96 deletions.
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2024-11-15";
+  version = "0-unstable-2025-01-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "1068cb8dbd6f312664ecf5901625cab4a6533204";
-    hash = "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA=";
+    rev = "60cf49e94e65d4023d93718161dc03b9e24da47a";
+    hash = "sha256-EFiLF/5zcoPFnzozEqkXWOEjx3KCgRoixYXqN9ai7qc=";
   };
 
   extraBuildInputs = lib.optionals withHw [

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix b/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix
@@ -5,7 +5,7 @@
 }:
 mkLibretroCore {
   core = "mednafen-supafaust";
-  version = "0-unstable-2024-10-01";
+  version = "0-unstable-2024-09-30";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2024-12-13";
+  version = "0-unstable-2025-01-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "a0bb11bbb1fc5d6b478baca53c3efe526c43986c";
-    hash = "sha256-unOJ2hdCA5LxNUcJe7fJCAetLpqrQzujxFDOsxLzXow=";
+    rev = "1e0054da1c158857dc444b9b52273ddd18858d49";
+    hash = "sha256-zm4X5RTaAm2njtvCBWBT1vhtf/YQvoBaaBSMzz9D2aQ=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/emulators/libretro/cores/desmume2015.nix b/pkgs/applications/emulators/libretro/cores/desmume2015.nix
@@ -10,7 +10,7 @@
 }:
 mkLibretroCore {
   core = "desmume2015";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2022-04-05";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2024-09-28";
+  version = "0-unstable-2024-12-31";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "9b4147fd14332a7354c9b76fa72653bda2d919e9";
-    hash = "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I=";
+    rev = "9e468f0087454c6c1b68975ead933977d5cf33b2";
+    hash = "sha256-tiyDXxwZapu+Ol1icOeemVQ5oAjMMx2/M4nA0CiRkMY=";
   };
 
   hardeningDisable = [ "format" ];

diff --git a/pkgs/applications/emulators/libretro/cores/easyrpg.nix b/pkgs/applications/emulators/libretro/cores/easyrpg.nix
@@ -67,6 +67,9 @@ mkLibretroCore {
   ];
   makefile = "Makefile";
 
+  # Do not update automatically since we want to pin a specific version
+  passthru.updateScript = null;
+
   meta = {
     description = "EasyRPG Player libretro port";
     homepage = "https://github.com/EasyRPG/Player";

diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2024-10-03";
+  version = "0-unstable-2025-01-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5";
-    hash = "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE=";
+    rev = "b8780c057029db8768c9a057b0bc28f9a12609d8";
+    hash = "sha256-cK3ILA0Ape6rHf5dPbXOMmQ69ZPZ/qrxeKYA1LniBEk=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2024-10-05";
+  version = "0-unstable-2025-01-09";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "d689c50e21bf956913ac607933cd4082eaedc06b";
-    hash = "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k=";
+    rev = "3114344414dbd8fb08efe1d6a25dbae457a2ec44";
+    hash = "sha256-UgH8L02WkAPaMMUnes6GYLjRbkuY8+9b6LCGaaQWhjQ=";
     fetchSubmodules = true;
   };
 

diff --git a/pkgs/applications/emulators/libretro/cores/fuse.nix b/pkgs/applications/emulators/libretro/cores/fuse.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fuse";
-  version = "0-unstable-2024-09-20";
+  version = "0-unstable-2024-11-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fuse-libretro";
-    rev = "6fd07d90acc38a1b8835bf16539b833f21aaa38f";
-    hash = "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s=";
+    rev = "cad85b7b1b864c65734f71aa4a510b6f6536881c";
+    hash = "sha256-SdwdcR9szJJoUxQ4y8rh40Bdnn5ZI2qV4OcS39BFViQ=";
   };
 
   meta = {

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2024-12-20";
+  version = "0-unstable-2025-01-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "a870b6dcde66fba00cd7aab5ae4bb699e458a91b";
-    hash = "sha256-yarpWSRmfqufj3sXwO1SHZ7VnPSITK/WG8u6mHil/OE=";
+    rev = "36a0da43fe6a82aba6acc5336574dbd749b18fa8";
+    hash = "sha256-3PM7PK1ouMObNZEIIIBG8gxIydYFKP9RRGlWBr5PIGU=";
   };
 
   meta = {

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2024-12-13";
+  version = "0-unstable-2025-01-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "3c1698778080541927f3d7011a00d2c9efe545af";
-    hash = "sha256-H310/VeGDVNz3bYEb7qIcstFc2ae0F+5+0LVVSHLeqI=";
+    rev = "bf492bf3532b9d30e7a023e4329e202b15169e1c";
+    hash = "sha256-QxplBzath9xN0AaFOT8K0dVEnMnTaZpLfdsX81fmP9g=";
   };
 
   meta = {

diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2024-11-01";
+  version = "0-unstable-2025-01-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "a67797ad2f7516906ed7acef87569c6f35ca8739";
-    hash = "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk=";
+    rev = "20db0f242e4e11a476b548dd57d2ef9cc3e84f03";
+    hash = "sha256-+xShU96m+KCHrFleEy55fBD5vCM+hsYMqIvRZQtzsr8=";
     fetchSubmodules = true;
   };
 

diff --git a/pkgs/applications/emulators/libretro/cores/mame2000.nix b/pkgs/applications/emulators/libretro/cores/mame2000.nix
@@ -6,7 +6,7 @@
 }:
 mkLibretroCore {
   core = "mame2000";
-  version = "0-unstable-2024-11-01";
+  version = "0-unstable-2024-07-01";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2024-12-29";
+  version = "0-unstable-2025-01-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "aaf1a95728d9ca6d4cf6633b6a839f8daa27db81";
-    hash = "sha256-AjeXfISAcH6RiHU5gJutZUdpg2p+ASVKsI1+Nl76xSY=";
+    rev = "aee3dac97c72e45b43423349289937dbe2d4a1ce";
+    hash = "sha256-X8K536+VfM/WAr4LIhYGWKEt8Oz8GCUMoSqYwQXBQos=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/applications/emulators/libretro/cores/mame2015.nix
@@ -7,7 +7,7 @@
 }:
 mkLibretroCore {
   core = "mame2015";
-  version = "0-unstable-2023-11-01";
+  version = "0-unstable-2023-10-31";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/mame2016.nix b/pkgs/applications/emulators/libretro/cores/mame2016.nix
@@ -8,7 +8,7 @@
 }:
 mkLibretroCore {
   core = "mame2016";
-  version = "0-unstable-2024-04-06";
+  version = "0-unstable-2022-04-06";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/mesen.nix b/pkgs/applications/emulators/libretro/cores/mesen.nix
@@ -5,7 +5,7 @@
 }:
 mkLibretroCore {
   core = "mesen";
-  version = "0.9.9-unstable-2024-10-21";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/mrboom.nix b/pkgs/applications/emulators/libretro/cores/mrboom.nix
@@ -5,7 +5,7 @@
 }:
 mkLibretroCore rec {
   core = "mrboom";
-  version = "5.5-unstable-2024-10-21";
+  version = "0-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "Javanaise";

diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2024-12-22";
+  version = "0-unstable-2025-01-05";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "6bbfff9a56ead67f0da696ab2c3aea3c11896964";
-    hash = "sha256-D2FtfabikcZq0dl+ot/NJJkOaQXj0Sl5P2ioNrvxgSs=";
+    rev = "9762adc00668f3a2e1016f3ad07ff9cbf9d67459";
+    hash = "sha256-CLEwhQ91dxoTLyhlQwssoCL/dEqY6SetwWLogfJi8RU=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix
@@ -6,7 +6,7 @@
 }:
 mkLibretroCore {
   core = "opera";
-  version = "0-unstable-2024-10-17";
+  version = "0-unstable-2024-10-16";
 
   src = fetchFromGitHub {
     owner = "libretro";

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2024-11-17";
+  version = "0-unstable-2025-01-09";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e";
-    hash = "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0=";
+    rev = "c5d1f1dd5e304dfcba2adf0de8aa9188ca35fad3";
+    hash = "sha256-4stYqeGrKtNtjbhoG8IriV41xq3urH9QMNnqYMQ7CxQ=";
   };
 
   dontConfigure = true;

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix
@@ -2,62 +2,54 @@
   lib,
   cmake,
   fetchFromGitHub,
-  gcc12Stdenv,
-  gettext,
   libGL,
   libGLU,
-  libaio,
-  libpcap,
-  libpng,
-  libxml2,
   mkLibretroCore,
+  perl,
   pkg-config,
-  xxd,
   xz,
 }:
 mkLibretroCore {
   core = "pcsx2";
-  version = "0-unstable-2023-01-30";
+  version = "0-unstable-2025-01-09";
 
   src = fetchFromGitHub {
     owner = "libretro";
-    repo = "lrps2";
-    rev = "f3c8743d6a42fe429f703b476fecfdb5655a98a9";
-    hash = "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=";
+    repo = "ps2";
+    rev = "397b8f54b92aeffd2dd502c2c9b601305fb1de9d";
+    hash = "sha256-zP4gOxAAWqgmGkilVijY2GF6awD7cbMICfxYSsI1wa0=";
+    fetchSubmodules = true;
   };
 
   extraNativeBuildInputs = [
     cmake
-    gettext
     pkg-config
   ];
+
   extraBuildInputs = [
-    libaio
     libGL
     libGLU
-    libpcap
-    libpng
-    libxml2
+    perl
     xz
-    xxd
   ];
+
+  # libretro/ps2 needs at least those flags to compile, and probably doesn't
+  # work on x86_64-v1
+  # https://github.com/libretro/ps2/blob/397b8f54b92aeffd2dd502c2c9b601305fb1de9d/cmake/BuildParameters.cmake#L101
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-msse"
+    "-msse2"
+    "-msse4.1"
+    "-mfxsr"
+  ];
+
   makefile = "Makefile";
-  cmakeFlags = [ "-DLIBRETRO=ON" ];
-  # remove ccache
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail "ccache" ""
-  '';
-  postBuild = "cd pcsx2";
-  # causes redefinition of _FORTIFY_SOURCE
-  hardeningDisable = [ "fortify3" ];
-  # FIXME: multiple build errors with GCC13.
-  # Unlikely to be fixed until we switch to libretro/pcsx2 that is a more
-  # up-to-date port (but still WIP).
-  stdenv = gcc12Stdenv;
+
+  preInstall = "cd bin";
 
   meta = {
     description = "Port of PCSX2 to libretro";
-    homepage = "https://github.com/libretro/lrps2";
+    homepage = "https://github.com/libretro/ps2";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.x86;
   };

diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "picodrive";
-  version = "0-unstable-2024-10-19";
+  version = "0-unstable-2024-12-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "picodrive";
-    rev = "0daf92b57fba1fdbc124651573e88373eef28aa5";
-    hash = "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE=";
+    rev = "bb4b7bcddb9f2f218e88971cccc66edf6c7669f0";
+    hash = "sha256-KbPsPG4pFZRHQoLuPVvBdXQTa+uXtmvSBKi7ShMyB3A=";
     fetchSubmodules = true;
   };