Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/by-name/mi/minecraft-server/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ callPackage }: (callPackage ./versions.nix { }).vanilla
50 changes: 50 additions & 0 deletions pkgs/by-name/mi/minecraft-server/versions.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
lib,
javaPackages,
stdenv,
fetchurl,
nixosTests,
makeWrapper,
udev,
}:
let
versions = lib.importJSON ./versions.json;

latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions));
escapeVersion = builtins.replaceStrings [ "." ] [ "-" ];

getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless;

mkVersion = (
version: value: {
name = "vanilla-${escapeVersion version}";
value = import ./derivation.nix {
inherit
lib
stdenv
fetchurl
nixosTests
makeWrapper
udev
;
inherit (value) version url sha1;
jre_headless = getJavaVersion (
if value.javaVersion == null then
8
else if value.javaVersion == 16 then
17
else
value.javaVersion
); # versions <= 1.6 will default to 8
};
}
);

packages = lib.mapAttrs' mkVersion versions;
in
lib.recurseIntoAttrs (
packages
// {
vanilla = (mkVersion latestVersion versions.${latestVersion}).value;
}
)
34 changes: 0 additions & 34 deletions pkgs/games/minecraft-servers/default.nix

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11137,8 +11137,7 @@ with pkgs;
enableServer = true;
};

minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
minecraft-server = minecraftServers.vanilla; # backwards compatibility
minecraftServers = callPackage ../by-name/mi/minecraft-server/versions.nix { };

luanti-client = luanti.override { buildServer = false; };
luanti-server = luanti.override { buildClient = false; };
Expand Down
Loading