From 86783802bf4633b6cfbe62dfa46720d18e88b5b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Mar 2025 23:00:22 +0000
Subject: [PATCH 1/2] bluemap: 5.4 -> 5.7

---
 pkgs/by-name/bl/bluemap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix
index 6275295aaefd..61c135faf080 100644
--- a/pkgs/by-name/bl/bluemap/package.nix
+++ b/pkgs/by-name/bl/bluemap/package.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "bluemap";
-  version = "5.4";
+  version = "5.7";
 
   src = fetchurl {
     url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-ycgCYot3lTdkufJdOSX/PMWI2fnAWz8f5I9IWZpKppw=";
+    hash = "sha256-8udZYJgrr4bi2mjRYrASd8JwUoUVZW1tZpOLRgafAIw=";
   };
 
   dontUnpack = true;

From 5b3e5519c104052b53e7756739745b0dad4219b4 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 28 May 2025 12:58:09 +0200
Subject: [PATCH 2/2] nixos/bluemap: merge `addons` option into `packs`

Mentioned in the release notes for bluemap 5.5:

> Move all contents (if any) of bluemaps addons folder into
> bluemaps packs folder and delete the addons folder.
> (Native addons now go into the packs folder alongside resourcepacks)

https://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v5.5
---
 nixos/modules/services/web-apps/bluemap.nix | 28 ++-------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/services/web-apps/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix
index b04f7a64e75a..5829b7c3e0dd 100644
--- a/nixos/modules/services/web-apps/bluemap.nix
+++ b/nixos/modules/services/web-apps/bluemap.nix
@@ -18,10 +18,6 @@ let
     ) cfg.maps
   );
 
-  addonsFolder = pkgs.linkFarm "addons" (
-    lib.attrsets.mapAttrs' (name: value: lib.nameValuePair "${name}.jar" value) cfg.addons
-  );
-
   storageFolder = pkgs.linkFarm "storage" (
     lib.attrsets.mapAttrs' (
       name: value: lib.nameValuePair "${name}.conf" (format.generate "${name}.conf" value)
@@ -34,8 +30,7 @@ let
     "core.conf" = coreConfig;
     "webapp.conf" = webappConfig;
     "webserver.conf" = webserverConfig;
-    "packs" = pkgs.linkFarm "packs" cfg.resourcepacks;
-    "addons" = addonsFolder;
+    "packs" = pkgs.linkFarm "packs" cfg.packs;
   };
 
   inherit (lib) mkOption;
@@ -46,6 +41,7 @@ in
       [ "services" "bluemap" "resourcepacks" ]
       [ "services" "bluemap" "packs" ]
     )
+    (lib.mkRenamedOptionModule [ "services" "bluemap" "addons" ] [ "services" "bluemap" "packs" ])
   ];
 
   options.services.bluemap = {
@@ -239,26 +235,6 @@ in
       '';
     };
 
-    addons = mkOption {
-      type = lib.types.attrsOf lib.types.pathInStore;
-      default = { };
-      description = ''
-        A set of jar addons to be loaded.
-
-        See <https://bluemap.bluecolored.de/3rdPartySupport.html> for a list of officially recognized addons.
-      '';
-
-      example = lib.literalExpression ''
-        {
-          blueBridge = ./blueBridge.jar;
-          blueBorder = pkgs.fetchurl {
-            url = "https://github.com/pop4959/BlueBorder/releases/download/1.1.1/BlueBorder-1.1.1.jar";
-            hash = "...";
-          };
-        }
-      '';
-    };
-
     storage = mkOption {
       type = lib.types.attrsOf (
         lib.types.submodule {