Skip to content

SDL2_classic: 2.32.2 -> 2.32.4#398067

Merged
K900 merged 1 commit intoNixOS:masterfrom
trofi:SDL2_classic-update
Apr 18, 2025
Merged

SDL2_classic: 2.32.2 -> 2.32.4#398067
K900 merged 1 commit intoNixOS:masterfrom
trofi:SDL2_classic-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Apr 12, 2025 •
edited
Loading

Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.32.4

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: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 12, 2025
@trofi trofi force-pushed the SDL2_classic-update branch from ab9cd6a to 2e9a0fe Compare April 12, 2025 21:01
LordGrimmauld
LordGrimmauld reviewed Apr 17, 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.

This doesn't need to go to staging anymore. Also, CI complains about your formatting, please fix.

pkgs/by-name/sd/SDL2_classic/package.nix Outdated
Copy link
Contributor

@LordGrimmauld LordGrimmauld Apr 17, 2025

Choose a reason for hiding this comment

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

you probably only intended to drop the commit that is now included in the release, not the header patch? Otherwise, please also remove the header patch file.

Copy link
Contributor Author

@trofi trofi Apr 17, 2025

Choose a reason for hiding this comment

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

Dropped by accident. Restored.

@trofi trofi force-pushed the SDL2_classic-update branch from 2e9a0fe to 560e625 Compare April 17, 2025 18:49
@trofi trofi changed the base branch from staging to master April 17, 2025 18:50
@trofi
Copy link
Contributor Author

trofi commented Apr 17, 2025

This doesn't need to go to staging anymore.

Good point. Switched to master.

Also, CI complains about your formatting, please fix.

Looking at the failure I thing the failure is unrelated to SDL2_classic changes but is related to something called playwright:

--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -80,7 +80,7 @@ let
         hash = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds=";
       };
       postPatch = "";
-      patches = [];
+      patches = [ ];
     }
   );

Rebased against a newer merge base hoping it was fixed since.

@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Apr 17, 2025

Commit message/PR title is inaccurate, old version was 2.32.2

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Apr 17, 2025
LordGrimmauld
LordGrimmauld approved these changes Apr 17, 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.

I checked upstream diff, looks fine.
Running nixpkgs-review rn, but apart from the commit message inaccuracy this lgtm.

@grimmauld-bot
Copy link

grimmauld-bot commented Apr 17, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 398067

aarch64-linux

⏩ 2 packages marked as broken and skipped:
  • python312Packages.torchrl
  • python312Packages.torchrl.dist
❌ 11 packages failed to build:
  • easyabc
  • python312Packages.ale-py
  • python312Packages.ale-py.dist
  • python312Packages.pytmx
  • python312Packages.pytmx.dist
  • python312Packages.shimmy
  • python312Packages.shimmy.dist
  • python312Packages.stable-baselines3
  • python312Packages.stable-baselines3.dist
  • python313Packages.pytmx
  • python313Packages.pytmx.dist
✅ 54 packages built:
  • SDL2_classic
  • SDL2_classic.dev
  • _20kly
  • brutalmaze
  • brutalmaze.dist
  • devilutionx
  • drum-machine
  • endgame-singularity
  • endgame-singularity.dist
  • frescobaldi
  • frescobaldi.dist
  • minari (python312Packages.minari)
  • minari.dist (python312Packages.minari.dist)
  • moonlight-qt
  • pysolfc
  • pysolfc.dist
  • python312Packages.baselines
  • python312Packages.baselines.dist
  • python312Packages.brax
  • python312Packages.brax.dist
  • python312Packages.bsuite
  • python312Packages.bsuite.dist
  • python312Packages.gym
  • python312Packages.gym.dist
  • python312Packages.gymnasium
  • python312Packages.gymnasium.dist
  • python312Packages.pettingzoo
  • python312Packages.pettingzoo.dist
  • python312Packages.pyautogui
  • python312Packages.pyautogui.dist
  • python312Packages.pygame
  • python312Packages.pygame.dist
  • python312Packages.pygetwindow
  • python312Packages.pygetwindow.dist
  • python312Packages.pyrect
  • python312Packages.pyrect.dist
  • python312Packages.skrl
  • python312Packages.skrl.dist
  • python312Packages.tianshou
  • python312Packages.tianshou.dist
  • python313Packages.bsuite
  • python313Packages.bsuite.dist
  • python313Packages.gym
  • python313Packages.gym.dist
  • python313Packages.pyautogui
  • python313Packages.pyautogui.dist
  • python313Packages.pygame
  • python313Packages.pygame.dist
  • python313Packages.pygetwindow
  • python313Packages.pygetwindow.dist
  • python313Packages.pyrect
  • python313Packages.pyrect.dist
  • theforceengine
  • video2midi

@trofi trofi force-pushed the SDL2_classic-update branch from 560e625 to 35eaead Compare April 17, 2025 19:16
@trofi trofi changed the title SDL2_classic: 2.32.3 -> 2.32.4 SDL2_classic: 2.32.2 -> 2.32.4 Apr 17, 2025
@trofi
Copy link
Contributor Author

trofi commented Apr 17, 2025

Fixed commit/PR descriptions to mention 2.32.2 source version.

LordGrimmauld
LordGrimmauld approved these changes Apr 17, 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.

Most of the failing python things are broken on master until #395688

This here looks fine to me, thanks

@K900 K900 merged commit f6d64ee into NixOS:master Apr 18, 2025
31 of 35 checks passed
@trofi trofi deleted the SDL2_classic-update branch April 18, 2025 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LordGrimmauld LordGrimmauld LordGrimmauld approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@trofi @LordGrimmauld @grimmauld-bot @K900