diff options
| author | sterni <sternenseemann@systemli.org> | 2023-03-20T13·57+0100 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-03-21T15·31+0000 |
| commit | 6a8afb578c101e258dbca3db6a1d4a476d190af8 (patch) | |
| tree | 0f4865b1bfbd031d8aac28a86e89e6fd0076d034 /users/sterni/modules | |
| parent | 3c7be2b361a283b8ffe48bfb1040dee7c68a4438 (diff) | |
chore(sterni/machines/edwin): minecraft 1.18 -> 1.18.2 r/6034
Starting with 1.18.1 we no longer need to pass an extra flag to work around the log4j CVE, so baseJvmOpts can be empty. Change-Id: I6d6c5a366ecbb499b2e3945db81ca0a8b2e2dcbf Reviewed-on: https://cl.tvl.fyi/c/depot/+/8332 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Autosubmit: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'users/sterni/modules')
| -rw-r--r-- | users/sterni/modules/minecraft-fabric.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix index c599d6c04282..716d8fae0aec 100644 --- a/users/sterni/modules/minecraft-fabric.nix +++ b/users/sterni/modules/minecraft-fabric.nix @@ -107,6 +107,18 @@ let "-Dlog4j2.formatMsgNoLookups=true" ]; }; + "1.18.1" = fetchJar { + pname = "server"; + version = "1.18.1"; + url = "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar"; + sha256 = "1pyvym6xzjb1siizzj4ma7lpb05qhgxnzps8lmlbk00lv0515kgb"; + }; + "1.18.2" = fetchJar { + pname = "server"; + version = "1.18.2"; + url = "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar"; + sha256 = "0hx330bnadixph44sip0h5h986m11qxbdba6lbgwz4da6lg9vgjp"; + }; }; # @@ -245,7 +257,7 @@ let # the actual shutdown in the stop script without relying on $MAINPID. exec "${bins.flock}" "''${RUNTIME_DIRECTORY}" \ "${bins.java}" \ - ${lib.escapeShellArgs (serverJar.baseJvmOpts ++ instanceCfg.jvmOpts)} \ + ${lib.escapeShellArgs (serverJar.baseJvmOpts or [ ] ++ instanceCfg.jvmOpts)} \ -jar fabric-server-launch.jar nogui ''; |