Skip to content

sdl3 3.2.12 and sdl2-compat 2.32.56#404228

Merged
pbsds merged 2 commits intoNixOS:stagingfrom
kylerisse:sdl3_3.2.12
May 5, 2025
Merged

sdl3 3.2.12 and sdl2-compat 2.32.56#404228
pbsds merged 2 commits intoNixOS:stagingfrom
kylerisse:sdl3_3.2.12

Conversation

@kylerisse
Copy link
Member

@kylerisse kylerisse commented May 4, 2025

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.

@kylerisse kylerisse mentioned this pull request May 4, 2025
Merged
13 tasks
@kylerisse
Copy link
Member Author

kylerisse commented May 4, 2025

Looks like this change affects 3128 packages. Will take a while to report back findings of nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" but I did spot check a few and so far so good.

@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. labels May 4, 2025
@pbsds
Copy link
Member

pbsds commented May 4, 2025

please target staging

@kylerisse kylerisse changed the base branch from master to staging May 4, 2025 23:33
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: kernel The Linux kernel 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels May 4, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 4, 2025
@nix-owners
Copy link

nix-owners bot commented May 4, 2025

The PR's base branch is set to staging, but 31 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto 6964385fafab99f685d9017affee6235eb9a0d02 86de8da5c386a55fb0996d4f010b25548e28d737
git push --force-with-lease

@github-actions github-actions bot removed 6.topic: kernel The Linux kernel 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels May 4, 2025
@github-actions github-actions bot added 6.topic: kernel The Linux kernel 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels May 4, 2025
@nix-owners
Copy link

nix-owners bot commented May 4, 2025

The PR's base branch is set to staging, but 31 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto 6964385fafab99f685d9017affee6235eb9a0d02 86de8da5c386a55fb0996d4f010b25548e28d737
git push --force-with-lease

@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: kernel The Linux kernel 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels May 4, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 4, 2025
@pbsds
Copy link
Member

pbsds commented May 5, 2025

image
over 1500 successful rebuilds so far, with no regressions, LGTM

@nadiaholmquist nadiaholmquist mentioned this pull request May 5, 2025
Closed
13 tasks
@grimmauld-bot
Copy link

grimmauld-bot commented May 5, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 404228 --package-regex ffmpeg|(sdl.*)|(SDL.*)

aarch64-linux

✅ 84 packages built:
  • SDL (SDL_compat)
  • SDL2 (sdl2-compat)
  • SDL2.dev (sdl2-compat.dev)
  • SDL2_Pango
  • SDL2_Pango.dev
  • SDL2_classic_mixer
  • SDL2_classic_mixer.dev
  • SDL2_classic_mixer_2_0
  • SDL2_classic_mixer_2_0.dev
  • SDL2_gfx
  • SDL2_gfx.dev
  • SDL2_image
  • SDL2_mixer
  • SDL2_mixer.dev
  • SDL2_mixer_2_0
  • SDL2_mixer_2_0.dev
  • SDL2_net
  • SDL2_net.dev
  • SDL2_sound
  • SDL2_ttf
  • SDL_Pango
  • SDL_audiolib
  • SDL_gfx
  • SDL_image
  • SDL_image.dev
  • SDL_mixer
  • SDL_mixer.dev
  • SDL_net
  • SDL_sound
  • SDL_stretch
  • SDL_ttf
  • ffmpeg (ffmpeg_7)
  • ffmpeg-full (ffmpeg_7-full)
  • ffmpeg-full.bin (ffmpeg_7-full.bin)
  • ffmpeg-full.data (ffmpeg_7-full.data)
  • ffmpeg-full.dev (ffmpeg_7-full.dev)
  • ffmpeg-full.doc (ffmpeg_7-full.doc)
  • ffmpeg-full.lib (ffmpeg_7-full.lib)
  • ffmpeg-full.man (ffmpeg_7-full.man)
  • ffmpeg-normalize
  • ffmpeg-normalize.dist
  • ffmpeg.bin (ffmpeg_7.bin)
  • ffmpeg.data (ffmpeg_7.data)
  • ffmpeg.dev (ffmpeg_7.dev)
  • ffmpeg.doc (ffmpeg_7.doc)
  • ffmpeg.lib (ffmpeg_7.lib)
  • ffmpeg.man (ffmpeg_7.man)
  • ffmpeg_4
  • ffmpeg_4-full
  • ffmpeg_4-full.bin
  • ffmpeg_4-full.data
  • ffmpeg_4-full.dev
  • ffmpeg_4-full.doc
  • ffmpeg_4-full.lib
  • ffmpeg_4-full.man
  • ffmpeg_4.bin
  • ffmpeg_4.data
  • ffmpeg_4.dev
  • ffmpeg_4.doc
  • ffmpeg_4.lib
  • ffmpeg_4.man
  • ffmpeg_6
  • ffmpeg_6-full
  • ffmpeg_6-full.bin
  • ffmpeg_6-full.data
  • ffmpeg_6-full.dev
  • ffmpeg_6-full.doc
  • ffmpeg_6-full.lib
  • ffmpeg_6-full.man
  • ffmpeg_6.bin
  • ffmpeg_6.data
  • ffmpeg_6.dev
  • ffmpeg_6.doc
  • ffmpeg_6.lib
  • ffmpeg_6.man
  • sdl-jstest
  • sdl3
  • sdl3-image
  • sdl3-image.dev
  • sdl3-image.lib
  • sdl3-ttf
  • sdl3.dev
  • sdl3.lib
  • sdlpop

