Unverified Commit 7c1dbbf7 authored by zimward's avatar zimward
Browse files

quickwit: use vendored Cargo.lock instead of patching src

parent f5f79278

pkgs/servers/search/quickwit/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ rustPlatform.buildRustPackage rec { 
      --replace-fail '.with_protos' '.with_includes(&["."]).with_protos'

    substituteInPlace ./quickwit-proto/build.rs \

      --replace-fail '.with_protos' '.with_includes(&["."]).with_protos'

    cp /build/cargo-vendor-dir/Cargo.lock /build/source/quickwit/Cargo.lock

  '';



  sourceRoot = "${src.name}/quickwit";
@@ -96,10 +97,6 @@ rustPlatform.buildRustPackage rec { 
    };

  };



  cargoPatches =[

    ./update-time-for-rust-1.80.patch

  ];



  CARGO_PROFILE_RELEASE_LTO = "fat";

  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";

pkgs/servers/search/quickwit/update-time-for-rust-1.80.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
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",