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 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 { diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index 02851fd5a5aa..a0bcb5135a3e 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -8,11 +8,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;