From 5396dc01668b08c956c24b2969890e56c81209b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Mon, 25 May 2026 15:03:02 +0700
Subject: [PATCH 01/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-15=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1503d10ee4e6af997e06545964df06897e54adec)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index f74e3a2575d9..3214b820177b 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-15";
+  version = "2.3.0-rolling-2026-05-25";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "9e7f283e5801bd0707cc5d48d0188c4c162fe7b3";
-    hash = "sha256-8FdUQLX67E+7f4HyoH6atLDxYzniVEFqc+jbjzTytFM=";
+    rev = "e27c3e6d8cc04b8b7c3dea35dbd00e41d5ad734c";
+    hash = "sha256-9KMAwNR8Ensdom7fijEvtae/hcYmH8wZsk4tDZf01Bw=";
   };
 
   outputs = [

From f1550beea05ff6ed3ca62b746aaf5c34f9240843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 28 May 2026 10:43:04 +0700
Subject: [PATCH 02/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-25=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e22df82761e44df34d3c6f8e18087c1fbcb05b61)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 3214b820177b..dde25bc993f8 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-25";
+  version = "2.3.0-rolling-2026-05-28";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "e27c3e6d8cc04b8b7c3dea35dbd00e41d5ad734c";
-    hash = "sha256-9KMAwNR8Ensdom7fijEvtae/hcYmH8wZsk4tDZf01Bw=";
+    rev = "11b0cfa2771e3ccad4a852e72473e4e278ab1de7";
+    hash = "sha256-uqzjq0+SmmdjNIFU0lrQ1JVZJISBdEqo8nTuEGIp7hI=";
   };
 
   outputs = [

From 13d8be863a9558f6b43cb736f07d551227955cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 29 May 2026 20:31:24 +0700
Subject: [PATCH 03/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-28=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 80af164903e1e001cf53cd21bc92d9e79dc6b6ac)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index dde25bc993f8..5c447ed2c146 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-28";
+  version = "2.3.0-rolling-2026-05-29";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "11b0cfa2771e3ccad4a852e72473e4e278ab1de7";
-    hash = "sha256-uqzjq0+SmmdjNIFU0lrQ1JVZJISBdEqo8nTuEGIp7hI=";
+    rev = "8dc37cb1e6171f7f772667618ea440696fed82c3";
+    hash = "sha256-tLHo8UXgef6rN/mBSwNIk7S2C4ZrweFTGUjjRw1S7KY=";
   };
 
   outputs = [

From 94ae65cd133d42fedf55ee2895ec08197fe2d494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 4 Jun 2026 19:07:48 +0700
Subject: [PATCH 04/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-29=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5379e268b1c36d4cf3424d44f3891993de60c339)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 5c447ed2c146..7f39a6e685de 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-29";
+  version = "2.3.0-rolling-2026-06-04";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "8dc37cb1e6171f7f772667618ea440696fed82c3";
-    hash = "sha256-tLHo8UXgef6rN/mBSwNIk7S2C4ZrweFTGUjjRw1S7KY=";
+    rev = "cd4703768c56d45b1384880ba9f73961140d084f";
+    hash = "sha256-EbpLS9Y733BszHSlvogPKTJY8p7hfVl+KF/OSwO8UZs=";
   };
 
   outputs = [

From d19fdbbc36d0b438059ee12948a8f048e9954330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 11 Jun 2026 21:28:20 +0700
Subject: [PATCH 05/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-04=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0cc1642964e4fba7b0d9730305ef2493d1556437)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 7f39a6e685de..3b2c05da207d 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-04";
+  version = "2.3.0-rolling-2026-06-10";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "cd4703768c56d45b1384880ba9f73961140d084f";
-    hash = "sha256-EbpLS9Y733BszHSlvogPKTJY8p7hfVl+KF/OSwO8UZs=";
+    rev = "ed7899d1c234fd15d272a0ac6404ffbd89a3c772";
+    hash = "sha256-oT31ZuB0e8wkxovP/sbs52m396IG4mdh0tf8WBs8egA=";
   };
 
   outputs = [

From 6ab5f6eb1fecd59ba34345fbbf2ebb8855fd6a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Tue, 16 Jun 2026 17:13:21 +0700
Subject: [PATCH 06/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-10=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b18fdf6106422a019b7d6df68d84be576decde90)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 3b2c05da207d..5006a26827a7 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-10";
+  version = "2.3.0-rolling-2026-06-16";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "ed7899d1c234fd15d272a0ac6404ffbd89a3c772";
-    hash = "sha256-oT31ZuB0e8wkxovP/sbs52m396IG4mdh0tf8WBs8egA=";
+    rev = "293a78a96ad566b9a091177fb4279584239dc281";
+    hash = "sha256-rEpLW7mnPCuX4AUqhgmdSaiZoRtRx6pMwNompN4xLZU=";
   };
 
   outputs = [

From ea9f2e97e08b62dbcead6361387e04516ce18c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Wed, 17 Jun 2026 16:36:19 +0700
Subject: [PATCH 07/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-16=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1f3e68b6269a6f8e2153b12bb762fd2a7a3c11bf)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 5006a26827a7..623f6f9d3d55 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-16";
+  version = "2.3.0-rolling-2026-06-17";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "293a78a96ad566b9a091177fb4279584239dc281";
-    hash = "sha256-rEpLW7mnPCuX4AUqhgmdSaiZoRtRx6pMwNompN4xLZU=";
+    rev = "e42097ed965e2e7d59dcca61e881a80c159e66f2";
+    hash = "sha256-C5NdwFDOk6AZiMWpwBKdEdUmLJAOBzZ4pM5XuVCaiWk=";
   };
 
   outputs = [

From e98bdecf5401f0607e45be0a98b94bea8a259ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Mon, 22 Jun 2026 15:04:44 +0700
Subject: [PATCH 08/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-17=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d877c0222ea94cee154e8f6d97e90ae4e1039809)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 623f6f9d3d55..85bc288af43e 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-17";
+  version = "2.3.0-rolling-2026-06-22";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "e42097ed965e2e7d59dcca61e881a80c159e66f2";
-    hash = "sha256-C5NdwFDOk6AZiMWpwBKdEdUmLJAOBzZ4pM5XuVCaiWk=";
+    rev = "f12fb3cca02ba31e89c87bc90041fe800dbed3f2";
+    hash = "sha256-OJ/MF6A6lcxWKgcOntCVc0fkcnQ9FJx8Wn2Pewz0h84=";
   };
 
   outputs = [

From 64acf53aeea65cfb7cd41fdb5f84572e4146bfcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Tue, 23 Jun 2026 18:22:07 +0700
Subject: [PATCH 09/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-22=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 360ca5a8635c28a1aaddcbfe30470a8543f70e0d)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 85bc288af43e..26df1a269643 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-22";
+  version = "2.3.0-rolling-2026-06-23";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "f12fb3cca02ba31e89c87bc90041fe800dbed3f2";
-    hash = "sha256-OJ/MF6A6lcxWKgcOntCVc0fkcnQ9FJx8Wn2Pewz0h84=";
+    rev = "21708fe347076047add1225349bbcc445c447002";
+    hash = "sha256-3wvKqlyHU6igfzA5xmxngpNJbxWIJkVwXQB1arycS3c=";
   };
 
   outputs = [

From e252649af45b41ff40ed51532236ff3d43221f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Wed, 24 Jun 2026 11:52:39 +0700
Subject: [PATCH 10/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-23=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f33092361f5dc2d14c9905b9269d4331c3a4b90d)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 26df1a269643..faa231744418 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-23";
+  version = "2.3.0-rolling-2026-06-24";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "21708fe347076047add1225349bbcc445c447002";
-    hash = "sha256-3wvKqlyHU6igfzA5xmxngpNJbxWIJkVwXQB1arycS3c=";
+    rev = "66fcbfed806d7645577e4e78e4d536d38379764d";
+    hash = "sha256-RzQHDHihcD+ife1CBCGliytrkt8eYVdL8AHdaYp3CFQ=";
   };
 
   outputs = [

From eb89ce866e6efd1cb2c260aeb0830e0d8c743e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 25 Jun 2026 16:17:15 +0700
Subject: [PATCH 11/16] =?UTF-8?q?h2o:=20makeWrapper=20=E2=86=92=20makeBina?=
 =?UTF-8?q?ryWrapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a49bf4a521dcd81c3c4437a4f20c31d180933b2b)
