From afdba72f6aad8635d3bd3a28c97b7e42bee17df6 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 17 May 2026 14:28:52 +0200 Subject: [PATCH 1/2] frozen-bubble: drop Signed-off-by: Marcin Serwin --- .../fr/frozen-bubble/fix-compilation.patch | 33 --------- pkgs/by-name/fr/frozen-bubble/package.nix | 74 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 pkgs/by-name/fr/frozen-bubble/fix-compilation.patch delete mode 100644 pkgs/by-name/fr/frozen-bubble/package.nix diff --git a/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch deleted file mode 100644 index e87dd0668dc2..000000000000 --- a/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Build.PL b/Build.PL -index b029d1e..8737395 100644 ---- a/Build.PL -+++ b/Build.PL -@@ -16,13 +16,14 @@ use Games::FrozenBubble; - my $prefix = Alien::SDL->config('prefix'); - my $cflags = '-I' - . File::Spec->catfile( $prefix, 'include' ) -+ . ' ' . `pkg-config --cflags SDL_mixer` - ; - $cflags .= ' -fnested-functions' if $^O =~ /darwin/; - ###!!! this looks strange, you perhaps meant "$cflags .= ..." - ###!!! I intended Alien::SDL to add -I$prefix/include automatically, please tell me when it does not work (kmx) - my $devnull = File::Spec->devnull(); - my @cflags = ExtUtils::CBuilder->new->split_like_shell( $cflags ); --my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_mixer', '-lSDL_Pango') ) ); -+my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_Pango',`pkg-config --libs SDL_mixer`) ) ); - push @linkers, '-liconv' - if $^O =~ /win/i; ###!!! really only Win needs this? ; BEWARE this matches also 'darwin', 'cygwin'!!!! - -diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm -index 2ebaf91..c420b9a 100644 ---- a/inc/My/Builder.pm -+++ b/inc/My/Builder.pm -@@ -123,7 +123,7 @@ sub ACTION_server { - push @ofiles, $cbuilder->compile( - source => catfile($server_directory, $cfile), - extra_compiler_flags => [ -- qw(-g -Wall -Werror -pipe), # verbatim from Makefile -+ qw(-g -pipe), # verbatim from Makefile - '-I' . $server_directory, # does not seem to be necessary - $cbuilder->split_like_shell(`pkg-config glib-2.0 --cflags`), - $cbuilder->split_like_shell(`pkg-config glib-2.0 --libs`), diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix deleted file mode 100644 index 40610b9c1ddb..000000000000 --- a/pkgs/by-name/fr/frozen-bubble/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - fetchurl, - perlPackages, - pkg-config, - SDL, - SDL_mixer, - SDL_Pango, - glib, - copyDesktopItems, - makeDesktopItem, - fetchpatch, -}: - -perlPackages.buildPerlModule { - pname = "frozen-bubble"; - version = "2.212"; - - src = fetchurl { - url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; - hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; - }; - - patches = [ - ./fix-compilation.patch - (fetchpatch { - # https://github.com/kthakore/frozen-bubble/pull/82 - url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1"; - hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY="; - }) - ]; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - ]; - - buildInputs = [ - glib - SDL - SDL_mixer - SDL_Pango - perlPackages.SDL - perlPackages.FileSlurp - ]; - - propagatedBuildInputs = with perlPackages; [ - AlienSDL - CompressBzip2 - FileShareDir - FileWhich - IPCSystemSimple - LocaleMaketextLexicon - ]; - - perlPreHook = "export LD=$CC"; - - desktopItems = [ - (makeDesktopItem { - name = "frozen-bubble"; - exec = "frozen-bubble"; - desktopName = "Frozen Bubble"; - genericName = "Frozen Bubble"; - comment = "Arcade/reflex colour matching game"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "Puzzle with Bubbles"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ puckipedia ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 51bb2987a152..d54e61e14c0c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -797,6 +797,7 @@ mapAliases { freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23 freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27 freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27 + frozen-bubble = throw "'frozen-bubble' has been removed because it is broken and unmaintained"; # Added 2026-05-17 frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20 fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05 fusionInventory = warnAlias "'fusionInventory' has been renamed to 'fusioninventory-agent'" fusioninventory-agent; # Added 2026-02-08 From 2c3f54b838acab38aff6d1a368e0af650f10c082 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Nov 2025 14:01:22 +0100 Subject: [PATCH 2/2] perl540Packages.SDL: drop Signed-off-by: Marcin Serwin --- pkgs/top-level/perl-packages.nix | 46 +------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8fae734e416..a2a671c0d19b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -30474,51 +30474,6 @@ with self; }; }; - SDL = buildPerlModule { - pname = "SDL"; - version = "2.548"; - src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz"; - hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U="; - }; - patches = [ - # https://github.com/PerlGameDev/SDL/pull/304 - ../development/perl-modules/sdl-modern-perl.patch - # sdl-compat correctly reports the bit depth of the test image, - # while SDL_classic rounded to the next byte - ../development/perl-modules/sdl-compat-bit-depth.patch - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/surface-xs-declare-calc-offset-earlier.diff?h=perl-sdl&id=d4b6da86d33046cde0e84fa2cd6eaccff1667cab"; - hash = "sha256-dQ2O4dO18diSAilSZrZj6II+mBuKKI3cx9fR1SJqUvo="; - }) - ]; - preCheck = "rm t/core_audiospec.t"; - buildInputs = [ - pkgs.SDL - pkgs.SDL_gfx - pkgs.SDL_mixer - pkgs.SDL_image - pkgs.SDL_ttf - pkgs.SDL_Pango - pkgs.SDL_net - AlienSDL - CaptureTiny - TestDeep - TestDifferences - TestException - TestMost - TestWarn - ]; - propagatedBuildInputs = [ - FileShareDir - TieSimple - ]; - meta = { - description = "SDL bindings to Perl"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - SeleniumRemoteDriver = buildPerlPackage { pname = "Selenium-Remote-Driver"; version = "1.49"; @@ -39746,4 +39701,5 @@ with self; MongoDB = throw "MongoDB has been removed"; # 2025-09-12 pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08 + SDL = throw "'SDL' has been removed as it was broken and unused"; # Added 2026-05-17 }