From 9080b2eadff00772cc4d9aac3c0ec362f9d8748e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 20 Aug 2018 19:34:03 -0400 Subject: minecraft-server: 1.12.2 -> 1.13.2 Update minecraft client to 1.13.2. The url is not as nice as before but it is the one provided by mojang. Adds 1_13_2, 1_13_1 as well. https://minecraft.net/en-us/download/server --- pkgs/games/minecraft-server/default.nix | 80 ++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 27 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 050e0126fa72..c2f20f53e9a8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,37 +1,63 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { - name = "minecraft-server-${version}"; - version = "1.13.2"; - - src = fetchurl { - # Old url - # https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar +let + common = { version, sha256, url }: + stdenv.mkDerivation (rec { + name = "minecraft-server-${version}"; + inherit version; + + src = fetchurl { + inherit url sha256; + }; + + preferLocalBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/lib/minecraft + cp -v $src $out/lib/minecraft/server.jar + + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + EOF + + chmod +x $out/bin/minecraft-server + ''; + + phases = "installPhase"; + + meta = { + description = "Minecraft Server"; + homepage = "https://minecraft.net"; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + }; + }); + +in { + minecraft-server_1_13_2 = common { + version = "1.13.2"; url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; }; - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/lib/minecraft - cp -v $src $out/lib/minecraft/server.jar - - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui - EOF - - chmod +x $out/bin/minecraft-server - ''; + minecraft-server_1_13_1 = common { + version = "1.13.1"; + url = "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar"; + sha256 = "1lak29b7dm0w1cmzjn9gyix6qkszwg8xgb20hci2ki2ifrz099if"; + }; - phases = "installPhase"; + minecraft-server_1_13_0 = common { + version = "1.13.0"; + url = "https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar"; + sha256 = "1fahqnylxzbvc0fdsqk0x15z40mcc5b7shrckab1qcsdj0kkjvz7"; + }; - meta = { - description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice stdenv.lib.maintainers.tomberek ]; + minecraft-server_1_12_2 = common { + version = "1.12.2"; + url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar"; + sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; }; + } -- cgit 1.4.1