From 205b85c7dee809b1880cf3400ff577e55d96a8ce Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:38:06 +0000 Subject: [PATCH 01/93] libretro: make it a scope --- pkgs/applications/emulators/retroarch/cores.nix | 17 +++++++---------- .../emulators/retroarch/mkLibretroCore.nix | 6 +++--- pkgs/top-level/all-packages.nix | 9 +++------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f30d55ee4395..b113dbd9f666 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -1,4 +1,5 @@ { lib +, newScope , stdenv , gcc12Stdenv , alsa-lib @@ -30,7 +31,6 @@ , libxml2 , libxmp , libzip -, makeWrapper , mpg123 , nasm , openssl @@ -40,7 +40,6 @@ , pkg-config , portaudio , python3 -, retroarch , sfml , snappy , speexdsp @@ -49,7 +48,6 @@ , xorg , xxd , xz -, zlib }: let @@ -67,7 +65,8 @@ let fetcherFn src; getCoreVersion = repo: (getCore repo).version; - +in +lib.makeScope newScope (self: rec { mkLibretroCore = # Sometimes core name != repo name, so you may need to set them differently # when necessary: @@ -82,12 +81,10 @@ let , version ? (getCoreVersion repo) , ... }@args: - import ./mkLibretroCore.nix ({ - inherit lib stdenv core repo src version makeWrapper retroarch zlib; + self.callPackage ./mkLibretroCore.nix ({ + inherit core repo src version; + retroarch = self.retroarchBare; } // args); -in -{ - inherit mkLibretroCore; atari800 = mkLibretroCore { core = "atari800"; @@ -1168,4 +1165,4 @@ in license = lib.licenses.gpl2Only; }; }; -} +}) diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index bf933bf70159..1d4a6ade42d3 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -3,7 +3,7 @@ , core , repo , makeWrapper -, retroarch +, retroarchBare , zlib , makefile ? "Makefile.libretro" , extraBuildInputs ? [ ] @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ runHook preInstall install -Dt ${coreDir} ${coreFilename} - makeWrapper ${retroarch}/bin/retroarch $out/bin/${mainProgram} \ + makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ --add-flags "-L ${coreDir}/${coreFilename}" runHook postInstall @@ -78,7 +78,7 @@ stdenv.mkDerivation ({ meta = with lib; { inherit mainProgram; - inherit (retroarch.meta) platforms; + inherit (retroarchBare.meta) platforms; homepage = "https://www.libretro.com/"; maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; } // (args.meta or { }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3aa1e178d9e..a0d1954f1a1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1480,12 +1480,7 @@ with pkgs; retroarch-joypad-autoconfig = callPackage ../applications/emulators/retroarch/retroarch-joypad-autoconfig.nix { }; - libretranslate = with python3.pkgs; toPythonApplication libretranslate; - - libretro = recurseIntoAttrs - (callPackage ../applications/emulators/retroarch/cores.nix { - retroarch = retroarchBare; - }); + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { }); libretro-core-info = callPackage ../applications/emulators/retroarch/libretro-core-info.nix { }; @@ -10020,6 +10015,8 @@ with pkgs; python = python3; }; + libretranslate = with python3.pkgs; toPythonApplication libretranslate; + librsb = callPackage ../development/libraries/librsb { # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; From 654cf1989a19c97e2225fd04de6ccee440ecb077 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:47:56 +0000 Subject: [PATCH 02/93] libretro.atari800: unstable-2024-10-01 -> 0-unstable-2024-10-31, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/atari800.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/atari800.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b113dbd9f666..fc9922ca23d3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -83,18 +83,9 @@ lib.makeScope newScope (self: rec { }@args: self.callPackage ./mkLibretroCore.nix ({ inherit core repo src version; - retroarch = self.retroarchBare; } // args); - atari800 = mkLibretroCore { - core = "atari800"; - makefile = "Makefile"; - makeFlags = [ "GIT_VERSION=" ]; - meta = { - description = "Port of Atari800 to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + atari800 = self.callPackage ./cores/atari800.nix { }; beetle-gba = mkLibretroCore { core = "mednafen-gba"; diff --git a/pkgs/applications/emulators/retroarch/cores/atari800.nix b/pkgs/applications/emulators/retroarch/cores/atari800.nix new file mode 100644 index 000000000000..d749224cb248 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/atari800.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "atari800"; + version = "0-unstable-2024-10-31"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-atari800"; + rev = "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b"; + hash = "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE="; + }; + + makefile = "Makefile"; + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Port of Atari800 to libretro"; + homepage = "https://github.com/libretro/libretro-atari800"; + license = lib.licenses.gpl2Only; + }; +} From 36b0d8f9ece3d47bb5797bf52c7afc904c6dbb88 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 10:54:19 +0000 Subject: [PATCH 03/93] libretro.beetle-gba: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------ .../emulators/retroarch/cores/beetle-gba.nix | 28 +++++++++++++++++++ .../emulators/retroarch/mkLibretroCore.nix | 6 ++-- 3 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-gba.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index fc9922ca23d3..046fccc0eeac 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -87,15 +87,7 @@ lib.makeScope newScope (self: rec { atari800 = self.callPackage ./cores/atari800.nix { }; - beetle-gba = mkLibretroCore { - core = "mednafen-gba"; - repo = "beetle-gba"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's GameBoy Advance core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-gba = self.callPackage ./cores/beetle-gba.nix { }; beetle-lynx = mkLibretroCore { core = "mednafen-lynx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix new file mode 100644 index 000000000000..22ce05982d23 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-gba"; + version = "0-unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-gba-libretro"; + rev = "6cee80685f735ea6c2373db2622a1f1ee9f39d39"; + hash = "sha256-a3XgExXVCUFw3GLCUkEl6now2L8qVdNOaXvrDMcT1ZE="; + }; + + makefile = "Makefile"; + + # TODO: move this to mkLibretroCore + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Port of Mednafen's GameBoy Advance core to libretro"; + homepage = "https://github.com/libretro/beetle-gba-libretro"; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 1d4a6ade42d3..86f05d6895e3 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -1,7 +1,7 @@ { lib , stdenv , core -, repo +, repo ? null # TODO: remove , makeWrapper , retroarchBare , zlib @@ -73,8 +73,8 @@ stdenv.mkDerivation ({ passthru = { inherit core libretroCore; - updateScript = [ ./update_cores.py repo ]; - }; + updateScript = lib.mkIf (repo != null) [ ./update_cores.py repo ]; + } // (args.passthru or { }); meta = with lib; { inherit mainProgram; From 9ead44754bdc42a5fb36fd80f3c4d9d661efbe98 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:08:17 +0000 Subject: [PATCH 04/93] libretro.beetle-lynx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-lynx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 046fccc0eeac..a5d5382c0de0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -89,15 +89,7 @@ lib.makeScope newScope (self: rec { beetle-gba = self.callPackage ./cores/beetle-gba.nix { }; - beetle-lynx = mkLibretroCore { - core = "mednafen-lynx"; - repo = "beetle-lynx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's Lynx core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-lynx = self.callPackage ./cores/beetle-lynx.nix { }; beetle-ngp = mkLibretroCore { core = "mednafen-ngp"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix new file mode 100644 index 000000000000..502d8c5df34f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-lynx"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-lynx-libretro"; + rev = "7fead71b49e0f08be5c4d4224fea73c6174763bf"; + hash = "sha256-fYBx/bjbhRXoVIGnEg4/oMVm705ivL1os+FfVQLRSyI="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's Lynx core to libretro"; + homepage = "https://github.com/libretro/beetle-lynx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 1066bbd6a401e5e07b0f4a7bb183d9f2930de03e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:37:45 +0000 Subject: [PATCH 05/93] libretro.beetle-ngp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-ngp.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a5d5382c0de0..aaca31f33272 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -91,15 +91,7 @@ lib.makeScope newScope (self: rec { beetle-lynx = self.callPackage ./cores/beetle-lynx.nix { }; - beetle-ngp = mkLibretroCore { - core = "mednafen-ngp"; - repo = "beetle-ngp"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's NeoGeo Pocket core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-ngp = self.callPackage ./cores/beetle-ngp.nix { }; beetle-pce = mkLibretroCore { core = "mednafen-pce"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix new file mode 100644 index 000000000000..6c86135282ad --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-ngp"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-ngp-libretro"; + rev = "139fe34c8dfc5585d6ee1793a7902bca79d544de"; + hash = "sha256-ruWnCgMxfpPHTWQ7vgNUczmGRzNKKhoZTNlUcNgm4T8="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's NeoGeo Pocket core to libretro"; + homepage = "https://github.com/libretro/beetle-ngp-libretro"; + license = lib.licenses.gpl2Only; + }; +} From a00a3734e052e89900be481a46d4935a64d4f9ab Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:39:35 +0000 Subject: [PATCH 06/93] libretro.mednafen-pce: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-pce.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pce.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index aaca31f33272..09917bbdbd0d 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -93,15 +93,7 @@ lib.makeScope newScope (self: rec { beetle-ngp = self.callPackage ./cores/beetle-ngp.nix { }; - beetle-pce = mkLibretroCore { - core = "mednafen-pce"; - repo = "beetle-pce"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PC Engine core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pce = self.callPackage ./cores/beetle-pce.nix { }; beetle-pce-fast = mkLibretroCore { core = "mednafen-pce-fast"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix new file mode 100644 index 000000000000..934ff1e0ba0d --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pce"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pce-libretro"; + rev = "af28fb0385d00e0292c4703b3aa7e72762b564d2"; + hash = "sha256-W+74RTIidSUdviihLy926OvlSdqMECvOLEEiWMtB50w="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PC Engine core to libretro"; + homepage = "https://github.com/libretro/beetle-pce-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 36ec2ddc20afed4413616554aa15584642a4a556 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:48:14 +0000 Subject: [PATCH 07/93] libretro.beetle-pce-fast: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-pce-fast.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 09917bbdbd0d..3860a11cb142 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -95,15 +95,7 @@ lib.makeScope newScope (self: rec { beetle-pce = self.callPackage ./cores/beetle-pce.nix { }; - beetle-pce-fast = mkLibretroCore { - core = "mednafen-pce-fast"; - repo = "beetle-pce-fast"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PC Engine fast core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pce-fast = self.callPackage ./cores/beetle-pce-fast.nix { }; beetle-pcfx = mkLibretroCore { core = "mednafen-pcfx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix new file mode 100644 index 000000000000..1af81b8c3c27 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pce-fast"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pce-fast-libretro"; + rev = "931586f0512663f625a6e981d3047a6620281ab5"; + hash = "sha256-9Nne4upiQNSAlTZsyXcLNIwN8MMKUO1ycahowYW1sWg="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PC Engine fast core to libretro"; + homepage = "https://github.com/libretro/beetle-pce-fast-libretro"; + license = lib.licenses.gpl2Only; + }; +} From dc0eba7c0ddb389db60de2597b22064f3b5d608f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 11:55:15 +0000 Subject: [PATCH 08/93] libretro.beetle-pcfx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-pcfx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3860a11cb142..00a1ef9cad22 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -97,15 +97,7 @@ lib.makeScope newScope (self: rec { beetle-pce-fast = self.callPackage ./cores/beetle-pce-fast.nix { }; - beetle-pcfx = mkLibretroCore { - core = "mednafen-pcfx"; - repo = "beetle-pcfx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's PCFX core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-pcfx = self.callPackage ./cores/beetle-pcfx.nix { }; beetle-psx = mkLibretroCore { core = "mednafen-psx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix new file mode 100644 index 000000000000..d53405fb3cb2 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-pcfx"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-pcfx-libretro"; + rev = "dd04cef9355286488a1d78ff18c4c848a1575540"; + hash = "sha256-oFBuriCbJWjgPH9RRAM/XUvkW0gKXnvs7lmBpJpWewo="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's PCFX core to libretro"; + homepage = "https://github.com/libretro/beetle-pcfx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 174f6501e10c4d806cbcebcf058b2ce937f8ceb2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:07:37 +0000 Subject: [PATCH 09/93] libretro.beetle-psx{,-hw}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 23 +---------- .../emulators/retroarch/cores/beetle-psx.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-psx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 00a1ef9cad22..24e7f2f7e682 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -99,28 +99,9 @@ lib.makeScope newScope (self: rec { beetle-pcfx = self.callPackage ./cores/beetle-pcfx.nix { }; - beetle-psx = mkLibretroCore { - core = "mednafen-psx"; - repo = "beetle-psx"; - makefile = "Makefile"; - makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ]; - meta = { - description = "Port of Mednafen's PSX Engine core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-psx = self.callPackage ./cores/beetle-psx.nix { }; - beetle-psx-hw = mkLibretroCore { - core = "mednafen-psx-hw"; - repo = "beetle-psx"; - extraBuildInputs = [ libGL libGLU ]; - makefile = "Makefile"; - makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ]; - meta = { - description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-psx-hw = self.beetle-psx.override { withHw = true; }; beetle-saturn = mkLibretroCore { core = "mednafen-saturn"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix new file mode 100644 index 000000000000..2c76381d3bb4 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix @@ -0,0 +1,38 @@ +{ + lib, + libGL, + libGLU, + fetchFromGitHub, + mkLibretroCore, + withHw ? false, +}: +mkLibretroCore { + core = "mednafen-psx" + lib.optionalString withHw "-hw"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-psx-libretro"; + rev = "1068cb8dbd6f312664ecf5901625cab4a6533204"; + hash = "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA="; + }; + + extraBuildInputs = lib.optionals withHw [ + libGL + libGLU + ]; + + makefile = "Makefile"; + makeFlags = [ + "HAVE_HW=${if withHw then "1" else "0"}" + "HAVE_LIGHTREC=1" + ]; + + meta = { + description = + "Port of Mednafen's PSX Engine core to libretro" + + lib.optionalString withHw " (with hardware acceleration support)"; + homepage = "https://github.com/libretro/beetle-psx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 53e34f0721098ac7cf276e2ce44e862e9063eba8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:10:55 +0000 Subject: [PATCH 10/93] libretro.beetle-saturn: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../retroarch/cores/beetle-saturn.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 24e7f2f7e682..cd49e0d1a88c 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -103,16 +103,7 @@ lib.makeScope newScope (self: rec { beetle-psx-hw = self.beetle-psx.override { withHw = true; }; - beetle-saturn = mkLibretroCore { - core = "mednafen-saturn"; - repo = "beetle-saturn"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's Saturn core to libretro"; - license = lib.licenses.gpl2Only; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - }; - }; + beetle-saturn = self.callPackage ./cores/beetle-saturn.nix { }; beetle-supafaust = mkLibretroCore { core = "mednafen-supafaust"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix new file mode 100644 index 000000000000..196453f1a171 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-saturn"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-saturn-libretro"; + rev = "0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48"; + hash = "sha256-WNQhtaYBg7JqPdxcD0cLRjr2pSda6Xmx/WWYzyu5u9c="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's Saturn core to libretro"; + homepage = "https://github.com/libretro/beetle-saturn-libretro"; + license = lib.licenses.gpl2Only; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From ba415c8b021fb97c93a6ba74de6ac6d05b49929c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:15:18 +0000 Subject: [PATCH 11/93] libretro.beetle-supafaust: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-supafaust.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index cd49e0d1a88c..d4c83678d224 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -105,15 +105,7 @@ lib.makeScope newScope (self: rec { beetle-saturn = self.callPackage ./cores/beetle-saturn.nix { }; - beetle-supafaust = mkLibretroCore { - core = "mednafen-supafaust"; - repo = "beetle-supafaust"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's experimental snes_faust core to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + beetle-supafaust = self.callPackage ./cores/beetle-supafaust.nix { }; beetle-supergrafx = mkLibretroCore { core = "mednafen-supergrafx"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix new file mode 100644 index 000000000000..6f3f9537a00f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-supafaust"; + version = "unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "supafaust"; + rev = "e25f66765938d33f9ad5850e8d6cd597e55b7299"; + hash = "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's experimental snes_faust core to libretro"; + homepage = "https://github.com/libretro/supafaust"; + license = lib.licenses.gpl2Only; + }; +} From 72140b806d9d211572679fc1a1707ed17fdff437 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:20:15 +0000 Subject: [PATCH 12/93] libretro.beetle-supergrafx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-supergrafx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index d4c83678d224..df4098717e9f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -107,15 +107,7 @@ lib.makeScope newScope (self: rec { beetle-supafaust = self.callPackage ./cores/beetle-supafaust.nix { }; - beetle-supergrafx = mkLibretroCore { - core = "mednafen-supergrafx"; - repo = "beetle-supergrafx"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's SuperGrafx core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-supergrafx = self.callPackage ./cores/beetle-supergrafx.nix { }; beetle-vb = mkLibretroCore { core = "mednafen-vb"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix new file mode 100644 index 000000000000..8737d5a824b2 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-supergrafx"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-supergrafx-libretro"; + rev = "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0"; + hash = "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's SuperGrafx core to libretro"; + homepage = "https://github.com/libretro/beetle-supergrafx-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 8a29897d5f88279461eaf45f9ae38451c9a6d3c1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:23:03 +0000 Subject: [PATCH 13/93] libretro.beetle-vb: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/beetle-vb.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-vb.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index df4098717e9f..a6e4edd22ddd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -109,15 +109,7 @@ lib.makeScope newScope (self: rec { beetle-supergrafx = self.callPackage ./cores/beetle-supergrafx.nix { }; - beetle-vb = mkLibretroCore { - core = "mednafen-vb"; - repo = "beetle-vb"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's VirtualBoy core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-vb = self.callPackage ./cores/beetle-vb.nix { }; beetle-wswan = mkLibretroCore { core = "mednafen-wswan"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix new file mode 100644 index 000000000000..1262b40854c7 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-vb"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-vb-libretro"; + rev = "8f837ebc077afdd6652efb2827fd8308a07113ca"; + hash = "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's VirtualBoy core to libretro"; + homepage = "https://github.com/libretro/beetle-vb-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 4b51fe0a49668d8753f8c998a1644fe0fab17503 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:25:20 +0000 Subject: [PATCH 14/93] libretro.beetle-wswan: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/beetle-wswan.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a6e4edd22ddd..6a6c6abc8ae1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -111,15 +111,7 @@ lib.makeScope newScope (self: rec { beetle-vb = self.callPackage ./cores/beetle-vb.nix { }; - beetle-wswan = mkLibretroCore { - core = "mednafen-wswan"; - repo = "beetle-wswan"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's WonderSwan core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + beetle-wswan = self.callPackage ./cores/beetle-wswan.nix { }; blastem = mkLibretroCore { core = "blastem"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix new file mode 100644 index 000000000000..14a856a54220 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mednafen-wswan"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "beetle-wswan-libretro"; + rev = "440e9228592a3f603d7d09e8bee707b0163f545f"; + hash = "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Mednafen's WonderSwan core to libretro"; + homepage = "https://github.com/libretro/beetle-wswan-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 573e6d71af33a6e84813dd338030491b9c9b8f30 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:28:13 +0000 Subject: [PATCH 15/93] libretro.blastem: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/blastem.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/blastem.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6a6c6abc8ae1..ed2066a7ba62 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -113,14 +113,7 @@ lib.makeScope newScope (self: rec { beetle-wswan = self.callPackage ./cores/beetle-wswan.nix { }; - blastem = mkLibretroCore { - core = "blastem"; - meta = { - description = "Port of BlastEm to libretro"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.x86; - }; - }; + blastem = self.callPackage ./cores/blastem.nix { }; bluemsx = mkLibretroCore { core = "bluemsx"; diff --git a/pkgs/applications/emulators/retroarch/cores/blastem.nix b/pkgs/applications/emulators/retroarch/cores/blastem.nix new file mode 100644 index 000000000000..395d568540ac --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/blastem.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "blastem"; + version = "unstable-2022-07-26"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "blastem"; + rev = "277e4a62668597d4f59cadda1cbafb844f981d45"; + hash = "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs="; + }; + + meta = { + description = "Port of BlastEm to libretro"; + homepage = "https://github.com/libretro/blastem"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.x86; + }; +} From ee8af6d04a6f635424f88da317c025444e23bb97 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:33:20 +0000 Subject: [PATCH 16/93] libretro.bluemsx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/bluemsx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bluemsx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed2066a7ba62..948c0b35fff8 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -115,13 +115,7 @@ lib.makeScope newScope (self: rec { blastem = self.callPackage ./cores/blastem.nix { }; - bluemsx = mkLibretroCore { - core = "bluemsx"; - meta = { - description = "Port of BlueMSX to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + bluemsx = self.callPackage ./cores/bluemsx.nix { }; bsnes = mkLibretroCore { core = "bsnes"; diff --git a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix new file mode 100644 index 000000000000..f3be7a2d1ca5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "bluemsx"; + version = "unstable-2024-10-22"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bluemsx-libretro"; + rev = "01ce142ccb85c302420cb962d1b6e6a68a6ce076"; + hash = "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM="; + }; + + meta = { + description = "Port of BlueMSX to libretro"; + homepage = "https://github.com/libretro/blueMSX-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 5d6b381320874afbafed4f2cae30d8841f5c6a2c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:35:24 +0000 Subject: [PATCH 17/93] libretro.bsnes: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/bsnes.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 948c0b35fff8..6e94d6cb04e0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -117,14 +117,7 @@ lib.makeScope newScope (self: rec { bluemsx = self.callPackage ./cores/bluemsx.nix { }; - bsnes = mkLibretroCore { - core = "bsnes"; - makefile = "Makefile"; - meta = { - description = "Port of bsnes to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes = self.callPackage ./cores/bsnes.nix { }; bsnes-hd = mkLibretroCore { core = "bsnes-hd-beta"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes.nix b/pkgs/applications/emulators/retroarch/cores/bsnes.nix new file mode 100644 index 000000000000..533aaa0763f9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "bsnes"; + version = "unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bsnes-libretro"; + rev = "20c55eb6333a11395ba637df8583066483e58cb2"; + hash = "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of bsnes to libretro"; + homepage = "https://github.com/libretro/bsnes-libretro"; + license = lib.licenses.gpl3Only; + }; +} From aac2ac2dbc0b47a42ff5391f9ca5f7b9a6615fdb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:42:27 +0000 Subject: [PATCH 18/93] libretro.bsnes-hd: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 24 +----------- .../emulators/retroarch/cores/bsnes-hd.nix | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6e94d6cb04e0..da3df1e4b4dd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -119,29 +119,7 @@ lib.makeScope newScope (self: rec { bsnes = self.callPackage ./cores/bsnes.nix { }; - bsnes-hd = mkLibretroCore { - core = "bsnes-hd-beta"; - repo = "bsnes-hd"; - makefile = "GNUmakefile"; - makeFlags = - let - # linux = bsd - # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 - platform = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; - in - [ - "-C" - "bsnes" - "target=libretro" - "platform=${platform}" - ]; - extraBuildInputs = [ xorg.libX11 xorg.libXext ]; - postBuild = "cd bsnes/out"; - meta = { - description = "Port of bsnes-hd to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-hd = self.callPackage ./cores/bsnes-hd.nix { }; bsnes-mercury = mkLibretroCore { core = "bsnes-mercury-accuracy"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix new file mode 100644 index 000000000000..33cef08d93bf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + xorg, +}: +mkLibretroCore { + core = "bsnes-hd-beta"; + version = "unstable-2023-04-26"; + + src = fetchFromGitHub { + owner = "DerKoun"; + repo = "bsnes-hd"; + rev = "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8"; + hash = "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI="; + }; + + extraBuildInputs = [ + xorg.libX11 + xorg.libXext + ]; + + makefile = "GNUmakefile"; + makeFlags = [ + "-C" + "bsnes" + "target=libretro" + "platform=linux" + ]; + + postBuild = "cd bsnes/out"; + + meta = { + description = "Port of bsnes-hd to libretro"; + homepage = "https://github.com/DerKoun/bsnes-hd"; + license = lib.licenses.gpl3Only; + }; +} From 813002b411344a99fea41b37512e90966830c331 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 12:49:33 +0000 Subject: [PATCH 19/93] libretro.bsnes-mercury{,-balanced,-performance}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 33 ++----------------- .../retroarch/cores/bsnes-mercury.nix | 26 +++++++++++++++ 2 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index da3df1e4b4dd..e4f4232cfcb6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -121,38 +121,11 @@ lib.makeScope newScope (self: rec { bsnes-hd = self.callPackage ./cores/bsnes-hd.nix { }; - bsnes-mercury = mkLibretroCore { - core = "bsnes-mercury-accuracy"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=accuracy" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (accuracy profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury = self.callPackage ./cores/bsnes-mercury.nix { }; - bsnes-mercury-balanced = mkLibretroCore { - core = "bsnes-mercury-balanced"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=balanced" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (balanced profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury-balanced = self.bsnes-mercury.override { withProfile = "balanced"; }; - bsnes-mercury-performance = mkLibretroCore { - core = "bsnes-mercury-performance"; - repo = "bsnes-mercury"; - makefile = "Makefile"; - makeFlags = [ "PROFILE=performance" ]; - meta = { - description = "Fork of bsnes with HLE DSP emulation restored (performance profile)"; - license = lib.licenses.gpl3Only; - }; - }; + bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; citra = mkLibretroCore rec { core = "citra"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix new file mode 100644 index 000000000000..f86a355a7c69 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + withProfile ? "accuracy", +}: +mkLibretroCore { + core = "bsnes-mercury-${withProfile}"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "bsnes-mercury"; + rev = "0f35d044bf2f2b879018a0500e676447e93a1db1"; + hash = "sha256-skVREKYITZn+gKKSZmwuBCWrG0jb/pifwIgat8VyQ8U="; + }; + + makefile = "Makefile"; + makeFlags = [ "PROFILE=${withProfile}" ]; + + meta = { + description = "Fork of bsnes with HLE DSP emulation restored (${withProfile} profile)"; + homepage = "https://github.com/libretro/bsnes-mercury"; + license = lib.licenses.gpl3Only; + }; +} From 3f0e78e5b8912fc8f2596f0646b073ec465ea6ee Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:15:24 +0000 Subject: [PATCH 20/93] libretro.citra: unstable-2024-01-24 -> unstable-2024-04-01, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 21 +------- .../emulators/retroarch/cores/citra.nix | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/citra.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e4f4232cfcb6..3ea8b478a469 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -127,26 +127,7 @@ lib.makeScope newScope (self: rec { bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; - citra = mkLibretroCore rec { - core = "citra"; - extraBuildInputs = [ libGLU libGL boost ffmpeg_6 nasm ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_FFMPEG_STATIC=0" - # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L87-L90 - "GIT_REV=${(getCoreSrc core).rev}" - "GIT_DESC=${lib.substring 0 8 (getCoreSrc core).rev}" - "GIT_BRANCH=master" - "BUILD_DATE=01/01/1970_00:00" - ]; - # FIXME: build fail with GCC13: - # error: 'mic_device_name' has incomplete type - stdenv = gcc12Stdenv; - meta = { - description = "Port of Citra to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + citra = self.callPackage ./cores/citra.nix { }; desmume = mkLibretroCore { core = "desmume"; diff --git a/pkgs/applications/emulators/retroarch/cores/citra.nix b/pkgs/applications/emulators/retroarch/cores/citra.nix new file mode 100644 index 000000000000..1a826fed9eaa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/citra.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + boost, + ffmpeg_6, + gcc12Stdenv, + libGL, + libGLU, + mkLibretroCore, + nasm, +}: +mkLibretroCore rec { + core = "citra"; + version = "unstable-2024-04-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "citra"; + # TODO: upstream migrated to cmake, this is the latest rev without it + rev = "36b600692905ebd457cbc9321e2f521938eced16"; + hash = "sha256-ZJcsdFgLBda4xS4Z6I8Pu+6B9TYwak//0CbloDK3Yg0="; + fetchSubmodules = true; + }; + + makefile = "Makefile"; + makeFlags = [ + "HAVE_FFMPEG_STATIC=0" + # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L87-L90 + "GIT_REV=${src.rev}" + "GIT_DESC=${lib.substring 0 7 src.rev}" + "GIT_BRANCH=master" + "BUILD_DATE=01/01/1970_00:00" + ]; + + extraBuildInputs = [ + boost + ffmpeg_6 + libGL + libGLU + nasm + ]; + + # FIXME: build fail with GCC13: + # error: 'mic_device_name' has incomplete type + stdenv = gcc12Stdenv; + + meta = { + description = "Port of Citra to libretro"; + homepage = "https://github.com/libretro/citra"; + license = lib.licenses.gpl2Plus; + }; +} From 2c54c27cbe77ef454b7d26c85f25a8d0cf3cc517 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:22:08 +0000 Subject: [PATCH 21/93] libretro.desmume: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/desmume.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/desmume.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3ea8b478a469..3a1603af73a4 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -129,17 +129,7 @@ lib.makeScope newScope (self: rec { citra = self.callPackage ./cores/citra.nix { }; - desmume = mkLibretroCore { - core = "desmume"; - preBuild = "cd desmume/src/frontend/libretro"; - extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; - meta = { - description = "Port of DeSmuME to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + desmume = self.callPackage ./cores/desmume.nix { }; desmume2015 = mkLibretroCore { core = "desmume2015"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume.nix b/pkgs/applications/emulators/retroarch/cores/desmume.nix new file mode 100644 index 000000000000..5236a4bddc1f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/desmume.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, + libpcap, + libGLU, + libGL, + xorg, +}: +mkLibretroCore { + core = "desmume"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "desmume"; + rev = "7f05a8d447b00acd9e0798aee97b4f72eb505ef9"; + hash = "sha256-BttWMunVbfPOTGx+DV+3QyOwW+55tgXKVIn99DZhbBI="; + }; + + extraBuildInputs = [ + libpcap + libGLU + libGL + xorg.libX11 + ]; + + makeFlags = + lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + + preBuild = "cd desmume/src/frontend/libretro"; + + meta = { + description = "Port of DeSmuME to libretro"; + homepage = "https://github.com/libretro/desmume"; + license = lib.licenses.gpl2Plus; + }; +} From a9249a3beac10bb566b6c9ea56d8ff8ec146b92d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:25:39 +0000 Subject: [PATCH 22/93] libretro.desmume2015: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/desmume2015.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/desmume2015.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 3a1603af73a4..5e48a73e9ca1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -131,17 +131,7 @@ lib.makeScope newScope (self: rec { desmume = self.callPackage ./cores/desmume.nix { }; - desmume2015 = mkLibretroCore { - core = "desmume2015"; - extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ]; - makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" - ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; - preBuild = "cd desmume"; - meta = { - description = "Port of DeSmuME ~2015 to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + desmume2015 = self.callPackage ./cores/desmume2015.nix { }; dolphin = mkLibretroCore { core = "dolphin"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix new file mode 100644 index 000000000000..af9f8870d846 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, + libpcap, + libGLU, + libGL, + xorg, +}: +mkLibretroCore { + core = "desmume2015"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "desmume2015"; + rev = "af397ff3d1f208c27f3922cc8f2b8e08884ba893"; + hash = "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U="; + }; + + extraBuildInputs = [ + libpcap + libGLU + libGL + xorg.libX11 + ]; + + makeFlags = + lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix" + ++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0"; + + preBuild = "cd desmume"; + + meta = { + description = "Port of DeSmuME ~2015 to libretro"; + homepage = "https://github.com/libretro/desmume2015"; + license = lib.licenses.gpl2Plus; + }; +} From 41a7b6c5a85df48d9950a5941955cc5d7a585414 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:32:06 +0000 Subject: [PATCH 23/93] libretro.dolphin: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 29 +------- .../emulators/retroarch/cores/dolphin.nix | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dolphin.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5e48a73e9ca1..beb5c8393f68 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -133,34 +133,7 @@ lib.makeScope newScope (self: rec { desmume2015 = self.callPackage ./cores/desmume2015.nix { }; - dolphin = mkLibretroCore { - core = "dolphin"; - extraNativeBuildInputs = [ cmake curl pkg-config ]; - extraBuildInputs = [ - libGLU - libGL - pcre - sfml - gettext - hidapi - libevdev - udev - ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); - makefile = "Makefile"; - cmakeFlags = [ - "-DLIBRETRO=ON" - "-DLIBRETRO_STATIC=1" - "-DENABLE_QT=OFF" - "-DENABLE_LTO=OFF" - "-DUSE_UPNP=OFF" - "-DUSE_DISCORD_PRESENCE=OFF" - ]; - dontUseCmakeBuildDir = true; - meta = { - description = "Port of Dolphin to libretro"; - license = lib.licenses.gpl2Plus; - }; - }; + dolphin = self.callPackage ./cores/dolphin.nix { }; dosbox = mkLibretroCore { core = "dosbox"; diff --git a/pkgs/applications/emulators/retroarch/cores/dolphin.nix b/pkgs/applications/emulators/retroarch/cores/dolphin.nix new file mode 100644 index 000000000000..f73ecff6c673 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dolphin.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + cmake, + curl, + gettext, + hidapi, + libGL, + libGLU, + libevdev, + mkLibretroCore, + pcre, + pkg-config, + sfml, + udev, + xorg, +}: +mkLibretroCore { + core = "dolphin"; + version = "unstable-2024-04-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "dolphin"; + rev = "89a4df725d4eb24537728f7d655cddb1add25c18"; + hash = "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs="; + }; + + extraNativeBuildInputs = [ + cmake + curl + pkg-config + ]; + extraBuildInputs = [ + gettext + hidapi + libGL + libGLU + libevdev + pcre + sfml + udev + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libXrandr + xorg.libXxf86vm + xorg.libpthreadstubs + xorg.libxcb + xorg.xcbutil + ]; + + makefile = "Makefile"; + cmakeFlags = [ + "-DLIBRETRO=ON" + "-DLIBRETRO_STATIC=1" + "-DENABLE_QT=OFF" + "-DENABLE_LTO=OFF" + "-DUSE_UPNP=OFF" + "-DUSE_DISCORD_PRESENCE=OFF" + ]; + dontUseCmakeBuildDir = true; + + meta = { + description = "Port of Dolphin to libretro"; + homepage = "https://github.com/libretro/dolphin"; + license = lib.licenses.gpl2Plus; + }; +} From 61c780f7b83cf978d3ed6a6348ac3f911cf8d489 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:43:02 +0000 Subject: [PATCH 24/93] libretro.dosbox: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/dosbox.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dosbox.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index beb5c8393f68..5910a24dabe3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -135,14 +135,7 @@ lib.makeScope newScope (self: rec { dolphin = self.callPackage ./cores/dolphin.nix { }; - dosbox = mkLibretroCore { - core = "dosbox"; - CXXFLAGS = "-std=gnu++11"; - meta = { - description = "Port of DOSBox to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + dosbox = self.callPackage ./cores/dosbox.nix { }; dosbox-pure = mkLibretroCore { core = "dosbox-pure"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox.nix b/pkgs/applications/emulators/retroarch/cores/dosbox.nix new file mode 100644 index 000000000000..50eb9ab55e9f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dosbox.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "dosbox"; + version = "unstable-2022-07-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "dosbox-libretro"; + rev = "b7b24262c282c0caef2368c87323ff8c381b3102"; + hash = "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I="; + }; + + env.CXXFLAGS = "-std=gnu++11"; + + meta = { + description = "Port of DOSBox to libretro"; + homepage = "https://github.com/libretro/dosbox-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 12a9521009bcd0d430ff0975b7307c6d4d8b5962 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:46:29 +0000 Subject: [PATCH 25/93] libretro.dosbox-pure: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/dosbox-pure.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5910a24dabe3..627f8e0c1f45 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -137,16 +137,7 @@ lib.makeScope newScope (self: rec { dosbox = self.callPackage ./cores/dosbox.nix { }; - dosbox-pure = mkLibretroCore { - core = "dosbox-pure"; - CXXFLAGS = "-std=gnu++11"; - hardeningDisable = [ "format" ]; - makefile = "Makefile"; - meta = { - description = "Port of DOSBox to libretro aiming for simplicity and ease of use"; - license = lib.licenses.gpl2Only; - }; - }; + dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; easyrpg = mkLibretroCore { core = "easyrpg"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix new file mode 100644 index 000000000000..152ad2e280af --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "dosbox-pure"; + version = "unstable-2024-09-28"; + + src = fetchFromGitHub { + owner = "schellingb"; + repo = "dosbox-pure"; + rev = "9b4147fd14332a7354c9b76fa72653bda2d919e9"; + hash = "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I="; + }; + + hardeningDisable = [ "format" ]; + makefile = "Makefile"; + + meta = { + description = "Port of DOSBox to libretro aiming for simplicity and ease of use"; + homepage = "https://github.com/schellingb/dosbox-pure"; + license = lib.licenses.gpl2Only; + }; +} From 980add9eb94d5e51796e7868f4f5c91d0d9f9946 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 13:56:18 +0000 Subject: [PATCH 26/93] libretro.easyrpg: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 26 +------ .../emulators/retroarch/cores/easyrpg.nix | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+), 25 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/easyrpg.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 627f8e0c1f45..e8f6369c6d4f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -139,31 +139,7 @@ lib.makeScope newScope (self: rec { dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; - easyrpg = mkLibretroCore { - core = "easyrpg"; - extraNativeBuildInputs = [ cmake pkg-config ]; - extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ]; - patches = [ - # The following patch is shared with easyrpg-player. - # Update when new versions of liblcf and easyrpg-player are released. - # See pkgs/games/easyrpg-player/default.nix for details. - (fetchpatch { - name = "0001-Fix-building-with-fmtlib-10.patch"; - url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; - hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; - }) - ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DPLAYER_TARGET_PLATFORM=libretro" - "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" - ]; - makefile = "Makefile"; - meta = { - description = "EasyRPG Player libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + easyrpg = self.callPackage ./cores/easyrpg.nix { }; eightyone = mkLibretroCore { core = "81"; diff --git a/pkgs/applications/emulators/retroarch/cores/easyrpg.nix b/pkgs/applications/emulators/retroarch/cores/easyrpg.nix new file mode 100644 index 000000000000..d28a571ba576 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/easyrpg.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchFromGitHub, + cmake, + fetchpatch, + fmt, + freetype, + harfbuzz, + liblcf, + libpng, + libsndfile, + libvorbis, + libxmp, + mkLibretroCore, + mpg123, + opusfile, + pcre, + pixman, + pkg-config, + speexdsp, +}: +mkLibretroCore { + core = "easyrpg"; + version = "0.8-unstable-2023-04-29"; + + src = fetchFromGitHub { + owner = "EasyRPG"; + repo = "Player"; + rev = "f8e41f43b619413f95847536412b56f85307d378"; + hash = "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + ]; + extraBuildInputs = [ + fmt + freetype + harfbuzz + liblcf + libpng + libsndfile + libvorbis + libxmp + mpg123 + opusfile + pcre + pixman + speexdsp + ]; + patches = [ + # The following patch is shared with easyrpg-player. + # Update when new versions of liblcf and easyrpg-player are released. + # See easyrpg-player expression for details. + (fetchpatch { + name = "0001-Fix-building-with-fmtlib-10.patch"; + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; + }) + ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DPLAYER_TARGET_PLATFORM=libretro" + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + ]; + makefile = "Makefile"; + + meta = { + description = "EasyRPG Player libretro port"; + homepage = "https://github.com/EasyRPG/Player"; + license = lib.licenses.gpl3Only; + }; +} From 880d3c5665271511d1790240097f6151d14b0c5a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 14:52:31 +0000 Subject: [PATCH 27/93] libretro.eightyone: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/eightyone.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/eightyone.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e8f6369c6d4f..d76a570bbbaa 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -141,14 +141,7 @@ lib.makeScope newScope (self: rec { easyrpg = self.callPackage ./cores/easyrpg.nix { }; - eightyone = mkLibretroCore { - core = "81"; - repo = "eightyone"; - meta = { - description = "Port of EightyOne to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + eightyone = self.callPackage ./cores/eightyone.nix { }; fbalpha2012 = mkLibretroCore { core = "fbalpha2012"; diff --git a/pkgs/applications/emulators/retroarch/cores/eightyone.nix b/pkgs/applications/emulators/retroarch/cores/eightyone.nix new file mode 100644 index 000000000000..e17e03605ec7 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/eightyone.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "81"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "81-libretro"; + rev = "ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf"; + hash = "sha256-3AIXk3LJHZHWIojMeo2BJHWYDHQ17WVbkwjFhXM14ZE="; + }; + + meta = { + description = "Port of EightyOne to libretro"; + homepage = "https://github.com/libretro/81-libretro"; + license = lib.licenses.gpl3Only; + }; +} From c0433e2a9caece50821c41f428369de4556485f9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 14:57:04 +0000 Subject: [PATCH 28/93] libretro.fbalpha2012: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/fbalpha2012.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index d76a570bbbaa..749058fef9d9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -143,16 +143,7 @@ lib.makeScope newScope (self: rec { eightyone = self.callPackage ./cores/eightyone.nix { }; - fbalpha2012 = mkLibretroCore { - core = "fbalpha2012"; - makefile = "makefile.libretro"; - preBuild = "cd svn-current/trunk"; - meta = { - description = "Port of Final Burn Alpha ~2012 to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; fbneo = mkLibretroCore { core = "fbneo"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix new file mode 100644 index 000000000000..17d8e1fe2e07 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fbalpha2012"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fbalpha2012"; + rev = "77167cea72e808384c136c8c163a6b4975ce7a84"; + hash = "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c="; + }; + + makefile = "makefile.libretro"; + preBuild = "cd svn-current/trunk"; + + meta = { + description = "Port of Final Burn Alpha ~2012 to libretro"; + homepage = "https://github.com/libretro/fbalpha2012"; + license = lib.licenses.unfreeRedistributable; + }; +} From b3de16f47c4fa527ec0f033c8102778360d1280d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 15:00:11 +0000 Subject: [PATCH 29/93] libretro.fbneo: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/fbneo.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fbneo.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 749058fef9d9..6354edf11a29 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -145,16 +145,7 @@ lib.makeScope newScope (self: rec { fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; - fbneo = mkLibretroCore { - core = "fbneo"; - makefile = "Makefile"; - preBuild = "cd src/burner/libretro"; - meta = { - description = "Port of FBNeo to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fbneo = self.callPackage ./cores/fbneo.nix { }; fceumm = mkLibretroCore { core = "fceumm"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbneo.nix b/pkgs/applications/emulators/retroarch/cores/fbneo.nix new file mode 100644 index 000000000000..486d44da6fb3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fbneo.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fbneo"; + version = "unstable-2024-10-03"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fbneo"; + rev = "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5"; + hash = "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE="; + }; + + makefile = "Makefile"; + preBuild = "cd src/burner/libretro"; + + meta = { + description = "Port of FBNeo to libretro"; + homepage = "https://github.com/libretro/fbneo"; + license = lib.licenses.unfreeRedistributable; + }; +} From 1e7e62c52a453ff1a4f6cb9e82ef7db76ec19de0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 15:56:41 +0000 Subject: [PATCH 30/93] libretro.fceumm: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/fceumm.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fceumm.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 6354edf11a29..0e25640d9dd2 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -147,13 +147,7 @@ lib.makeScope newScope (self: rec { fbneo = self.callPackage ./cores/fbneo.nix { }; - fceumm = mkLibretroCore { - core = "fceumm"; - meta = { - description = "FCEUmm libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + fceumm = self.callPackage ./cores/fceumm.nix { }; flycast = mkLibretroCore { core = "flycast"; diff --git a/pkgs/applications/emulators/retroarch/cores/fceumm.nix b/pkgs/applications/emulators/retroarch/cores/fceumm.nix new file mode 100644 index 000000000000..e8ada8587cbf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fceumm.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fceumm"; + version = "unstable-2024-09-23"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-fceumm"; + rev = "e226068f979cd8fbfc3be9780d16cfb1405095b0"; + hash = "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM="; + }; + + meta = { + description = "FCEUmm libretro port"; + homepage = "https://github.com/libretro/libretro-fceumm"; + license = lib.licenses.gpl2Only; + }; +} From f66bd675c48a8f178cc7c6b766281f31a704c0c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:01:18 +0000 Subject: [PATCH 31/93] libretro.flycast: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 13 +------ .../emulators/retroarch/cores/flycast.nix | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/flycast.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 0e25640d9dd2..1dfb91867049 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -149,18 +149,7 @@ lib.makeScope newScope (self: rec { fceumm = self.callPackage ./cores/fceumm.nix { }; - flycast = mkLibretroCore { - core = "flycast"; - extraNativeBuildInputs = [ cmake ]; - extraBuildInputs = [ libGL libGLU ]; - cmakeFlags = [ "-DLIBRETRO=ON" ]; - makefile = "Makefile"; - meta = { - description = "Flycast libretro port"; - license = lib.licenses.gpl2Only; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - }; - }; + flycast = self.callPackage ./cores/flycast.nix { }; fmsx = mkLibretroCore { core = "fmsx"; diff --git a/pkgs/applications/emulators/retroarch/cores/flycast.nix b/pkgs/applications/emulators/retroarch/cores/flycast.nix new file mode 100644 index 000000000000..43982c818d2d --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/flycast.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + cmake, + libGL, + libGLU, +}: +mkLibretroCore { + core = "flycast"; + version = "unstable-2024-10-05"; + + src = fetchFromGitHub { + owner = "flyinghead"; + repo = "flycast"; + rev = "d689c50e21bf956913ac607933cd4082eaedc06b"; + hash = "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ cmake ]; + extraBuildInputs = [ + libGL + libGLU + ]; + cmakeFlags = [ "-DLIBRETRO=ON" ]; + makefile = "Makefile"; + + meta = { + description = "Flycast libretro port"; + homepage = "https://github.com/flyinghead/flycast"; + license = lib.licenses.gpl2Only; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From 4724ea1666cd8e444d5c0e797feeba5eb2bbc29f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:09:48 +0000 Subject: [PATCH 32/93] libretro.fmsx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/fmsx.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fmsx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1dfb91867049..7e597889c956 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -151,15 +151,7 @@ lib.makeScope newScope (self: rec { flycast = self.callPackage ./cores/flycast.nix { }; - fmsx = mkLibretroCore { - core = "fmsx"; - makefile = "Makefile"; - meta = { - description = "FMSX libretro port"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + fmsx = self.callPackage ./cores/fmsx.nix { }; freeintv = mkLibretroCore { core = "freeintv"; diff --git a/pkgs/applications/emulators/retroarch/cores/fmsx.nix b/pkgs/applications/emulators/retroarch/cores/fmsx.nix new file mode 100644 index 000000000000..e888ef1e0693 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fmsx.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fmsx"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fmsx-libretro"; + rev = "cf97a3c6da07d5f8e98c90c907ad987ffea432e0"; + hash = "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA="; + }; + + makefile = "Makefile"; + + meta = { + description = "FMSX libretro port"; + homepage = "https://github.com/libretro/fmsx-libretro"; + license = lib.licenses.unfreeRedistributable; + }; +} From 225b5a48769bf6fa8d2c82f1eea07a39e844a77b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:13:41 +0000 Subject: [PATCH 33/93] libretro.freeintv: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/freeintv.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/freeintv.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 7e597889c956..845570c7c1c5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -153,14 +153,7 @@ lib.makeScope newScope (self: rec { fmsx = self.callPackage ./cores/fmsx.nix { }; - freeintv = mkLibretroCore { - core = "freeintv"; - makefile = "Makefile"; - meta = { - description = "FreeIntv libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + freeintv = self.callPackage ./cores/freeintv.nix { }; fuse = mkLibretroCore { core = "fuse"; diff --git a/pkgs/applications/emulators/retroarch/cores/freeintv.nix b/pkgs/applications/emulators/retroarch/cores/freeintv.nix new file mode 100644 index 000000000000..a99be9271590 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/freeintv.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "freeintv"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "freeintv"; + rev = "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87"; + hash = "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0="; + }; + + makefile = "Makefile"; + + meta = { + description = "FreeIntv libretro port"; + homepage = "https://github.com/libretro/freeintv"; + license = lib.licenses.gpl3Only; + }; +} From 893a1384e45d0d57ef1e2e353b0d47ec9b7adca5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:16:44 +0000 Subject: [PATCH 34/93] libretro.fuse: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/fuse.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/fuse.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 845570c7c1c5..e73fc71d05c8 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -155,13 +155,7 @@ lib.makeScope newScope (self: rec { freeintv = self.callPackage ./cores/freeintv.nix { }; - fuse = mkLibretroCore { - core = "fuse"; - meta = { - description = "Port of the Fuse Unix Spectrum Emulator to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + fuse = self.callPackage ./cores/fuse.nix { }; gambatte = mkLibretroCore { core = "gambatte"; diff --git a/pkgs/applications/emulators/retroarch/cores/fuse.nix b/pkgs/applications/emulators/retroarch/cores/fuse.nix new file mode 100644 index 000000000000..1bfd08e81fb0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/fuse.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "fuse"; + version = "unstable-2024-09-20"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "fuse-libretro"; + rev = "6fd07d90acc38a1b8835bf16539b833f21aaa38f"; + hash = "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s="; + }; + + meta = { + description = "Port of the Fuse Unix Spectrum Emulator to libretro"; + homepage = "https://github.com/libretro/fuse-libretro"; + license = lib.licenses.gpl3Only; + }; +} From 7d2f1f1ce1f42cd2ddc0728854d6887cb9b5176c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:19:04 +0000 Subject: [PATCH 35/93] libretro.gambatte: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/gambatte.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gambatte.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e73fc71d05c8..11ac6c5573d1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -157,13 +157,7 @@ lib.makeScope newScope (self: rec { fuse = self.callPackage ./cores/fuse.nix { }; - gambatte = mkLibretroCore { - core = "gambatte"; - meta = { - description = "Gambatte libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + gambatte = self.callPackage ./cores/gambatte.nix { }; genesis-plus-gx = mkLibretroCore { core = "genesis-plus-gx"; diff --git a/pkgs/applications/emulators/retroarch/cores/gambatte.nix b/pkgs/applications/emulators/retroarch/cores/gambatte.nix new file mode 100644 index 000000000000..d256b0d5ffaa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gambatte.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gambatte"; + version = "unstable-2024-10-04"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gambatte-libretro"; + rev = "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f"; + hash = "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY="; + }; + + meta = { + description = "Gambatte libretro port"; + homepage = "https://github.com/libretro/gambatte-libretro"; + license = lib.licenses.gpl2Only; + }; +} From c887658db423538949d5e867b3eb9cad7ea38cbb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:21:48 +0000 Subject: [PATCH 36/93] libretro.genesis-plus-gx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../retroarch/cores/genesis-plus-gx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 11ac6c5573d1..ebcae71a522f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -159,14 +159,7 @@ lib.makeScope newScope (self: rec { gambatte = self.callPackage ./cores/gambatte.nix { }; - genesis-plus-gx = mkLibretroCore { - core = "genesis-plus-gx"; - meta = { - description = "Enhanced Genesis Plus libretro port"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; gpsp = mkLibretroCore { core = "gpsp"; diff --git a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix new file mode 100644 index 000000000000..7754df92f19a --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "genesis-plus-gx"; + version = "unstable-2024-09-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "Genesis-Plus-GX"; + rev = "7de0f0b6cde9bda1235b448aa607044b3f80ab3c"; + hash = "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM="; + }; + + meta = { + description = "Enhanced Genesis Plus libretro port"; + homepage = "https://github.com/libretro/Genesis-Plus-GX"; + license = lib.licenses.unfreeRedistributable; + }; +} From d5623dc94a8ffea79568c8ee0f86b0ec9723e7f5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:24:13 +0000 Subject: [PATCH 37/93] libretro.gpsp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/gpsp.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gpsp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ebcae71a522f..5fa0d079d5fe 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -161,14 +161,7 @@ lib.makeScope newScope (self: rec { genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; - gpsp = mkLibretroCore { - core = "gpsp"; - makefile = "Makefile"; - meta = { - description = "Port of gpSP to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + gpsp = self.callPackage ./cores/gpsp.nix { }; gw = mkLibretroCore { core = "gw"; diff --git a/pkgs/applications/emulators/retroarch/cores/gpsp.nix b/pkgs/applications/emulators/retroarch/cores/gpsp.nix new file mode 100644 index 000000000000..e51e86e31be9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gpsp.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gpsp"; + version = "unstable-2024-09-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gpsp"; + rev = "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7"; + hash = "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of gpSP to libretro"; + homepage = "https://github.com/libretro/gpsp"; + license = lib.licenses.gpl2Only; + }; +} From 7fa34b63f8d49f461981dc94cc99a498184f3143 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:27:01 +0000 Subject: [PATCH 38/93] libretro.gw: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/gw.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/gw.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5fa0d079d5fe..24a168e349d9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -163,14 +163,7 @@ lib.makeScope newScope (self: rec { gpsp = self.callPackage ./cores/gpsp.nix { }; - gw = mkLibretroCore { - core = "gw"; - makefile = "Makefile"; - meta = { - description = "Port of Game and Watch to libretro"; - license = lib.licenses.zlib; - }; - }; + gw = self.callPackage ./cores/gw.nix { }; handy = mkLibretroCore { core = "handy"; diff --git a/pkgs/applications/emulators/retroarch/cores/gw.nix b/pkgs/applications/emulators/retroarch/cores/gw.nix new file mode 100644 index 000000000000..a13eef2799f5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/gw.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "gw"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "gw-libretro"; + rev = "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd"; + hash = "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Game and Watch to libretro"; + homepage = "https://github.com/libretro/gw-libretro"; + license = lib.licenses.zlib; + }; +} From 7cc0ad3bf932a6643b24a3221de5b0d0ff18d372 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:29:18 +0000 Subject: [PATCH 39/93] libretro.handy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/handy.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/handy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 24a168e349d9..02e47700346f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -165,14 +165,7 @@ lib.makeScope newScope (self: rec { gw = self.callPackage ./cores/gw.nix { }; - handy = mkLibretroCore { - core = "handy"; - makefile = "Makefile"; - meta = { - description = "Port of Handy to libretro"; - license = lib.licenses.zlib; - }; - }; + handy = self.callPackage ./cores/handy.nix { }; hatari = mkLibretroCore { core = "hatari"; diff --git a/pkgs/applications/emulators/retroarch/cores/handy.nix b/pkgs/applications/emulators/retroarch/cores/handy.nix new file mode 100644 index 000000000000..9dd5c58f9fcc --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/handy.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "handy"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-handy"; + rev = "4e9e072796e5552a9d57f6ab83b3f85f27b17fb6"; + hash = "sha256-ThzFEqLCX2JC06n6GZgkGzX5sFY5CxFDjkeekXRmbXY="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Handy to libretro"; + homepage = "https://github.com/libretro/libretro-handy"; + license = lib.licenses.zlib; + }; +} From 35ec5e76a0bcb9124b343acdedeb3277bcb285ba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 16:33:13 +0000 Subject: [PATCH 40/93] libretro.hatari: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +------- .../emulators/retroarch/cores/hatari.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/hatari.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 02e47700346f..ce13f44c9efd 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -167,17 +167,7 @@ lib.makeScope newScope (self: rec { handy = self.callPackage ./cores/handy.nix { }; - hatari = mkLibretroCore { - core = "hatari"; - extraNativeBuildInputs = [ which ]; - dontConfigure = true; - # zlib is already included in mkLibretroCore as buildInputs - makeFlags = [ "EXTERNAL_ZLIB=1" ]; - meta = { - description = "Port of Hatari to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + hatari = self.callPackage ./cores/hatari.nix { }; mame = mkLibretroCore { core = "mame"; diff --git a/pkgs/applications/emulators/retroarch/cores/hatari.nix b/pkgs/applications/emulators/retroarch/cores/hatari.nix new file mode 100644 index 000000000000..e1ded94dc175 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/hatari.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + which, +}: +mkLibretroCore { + core = "hatari"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "hatari"; + rev = "7008194d3f951a157997f67a820578f56f7feee0"; + hash = "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg="; + }; + + extraNativeBuildInputs = [ which ]; + dontConfigure = true; + # zlib is already included in mkLibretroCore as buildInputs + makeFlags = [ "EXTERNAL_ZLIB=1" ]; + + meta = { + description = "Port of Hatari to libretro"; + homepage = "https://github.com/libretro/hatari"; + license = lib.licenses.gpl2Only; + }; +} From fcd77c39f03355d8c0096109575762b637bffeba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:12:08 +0000 Subject: [PATCH 41/93] libretro.mame: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +----- .../emulators/retroarch/cores/mame.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ce13f44c9efd..5d6479aef692 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -169,17 +169,7 @@ lib.makeScope newScope (self: rec { hatari = self.callPackage ./cores/hatari.nix { }; - mame = mkLibretroCore { - core = "mame"; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib libGLU libGL ]; - # Setting this is breaking compilation of src/3rdparty/genie for some reason - makeFlags = [ "ARCH=" ]; - meta = { - description = "Port of MAME to libretro"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + mame = self.callPackage ./cores/mame.nix { }; mame2000 = mkLibretroCore { core = "mame2000"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame.nix b/pkgs/applications/emulators/retroarch/cores/mame.nix new file mode 100644 index 000000000000..20a8f8dd5cee --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + python3, + alsa-lib, + libGLU, + libGL, +}: +mkLibretroCore { + core = "mame"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame"; + rev = "a67797ad2f7516906ed7acef87569c6f35ca8739"; + hash = "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ + alsa-lib + libGLU + libGL + ]; + # Setting this is breaking compilation of src/3rdparty/genie for some reason + makeFlags = [ "ARCH=" ]; + + meta = { + description = "Port of MAME to libretro"; + homepage = "https://github.com/libretro/mame"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; + }; +} From 1d0c291d0deca2ca612bbf86ea8eb2ea3f991fa9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:15:49 +0000 Subject: [PATCH 42/93] libretro.mame2000: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/mame2000.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2000.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5d6479aef692..ed809ceaa73d 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -171,16 +171,7 @@ lib.makeScope newScope (self: rec { mame = self.callPackage ./cores/mame.nix { }; - mame2000 = mkLibretroCore { - core = "mame2000"; - makefile = "Makefile"; - makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; - meta = { - description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2000 = self.callPackage ./cores/mame2000.nix { }; mame2003 = mkLibretroCore { core = "mame2003"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2000.nix b/pkgs/applications/emulators/retroarch/cores/mame2000.nix new file mode 100644 index 000000000000..f9ece98f68f5 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2000.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2000"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2000-libretro"; + rev = "2ec60f6e1078cf9ba173e80432cc28fd4eea200f"; + hash = "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok="; + }; + + makefile = "Makefile"; + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; + + meta = { + description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; + homepage = "https://github.com/libretro/mame2000-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 2aff2348475301282b5572a8ed3ad7e6e5015faa Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:20:20 +0000 Subject: [PATCH 43/93] libretro.mame2003: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/mame2003.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2003.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed809ceaa73d..27e6feed4d96 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -173,15 +173,7 @@ lib.makeScope newScope (self: rec { mame2000 = self.callPackage ./cores/mame2000.nix { }; - mame2003 = mkLibretroCore { - core = "mame2003"; - makefile = "Makefile"; - meta = { - description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2003 = self.callPackage ./cores/mame2003.nix { }; mame2003-plus = mkLibretroCore { core = "mame2003-plus"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003.nix b/pkgs/applications/emulators/retroarch/cores/mame2003.nix new file mode 100644 index 000000000000..96786a4c1a0e --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2003.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2003"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2003-libretro"; + rev = "6d543115531fc96422b73c989a628600cacbea50"; + hash = "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; + homepage = "https://github.com/libretro/mame2003-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 5dab5710c5c11fbab7bef13c3291cbdc86e28118 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:25:45 +0000 Subject: [PATCH 44/93] libretro.mame2003-plus: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../retroarch/cores/mame2003-plus.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 27e6feed4d96..aaec6a7f9d89 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -175,15 +175,7 @@ lib.makeScope newScope (self: rec { mame2003 = self.callPackage ./cores/mame2003.nix { }; - mame2003-plus = mkLibretroCore { - core = "mame2003-plus"; - makefile = "Makefile"; - meta = { - description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; mame2010 = mkLibretroCore { core = "mame2010"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix new file mode 100644 index 000000000000..048211d985c3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2003-plus"; + version = "unstable-2024-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2003-plus-libretro"; + rev = "b00ea1c9574126d75ae7b80c3b41e1186421fc1d"; + hash = "sha256-Zq4P5UsZh3p9/zasfTC+pzWiLAo7T2qAgZw4bJ4ADdM="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; + homepage = "https://github.com/libretro/mame2003-plus-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 3bb5ff0ceb41d527e15e43ef6b9933cf72dd8e40 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:28:49 +0000 Subject: [PATCH 45/93] libretro.mame2010: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------ .../emulators/retroarch/cores/mame2010.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2010.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index aaec6a7f9d89..b2663cd42d39 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -177,16 +177,7 @@ lib.makeScope newScope (self: rec { mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; - mame2010 = mkLibretroCore { - core = "mame2010"; - makefile = "Makefile"; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; - meta = { - description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2010 = self.callPackage ./cores/mame2010.nix { }; mame2015 = mkLibretroCore { core = "mame2015"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2010.nix b/pkgs/applications/emulators/retroarch/cores/mame2010.nix new file mode 100644 index 000000000000..529c79b7d9be --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2010.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mame2010"; + version = "unstable-2024-10-23"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2010-libretro"; + rev = "c5b413b71e0a290c57fc351562cd47ba75bac105"; + hash = "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM="; + }; + + makefile = "Makefile"; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ + "PTR64=1" + "ARM_ENABLED=1" + "X86_SH2DRC=0" + "FORCE_DRC_C_BACKEND=1" + ]; + + meta = { + description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; + homepage = "https://github.com/libretro/mame2010-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} From 45e8e2e77977f57617a1a510fc821e27fd310127 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:33:59 +0000 Subject: [PATCH 46/93] libretro.mame2015: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +-------- .../emulators/retroarch/cores/mame2015.nix | 32 ++++++++++++++++++ .../emulators/retroarch/cores/mame2016.nix | 33 +++++++++++++++++++ .../patches/mame2015-python311.patch | 0 .../patches/mame2016-python311.patch | 0 5 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2015.nix create mode 100644 pkgs/applications/emulators/retroarch/cores/mame2016.nix rename pkgs/applications/emulators/retroarch/{ => cores}/patches/mame2015-python311.patch (100%) rename pkgs/applications/emulators/retroarch/{ => cores}/patches/mame2016-python311.patch (100%) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b2663cd42d39..640aaaa44aa5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -179,21 +179,7 @@ lib.makeScope newScope (self: rec { mame2010 = self.callPackage ./cores/mame2010.nix { }; - mame2015 = mkLibretroCore { - core = "mame2015"; - patches = [ ./patches/mame2015-python311.patch ]; - makeFlags = [ "PYTHON=python3" ]; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib ]; - makefile = "Makefile"; - # Build failures when this is set to a bigger number - NIX_BUILD_CORES = 8; - meta = { - description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; - # MAME license, non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + mame2015 = self.callPackage ./cores/mame2015.nix { }; mame2016 = mkLibretroCore { core = "mame2016"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2015.nix b/pkgs/applications/emulators/retroarch/cores/mame2015.nix new file mode 100644 index 000000000000..797c7f80e0a3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2015.nix @@ -0,0 +1,32 @@ +{ + lib, + alsa-lib, + fetchFromGitHub, + mkLibretroCore, + python3, +}: +mkLibretroCore { + core = "mame2015"; + version = "unstable-2023-11-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2015-libretro"; + rev = "316cd06349f2b34b4719f04f7c0d07569a74c764"; + hash = "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0="; + }; + + patches = [ ./patches/mame2015-python311.patch ]; + makeFlags = [ "PYTHON=python3" ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib ]; + makefile = "Makefile"; + # Build failures when this is set to a bigger number + NIX_BUILD_CORES = 8; + meta = { + description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; + homepage = "https://github.com/libretro/mame2015-libretro"; + # MAME license, non-commercial clause + license = lib.licenses.unfreeRedistributable; + }; +} diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix new file mode 100644 index 000000000000..fb3d61964344 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -0,0 +1,33 @@ +{ + lib, + alsa-lib, + fetchfromgithub, + mklibretrocore, + python3, +}: +mklibretrocore { + core = "mame2016"; + version = "unstable-2024-04-06"; + + "src": { + "owner": "libretro", + "repo": "mame2016-libretro", + "rev": "01058613a0109424c4e7211e49ed83ac950d3993", + "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" + }, + + patches = [ ./patches/mame2015-python311.patch ]; + makeflags = [ "python=python3" ]; + extranativebuildinputs = [ python3 ]; + extrabuildinputs = [ alsa-lib ]; + makefile = "makefile"; + # build failures when this is set to a bigger number + nix_build_cores = 8; + + meta = { + description = "port of mame ~2015 to libretro, compatible with mame 0.160 sets"; + homepage = "https://github.com/libretro/mame2015-libretro"; + # mame license, non-commercial clause + license = lib.licenses.unfreeredistributable; + }; +} diff --git a/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch b/pkgs/applications/emulators/retroarch/cores/patches/mame2015-python311.patch similarity index 100% rename from pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch rename to pkgs/applications/emulators/retroarch/cores/patches/mame2015-python311.patch diff --git a/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch b/pkgs/applications/emulators/retroarch/cores/patches/mame2016-python311.patch similarity index 100% rename from pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch rename to pkgs/applications/emulators/retroarch/cores/patches/mame2016-python311.patch From 21a3d16115a6947ae9e94af87f97294dcb9ba95d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 17:39:19 +0000 Subject: [PATCH 47/93] libretro.mame2016: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +------ .../emulators/retroarch/cores/mame2016.nix | 43 ++++++++++--------- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 640aaaa44aa5..2d28737fcc2e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -181,21 +181,7 @@ lib.makeScope newScope (self: rec { mame2015 = self.callPackage ./cores/mame2015.nix { }; - mame2016 = mkLibretroCore { - core = "mame2016"; - patches = [ ./patches/mame2016-python311.patch ]; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib ]; - makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; - # Build failures when this is set to a bigger number - NIX_BUILD_CORES = 8; - # Fix build errors in GCC13 - NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; - meta = { - description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + mame2016 = self.callPackage ./cores/mame2016.nix { }; melonds = mkLibretroCore { core = "melonds"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix index fb3d61964344..a98b98a7ace0 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2016.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -1,33 +1,36 @@ { lib, alsa-lib, - fetchfromgithub, - mklibretrocore, + fetchFromGitHub, + mkLibretroCore, python3, }: -mklibretrocore { +mkLibretroCore { core = "mame2016"; version = "unstable-2024-04-06"; - "src": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" - }, + src = fetchFromGitHub { + owner = "libretro"; + repo = "mame2016-libretro"; + rev = "01058613a0109424c4e7211e49ed83ac950d3993"; + hash = "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak="; + }; - patches = [ ./patches/mame2015-python311.patch ]; - makeflags = [ "python=python3" ]; - extranativebuildinputs = [ python3 ]; - extrabuildinputs = [ alsa-lib ]; - makefile = "makefile"; - # build failures when this is set to a bigger number - nix_build_cores = 8; + patches = [ ./patches/mame2016-python311.patch ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib ]; + makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; + # Build failures when this is set to a bigger number + NIX_BUILD_CORES = 8; + # Fix build errors in GCC13 + NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; meta = { - description = "port of mame ~2015 to libretro, compatible with mame 0.160 sets"; - homepage = "https://github.com/libretro/mame2015-libretro"; - # mame license, non-commercial clause - license = lib.licenses.unfreeredistributable; + description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; + homepage = "https://github.com/libretro/mame2016-libretro"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; }; } From bd99bc46159b80e8c3d435bde052563e8b1e884e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:50:09 +0000 Subject: [PATCH 48/93] libretro.melonds: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------ .../emulators/retroarch/cores/melonds.nix | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/melonds.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2d28737fcc2e..34cf35ee8b56 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -183,15 +183,7 @@ lib.makeScope newScope (self: rec { mame2016 = self.callPackage ./cores/mame2016.nix { }; - melonds = mkLibretroCore { - core = "melonds"; - extraBuildInputs = [ libGL libGLU ]; - makefile = "Makefile"; - meta = { - description = "Port of MelonDS to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + melonds = self.callPackage ./cores/melonds.nix { }; mesen = mkLibretroCore { core = "mesen"; diff --git a/pkgs/applications/emulators/retroarch/cores/melonds.nix b/pkgs/applications/emulators/retroarch/cores/melonds.nix new file mode 100644 index 000000000000..a7adaf2fbb3b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/melonds.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + libGLU, + libGL, +}: +mkLibretroCore { + core = "melonds"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "melonds"; + rev = "7a3c11ff970cd36ca806961fae6db94b30dd5401"; + hash = "sha256-YGkRdth7qdATcZpJkBd5MGOJFG1AbeJhAnyir+ssZYA="; + }; + + extraBuildInputs = [ + libGLU + libGL + ]; + makefile = "Makefile"; + + meta = { + description = "Port of MelonDS to libretro"; + homepage = "https://github.com/libretro/melonds"; + license = lib.licenses.gpl3Only; + }; +} From 87fbbb55802b669257d695529038ccecf9999e1c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:53:36 +0000 Subject: [PATCH 49/93] libretro.mesen: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/mesen.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mesen.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 34cf35ee8b56..faaa202548e0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -185,15 +185,7 @@ lib.makeScope newScope (self: rec { melonds = self.callPackage ./cores/melonds.nix { }; - mesen = mkLibretroCore { - core = "mesen"; - makefile = "Makefile"; - preBuild = "cd Libretro"; - meta = { - description = "Port of Mesen to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + mesen = self.callPackage ./cores/mesen.nix { }; mesen-s = mkLibretroCore { core = "mesen-s"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen.nix b/pkgs/applications/emulators/retroarch/cores/mesen.nix new file mode 100644 index 000000000000..8f75096ff72c --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mesen.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mesen"; + version = "unstable-2024-06-09"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mesen"; + rev = "91db6be681f70b2080525c267af6132555323ea1"; + hash = "sha256-rw/bwHaeglO/DPeOCFHAWF5Y5DXVKiteO4bWZjTB4rI="; + }; + + makefile = "Makefile"; + preBuild = "cd Libretro"; + + meta = { + description = "Port of Mesen to libretro"; + homepage = "https://github.com/libretro/mesen"; + license = lib.licenses.gpl3Only; + }; +} From 0d96487b33262a8e36039978c982bd365c91f618 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:55:27 +0000 Subject: [PATCH 50/93] libretro.mesen-s: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/mesen-s.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mesen-s.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index faaa202548e0..e1488eee3e52 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -187,16 +187,7 @@ lib.makeScope newScope (self: rec { mesen = self.callPackage ./cores/mesen.nix { }; - mesen-s = mkLibretroCore { - core = "mesen-s"; - makefile = "Makefile"; - preBuild = "cd Libretro"; - normalizeCore = false; - meta = { - description = "Port of Mesen-S to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + mesen-s = self.callPackage ./cores/mesen-s.nix { }; meteor = mkLibretroCore { core = "meteor"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix new file mode 100644 index 000000000000..5c4ad5996e58 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mesen-s"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mesen-s"; + rev = "d4fca31a6004041d99b02199688f84c009c55967"; + hash = "sha256-mGGTLBRJCsNJg57LWSFndIv/LLzEmVRnv6gNbllkV/Y="; + }; + + makefile = "Makefile"; + preBuild = "cd Libretro"; + normalizeCore = false; + + meta = { + description = "Port of Mesen-S to libretro"; + homepage = "https://github.com/libretro/mesen-s"; + license = lib.licenses.gpl3Only; + }; +} From 13130827a8a4ca93328469646c0e592834e6aab2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 18:58:25 +0000 Subject: [PATCH 51/93] libretro.meteor: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/meteor.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/meteor.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e1488eee3e52..ad89bea5d98e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -189,15 +189,7 @@ lib.makeScope newScope (self: rec { mesen-s = self.callPackage ./cores/mesen-s.nix { }; - meteor = mkLibretroCore { - core = "meteor"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Port of Meteor to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + meteor = self.callPackage ./cores/meteor.nix { }; mgba = mkLibretroCore { core = "mgba"; diff --git a/pkgs/applications/emulators/retroarch/cores/meteor.nix b/pkgs/applications/emulators/retroarch/cores/meteor.nix new file mode 100644 index 000000000000..c6e656f698af --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/meteor.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "meteor"; + version = "unstable-2020-12-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "meteor-libretro"; + rev = "e533d300d0561564451bde55a2b73119c768453c"; + hash = "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Port of Meteor to libretro"; + homepage = "https://github.com/libretro/meteor"; + license = lib.licenses.gpl3Only; + }; +} From c6f6b7bd4a118c6c9f2cd18b95b5ac94f66050c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 19 Nov 2024 19:00:13 +0000 Subject: [PATCH 52/93] libretro.mgba: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../emulators/retroarch/cores/mgba.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mgba.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ad89bea5d98e..8e2b7acaf0ca 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -191,13 +191,7 @@ lib.makeScope newScope (self: rec { meteor = self.callPackage ./cores/meteor.nix { }; - mgba = mkLibretroCore { - core = "mgba"; - meta = { - description = "Port of mGBA to libretro"; - license = lib.licenses.mpl20; - }; - }; + mgba = self.callPackage ./cores/mgba.nix { }; mrboom = mkLibretroCore { core = "mrboom"; diff --git a/pkgs/applications/emulators/retroarch/cores/mgba.nix b/pkgs/applications/emulators/retroarch/cores/mgba.nix new file mode 100644 index 000000000000..e2f683345740 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mgba.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "mgba"; + version = "unstable-2024-11-12"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mgba"; + rev = "747362c02d2e71ee7c363e8dcb240925be8af906"; + hash = "sha256-dBhdS6C1H02iwdYDVvJmkPWob81vpmQJdHUHJFAq2vo="; + }; + + meta = { + description = "Port of mGBA to libretro"; + homepage = "https://github.com/libretro/mgba"; + license = lib.licenses.mpl20; + }; +} From 418e948588356a1b9f04d046ea874c81452db9c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:10:05 +0000 Subject: [PATCH 53/93] libretro.mrboom: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/mrboom.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mrboom.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8e2b7acaf0ca..8151a3df5b63 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -193,14 +193,7 @@ lib.makeScope newScope (self: rec { mgba = self.callPackage ./cores/mgba.nix { }; - mrboom = mkLibretroCore { - core = "mrboom"; - makefile = "Makefile"; - meta = { - description = "Port of Mr.Boom to libretro"; - license = lib.licenses.mit; - }; - }; + mrboom = self.callPackage ./cores/mrboom.nix { }; mupen64plus = mkLibretroCore { core = "mupen64plus-next"; diff --git a/pkgs/applications/emulators/retroarch/cores/mrboom.nix b/pkgs/applications/emulators/retroarch/cores/mrboom.nix new file mode 100644 index 000000000000..017c8325df69 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mrboom.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "mrboom"; + version = "unstable-2024-07-01"; + + src = fetchFromGitHub { + owner = "Javanaise"; + repo = "mrboom-libretro"; + rev = "22765ce7176d236d846f504318a51c448d2b469b"; + hash = "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw="; + fetchSubmodules = true; + }; + + makefile = "Makefile"; + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Port of Mr.Boom to libretro"; + homepage = "https://github.com/Javanaise/mrboom-libretro"; + license = lib.licenses.mit; + }; +} From 87c06feb0129fdc0efb76447e11bb7d8f3a68f44 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:16:46 +0000 Subject: [PATCH 54/93] libretro.mupen64plus: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 18 +------- .../emulators/retroarch/cores/mupen64plus.nix | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/mupen64plus.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8151a3df5b63..9968263b3b57 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -195,23 +195,7 @@ lib.makeScope newScope (self: rec { mrboom = self.callPackage ./cores/mrboom.nix { }; - mupen64plus = mkLibretroCore { - core = "mupen64plus-next"; - repo = "mupen64plus"; - extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_PARALLEL_RDP=1" - "HAVE_PARALLEL_RSP=1" - "HAVE_THR_AL=1" - "LLE=1" - "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" - ]; - meta = { - description = "Libretro port of Mupen64 Plus, GL only"; - license = lib.licenses.gpl3Only; - }; - }; + mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; neocd = mkLibretroCore { core = "neocd"; diff --git a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix new file mode 100644 index 000000000000..41aff713cba6 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libGL, + libGLU, + libpng, + mkLibretroCore, + nasm, + xorg, +}: +mkLibretroCore { + core = "mupen64plus-next"; + version = "unstable-2024-10-29"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "mupen64plus-libretro-nx"; + rev = "4249e39b2c200e5f0895385f76d99928785f2bea"; + hash = "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI="; + }; + + extraBuildInputs = [ + libGLU + libGL + libpng + nasm + xorg.libX11 + ]; + makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL_RDP=1" + "HAVE_PARALLEL_RSP=1" + "HAVE_THR_AL=1" + "LLE=1" + "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" + ]; + + meta = { + description = "Libretro port of Mupen64 Plus"; + homepage = "https://github.com/libretro/mupen64plus-libretro-nx"; + license = lib.licenses.gpl3Only; + }; +} From baa6a603be37cff416a12d8a95832872b0fd5826 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:34:18 +0000 Subject: [PATCH 55/93] libretro.neocd: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/neocd.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/neocd.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 9968263b3b57..765caee7a9f9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -197,14 +197,7 @@ lib.makeScope newScope (self: rec { mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; - neocd = mkLibretroCore { - core = "neocd"; - makefile = "Makefile"; - meta = { - description = "NeoCD libretro port"; - license = lib.licenses.lgpl3Only; - }; - }; + neocd = self.callPackage ./cores/neocd.nix { }; nestopia = mkLibretroCore { core = "nestopia"; diff --git a/pkgs/applications/emulators/retroarch/cores/neocd.nix b/pkgs/applications/emulators/retroarch/cores/neocd.nix new file mode 100644 index 000000000000..17c74d6ab92f --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/neocd.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "neocd"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "neocd_libretro"; + rev = "5eca2c8fd567b5261251c65ecafa8cf5b179d1d2"; + hash = "sha256-72tmPCb7AXsamaQsMAPiYpgDR8DER2GTz4hcbN8wy7g="; + }; + + makefile = "Makefile"; + + meta = { + description = "NeoCD libretro port"; + homepage = "https://github.com/libretro/neocd_libretro"; + license = lib.licenses.lgpl3Only; + }; +} From 6f50f7cd46b20d91457e9fe1523b9d35cbe83ff7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:36:21 +0000 Subject: [PATCH 56/93] libretro.nestopia: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/nestopia.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/nestopia.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 765caee7a9f9..76dbebe9012e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -199,15 +199,7 @@ lib.makeScope newScope (self: rec { neocd = self.callPackage ./cores/neocd.nix { }; - nestopia = mkLibretroCore { - core = "nestopia"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Nestopia libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + nestopia = self.callPackage ./cores/nestopia.nix { }; nxengine = mkLibretroCore { core = "nxengine"; diff --git a/pkgs/applications/emulators/retroarch/cores/nestopia.nix b/pkgs/applications/emulators/retroarch/cores/nestopia.nix new file mode 100644 index 000000000000..4d881e69b281 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/nestopia.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "nestopia"; + version = "unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "nestopia"; + rev = "b932740e8abbe2cda80d06b083fdd8115af1c5d5"; + hash = "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Nestopia libretro port"; + homepage = "https://github.com/libretro/nestopia"; + license = lib.licenses.gpl2Only; + }; +} From b336ab6fa3a8b7ea2550d124032491e9cddba5cb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:40:21 +0000 Subject: [PATCH 57/93] libretro.nxengine: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/nxengine.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/nxengine.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 76dbebe9012e..36edc7cbcd98 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -201,14 +201,7 @@ lib.makeScope newScope (self: rec { nestopia = self.callPackage ./cores/nestopia.nix { }; - nxengine = mkLibretroCore { - core = "nxengine"; - makefile = "Makefile"; - meta = { - description = "NXEngine libretro port"; - license = lib.licenses.gpl3Only; - }; - }; + nxengine = self.callPackage ./cores/nxengine.nix { }; np2kai = mkLibretroCore rec { core = "np2kai"; diff --git a/pkgs/applications/emulators/retroarch/cores/nxengine.nix b/pkgs/applications/emulators/retroarch/cores/nxengine.nix new file mode 100644 index 000000000000..6754dd7a3926 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/nxengine.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "nxengine"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "nxengine-libretro"; + rev = "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2"; + hash = "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U="; + }; + + makefile = "Makefile"; + + meta = { + description = "NXEngine libretro port"; + homepage = "https://github.com/libretro/nxengine-libretro"; + license = lib.licenses.gpl3Only; + }; +} From d9c95ab53e4d71f90ac75e0b29a142e0d6926b0c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 11:53:47 +0000 Subject: [PATCH 58/93] libretro.np2kai: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 ++-------- .../emulators/retroarch/cores/np2kai.nix | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/np2kai.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 36edc7cbcd98..1e617d342980 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -201,21 +201,9 @@ lib.makeScope newScope (self: rec { nestopia = self.callPackage ./cores/nestopia.nix { }; - nxengine = self.callPackage ./cores/nxengine.nix { }; + np2kai = self.callPackage ./cores/np2kai.nix { }; - np2kai = mkLibretroCore rec { - core = "np2kai"; - makeFlags = [ - # See https://github.com/AZO234/NP2kai/tags - "NP2KAI_VERSION=rev.22" - "NP2KAI_HASH=${(getCoreSrc core).rev}" - ]; - preBuild = "cd sdl"; - meta = { - description = "Neko Project II kai libretro port"; - license = lib.licenses.mit; - }; - }; + nxengine = self.callPackage ./cores/nxengine.nix { }; o2em = mkLibretroCore { core = "o2em"; diff --git a/pkgs/applications/emulators/retroarch/cores/np2kai.nix b/pkgs/applications/emulators/retroarch/cores/np2kai.nix new file mode 100644 index 000000000000..f840b04327cf --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/np2kai.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "np2kai"; + version = "unstable-2024-11-03"; + + src = fetchFromGitHub { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4b109eaac4f79b04065ff5025319fce51537e04d"; + hash = "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU="; + fetchSubmodules = true; + }; + + makeFlags = [ + # See https://github.com/AZO234/NP2kai/tags + "NP2KAI_VERSION=rev.22" + "NP2KAI_HASH=${builtins.substring 0 7 src.rev}" + ]; + + preBuild = "cd sdl"; + + meta = { + description = "Neko Project II kai libretro port"; + homepage = "https://github.com/AZO234/NP2kai"; + license = lib.licenses.mit; + }; +} From 45d04e07a4d20b944111f952bcfcda2f668b2dec Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:33:26 +0000 Subject: [PATCH 59/93] libretro.o2em: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/o2em.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/o2em.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1e617d342980..555e0db1c1d6 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -205,14 +205,7 @@ lib.makeScope newScope (self: rec { nxengine = self.callPackage ./cores/nxengine.nix { }; - o2em = mkLibretroCore { - core = "o2em"; - makefile = "Makefile"; - meta = { - description = "Port of O2EM to libretro"; - license = lib.licenses.artistic1; - }; - }; + o2em = self.callPackage ./cores/o2em.nix { }; opera = mkLibretroCore { core = "opera"; diff --git a/pkgs/applications/emulators/retroarch/cores/o2em.nix b/pkgs/applications/emulators/retroarch/cores/o2em.nix new file mode 100644 index 000000000000..504deb49a268 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/o2em.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "o2em"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-o2em"; + rev = "c8f458d035392963823fbb50db0cec0033d9315f"; + hash = "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of O2EM to libretro"; + homepage = "https://github.com/libretro/libretro-o2em"; + license = lib.licenses.artistic1; + }; +} From e1dcc59e2868bc4bff1ec1bfb7b511091ed4e75d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:36:11 +0000 Subject: [PATCH 60/93] libretro.opera: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/opera.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/opera.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 555e0db1c1d6..f3d922b7a7a7 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -207,16 +207,7 @@ lib.makeScope newScope (self: rec { o2em = self.callPackage ./cores/o2em.nix { }; - opera = mkLibretroCore { - core = "opera"; - makefile = "Makefile"; - makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; - meta = { - description = "Opera is a port of 4DO/libfreedo to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + opera = self.callPackage ./cores/opera.nix { }; parallel-n64 = mkLibretroCore { core = "parallel-n64"; diff --git a/pkgs/applications/emulators/retroarch/cores/opera.nix b/pkgs/applications/emulators/retroarch/cores/opera.nix new file mode 100644 index 000000000000..90e273c6d2b3 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/opera.nix @@ -0,0 +1,26 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "opera"; + version = "unstable-2024-10-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "opera-libretro"; + rev = "67a29e60a4d194b675c9272b21b61eaa022f3ba3"; + hash = "sha256-8896EWNbzVyr3MS1jtWD3pLur7ZvAhhJmrwkW3ayzkU="; + }; + + makefile = "Makefile"; + makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ]; + + meta = { + description = "Opera is a port of 4DO/libfreedo to libretro"; + homepage = "https://github.com/libretro/libretro-o2em"; + license = lib.licenses.unfreeRedistributable; + }; +} From 1556d2c6de2ba0d623d035806c3ba8268dcbb910 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:43:15 +0000 Subject: [PATCH 61/93] libretro.parallel-n64: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 19 +-------- .../retroarch/cores/parallel-n64.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/parallel-n64.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f3d922b7a7a7..65c6a342dde3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -209,24 +209,7 @@ lib.makeScope newScope (self: rec { opera = self.callPackage ./cores/opera.nix { }; - parallel-n64 = mkLibretroCore { - core = "parallel-n64"; - extraBuildInputs = [ libGLU libGL libpng ]; - makefile = "Makefile"; - makeFlags = [ - "HAVE_PARALLEL=1" - "HAVE_PARALLEL_RSP=1" - "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' - sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ - && sed -i -e 's,CPUFLAGS :=,,g' Makefile - ''; - meta = { - description = "Parallel Mupen64plus rewrite for libretro"; - license = lib.licenses.gpl3Only; - }; - }; + parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; pcsx2 = mkLibretroCore { core = "pcsx2"; diff --git a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix new file mode 100644 index 000000000000..f6ba71d47c63 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libGL, + libGLU, + libpng, + mkLibretroCore, +}: +mkLibretroCore { + core = "parallel-n64"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "parallel-n64"; + rev = "e372c5e327dcd649e9d840ffc3d88480b6866eda"; + hash = "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo="; + }; + + extraBuildInputs = [ + libGLU + libGL + libpng + ]; + makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL=1" + "HAVE_PARALLEL_RSP=1" + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' + sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ + && sed -i -e 's,CPUFLAGS :=,,g' Makefile + ''; + + meta = { + description = "Parallel Mupen64plus rewrite for libretro"; + homepage = "https://github.com/libretro/parallel-n64"; + license = lib.licenses.gpl3Only; + }; +} From bbb92a0b2700def4c2dc9bf769d5eec85c8376d9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:49:32 +0000 Subject: [PATCH 62/93] libretro.pcsx2: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 37 +---------- .../emulators/retroarch/cores/pcsx2.nix | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+), 36 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/pcsx2.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 65c6a342dde3..c0b1919c4bc3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -211,42 +211,7 @@ lib.makeScope newScope (self: rec { parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; - pcsx2 = mkLibretroCore { - core = "pcsx2"; - extraNativeBuildInputs = [ - cmake - gettext - pkg-config - ]; - extraBuildInputs = [ - libaio - libGL - libGLU - libpcap - libpng - libxml2 - xz - xxd - ]; - makefile = "Makefile"; - cmakeFlags = [ "-DLIBRETRO=ON" ]; - # remove ccache - postPatch = '' - substituteInPlace CMakeLists.txt --replace "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; - meta = { - description = "Port of PCSX2 to libretro"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.x86; - }; - }; + pcsx2 = self.callPackage ./cores/pcsx2.nix { }; pcsx-rearmed = mkLibretroCore { core = "pcsx_rearmed"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix new file mode 100644 index 000000000000..d24311b4df62 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix @@ -0,0 +1,64 @@ +{ + lib, + cmake, + fetchFromGitHub, + gcc12Stdenv, + gettext, + libGL, + libGLU, + libaio, + libpcap, + libpng, + libxml2, + mkLibretroCore, + pkg-config, + xxd, + xz, +}: +mkLibretroCore { + core = "pcsx2"; + version = "unstable-2023-01-30"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "lrps2"; + rev = "f3c8743d6a42fe429f703b476fecfdb5655a98a9"; + hash = "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="; + }; + + extraNativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + extraBuildInputs = [ + libaio + libGL + libGLU + libpcap + libpng + libxml2 + xz + xxd + ]; + 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; + + meta = { + description = "Port of PCSX2 to libretro"; + homepage = "https://github.com/libretro/lrps2"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.x86; + }; +} From 54b719f02d11e63acc68d2c9e3fa877f23773cb3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 12:54:56 +0000 Subject: [PATCH 63/93] libretro.pcsx-rearmed: renamed from pcsx_rearmed, move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 ++------ .../retroarch/cores/pcsx-rearmed.nix | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c0b1919c4bc3..89049803bea1 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -213,14 +213,8 @@ lib.makeScope newScope (self: rec { pcsx2 = self.callPackage ./cores/pcsx2.nix { }; - pcsx-rearmed = mkLibretroCore { - core = "pcsx_rearmed"; - dontConfigure = true; - meta = { - description = "Port of PCSX ReARMed with GNU lightning to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; + pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 picodrive = mkLibretroCore { core = "picodrive"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix new file mode 100644 index 000000000000..92405ee175b9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "pcsx-rearmed"; + version = "unstable-2024-11-17"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "pcsx_rearmed"; + rev = "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e"; + hash = "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0="; + }; + + dontConfigure = true; + + meta = { + description = "Port of PCSX ReARMed to libretro"; + homepage = "https://github.com/libretro/pcsx_rearmed"; + license = lib.licenses.gpl2Only; + }; +} From 6defc5ebb7876b50fa65759e14998b8badabd89e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:05:13 +0000 Subject: [PATCH 64/93] libretro.picodrive: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/picodrive.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/picodrive.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 89049803bea1..dfd2b2f76a06 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -216,15 +216,7 @@ lib.makeScope newScope (self: rec { pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 - picodrive = mkLibretroCore { - core = "picodrive"; - dontConfigure = true; - meta = { - description = "Fast MegaDrive/MegaCD/32X emulator"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + picodrive = self.callPackage ./cores/picodrive.nix { }; play = mkLibretroCore { core = "play"; diff --git a/pkgs/applications/emulators/retroarch/cores/picodrive.nix b/pkgs/applications/emulators/retroarch/cores/picodrive.nix new file mode 100644 index 000000000000..6c5b6e093fe0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/picodrive.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "picodrive"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "picodrive"; + rev = "0daf92b57fba1fdbc124651573e88373eef28aa5"; + hash = "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE="; + fetchSubmodules = true; + }; + + dontConfigure = true; + + meta = { + description = "Fast MegaDrive/MegaCD/32X emulator"; + homepage = "https://github.com/libretro/picodrive"; + license = lib.licenses.unfreeRedistributable; + }; +} From 46ab30c61f7bf51f5b1446498684b78c4e21178f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:11:20 +0000 Subject: [PATCH 65/93] libretro.play: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 16 +----- .../emulators/retroarch/cores/play.nix | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/play.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index dfd2b2f76a06..41dc9c278ce3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -218,21 +218,7 @@ lib.makeScope newScope (self: rec { picodrive = self.callPackage ./cores/picodrive.nix { }; - play = mkLibretroCore { - core = "play"; - extraBuildInputs = [ boost bzip2 curl openssl icu libGL libGLU xorg.libX11 ]; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - cmakeFlags = [ "-DBUILD_PLAY=OFF" "-DBUILD_LIBRETRO_CORE=ON" ]; - postBuild = "cd Source/ui_libretro"; - # FIXME: workaround the following GCC 13 error: - # error: 'printf' was not declared in this scop - CXXFLAGS = "-include cstdio"; - meta = { - description = "Port of Play! to libretro"; - license = lib.licenses.bsd2; - }; - }; + play = self.callPackage ./cores/play.nix { }; ppsspp = mkLibretroCore { core = "ppsspp"; diff --git a/pkgs/applications/emulators/retroarch/cores/play.nix b/pkgs/applications/emulators/retroarch/cores/play.nix new file mode 100644 index 000000000000..12b3ac2d6ba6 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/play.nix @@ -0,0 +1,53 @@ +{ + lib, + boost, + bzip2, + cmake, + curl, + fetchFromGitHub, + icu, + libGL, + libGLU, + mkLibretroCore, + openssl, + xorg, +}: +mkLibretroCore { + core = "play"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "jpd002"; + repo = "Play-"; + rev = "c3cba5418b4e5618befd9c2790498cf3cf88372a"; + hash = "sha256-xO2Pgl1E0JFEsthTmG+Ka+NqOTWG/JeeAIa6wBWXJyc="; + fetchSubmodules = true; + }; + + extraBuildInputs = [ + boost + bzip2 + curl + openssl + icu + libGL + libGLU + xorg.libX11 + ]; + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_PLAY=OFF" + "-DBUILD_LIBRETRO_CORE=ON" + ]; + postBuild = "cd Source/ui_libretro"; + # FIXME: workaround the following GCC 13 error: + # error: 'printf' was not declared in this scop + env.CXXFLAGS = "-include cstdio"; + + meta = { + description = "Port of Play! to libretro"; + homepage = "https://github.com/jpd002/Play-"; + license = lib.licenses.bsd2; + }; +} From 215e0d401257baf045fe9b08d6ba7bc0fc985fd8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:20:20 +0000 Subject: [PATCH 66/93] libretro.ppsspp: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 21 +------ .../emulators/retroarch/cores/ppsspp.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/ppsspp.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 41dc9c278ce3..2fc6b82c5e65 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -220,26 +220,7 @@ lib.makeScope newScope (self: rec { play = self.callPackage ./cores/play.nix { }; - ppsspp = mkLibretroCore { - core = "ppsspp"; - extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DLIBRETRO=ON" - # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback - # See: https://github.com/NixOS/nixpkgs/issues/304616 - "-DUSE_SYSTEM_FFMPEG=OFF" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DOpenGL_GL_PREFERENCE=GLVND" - ]; - postBuild = "cd lib"; - meta = { - description = "ppsspp libretro port"; - license = lib.licenses.gpl2Plus; - }; - }; + ppsspp = self.callPackage ./cores/ppsspp.nix { }; prboom = mkLibretroCore { core = "prboom"; diff --git a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix new file mode 100644 index 000000000000..78db8a8db409 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix @@ -0,0 +1,55 @@ +{ + lib, + cmake, + fetchFromGitHub, + libGL, + libGLU, + libzip, + mkLibretroCore, + pkg-config, + python3, + snappy, + xorg, +}: +mkLibretroCore { + core = "ppsspp"; + version = "unstable-2024-11-15"; + + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "2402eea4b16908ad59079bcf3fab06ba63531a3c"; + hash = "sha256-bpeiZdcXkGWLFZOsxTGuVmo4xAiUb9v5Wf6pWkt5JV0="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + extraBuildInputs = [ + libGLU + libGL + libzip + snappy + xorg.libX11 + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DLIBRETRO=ON" + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback + # See: https://github.com/NixOS/nixpkgs/issues/304616 + "-DUSE_SYSTEM_FFMPEG=OFF" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + postBuild = "cd lib"; + + meta = { + description = "PPSSPP libretro port"; + homepage = "https://github.com/hrydgard/ppsspp"; + license = lib.licenses.gpl2Plus; + }; +} From aa75a15f56b2f732b8b59f94d357e1e69d710fed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:24:09 +0000 Subject: [PATCH 67/93] libretro.prboom: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/prboom.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/prboom.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2fc6b82c5e65..95ec8eed6a79 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -222,14 +222,7 @@ lib.makeScope newScope (self: rec { ppsspp = self.callPackage ./cores/ppsspp.nix { }; - prboom = mkLibretroCore { - core = "prboom"; - makefile = "Makefile"; - meta = { - description = "Prboom libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + prboom = self.callPackage ./cores/prboom.nix { }; prosystem = mkLibretroCore { core = "prosystem"; diff --git a/pkgs/applications/emulators/retroarch/cores/prboom.nix b/pkgs/applications/emulators/retroarch/cores/prboom.nix new file mode 100644 index 000000000000..b92d3159d729 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/prboom.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "prboom"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-prboom"; + rev = "d25ccfb9739069824d8fff99e3ae78a58a09df01"; + hash = "sha256-IaMreS2MSkFdZ3Jff2FOZBvKIIa4KIkp41LIg3PLl44="; + }; + + makefile = "Makefile"; + + meta = { + description = "Prboom libretro port"; + homepage = "https://github.com/libretro/libretro-prboom"; + license = lib.licenses.gpl2Only; + }; +} From eb45df7d86baaeef2d52452c2c179544794c103f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:26:25 +0000 Subject: [PATCH 68/93] libretro.prosystem: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/prosystem.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/prosystem.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 95ec8eed6a79..171955eed008 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -224,14 +224,7 @@ lib.makeScope newScope (self: rec { prboom = self.callPackage ./cores/prboom.nix { }; - prosystem = mkLibretroCore { - core = "prosystem"; - makefile = "Makefile"; - meta = { - description = "Port of ProSystem to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + prosystem = self.callPackage ./cores/prosystem.nix { }; puae = mkLibretroCore { core = "puae"; diff --git a/pkgs/applications/emulators/retroarch/cores/prosystem.nix b/pkgs/applications/emulators/retroarch/cores/prosystem.nix new file mode 100644 index 000000000000..30aedcb7e346 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/prosystem.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "prosystem"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "prosystem-libretro"; + rev = "acae250da8d98b8b9707cd499e2a0bf6d8500652"; + hash = "sha256-AGF3K3meZEEsnzHmMTCsFXBGNvWVELH8a8qET07kP0o="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of ProSystem to libretro"; + homepage = "https://github.com/libretro/prosystem-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 9c4bcd0e97c88fa84554d471cdda2c08f00ddc33 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:32:32 +0000 Subject: [PATCH 69/93] libretro.puae: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/puae.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/puae.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 171955eed008..2b24e7963b58 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -226,14 +226,7 @@ lib.makeScope newScope (self: rec { prosystem = self.callPackage ./cores/prosystem.nix { }; - puae = mkLibretroCore { - core = "puae"; - makefile = "Makefile"; - meta = { - description = "Amiga emulator based on WinUAE"; - license = lib.licenses.gpl2Only; - }; - }; + puae = self.callPackage ./cores/puae.nix { }; quicknes = mkLibretroCore { core = "quicknes"; diff --git a/pkgs/applications/emulators/retroarch/cores/puae.nix b/pkgs/applications/emulators/retroarch/cores/puae.nix new file mode 100644 index 000000000000..9fe0184c36e0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/puae.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "puae"; + version = "unstable-2024-10-19"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-uae"; + rev = "c60e42ef9ad474518d4be859b7c1da2c0c7e1d6f"; + hash = "sha256-WCkz7BUgYaI+yRhPmNuOKGJC/GxV+n2aeJVn8vhx0Ng="; + }; + + makefile = "Makefile"; + + meta = { + description = "Amiga emulator based on WinUAE"; + homepage = "https://github.com/libretro/libretro-uae"; + license = lib.licenses.gpl2Only; + }; +} From bdd38425123d157d9cfe5d926506d195bc53d2c3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:35:42 +0000 Subject: [PATCH 70/93] libretro.quicknes: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/quicknes.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/quicknes.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2b24e7963b58..8229512e8a56 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -228,14 +228,7 @@ lib.makeScope newScope (self: rec { puae = self.callPackage ./cores/puae.nix { }; - quicknes = mkLibretroCore { - core = "quicknes"; - makefile = "Makefile"; - meta = { - description = "QuickNES libretro port"; - license = lib.licenses.lgpl21Plus; - }; - }; + quicknes = self.callPackage ./cores/quicknes.nix { }; sameboy = mkLibretroCore { core = "sameboy"; diff --git a/pkgs/applications/emulators/retroarch/cores/quicknes.nix b/pkgs/applications/emulators/retroarch/cores/quicknes.nix new file mode 100644 index 000000000000..18edd078af28 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/quicknes.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "quicknes"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "QuickNES_Core"; + rev = "dbf19f73e3eb9701d1c7f5898f57c097e05c9fbd"; + hash = "sha256-oFQUMp1imc8JCsQYCy1BtIUmTC+u0VcoYHpWzUpKNb4="; + }; + + makefile = "Makefile"; + + meta = { + description = "QuickNES libretro port"; + homepage = "https://github.com/libretro/QuickNES_Core"; + license = lib.licenses.lgpl21Plus; + }; +} From 5674d17def505b7ec06e116ab19ca2f778901f3f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:39:30 +0000 Subject: [PATCH 71/93] libretro.sameboy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------ .../emulators/retroarch/cores/sameboy.nix | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/sameboy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8229512e8a56..c8cf4d96ecd4 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -230,16 +230,7 @@ lib.makeScope newScope (self: rec { quicknes = self.callPackage ./cores/quicknes.nix { }; - sameboy = mkLibretroCore { - core = "sameboy"; - extraNativeBuildInputs = [ which hexdump ]; - preBuild = "cd libretro"; - makefile = "Makefile"; - meta = { - description = "SameBoy libretro port"; - license = lib.licenses.mit; - }; - }; + sameboy = self.callPackage ./cores/sameboy.nix { }; same_cdi = mkLibretroCore { core = "same_cdi"; diff --git a/pkgs/applications/emulators/retroarch/cores/sameboy.nix b/pkgs/applications/emulators/retroarch/cores/sameboy.nix new file mode 100644 index 000000000000..53ffa7b2fe4b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/sameboy.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + hexdump, + mkLibretroCore, + which, +}: +mkLibretroCore { + core = "sameboy"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "sameboy"; + rev = "51433012a871a44555492273fd22f29867d12655"; + hash = "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw="; + }; + + extraNativeBuildInputs = [ + which + hexdump + ]; + preBuild = "cd libretro"; + makefile = "Makefile"; + + meta = { + description = "QuickNES libretro port"; + homepage = "https://github.com/libretro/QuickNES_Core"; + license = lib.licenses.mit; + }; +} From ba77247b37f615083cfa807852b3dd19aa878c90 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:44:46 +0000 Subject: [PATCH 72/93] libretro.same_cdi: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 15 +------ .../emulators/retroarch/cores/same_cdi.nix | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/same_cdi.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c8cf4d96ecd4..c0a09e891259 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -230,20 +230,9 @@ lib.makeScope newScope (self: rec { quicknes = self.callPackage ./cores/quicknes.nix { }; - sameboy = self.callPackage ./cores/sameboy.nix { }; + same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo - same_cdi = mkLibretroCore { - core = "same_cdi"; - extraNativeBuildInputs = [ python3 ]; - extraBuildInputs = [ alsa-lib libGLU libGL portaudio xorg.libX11 ]; - # FIXME: build fail with GCC13: - # error: 'uint8_t' in namespace 'std' does not name a type; did you mean 'wint_t'? - stdenv = gcc12Stdenv; - meta = { - description = "SAME_CDI is a libretro core to play CD-i games"; - license = with lib.licenses; [ bsd3 gpl2Plus ]; - }; - }; + sameboy = self.callPackage ./cores/sameboy.nix { }; scummvm = mkLibretroCore { core = "scummvm"; diff --git a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix new file mode 100644 index 000000000000..365b2c5cefc0 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix @@ -0,0 +1,44 @@ +{ + lib, + alsa-lib, + fetchFromGitHub, + gcc12Stdenv, + libGL, + libGLU, + mkLibretroCore, + portaudio, + python3, + xorg, +}: +mkLibretroCore { + core = "same_cdi"; + version = "unstable-2023-02-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "same_cdi"; + rev = "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0"; + hash = "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E="; + }; + + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ + alsa-lib + libGL + libGLU + portaudio + xorg.libX11 + ]; + # FIXME = build fail with GCC13: + # error = 'uint8_t' in namespace 'std' does not name a type; did you mean 'wint_t'? + stdenv = gcc12Stdenv; + + meta = { + description = "SAME_CDI is a libretro core to play CD-i games"; + homepage = "https://github.com/libretro/same_cdi"; + license = with lib.licenses; [ + bsd3 + gpl2Plus + ]; + }; +} From 9c470f7502c8d29531ff4a8664f7977a38dd1368 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:49:42 +0000 Subject: [PATCH 73/93] libretro.scumvmm: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +---- .../emulators/retroarch/cores/scummvm.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/scummvm.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c0a09e891259..918cddf4582e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -234,16 +234,7 @@ lib.makeScope newScope (self: rec { sameboy = self.callPackage ./cores/sameboy.nix { }; - scummvm = mkLibretroCore { - core = "scummvm"; - extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; - makefile = "Makefile"; - preConfigure = "cd backends/platform/libretro/build"; - meta = { - description = "Libretro port of ScummVM"; - license = lib.licenses.gpl2Only; - }; - }; + scummvm = self.callPackage ./cores/scummvm.nix { }; smsplus-gx = mkLibretroCore { core = "smsplus"; diff --git a/pkgs/applications/emulators/retroarch/cores/scummvm.nix b/pkgs/applications/emulators/retroarch/cores/scummvm.nix new file mode 100644 index 000000000000..6b8cc313913c --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/scummvm.nix @@ -0,0 +1,42 @@ +{ + lib, + fetchFromGitHub, + fluidsynth, + libGL, + libGLU, + libjpeg, + libvorbis, + mkLibretroCore, +}: +mkLibretroCore { + core = "scummvm"; + version = "unstable-2022-04-06"; + + # This is the old source code before they upstreamed the source code, + # so now the libretro related code lives in the scummvm/scummvm repository. + # However this broke the old way we were doing builds, so for now point + # to a mirror with the old source code until this issue is fixed. + # TODO: switch to libretro/scummvm since this is more up-to-date + src = fetchFromGitHub { + owner = "libretro-mirrors"; + repo = "scummvm"; + rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; + hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; + }; + + extraBuildInputs = [ + fluidsynth + libjpeg + libvorbis + libGLU + libGL + ]; + makefile = "Makefile"; + preConfigure = "cd backends/platform/libretro/build"; + + meta = { + description = "Libretro port of ScummVM"; + homepage = "https://github.com/libretro-mirrors/scummvm"; + license = lib.licenses.gpl2Only; + }; +} From e07d0ce6f693ade3ad14a1300780906cafc8a990 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 13:56:08 +0000 Subject: [PATCH 74/93] libretro.smsplus-gx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------- .../emulators/retroarch/cores/smsplus-gx.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 918cddf4582e..1b396c396ddf 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -236,14 +236,7 @@ lib.makeScope newScope (self: rec { scummvm = self.callPackage ./cores/scummvm.nix { }; - smsplus-gx = mkLibretroCore { - core = "smsplus"; - repo = "smsplus-gx"; - meta = { - description = "SMS Plus GX libretro port"; - license = lib.licenses.gpl2Plus; - }; - }; + smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; snes9x = mkLibretroCore { core = "snes9x"; diff --git a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix new file mode 100644 index 000000000000..3eb69a857811 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "smsplus"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "smsplus-gx"; + rev = "c642bbd0680b5959180a420036108893d0aec961"; + hash = "sha256-SHBrwzLyVZ4Tp/kVCnr4xj2B3pmdg+JUmZUM7hYao64="; + }; + + meta = { + description = "SMS Plus GX libretro port"; + homepage = "https://github.com/libretro/smsplus-gx"; + license = lib.licenses.gpl2Plus; + }; +} From e96e989b265125664f55d70801bf0f122dde71c2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:26:31 +0000 Subject: [PATCH 75/93] libretro.snes9x: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/snes9x.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 1b396c396ddf..182c9e8434cb 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -238,16 +238,7 @@ lib.makeScope newScope (self: rec { smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; - snes9x = mkLibretroCore { - core = "snes9x"; - makefile = "Makefile"; - preBuild = "cd libretro"; - meta = { - description = "Port of SNES9x git to libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x = self.callPackage ./cores/snes9x.nix { }; snes9x2002 = mkLibretroCore { core = "snes9x2002"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x.nix b/pkgs/applications/emulators/retroarch/cores/snes9x.nix new file mode 100644 index 000000000000..dc51fdfc9d3b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "snes9x"; + version = "unstable-2024-10-28"; + + src = fetchFromGitHub { + owner = "snes9xgit"; + repo = "snes9x"; + rev = "fd05ca7df5259a2cd0aa9204f331e0b05126c376"; + hash = "sha256-o/Rb1XQ7QoI0hKROMFZ9igyH8NN3bMryvyU4oNUqtRA="; + }; + + makefile = "Makefile"; + preBuild = "cd libretro"; + + meta = { + description = "Port of SNES9x git to libretro"; + homepage = "https://github.com/snes9xgit/snes9x"; + license = lib.licenses.unfreeRedistributable; + }; +} From 6ea1c0b4142dd1023cb6e48edd86b2191133b487 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:28:42 +0000 Subject: [PATCH 76/93] libretro.snes9x2002: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 10 +------- .../emulators/retroarch/cores/snes9x2002.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2002.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 182c9e8434cb..dbd48ba6c229 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -240,15 +240,7 @@ lib.makeScope newScope (self: rec { snes9x = self.callPackage ./cores/snes9x.nix { }; - snes9x2002 = mkLibretroCore { - core = "snes9x2002"; - makefile = "Makefile"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; snes9x2005 = mkLibretroCore { core = "snes9x2005"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix new file mode 100644 index 000000000000..f64f31641b56 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "snes9x2002"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2002"; + rev = "a0709ec7dcd6de2fbebb43106bd757b649e3b7cf"; + hash = "sha256-rrMPhXIsQ48fVvjgZgC3xeqm9k9kwe43oZNzs2d/h1Q="; + }; + + makefile = "Makefile"; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.39 to Libretro"; + homepage = "https://github.com/libretro/snes9x2002"; + license = lib.licenses.unfreeRedistributable; + }; +} From 933b4db84b5af171819d9df6f3b68863fa5b7a80 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:31:14 +0000 Subject: [PATCH 77/93] libretro.snes9x2005{,-plus}: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 22 ++-------------- .../emulators/retroarch/cores/snes9x2005.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2005.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index dbd48ba6c229..94e992b46776 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -242,27 +242,9 @@ lib.makeScope newScope (self: rec { snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; - snes9x2005 = mkLibretroCore { - core = "snes9x2005"; - makefile = "Makefile"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; - snes9x2005-plus = mkLibretroCore { - core = "snes9x2005-plus"; - repo = "snes9x2005"; - makefile = "Makefile"; - makeFlags = [ "USE_BLARGG_APU=1" ]; - meta = { - description = "Optimized port/rewrite of SNES9x 1.43 to Libretro, with Blargg's APU"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; snes9x2010 = mkLibretroCore { core = "snes9x2010"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix new file mode 100644 index 000000000000..f823a0fab39a --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, + withBlarggAPU ? false, +}: +mkLibretroCore { + core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2005"; + rev = "74d871db9b4dba6dbe6c5ecebc88cbf255be5349"; + hash = "sha256-YlRMjSEo9sdLVRzWGSJlnBeqg6wUhZi8l3ffzUaKQIQ="; + }; + + makefile = "Makefile"; + makeFlags = lib.optionals withBlarggAPU [ "USE_BLARGG_APU=1" ]; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.43 to Libretro"; + homepage = "https://github.com/libretro/snes9x2005"; + license = lib.licenses.unfreeRedistributable; + }; +} From 5819c9c742a81aebedbbd8c16f5e27e47f2873fa Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:46:37 +0000 Subject: [PATCH 78/93] libretro.snes9x2010: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/snes9x2010.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/snes9x2010.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 94e992b46776..e88262b29a25 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -246,14 +246,7 @@ lib.makeScope newScope (self: rec { snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; - snes9x2010 = mkLibretroCore { - core = "snes9x2010"; - meta = { - description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; - # Non-commercial clause - license = lib.licenses.unfreeRedistributable; - }; - }; + snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; stella = mkLibretroCore { core = "stella"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix new file mode 100644 index 000000000000..8b913e7fa4a4 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore rec { + core = "snes9x2010"; + version = "unstable-2024-11-18"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "snes9x2010"; + rev = "f9ae8fd28b13070a945a829ccf41cbf90a21d0f7"; + hash = "sha256-nsExAYnzDenPvXzeN60jGykRTrCGMi/mRPV+vgS8ZtE="; + }; + + makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; + + meta = { + description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; + homepage = "https://github.com/libretro/snes9x2010"; + license = lib.licenses.unfreeRedistributable; + }; +} From 5d49f432a20a89094edd88778ee48fd937a59df9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:51:52 +0000 Subject: [PATCH 79/93] libretro/stella: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../emulators/retroarch/cores/stella.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/stella.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e88262b29a25..f4b238f4c0bb 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -248,16 +248,7 @@ lib.makeScope newScope (self: rec { snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; - stella = mkLibretroCore { - core = "stella"; - makefile = "Makefile"; - preBuild = "cd src/os/libretro"; - dontConfigure = true; - meta = { - description = "Port of Stella to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + stella = self.callPackage ./cores/stella.nix { }; stella2014 = mkLibretroCore { core = "stella2014"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella.nix b/pkgs/applications/emulators/retroarch/cores/stella.nix new file mode 100644 index 000000000000..891127b278fa --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/stella.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "stella"; + version = "unstable-2024-11-17"; + + src = fetchFromGitHub { + owner = "stella-emu"; + repo = "stella"; + rev = "0e2ce2771c7d0c9b2dd5c06e3a4746738d3c9e47"; + hash = "sha256-axt5wvH7WENh1ALPYc+f5XpCv2xPm5jYx26zMhLEt3E="; + }; + + makefile = "Makefile"; + preBuild = "cd src/os/libretro"; + dontConfigure = true; + + meta = { + description = "Port of Stella to libretro"; + homepage = "https://github.com/stella-emu/stella"; + license = lib.licenses.gpl2Only; + }; +} From 0d5079de2d817160e21f56056227daf681cc8a58 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:54:44 +0000 Subject: [PATCH 80/93] libretro.stella2014: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/stella2014.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/stella2014.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index f4b238f4c0bb..87643c0d3451 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -250,14 +250,7 @@ lib.makeScope newScope (self: rec { stella = self.callPackage ./cores/stella.nix { }; - stella2014 = mkLibretroCore { - core = "stella2014"; - makefile = "Makefile"; - meta = { - description = "Port of Stella ~2014 to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + stella2014 = self.callPackage ./cores/stella2014.nix { }; swanstation = mkLibretroCore { core = "swanstation"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella2014.nix b/pkgs/applications/emulators/retroarch/cores/stella2014.nix new file mode 100644 index 000000000000..2baf66a65f7b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/stella2014.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "stella2014"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "stella2014-libretro"; + rev = "3cc89f0d316d6c924a5e3f4011d17421df58e615"; + hash = "sha256-2gnFWau7F45SdzoqDUlqYXfXVE1EUPozHZv7BhyRRIA="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of Stella ~2014 to libretro"; + homepage = "https://github.com/libretro/stella2014-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 35a15946800b19ee36acb3b94a4f186f41f83467 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:57:04 +0000 Subject: [PATCH 81/93] libretro.swanstation: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 13 +-------- .../emulators/retroarch/cores/swanstation.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/swanstation.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 87643c0d3451..51c22146d160 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -252,18 +252,7 @@ lib.makeScope newScope (self: rec { stella2014 = self.callPackage ./cores/stella2014.nix { }; - swanstation = mkLibretroCore { - core = "swanstation"; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DBUILD_LIBRETRO_CORE=ON" - ]; - meta = { - description = "Port of SwanStation (a fork of DuckStation) to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + swanstation = self.callPackage ./cores/swanstation.nix { }; tgbdual = mkLibretroCore { core = "tgbdual"; diff --git a/pkgs/applications/emulators/retroarch/cores/swanstation.nix b/pkgs/applications/emulators/retroarch/cores/swanstation.nix new file mode 100644 index 000000000000..aa87dc8178b1 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/swanstation.nix @@ -0,0 +1,29 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "swanstation"; + version = "unstable-2024-07-24"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "swanstation"; + rev = "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb"; + hash = "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E="; + }; + + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_LIBRETRO_CORE=ON" + ]; + + meta = { + description = "Port of SwanStation (a fork of DuckStation) to libretro"; + homepage = "https://github.com/libretro/swanstation"; + license = lib.licenses.gpl3Only; + }; +} From dce5b44ed781122a8fcbee2620b6434bd376c53a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 14:59:38 +0000 Subject: [PATCH 82/93] libretro.tgbdual: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../emulators/retroarch/cores/tgbdual.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/tgbdual.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 51c22146d160..75258a75c789 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -254,14 +254,7 @@ lib.makeScope newScope (self: rec { swanstation = self.callPackage ./cores/swanstation.nix { }; - tgbdual = mkLibretroCore { - core = "tgbdual"; - makefile = "Makefile"; - meta = { - description = "Port of TGBDual to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + tgbdual = self.callPackage ./cores/tgbdual.nix { }; thepowdertoy = mkLibretroCore { core = "thepowdertoy"; diff --git a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix new file mode 100644 index 000000000000..7297818539c8 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "tgbdual"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "tgbdual-libretro"; + rev = "8d305769eebd67266c284558f9d3a30498894d3d"; + hash = "sha256-3mlnTgp43qC3yifpr6pvtC4vslddcf6mephKA183vEk="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of TGBDual to libretro"; + homepage = "https://github.com/libretro/tgbdual-libretro"; + license = lib.licenses.gpl2Only; + }; +} From dec2549c0c2706d21eff7c9e169dfec444b31f29 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:02:00 +0000 Subject: [PATCH 83/93] libretro.thepowdertoy: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 11 +------- .../retroarch/cores/thepowdertoy.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 75258a75c789..4d74950466b7 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -256,16 +256,7 @@ lib.makeScope newScope (self: rec { tgbdual = self.callPackage ./cores/tgbdual.nix { }; - thepowdertoy = mkLibretroCore { - core = "thepowdertoy"; - extraNativeBuildInputs = [ cmake ]; - makefile = "Makefile"; - postBuild = "cd src"; - meta = { - description = "Port of The Powder Toy to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; tic80 = mkLibretroCore { core = "tic80"; diff --git a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix new file mode 100644 index 000000000000..2b8358a59803 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix @@ -0,0 +1,27 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "thepowdertoy"; + version = "unstable-2024-10-01"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "ThePowderToy"; + rev = "5d9c749780063b87bd62ddb025dee4241f196f26"; + hash = "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="; + }; + + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + postBuild = "cd src"; + + meta = { + description = "Port of The Powder Toy to libretro"; + homepage = "https://github.com/libretro/ThePowderToy"; + license = lib.licenses.gpl3Only; + }; +} From 0ea40e12d79db9aed77f81de0041ad6ccb429180 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:04:35 +0000 Subject: [PATCH 84/93] libretro.tic80: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 20 +-------- .../emulators/retroarch/cores/tic80.nix | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/tic80.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 4d74950466b7..c20c529aba84 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -258,25 +258,7 @@ lib.makeScope newScope (self: rec { thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; - tic80 = mkLibretroCore { - core = "tic80"; - extraNativeBuildInputs = [ cmake pkg-config ]; - makefile = "Makefile"; - cmakeFlags = [ - "-DBUILD_LIBRETRO=ON" - "-DBUILD_DEMO_CARTS=OFF" - "-DBUILD_PRO=OFF" - "-DBUILD_PLAYER=OFF" - "-DBUILD_SDL=OFF" - "-DBUILD_SOKOL=OFF" - ]; - preConfigure = "cd core"; - postBuild = "cd lib"; - meta = { - description = "Port of TIC-80 to libretro"; - license = lib.licenses.mit; - }; - }; + tic80 = self.callPackage ./cores/tic80.nix { }; twenty-fortyeight = mkLibretroCore { core = "2048"; diff --git a/pkgs/applications/emulators/retroarch/cores/tic80.nix b/pkgs/applications/emulators/retroarch/cores/tic80.nix new file mode 100644 index 000000000000..2e637e9a1e74 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/tic80.nix @@ -0,0 +1,41 @@ +{ + lib, + cmake, + fetchFromGitHub, + mkLibretroCore, + pkg-config, +}: +mkLibretroCore { + core = "tic80"; + version = "unstable-2024-05-13"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "tic-80"; + rev = "6412f72d0f4725c153ce3d245729b829e713542e"; + hash = "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q="; + fetchSubmodules = true; + }; + + extraNativeBuildInputs = [ + cmake + pkg-config + ]; + makefile = "Makefile"; + cmakeFlags = [ + "-DBUILD_LIBRETRO=ON" + "-DBUILD_DEMO_CARTS=OFF" + "-DBUILD_PRO=OFF" + "-DBUILD_PLAYER=OFF" + "-DBUILD_SDL=OFF" + "-DBUILD_SOKOL=OFF" + ]; + preConfigure = "cd core"; + postBuild = "cd lib"; + + meta = { + description = "Port of TIC-80 to libretro"; + homepage = "https://github.com/libretro/tic-80"; + license = lib.licenses.mit; + }; +} From 9455b06a10aac04d94b5c4da276a7526a150e0fc Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:07:56 +0000 Subject: [PATCH 85/93] libretro.twenty-fortyeight: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 8 +------ .../retroarch/cores/twenty-fortyeight.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c20c529aba84..37b197e3bf2e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -260,13 +260,7 @@ lib.makeScope newScope (self: rec { tic80 = self.callPackage ./cores/tic80.nix { }; - twenty-fortyeight = mkLibretroCore { - core = "2048"; - meta = { - description = "Port of 2048 puzzle game to the libretro API"; - license = lib.licenses.unlicense; - }; - }; + twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; vba-m = mkLibretroCore { core = "vbam"; diff --git a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix new file mode 100644 index 000000000000..23d72dfead1b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "2048"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-2048"; + rev = "5474ed1ab880b3296c9860d0943d7de1970c79dd"; + hash = "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc="; + }; + + meta = { + description = "Port of 2048 puzzle game to libretro"; + homepage = "https://github.com/libretro/libretro-2048"; + license = lib.licenses.unlicense; + }; +} From 55c673765c27ee35c4747c007023fd3f8450b031 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:11:08 +0000 Subject: [PATCH 86/93] libretro.vba-m: move to retroarch/cores --- .../emulators/retroarch/cores/vba-m.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/applications/emulators/retroarch/cores/vba-m.nix diff --git a/pkgs/applications/emulators/retroarch/cores/vba-m.nix b/pkgs/applications/emulators/retroarch/cores/vba-m.nix new file mode 100644 index 000000000000..5b50f4d9a094 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vba-m.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "vbam"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "vbam-libretro"; + rev = "379dd97301458a51fb69dd93ba21b64f81e01ef2"; + hash = "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI="; + }; + + makefile = "Makefile"; + preBuild = "cd src/libretro"; + + meta = { + description = "VBA-M libretro port"; + homepage = "https://github.com/libretro/vbam-libretro"; + license = lib.licenses.gpl2Only; + }; +} From 52d42220c35994fe8d35198228977ae3458c68e4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:12:57 +0000 Subject: [PATCH 87/93] libretro.vba-next: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 19 ++-------------- .../emulators/retroarch/cores/vba-next.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/vba-next.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 37b197e3bf2e..493c2b47056f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -262,24 +262,9 @@ lib.makeScope newScope (self: rec { twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; - vba-m = mkLibretroCore { - core = "vbam"; - repo = "vba-m"; - makefile = "Makefile"; - preBuild = "cd src/libretro"; - meta = { - description = "vanilla VBA-M libretro port"; - license = lib.licenses.gpl2Only; - }; - }; + vba-m = self.callPackage ./cores/vba-m.nix { }; - vba-next = mkLibretroCore { - core = "vba-next"; - meta = { - description = "VBA-M libretro port with modifications for speed"; - license = lib.licenses.gpl2Only; - }; - }; + vba-next = self.callPackage ./cores/vba-next.nix { }; vecx = mkLibretroCore { core = "vecx"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-next.nix b/pkgs/applications/emulators/retroarch/cores/vba-next.nix new file mode 100644 index 000000000000..9027d8501565 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vba-next.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "vba-next"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "vba-next"; + rev = "2c726f25da75a5600ef5791ce904befe06c4dddd"; + hash = "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs="; + }; + + meta = { + description = "VBA-M libretro port with modifications for speed"; + homepage = "https://github.com/libretro/vba-next"; + license = lib.licenses.gpl2Only; + }; +} From 0c15ac65d46b3a10fa66ab1a353657316ab2fc35 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:14:58 +0000 Subject: [PATCH 88/93] libretro.vecx: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +----- .../emulators/retroarch/cores/vecx.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/vecx.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 493c2b47056f..8c4028f586d5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -266,14 +266,7 @@ lib.makeScope newScope (self: rec { vba-next = self.callPackage ./cores/vba-next.nix { }; - vecx = mkLibretroCore { - core = "vecx"; - extraBuildInputs = [ libGL libGLU ]; - meta = { - description = "Port of Vecx to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + vecx = self.callPackage ./cores/vecx.nix { }; virtualjaguar = mkLibretroCore { core = "virtualjaguar"; diff --git a/pkgs/applications/emulators/retroarch/cores/vecx.nix b/pkgs/applications/emulators/retroarch/cores/vecx.nix new file mode 100644 index 000000000000..664f01b73849 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/vecx.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + libGL, + libGLU, + mkLibretroCore, +}: +mkLibretroCore { + core = "vecx"; + version = "unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "libretro-vecx"; + rev = "0e48a8903bd9cc359da3f7db783f83e22722c0cf"; + hash = "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU="; + }; + + extraBuildInputs = [ + libGL + libGLU + ]; + + meta = { + description = "VBA-M libretro port with modifications for speed"; + homepage = "https://github.com/libretro/libretro-vecx"; + license = lib.licenses.gpl3Only; + }; +} From a994304cda565949ebe63ef779b29aa72e2a8ddb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:17:16 +0000 Subject: [PATCH 89/93] libretro.virtualjaguar: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 9 +------ .../retroarch/cores/virtualjaguar.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 8c4028f586d5..199939aa498f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -268,14 +268,7 @@ lib.makeScope newScope (self: rec { vecx = self.callPackage ./cores/vecx.nix { }; - virtualjaguar = mkLibretroCore { - core = "virtualjaguar"; - makefile = "Makefile"; - meta = { - description = "Port of VirtualJaguar to libretro"; - license = lib.licenses.gpl3Only; - }; - }; + virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; yabause = mkLibretroCore { core = "yabause"; diff --git a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix new file mode 100644 index 000000000000..c90c4b081002 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "virtualjaguar"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "virtualjaguar-libretro"; + rev = "48096c1f6f8b98cfff048a5cb4e6a86686631072"; + hash = "sha256-DLBQQARHqupGGQS8YznDSSMuxQliyt5apGA4Ku2jlYo="; + }; + + makefile = "Makefile"; + + meta = { + description = "Port of VirtualJaguar to libretro"; + homepage = "https://github.com/libretro/virtualjaguar-libretro"; + license = lib.licenses.gpl3Only; + }; +} From b57fd97854c24f559085feda787dd1ce80c99605 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:19:23 +0000 Subject: [PATCH 90/93] libretro.yabause: move to retroarch/cores --- .../emulators/retroarch/cores.nix | 12 +------- .../emulators/retroarch/cores/yabause.nix | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/emulators/retroarch/cores/yabause.nix diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 199939aa498f..ebfc283d2360 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -270,15 +270,5 @@ lib.makeScope newScope (self: rec { virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; - yabause = mkLibretroCore { - core = "yabause"; - makefile = "Makefile"; - # Disable SSE for non-x86. DYNAREC doesn't build on aarch64. - makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; - preBuild = "cd yabause/src/libretro"; - meta = { - description = "Port of Yabause to libretro"; - license = lib.licenses.gpl2Only; - }; - }; + yabause = self.callPackage ./cores/yabause.nix { }; }) diff --git a/pkgs/applications/emulators/retroarch/cores/yabause.nix b/pkgs/applications/emulators/retroarch/cores/yabause.nix new file mode 100644 index 000000000000..dec1fe3e89b9 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/cores/yabause.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mkLibretroCore, +}: +mkLibretroCore { + core = "yabause"; + version = "unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "yabause"; + rev = "c35712c5ed33e18d77097f2059a036e19d1d66f2"; + hash = "sha256-4/gxWNPkGKBf4ti7ZF4GXgng6ZPyM9prrvK0S5tZ6V8="; + }; + + makefile = "Makefile"; + # Disable SSE for non-x86. DYNAREC doesn't build on aarch64. + makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0"; + preBuild = "cd yabause/src/libretro"; + + meta = { + description = "Port of Yabause to libretro"; + homepage = "https://github.com/libretro/yabause"; + license = lib.licenses.gpl2Only; + }; +} From d8c5c5e001a00ca80e9be849be72bdde58f4daf8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 15:28:23 +0000 Subject: [PATCH 91/93] libretro.cores: clean-up, remove update_cores.py script --- maintainers/team-list.nix | 1 + .../emulators/retroarch/cores.nix | 234 ++--- .../emulators/retroarch/cores/beetle-gba.nix | 4 - .../emulators/retroarch/hashes.json | 903 ------------------ .../emulators/retroarch/mkLibretroCore.nix | 129 +-- .../emulators/retroarch/update_cores.py | 233 ----- 6 files changed, 151 insertions(+), 1353 deletions(-) delete mode 100644 pkgs/applications/emulators/retroarch/hashes.json delete mode 100755 pkgs/applications/emulators/retroarch/update_cores.py diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 613d6be6753a..c27a307a8261 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -576,6 +576,7 @@ with lib.maintainers; members = [ aanderse edwtjo + hrdinka thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ebfc283d2360..61097042e33f 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -1,89 +1,11 @@ -{ lib -, newScope -, stdenv -, gcc12Stdenv -, alsa-lib -, boost -, bzip2 -, cmake -, curl -, fetchFromGitHub -, fetchpatch -, ffmpeg_6 -, fluidsynth -, fmt -, freetype -, gettext -, harfbuzz -, hexdump -, hidapi -, icu -, libaio -, libevdev -, libGL -, libGLU -, libjpeg -, liblcf -, libpcap -, libpng -, libsndfile -, libvorbis -, libxml2 -, libxmp -, libzip -, mpg123 -, nasm -, openssl -, opusfile -, pcre -, pixman -, pkg-config -, portaudio -, python3 -, sfml -, snappy -, speexdsp -, udev -, which -, xorg -, xxd -, xz +{ + lib, + newScope, + fetchFromGitHub, }: -let - hashesFile = lib.importJSON ./hashes.json; - - getCore = repo: (lib.getAttr repo hashesFile); - - getCoreSrc = repo: - let - inherit (getCore repo) src fetcher; - fetcherFn = { - inherit fetchFromGitHub; - }.${fetcher} or (throw "Unknown fetcher: ${fetcher}"); - in - fetcherFn src; - - getCoreVersion = repo: (getCore repo).version; -in -lib.makeScope newScope (self: rec { - mkLibretroCore = - # Sometimes core name != repo name, so you may need to set them differently - # when necessary: - # - core: used by the resulting core library name, e.g.: - # `${core}_libretro.so`. Needs to match their respectful core info file - # (see https://github.com/libretro/libretro-core-info/) - # - repo: the repository name on GitHub - # See `update_cores.py` for instruction on how to add a new core. - { core - , repo ? core - , src ? (getCoreSrc repo) - , version ? (getCoreVersion repo) - , ... - }@args: - self.callPackage ./mkLibretroCore.nix ({ - inherit core repo src version; - } // args); +lib.makeScope newScope (self: { + mkLibretroCore = self.callPackage ./mkLibretroCore.nix; atari800 = self.callPackage ./cores/atari800.nix { }; @@ -127,148 +49,148 @@ lib.makeScope newScope (self: rec { bsnes-mercury-performance = self.bsnes-mercury.override { withProfile = "performance"; }; - citra = self.callPackage ./cores/citra.nix { }; + citra = self.callPackage ./cores/citra.nix { }; - desmume = self.callPackage ./cores/desmume.nix { }; + desmume = self.callPackage ./cores/desmume.nix { }; - desmume2015 = self.callPackage ./cores/desmume2015.nix { }; + desmume2015 = self.callPackage ./cores/desmume2015.nix { }; - dolphin = self.callPackage ./cores/dolphin.nix { }; + dolphin = self.callPackage ./cores/dolphin.nix { }; - dosbox = self.callPackage ./cores/dosbox.nix { }; + dosbox = self.callPackage ./cores/dosbox.nix { }; - dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; + dosbox-pure = self.callPackage ./cores/dosbox-pure.nix { }; - easyrpg = self.callPackage ./cores/easyrpg.nix { }; + easyrpg = self.callPackage ./cores/easyrpg.nix { }; - eightyone = self.callPackage ./cores/eightyone.nix { }; + eightyone = self.callPackage ./cores/eightyone.nix { }; - fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; + fbalpha2012 = self.callPackage ./cores/fbalpha2012.nix { }; - fbneo = self.callPackage ./cores/fbneo.nix { }; + fbneo = self.callPackage ./cores/fbneo.nix { }; - fceumm = self.callPackage ./cores/fceumm.nix { }; + fceumm = self.callPackage ./cores/fceumm.nix { }; - flycast = self.callPackage ./cores/flycast.nix { }; + flycast = self.callPackage ./cores/flycast.nix { }; - fmsx = self.callPackage ./cores/fmsx.nix { }; + fmsx = self.callPackage ./cores/fmsx.nix { }; - freeintv = self.callPackage ./cores/freeintv.nix { }; + freeintv = self.callPackage ./cores/freeintv.nix { }; - fuse = self.callPackage ./cores/fuse.nix { }; + fuse = self.callPackage ./cores/fuse.nix { }; - gambatte = self.callPackage ./cores/gambatte.nix { }; + gambatte = self.callPackage ./cores/gambatte.nix { }; - genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; + genesis-plus-gx = self.callPackage ./cores/genesis-plus-gx.nix { }; - gpsp = self.callPackage ./cores/gpsp.nix { }; + gpsp = self.callPackage ./cores/gpsp.nix { }; - gw = self.callPackage ./cores/gw.nix { }; + gw = self.callPackage ./cores/gw.nix { }; - handy = self.callPackage ./cores/handy.nix { }; + handy = self.callPackage ./cores/handy.nix { }; - hatari = self.callPackage ./cores/hatari.nix { }; + hatari = self.callPackage ./cores/hatari.nix { }; - mame = self.callPackage ./cores/mame.nix { }; + mame = self.callPackage ./cores/mame.nix { }; - mame2000 = self.callPackage ./cores/mame2000.nix { }; + mame2000 = self.callPackage ./cores/mame2000.nix { }; - mame2003 = self.callPackage ./cores/mame2003.nix { }; + mame2003 = self.callPackage ./cores/mame2003.nix { }; - mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; + mame2003-plus = self.callPackage ./cores/mame2003-plus.nix { }; - mame2010 = self.callPackage ./cores/mame2010.nix { }; + mame2010 = self.callPackage ./cores/mame2010.nix { }; - mame2015 = self.callPackage ./cores/mame2015.nix { }; + mame2015 = self.callPackage ./cores/mame2015.nix { }; - mame2016 = self.callPackage ./cores/mame2016.nix { }; + mame2016 = self.callPackage ./cores/mame2016.nix { }; - melonds = self.callPackage ./cores/melonds.nix { }; + melonds = self.callPackage ./cores/melonds.nix { }; - mesen = self.callPackage ./cores/mesen.nix { }; + mesen = self.callPackage ./cores/mesen.nix { }; - mesen-s = self.callPackage ./cores/mesen-s.nix { }; + mesen-s = self.callPackage ./cores/mesen-s.nix { }; - meteor = self.callPackage ./cores/meteor.nix { }; + meteor = self.callPackage ./cores/meteor.nix { }; - mgba = self.callPackage ./cores/mgba.nix { }; + mgba = self.callPackage ./cores/mgba.nix { }; - mrboom = self.callPackage ./cores/mrboom.nix { }; + mrboom = self.callPackage ./cores/mrboom.nix { }; - mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; + mupen64plus = self.callPackage ./cores/mupen64plus.nix { }; - neocd = self.callPackage ./cores/neocd.nix { }; + neocd = self.callPackage ./cores/neocd.nix { }; - nestopia = self.callPackage ./cores/nestopia.nix { }; + nestopia = self.callPackage ./cores/nestopia.nix { }; - np2kai = self.callPackage ./cores/np2kai.nix { }; + np2kai = self.callPackage ./cores/np2kai.nix { }; - nxengine = self.callPackage ./cores/nxengine.nix { }; + nxengine = self.callPackage ./cores/nxengine.nix { }; - o2em = self.callPackage ./cores/o2em.nix { }; + o2em = self.callPackage ./cores/o2em.nix { }; - opera = self.callPackage ./cores/opera.nix { }; + opera = self.callPackage ./cores/opera.nix { }; - parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; + parallel-n64 = self.callPackage ./cores/parallel-n64.nix { }; - pcsx2 = self.callPackage ./cores/pcsx2.nix { }; + pcsx2 = self.callPackage ./cores/pcsx2.nix { }; - pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; - pcsx_rearmed = lib.lowPrio(self.pcsx-rearmed); # added 2024-11-20 + pcsx-rearmed = self.callPackage ./cores/pcsx-rearmed.nix { }; + pcsx_rearmed = lib.lowPrio (self.pcsx-rearmed); # added 2024-11-20 - picodrive = self.callPackage ./cores/picodrive.nix { }; + picodrive = self.callPackage ./cores/picodrive.nix { }; - play = self.callPackage ./cores/play.nix { }; + play = self.callPackage ./cores/play.nix { }; - ppsspp = self.callPackage ./cores/ppsspp.nix { }; + ppsspp = self.callPackage ./cores/ppsspp.nix { }; - prboom = self.callPackage ./cores/prboom.nix { }; + prboom = self.callPackage ./cores/prboom.nix { }; - prosystem = self.callPackage ./cores/prosystem.nix { }; + prosystem = self.callPackage ./cores/prosystem.nix { }; - puae = self.callPackage ./cores/puae.nix { }; + puae = self.callPackage ./cores/puae.nix { }; - quicknes = self.callPackage ./cores/quicknes.nix { }; + quicknes = self.callPackage ./cores/quicknes.nix { }; - same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo + same_cdi = self.callPackage ./cores/same_cdi.nix { }; # the name is not a typo - sameboy = self.callPackage ./cores/sameboy.nix { }; + sameboy = self.callPackage ./cores/sameboy.nix { }; - scummvm = self.callPackage ./cores/scummvm.nix { }; + scummvm = self.callPackage ./cores/scummvm.nix { }; - smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; + smsplus-gx = self.callPackage ./cores/smsplus-gx.nix { }; - snes9x = self.callPackage ./cores/snes9x.nix { }; + snes9x = self.callPackage ./cores/snes9x.nix { }; - snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; + snes9x2002 = self.callPackage ./cores/snes9x2002.nix { }; - snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; + snes9x2005 = self.callPackage ./cores/snes9x2005.nix { }; snes9x2005-plus = self.snes9x2005.override { withBlarggAPU = true; }; - snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; + snes9x2010 = self.callPackage ./cores/snes9x2010.nix { }; - stella = self.callPackage ./cores/stella.nix { }; + stella = self.callPackage ./cores/stella.nix { }; - stella2014 = self.callPackage ./cores/stella2014.nix { }; + stella2014 = self.callPackage ./cores/stella2014.nix { }; - swanstation = self.callPackage ./cores/swanstation.nix { }; + swanstation = self.callPackage ./cores/swanstation.nix { }; - tgbdual = self.callPackage ./cores/tgbdual.nix { }; + tgbdual = self.callPackage ./cores/tgbdual.nix { }; - thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; + thepowdertoy = self.callPackage ./cores/thepowdertoy.nix { }; - tic80 = self.callPackage ./cores/tic80.nix { }; + tic80 = self.callPackage ./cores/tic80.nix { }; - twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; + twenty-fortyeight = self.callPackage ./cores/twenty-fortyeight.nix { }; - vba-m = self.callPackage ./cores/vba-m.nix { }; + vba-m = self.callPackage ./cores/vba-m.nix { }; - vba-next = self.callPackage ./cores/vba-next.nix { }; + vba-next = self.callPackage ./cores/vba-next.nix { }; - vecx = self.callPackage ./cores/vecx.nix { }; + vecx = self.callPackage ./cores/vecx.nix { }; - virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; + virtualjaguar = self.callPackage ./cores/virtualjaguar.nix { }; - yabause = self.callPackage ./cores/yabause.nix { }; + yabause = self.callPackage ./cores/yabause.nix { }; }) diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix index 22ce05982d23..ba6f74a5a6a0 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-gba.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - unstableGitUpdater, mkLibretroCore, }: mkLibretroCore { @@ -17,9 +16,6 @@ mkLibretroCore { makefile = "Makefile"; - # TODO: move this to mkLibretroCore - passthru.updateScript = unstableGitUpdater { }; - meta = { description = "Port of Mednafen's GameBoy Advance core to libretro"; homepage = "https://github.com/libretro/beetle-gba-libretro"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json deleted file mode 100644 index 85ad2aa9e010..000000000000 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ /dev/null @@ -1,903 +0,0 @@ -{ - "!comment": "Generated with update_cores.py script, do not edit!", - "2048": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "5474ed1ab880b3296c9860d0943d7de1970c79dd", - "hash": "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc=" - }, - "version": "unstable-2024-06-28" - }, - "atari800": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-atari800", - "rev": "6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b", - "hash": "sha256-+cZXHtaXnpU/zCwiDtjkyNMFGDahiHzqV2FoTCRnUWE=" - }, - "version": "unstable-2024-10-31" - }, - "beetle-gba": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-gba-libretro", - "rev": "6cee80685f735ea6c2373db2622a1f1ee9f39d39", - "hash": "sha256-a3XgExXVCUFw3GLCUkEl6now2L8qVdNOaXvrDMcT1ZE=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-lynx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-lynx-libretro", - "rev": "7fead71b49e0f08be5c4d4224fea73c6174763bf", - "hash": "sha256-fYBx/bjbhRXoVIGnEg4/oMVm705ivL1os+FfVQLRSyI=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-ngp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-ngp-libretro", - "rev": "139fe34c8dfc5585d6ee1793a7902bca79d544de", - "hash": "sha256-ruWnCgMxfpPHTWQ7vgNUczmGRzNKKhoZTNlUcNgm4T8=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-pce": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pce-libretro", - "rev": "af28fb0385d00e0292c4703b3aa7e72762b564d2", - "hash": "sha256-W+74RTIidSUdviihLy926OvlSdqMECvOLEEiWMtB50w=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-pce-fast": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pce-fast-libretro", - "rev": "931586f0512663f625a6e981d3047a6620281ab5", - "hash": "sha256-9Nne4upiQNSAlTZsyXcLNIwN8MMKUO1ycahowYW1sWg=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-pcfx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-pcfx-libretro", - "rev": "dd04cef9355286488a1d78ff18c4c848a1575540", - "hash": "sha256-oFBuriCbJWjgPH9RRAM/XUvkW0gKXnvs7lmBpJpWewo=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-psx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-psx-libretro", - "rev": "1068cb8dbd6f312664ecf5901625cab4a6533204", - "hash": "sha256-ioAnpz6OkHWPaYE0uTEvnHV+vGzq02bQ4oUP8jW6/YA=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-saturn": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-saturn-libretro", - "rev": "0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48", - "hash": "sha256-WNQhtaYBg7JqPdxcD0cLRjr2pSda6Xmx/WWYzyu5u9c=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-supafaust": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "supafaust", - "rev": "e25f66765938d33f9ad5850e8d6cd597e55b7299", - "hash": "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow=" - }, - "version": "unstable-2024-10-01" - }, - "beetle-supergrafx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-supergrafx-libretro", - "rev": "a776133c34ae8da5daf7d9ccb43e3e292e2b07b0", - "hash": "sha256-FemWW4EPQCwhrS7YEytf6fEeimdTTfzaDdyRNDIBQyk=" - }, - "version": "unstable-2024-11-15" - }, - "beetle-vb": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-vb-libretro", - "rev": "8f837ebc077afdd6652efb2827fd8308a07113ca", - "hash": "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8=" - }, - "version": "unstable-2024-10-21" - }, - "beetle-wswan": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "2aeb47d3a58bf0360c686f842d9bb5bd201306fe", - "hash": "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU=" - }, - "version": "unstable-2024-10-21" - }, - "blastem": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "blastem", - "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", - "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" - }, - "version": "unstable-2022-07-26" - }, - "bluemsx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bluemsx-libretro", - "rev": "01ce142ccb85c302420cb962d1b6e6a68a6ce076", - "hash": "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM=" - }, - "version": "unstable-2024-10-22" - }, - "bsnes": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bsnes-libretro", - "rev": "20c55eb6333a11395ba637df8583066483e58cb2", - "hash": "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM=" - }, - "version": "unstable-2024-09-06" - }, - "bsnes-hd": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "DerKoun", - "repo": "bsnes-hd", - "rev": "0bb7b8645e22ea2476cabd58f32e987b14686601", - "hash": "sha256-YzWSZMn6v5hWIHnp6KmmpevCsf35Vi2BCcmFMnrFPH0=" - }, - "version": "unstable-2024-10-21" - }, - "bsnes-mercury": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "bsnes-mercury", - "rev": "0f35d044bf2f2b879018a0500e676447e93a1db1", - "hash": "sha256-skVREKYITZn+gKKSZmwuBCWrG0jb/pifwIgat8VyQ8U=" - }, - "version": "unstable-2024-10-21" - }, - "citra": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "citra", - "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", - "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", - "fetchSubmodules": true - }, - "version": "unstable-2024-01-24" - }, - "desmume": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "desmume", - "rev": "7f05a8d447b00acd9e0798aee97b4f72eb505ef9", - "hash": "sha256-BttWMunVbfPOTGx+DV+3QyOwW+55tgXKVIn99DZhbBI=" - }, - "version": "unstable-2024-10-21" - }, - "desmume2015": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "desmume2015", - "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", - "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" - }, - "version": "unstable-2022-04-05" - }, - "dolphin": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "dolphin", - "rev": "89a4df725d4eb24537728f7d655cddb1add25c18", - "hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs=" - }, - "version": "unstable-2024-04-19" - }, - "dosbox": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "dosbox-libretro", - "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", - "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" - }, - "version": "unstable-2022-07-18" - }, - "dosbox-pure": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "schellingb", - "repo": "dosbox-pure", - "rev": "39dd77adff71cd2ae17d80a0e48fad8583ade8e4", - "hash": "sha256-ZC3JX4BG+FUR/lcEUupISz1s8Q0AdqkO4XVIPi1L5vg=" - }, - "version": "unstable-2024-11-16" - }, - "easyrpg": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "EasyRPG", - "repo": "Player", - "rev": "f8e41f43b619413f95847536412b56f85307d378", - "hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=", - "fetchSubmodules": true - }, - "version": "unstable-2023-04-29" - }, - "eightyone": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "81-libretro", - "rev": "ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf", - "hash": "sha256-3AIXk3LJHZHWIojMeo2BJHWYDHQ17WVbkwjFhXM14ZE=" - }, - "version": "unstable-2024-10-21" - }, - "fbalpha2012": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fbalpha2012", - "rev": "77167cea72e808384c136c8c163a6b4975ce7a84", - "hash": "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c=" - }, - "version": "unstable-2024-10-21" - }, - "fbneo": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fbneo", - "rev": "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5", - "hash": "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE=" - }, - "version": "unstable-2024-10-03" - }, - "fceumm": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-fceumm", - "rev": "9f53af4e332476ba99d0c056668fbb35cfb527c3", - "hash": "sha256-sTzjIuEBTKt2rZfSadQa1pDLFclLL/vwjgkTMK1ZzPQ=" - }, - "version": "unstable-2024-10-16" - }, - "flycast": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "flyinghead", - "repo": "flycast", - "rev": "d618abc3205fe185b26afe58eb5472b800ae0b42", - "hash": "sha256-hlYu1RXfzDHJh5nqBQkcwjrLtFV5AIxdBw5PZn0SUNg=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-17" - }, - "fmsx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fmsx-libretro", - "rev": "9eb5f25df5397212a3e3088ca1a64db0740bbe5f", - "hash": "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=" - }, - "version": "unstable-2024-10-21" - }, - "freeintv": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "freeintv", - "rev": "beab9af119fc117833d2d866d8d4ea0857ec0236", - "hash": "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ=" - }, - "version": "unstable-2024-10-21" - }, - "fuse": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "fuse-libretro", - "rev": "99df66eac096400d4d6d8fae2215192b6f03277e", - "hash": "sha256-o8FbDxke2JCUlmDZEHxMBY4f/WyHm1J76R43w+LVJfM=" - }, - "version": "unstable-2024-11-18" - }, - "gambatte": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gambatte-libretro", - "rev": "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f", - "hash": "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY=" - }, - "version": "unstable-2024-10-04" - }, - "genesis-plus-gx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "Genesis-Plus-GX", - "rev": "7de0f0b6cde9bda1235b448aa607044b3f80ab3c", - "hash": "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=" - }, - "version": "unstable-2024-09-18" - }, - "gpsp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gpsp", - "rev": "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7", - "hash": "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0=" - }, - "version": "unstable-2024-10-21" - }, - "gw": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "gw-libretro", - "rev": "435e5cfd4bf6aea03a84259e9b8dba3daf3ff5bd", - "hash": "sha256-csaOqrZMSk9xZUlGAKgypV38q9XE7K6hLLdBC10g9Ao=" - }, - "version": "unstable-2024-10-21" - }, - "handy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-handy", - "rev": "4e9e072796e5552a9d57f6ab83b3f85f27b17fb6", - "hash": "sha256-ThzFEqLCX2JC06n6GZgkGzX5sFY5CxFDjkeekXRmbXY=" - }, - "version": "unstable-2024-10-21" - }, - "hatari": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "hatari", - "rev": "7008194d3f951a157997f67a820578f56f7feee0", - "hash": "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg=" - }, - "version": "unstable-2024-10-21" - }, - "mame": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame", - "rev": "a67797ad2f7516906ed7acef87569c6f35ca8739", - "hash": "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-01" - }, - "mame2000": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2000-libretro", - "rev": "2ec60f6e1078cf9ba173e80432cc28fd4eea200f", - "hash": "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok=" - }, - "version": "unstable-2024-07-01" - }, - "mame2003": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2003-libretro", - "rev": "6d543115531fc96422b73c989a628600cacbea50", - "hash": "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4=" - }, - "version": "unstable-2024-11-10" - }, - "mame2003-plus": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2003-plus-libretro", - "rev": "b00ea1c9574126d75ae7b80c3b41e1186421fc1d", - "hash": "sha256-Zq4P5UsZh3p9/zasfTC+pzWiLAo7T2qAgZw4bJ4ADdM=" - }, - "version": "unstable-2024-11-19" - }, - "mame2010": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2010-libretro", - "rev": "c5b413b71e0a290c57fc351562cd47ba75bac105", - "hash": "sha256-p+uEhxjr/07YJxInhW7oJDr8KurD36JxnSfJo17FOxM=" - }, - "version": "unstable-2024-10-23" - }, - "mame2015": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2015-libretro", - "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", - "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=" - }, - "version": "unstable-2023-11-01" - }, - "mame2016": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" - }, - "version": "unstable-2022-04-06" - }, - "melonds": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "melonds", - "rev": "7a3c11ff970cd36ca806961fae6db94b30dd5401", - "hash": "sha256-YGkRdth7qdATcZpJkBd5MGOJFG1AbeJhAnyir+ssZYA=" - }, - "version": "unstable-2024-10-21" - }, - "mesen": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mesen", - "rev": "791c5e8153ee6e29691d45b5df2cf1151ff416f9", - "hash": "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic=" - }, - "version": "unstable-2024-10-21" - }, - "mesen-s": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mesen-s", - "rev": "d4fca31a6004041d99b02199688f84c009c55967", - "hash": "sha256-mGGTLBRJCsNJg57LWSFndIv/LLzEmVRnv6gNbllkV/Y=" - }, - "version": "unstable-2024-10-21" - }, - "meteor": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "meteor-libretro", - "rev": "e533d300d0561564451bde55a2b73119c768453c", - "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" - }, - "version": "unstable-2020-12-28" - }, - "mgba": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mgba", - "rev": "747362c02d2e71ee7c363e8dcb240925be8af906", - "hash": "sha256-dBhdS6C1H02iwdYDVvJmkPWob81vpmQJdHUHJFAq2vo=" - }, - "version": "unstable-2024-11-12" - }, - "mrboom": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "Javanaise", - "repo": "mrboom-libretro", - "rev": "22765ce7176d236d846f504318a51c448d2b469b", - "hash": "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw=", - "fetchSubmodules": true - }, - "version": "unstable-2024-07-01" - }, - "mupen64plus": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "mupen64plus-libretro-nx", - "rev": "4249e39b2c200e5f0895385f76d99928785f2bea", - "hash": "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI=" - }, - "version": "unstable-2024-10-29" - }, - "neocd": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "neocd_libretro", - "rev": "5eca2c8fd567b5261251c65ecafa8cf5b179d1d2", - "hash": "sha256-72tmPCb7AXsamaQsMAPiYpgDR8DER2GTz4hcbN8wy7g=" - }, - "version": "unstable-2024-10-21" - }, - "nestopia": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "nestopia", - "rev": "b932740e8abbe2cda80d06b083fdd8115af1c5d5", - "hash": "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4=" - }, - "version": "unstable-2024-10-17" - }, - "np2kai": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "AZO234", - "repo": "NP2kai", - "rev": "4b109eaac4f79b04065ff5025319fce51537e04d", - "hash": "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-03" - }, - "nxengine": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "nxengine-libretro", - "rev": "9adc032a5f6aa913d71d22042bb72cb11cf0f4a2", - "hash": "sha256-8XjZp18lQU3xFNDjIuNsSHn7Mhba8Lze/IeRsy8/U1U=" - }, - "version": "unstable-2024-10-21" - }, - "o2em": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-o2em", - "rev": "c8f458d035392963823fbb50db0cec0033d9315f", - "hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=" - }, - "version": "unstable-2024-06-28" - }, - "opera": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "opera-libretro", - "rev": "67a29e60a4d194b675c9272b21b61eaa022f3ba3", - "hash": "sha256-8896EWNbzVyr3MS1jtWD3pLur7ZvAhhJmrwkW3ayzkU=" - }, - "version": "unstable-2024-10-17" - }, - "parallel-n64": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "parallel-n64", - "rev": "e372c5e327dcd649e9d840ffc3d88480b6866eda", - "hash": "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo=" - }, - "version": "unstable-2024-10-21" - }, - "pcsx2": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "lrps2", - "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", - "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" - }, - "version": "unstable-2023-01-30" - }, - "pcsx_rearmed": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "pcsx_rearmed", - "rev": "e3d7ea45c75f2752e351d5c5b54cf7e79e66d26e", - "hash": "sha256-dJqomyUHYQ+vpyu7/w2S/NidgYbHiGBWjebFQAXjzI0=" - }, - "version": "unstable-2024-11-17" - }, - "picodrive": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "picodrive", - "rev": "0daf92b57fba1fdbc124651573e88373eef28aa5", - "hash": "sha256-rvgcGNpHhjHpg5q6qiu08lBn+Zjx87E5/Q98gPoffhE=", - "fetchSubmodules": true - }, - "version": "unstable-2024-10-19" - }, - "play": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "jpd002", - "repo": "Play-", - "rev": "c3cba5418b4e5618befd9c2790498cf3cf88372a", - "hash": "sha256-xO2Pgl1E0JFEsthTmG+Ka+NqOTWG/JeeAIa6wBWXJyc=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-14" - }, - "ppsspp": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "hrydgard", - "repo": "ppsspp", - "rev": "2402eea4b16908ad59079bcf3fab06ba63531a3c", - "hash": "sha256-bpeiZdcXkGWLFZOsxTGuVmo4xAiUb9v5Wf6pWkt5JV0=", - "fetchSubmodules": true - }, - "version": "unstable-2024-11-15" - }, - "prboom": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-prboom", - "rev": "d25ccfb9739069824d8fff99e3ae78a58a09df01", - "hash": "sha256-IaMreS2MSkFdZ3Jff2FOZBvKIIa4KIkp41LIg3PLl44=" - }, - "version": "unstable-2024-10-21" - }, - "prosystem": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "prosystem-libretro", - "rev": "acae250da8d98b8b9707cd499e2a0bf6d8500652", - "hash": "sha256-AGF3K3meZEEsnzHmMTCsFXBGNvWVELH8a8qET07kP0o=" - }, - "version": "unstable-2024-10-21" - }, - "puae": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-uae", - "rev": "c60e42ef9ad474518d4be859b7c1da2c0c7e1d6f", - "hash": "sha256-WCkz7BUgYaI+yRhPmNuOKGJC/GxV+n2aeJVn8vhx0Ng=" - }, - "version": "unstable-2024-10-19" - }, - "quicknes": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "QuickNES_Core", - "rev": "dbf19f73e3eb9701d1c7f5898f57c097e05c9fbd", - "hash": "sha256-oFQUMp1imc8JCsQYCy1BtIUmTC+u0VcoYHpWzUpKNb4=" - }, - "version": "unstable-2024-10-21" - }, - "same_cdi": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "same_cdi", - "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", - "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" - }, - "version": "unstable-2023-02-28" - }, - "sameboy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "sameboy", - "rev": "51433012a871a44555492273fd22f29867d12655", - "hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=" - }, - "version": "unstable-2024-06-28" - }, - "scummvm": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro-mirrors", - "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" - }, - "version": "unstable-2022-04-06" - }, - "smsplus-gx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "smsplus-gx", - "rev": "c642bbd0680b5959180a420036108893d0aec961", - "hash": "sha256-SHBrwzLyVZ4Tp/kVCnr4xj2B3pmdg+JUmZUM7hYao64=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "snes9xgit", - "repo": "snes9x", - "rev": "fd05ca7df5259a2cd0aa9204f331e0b05126c376", - "hash": "sha256-o/Rb1XQ7QoI0hKROMFZ9igyH8NN3bMryvyU4oNUqtRA=" - }, - "version": "unstable-2024-10-28" - }, - "snes9x2002": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2002", - "rev": "a0709ec7dcd6de2fbebb43106bd757b649e3b7cf", - "hash": "sha256-rrMPhXIsQ48fVvjgZgC3xeqm9k9kwe43oZNzs2d/h1Q=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x2005": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2005", - "rev": "74d871db9b4dba6dbe6c5ecebc88cbf255be5349", - "hash": "sha256-YlRMjSEo9sdLVRzWGSJlnBeqg6wUhZi8l3ffzUaKQIQ=" - }, - "version": "unstable-2024-10-21" - }, - "snes9x2010": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "snes9x2010", - "rev": "f9ae8fd28b13070a945a829ccf41cbf90a21d0f7", - "hash": "sha256-nsExAYnzDenPvXzeN60jGykRTrCGMi/mRPV+vgS8ZtE=" - }, - "version": "unstable-2024-11-18" - }, - "stella": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "stella-emu", - "repo": "stella", - "rev": "0e2ce2771c7d0c9b2dd5c06e3a4746738d3c9e47", - "hash": "sha256-axt5wvH7WENh1ALPYc+f5XpCv2xPm5jYx26zMhLEt3E=" - }, - "version": "unstable-2024-11-17" - }, - "stella2014": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "stella2014-libretro", - "rev": "3cc89f0d316d6c924a5e3f4011d17421df58e615", - "hash": "sha256-2gnFWau7F45SdzoqDUlqYXfXVE1EUPozHZv7BhyRRIA=" - }, - "version": "unstable-2024-10-21" - }, - "swanstation": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "swanstation", - "rev": "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb", - "hash": "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E=" - }, - "version": "unstable-2024-07-24" - }, - "tgbdual": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "tgbdual-libretro", - "rev": "8d305769eebd67266c284558f9d3a30498894d3d", - "hash": "sha256-3mlnTgp43qC3yifpr6pvtC4vslddcf6mephKA183vEk=" - }, - "version": "unstable-2024-10-21" - }, - "thepowdertoy": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "ThePowderToy", - "rev": "5d9c749780063b87bd62ddb025dee4241f196f26", - "hash": "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8=" - }, - "version": "unstable-2024-10-01" - }, - "tic80": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "tic-80", - "rev": "6412f72d0f4725c153ce3d245729b829e713542e", - "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", - "fetchSubmodules": true - }, - "version": "unstable-2024-05-13" - }, - "vba-m": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "vbam-libretro", - "rev": "379dd97301458a51fb69dd93ba21b64f81e01ef2", - "hash": "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI=" - }, - "version": "unstable-2024-10-21" - }, - "vba-next": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "vba-next", - "rev": "2c726f25da75a5600ef5791ce904befe06c4dddd", - "hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=" - }, - "version": "unstable-2024-06-28" - }, - "vecx": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "libretro-vecx", - "rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf", - "hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=" - }, - "version": "unstable-2024-06-28" - }, - "virtualjaguar": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "virtualjaguar-libretro", - "rev": "48096c1f6f8b98cfff048a5cb4e6a86686631072", - "hash": "sha256-DLBQQARHqupGGQS8YznDSSMuxQliyt5apGA4Ku2jlYo=" - }, - "version": "unstable-2024-10-21" - }, - "yabause": { - "fetcher": "fetchFromGitHub", - "src": { - "owner": "libretro", - "repo": "yabause", - "rev": "c35712c5ed33e18d77097f2059a036e19d1d66f2", - "hash": "sha256-4/gxWNPkGKBf4ti7ZF4GXgng6ZPyM9prrvK0S5tZ6V8=" - }, - "version": "unstable-2024-10-21" - } -} diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 86f05d6895e3..42124cb23609 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -1,19 +1,22 @@ -{ lib -, stdenv -, core -, repo ? null # TODO: remove -, makeWrapper -, retroarchBare -, zlib -, makefile ? "Makefile.libretro" -, extraBuildInputs ? [ ] -, extraNativeBuildInputs ? [ ] - # Location of resulting RetroArch core on $out -, libretroCore ? "/lib/retroarch/cores" - # The core filename is derivated from the core name - # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename -, normalizeCore ? true -, ... +{ + # Deps + lib, + stdenv, + makeWrapper, + retroarchBare, + unstableGitUpdater, + zlib, + # Params + core, + makefile ? "Makefile.libretro", + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + ## Location of resulting RetroArch core on $out + libretroCore ? "/lib/retroarch/cores", + ## The core filename is derivated from the core name + ## Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename + normalizeCore ? true, + ... }@args: let @@ -24,62 +27,74 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" - "core" "makeWrapper" - "retroarch" + "retroarchBare" + "unstableGitUpdater" "zlib" + + "core" "makefile" "extraBuildInputs" "extraNativeBuildInputs" "libretroCore" "normalizeCore" - "makeFlags" - "meta" ]; in -stdenv.mkDerivation ({ - pname = "libretro-${core}"; +stdenv.mkDerivation ( + { + pname = "libretro-${core}"; - buildInputs = [ zlib ] ++ extraBuildInputs; - nativeBuildInputs = [ makeWrapper ] ++ extraNativeBuildInputs; + buildInputs = [ zlib ] ++ extraBuildInputs; + nativeBuildInputs = [ makeWrapper ] ++ extraNativeBuildInputs; - inherit makefile; + inherit makefile; - makeFlags = [ - "platform=${{ - linux = "unix"; - darwin = "osx"; - windows = "win"; - }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" - "ARCH=${{ - armv7l = "arm"; - armv6l = "arm"; - aarch64 = "arm64"; - i686 = "x86"; - }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" - ] ++ (args.makeFlags or [ ]); + makeFlags = [ + "platform=${ + { + linux = "unix"; + darwin = "osx"; + windows = "win"; + } + .${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name + }" + "ARCH=${ + { + armv7l = "arm"; + armv6l = "arm"; + aarch64 = "arm64"; + i686 = "x86"; + } + .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name + }" + ] ++ (args.makeFlags or [ ]); - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - install -Dt ${coreDir} ${coreFilename} - makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ - --add-flags "-L ${coreDir}/${coreFilename}" + install -Dt ${coreDir} ${coreFilename} + makeWrapper ${retroarchBare}/bin/retroarch $out/bin/${mainProgram} \ + --add-flags "-L ${coreDir}/${coreFilename}" - runHook postInstall - ''; + runHook postInstall + ''; - enableParallelBuilding = true; + enableParallelBuilding = true; - passthru = { - inherit core libretroCore; - updateScript = lib.mkIf (repo != null) [ ./update_cores.py repo ]; - } // (args.passthru or { }); + passthru = { + inherit core libretroCore; + updateScript = unstableGitUpdater { }; + } // (args.passthru or { }); - meta = with lib; { - inherit mainProgram; - inherit (retroarchBare.meta) platforms; - homepage = "https://www.libretro.com/"; - maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; - } // (args.meta or { }); -} // extraArgs) + meta = + with lib; + { + inherit mainProgram; + inherit (retroarchBare.meta) platforms; + homepage = "https://www.libretro.com/"; + maintainers = with maintainers; teams.libretro.members; + } + // (args.meta or { }); + } + // extraArgs +) diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py deleted file mode 100755 index 4e15315ce726..000000000000 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ /dev/null @@ -1,233 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-git -p nix-prefetch-scripts - -import json -import os -import subprocess -import sys -from concurrent.futures import ThreadPoolExecutor -from pathlib import Path - -SCRIPT_PATH = Path(__file__).absolute().parent -HASHES_PATH = SCRIPT_PATH / "hashes.json" -GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) -# To add a new core, add it to the dictionary below. You need to set at least -# `repo`, that is the repository name if the owner of the repository is -# `libretro` itself, otherwise also set `owner`. -# You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to -# `True` and they're similar to `fetchgit` options. Also if for some reason you -# need to pin a specific revision, set `rev` to a commit. -# There is also a `fetcher` option that for now only supports `fetchFromGitHub` -# (see `get_repo_hash()`), but it may be extended in the future if there is a -# need to support fetchers from other source hubs. -# To generate the hash file for your new core, you can run -# `/pkgs/applications/emulators/retroarch/update_cores.py `. Do -# not forget to add your core to `cores.nix` file with the proper overrides so -# the core can be build. -CORES = { - "2048": {"repo": "libretro-2048"}, - "atari800": {"repo": "libretro-atari800"}, - "beetle-gba": {"repo": "beetle-gba-libretro"}, - "beetle-lynx": {"repo": "beetle-lynx-libretro"}, - "beetle-ngp": {"repo": "beetle-ngp-libretro"}, - "beetle-pce": {"repo": "beetle-pce-libretro"}, - "beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"}, - "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, - "beetle-psx": {"repo": "beetle-psx-libretro"}, - "beetle-saturn": {"repo": "beetle-saturn-libretro"}, - "beetle-supafaust": {"repo": "supafaust"}, - "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, - "beetle-vb": {"repo": "beetle-vb-libretro"}, - "beetle-wswan": {"repo": "beetle-wswan-libretro"}, - "blastem": {"repo": "blastem"}, - "bluemsx": {"repo": "bluemsx-libretro"}, - "bsnes": {"repo": "bsnes-libretro"}, - "bsnes-hd": {"repo": "bsnes-hd", "owner": "DerKoun"}, - "bsnes-mercury": {"repo": "bsnes-mercury"}, - "citra": {"repo": "citra", "fetch_submodules": True}, - "desmume": {"repo": "desmume"}, - "desmume2015": {"repo": "desmume2015"}, - "dolphin": {"repo": "dolphin"}, - "dosbox": {"repo": "dosbox-libretro"}, - "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, - # The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which - # was released in April 2023. - # Update the version when a compatible liblcf is available. - # See pkgs/games/easyrpg-player/default.nix for details. - "easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"}, - "eightyone": {"repo": "81-libretro"}, - "fbalpha2012": {"repo": "fbalpha2012"}, - "fbneo": {"repo": "fbneo"}, - "fceumm": {"repo": "libretro-fceumm"}, - "flycast": {"repo": "flycast", "owner": "flyinghead", "fetch_submodules": True}, - "fmsx": {"repo": "fmsx-libretro"}, - "freeintv": {"repo": "freeintv"}, - "fuse": {"repo": "fuse-libretro"}, - "gambatte": {"repo": "gambatte-libretro"}, - "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, - "gpsp": {"repo": "gpsp"}, - "gw": {"repo": "gw-libretro"}, - "handy": {"repo": "libretro-handy"}, - "hatari": {"repo": "hatari"}, - # Setting fetch_submodules=True since libretro/mame constantly gives - # different hashes for its tarballs, see: - # - https://github.com/NixOS/nixpkgs/issues/259488#issuecomment-1751768379 - # - https://github.com/NixOS/nixpkgs/pull/303494 - "mame": {"repo": "mame", "fetch_submodules": True}, - "mame2000": {"repo": "mame2000-libretro"}, - "mame2003": {"repo": "mame2003-libretro"}, - "mame2003-plus": {"repo": "mame2003-plus-libretro"}, - "mame2010": {"repo": "mame2010-libretro"}, - "mame2015": {"repo": "mame2015-libretro"}, - "mame2016": {"repo": "mame2016-libretro"}, - "melonds": {"repo": "melonds"}, - "mesen": {"repo": "mesen"}, - "mesen-s": {"repo": "mesen-s"}, - "meteor": {"repo": "meteor-libretro"}, - "mrboom": {"repo": "mrboom-libretro", "owner": "Javanaise", "fetch_submodules": True}, - "mgba": {"repo": "mgba"}, - "mupen64plus": {"repo": "mupen64plus-libretro-nx"}, - "neocd": {"repo": "neocd_libretro"}, - "nestopia": {"repo": "nestopia"}, - "nxengine": {"repo": "nxengine-libretro"}, - "np2kai": {"repo": "NP2kai", "owner": "AZO234", "fetch_submodules": True}, - "o2em": {"repo": "libretro-o2em"}, - "opera": {"repo": "opera-libretro"}, - "parallel-n64": {"repo": "parallel-n64"}, - # libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target - # only libretro, while libretro/pcsx2 is supposedly closer to upstream but - # it is a WIP. - # TODO: switch to libretro/pcsx2 when upstream switches to it. - "pcsx2": {"repo": "lrps2"}, - "pcsx_rearmed": {"repo": "pcsx_rearmed"}, - "picodrive": {"repo": "picodrive", "fetch_submodules": True}, - "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, - "ppsspp": {"repo": "ppsspp", "owner": "hrydgard", "fetch_submodules": True}, - "prboom": {"repo": "libretro-prboom"}, - "prosystem": {"repo": "prosystem-libretro"}, - "puae": {"repo": "libretro-uae"}, - "quicknes": {"repo": "QuickNES_Core"}, - "sameboy": {"repo": "sameboy"}, - "same_cdi": {"repo": "same_cdi"}, - # This is the old source code before they upstreamed the source code, - # so now the libretro related code lives in the scummvm/scummvm repository. - # However this broke the old way we were doing builds, so for now point - # to a mirror with the old source code until this issue is fixed. - # TODO: switch to libretro/scummvm since this is more up-to-date - "scummvm": {"repo": "scummvm", "owner": "libretro-mirrors"}, - "smsplus-gx": {"repo": "smsplus-gx"}, - "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, - "snes9x2002": {"repo": "snes9x2002"}, - "snes9x2005": {"repo": "snes9x2005"}, - "snes9x2010": {"repo": "snes9x2010"}, - "stella": {"repo": "stella", "owner": "stella-emu"}, - "stella2014": {"repo": "stella2014-libretro"}, - "swanstation": {"repo": "swanstation"}, - "tgbdual": {"repo": "tgbdual-libretro"}, - "thepowdertoy": {"repo": "ThePowderToy"}, - "tic80": {"repo": "tic-80", "fetch_submodules": True}, - "vba-m": {"repo": "vbam-libretro"}, - "vba-next": {"repo": "vba-next"}, - "vecx": {"repo": "libretro-vecx"}, - "virtualjaguar": {"repo": "virtualjaguar-libretro"}, - "yabause": {"repo": "yabause"}, -} - - -def info(*msg): - print(*msg, file=sys.stderr) - - -def get_repo_hash_fetchFromGitHub( - repo, - owner="libretro", - deep_clone=False, - fetch_submodules=False, - leave_dot_git=False, - rev=None, -): - extra_args = [] - if deep_clone: - extra_args.append("--deep-clone") - else: - extra_args.append("--no-deep-clone") - if fetch_submodules: - extra_args.append("--fetch-submodules") - else: - extra_args.append("--no-fetch-submodules") - if leave_dot_git: - extra_args.append("--leave-dot-git") - else: - extra_args.append("--no-leave-dot-git") - if rev: - extra_args.append("--rev") - extra_args.append(rev) - try: - result = subprocess.run( - ["nix-prefetch-github", owner, repo, "--meta", *extra_args], - check=True, - capture_output=True, - text=True, - ) - except subprocess.CalledProcessError as ex: - info(f"Error while updating {owner}/{repo}:", ex.stderr) - raise ex - - j = json.loads(result.stdout) - return { - "fetcher": "fetchFromGitHub", - # Remove False values - "src": {k: v for k, v in j["src"].items() if v}, - "version": f"unstable-{j['meta']['commitDate']}", - } - - -def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): - if fetcher == "fetchFromGitHub": - return get_repo_hash_fetchFromGitHub(**kwargs) - else: - raise ValueError(f"Unsupported fetcher: {fetcher}") - - -def get_repo_hashes(cores={}): - def get_repo_hash_from_core_def(core_def): - core, repo = core_def - info(f"Getting repo hash for '{core}'...") - result = core, get_repo_hash(**repo) - info(f"Got repo hash for '{core}'!") - return result - - with open(HASHES_PATH) as f: - repo_hashes = json.loads(f.read()) - - info(f"Running with {GET_REPO_THREADS} threads!") - with ThreadPoolExecutor(max_workers=GET_REPO_THREADS) as executor: - new_repo_hashes = executor.map(get_repo_hash_from_core_def, cores.items()) - - for core, repo in new_repo_hashes: - repo_hashes[core] = repo - - return repo_hashes - - -def main(): - # If you don't want to update all cores, pass the name of the cores you - # want to update on the command line. E.g.: - # $ ./update.py citra snes9x - if len(sys.argv) > 1: - cores_to_update = sys.argv[1:] - else: - cores_to_update = CORES.keys() - - cores = {core: repo for core, repo in CORES.items() if core in cores_to_update} - repo_hashes = get_repo_hashes(cores) - repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!" - info(f"Generating '{HASHES_PATH}'...") - with open(HASHES_PATH, "w") as f: - f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) - f.write("\n") - info("Finished!") - - -if __name__ == "__main__": - main() From 967dae48b2187acd90ca8ce90d14228f950ae56c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 16:50:33 +0000 Subject: [PATCH 92/93] libretro: update README.md --- .../emulators/retroarch/README.md | 44 +++---------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/README.md b/pkgs/applications/emulators/retroarch/README.md index 74b600e069bd..1a1fec0ed1d1 100644 --- a/pkgs/applications/emulators/retroarch/README.md +++ b/pkgs/applications/emulators/retroarch/README.md @@ -1,46 +1,16 @@ -# RetroArch +# Libretro -This directory includes [RetroArch](https://www.retroarch.com/), [libretro -cores](https://docs.libretro.com/guides/core-list/) and related packages. +[libretro cores](https://docs.libretro.com/guides/core-list/) and related +packages. ## Adding new cores The basic steps to add a new core are: -1. Add the core repository to [update_cores.py](./update_cores.py) inside the - `CORES` map. - - The minimum required parameter is `repo` - - If the repository owner is not `libretro`, set `owner` parameter - - If the core needs submodules, set `fetch_submodules` parameter to `True` - - To pin the core to a specific release, set `rev` parameter -2. Run `./pkgs/applications/emulators/retroarch/update_cores.py ` to - generate [`hashes.json`](./hashes.json) file -3. Add your new core to [`cores.nix`](./cores.nix) file, using - [`mkLibretroCore`](./mkLibretroCore.nix) function - - In general, the attribute name should be the same as the repo name, unless - there is a good reason not to - - Check the core repo and [Libretro - documentation](https://docs.libretro.com/) for the core you're trying to add - for instructions on how to build - - Also check the examples inside [`cores.nix`](./cores.nix) - - If your core is recently released, there is a good chance that you may - need to update [`libretro-core-info`](./libretro-core-info.nix) for things - to work inside RetroArch -4. Try to build your core with `nix-build -A libretro.` - -## Updating cores - -Just run: - -```console -# From the root of your nixpkgs directory -./pkgs/applications/emulators/retroarch/update_cores.nix -``` - -Keep in mind that because of the huge amount of cores that we package here, it -is recommended to set `GITHUB_TOKEN` to your GitHub's [Personal Access -Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) -(PAT), otherwise the update will probably fail due to GitHub's API rate limit. +1. Add a new core using `mkLibretroCore` function (use one of the existing + files as an example) +2. Add your new core to [`default.nix`](./default.nix) file +3. Try to build your core with `nix-build -A libretro.` ## Using RetroArch with cores From ef3c223fdbecd488a30fe9f28d5f5067d5fb8e4f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 20 Nov 2024 18:38:20 +0000 Subject: [PATCH 93/93] libretro: add 0-prefix before version --- pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pce.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-psx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix | 2 +- .../applications/emulators/retroarch/cores/beetle-supafaust.nix | 2 +- .../emulators/retroarch/cores/beetle-supergrafx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-vb.nix | 2 +- pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix | 2 +- pkgs/applications/emulators/retroarch/cores/blastem.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bluemsx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix | 2 +- pkgs/applications/emulators/retroarch/cores/bsnes.nix | 2 +- pkgs/applications/emulators/retroarch/cores/citra.nix | 2 +- pkgs/applications/emulators/retroarch/cores/desmume.nix | 2 +- pkgs/applications/emulators/retroarch/cores/desmume2015.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dolphin.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix | 2 +- pkgs/applications/emulators/retroarch/cores/dosbox.nix | 2 +- pkgs/applications/emulators/retroarch/cores/eightyone.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fbneo.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fceumm.nix | 2 +- pkgs/applications/emulators/retroarch/cores/flycast.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fmsx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/freeintv.nix | 2 +- pkgs/applications/emulators/retroarch/cores/fuse.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gambatte.nix | 2 +- pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gpsp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/gw.nix | 2 +- pkgs/applications/emulators/retroarch/cores/handy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/hatari.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2000.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2003.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2010.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2015.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mame2016.nix | 2 +- pkgs/applications/emulators/retroarch/cores/melonds.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mesen-s.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mesen.nix | 2 +- pkgs/applications/emulators/retroarch/cores/meteor.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mgba.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mrboom.nix | 2 +- pkgs/applications/emulators/retroarch/cores/mupen64plus.nix | 2 +- pkgs/applications/emulators/retroarch/cores/neocd.nix | 2 +- pkgs/applications/emulators/retroarch/cores/nestopia.nix | 2 +- pkgs/applications/emulators/retroarch/cores/np2kai.nix | 2 +- pkgs/applications/emulators/retroarch/cores/nxengine.nix | 2 +- pkgs/applications/emulators/retroarch/cores/o2em.nix | 2 +- pkgs/applications/emulators/retroarch/cores/opera.nix | 2 +- pkgs/applications/emulators/retroarch/cores/parallel-n64.nix | 2 +- pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix | 2 +- pkgs/applications/emulators/retroarch/cores/pcsx2.nix | 2 +- pkgs/applications/emulators/retroarch/cores/picodrive.nix | 2 +- pkgs/applications/emulators/retroarch/cores/play.nix | 2 +- pkgs/applications/emulators/retroarch/cores/ppsspp.nix | 2 +- pkgs/applications/emulators/retroarch/cores/prboom.nix | 2 +- pkgs/applications/emulators/retroarch/cores/prosystem.nix | 2 +- pkgs/applications/emulators/retroarch/cores/puae.nix | 2 +- pkgs/applications/emulators/retroarch/cores/quicknes.nix | 2 +- pkgs/applications/emulators/retroarch/cores/same_cdi.nix | 2 +- pkgs/applications/emulators/retroarch/cores/sameboy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/scummvm.nix | 2 +- pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2002.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2005.nix | 2 +- pkgs/applications/emulators/retroarch/cores/snes9x2010.nix | 2 +- pkgs/applications/emulators/retroarch/cores/stella.nix | 2 +- pkgs/applications/emulators/retroarch/cores/stella2014.nix | 2 +- pkgs/applications/emulators/retroarch/cores/swanstation.nix | 2 +- pkgs/applications/emulators/retroarch/cores/tgbdual.nix | 2 +- pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix | 2 +- pkgs/applications/emulators/retroarch/cores/tic80.nix | 2 +- .../emulators/retroarch/cores/twenty-fortyeight.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vba-m.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vba-next.nix | 2 +- pkgs/applications/emulators/retroarch/cores/vecx.nix | 2 +- pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix | 2 +- pkgs/applications/emulators/retroarch/cores/yabause.nix | 2 +- 86 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix index 502d8c5df34f..dcc3a00d1d2a 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-lynx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-lynx"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix index 6c86135282ad..567d7332466b 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-ngp.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-ngp"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix index 1af81b8c3c27..f3c9551a9cc0 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce-fast.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix index 934ff1e0ba0d..346ebc6cb3b6 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pce.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pce"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix index d53405fb3cb2..047a25cd2afa 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-pcfx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-pcfx"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix index 2c76381d3bb4..aebe33c49013 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-psx.nix @@ -8,7 +8,7 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix index 196453f1a171..e648472b14ff 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-saturn.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-saturn"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix index 6f3f9537a00f..3f8d18fec719 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supafaust.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-supafaust"; - version = "unstable-2024-10-01"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix index 8737d5a824b2..3f0597c4f6ca 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-supergrafx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-supergrafx"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix index 1262b40854c7..e6af3a42ae21 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-vb.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-vb"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix index 14a856a54220..39b2afda52e9 100644 --- a/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix +++ b/pkgs/applications/emulators/retroarch/cores/beetle-wswan.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mednafen-wswan"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/blastem.nix b/pkgs/applications/emulators/retroarch/cores/blastem.nix index 395d568540ac..cdcba56c6a98 100644 --- a/pkgs/applications/emulators/retroarch/cores/blastem.nix +++ b/pkgs/applications/emulators/retroarch/cores/blastem.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "blastem"; - version = "unstable-2022-07-26"; + version = "0-unstable-2022-07-26"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix index f3be7a2d1ca5..1f352cf6356b 100644 --- a/pkgs/applications/emulators/retroarch/cores/bluemsx.nix +++ b/pkgs/applications/emulators/retroarch/cores/bluemsx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "bluemsx"; - version = "unstable-2024-10-22"; + version = "0-unstable-2024-10-22"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix index 33cef08d93bf..5353a8ef49b5 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-hd.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "bsnes-hd-beta"; - version = "unstable-2023-04-26"; + version = "0-unstable-2023-04-26"; src = fetchFromGitHub { owner = "DerKoun"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix index f86a355a7c69..edb377829e11 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes-mercury.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "bsnes-mercury-${withProfile}"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/bsnes.nix b/pkgs/applications/emulators/retroarch/cores/bsnes.nix index 533aaa0763f9..0e31a09943da 100644 --- a/pkgs/applications/emulators/retroarch/cores/bsnes.nix +++ b/pkgs/applications/emulators/retroarch/cores/bsnes.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "bsnes"; - version = "unstable-2024-09-06"; + version = "0-unstable-2024-09-06"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/citra.nix b/pkgs/applications/emulators/retroarch/cores/citra.nix index 1a826fed9eaa..1739d978d4d0 100644 --- a/pkgs/applications/emulators/retroarch/cores/citra.nix +++ b/pkgs/applications/emulators/retroarch/cores/citra.nix @@ -11,7 +11,7 @@ }: mkLibretroCore rec { core = "citra"; - version = "unstable-2024-04-01"; + version = "0-unstable-2024-04-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume.nix b/pkgs/applications/emulators/retroarch/cores/desmume.nix index 5236a4bddc1f..bd03cb5bf341 100644 --- a/pkgs/applications/emulators/retroarch/cores/desmume.nix +++ b/pkgs/applications/emulators/retroarch/cores/desmume.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "desmume"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix index af9f8870d846..6b654234aee6 100644 --- a/pkgs/applications/emulators/retroarch/cores/desmume2015.nix +++ b/pkgs/applications/emulators/retroarch/cores/desmume2015.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "desmume2015"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/dolphin.nix b/pkgs/applications/emulators/retroarch/cores/dolphin.nix index f73ecff6c673..b645617b4696 100644 --- a/pkgs/applications/emulators/retroarch/cores/dolphin.nix +++ b/pkgs/applications/emulators/retroarch/cores/dolphin.nix @@ -17,7 +17,7 @@ }: mkLibretroCore { core = "dolphin"; - version = "unstable-2024-04-19"; + version = "0-unstable-2024-04-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix index 152ad2e280af..da24544b5f17 100644 --- a/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/retroarch/cores/dosbox-pure.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "unstable-2024-09-28"; + version = "0-unstable-2024-09-28"; src = fetchFromGitHub { owner = "schellingb"; diff --git a/pkgs/applications/emulators/retroarch/cores/dosbox.nix b/pkgs/applications/emulators/retroarch/cores/dosbox.nix index 50eb9ab55e9f..3dfc236eb0c5 100644 --- a/pkgs/applications/emulators/retroarch/cores/dosbox.nix +++ b/pkgs/applications/emulators/retroarch/cores/dosbox.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "dosbox"; - version = "unstable-2022-07-18"; + version = "0-unstable-2022-07-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/eightyone.nix b/pkgs/applications/emulators/retroarch/cores/eightyone.nix index e17e03605ec7..88f0fa5822df 100644 --- a/pkgs/applications/emulators/retroarch/cores/eightyone.nix +++ b/pkgs/applications/emulators/retroarch/cores/eightyone.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "81"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix index 17d8e1fe2e07..febf6f7935a8 100644 --- a/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix +++ b/pkgs/applications/emulators/retroarch/cores/fbalpha2012.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fbalpha2012"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fbneo.nix b/pkgs/applications/emulators/retroarch/cores/fbneo.nix index 486d44da6fb3..238d96778a98 100644 --- a/pkgs/applications/emulators/retroarch/cores/fbneo.nix +++ b/pkgs/applications/emulators/retroarch/cores/fbneo.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fbneo"; - version = "unstable-2024-10-03"; + version = "0-unstable-2024-10-03"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fceumm.nix b/pkgs/applications/emulators/retroarch/cores/fceumm.nix index e8ada8587cbf..93c6956d18b1 100644 --- a/pkgs/applications/emulators/retroarch/cores/fceumm.nix +++ b/pkgs/applications/emulators/retroarch/cores/fceumm.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fceumm"; - version = "unstable-2024-09-23"; + version = "0-unstable-2024-09-23"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/flycast.nix b/pkgs/applications/emulators/retroarch/cores/flycast.nix index 43982c818d2d..77abcb4eaded 100644 --- a/pkgs/applications/emulators/retroarch/cores/flycast.nix +++ b/pkgs/applications/emulators/retroarch/cores/flycast.nix @@ -8,7 +8,7 @@ }: mkLibretroCore { core = "flycast"; - version = "unstable-2024-10-05"; + version = "0-unstable-2024-10-05"; src = fetchFromGitHub { owner = "flyinghead"; diff --git a/pkgs/applications/emulators/retroarch/cores/fmsx.nix b/pkgs/applications/emulators/retroarch/cores/fmsx.nix index e888ef1e0693..ca320c9df653 100644 --- a/pkgs/applications/emulators/retroarch/cores/fmsx.nix +++ b/pkgs/applications/emulators/retroarch/cores/fmsx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fmsx"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/freeintv.nix b/pkgs/applications/emulators/retroarch/cores/freeintv.nix index a99be9271590..e5486b6a1d03 100644 --- a/pkgs/applications/emulators/retroarch/cores/freeintv.nix +++ b/pkgs/applications/emulators/retroarch/cores/freeintv.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "freeintv"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/fuse.nix b/pkgs/applications/emulators/retroarch/cores/fuse.nix index 1bfd08e81fb0..a4e954ac109f 100644 --- a/pkgs/applications/emulators/retroarch/cores/fuse.nix +++ b/pkgs/applications/emulators/retroarch/cores/fuse.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "fuse"; - version = "unstable-2024-09-20"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gambatte.nix b/pkgs/applications/emulators/retroarch/cores/gambatte.nix index d256b0d5ffaa..90840af74960 100644 --- a/pkgs/applications/emulators/retroarch/cores/gambatte.nix +++ b/pkgs/applications/emulators/retroarch/cores/gambatte.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gambatte"; - version = "unstable-2024-10-04"; + version = "0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix index 7754df92f19a..caf2d667ba95 100644 --- a/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/retroarch/cores/genesis-plus-gx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "unstable-2024-09-18"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gpsp.nix b/pkgs/applications/emulators/retroarch/cores/gpsp.nix index e51e86e31be9..cd4c55e916c6 100644 --- a/pkgs/applications/emulators/retroarch/cores/gpsp.nix +++ b/pkgs/applications/emulators/retroarch/cores/gpsp.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gpsp"; - version = "unstable-2024-09-18"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/gw.nix b/pkgs/applications/emulators/retroarch/cores/gw.nix index a13eef2799f5..274bb2dfced4 100644 --- a/pkgs/applications/emulators/retroarch/cores/gw.nix +++ b/pkgs/applications/emulators/retroarch/cores/gw.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "gw"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/handy.nix b/pkgs/applications/emulators/retroarch/cores/handy.nix index 9dd5c58f9fcc..fe046d5eaf38 100644 --- a/pkgs/applications/emulators/retroarch/cores/handy.nix +++ b/pkgs/applications/emulators/retroarch/cores/handy.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "handy"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/hatari.nix b/pkgs/applications/emulators/retroarch/cores/hatari.nix index e1ded94dc175..0daef12b19dd 100644 --- a/pkgs/applications/emulators/retroarch/cores/hatari.nix +++ b/pkgs/applications/emulators/retroarch/cores/hatari.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "hatari"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame.nix b/pkgs/applications/emulators/retroarch/cores/mame.nix index 20a8f8dd5cee..85b034aa599a 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame.nix @@ -9,7 +9,7 @@ }: mkLibretroCore { core = "mame"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2000.nix b/pkgs/applications/emulators/retroarch/cores/mame2000.nix index f9ece98f68f5..fd3448e8cb37 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2000.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2000.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "mame2000"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix index 048211d985c3..d895438cef5e 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2003-plus.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2003.nix b/pkgs/applications/emulators/retroarch/cores/mame2003.nix index 96786a4c1a0e..47b83ea80c5c 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2003.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2003.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mame2003"; - version = "unstable-2024-11-01"; + version = "0-unstable-2024-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2010.nix b/pkgs/applications/emulators/retroarch/cores/mame2010.nix index 529c79b7d9be..52fa54a76408 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2010.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2010.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "mame2010"; - version = "unstable-2024-10-23"; + version = "0-unstable-2024-10-23"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2015.nix b/pkgs/applications/emulators/retroarch/cores/mame2015.nix index 797c7f80e0a3..8096a99a089d 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2015.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2015.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "mame2015"; - version = "unstable-2023-11-01"; + version = "0-unstable-2023-11-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mame2016.nix b/pkgs/applications/emulators/retroarch/cores/mame2016.nix index a98b98a7ace0..31e929b7089a 100644 --- a/pkgs/applications/emulators/retroarch/cores/mame2016.nix +++ b/pkgs/applications/emulators/retroarch/cores/mame2016.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "mame2016"; - version = "unstable-2024-04-06"; + version = "0-unstable-2024-04-06"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/melonds.nix b/pkgs/applications/emulators/retroarch/cores/melonds.nix index a7adaf2fbb3b..59e0676a5594 100644 --- a/pkgs/applications/emulators/retroarch/cores/melonds.nix +++ b/pkgs/applications/emulators/retroarch/cores/melonds.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "melonds"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix index 5c4ad5996e58..ea349e193621 100644 --- a/pkgs/applications/emulators/retroarch/cores/mesen-s.nix +++ b/pkgs/applications/emulators/retroarch/cores/mesen-s.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mesen-s"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mesen.nix b/pkgs/applications/emulators/retroarch/cores/mesen.nix index 8f75096ff72c..3c6c9bb9399e 100644 --- a/pkgs/applications/emulators/retroarch/cores/mesen.nix +++ b/pkgs/applications/emulators/retroarch/cores/mesen.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mesen"; - version = "unstable-2024-06-09"; + version = "0-unstable-2024-06-09"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/meteor.nix b/pkgs/applications/emulators/retroarch/cores/meteor.nix index c6e656f698af..f1e5b1c55121 100644 --- a/pkgs/applications/emulators/retroarch/cores/meteor.nix +++ b/pkgs/applications/emulators/retroarch/cores/meteor.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "meteor"; - version = "unstable-2020-12-28"; + version = "0-unstable-2020-12-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mgba.nix b/pkgs/applications/emulators/retroarch/cores/mgba.nix index e2f683345740..02bd1e8b837c 100644 --- a/pkgs/applications/emulators/retroarch/cores/mgba.nix +++ b/pkgs/applications/emulators/retroarch/cores/mgba.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "mgba"; - version = "unstable-2024-11-12"; + version = "0-unstable-2024-11-12"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/mrboom.nix b/pkgs/applications/emulators/retroarch/cores/mrboom.nix index 017c8325df69..dcb6aaecf9ec 100644 --- a/pkgs/applications/emulators/retroarch/cores/mrboom.nix +++ b/pkgs/applications/emulators/retroarch/cores/mrboom.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "mrboom"; - version = "unstable-2024-07-01"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "Javanaise"; diff --git a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix index 41aff713cba6..bf455e034deb 100644 --- a/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix +++ b/pkgs/applications/emulators/retroarch/cores/mupen64plus.nix @@ -11,7 +11,7 @@ }: mkLibretroCore { core = "mupen64plus-next"; - version = "unstable-2024-10-29"; + version = "0-unstable-2024-10-29"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/neocd.nix b/pkgs/applications/emulators/retroarch/cores/neocd.nix index 17c74d6ab92f..55fce9c5e269 100644 --- a/pkgs/applications/emulators/retroarch/cores/neocd.nix +++ b/pkgs/applications/emulators/retroarch/cores/neocd.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "neocd"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/nestopia.nix b/pkgs/applications/emulators/retroarch/cores/nestopia.nix index 4d881e69b281..0275db2c133e 100644 --- a/pkgs/applications/emulators/retroarch/cores/nestopia.nix +++ b/pkgs/applications/emulators/retroarch/cores/nestopia.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "nestopia"; - version = "unstable-2024-10-17"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/np2kai.nix b/pkgs/applications/emulators/retroarch/cores/np2kai.nix index f840b04327cf..2ca6b2fba9c6 100644 --- a/pkgs/applications/emulators/retroarch/cores/np2kai.nix +++ b/pkgs/applications/emulators/retroarch/cores/np2kai.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "np2kai"; - version = "unstable-2024-11-03"; + version = "0-unstable-2024-11-03"; src = fetchFromGitHub { owner = "AZO234"; diff --git a/pkgs/applications/emulators/retroarch/cores/nxengine.nix b/pkgs/applications/emulators/retroarch/cores/nxengine.nix index 6754dd7a3926..c9712892daab 100644 --- a/pkgs/applications/emulators/retroarch/cores/nxengine.nix +++ b/pkgs/applications/emulators/retroarch/cores/nxengine.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "nxengine"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/o2em.nix b/pkgs/applications/emulators/retroarch/cores/o2em.nix index 504deb49a268..e5deb54ea7dd 100644 --- a/pkgs/applications/emulators/retroarch/cores/o2em.nix +++ b/pkgs/applications/emulators/retroarch/cores/o2em.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "o2em"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/opera.nix b/pkgs/applications/emulators/retroarch/cores/opera.nix index 90e273c6d2b3..5b3c12b73f52 100644 --- a/pkgs/applications/emulators/retroarch/cores/opera.nix +++ b/pkgs/applications/emulators/retroarch/cores/opera.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "opera"; - version = "unstable-2024-10-17"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix index f6ba71d47c63..48ae3d922650 100644 --- a/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/retroarch/cores/parallel-n64.nix @@ -9,7 +9,7 @@ }: mkLibretroCore { core = "parallel-n64"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix index 92405ee175b9..d96f80d1ceb0 100644 --- a/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/retroarch/cores/pcsx-rearmed.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "unstable-2024-11-17"; + version = "0-unstable-2024-11-17"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix index d24311b4df62..09a80f4dbe86 100644 --- a/pkgs/applications/emulators/retroarch/cores/pcsx2.nix +++ b/pkgs/applications/emulators/retroarch/cores/pcsx2.nix @@ -17,7 +17,7 @@ }: mkLibretroCore { core = "pcsx2"; - version = "unstable-2023-01-30"; + version = "0-unstable-2023-01-30"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/picodrive.nix b/pkgs/applications/emulators/retroarch/cores/picodrive.nix index 6c5b6e093fe0..7d3b3065e661 100644 --- a/pkgs/applications/emulators/retroarch/cores/picodrive.nix +++ b/pkgs/applications/emulators/retroarch/cores/picodrive.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "picodrive"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/play.nix b/pkgs/applications/emulators/retroarch/cores/play.nix index 12b3ac2d6ba6..f87380b7e62d 100644 --- a/pkgs/applications/emulators/retroarch/cores/play.nix +++ b/pkgs/applications/emulators/retroarch/cores/play.nix @@ -14,7 +14,7 @@ }: mkLibretroCore { core = "play"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "jpd002"; diff --git a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix index 78db8a8db409..7339294e0767 100644 --- a/pkgs/applications/emulators/retroarch/cores/ppsspp.nix +++ b/pkgs/applications/emulators/retroarch/cores/ppsspp.nix @@ -13,7 +13,7 @@ }: mkLibretroCore { core = "ppsspp"; - version = "unstable-2024-11-15"; + version = "0-unstable-2024-11-15"; src = fetchFromGitHub { owner = "hrydgard"; diff --git a/pkgs/applications/emulators/retroarch/cores/prboom.nix b/pkgs/applications/emulators/retroarch/cores/prboom.nix index b92d3159d729..64d4e28d286f 100644 --- a/pkgs/applications/emulators/retroarch/cores/prboom.nix +++ b/pkgs/applications/emulators/retroarch/cores/prboom.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "prboom"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/prosystem.nix b/pkgs/applications/emulators/retroarch/cores/prosystem.nix index 30aedcb7e346..4e202e6a2bb3 100644 --- a/pkgs/applications/emulators/retroarch/cores/prosystem.nix +++ b/pkgs/applications/emulators/retroarch/cores/prosystem.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "prosystem"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/puae.nix b/pkgs/applications/emulators/retroarch/cores/puae.nix index 9fe0184c36e0..07cc1c006023 100644 --- a/pkgs/applications/emulators/retroarch/cores/puae.nix +++ b/pkgs/applications/emulators/retroarch/cores/puae.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "puae"; - version = "unstable-2024-10-19"; + version = "0-unstable-2024-10-19"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/quicknes.nix b/pkgs/applications/emulators/retroarch/cores/quicknes.nix index 18edd078af28..365a64725c7a 100644 --- a/pkgs/applications/emulators/retroarch/cores/quicknes.nix +++ b/pkgs/applications/emulators/retroarch/cores/quicknes.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "quicknes"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix index 365b2c5cefc0..5a9611ac25a9 100644 --- a/pkgs/applications/emulators/retroarch/cores/same_cdi.nix +++ b/pkgs/applications/emulators/retroarch/cores/same_cdi.nix @@ -12,7 +12,7 @@ }: mkLibretroCore { core = "same_cdi"; - version = "unstable-2023-02-28"; + version = "0-unstable-2023-02-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/sameboy.nix b/pkgs/applications/emulators/retroarch/cores/sameboy.nix index 53ffa7b2fe4b..252976e3f85a 100644 --- a/pkgs/applications/emulators/retroarch/cores/sameboy.nix +++ b/pkgs/applications/emulators/retroarch/cores/sameboy.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "sameboy"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/scummvm.nix b/pkgs/applications/emulators/retroarch/cores/scummvm.nix index 6b8cc313913c..6bb0e08778cb 100644 --- a/pkgs/applications/emulators/retroarch/cores/scummvm.nix +++ b/pkgs/applications/emulators/retroarch/cores/scummvm.nix @@ -10,7 +10,7 @@ }: mkLibretroCore { core = "scummvm"; - version = "unstable-2022-04-06"; + version = "0-unstable-2022-04-06"; # This is the old source code before they upstreamed the source code, # so now the libretro related code lives in the scummvm/scummvm repository. diff --git a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix index 3eb69a857811..d0e9569bfc77 100644 --- a/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix +++ b/pkgs/applications/emulators/retroarch/cores/smsplus-gx.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "smsplus"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x.nix b/pkgs/applications/emulators/retroarch/cores/snes9x.nix index dc51fdfc9d3b..9c977d2a4d08 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "snes9x"; - version = "unstable-2024-10-28"; + version = "0-unstable-2024-10-28"; src = fetchFromGitHub { owner = "snes9xgit"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix index f64f31641b56..1f76c95869d2 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2002.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "snes9x2002"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix index f823a0fab39a..94e2f2440b18 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2005.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix index 8b913e7fa4a4..a9e1f27911cd 100644 --- a/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/retroarch/cores/snes9x2010.nix @@ -5,7 +5,7 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "unstable-2024-11-18"; + version = "0-unstable-2024-11-18"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella.nix b/pkgs/applications/emulators/retroarch/cores/stella.nix index 891127b278fa..d3028ef6926b 100644 --- a/pkgs/applications/emulators/retroarch/cores/stella.nix +++ b/pkgs/applications/emulators/retroarch/cores/stella.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "stella"; - version = "unstable-2024-11-17"; + version = "0-unstable-2024-11-17"; src = fetchFromGitHub { owner = "stella-emu"; diff --git a/pkgs/applications/emulators/retroarch/cores/stella2014.nix b/pkgs/applications/emulators/retroarch/cores/stella2014.nix index 2baf66a65f7b..467f6f82882b 100644 --- a/pkgs/applications/emulators/retroarch/cores/stella2014.nix +++ b/pkgs/applications/emulators/retroarch/cores/stella2014.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "stella2014"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/swanstation.nix b/pkgs/applications/emulators/retroarch/cores/swanstation.nix index aa87dc8178b1..092060008072 100644 --- a/pkgs/applications/emulators/retroarch/cores/swanstation.nix +++ b/pkgs/applications/emulators/retroarch/cores/swanstation.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "swanstation"; - version = "unstable-2024-07-24"; + version = "0-unstable-2024-07-24"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix index 7297818539c8..5925125cee29 100644 --- a/pkgs/applications/emulators/retroarch/cores/tgbdual.nix +++ b/pkgs/applications/emulators/retroarch/cores/tgbdual.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "tgbdual"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix index 2b8358a59803..ae74646706e2 100644 --- a/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix +++ b/pkgs/applications/emulators/retroarch/cores/thepowdertoy.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "thepowdertoy"; - version = "unstable-2024-10-01"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/tic80.nix b/pkgs/applications/emulators/retroarch/cores/tic80.nix index 2e637e9a1e74..8799649b6653 100644 --- a/pkgs/applications/emulators/retroarch/cores/tic80.nix +++ b/pkgs/applications/emulators/retroarch/cores/tic80.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "tic80"; - version = "unstable-2024-05-13"; + version = "0-unstable-2024-05-13"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix index 23d72dfead1b..5c9c39ac3a08 100644 --- a/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix +++ b/pkgs/applications/emulators/retroarch/cores/twenty-fortyeight.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "2048"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-m.nix b/pkgs/applications/emulators/retroarch/cores/vba-m.nix index 5b50f4d9a094..04b25cbcedca 100644 --- a/pkgs/applications/emulators/retroarch/cores/vba-m.nix +++ b/pkgs/applications/emulators/retroarch/cores/vba-m.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "vbam"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vba-next.nix b/pkgs/applications/emulators/retroarch/cores/vba-next.nix index 9027d8501565..a0c9ee947e2d 100644 --- a/pkgs/applications/emulators/retroarch/cores/vba-next.nix +++ b/pkgs/applications/emulators/retroarch/cores/vba-next.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "vba-next"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/vecx.nix b/pkgs/applications/emulators/retroarch/cores/vecx.nix index 664f01b73849..0b2871528486 100644 --- a/pkgs/applications/emulators/retroarch/cores/vecx.nix +++ b/pkgs/applications/emulators/retroarch/cores/vecx.nix @@ -7,7 +7,7 @@ }: mkLibretroCore { core = "vecx"; - version = "unstable-2024-06-28"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix index c90c4b081002..60b3ac75dd67 100644 --- a/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix +++ b/pkgs/applications/emulators/retroarch/cores/virtualjaguar.nix @@ -5,7 +5,7 @@ }: mkLibretroCore { core = "virtualjaguar"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; diff --git a/pkgs/applications/emulators/retroarch/cores/yabause.nix b/pkgs/applications/emulators/retroarch/cores/yabause.nix index dec1fe3e89b9..a825ad01c7ce 100644 --- a/pkgs/applications/emulators/retroarch/cores/yabause.nix +++ b/pkgs/applications/emulators/retroarch/cores/yabause.nix @@ -6,7 +6,7 @@ }: mkLibretroCore { core = "yabause"; - version = "unstable-2024-10-21"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro";