Commit 451ef399 authored by 06kellyjac's avatar 06kellyjac Committed by Francesco Gazzetta
Browse files

minetest: rename to luanti 

Moved to pkgs/by-name
Added and updated aliases
Added release note
parent c006b91a

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ 


- `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.



- `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.



- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.



- `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.

pkgs/games/minetest/default.nix→pkgs/by-name/lu/luanti/package.nix

+12 −16
Original line number Diff line number Diff line
@@ -31,11 +31,7 @@ 
  libiconv,

  ninja,

  prometheus-cpp,

  OpenGL,

  OpenAL ? openal,

  Carbon,

  Cocoa,

  Kernel,

  darwin,

  buildClient ? true,

  buildServer ? true,

  SDL2,
@@ -43,7 +39,7 @@ 
}:



stdenv.mkDerivation (finalAttrs: {

  pname = "minetest";

  pname = "luanti";

  version = "5.10.0";



  src = fetchFromGitHub {
@@ -85,7 +81,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")
@@ -113,11 +109,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
@@ -147,7 +143,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;
@@ -158,14 +154,14 @@ 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; [

      fpletz

      fgaz

    ];

    mainProgram = if buildClient then "minetest" else "minetestserver";

    mainProgram = if buildClient then "luanti" else "luantiserver";

  };

})

pkgs/top-level/aliases.nix

+4 −3
Original line number Diff line number Diff line
@@ -828,9 +828,10 @@ 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 = luanti-client; # Added 2024-11-11

  minetestserver = luanti-server; # Added 2024-11-11

  minetest-touch = luanti-client; # Added 2024-08-12

  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

pkgs/top-level/all-packages.nix

+2 −5
Original line number Diff line number Diff line
@@ -16773,11 +16773,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; };













  luanti-client = luanti.override { buildServer = false; };













  luanti-server = luanti.override { buildClient = false; };





























  mnemosyne = callPackage ../games/mnemosyne {















    python = python3;