From d1f806d5d892cf54304993c67009fd1cb0ec475c Mon Sep 17 00:00:00 2001 From: zimward <96021122+zimward@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:56:20 +0900 Subject: [PATCH] quickwit: fix compilation with rust 1.80 --- pkgs/servers/search/quickwit/Cargo.lock | 8 +++--- pkgs/servers/search/quickwit/default.nix | 4 +++ .../quickwit/update-time-for-rust-1.80.patch | 28 +++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/search/quickwit/update-time-for-rust-1.80.patch diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/servers/search/quickwit/Cargo.lock index db5e22e698f2f..6d48db37fa128 100644 --- a/pkgs/servers/search/quickwit/Cargo.lock +++ b/pkgs/servers/search/quickwit/Cargo.lock @@ -8225,9 +8225,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -8258,9 +8258,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index ccc32cb90056e..60a18dc4f8348 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -96,6 +96,10 @@ rustPlatform.buildRustPackage rec { }; }; + cargoPatches =[ + ./update-time-for-rust-1.80.patch + ]; + CARGO_PROFILE_RELEASE_LTO = "fat"; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; diff --git a/pkgs/servers/search/quickwit/update-time-for-rust-1.80.patch b/pkgs/servers/search/quickwit/update-time-for-rust-1.80.patch new file mode 100644 index 0000000000000..225bf7f8a1c0c --- /dev/null +++ b/pkgs/servers/search/quickwit/update-time-for-rust-1.80.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index db5e22e6..6d48db37 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -8225,9 +8225,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -8258,9 +8258,9 @@ dependencies = [ + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core",