From 27fbdc911975979b00a6b6a8440e09215938d121 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:58:04 -0300 Subject: [PATCH 1/9] lpairs2: migrate to by-name --- .../lpairs2/default.nix => by-name/lp/lpairs2/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/lgames/lpairs2/default.nix => by-name/lp/lpairs2/package.nix} (100%) diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/by-name/lp/lpairs2/package.nix similarity index 100% rename from pkgs/games/lgames/lpairs2/default.nix rename to pkgs/by-name/lp/lpairs2/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe2642393297..ba52738e9457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37073,8 +37073,6 @@ with pkgs; lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; - lpairs2 = callPackage ../games/lgames/lpairs2 { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; From b39fd9c745477e559607ed11e6afddf2c0793a9d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 18:40:52 -0300 Subject: [PATCH 2/9] lpairs2: refactor - finalAttrs design pattern - meta.mainProgram --- pkgs/by-name/lp/lpairs2/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index 7993fd0657da..a7ecd6c0f3c9 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -1,19 +1,19 @@ { lib -, stdenv -, fetchurl , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf , directoryListingUpdater +, fetchurl +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lpairs2"; version = "2.3"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz"; hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; }; @@ -25,17 +25,18 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://lgames.sourceforge.io/LPairs/"; extraRegex = "(?!.*-win(32|64)).*"; }; - meta = with lib; { - broken = stdenv.isDarwin; + meta = { homepage = "http://lgames.sourceforge.net/LPairs/"; description = "Matching the pairs - a typical Memory Game"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "lpairs2"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; -} +}) From 49d3ac8c990f3071d972b4e33886cc62252e06d5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:55:59 -0300 Subject: [PATCH 3/9] lbreakouthd: migrate to by-name --- .../default.nix => by-name/lb/lbreakouthd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/lgames/lbreakouthd/default.nix => by-name/lb/lbreakouthd/package.nix} (100%) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/by-name/lb/lbreakouthd/package.nix similarity index 100% rename from pkgs/games/lgames/lbreakouthd/default.nix rename to pkgs/by-name/lb/lbreakouthd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba52738e9457..68530b1cdef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37071,8 +37071,6 @@ with pkgs; lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; - lbreakouthd = callPackage ../games/lgames/lbreakouthd { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; From 29b043ba468885b86d751376b025d9ae7eadc096 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 19:07:06 -0300 Subject: [PATCH 4/9] lbreakouthd: refactor - meta.mainProgram --- pkgs/by-name/lb/lbreakouthd/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index 64be757c35ad..0160d7e2033b 100644 --- a/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -1,11 +1,11 @@ { lib -, stdenv -, fetchurl -, directoryListingUpdater , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf +, directoryListingUpdater +, fetchurl +, stdenv }: stdenv.mkDerivation (finalAttrs: { @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; description = "A widescreen Breakout clone"; license = lib.licenses.gpl2Plus; + mainProgram = "lbreakouthd"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL2.meta) platforms; broken = stdenv.isDarwin; From 222a1cc130f6cf9723cd6858f8bff8b5a9e514cb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 19:02:55 -0300 Subject: [PATCH 5/9] barrage: refactor - finalAttrs design pattern - meta.mainProgram --- pkgs/games/lgames/barrage/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix index 822ec04f1d45..a606d4f3dfdf 100644 --- a/pkgs/games/lgames/barrage/default.nix +++ b/pkgs/games/lgames/barrage/default.nix @@ -1,16 +1,16 @@ { lib -, stdenv -, fetchurl , SDL , SDL_mixer +, fetchurl +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "barrage"; version = "1.0.7"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/lgames/barrage-${finalAttrs.version}.tar.gz"; hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg="; }; @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { homepage = "https://lgames.sourceforge.io/Barrage/"; description = "A destructive action game"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "barrage"; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; broken = stdenv.isDarwin; }; -} +}) From 674fc88fdaaacd07dec21fb1969d301abc159866 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:35:08 -0300 Subject: [PATCH 6/9] barrage: migrate to by-name --- .../barrage/default.nix => by-name/ba/barrage/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/lgames/barrage/default.nix => by-name/ba/barrage/package.nix} (100%) diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/by-name/ba/barrage/package.nix similarity index 100% rename from pkgs/games/lgames/barrage/default.nix rename to pkgs/by-name/ba/barrage/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68530b1cdef9..f8424110a671 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37067,8 +37067,6 @@ with pkgs; ### GAMES/LGAMES - barrage = callPackage ../games/lgames/barrage { }; - lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; maelstrom = callPackage ../games/maelstrom { }; From 4e7309d4c1f6cf54d36fdab638379ba70d75adf7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 18:21:34 -0300 Subject: [PATCH 7/9] lbreakout2: migrate to by-name --- .../default.nix => by-name/lb/lbreakout2/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/lgames/lbreakout2/default.nix => by-name/lb/lbreakout2/package.nix} (100%) diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/by-name/lb/lbreakout2/package.nix similarity index 100% rename from pkgs/games/lgames/lbreakout2/default.nix rename to pkgs/by-name/lb/lbreakout2/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8424110a671..9d4587fd8071 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37067,8 +37067,6 @@ with pkgs; ### GAMES/LGAMES - lbreakout2 = callPackage ../games/lgames/lbreakout2 { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; From 85bd7e43bfde9bdec72f1d8dd79ef0250b9c65eb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 19:00:04 -0300 Subject: [PATCH 8/9] lbreakout2: refactor - finalAttrs design pattern - meta.mainProgram --- pkgs/by-name/lb/lbreakout2/package.nix | 35 +++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index f554a1683eee..bd88ac2a21f2 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -1,28 +1,29 @@ { lib -, stdenv -, fetchurl -, fetchpatch , SDL , SDL_mixer +, fetchpatch +, fetchurl , libintl , libpng +, stdenv , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lbreakout2"; version = "2.6.5"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; + url = "mirror://sourceforge/lgames/lbreakout2-${finalAttrs.version}.tar.gz"; + hash = "sha256-kQTWF1VT2jRC3GpfxAemaeL1r/Pu3F0wQJ6wA7enjW8="; }; - # Can't exit from pause without this patch - patches = [(fetchpatch { - url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch"; - hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI="; - })]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch"; + hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI="; + }) + ]; buildInputs = [ SDL @@ -37,12 +38,12 @@ stdenv.mkDerivation rec { # Aborted (core dumped) hardeningDisable = [ "fortify" ]; - meta = with lib; { + meta = { homepage = "http://lgames.sourceforge.net/LBreakout2/"; description = "Breakout clone from the LGames series"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.ciil ]; - platforms = platforms.unix; - hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "lbreakout2"; + maintainers = with lib.maintainers; [ AndersonTorres ciil ]; + platforms = lib.platforms.unix; }; -} +}) From f982103f5d1cf96a4cb2e9e7efa8d87320349ba7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 18:24:06 -0300 Subject: [PATCH 9/9] all-packages: remove GAMES/LGAMES headline --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d4587fd8071..b43ff0ffce12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37065,8 +37065,6 @@ with pkgs; zdoom = callPackage ../games/doom-ports/zdoom { }; - ### GAMES/LGAMES - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ;