clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts

Failing Hydra build: https://hydra.nixos.org/build/143269865
ZHF #122042

Changed files
+6 -15
nixos
modules
services
databases
tests
pkgs
servers
clickhouse
+1
nixos/modules/services/databases/clickhouse.nix
···
User = "clickhouse";
Group = "clickhouse";
ConfigurationDirectory = "clickhouse-server";
StateDirectory = "clickhouse";
LogsDirectory = "clickhouse";
ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";
···
User = "clickhouse";
Group = "clickhouse";
ConfigurationDirectory = "clickhouse-server";
+
AmbientCapabilities = "CAP_SYS_NICE";
StateDirectory = "clickhouse";
LogsDirectory = "clickhouse";
ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml";
+1
nixos/tests/clickhouse.nix
···
machine = {
services.clickhouse.enable = true;
};
testScript =
···
machine = {
services.clickhouse.enable = true;
+
virtualisation.memorySize = 4096;
};
testScript =
+4 -15
pkgs/servers/clickhouse/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja
, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
···
stdenv.mkDerivation rec {
pname = "clickhouse";
-
version = "20.11.4.13";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
src = fetchFromGitHub {
owner = "ClickHouse";
repo = "ClickHouse";
-
rev = "v${version}-stable";
fetchSubmodules = true;
-
sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny";
};
nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
···
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 = ''
patchShebangs src/
-
substituteInPlace contrib/openssl-cmake/CMakeLists.txt \
-
--replace '/usr/bin/env perl' perl
substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-duplicate-includes.sh \
···
+
{ lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
···
stdenv.mkDerivation rec {
pname = "clickhouse";
+
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
src = fetchFromGitHub {
owner = "ClickHouse";
repo = "ClickHouse";
+
rev = "v${version}-lts";
fetchSubmodules = true;
+
sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo=";
};
nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
···
xxHash zstd
];
postPatch = ''
patchShebangs src/
substituteInPlace src/Storages/System/StorageSystemLicenses.sh \
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-duplicate-includes.sh \