clickhouse: 1.1.54190 -> 1.1.54236

pkgs/servers/clickhouse/default.nix

@@ -3,16 +3,16 @@
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
 
-  version = "1.1.54190";
+  version = "1.1.54236";
 
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "ClickHouse";
     rev = "v${version}-stable";
-    sha256 = "03snzrhz3ai66fqy3rh89cgmpiaskg3077zflkwzqxwx69jkmqix";
+    sha256 = "1mfjr1yzvf810vbb35c2rknvqnc4mkncl56ja48myn7hc9p457d7";
   };
 
-  patches = [ ./prefix.patch ./termcap.patch ];
+  patches = [ ./termcap.patch ];
 
   nativeBuildInputs = [ cmake libtool ];
 

pkgs/servers/clickhouse/prefix.patch

@@ -1,30 +0,0 @@
-From ccc3596aa3ca041f457bf44d3437d935f56e82a4 Mon Sep 17 00:00:00 2001
-From: Orivej Desh <orivej@gmx.fr>
-Date: Sun, 26 Mar 2017 23:57:32 +0000
-Subject: [PATCH] Do not override CMAKE_INSTALL_PREFIX
-
----
- CMakeLists.txt | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 517b25e..6d8ced2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,12 +141,7 @@ if (ENABLE_TESTS)
- endif (ENABLE_TESTS)
- 
- # Installation prefix
--if (NOT CMAKE_SYSTEM MATCHES "FreeBSD")
--	set (CMAKE_INSTALL_PREFIX /usr)
--	set (CLICKHOUSE_ETC_DIR /etc)
--else ()
--	set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
--endif ()
-+set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
- 
- 
- option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF)
--- 
-2.12.0
-