From 5ed4a63a05510919465c880af45bad5cd7327b08 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:17:15 +0000 Subject: [PATCH 1/5] clickhouse: Use `zstd` for tarball compression --- pkgs/by-name/cl/clickhouse/generic.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index cac17f4fc466..dbbfa7f2b1ad 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -23,6 +23,7 @@ findutils, libiconv, removeReferencesTo, + zstd, rustSupport ? true, rustc, cargo, @@ -44,8 +45,9 @@ llvmStdenv.mkDerivation (finalAttrs: { repo = "ClickHouse"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - name = "clickhouse-${tag}.tar.gz"; + name = "clickhouse-${tag}.tar.zst"; inherit hash; + nativeBuildInputs = [ zstd ]; postFetch = '' # Delete files that make the source too big rm -rf $out/contrib/arrow/docs/ @@ -80,7 +82,7 @@ llvmStdenv.mkDerivation (finalAttrs: { # Compress to not exceed the 2GB output limit echo "Creating deterministic source tarball..." - tar -I 'gzip -n' \ + tar -I 'zstd --no-progress' \ --sort=name \ --mtime=1970-01-01 \ --owner=0 --group=0 \ @@ -103,6 +105,7 @@ llvmStdenv.mkDerivation (finalAttrs: { perl llvmPackages.lld removeReferencesTo + zstd ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm From 5c6616e99b3e56d76d7187df5416e88999c181ad Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:19:11 +0000 Subject: [PATCH 2/5] clickhouse: Move `binutils` to nativeBuildInputs --- pkgs/by-name/cl/clickhouse/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index dbbfa7f2b1ad..71d8ebe41985 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -104,6 +104,10 @@ llvmStdenv.mkDerivation (finalAttrs: { python3 perl llvmPackages.lld + # Provides llvm-ar/llvm-objcopy. + # Required by cmake/strip_rust_symbols.sh to match the LLVM toolchain + # Otherwise it corrupts .eh_frame in the Rust staticlibs + llvmPackages.bintools removeReferencesTo zstd ] @@ -112,7 +116,6 @@ llvmStdenv.mkDerivation (finalAttrs: { yasm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.bintools findutils darwin.bootstrap_cmds ] From 6ee21a238c2d816521a1f5427d8631b2caa876c7 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:20:52 +0000 Subject: [PATCH 3/5] =?UTF-8?q?clickhouse:=2026.2.5.45=20=E2=86=92=2026.4.?= =?UTF-8?q?2.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/cl/clickhouse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index b67d86d9013d..6a36b81a54eb 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "26.2.5.45-stable"; - rev = "9ca62f3f68fd635f4b56171568d75588b13b6258"; - hash = "sha256-qzY3nFbLvKVJaIfXgNliAvAmO8dzEWNKf4o8HfZYyZA="; + version = "26.4.2.10-stable"; + rev = "184f682d431389803dd383668f52729cf26e23db"; + hash = "sha256-UCRwnrIY/j0gdjFnNmR5U7VZeBRqA96mIt6AEKRJQ5Q="; lts = false; } From a9ff72e09a6a2281a7a6e9e71db24d0ebffcebd6 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:21:51 +0000 Subject: [PATCH 4/5] =?UTF-8?q?clickhouse-lts:=2025.8.20.4=20=E2=86=92=202?= =?UTF-8?q?6.3.10.62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/cl/clickhouse/lts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 100c72de62fb..2dbde7ae2868 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.20.4-lts"; - rev = "2e1cd6354ae8898072e5dbf97aa6e5945761e3d7"; - hash = "sha256-Xd9hLb4sXnSQby8NuKnD0b8R6iGb+M4u0L0yYASNvzw="; + version = "26.3.10.62-lts"; + rev = "e1c11930c28196f954a93287e43c1aa112c8c607"; + hash = "sha256-2vU3PRJISFqrh1KWRKub95QA0cawWGP+wzrn2Kwo5Bc="; lts = true; } From 219bbbc9ac8fad5fd0b9c045a21483455a3c2c1e Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:24:53 +0000 Subject: [PATCH 5/5] clickhouse: Drop unncessary version gate and patches --- pkgs/by-name/cl/clickhouse/generic.nix | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 71d8ebe41985..4b9b9cfaded9 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -8,7 +8,6 @@ { lib, stdenv, - llvmPackages_19, llvmPackages_21, fetchFromGitHub, fetchpatch, @@ -32,7 +31,7 @@ versionCheckHook, }: let - llvmPackages = if lib.versionAtLeast version "26" then llvmPackages_21 else llvmPackages_19; + llvmPackages = llvmPackages_21; llvmStdenv = llvmPackages.stdenv; in llvmStdenv.mkDerivation (finalAttrs: { @@ -129,26 +128,6 @@ llvmStdenv.mkDerivation (finalAttrs: { dontCargoSetupPostUnpack = true; - patches = - lib.optional (lib.versions.majorMinor version == "25.8") (fetchpatch { - # Disable building WASM lexer - url = "https://github.com/ClickHouse/ClickHouse/commit/67a42b78cdf1c793e78c1adbcc34162f67044032.patch"; - hash = "sha256-7VF+JSztqTWD+aunCS3UVNxlRdwHc2W5fNqzDyeo3Fc="; - }) - ++ - - lib.optional (lib.versions.majorMinor version == "25.8" && stdenv.hostPlatform.isDarwin) - (fetchpatch { - # Do not intercept memalign on darwin - url = "https://github.com/ClickHouse/ClickHouse/commit/0cfd2dbe981727fb650f3b9935f5e7e7e843180f.patch"; - hash = "sha256-1iNYZbugX2g2dxNR1ZiUthzPnhLUR8g118aG23yhgUo="; - }) - ++ lib.optional (!lib.versionAtLeast version "25.11" && stdenv.hostPlatform.isDarwin) (fetchpatch { - # Remove flaky macOS SDK version detection - url = "https://github.com/ClickHouse/ClickHouse/commit/11e172a37bd0507d595d27007170090127273b33.patch"; - hash = "sha256-oI7MrjMgJpIPTsci2IqEOs05dUGEMnjI/WqGp2N+rps="; - }); - postPatch = '' patchShebangs src/ utils/ ''