From 446bb88bb07644bc588dece492b46d5aeb67e573 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:16:35 -0300 Subject: [PATCH 1/5] blockattack: migrate to by-name --- .../default.nix => by-name/bl/blockattack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/blockattack/default.nix => by-name/bl/blockattack/package.nix} (100%) diff --git a/pkgs/games/blockattack/default.nix b/pkgs/by-name/bl/blockattack/package.nix similarity index 100% rename from pkgs/games/blockattack/default.nix rename to pkgs/by-name/bl/blockattack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6c9407956f..8a3ea78b071e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36254,8 +36254,6 @@ with pkgs; ballerburg = callPackage ../games/ballerburg { } ; - blockattack = callPackage ../games/blockattack { } ; - colobot = callPackage ../games/colobot { }; corsix-th = callPackage ../games/corsix-th { }; From 9d511f87c8ce76adcdb8299a236b7815c8054044 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:17:45 -0300 Subject: [PATCH 2/5] blockattack: refactor - finalAttrs - strictDeps - split outputs - no nested with in meta - updateScript --- pkgs/by-name/bl/blockattack/package.nix | 34 +++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index d59b93ae600c..c76d149eed18 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -1,30 +1,32 @@ { lib -, stdenv -, fetchFromGitHub , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf , boost , cmake +, fetchFromGitHub , gettext +, gitUpdater , physfs , pkg-config +, stdenv , zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; version = "2.8.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ + SDL2 cmake pkg-config gettext @@ -41,19 +43,31 @@ stdenv.mkDerivation rec { physfs ]; + outputs = [ + "out" + "man" + ]; + + strictDeps = true; + preConfigure = '' patchShebangs packdata.sh source/misc/translation/*.sh chmod +x ./packdata.sh ./packdata.sh ''; - meta = with lib; { + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { homepage = "https://blockattack.net/"; description = "An open source clone of Panel de Pon (aka Tetris Attack)"; - mainProgram = "blockattack"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; broken = stdenv.isDarwin; + changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "blockattack"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL2.meta) platforms; }; -} +}) From 8ec62b508f9779654a7501435920de328c57f876 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:30:17 -0300 Subject: [PATCH 3/5] blockattack: use ninja Because it is faster (your mileage can vary). --- pkgs/by-name/bl/blockattack/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index c76d149eed18..ce94ef1d72ed 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -8,6 +8,7 @@ , fetchFromGitHub , gettext , gitUpdater +, ninja , physfs , pkg-config , stdenv @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ SDL2 cmake + ninja pkg-config gettext zip From abaecccc88dae6bcd6b5fcc47702f1929a263b58 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:31:12 -0300 Subject: [PATCH 4/5] blockattack: nixfmt --- pkgs/by-name/bl/blockattack/package.nix | 31 +++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index ce94ef1d72ed..415ba325d55d 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -1,18 +1,19 @@ -{ lib -, SDL2 -, SDL2_image -, SDL2_mixer -, SDL2_ttf -, boost -, cmake -, fetchFromGitHub -, gettext -, gitUpdater -, ninja -, physfs -, pkg-config -, stdenv -, zip +{ + lib, + SDL2, + SDL2_image, + SDL2_mixer, + SDL2_ttf, + boost, + cmake, + fetchFromGitHub, + gettext, + gitUpdater, + ninja, + physfs, + pkg-config, + stdenv, + zip, }: stdenv.mkDerivation (finalAttrs: { From 195936e03a08384eec83391f73c28af6b3a17805 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:19:44 -0300 Subject: [PATCH 5/5] blockattack: 2.8.0 -> 2.9.0 Co-authored-by: R. RyanTM --- pkgs/by-name/bl/blockattack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 415ba325d55d..f0de4f2de8af 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; rev = "v${finalAttrs.version}"; - hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; + hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po="; }; nativeBuildInputs = [