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

Merge pull request #53376 from r-ryantm/auto-update/clickhouse

Browse Source 
clickhouse: 18.14.18 -> 18.16.1
This commit is contained in:
Orivej Desh (NixOS) 2019-01-07 11:25:08 +00:00 committed by GitHub
commit fa17392fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libtool { stdenv, fetchFromGitHub, fetchpatch, cmake, libtool
, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
, readline, sparsehash, unixODBC, zstd, ninja, jemalloc , readline, sparsehash, unixODBC, zstd, ninja, jemalloc
@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clickhouse-${version}"; name = "clickhouse-${version}";
version = "18.14.18"; version = "18.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yandex"; owner = "yandex";
repo = "ClickHouse"; repo = "ClickHouse";
rev = "v${version}-stable"; rev = "v${version}-stable";
sha256 = "0nivnmlnamcjxwc66ja9fagi5fqzzjsnrrfk32f4g8sxffx2rjy3"; sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8";
}; };
nativeBuildInputs = [ cmake libtool ninja ]; nativeBuildInputs = [ cmake libtool ninja ];
@ -28,10 +28,16 @@ stdenv.mkDerivation rec {
"-DUSE_STATIC_LIBRARIES=OFF" "-DUSE_STATIC_LIBRARIES=OFF"
"-DUSE_INTERNAL_SSL_LIBRARY=False" "-DUSE_INTERNAL_SSL_LIBRARY=False"
]; ];
hardeningDisable = [ "format" ];
patchPhase = '' patches = [
patchShebangs . (fetchpatch {
url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch";
sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z";
})
];
postPatch = ''
patchShebangs copy_headers.sh
''; '';
postInstall = '' postInstall = ''
@ -43,6 +49,8 @@ stdenv.mkDerivation rec {
--replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>" --replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>"
''; '';
hardeningDisable = [ "format" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://clickhouse.yandex/; homepage = https://clickhouse.yandex/;
description = "Column-oriented database management system"; description = "Column-oriented database management system";