From 9cfb067dff0dbc8b05e8678c9fc93c21ea0d6d27 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 20 Jul 2024 10:39:15 +0200
Subject: [PATCH 1/3] h2: 2.2.224 -> 2.3.230

https://github.com/h2database/h2database/releases/tag/version-2.3.230
https://github.com/h2database/h2database/compare/version-2.2.224...version-2.3.230
---
 pkgs/servers/h2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index a083075711b8..4574a47e3096 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -2,7 +2,7 @@
 
 maven.buildMavenPackage rec {
   pname = "h2";
-  version = "2.2.224";
+  version = "2.3.230";
 
   outputs = [ "out" "doc" ];
 
@@ -10,11 +10,11 @@ maven.buildMavenPackage rec {
     owner = "h2database";
     repo = "h2database";
     rev = "refs/tags/version-${version}";
-    hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g=";
+    hash = "sha256-zF33xqsTIXSdOSqBeX/uuEdi36btn6gS/fmbxcgsSpg=";
   };
 
   mvnParameters = "-f h2/pom.xml";
-  mvnHash = "sha256-kWRwaHb9+O07/jq8tgQnYpJa6zFsAMBCEnhT7HNKM4s=";
+  mvnHash = "sha256-ue1X0fswi3C9uqJ/cVCf/qd2XStMve1k1qA+IsREOGk=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 1a1be4a174b181f8d01b7ee1fc36f05ca7e74bb2 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 20 Jul 2024 10:40:15 +0200
Subject: [PATCH 2/3] h2: reformat with nixfmt-rfc-style, remove `with lib;`

---
 pkgs/servers/h2/default.nix | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index 4574a47e3096..5398d1eef0c5 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,10 +1,20 @@
-{ lib, maven, fetchFromGitHub, jre, makeWrapper, nix-update-script }:
+{
+  fetchFromGitHub,
+  jre,
+  lib,
+  makeWrapper,
+  maven,
+  nix-update-script,
+}:
 
 maven.buildMavenPackage rec {
   pname = "h2";
   version = "2.3.230";
 
-  outputs = [ "out" "doc" ];
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   src = fetchFromGitHub {
     owner = "h2database";
@@ -32,16 +42,22 @@ maven.buildMavenPackage rec {
   '';
 
   passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex" "^version-([0-9.]+)$" ];
+    extraArgs = [
+      "--version-regex"
+      "^version-([0-9.]+)$"
+    ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Java SQL database";
     homepage = "https://h2database.com/html/main.html";
     changelog = "https://h2database.com/html/changelog.html";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    maintainers = with maintainers; [ mahe anthonyroussel ];
+    maintainers = with lib.maintainers; [
+      mahe
+      anthonyroussel
+    ];
     mainProgram = "h2";
   };
 }

From 85a9da1d7e25fcb8f44886e5ddd6933f856a0512 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 20 Jul 2024 10:41:20 +0200
Subject: [PATCH 3/3] h2: move to pkgs/by-name

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

diff --git a/pkgs/servers/h2/default.nix b/pkgs/by-name/h2/h2/package.nix
similarity index 100%
rename from pkgs/servers/h2/default.nix
rename to pkgs/by-name/h2/h2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2018bdc1ec2..eec1f3abfd3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8702,8 +8702,6 @@ with pkgs;
 
   hans = callPackage ../tools/networking/hans { };
 
-  h2 = callPackage ../servers/h2 { };
-
   haproxy = callPackage ../tools/networking/haproxy { };
 
   hackertyper = callPackage ../tools/misc/hackertyper { };