Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minetest: 5.8.0 -> 5.9.0 #334206

Merged
merged 3 commits into from
Aug 12, 2024
Merged

minetest: 5.8.0 -> 5.9.0 #334206

merged 3 commits into from
Aug 12, 2024

Conversation

sysedwinistrator
Copy link
Contributor

@sysedwinistrator sysedwinistrator commented Aug 12, 2024

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

pkgs/top-level/all-packages.nix Show resolved Hide resolved
pkgs/games/minetest/default.nix Show resolved Hide resolved
pkgs/games/minetest/default.nix Show resolved Hide resolved
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

I’ve confirmed that this starts up successfully for me on x86_64-darwin 🎉

Glad to see a Darwin Mesa dependency go away.

* remove irrlichtmt input. Minetest's irrlicht fork has been moved into
  the minetest repo and is now statically linked.
* remove mesa from buildInputs for darwin. Otherwise startup fails with
  "OpenGL driver version is not 1.2 or better." and "Shaders are enabled
  but GLSL is not supported by the driver.". Presumably that happens
  because minetest tries to use an incomplete OpenGL driver from mesa
  instead of the drivers provided by macOS.
* remove withTouchSupport arg, as the upstream CMake option has been
  removed. Touch support should now always be enabled.
* make minetest-touch an alias for minetestclient
* remove unused args
Irrlicht's SDL device (=backend) was enabled by default for the 5.9.0
pre-release, but was disabled again at the last minute before the
release due to issues reported by some users.

NOTE: the irrlicht device is a compile time option and cannot be
switched at runtime.
Copy link
Member

@fgaz fgaz left a comment

Choose a reason for hiding this comment

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

Looks good!

Works both with and without SDL2

pkgs/top-level/all-packages.nix Show resolved Hide resolved
Minetest's irrlicht fork has been moved into the minetest repo.
Copy link
Member

@fgaz fgaz left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks everyone!

@fpletz fpletz merged commit 672bdca into NixOS:master Aug 12, 2024
8 of 9 checks passed
@ofborg ofborg bot requested review from fgaz and fpletz August 12, 2024 21:50
@sysedwinistrator sysedwinistrator added the backport release-24.05 Backport PR automatically label Aug 13, 2024
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-334206-to-release-24.05 origin/release-24.05
cd .worktree/backport-334206-to-release-24.05
git switch --create backport-334206-to-release-24.05
git cherry-pick -x d61c03fe460f6349e5173e007fb2b678c33bed36 e9761ca2ae6c793ad3578444b5644bbdbcd0d607 873934134d0a0b237aa39a3ed31521d7a2df8326

@fgaz
Copy link
Member

fgaz commented Aug 13, 2024

I'm not sure a backport is appropriate. See https://dev.minetest.net/Changelog#Deprecations_and_compatibility_notes . This pr also removes a package and alters the parameters of another.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants