about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2023-12-07 13:10:01 +0100
committerYt <raphael@megzari.com>2023-12-12 07:12:04 +0000
commit73a4603df849e21ec7a792e99dd12868c3bbded3 (patch)
tree43e5f98d9dfff6f1224015429c64a1eb40bd047f /pkgs
parentb9e35d7dc400b7f8a8a55cd3ebb545f7787ea14c (diff)
downloadnixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar.gz
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar.bz2
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar.lz
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar.xz
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.tar.zst
nixlib-73a4603df849e21ec7a792e99dd12868c3bbded3.zip
clickhouse: 23.10.3.5 -> 23.11.1.2711
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/clickhouse/default.nix18
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 19a0b5e92340..629842669388 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -28,7 +28,7 @@ let
     else llvmPackages.stdenv).mkDerivation;
 in mkDerivation rec {
   pname = "clickhouse";
-  version = "23.10.3.5";
+  version = "23.11.1.2711";
 
   src = fetchFromGitHub rec {
     owner = "ClickHouse";
@@ -36,7 +36,7 @@ in mkDerivation rec {
     rev = "v${version}-stable";
     fetchSubmodules = true;
     name = "clickhouse-${rev}.tar.gz";
-    hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY=";
+    hash = "sha256-xRg9NzUkjTbR2Lp6DgDzcUp2Hrc4sfgkot7KxPw2Uy8=";
     postFetch = ''
       # delete files that make the source too big
       rm -rf $out/contrib/llvm-project/llvm/test
@@ -61,6 +61,20 @@ in mkDerivation rec {
     '';
   };
 
+  patches = [
+    # They updated the Cargo.toml without updating the Cargo.lock :/
+    (fetchpatch {
+      url = "https://github.com/ClickHouse/ClickHouse/commit/bccd33932b5fe17ced2dc2f27813da0b1c034afa.patch";
+      revert = true;
+      hash = "sha256-4idwr+G8WGuT/VILKtDIJIvbCvi6pZokJFze4dP6ExE=";
+    })
+    (fetchpatch {
+      url = "https://github.com/ClickHouse/ClickHouse/commit/b6bd5ecb199ef8a10e3008a4ea3d96087db8a8c1.patch";
+      revert = true;
+      hash = "sha256-nbb/GV2qWEZ+BEfT6/9//yZf4VWdhOdJCI3PLeh6o0M=";
+    })
+  ];
+
   strictDeps = true;
   nativeBuildInputs = [
     cmake