Skip to content

sdl2-compat: 2.32.52 -> 2.32.54#395227

Merged
leona-ya merged 1 commit intoNixOS:stagingfrom
MisileLab:sdl2_compat
Apr 24, 2025
Merged

sdl2-compat: 2.32.52 -> 2.32.54#395227
leona-ya merged 1 commit intoNixOS:stagingfrom
MisileLab:sdl2_compat

Conversation

@MisileLab
Copy link
Contributor

@MisileLab MisileLab commented Apr 1, 2025

https://github.com/libsdl-org/sdl2-compat/releases/tag/release-2.32.54

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 1, 2025
@nix-owners nix-owners bot requested a review from nadiaholmquist April 1, 2025 17:04
Copy link
Contributor

@nadiaholmquist nadiaholmquist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changelog states that sdl2_compat.pc has been renamed to sdl2-compat.pc, the package will need to be adjusted for this.

Edit: Also this requires #395231 since they raised the SDL3 version requirement.

@getchoo
Copy link
Member

getchoo commented Apr 3, 2025

Edit: Also this requires #395231 since they raised the SDL3 version requirement.

Merged!

@getchoo getchoo self-requested a review April 3, 2025 17:22
@MisileLab
Copy link
Contributor Author

MisileLab commented Apr 3, 2025

I'll rebase after 7-8 hours.

@LordGrimmauld
Copy link
Contributor

I'll rebase after 7-8 hours.

what happened to this plan? And please adjust the symlink pointing to sdl2.pc, that is important.

@MisileLab
Copy link
Contributor Author

I'll rebase after 7-8 hours.

what happened to this plan? And please adjust the symlink pointing to sdl2.pc, that is important.

I just forgot, wait a minute.

@MisileLab MisileLab marked this pull request as draft April 6, 2025 13:11
@MisileLab MisileLab marked this pull request as ready for review April 6, 2025 13:13
LordGrimmauld

This comment was marked as resolved.

@MisileLab
Copy link
Contributor Author

diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index 571619c61ff7..fb6d419e7969 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.52";
+  version = "2.32.54";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-adtFcBFclfub//KGpxqObuTIZbh9r4k/jdJEnP1Hzpw=";
+    hash = "sha256-tkiKJ/YPipeqAiioWZKlL1dXKPnvbW57v97rtITpV0Y=";
   };
 
   nativeBuildInputs = [
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     # allow as a drop in replacement for SDL2
     # Can be removed after treewide switch from pkg-config to pkgconf
-    ln -s $dev/lib/pkgconfig/sdl2_compat.pc $dev/lib/pkgconfig/sdl2.pc
+    ln -s $dev/lib/pkgconfig/sdl2-compat.pc $dev/lib/pkgconfig/sdl2.pc
   '';
 
   passthru = {

I applied it.

@MisileLab MisileLab requested a review from LordGrimmauld April 6, 2025 13:16
Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change itself is correct - however, since #393386 sdl2-compat became a mass rebuild. Merging it to master might be problematic. This might have to target staging/staging-next, i'll have to check procedures here.

@LordGrimmauld
Copy link
Contributor

After asking people in the staging channel on matrix, i was told this should probably go to staging as to not cause unexpected recompiles with staging-next. That means you have to rebase again, sorry.

@MisileLab MisileLab marked this pull request as draft April 6, 2025 15:34
@MisileLab MisileLab changed the base branch from master to staging April 6, 2025 15:36
@MisileLab MisileLab marked this pull request as ready for review April 6, 2025 15:37
@LordGrimmauld
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 395227


x86_64-linux

❌ 35 packages failed to build:
  • brogue
  • directvnc
  • freewheeling
  • frozen-bubble
  • frozen-bubble.devdoc
  • gnss-sdr
  • gnu-smalltalk
  • guile-sdl
  • haskellPackages.bindings-directfb
  • haskellPackages.bindings-directfb.doc
  • hheretic
  • ibniz
  • libtcod
  • np2kai
  • odamex
  • perl538Packages.SDL
  • perl538Packages.SDL.devdoc
  • perl540Packages.SDL
  • perl540Packages.SDL.devdoc
  • pokerth
  • pokerth-server
  • scorched3d
  • soundtracker
  • t4kcommon
  • titanion
  • torus-trooper
  • trunk-recorder
  • tumiki-fighters
  • tuxtype
  • uae
  • uhexen2
  • vessel
  • vice
  • xwax
  • zsnes2
✅ 220 packages built:
  • SDL (SDL_compat)
  • SDL_Pango
  • SDL_gfx
  • SDL_image
  • SDL_image.dev
  • SDL_mixer
  • SDL_mixer.dev
  • SDL_net
  • SDL_sound
  • SDL_stretch
  • SDL_ttf
  • _1oom
  • _1oom.doc
  • agg
  • airstrike
  • andyetitmoves
  • armagetronad
  • asap
  • asap.dev
  • asc
  • atari800
  • ataripp
  • azimuth
  • ballerburg
  • barrage
  • blackvoxel
  • bloodspilot-client
  • bottles
  • btanks
  • caprice32
  • cgterm
  • cheesecutter
  • chickenPackages_5.chickenEggs.sdl-base
  • crossfire-client
  • crrcsim
  • curseofwar-sdl
  • cuyo
  • desmume
  • dgen-sdl
  • directfb
  • dosbox
  • dwarf-fortress-packages.dwarf-fortress_0_43_05
  • dwarf-fortress-packages.dwarf-fortress_0_44_05
  • dwarf-fortress-packages.dwarf-fortress_0_44_09
  • dwarf-fortress-packages.dwarf-fortress_0_44_10
  • dwarf-fortress-packages.dwarf-fortress_0_44_11
  • dwarf-fortress-packages.dwarf-fortress_0_44_12
  • dwarf-fortress-packages.dwarf-fortress_0_47_01
  • dwarf-fortress-packages.dwarf-fortress_0_47_02
  • dwarf-fortress-packages.dwarf-fortress_0_47_04
  • dwarf-fortress-packages.dwarf-fortress_0_47_05
  • edgetx
  • egoboo
  • fim
  • fish-fillets-ng
  • flowblade
  • freedink
  • freedroid
  • freedroidrpg
  • fuse-emulator
  • gargoyle
  • gav
  • gl117
  • globulation2
  • gltron
  • gmu
  • gnujump
  • gnuradio
  • gnuradioMinimal
  • gnuradioPackages.bladeRF
  • gnuradioPackages.fosphor
  • gnuradioPackages.lora_sdr
  • gnuradioPackages.lora_sdr.dev
  • gnuradioPackages.osmosdr
  • gnuradioPackages.osmosdr.dev
  • goattracker
  • goattracker-stereo
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • grafx2
  • grafx2.man
  • gravit
  • hase
  • haskellPackages.SDL
  • haskellPackages.SDL-gfx
  • haskellPackages.SDL-gfx.data
  • haskellPackages.SDL-gfx.doc
  • haskellPackages.SDL-image
  • haskellPackages.SDL-image.data
  • haskellPackages.SDL-image.doc
  • haskellPackages.SDL-mixer
  • haskellPackages.SDL-mixer.data
  • haskellPackages.SDL-mixer.doc
  • haskellPackages.SDL-mpeg
  • haskellPackages.SDL-mpeg.data
  • haskellPackages.SDL-mpeg.doc
  • haskellPackages.SDL-ttf
  • haskellPackages.SDL-ttf.data
  • haskellPackages.SDL-ttf.doc
  • haskellPackages.SDL.data
  • haskellPackages.SDL.doc
  • haskellPackages.elerea-sdl
  • haskellPackages.elerea-sdl.doc
  • hatari
  • hex-a-hop
  • hhexen
  • hikounomizu
  • hivelytracker
  • hyperrogue
  • inspectrum
  • jack_oscrolloscope
  • jimtcl
  • katawa-shoujo
  • kdePackages.kdenlive
  • kdePackages.kdenlive.debug
  • kdePackages.kdenlive.dev
  • kdePackages.kdenlive.devtools
  • kdePackages.mlt (qt6Packages.mlt)
  • kdePackages.mlt.dev (qt6Packages.mlt.dev)
  • keen4
  • kobodeluxe
  • krita
  • krita-plugin-gmic
  • lbreakout2
  • libagar
  • libagar.devdoc
  • libagar_test
  • libsForQt5.kdenlive (plasma5Packages.kdenlive)
  • libsForQt5.mlt (plasma5Packages.mlt)
  • libsForQt5.mlt.dev (plasma5Packages.mlt.dev)
  • linuxConsoleTools
  • liquidwar
  • lmms
  • ltris
  • lutris
  • lutris-free
  • matrix-brandy
  • meritous
  • meterbridge
  • mjpegtoolsFull
  • mjpegtoolsFull.lib
  • mlt
  • mlt.dev
  • nexuiz
  • njam
  • onscripter-en
  • open-watcom-v2
  • open-watcom-v2-unwrapped
  • openboard
  • openlierox
  • openocd
  • openocd-rp2040
  • opentx
  • openxcom
  • oversteer
  • perl538Packages.AlienSDL
  • perl538Packages.AlienSDL.devdoc
  • perl540Packages.AlienSDL
  • perl540Packages.AlienSDL.devdoc
  • plib
  • powermanga
  • pterm
  • python312Packages.mlt
  • python312Packages.mlt.dev
  • python313Packages.mlt
  • python313Packages.mlt.dev
  • qodem
  • qradiolink
  • quakespasm
  • quantumminigolf
  • rili
  • rott
  • rott-shareware
  • rrootage
  • sdl-jstest
  • sdl2-compat
  • sdl2-compat.dev
  • sfxr
  • sfxr-qt
  • shotcut
  • simgear
  • simutrans_binaries
  • smpeg
  • smpeg.dev
  • snis-unwrapped
  • soi
  • sparrow3d
  • sparrow3d.dev
  • stardust
  • synaesthesia
  • synfigstudio
  • tecnoballz
  • teetertorture
  • tennix
  • tiny8086
  • tinyemu
  • tinygo
  • toppler
  • ultimatestunts
  • unscii
  • unscii.extra
  • urbanterror
  • vectoroids
  • vix
  • vp
  • vp.man
  • vpWithSixel
  • vpWithSixel.man
  • warmux
  • xpilot-ng
  • xsw
  • zandronum
  • zandronum-alpha
  • zandronum-alpha-server
  • zandronum-server
  • zaz
  • zgv
  • zod
  • zsnes

@github-actions github-actions bot added 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Apr 6, 2025
@nix-owners nix-owners bot requested a review from marcin-serwin April 6, 2025 15:45
@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 2 This PR was reviewed and approved by two persons. labels Apr 6, 2025
@LordGrimmauld LordGrimmauld added the 8.has: package (update) This PR updates a package to a newer version label Apr 6, 2025
@nadiaholmquist
Copy link
Contributor

meta.pkgConfigModules still needs to be adjusted for the tests to pass, but other than that I think this should be fine.

Copy link
Contributor

@LordGrimmauld LordGrimmauld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MisileLab passthru tests will fail unless you fix the meta, as pointed out by nadia:

diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index fb6d419e7969..23da12cc8057 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -108,6 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
       marcin-serwin
     ];
     platforms = lib.platforms.all;
-    pkgConfigModules = [ "sdl2_compat" ];
+    pkgConfigModules = [ "sdl2-compat" ];
   };
 })

Would love to get this merged soon, but the fix would be nice before that.

@leona-ya leona-ya merged commit b0e88f5 into NixOS:staging Apr 24, 2025
23 of 27 checks passed
@MisileLab MisileLab deleted the sdl2_compat branch April 24, 2025 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants