From 9605c575a6d55d3dee28a0bf076e233ba7550c91 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 19:34:46 -0800
Subject: [PATCH 1/2] clickhouse: 18.14.18 -> 18.16.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clickhouse/versions
---
 pkgs/servers/clickhouse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index bddffc52fd7..90d614553ea 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -6,13 +6,13 @@
 
 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 ];

From e4e695548c126297ccef27af62a65a9bb8d099fd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 6 Jan 2019 04:16:10 +0000
Subject: [PATCH 2/2] clickhouse: link to libLLVM rather than to individual
 LLVM libs

The clickhouse program links to LLVM and to the clickhouse library, that also
links to LLVM. When the library is shared but LLVM is static, LLVM gets linked
into the program twice (once via the library and once directly), which causes
this error when running clickhouse:

     : CommandLine Error: Option 'x86-use-base-pointer' registered more than once!
     LLVM ERROR: inconsistency in registered CommandLine options

A common LLVM installation provides static component libraries and a shared
libLLVM. Linking to libLLVM when libclickhouse is shared solves this issue.

Upstream pull request: https://github.com/yandex/ClickHouse/pull/3989
---
 pkgs/servers/clickhouse/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 90d614553ea..3272065efbe 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,4 +1,4 @@
-{ 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
@@ -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";