From 9d035c1db1f66b5ec1ee0a361f4dfc10ee1df206 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:25:39 +0100
Subject: [PATCH 1/4] metabase: migrate to by-name

---
 .../metabase/default.nix => by-name/me/metabase/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{servers/metabase/default.nix => by-name/me/metabase/package.nix} (100%)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/by-name/me/metabase/package.nix
similarity index 100%
rename from pkgs/servers/metabase/default.nix
rename to pkgs/by-name/me/metabase/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01cee5c744ab..9af2936b224b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2618,10 +2618,6 @@ with pkgs;
           throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."
       );
 
-  metabase = callPackage ../servers/metabase {
-    jdk11 = jdk11_headless;
-  };
-
   mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
 
   mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });

From 19356993bd0755a9b95a40468605270f632fbf73 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:29:07 +0100
Subject: [PATCH 2/4] metabase: modernize

---
 pkgs/by-name/me/metabase/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index d6cac37c3e2d..0ccd46c00454 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -3,16 +3,19 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jdk11,
+  jdk11_headless,
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+let
+  jdk11 = jdk11_headless;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
   version = "0.52.8";
 
   src = fetchurl {
-    url = "https://downloads.metabase.com/v${version}/metabase.jar";
+    url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
     hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";
   };
 
@@ -22,12 +25,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src"
+    makeWrapper ${lib.getExe jdk11} $out/bin/metabase --add-flags "-jar $src"
     runHook postInstall
   '';
 
   meta = with lib; {
-    description = "Easy, open source way for everyone in your company to ask questions and learn from data";
+    description = "Business Intelligence and Embedded Analytics tool";
     homepage = "https://metabase.com";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.agpl3Only;
@@ -42,4 +45,4 @@ stdenv.mkDerivation rec {
   passthru.tests = {
     inherit (nixosTests) metabase;
   };
-}
+})

From f7907c177e54006c2e80aefe7c704d233eb1bd1b Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:41:26 +0100
Subject: [PATCH 3/4] metabase: switch to jre from jdk11_headless

---
 pkgs/by-name/me/metabase/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index 0ccd46c00454..6510f0dda84d 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jdk11_headless,
+  jre_headless,
   nixosTests,
 }:
 
 let
-  jdk11 = jdk11_headless;
+  jre = jre_headless;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    makeWrapper ${lib.getExe jdk11} $out/bin/metabase --add-flags "-jar $src"
+    makeWrapper ${lib.getExe jre} $out/bin/metabase --add-flags "-jar $src"
     runHook postInstall
   '';
 

From d8187600ca4bbf5bc61c33728616bda4337acf33 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 12 Mar 2025 19:43:20 +0100
Subject: [PATCH 4/4] metabase: 0.52.8 -> 0.54.1

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

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index 6510f0dda84d..1a7af0ffce8f 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
-  version = "0.52.8";
+  version = "0.54.1";
 
   src = fetchurl {
     url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
-    hash = "sha256-Z14BuKaSAMzlgdtqppc/3ItCxVZwE4E1EQUVMVR6JwQ=";
+    hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];