diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index be067e477a83..793ee917966c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "21.8.12.29"; + version = "22.3.2.2"; broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl"; + sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v"; }; nativeBuildInputs = [ cmake libtool llvm-bintools ninja ]; @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-ungrouped-includes.sh \ --replace 'git rev-parse --show-toplevel' '$src' - substituteInPlace utils/generate-ya-make/generate-ya-make.sh \ - --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/list-licenses/list-licenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-style \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1584e5c0d94..6bce869fbb2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21177,9 +21177,10 @@ with pkgs; clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # upstream requires llvm10 as of v20.11.4.13 - inherit (llvmPackages_10) clang-unwrapped lld llvm; - llvm-bintools = llvmPackages_10.bintools; + # upstream requires llvm12 as of v22.3.2.2 + inherit (llvmPackages_12) clang-unwrapped lld llvm; + llvm-bintools = llvmPackages_12.bintools; + stdenv = llvmPackages_12.stdenv; }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;