minecraftServers: init - move all minecraft-server versions into minecraftServers

authored by Joel and committed by tomberek b254d2b1 e0843a80

+9 -25
+7 -6
pkgs/games/minecraft-server/default.nix pkgs/games/minecraft-servers/default.nix
··· 1 1 { callPackage, lib, javaPackages }: 2 - # if you add more versions make sure to add to all-packages.nix 3 2 let 4 3 versions = lib.importJSON ./versions.json; 5 4 6 5 latestVersion = lib.last (builtins.sort lib.versionOlder (builtins.attrNames versions)); 7 - escapeVersion = builtins.replaceStrings [ "." ] [ "_" ]; 6 + escapeVersion = builtins.replaceStrings [ "." ] [ "-" ]; 8 7 9 8 getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" javaPackages.compiler).headless; 10 9 11 10 packages = lib.mapAttrs' 12 11 (version: value: { 13 - name = "minecraft-server_${escapeVersion version}"; 12 + name = "vanilla-${escapeVersion version}"; 14 13 value = callPackage ./derivation.nix { 15 14 inherit (value) version url sha1; 16 15 jre_headless = getJavaVersion (if value.javaVersion == null then 8 else value.javaVersion); # versions <= 1.6 will default to 8 ··· 18 17 }) 19 18 versions; 20 19 in 21 - packages // { 22 - minecraft-server = builtins.getAttr "minecraft-server_${escapeVersion latestVersion}" packages; 23 - } 20 + lib.recurseIntoAttrs ( 21 + packages // { 22 + vanilla = builtins.getAttr "vanilla-${escapeVersion latestVersion}" packages; 23 + } 24 + )
pkgs/games/minecraft-server/derivation.nix pkgs/games/minecraft-servers/derivation.nix
pkgs/games/minecraft-server/update.py pkgs/games/minecraft-servers/update.py
pkgs/games/minecraft-server/versions.json pkgs/games/minecraft-servers/versions.json
+2 -19
pkgs/top-level/all-packages.nix
··· 30810 30810 30811 30811 minecraft = callPackage ../games/minecraft { }; 30812 30812 30813 - inherit (import ../games/minecraft-server { inherit callPackage lib javaPackages; }) 30814 - minecraft-server_1_2 30815 - minecraft-server_1_3 30816 - minecraft-server_1_4 30817 - minecraft-server_1_5 30818 - minecraft-server_1_6 30819 - minecraft-server_1_7 30820 - minecraft-server_1_8 30821 - minecraft-server_1_9 30822 - minecraft-server_1_10 30823 - minecraft-server_1_11 30824 - minecraft-server_1_12 30825 - minecraft-server_1_13 30826 - minecraft-server_1_14 30827 - minecraft-server_1_15 30828 - minecraft-server_1_16 30829 - minecraft-server_1_17 30830 - minecraft-server_1_18 30831 - minecraft-server; 30813 + minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; 30814 + minecraft-server = minecraftServers.vanilla; # backwards compatibility 30832 30815 30833 30816 moon-buggy = callPackage ../games/moon-buggy {}; 30834 30817