Skip to content

SDL2_image_2_0: drop#400338

Merged
K900 merged 5 commits intoNixOS:masterfrom
marcin-serwin:push-mwqlmoqwwlvp
Apr 21, 2025
Merged

SDL2_image_2_0: drop#400338
K900 merged 5 commits intoNixOS:masterfrom
marcin-serwin:push-mwqlmoqwwlvp

Conversation

@marcin-serwin
Copy link
Contributor

@marcin-serwin marcin-serwin commented Apr 20, 2025

This version was pinned due to pygame and pygame-ce. It turns out that it was only due to the fact that newer versions changed defaults from libpng/libjpeg to STB backend. After adding the option to build the SDL2_image with these libs, both of them can be built with the newest version of SDL2_image.

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 20, 2025
@nix-owners nix-owners bot requested a review from natsukium April 20, 2025 14:05
@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 20, 2025
@nix-owners nix-owners bot requested review from emilytrau and pbsds April 20, 2025 14:11
@LordGrimmauld
Copy link
Contributor

LordGrimmauld commented Apr 20, 2025

@GaetanLepage i remember you having issues with pygame on darwin, re pygame/pygame#4486 / #399467

While i don't expect this to fix itself, do you mind trying again with this PR? Probably won't work, but worth a shot.

@GaetanLepage
Copy link
Contributor

@GaetanLepage i remember you having issues with pygame on darwin, re pygame/pygame#4486 / #399467

While i don't expect this to fix itself, do you mind trying again with this PR? Probably won't work, but worth a shot.

Thanks for the heads up!
Unfortunately, I still get the same segfaults in some tests :/

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.

Some minor things, like putting an alias and messed up line ordering.
Thanks for working on this!

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
## Darwin headless will hang when trying to run the SDL test program
enableSTB ? true,
enableSTB ? true,
## Darwin headless will hang when trying to run the SDL test program

This is confusing ordering

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Copy link
Contributor

Choose a reason for hiding this comment

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

Foundation can be dropped, see also #398707

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for dropping this! This should however get an entry in pkgs/top-level/aliases.nix

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added

Comment on lines 43 to 44
Copy link
Contributor

Choose a reason for hiding this comment

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

While we are here: libXpm and giflib are being flagged by my nix-check-deps tool - are they actually required?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I couldn't find any usage of them, removed.

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.

Diff looks good to me, running nixpkgs-review now

@grimmauld-bot
Copy link

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 400338


aarch64-linux

⏩ 5 packages marked as broken and skipped:
  • cables
  • fspy
  • openspades
  • python312Packages.torchrl
  • python312Packages.torchrl.dist
❌ 12 packages failed to build:
  • assaultcube
  • colobot
  • commandergenius
  • easyabc
  • freeciv_sdl2
  • frogatto
  • klystrack
  • koboredux
  • lincity_ng
  • mpd-touch-screen-gui
  • python313Packages.guestfs
  • python313Packages.guestfs.dist
