diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-08-07 17:54:32 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-08-07 18:40:39 -0500 |
| commit | 6220a3190899c1e6bfbcb2145d7aca6cc53cb13b (patch) | |
| tree | 0a8b075b9b0913797a4d1db4ec134f0f5556522f /pkgs/servers/clickhouse/default.nix | |
| parent | a240276ccbbcd3c4d629dac8666ac37e01057870 (diff) | |
| download | nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar.gz nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar.bz2 nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar.lz nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar.xz nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.tar.zst nixpkgs-6220a3190899c1e6bfbcb2145d7aca6cc53cb13b.zip | |
clickhouse: 18.1.0 -> 18.5.1, fix build and use ninja
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/servers/clickhouse/default.nix')
| -rw-r--r-- | pkgs/servers/clickhouse/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 10de85b0d36..b5a2c61e23e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,30 +1,37 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd +, readline, sparsehash, unixODBC, zstd, ninja }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - - version = "18.1.0"; + version = "18.5.1"; src = fetchFromGitHub { - owner = "yandex"; - repo = "ClickHouse"; - rev = "v${version}-stable"; - sha256 = "1vsfnggf69xh91ndycdxwfz6m2bs7psaxf2bh04svgk1vzj2z4l0"; + owner = "yandex"; + repo = "ClickHouse"; + rev = "v${version}-stable"; + sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31"; }; - nativeBuildInputs = [ cmake libtool ]; - + nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka readline sparsehash unixODBC zstd ]; - cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; + cmakeFlags = [ + "-DENABLE_TESTS=OFF" + "-DUNBUNDLED=ON" + "-DUSE_STATIC_LIBRARIES=OFF" + ]; + hardeningDisable = [ "format" ]; + + patchPhase = '' + patchShebangs . + ''; postInstall = '' rm -rf $out/share/clickhouse-test |