LordGrimmauld
LordGrimmauld approved these changes May 5, 2025
View reviewed changes
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.

ffmpeg and all the SDLs do still build, this lgtm

marcin-serwin
marcin-serwin approved these changes May 5, 2025
View reviewed changes
pkgs/by-name/sd/sdl2-compat/package.nix Outdated
Copy link
Contributor

@marcin-serwin marcin-serwin May 5, 2025

Choose a reason for hiding this comment

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

Is this actually used by something?

Copy link
Member Author

@kylerisse kylerisse May 5, 2025

Choose a reason for hiding this comment

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

I added it to resolve this error https://github.com/NixOS/nixpkgs/runs/41618542753 but this PR was still targetting master at the time, so I am unsure.

Copy link
Contributor

@LordGrimmauld LordGrimmauld May 5, 2025

Choose a reason for hiding this comment

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

I added it to resolve this error https://github.com/NixOS/nixpkgs/runs/41618542753 but this PR was still targetting master at the time, so I am unsure.

Should have been fixed in #395227

Copy link
Member Author

@kylerisse kylerisse May 5, 2025

Choose a reason for hiding this comment

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

I'll remove it

@grimmauld-bot
Copy link

grimmauld-bot commented May 5, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 404228 --package-regex ffmpeg|(sdl.*)|(SDL.*)

aarch64-linux

✅ 84 packages built:
  • SDL (SDL_compat)
  • SDL2 (sdl2-compat)
  • SDL2.dev (sdl2-compat.dev)
  • SDL2_Pango
  • SDL2_Pango.dev
  • SDL2_classic_mixer
  • SDL2_classic_mixer.dev
  • SDL2_classic_mixer_2_0
  • SDL2_classic_mixer_2_0.dev
  • SDL2_gfx
  • SDL2_gfx.dev
  • SDL2_image
  • SDL2_mixer
  • SDL2_mixer.dev
  • SDL2_mixer_2_0
  • SDL2_mixer_2_0.dev
  • SDL2_net
  • SDL2_net.dev
  • SDL2_sound
  • SDL2_ttf
  • SDL_Pango
  • SDL_audiolib
  • SDL_gfx
  • SDL_image
  • SDL_image.dev
  • SDL_mixer
  • SDL_mixer.dev
  • SDL_net
  • SDL_sound
  • SDL_stretch
  • SDL_ttf
  • ffmpeg (ffmpeg_7)
  • ffmpeg-full (ffmpeg_7-full)
  • ffmpeg-full.bin (ffmpeg_7-full.bin)
  • ffmpeg-full.data (ffmpeg_7-full.data)
  • ffmpeg-full.dev (ffmpeg_7-full.dev)
  • ffmpeg-full.doc (ffmpeg_7-full.doc)
  • ffmpeg-full.lib (ffmpeg_7-full.lib)
  • ffmpeg-full.man (ffmpeg_7-full.man)
  • ffmpeg-normalize
  • ffmpeg-normalize.dist
  • ffmpeg.bin (ffmpeg_7.bin)
  • ffmpeg.data (ffmpeg_7.data)
  • ffmpeg.dev (ffmpeg_7.dev)
  • ffmpeg.doc (ffmpeg_7.doc)
  • ffmpeg.lib (ffmpeg_7.lib)
  • ffmpeg.man (ffmpeg_7.man)
  • ffmpeg_4
  • ffmpeg_4-full
  • ffmpeg_4-full.bin
  • ffmpeg_4-full.data
  • ffmpeg_4-full.dev
  • ffmpeg_4-full.doc
  • ffmpeg_4-full.lib
  • ffmpeg_4-full.man
  • ffmpeg_4.bin
  • ffmpeg_4.data
  • ffmpeg_4.dev
  • ffmpeg_4.doc
  • ffmpeg_4.lib
  • ffmpeg_4.man
  • ffmpeg_6
  • ffmpeg_6-full
  • ffmpeg_6-full.bin
  • ffmpeg_6-full.data
  • ffmpeg_6-full.dev
  • ffmpeg_6-full.doc
  • ffmpeg_6-full.lib
  • ffmpeg_6-full.man
  • ffmpeg_6.bin
  • ffmpeg_6.data
  • ffmpeg_6.dev
  • ffmpeg_6.doc
  • ffmpeg_6.lib
  • ffmpeg_6.man
  • sdl-jstest
  • sdl3
  • sdl3-image
  • sdl3-image.dev
  • sdl3-image.lib
  • sdl3-ttf
  • sdl3.dev
  • sdl3.lib
  • sdlpop

@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: 3+ This PR was reviewed and approved by three or more persons. labels May 5, 2025
@pbsds pbsds merged commit f6e130f into NixOS:staging May 5, 2025
27 of 29 checks passed
@Rhys-T Rhys-T mentioned this pull request May 6, 2025
Closed
3 tasks
@ixhbinphoenix ixhbinphoenix mentioned this pull request May 7, 2025
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pbsds pbsds pbsds approved these changes

@marcin-serwin marcin-serwin marcin-serwin approved these changes

@LordGrimmauld LordGrimmauld LordGrimmauld approved these changes

@getchoo getchoo Awaiting requested review from getchoo

+1 more reviewer

@nadiaholmquist nadiaholmquist nadiaholmquist approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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: 3+ This PR was reviewed and approved by three or more 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@kylerisse @pbsds @grimmauld-bot @nadiaholmquist @marcin-serwin @LordGrimmauld @wegank