From bf8db64ddb159a9867182a8e1bd61aff88fc6b57 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 16:44:53 -0300 Subject: [PATCH 1/6] lzsa: init at 1.4.1 --- pkgs/by-name/lz/lzsa/package.nix | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/lz/lzsa/package.nix diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix new file mode 100644 index 000000000000..e0ddc158706e --- /dev/null +++ b/pkgs/by-name/lz/lzsa/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lzsa"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "emmanuel-marty"; + repo = "lzsa"; + rev = finalAttrs.version; + hash = "sha256-XaPtMW9INv/wzMXvlyXgE3VfFJCY/5R/HFGhV3ZKvGs="; + }; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + install -Dm755 lzsa -t $out/bin/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/emmanuel-marty/lzsa"; + description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros"; + license = with lib.licenses; [ cc0 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) From 5f0c17edea433b360b76bb425d21f0157a8a61aa Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 17:11:47 -0300 Subject: [PATCH 2/6] x16: move from commanderx16 Now they live under x16 attribute. Since the old names are easier to use and remember, they should be kept as non-removable aliases. --- .../emulator.nix => by-name/x1/x16/package.nix} | 6 ++++++ .../commanderx16 => by-name/x1/x16}/rom.nix | 0 .../commanderx16 => by-name/x1/x16}/run.nix | 1 + pkgs/top-level/all-packages.nix | 12 ++++-------- 4 files changed, 11 insertions(+), 8 deletions(-) rename pkgs/{applications/emulators/commanderx16/emulator.nix => by-name/x1/x16/package.nix} (87%) rename pkgs/{applications/emulators/commanderx16 => by-name/x1/x16}/rom.nix (100%) rename pkgs/{applications/emulators/commanderx16 => by-name/x1/x16}/run.nix (93%) diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/by-name/x1/x16/package.nix similarity index 87% rename from pkgs/applications/emulators/commanderx16/emulator.nix rename to pkgs/by-name/x1/x16/package.nix index 9da865057739..b01b706f746b 100644 --- a/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , SDL2 +, callPackage , zlib }: @@ -41,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: { # upstream project recommends emulator and rom to be synchronized; passing # through the version is useful to ensure this inherit (finalAttrs) version; + emulator = finalAttrs.finalPackage; + rom = callPackage ./rom.nix { }; + run = (callPackage ./run.nix { }){ + inherit (finalAttrs.finalPackage) emulator rom; + }; }; meta = { diff --git a/pkgs/applications/emulators/commanderx16/rom.nix b/pkgs/by-name/x1/x16/rom.nix similarity index 100% rename from pkgs/applications/emulators/commanderx16/rom.nix rename to pkgs/by-name/x1/x16/rom.nix diff --git a/pkgs/applications/emulators/commanderx16/run.nix b/pkgs/by-name/x1/x16/run.nix similarity index 93% rename from pkgs/applications/emulators/commanderx16/run.nix rename to pkgs/by-name/x1/x16/run.nix index 1f14fdb223c7..274e98afecca 100644 --- a/pkgs/applications/emulators/commanderx16/run.nix +++ b/pkgs/by-name/x1/x16/run.nix @@ -35,3 +35,4 @@ symlinkJoin { # 1. Parse the command line in order to allow the user to set an optional # rom-file # 2. generate runScript based on symlinkJoin (maybe a postBuild?) +# 3. a NixOS module to abstract the runner diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f3ef401937f..660608ae0a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2956,14 +2956,10 @@ with pkgs; branch = "early-access"; }; - ### APPLICATIONS/EMULATORS/COMMANDERX16 - - x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { - emulator = x16-emulator; - rom = x16-rom; - }; + # Aliases kept here because they are easier to use + x16-emulator = x16.emulator; + x16-rom = x16.rom; + x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; From fd6fc06eb9107c9dc6f80d0da3a4d4d19f7fd5a5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 17:18:00 -0300 Subject: [PATCH 3/6] x16.rom: 44 -> 45 New dependency `lzsa`. --- pkgs/by-name/x1/x16/rom.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index c272faa706aa..4a85b138ef2f 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -2,22 +2,24 @@ , stdenv , fetchFromGitHub , cc65 +, lzsa , python3 }: stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "44"; + version = "45"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-x/U+8e869mkWZKmCiW2fZKGB9un2cFXNclemwxbAjLQ="; + hash = "sha256-gZAs383Lft2Ee9Cp2+Daxa/swwtNYI/T/7kNtn5ROSY="; }; nativeBuildInputs = [ cc65 + lzsa python3 ]; From 61bd5e07615fec93037ae254d41326ffcb082f3d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 17:18:56 -0300 Subject: [PATCH 4/6] x16.emulator: 44 -> 45 --- pkgs/by-name/x1/x16/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index b01b706f746b..d99e55abecfe 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "44"; + version = "45"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-NDtfbhqGldxtvWQf/t6UnMRjI2DR7JYKbm2KFAMZhHY="; + hash = "sha256-5iVoN3V2uLzNgAQ5TlJju9K2u4M65kALWtytyrY1eiQ="; }; postPatch = '' From 7d416c7e15ff6204541c02ce1a9b884417c8abc7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 17:21:59 -0300 Subject: [PATCH 5/6] x16.rom: 45 -> 46 --- pkgs/by-name/x1/x16/rom.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index 4a85b138ef2f..7d17bb8272ce 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-gZAs383Lft2Ee9Cp2+Daxa/swwtNYI/T/7kNtn5ROSY="; + hash = "sha256-PcLHIT84NbH+ejq8SY/UN+TYtRFWtqQBHwHqToFUol8="; }; nativeBuildInputs = [ From 82529fe5ecaba9291163e80b7e71836a3d562169 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Dec 2023 17:22:15 -0300 Subject: [PATCH 6/6] x16.emulator: 45 -> 46 --- pkgs/by-name/x1/x16/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index d99e55abecfe..6a144bea669d 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-5iVoN3V2uLzNgAQ5TlJju9K2u4M65kALWtytyrY1eiQ="; + hash = "sha256-cYr6s69eua1hCFqNkcomZDK9akxBqMTIaGqOl/YX2kc="; }; postPatch = ''