From b46c48c12a11250a684da6a8e1f4d765a148b2da Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 3 Mar 2020 09:12:44 -0300 Subject: [PATCH 1/3] mednaffe: 0.8.6 -> 0.8.8 --- pkgs/misc/emulators/mednaffe/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 40390068e7b..7e231c5edd3 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.6"; + version = "0.8.8"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "v${version}"; - sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; + rev = "${version}"; + sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based frontend for mednafen emulator"; - homepage = https://github.com/AmatCoder/mednaffe; + homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yegortimoshenko ]; + maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ]; platforms = platforms.linux; }; } From 3867188af72d2317c900d75642b0d4ffe0d25b2c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 3 Mar 2020 09:14:07 -0300 Subject: [PATCH 2/3] mednafen: 0.9.48 -> 1.22.2 --- pkgs/misc/emulators/mednafen/default.nix | 43 ++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 337d19804fc..777c9f043f4 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: stdenv.mkDerivation rec { pname = "mednafen"; - version = "0.9.48"; + version = "1.22.2"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; + sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { libsamplerate libsndfile libX11 - SDL - SDL_net + SDL2 + SDL2_net zlib ]; @@ -34,7 +34,38 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = https://mednafen.github.io/; + longDescription = '' + Mednafen is a portable, utilizing OpenGL and SDL, + argument(command-line)-driven multi-system emulator. Mednafen has the + ability to remap hotkey functions and virtual system inputs to a keyboard, + a joystick, or both simultaneously. Save states are supported, as is + real-time game rewinding. Screen snapshots may be taken, in the PNG file + format, at the press of a button. Mednafen can record audiovisual movies + in the QuickTime file format, with several different lossless codecs + supported. + + The following systems are supported (refer to the emulation module + documentation for more details): + + - Apple II/II+ + - Atari Lynx + - Neo Geo Pocket (Color) + - WonderSwan + - GameBoy (Color) + - GameBoy Advance + - Nintendo Entertainment System + - Super Nintendo Entertainment System/Super Famicom + - Virtual Boy + - PC Engine/TurboGrafx 16 (CD) + - SuperGrafx + - PC-FX + - Sega Game Gear + - Sega Genesis/Megadrive + - Sega Master System + - Sega Saturn (experimental, x86_64 only) + - Sony PlayStation + ''; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; From 66bd71cf131653c766925fbba3974726f8a22e4a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 3 Mar 2020 09:15:30 -0300 Subject: [PATCH 3/3] mednafen-server: convert meta.homepage to an explicit string --- pkgs/misc/emulators/mednafen/server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 146d5320261..9a1edc00452 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = https://mednafen.github.io/; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux;