From f0fd0d645852e718b825a6b9f257480b78f04e34 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 17:06:45 -0300 Subject: [PATCH 1/3] yapesdl: migrate to by-name --- .../yapesdl/default.nix => by-name/ya/yapesdl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/yapesdl/default.nix => by-name/ya/yapesdl/package.nix} (100%) diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/by-name/ya/yapesdl/package.nix similarity index 100% rename from pkgs/applications/emulators/yapesdl/default.nix rename to pkgs/by-name/ya/yapesdl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d66f9cb0f6..b6637d448765 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2771,8 +2771,6 @@ with pkgs; xcpc = callPackage ../applications/emulators/xcpc { }; - yapesdl = callPackage ../applications/emulators/yapesdl { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; From 15712a5ddf01f9c730c3750cd7a817fa4ba0dcec Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 8 Jul 2024 08:21:38 -0300 Subject: [PATCH 2/3] yapesdl: rewrite - split outputs - strictDeps - meta.changelog --- pkgs/by-name/ya/yapesdl/package.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix index 652b2cff3488..9921b9f0f624 100644 --- a/pkgs/by-name/ya/yapesdl/package.nix +++ b/pkgs/by-name/ya/yapesdl/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 +{ + lib, + SDL2, + fetchFromGitHub, + pkg-config, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -17,6 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + SDL2 pkg-config ]; @@ -26,20 +28,25 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; + outputs = [ "out" "doc" ]; + + strictDeps = true; + installPhase = '' runHook preInstall - install -Dm755 yapesdl -t $out/bin/ - install -Dm755 README.SDL -t $out/share/doc/yapesdl/ + install -Dm755 yapesdl -t ''${!outputBin}/bin/ + install -Dm755 README.SDL -t ''${!outputDoc}/share/doc/yapesdl/ runHook postInstall ''; meta = { homepage = "http://yape.plus4.net/"; description = "Multiplatform Commodore 64 and 264 family emulator"; + changelog = "https://github.com/calmopyrin/yapesdl/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl2Plus; + mainProgram = "yapesdl"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; - mainProgram = "yapesdl"; }; }) From aea5e5f1a57a2e688830cb39bbb9b50b67062129 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 8 Jul 2024 08:22:01 -0300 Subject: [PATCH 3/3] yapesdl: 0.71.2 -> 0.80.1 --- pkgs/by-name/ya/yapesdl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yapesdl/package.nix b/pkgs/by-name/ya/yapesdl/package.nix index 9921b9f0f624..44bb2a0dbaf8 100644 --- a/pkgs/by-name/ya/yapesdl/package.nix +++ b/pkgs/by-name/ya/yapesdl/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yapesdl"; - version = "0.71.2"; + version = "0.80.1"; src = fetchFromGitHub { owner = "calmopyrin"; repo = "yapesdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k="; + hash = "sha256-VCjxdVatu1h6VNMkLYL8Nknwn7ax0J2OhO1bc7dnQRA="; }; nativeBuildInputs = [