From 219bbbc9ac8fad5fd0b9c045a21483455a3c2c1e Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 13 May 2026 08:24:53 +0000 Subject: [PATCH] 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/ ''