From 727126a6f0a153268d6fd17360ae73de1e1aa545 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 3 Sep 2022 05:33:45 -0400 Subject: [PATCH] clickhouse: 22.3.2.2 -> 22.8.5.29 --- pkgs/servers/clickhouse/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 793ee917966c..b797951e4112 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "22.3.2.2"; + version = "22.8.5.29"; 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 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v"; + sha256 = "sha256-JRdZb5YgaumTnjJEYIXh9o3NSv67DAdl9gizVKvGTJI="; }; nativeBuildInputs = [ cmake libtool llvm-bintools ninja ]; @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" + "-DENABLE_CCACHE=0" "-DENABLE_EMBEDDED_COMPILER=ON" "-USE_INTERNAL_LLVM_LIBRARY=OFF" ]; @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { passthru.tests.clickhouse = nixosTests.clickhouse; meta = with lib; { - homepage = "https://clickhouse.tech/"; + homepage = "https://clickhouse.com"; description = "Column-oriented database management system"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d1d7a0cabe6..54e7778c41c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22948,9 +22948,9 @@ with pkgs; clickhouse = callPackage ../servers/clickhouse { # 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; + inherit (llvmPackages_13) clang-unwrapped lld llvm; + llvm-bintools = llvmPackages_13.bintools; + stdenv = llvmPackages_13.stdenv; }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;