---
 pkgs/by-name/h2/h2o/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index faa231744418..c87d218dfe08 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  makeWrapper,
+  makeBinaryWrapper,
   ninja,
   perl,
   perlPackages,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
-    makeWrapper
+    makeBinaryWrapper
     ninja
     perlPackages.JSON
   ]

From 0b56f9562b00ca7de615f14fcca41fdd8dab226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 25 Jun 2026 16:02:01 +0700
Subject: [PATCH 12/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-24=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6d2f708632caf9ef7988931f3a2a435d670787ba)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index c87d218dfe08..72d314ae5c26 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-24";
+  version = "2.3.0-rolling-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "66fcbfed806d7645577e4e78e4d536d38379764d";
-    hash = "sha256-RzQHDHihcD+ife1CBCGliytrkt8eYVdL8AHdaYp3CFQ=";
+    rev = "58a9a054300a09235df52954101a49573762e0fc";
+    hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA=";
   };
 
   outputs = [

From 736c3efd16db1cec4edd1058e46d0aec578cda43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 25 Jun 2026 16:29:33 +0700
Subject: [PATCH 13/16] h2o: make Brotli optional

2026-06-25 updates made Brotli optional

(cherry picked from commit 39e152cdbf81fe552a1cc478fdc050ef39306eb1)
---
 pkgs/by-name/h2/h2o/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 72d314ae5c26..595bb7bef992 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -8,12 +8,13 @@
   ninja,
   perl,
   perlPackages,
-  brotli,
   openssl,
   libcap,
   libuv,
   wslay,
   zlib,
+  withBrotli ? true,
+  brotli,
   withMruby ? true,
   bison,
   ruby,
@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     perlPackages.JSON
   ]
+  ++ lib.optional withBrotli brotli
   ++ lib.optionals withMruby [
     bison
     ruby
@@ -61,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     zlib
     wslay
-  ];
+  ]
+  ++ lib.optional withBrotli brotli;
 
   cmakeFlags = [
+    "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}"
     "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}"
   ];
 

From 9ebd5073cde169e14fb7a7f9e56c856744254e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 26 Jun 2026 22:23:20 +0700
Subject: [PATCH 14/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-25=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 789715ba5b2f432b70aaab1bc56ee2d15b43e204)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 595bb7bef992..6cb9d4a64ab7 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-25";
+  version = "2.3.0-rolling-2026-06-26";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "58a9a054300a09235df52954101a49573762e0fc";
-    hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA=";
+    rev = "428a48f16cb3d6035dee3c333ca14b1466b3f3ff";
+    hash = "sha256-DOVDElUOY+IuavcLR4KYwFYrBkooVmUbT8WUNao7Bwk=";
   };
 
   outputs = [

From 8d8b25be199e58bef316d169f07802be85a23628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 26 Jun 2026 22:27:19 +0700
Subject: [PATCH 15/16] h2o: optionally add Zstandard support

(cherry picked from commit 58db73c1953898286aa270e417e0388b0cd68cd6)
---
 pkgs/by-name/h2/h2o/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 6cb9d4a64ab7..32aa6ad16fbc 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -20,6 +20,8 @@
   ruby,
   withUring ? stdenv.hostPlatform.isLinux,
   liburing,
+  withZstandard ? true,
+  zstd,
   nixosTests,
 }:
 
@@ -53,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     ruby
   ]
-  ++ lib.optional withUring liburing;
+  ++ lib.optional withUring liburing
+  ++ lib.optional withZstandard zstd;
 
   buildInputs = [
     brotli
@@ -64,11 +67,13 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     wslay
   ]
-  ++ lib.optional withBrotli brotli;
+  ++ lib.optional withBrotli brotli
+  ++ lib.optional withZstandard zstd;
 
   cmakeFlags = [
     "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}"
     "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}"
+    "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}"
   ];
 
   postInstall = ''

From f01dd81226bc1a3bfc024f34d39b48b45e056f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Mon, 29 Jun 2026 17:17:18 +0700
Subject: [PATCH 16/16] =?UTF-8?q?h2o:=202.3.0-rolling-2026-06-26=C2=A0?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 2546ae0b2440b1b56586cd6bc72dfe7b053af730)
---
 pkgs/by-name/h2/h2o/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 32aa6ad16fbc..50191ac86634 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-06-26";
+  version = "2.3.0-rolling-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "428a48f16cb3d6035dee3c333ca14b1466b3f3ff";
-    hash = "sha256-DOVDElUOY+IuavcLR4KYwFYrBkooVmUbT8WUNao7Bwk=";
+    rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1";
+    hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE=";
   };
 
   outputs = [