about summary refs log tree commit diff
path: root/third_party/overlays/tvl.nix
diff options
context:
space:
mode:
authoredef <edef@edef.eu>2023-11-12T14·32+0000
committeredef <edef@edef.eu>2023-11-12T14·57+0000
commit3fe455cd4ada32990f67af640becd4cf8ae6117c (patch)
treeb356c4ddcca4ef8a6b52187fe7e2419c3fe02aa9 /third_party/overlays/tvl.nix
parent46964f6d8f95590748855976fc77ce1faa75d708 (diff)
chore(3p/nixpkgs/clickhouse): 23.3.13.6 -> 23.10.3.5 r/6995
Change-Id: I3e4c43690fcaf50965152bf40e1ca2b027010fcf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9997
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays/tvl.nix')
-rw-r--r--third_party/overlays/tvl.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 600161b66143..fb2a89e7fd42 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -148,7 +148,12 @@ depot.nix.readTree.drvTargets {
     };
   };
 
-  clickhouse = super.clickhouse.overrideAttrs (old: {
+  # we're vendoring this for now, since the version upgrade has a lot of changes
+  # we can't merge it upstream yet because the Darwin build is broken
+  # https://github.com/NixOS/nixpkgs/pull/267033
+  clickhouse = (super.callPackage ./clickhouse {
+    llvmPackages = super.llvmPackages_16;
+  }).overrideAttrs (old: {
     patches = old.patches or [ ] ++ [
       # https://github.com/ClickHouse/ClickHouse/pull/56118
       ./patches/clickhouse-support-reading-arrow-LargeListArray.patch