summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Cloud <417981+cpcloud@users.noreply.github.com>2022-12-16 07:09:57 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-04 11:50:22 +0000
commit84f0cc651207ae7c63184b171ff8a54b64a27be5 (patch)
tree81274e4ca53ee20429746e19389cc9e9c92703bd
parentMerge pull request #207088 from NixOS/backport-207082-to-release-22.11 (diff)
downloadnixpkgs-84f0cc651207ae7c63184b171ff8a54b64a27be5.tar.gz
clickhouse: 22.8.5.29 -> 22.8.11.15
(cherry picked from commit 29b07eb02e648e042824157fa3d59dc490045544)
-rw-r--r--pkgs/servers/clickhouse/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index b797951e4112..b3a1754dcab6 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -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
@@ -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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf05e66d681..b38969661a06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23527,9 +23527,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;