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

clickhouse: 18.14.18 -> 18.16.1
NixOS · Jan 7, 2019 · fa17392 · fa17392
2 parents 8ad610b + e4e6955
commit fa17392
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, libtool
+{ stdenv, fetchFromGitHub, fetchpatch, 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, ninja, jemalloc
 }:
 
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
-  version = "18.14.18";
+  version = "18.16.1";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "0nivnmlnamcjxwc66ja9fagi5fqzzjsnrrfk32f4g8sxffx2rjy3";
+    sha256 = "02slllcan7w3ln4c9yvxc8w0h2vszd7n0wshbn4bra2hb6mrzyp8";
   };
 
   nativeBuildInputs = [ cmake libtool ninja ];
@@ -28,10 +28,16 @@ stdenv.mkDerivation rec {
     "-DUSE_STATIC_LIBRARIES=OFF"
     "-DUSE_INTERNAL_SSL_LIBRARY=False"
   ];
-  hardeningDisable = [ "format" ];
 
-  patchPhase = ''
-    patchShebangs .
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/yandex/ClickHouse/commit/afbcdf2f00a04e747c5279414cf4691f29bb5cc2.patch";
+      sha256 = "17y891q0dp179w3jv32h74pbfwyzgnz4dxxwv73vzdwvys4i8c8z";
+    })
+  ];
+
+  postPatch = ''
+    patchShebangs copy_headers.sh
   '';
 
   postInstall = ''
@@ -43,6 +49,8 @@ stdenv.mkDerivation rec {
       --replace "<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>" "<console>1</console>"
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     homepage = https://clickhouse.yandex/;
     description = "Column-oriented database management system";