Skip to content

Commit 5d3eb3a

Browse files
authored
SDL2_classic: 2.32.4 -> 2.32.6; fix update script; fix tests (#404500)
2 parents 7848caf + d0549fd commit 5d3eb3a

File tree

1 file changed

+10
-22
lines changed

1 file changed

+10
-22
lines changed

pkgs/by-name/sd/SDL2_classic/package.nix

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,23 @@
4848
withStatic ? stdenv.hostPlatform.isMinGW,
4949
# passthru.tests
5050
testers,
51-
guile-sdl2,
52-
jazz2,
53-
SDL2_ttf,
54-
SDL2_net,
55-
SDL2_gfx,
56-
SDL2_sound,
57-
SDL2_mixer,
58-
SDL2_image,
59-
python3Packages,
51+
SDL2_classic_ttf,
52+
SDL2_classic_mixer,
53+
SDL2_classic_image,
6054
}:
6155

6256
# NOTE: When editing this expression see if the same change applies to
6357
# SDL expression too
6458

6559
stdenv.mkDerivation (finalAttrs: {
6660
pname = "SDL2";
67-
version = "2.32.4";
61+
version = "2.32.6";
6862

6963
src = fetchFromGitHub {
7064
owner = "libsdl-org";
7165
repo = "SDL";
7266
rev = "release-${finalAttrs.version}";
73-
hash = "sha256-4yUJkttUAbDC/5IdcCFY5ZTIG1qsxEEOjTTuplXV/p4=";
67+
hash = "sha256-sXlW+ivDRCNMcZDzZEfOPGvFGU0aE4n/fO+Wxym6GGw=";
7468
};
7569
dontDisableStatic = if withStatic then 1 else 0;
7670
outputs = [
@@ -211,22 +205,16 @@ stdenv.mkDerivation (finalAttrs: {
211205
updateScript = nix-update-script {
212206
extraArgs = [
213207
"--version-regex"
214-
"release-(.*)"
208+
"release-(2\\..*)"
215209
];
216210
};
217211
tests = {
218-
pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
212+
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
219213
inherit
220-
guile-sdl2
221-
jazz2
222-
SDL2_ttf
223-
SDL2_net
224-
SDL2_gfx
225-
SDL2_sound
226-
SDL2_mixer
227-
SDL2_image
214+
SDL2_classic_ttf
215+
SDL2_classic_mixer
216+
SDL2_classic_image
228217
;
229-
inherit (python3Packages) pygame pygame-ce pygame-sdl2;
230218
};
231219
};
232220

0 commit comments

Comments
 (0)