public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts

Browse Source 
Failing Hydra build: https://hydra.nixos.org/build/143269865
ZHF #122042
This commit is contained in:
Maximilian Bosch 2021-05-18 12:04:37 +02:00 committed by Jonathan Ringer
parent 274a71f262
commit 3f3cec6d9e
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/databases/clickhouse.nix
View File

@ -42,6 +42,7 @@ with lib;
User = "clickhouse"; User = "clickhouse";
Group = "clickhouse"; Group = "clickhouse";
ConfigurationDirectory = "clickhouse-server"; ConfigurationDirectory = "clickhouse-server";
AmbientCapabilities = "CAP_SYS_NICE";
StateDirectory = "clickhouse"; StateDirectory = "clickhouse";
LogsDirectory = "clickhouse"; LogsDirectory = "clickhouse";
ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml"; ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";

1
nixos/tests/clickhouse.nix
View File

@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine = { machine = {
services.clickhouse.enable = true; services.clickhouse.enable = true;
virtualisation.memorySize = 4096;
}; };
testScript = testScript =

19
pkgs/servers/clickhouse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja { lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
@ -7,16 +7,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clickhouse"; pname = "clickhouse";
version = "20.11.4.13"; version = "21.3.11.5";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ClickHouse"; owner = "ClickHouse";
repo = "ClickHouse"; repo = "ClickHouse";
rev = "v${version}-stable"; rev = "v${version}-lts";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny"; sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo=";
}; };
nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
@ -27,20 +27,9 @@ stdenv.mkDerivation rec {
xxHash zstd xxHash zstd
]; ];
patches = [
# This patch is only required for 20.11.4.13 - it should be included in the
# next stable release from upstream by default
(fetchpatch {
url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch";
sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb";
})
];
postPatch = '' postPatch = ''
patchShebangs src/ patchShebangs src/
substituteInPlace contrib/openssl-cmake/CMakeLists.txt \
--replace '/usr/bin/env perl' perl
substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
--replace 'git rev-parse --show-toplevel' '$src' --replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-duplicate-includes.sh \ substituteInPlace utils/check-style/check-duplicate-includes.sh \