From 27fbdc911975979b00a6b6a8440e09215938d121 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:58:04 -0300 Subject: lpairs2: migrate to by-name --- pkgs/games/lgames/lpairs2/default.nix | 41 ----------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 pkgs/games/lgames/lpairs2/default.nix (limited to 'pkgs/games') diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix deleted file mode 100644 index 7993fd0657dac..0000000000000 --- a/pkgs/games/lgames/lpairs2/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, SDL2_image -, SDL2_mixer -, SDL2_ttf -, directoryListingUpdater -}: - -stdenv.mkDerivation rec { - pname = "lpairs2"; - version = "2.3"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; - }; - - buildInputs = [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_ttf - ]; - - passthru.updateScript = directoryListingUpdater { - inherit pname version; - url = "https://lgames.sourceforge.io/LPairs/"; - extraRegex = "(?!.*-win(32|64)).*"; - }; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "http://lgames.sourceforge.net/LPairs/"; - description = "Matching the pairs - a typical Memory Game"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} -- cgit 1.4.1 From 49d3ac8c990f3071d972b4e33886cc62252e06d5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:55:59 -0300 Subject: lbreakouthd: migrate to by-name --- pkgs/by-name/lb/lbreakouthd/package.nix | 43 +++++++++++++++++++++++++++++++ pkgs/games/lgames/lbreakouthd/default.nix | 43 ------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/lb/lbreakouthd/package.nix delete mode 100644 pkgs/games/lgames/lbreakouthd/default.nix (limited to 'pkgs/games') diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix new file mode 100644 index 0000000000000..64be757c35ad3 --- /dev/null +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, directoryListingUpdater +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lbreakouthd"; + version = "1.1.6"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; + hash = "sha256-Gor2LnM8vi6skJbzfR5023J13GxvqcpIrua9S+nT/S0="; + }; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + ]; + + hardeningDisable = [ "format" ]; + + passthru.updateScript = directoryListingUpdater { + inherit (finalAttrs) pname version; + url = "https://lgames.sourceforge.io/LBreakoutHD/"; + extraRegex = "(?!.*-win(32|64)).*"; + }; + + meta = { + homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; + description = "A widescreen Breakout clone"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL2.meta) platforms; + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix deleted file mode 100644 index 64be757c35ad3..0000000000000 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchurl -, directoryListingUpdater -, SDL2 -, SDL2_image -, SDL2_mixer -, SDL2_ttf -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "lbreakouthd"; - version = "1.1.6"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; - hash = "sha256-Gor2LnM8vi6skJbzfR5023J13GxvqcpIrua9S+nT/S0="; - }; - - buildInputs = [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_ttf - ]; - - hardeningDisable = [ "format" ]; - - passthru.updateScript = directoryListingUpdater { - inherit (finalAttrs) pname version; - url = "https://lgames.sourceforge.io/LBreakoutHD/"; - extraRegex = "(?!.*-win(32|64)).*"; - }; - - meta = { - homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; - description = "A widescreen Breakout clone"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - inherit (SDL2.meta) platforms; - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba52738e94574..68530b1cdef9a 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 { } ; -- cgit 1.4.1 From 222a1cc130f6cf9723cd6858f8bff8b5a9e514cb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 19:02:55 -0300 Subject: barrage: refactor - finalAttrs design pattern - meta.mainProgram --- pkgs/games/lgames/barrage/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix index 822ec04f1d45f..a606d4f3dfdf9 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; }; -} +}) -- cgit 1.4.1 From 674fc88fdaaacd07dec21fb1969d301abc159866 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 17:35:08 -0300 Subject: barrage: migrate to by-name --- pkgs/by-name/ba/barrage/package.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/games/lgames/barrage/default.nix | 33 --------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 33 insertions(+), 35 deletions(-) create mode 100644 pkgs/by-name/ba/barrage/package.nix delete mode 100644 pkgs/games/lgames/barrage/default.nix (limited to 'pkgs/games') diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix new file mode 100644 index 0000000000000..a606d4f3dfdf9 --- /dev/null +++ b/pkgs/by-name/ba/barrage/package.nix @@ -0,0 +1,33 @@ +{ lib +, SDL +, SDL_mixer +, fetchurl +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "barrage"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/barrage-${finalAttrs.version}.tar.gz"; + hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg="; + }; + + buildInputs = [ + SDL + SDL_mixer + ]; + + hardeningDisable = [ "format" ]; + + meta = { + homepage = "https://lgames.sourceforge.io/Barrage/"; + description = "A destructive action game"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "barrage"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix deleted file mode 100644 index a606d4f3dfdf9..0000000000000 --- a/pkgs/games/lgames/barrage/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, SDL -, SDL_mixer -, fetchurl -, stdenv -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "barrage"; - version = "1.0.7"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/barrage-${finalAttrs.version}.tar.gz"; - hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg="; - }; - - buildInputs = [ - SDL - SDL_mixer - ]; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://lgames.sourceforge.io/Barrage/"; - description = "A destructive action game"; - license = with lib.licenses; [ gpl2Plus ]; - mainProgram = "barrage"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68530b1cdef9a..f8424110a671e 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 { }; -- cgit 1.4.1 From 4e7309d4c1f6cf54d36fdab638379ba70d75adf7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Mar 2024 18:21:34 -0300 Subject: lbreakout2: migrate to by-name --- pkgs/by-name/lb/lbreakout2/package.nix | 48 ++++++++++++++++++++++++++++++++ pkgs/games/lgames/lbreakout2/default.nix | 48 -------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 48 insertions(+), 50 deletions(-) create mode 100644 pkgs/by-name/lb/lbreakout2/package.nix delete mode 100644 pkgs/games/lgames/lbreakout2/default.nix (limited to 'pkgs/games') diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix new file mode 100644 index 0000000000000..f554a1683eee1 --- /dev/null +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, SDL +, SDL_mixer +, libintl +, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "lbreakout2"; + version = "2.6.5"; + + src = fetchurl { + url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; + sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; + }; + + # 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="; + })]; + + buildInputs = [ + SDL + SDL_mixer + libintl + libpng + zlib + ]; + + # With fortify it crashes at runtime: + # *** buffer overflow detected ***: terminated + # Aborted (core dumped) + hardeningDisable = [ "fortify" ]; + + meta = with lib; { + 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 + }; +} diff --git a/pkgs/games/lgames/lbreakout2/default.nix b/pkgs/games/lgames/lbreakout2/default.nix deleted file mode 100644 index f554a1683eee1..0000000000000 --- a/pkgs/games/lgames/lbreakout2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, SDL -, SDL_mixer -, libintl -, libpng -, zlib -}: - -stdenv.mkDerivation rec { - pname = "lbreakout2"; - version = "2.6.5"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i"; - }; - - # 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="; - })]; - - buildInputs = [ - SDL - SDL_mixer - libintl - libpng - zlib - ]; - - # With fortify it crashes at runtime: - # *** buffer overflow detected ***: terminated - # Aborted (core dumped) - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - 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 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8424110a671e..9d4587fd8071d 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 { } ; -- cgit 1.4.1