From 5d04dcf4f50fc9cdf6581f0dd555acf99ab086a4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 27 Jun 2019 10:50:47 +0200 Subject: [PATCH] minecraft-server: 1.14 -> 1.14.3 Also removes older versions. --- pkgs/games/minecraft-server/default.nix | 77 +++++++++---------------- pkgs/top-level/all-packages.nix | 7 +-- 2 files changed, 28 insertions(+), 56 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index cc91d867f1d8..0210fdd055ad 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,57 +1,34 @@ { stdenv, fetchurl, jre }: +stdenv.mkDerivation rec { + name = "minecraft-server-${version}"; + version = "1.14.3"; -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_14 = common { - version = "1.14"; - url = "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar"; - sha256 = "671e3d334dd601c520bf1aeb96e49038145172bef16bc6c418e969fd8bf8ff6c"; + src = fetchurl { + url = "https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar"; + sha256 = "0f0v0kqz2v5758551yji1vj6xf43lvbma30v3crz4h7cpzq5c8ll"; }; - minecraft-server_1_13_2 = common { - version = "1.13.2"; - url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; - sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; - }; + preferLocalBuild = true; - 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"; - }; + 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]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ff4c5c3b89a..bed4577ff034 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21661,12 +21661,7 @@ in minecraft = callPackage ../games/minecraft { }; - minecraft-server = minecraft-server_1_14; - - inherit (callPackages ../games/minecraft-server { }) - minecraft-server_1_14 - minecraft-server_1_13_2 - minecraft-server_1_12_2; + minecraft-server = callPackage ../games/minecraft-server { }; moon-buggy = callPackage ../games/moon-buggy {};