Skip to content

Commit

Permalink
Merge pull request #206390 from cpcloud/bump-clickhouse
Browse files Browse the repository at this point in the history
clickhouse: 22.8.5.29 -> 22.8.11.15
  • Loading branch information
delroth authored Jan 4, 2023
2 parents e479a1f + 29b07eb commit 6dc0f05
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pkgs/servers/clickhouse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

stdenv.mkDerivation rec {
pname = "clickhouse";
version = "22.8.5.29";
version = "22.8.11.15";

broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685

Expand All @@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
sha256 = "sha256-JRdZb5YgaumTnjJEYIXh9o3NSv67DAdl9gizVKvGTJI=";
sha256 = "sha256-ZFS7RgeTV/eMSiI0o9WO1fHjRkPDNZs0Gm3w+blGsz0=";
};

nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23862,9 +23862,9 @@ with pkgs;

clickhouse = callPackage ../servers/clickhouse {
# upstream requires llvm12 as of v22.3.2.2
inherit (llvmPackages_13) clang-unwrapped lld llvm;
llvm-bintools = llvmPackages_13.bintools;
stdenv = llvmPackages_13.stdenv;
inherit (llvmPackages_14) clang-unwrapped lld llvm;
llvm-bintools = llvmPackages_14.bintools;
stdenv = llvmPackages_14.stdenv;
};

clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
Expand Down

0 comments on commit 6dc0f05

Please sign in to comment.