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.7.0 -> 5.8.0, cleanup #273557

Merged
merged 2 commits into from Dec 13, 2023
Merged

minetest: 5.7.0 -> 5.8.0, cleanup #273557

merged 2 commits into from Dec 13, 2023

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Dec 11, 2023

Description of changes

https://blog.minetest.net/2023/12/04/5.8.0-released/

irrlichtmt: 1.9.0mt10 -> 1.9.0mt13

  • Use finalAttrs
  • Touch support is now unconditional

minetest: 5.7.0 -> 5.8.0, cleanup

  • Inline the generic builder, since we don't build multiple versions
    anymore
  • Remove unused patches, flags, and overrides
  • Remove minetest_game, it has been debundled
  • Use finalAttrs
  • Use lib.cmake*
  • Add a top-level attribute for the touch variant
  • Define the server- and client-only variants through overrides in
    all-packages.nix
  • Move the *_5 aliases to top-level/aliases.nix
  • General cleanup

Closes #273207

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.05 Release Notes (or backporting 23.05 and 23.11 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.

* Use finalAttrs
* Touch support is now unconditional
@fgaz
Copy link
Member Author

fgaz commented Dec 11, 2023

@GrahamcOfBorg build minetestclient minetestserver minetest-touch

Comment on lines 72 to 73
(lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc")
(lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc")
Copy link
Contributor

Choose a reason for hiding this comment

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

This outputs docs to share/doc/ directly, so we get eg share/doc/README.md. We'll want to set the value to share/doc/minetest or share/doc/${finalAttrs.pname}.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@DeeUnderscore
Copy link
Contributor

Result of nixpkgs-review run on x86_64-linux 1

6 packages built:
  • irrlichtmt
  • irrlichtmt.dev
  • minetest
  • minetest-touch
  • minetestclient
  • minetestserver

* Inline the generic builder, since we don't build multiple versions
  anymore
* Remove unused patches, flags, and overrides
* Remove minetest_game, it has been debundled
* Use finalAttrs
* Use lib.cmake*
* Add a top-level attribute for the touch variant
* Define the server- and client-only variants through overrides in
  all-packages.nix
* Move the *_5 aliases to top-level/aliases.nix
* General cleanup

Closes NixOS#273207
Copy link
Contributor

@DeeUnderscore DeeUnderscore 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, thanks.

@fgaz fgaz merged commit c64ebc8 into NixOS:master Dec 13, 2023
22 of 23 checks passed
@fgaz fgaz deleted the minetest/5.8.0 branch December 13, 2023 06:45
@fpletz
Copy link
Member

fpletz commented Dec 13, 2023

Thanks for the cleanup! ❤️

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.

Update request: minetest 5.7.0 → 5.8.0
4 participants