From df482fb6c722fe02917fe81c153b2a3c85532a6a Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 6 May 2025 00:02:53 +0200 Subject: [PATCH 1/3] SDL2_classic: fix update script Without the more specific regex it considered 3.x releases for updates. --- pkgs/by-name/sd/SDL2_classic/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 040917569f8e..4db7c9f90c0c 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "release-(.*)" + "release-(2\\..*)" ]; }; tests = { From 1f49a562de8eae6e3c8e7ea549f784a06b36717e Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 6 May 2025 00:13:10 +0200 Subject: [PATCH 2/3] SDL2_classic: 2.32.4 -> 2.32.6 --- pkgs/by-name/sd/SDL2_classic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 4db7c9f90c0c..1b6439390006 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -64,13 +64,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.32.4"; + version = "2.32.6"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-4yUJkttUAbDC/5IdcCFY5ZTIG1qsxEEOjTTuplXV/p4="; + hash = "sha256-sXlW+ivDRCNMcZDzZEfOPGvFGU0aE4n/fO+Wxym6GGw="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From d0549fdad7d23ca08713a8e8153117c26a04f6a6 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 6 May 2025 00:06:31 +0200 Subject: [PATCH 3/3] SDL2_classic: use tests that actually use the package The default libraries use SDL2 compat after migration, switched to use the specifically created classic variants. Only pygame and pygame-ce use SDL2 classic, other listed packages use SDL2 compat so they were removed. Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/SDL2_classic/package.nix | 26 +++++++----------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 1b6439390006..831d5074e772 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -48,15 +48,9 @@ withStatic ? stdenv.hostPlatform.isMinGW, # passthru.tests testers, - guile-sdl2, - jazz2, - SDL2_ttf, - SDL2_net, - SDL2_gfx, - SDL2_sound, - SDL2_mixer, - SDL2_image, - python3Packages, + SDL2_classic_ttf, + SDL2_classic_mixer, + SDL2_classic_image, }: # NOTE: When editing this expression see if the same change applies to @@ -215,18 +209,12 @@ stdenv.mkDerivation (finalAttrs: { ]; }; tests = { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; inherit - guile-sdl2 - jazz2 - SDL2_ttf - SDL2_net - SDL2_gfx - SDL2_sound - SDL2_mixer - SDL2_image + SDL2_classic_ttf + SDL2_classic_mixer + SDL2_classic_image ; - inherit (python3Packages) pygame pygame-ce pygame-sdl2; }; };