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

Merge pull request #61988 from teh/clickhouse

Browse Source 
clickhouse: 18.16.1 -> 19.6.2.11
This commit is contained in:
Aaron Andersen 2019-05-26 15:35:46 -04:00 committed by GitHub
commit 39adff94a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,43 +1,35 @@
{ stdenv, fetchFromGitHub, fetchpatch, 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, brotli, protobuf, xxHash
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clickhouse-${version}"; name = "clickhouse-${version}";
version = "18.16.1"; version = "19.6.2.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yandex"; owner = "yandex";
repo = "ClickHouse"; repo = "ClickHouse";
rev = "v${version}-stable"; rev = "v${version}-stable";
sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8"; sha256 = "0bs38a8dm5x43klx4nc5dwkkxpab12lp2chyvc2y47c75j7rn5d7";
}; };
nativeBuildInputs = [ cmake libtool ninja ]; nativeBuildInputs = [ cmake libtool ninja ];
buildInputs = [ buildInputs = [
boost capnproto cctz clang-unwrapped double-conversion gperftools icu boost capnproto cctz clang-unwrapped double-conversion gperftools icu
libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
readline sparsehash unixODBC zstd jemalloc readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
]; ];
cmakeFlags = [ cmakeFlags = [
"-DENABLE_TESTS=OFF" "-DENABLE_TESTS=OFF"
"-DUNBUNDLED=ON" "-DUNBUNDLED=ON"
"-DUSE_STATIC_LIBRARIES=OFF" "-DUSE_STATIC_LIBRARIES=OFF"
"-DUSE_INTERNAL_SSL_LIBRARY=False"
];
patches = [
(fetchpatch {
url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch";
sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z";
})
]; ];
postPatch = '' postPatch = ''
patchShebangs copy_headers.sh patchShebangs dbms/programs/clang/copy_headers.sh
''; '';
postInstall = '' postInstall = ''

3
pkgs/top-level/all-packages.nix
View File

@ -14081,7 +14081,8 @@ in
clamsmtp = callPackage ../servers/mail/clamsmtp { }; clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse { clickhouse = callPackage ../servers/clickhouse {
inherit (llvmPackages_latest) clang-unwrapped lld llvm; # clickhouse doesn't build on llvm8.
inherit (llvmPackages_7) clang-unwrapped lld llvm;
}; };
couchdb = callPackage ../servers/http/couchdb { couchdb = callPackage ../servers/http/couchdb {