about summary refs log tree commit diff
path: root/users/sterni/machines
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-03-20T13·57+0100
committerclbot <clbot@tvl.fyi>2023-03-21T15·31+0000
commit6a8afb578c101e258dbca3db6a1d4a476d190af8 (patch)
tree0f4865b1bfbd031d8aac28a86e89e6fd0076d034 /users/sterni/machines
parent3c7be2b361a283b8ffe48bfb1040dee7c68a4438 (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/machines')
-rw-r--r--users/sterni/machines/edwin/minecraft.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/users/sterni/machines/edwin/minecraft.nix b/users/sterni/machines/edwin/minecraft.nix
index 0ba0cda25451..b82e729a67c4 100644
--- a/users/sterni/machines/edwin/minecraft.nix
+++ b/users/sterni/machines/edwin/minecraft.nix
@@ -2,13 +2,13 @@
 
 let
   carpet = pkgs.fetchurl {
-    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.56/fabric-carpet-1.18-1.4.56+v211130.jar";
-    sha256 = "0rvl2yb8xymla8c052j07gqkqfkz4h5pxf6aip2v9v0h8r84p9hf";
+    url = "https://github.com/gnembon/fabric-carpet/releases/download/1.4.69/fabric-carpet-1.18.2-1.4.69+v220331.jar";
+    sha256 = "0rg21myrcfaapc77582zxq89rrfnwibzbik3nvfmrjcdhirrn2zy";
   };
 
   carpet-extra = pkgs.fetchurl {
-    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.56/carpet-extra-1.18-1.4.56.jar";
-    sha256 = "16d8szz13wh5344d61sf0f3f7aj3qa35c6jrbd68krf3srpqfa4x";
+    url = "https://github.com/gnembon/carpet-extra/releases/download/1.4.72/carpet-extra-1.18.2-1.4.72.jar";
+    sha256 = "1vd5z5zw26jkfzdwj81xcmaa5rdi4gdsq8ii0533gbn5gqlmngas";
   };
 
   userGroup = "minecraft";
@@ -67,7 +67,7 @@ in
     services.minecraft-fabric-server = {
       creative = {
         enable = true;
-        version = "1.18";
+        version = "1.18.2";
         mods = [
           carpet
           carpet-extra
@@ -93,7 +93,7 @@ in
 
       carpet = {
         enable = true;
-        version = "1.18";
+        version = "1.18.2";
         mods = [
           carpet
           carpet-extra