diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 10f3ea319340dd..0f28e6b139f61a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -267,6 +267,8 @@ - `headscale` has been updated to version 0.23.0 which reworked large parts of the configuration, including DNS, Magic DNS prefixes and ACL policy files. See the [upstream changelog](https://github.com/juanfont/headscale/releases/tag/v0.23.0) for details. +- `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details. + - `nginx` package no longer includes the `gd` and `geoip` dependencies. To re-enable them, override `nginx` with the options `withImageFilter = true;` and `withGeoIP = true;`. - `systemd.enableUnifiedCgroupHierarchy` has been removed. diff --git a/pkgs/games/minetest/default.nix b/pkgs/by-name/lu/luanti/package.nix similarity index 85% rename from pkgs/games/minetest/default.nix rename to pkgs/by-name/lu/luanti/package.nix index ac3820097cf82a..bb078e87dc64be 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -30,11 +30,7 @@ libiconv, ninja, prometheus-cpp, - OpenGL, - OpenAL ? openal, - Carbon, - Cocoa, - Kernel, + darwin, buildClient ? true, buildServer ? true, SDL2, @@ -42,7 +38,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "minetest"; + pname = "luanti"; version = "5.10.0"; src = fetchFromGitHub { @@ -69,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share") - (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/minetest") + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/luanti") (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale") @@ -97,11 +93,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - OpenGL - OpenAL - Carbon - Cocoa - Kernel + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.OpenAL + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Kernel ] ++ lib.optionals buildClient [ libpng @@ -135,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications - mv $out/minetest.app $out/Applications + mv $out/luanti.app $out/Applications ''; doCheck = true; @@ -146,8 +142,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://minetest.net/"; - description = "Infinite-world block sandbox game"; + homepage = "https://www.luanti.org/"; + description = "An open source voxel game engine (formerly Minetest)"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ @@ -155,6 +151,6 @@ stdenv.mkDerivation (finalAttrs: { fpletz fgaz ]; - mainProgram = if buildClient then "minetest" else "minetestserver"; + mainProgram = if buildClient then "luanti" else "luantiserver"; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28319cd38a4e6d..7858a77b6656d5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -768,9 +768,12 @@ mapAliases { MIDIVisualizer = midivisualizer; # Added 2024-06-12 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 mime-types = mailcap; # Added 2022-01-21 - minetest-touch = minetestclient; # Added 2024-08-12 - minetestclient_5 = minetestclient; # Added 2023-12-11 - minetestserver_5 = minetestserver; # Added 2023-12-11 + minetest = luanti; # Added 2024-11-11 + minetestclient = luanticlient; # Added 2024-11-11 + minetestserver = luantiserver; # Added 2024-11-11 + minetest-touch = luanticlient; # Added 2024-08-12 + minetestclient_5 = luanticlient; # Added 2023-12-11 + minetestserver_5 = luantiserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44ff8fd42b6a0b..cccc6551a48b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17292,11 +17292,8 @@ with pkgs; minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraft-server = minecraftServers.vanilla; # backwards compatibility - minetest = callPackage ../games/minetest { - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; - }; - minetestclient = minetest.override { buildServer = false; }; - minetestserver = minetest.override { buildClient = false; }; + luanticlient = luanti.override { buildServer = false; }; + luantiserver = luanti.override { buildClient = false; }; mnemosyne = callPackage ../games/mnemosyne { python = python3;