Skip to content

Conversation

@LordGrimmauld
Copy link
Contributor

@LordGrimmauld LordGrimmauld commented Apr 3, 2025

pysdl2 is mostly unmaintained. However, i wanted to fix it instead of dropping it outright - we can still drop it later. Upstream fixed a couple tests with sdl2-compat, but not all tests work on sdl2-compat in our build sandbox. This is partially due to sdl2-compat not explicitly expecting an x11 display, which means it returns errors on some method calls.

This PR skips the tests that are broken with sdl2-compat, and fixes the shared object file being loaded to work properly with sdl2-compat.

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 the 6.topic: python Python is a high-level, general-purpose programming language. label Apr 3, 2025
@LordGrimmauld LordGrimmauld requested review from K900 and pmiddend April 3, 2025 07:49
@LordGrimmauld
Copy link
Contributor Author

Related: this breaks with #393386 which is currently in staging. That motivated this fix.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 3, 2025
@LordGrimmauld
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 395688


x86_64-linux

✅ 17 packages built:
  • python312Packages.pysdl2
  • python312Packages.pysdl2.dist
  • python312Packages.pytmx
  • python312Packages.pytmx.dist
  • python312Packages.vulkan
  • python312Packages.vulkan.dist
  • python313Packages.pysdl2
  • python313Packages.pysdl2.dist
  • python313Packages.pytmx
  • python313Packages.pytmx.dist
  • python313Packages.vulkan
  • python313Packages.vulkan.dist
  • steamos-devkit
  • steamos-devkit.dist
  • tauon
  • tauon.dist
  • upscaler

@grimmauld-bot
Copy link

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 395688


aarch64-linux

✅ 17 packages built:
  • python312Packages.pysdl2
  • python312Packages.pysdl2.dist
  • python312Packages.pytmx
  • python312Packages.pytmx.dist
  • python312Packages.vulkan
  • python312Packages.vulkan.dist
  • python313Packages.pysdl2
  • python313Packages.pysdl2.dist
  • python313Packages.pytmx
  • python313Packages.pytmx.dist
  • python313Packages.vulkan
  • python313Packages.vulkan.dist
  • steamos-devkit
  • steamos-devkit.dist
  • tauon
  • tauon.dist
  • upscaler

@Henry-Hiles Henry-Hiles added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 18, 2025
@K900 K900 merged commit ce3ac17 into NixOS:master Apr 18, 2025
60 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants