bluemap: move module and package, expose through flake, bekkalokk/bluemap: use correct package version

flake.nix

@@ -137,6 +137,7 @@
         ];
         modules = [
           inputs.pvv-nettsiden.nixosModules.default
+          self.nixosModules.bluemap
         ];
       };
       ildkule = stableNixosConfig "ildkule" { };
@@ -193,6 +194,7 @@
     }));
 
     nixosModules = {
+      bluemap = ./modules/bluemap.nix;
       snakeoil-certs = ./modules/snakeoil-certs.nix;
       snappymail = ./modules/snappymail.nix;
       robots-txt = ./modules/robots-txt.nix;

hosts/bekkalokk/configuration.nix

@@ -6,7 +6,7 @@
     (fp /base)
     (fp /misc/metrics-exporters.nix)
 
-    ./services/bluemap/default.nix
+    ./services/bluemap.nix
     ./services/idp-simplesamlphp
     ./services/kerberos.nix
     ./services/mediawiki

hosts/bekkalokk/services/bluemap.nix

@@ -3,10 +3,7 @@ let
   vanillaSurvival = "/var/lib/bluemap/vanilla_survival_world";
   format = pkgs.formats.hocon { };
 in {
-  imports = [
+  # NOTE: our versino of the module gets added in flake.nix
-    ./module.nix # From danio, pending upstreaming
-  ];
-
   disabledModules = [ "services/web-apps/bluemap.nix" ];
 
   sops.secrets."bluemap/ssh-key" = { };
@@ -14,7 +11,6 @@ in {
 
   services.bluemap = {
     enable = true;
-    package = pkgs.callPackage ./package.nix { };
 
     eula = true;
     onCalendar = "*-*-* 05:45:00"; # a little over an hour after auto-upgrade
@@ -90,7 +86,6 @@ in {
     forceSSL = true;
   };
 
-  # TODO: render somewhere else lmao
   systemd.services."render-bluemap-maps" = {
     preStart = ''
       mkdir -p /var/lib/bluemap/world

hosts/bekkalokk/services/bluemap/package.nix

@@ -1,30 +0,0 @@
-{ lib, stdenvNoCC, fetchurl, makeWrapper, jre }:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "bluemap";
-  version = "5.7";
-
-  src = fetchurl {
-    url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-8udZYJgrr4bi2mjRYrASd8JwUoUVZW1tZpOLRgafAIw=";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    runHook preInstall
-    makeWrapper ${jre}/bin/java $out/bin/bluemap --add-flags "-jar $src"
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "3D minecraft map renderer";
-    homepage = "https://bluemap.bluecolored.de/";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dandellion h7x4 ];
-    mainProgram = "bluemap";
-  };
-}