✅ 275 packages built:
  • OVMFFull
  • OVMFFull.fd
  • SDL2_image
  • _20kly
  • abbaye-des-morts
  • alephone
  • alephone.icons
  • amiberry
  • appimage-run
  • archipelago
  • archipelago-minecraft
  • blobby
  • blobwars
  • blockattack
  • blockattack.man
  • brogue-ce
  • brutalmaze
  • brutalmaze.dist
  • brutespray
  • buckets
  • budgie-control-center
  • budgie-control-center.debug
  • cataclysm-dda
  • cataclysm-dda-git
  • cdogs-sdl
  • chickenPackages_5.chickenEggs.sdl2-image
  • chromium-bsu
  • code-cursor
  • colima
  • cot (python312Packages.cot)
  • cot.dist (python312Packages.cot.dist)
  • crawlTiles
  • crowbar
  • crowbar.dist
  • dbgate
  • debos
  • decker
  • deskreen
  • devilutionx
  • domino-chain
  • doomretro
  • dosbox-staging
  • dosbox-staging.man
  • dreamchess
  • drum-machine
  • dsda-doom
  • dxx-rebirth
  • endgame-singularity
  • endgame-singularity.dist
  • enigma
  • fflogs
  • fheroes2
  • flare
  • flex-launcher
  • freeciv (freeciv_gtk)
  • freeciv_qt
  • freenukum
  • freerdp
  • frescobaldi
  • frescobaldi.dist
  • gearlever
  • gnome-connections
  • gnome-control-center
  • gnome-control-center.debug
  • gnome-remote-desktop
  • goldboot
  • gource
  • gtk-frdp
  • guile-chickadee
  • guile-sdl2
  • hamrs
  • hamrs-pro
  • hedgewars
  • hikounomizu
  • httpie-desktop
  • hydralauncher
  • hypseus-singe
  • immersed
  • infra-arcana
  • instead
  • jetbrains-toolbox
  • kata-runtime
  • katawa-shoujo-re-engineered
  • kdePackages.krdc
  • kdePackages.krdc.debug
  • kdePackages.krdc.dev
  • kdePackages.krdc.devtools
  • kdePackages.krdp
  • kdePackages.krdp.debug
  • kdePackages.krdp.dev
  • kdePackages.krdp.devtools
  • koboredux-free
  • lbreakouthd
  • libguestfs
  • libguestfs.guestfsd
  • libresprite
  • libsForQt5.krdc (plasma5Packages.krdc)
  • libwtk-sdl2
  • libwtk-sdl2.dev
  • libwtk-sdl2.lib
  • lima
  • lima-bin
  • linthesia
  • liquidsoap
  • logstalgia
  • lpairs2
  • ltris
  • lxd-lts
  • manaplus
  • medusa
  • medusa.man
  • mepo
  • minari (python312Packages.minari)
  • minari.dist (python312Packages.minari.dist)
  • mochi
  • mqttx
  • naev
  • narsil
  • navicat-premium
  • nemu
  • nsz (python312Packages.nsz)
  • nsz.dist (python312Packages.nsz.dist)
  • open-interpreter (python312Packages.open-interpreter)
  • open-interpreter.dist (python312Packages.open-interpreter.dist)
  • opendune
  • openmsx
  • out-of-tree
  • p3x-onenote
  • parsify
  • phosh
  • phosh-mobile-settings
  • picoloop
  • pinball
  • pingus
  • prboom-plus
  • principia
  • pysolfc
  • pysolfc.dist
  • python312Packages.ale-py
  • python312Packages.ale-py.dist
  • python312Packages.baselines
  • python312Packages.baselines.dist
  • python312Packages.brax
  • python312Packages.brax.dist
  • python312Packages.bsuite
  • python312Packages.bsuite.dist
  • python312Packages.guestfs
  • python312Packages.guestfs.dist
  • python312Packages.gym
  • python312Packages.gym.dist
  • python312Packages.gymnasium
  • python312Packages.gymnasium.dist
  • python312Packages.kivy
  • python312Packages.kivy-garden-modernmenu
  • python312Packages.kivy-garden-modernmenu.dist
  • python312Packages.kivy.dist
  • python312Packages.pettingzoo
  • python312Packages.pettingzoo.dist
  • python312Packages.pyautogui
  • python312Packages.pyautogui.dist
  • python312Packages.pygame
  • python312Packages.pygame-ce
  • python312Packages.pygame-ce.dist
  • python312Packages.pygame-gui
  • python312Packages.pygame-gui.dist
  • python312Packages.pygame-sdl2
  • python312Packages.pygame-sdl2.dist
  • python312Packages.pygame.dist
  • python312Packages.pygetwindow
  • python312Packages.pygetwindow.dist
  • python312Packages.pyrect
  • python312Packages.pyrect.dist
  • python312Packages.pysdl2
  • python312Packages.pysdl2.dist
  • python312Packages.pytmx
  • python312Packages.pytmx.dist
  • python312Packages.shimmy
  • python312Packages.shimmy.dist
  • python312Packages.skrl
  • python312Packages.skrl.dist
  • python312Packages.stable-baselines3
  • python312Packages.stable-baselines3.dist
  • python312Packages.tianshou
  • python312Packages.tianshou.dist
  • python312Packages.vulkan
  • python312Packages.vulkan.dist
  • python313Packages.bsuite
  • python313Packages.bsuite.dist
  • python313Packages.cot
  • python313Packages.cot.dist
  • python313Packages.gym
  • python313Packages.gym.dist
  • python313Packages.kivy
  • python313Packages.kivy-garden-modernmenu
  • python313Packages.kivy-garden-modernmenu.dist
  • python313Packages.kivy.dist
  • python313Packages.nsz
  • python313Packages.nsz.dist
  • python313Packages.open-interpreter
  • python313Packages.open-interpreter.dist
  • python313Packages.pyautogui
  • python313Packages.pyautogui.dist
  • python313Packages.pygame
  • python313Packages.pygame-ce
  • python313Packages.pygame-ce.dist
  • python313Packages.pygame-gui
  • python313Packages.pygame-gui.dist
  • python313Packages.pygame-sdl2
  • python313Packages.pygame-sdl2.dist
  • python313Packages.pygame.dist
  • python313Packages.pygetwindow
  • python313Packages.pygetwindow.dist
  • python313Packages.pyrect
  • python313Packages.pyrect.dist
  • python313Packages.pysdl2
  • python313Packages.pysdl2.dist
  • python313Packages.pytmx
  • python313Packages.pytmx.dist
  • python313Packages.vulkan
  • python313Packages.vulkan.dist
  • qemu
  • qemu.doc
  • qemu.ga
  • qemu_full
  • qemu_full.doc
  • qemu_full.ga
  • qemu_kvm
  • qemu_kvm.doc
  • qemu_kvm.ga
  • qtemu
  • quickemu
  • remmina
  • renpy
  • requestly
  • retrofe
  • rkboot
  • rocksndiamonds
  • sdlpop
  • solarus
  • solarus-quest-editor
  • solarus.dev
  • solarus.lib
  • status-im
  • steamos-devkit
  • steamos-devkit.dist
  • superTux
  • supermariowar
  • tamatool
  • tauon
  • tauon.dist
  • the-legend-of-edgar
  • theforceengine
  • toppler
  • trackballs
  • trezor-suite
  • trigger
  • tuxpaint
  • ultrastardx
  • upscaler
  • vagrant
  • vcmi
  • vdrift-bin
  • video2midi
  • virt-manager-qt
  • vmctl
  • vrcx
  • wargus
  • wesnoth (wesnoth-dev)
  • weston
  • wootility
  • xemu
  • xemu.debug
  • xlights
  • xwayland-run
  • xwayland-run.man

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 20, 2025
@marcin-serwin
Copy link
Contributor Author

All the failing packages also fail to build for me on master so the failures are likely unrelated.

@LordGrimmauld LordGrimmauld requested a review from K900 April 21, 2025 06:54
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM

@K900 K900 merged commit 871b355 into NixOS:master Apr 21, 2025
25 of 28 checks passed
@marcin-serwin marcin-serwin deleted the push-mwqlmoqwwlvp branch May 22, 2025 15:36
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: 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. 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.

7 participants