From b8bcc00431640ac5e750365c2285edc16e56af45 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 07:47:56 -0700 Subject: [PATCH 1/2] postgresqlPackages.apache_datasketches: fix build with gcc15 --- .../sql/postgresql/ext/apache_datasketches.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 43884c22a13a..a95bef28817c 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,6 +1,7 @@ { boost186, fetchFromGitHub, + fetchpatch, lib, postgresql, postgresqlBuildExtension, @@ -41,10 +42,18 @@ postgresqlBuildExtension (finalAttrs: { # fails to build with boost 1.87 buildInputs = [ boost186 ]; - patchPhase = '' - runHook prePatch - cp -r ../${cpp_src.name} . - runHook postPatch + patches = [ + # https://github.com/apache/datasketches-cpp/pull/500 + (fetchpatch { + url = "https://github.com/apache/datasketches-cpp/commit/639134f6e88483bd1bfca451cf09d243ade9bdd4.patch"; + hash = "sha256-6SYKy3NycYABnUCuLUXQz+mTx4VaeWMlHnJ6aM+sNt4="; + stripLen = 1; + extraPrefix = "datasketches-cpp/"; + }) + ]; + + prePatch = '' + cp --no-preserve=mode -r ../${cpp_src.name} . ''; enableUpdateScript = false; From 51be85b9f9a4cf7034ff6a6e190d10c6752b962f Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sat, 18 Apr 2026 07:48:08 -0700 Subject: [PATCH 2/2] postgresqlPackages.apache_datasketches: datasketches-cpp: 5.0.2 -> 5.2.0 --- pkgs/servers/sql/postgresql/ext/apache_datasketches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index a95bef28817c..d215a5467bcf 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -23,8 +23,8 @@ let name = "datasketches-cpp"; owner = "apache"; repo = "datasketches-cpp"; - tag = "5.0.2"; - hash = "sha256-yGk1OckYipAgLTQK6w6p6EdHMxBIQSjPV/MMND3cDks="; + tag = "5.2.0"; + hash = "sha256-h4+cln01jqLV0EpIqScpCyw8jxZgoVtdfBEjdvyUuVk="; }; in