From 6f4daaafe58ce280cba781498279b5a22bf38623 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 14:41:25 -0300 Subject: [PATCH 1/5] ataripp: migrate to by-name --- .../atari++/default.nix => by-name/at/ataripp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/atari++/default.nix => by-name/at/ataripp/package.nix} (100%) diff --git a/pkgs/applications/emulators/atari++/default.nix b/pkgs/by-name/at/ataripp/package.nix similarity index 100% rename from pkgs/applications/emulators/atari++/default.nix rename to pkgs/by-name/at/ataripp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 863e7e076bda..a49a30d3e0c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2641,8 +2641,6 @@ with pkgs; atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../applications/emulators/atari++ { }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; basiliskii = callPackage ../applications/emulators/basiliskii { }; From e5338a2b7db2b0f8938e5d7634bf55d0aa2f8845 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 15:04:06 -0300 Subject: [PATCH 2/5] ataripp: cleanup --- pkgs/by-name/at/ataripp/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix index f78bf7e4cf06..86dc7b0bc0f4 100644 --- a/pkgs/by-name/at/ataripp/package.nix +++ b/pkgs/by-name/at/ataripp/package.nix @@ -1,8 +1,8 @@ { lib , stdenv -, fetchurl , SDL , alsa-lib +, fetchurl , gcc-unwrapped , libICE , libSM @@ -30,10 +30,12 @@ stdenv.mkDerivation (finalAttrs: { ]; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs} "$out/bin/atari++" + patchelf \ + --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs} \ + "$out/bin/atari++" ''; - meta = with lib; { + meta = { homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' @@ -42,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { and the Atari 5200 game console. The emulator is auto-configurable and will compile on a variety of systems (Linux, Solaris, Irix). ''; - maintainers = [ maintainers.AndersonTorres ]; - license = licenses.gpl2Plus; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ AndersonTorres ]; + license = with lib.licenses; [ gpl2Plus ]; + platforms = lib.platforms.unix; }; }) From 006a2b5e92041ec31feeb2abd49079e2a17d956f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 14:37:32 -0300 Subject: [PATCH 3/5] atari800: migrate to by-name --- .../atari800/default.nix => by-name/at/atari800/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/atari800/default.nix => by-name/at/atari800/package.nix} (100%) diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/by-name/at/atari800/package.nix similarity index 100% rename from pkgs/applications/emulators/atari800/default.nix rename to pkgs/by-name/at/atari800/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a49a30d3e0c0..4c0967413780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2639,8 +2639,6 @@ with pkgs; _86Box = callPackage ../applications/emulators/86box { }; - atari800 = callPackage ../applications/emulators/atari800 { }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; basiliskii = callPackage ../applications/emulators/basiliskii { }; From 704823fe3c9ec66bb058161fd76cfcd4ce87ccca Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 14:55:48 -0300 Subject: [PATCH 4/5] atari800: cleanup --- pkgs/by-name/at/atari800/package.nix | 59 ++++++++++++++++++---------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index 0f1d4a47582e..c522ad557d98 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -1,43 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook -, zlib, SDL, readline, libGLU, libGL, libX11 }: +{ lib +, stdenv +, SDL +, autoreconfHook +, fetchFromGitHub +, libGL +, libGLU +, libX11 +, readline +, zlib +}: -with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atari800"; version = "5.0.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; - rev = "ATARI800_${replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; + hash = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; + rev = "ATARI800_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + ]; - buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; + buildInputs = [ + SDL + libGL + libGLU + libX11 + readline + zlib + ]; configureFlags = [ "--target=default" - "--with-video=sdl" - "--with-sound=sdl" - "--with-readline" - "--with-opengl" - "--with-x" - "--enable-riodevice" + (lib.enableFeature true "riodevice") + (lib.withFeature true "opengl") + (lib.withFeature true "readline") + (lib.withFeature true "x") + (lib.withFeatureAs true "sound" "sdl") + (lib.withFeatureAs true "video" "sdl") ]; meta = { homepage = "https://atari800.github.io/"; description = "An Atari 8-bit emulator"; longDescription = '' - Atari800 is the emulator of Atari 8-bit computer systems and - 5200 game console for Unix, Linux, Amiga, MS-DOS, Atari - TT/Falcon, MS-Windows, MS WinCE, Sega Dreamcast, Android and - other systems supported by the SDL library. + Atari800 is the emulator of Atari 8-bit computer systems and 5200 game + console for Unix, Linux, Amiga, MS-DOS, Atari TT/Falcon, MS-Windows, MS + WinCE, Sega Dreamcast, Android and other systems supported by the SDL + library. ''; - maintainers = [ maintainers.AndersonTorres ]; - license = licenses.gpl2Plus; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) From 8c4161f86d32c8443c8cb38f8885d605cbe61b37 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Dec 2023 15:14:55 -0300 Subject: [PATCH 5/5] atari800: 5.0.0 -> 5.1.0 --- pkgs/by-name/at/atari800/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index c522ad557d98..7e57a192a697 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "atari800"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; - hash = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; rev = "ATARI800_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; + hash = "sha256-OZj0x9+M3jkiXUWgB93JTQzi4OUSBCZ3KtniwcZeVB0="; }; nativeBuildInputs = [