meilisearch: 0.21.1 -> 0.23.1

pkgs/servers/search/meilisearch/crate-hashes.json

@@ -1,13 +0,0 @@
-{
-  "actix-cors 0.6.0-beta.1 (git+https://github.com/MarinPostma/actix-extras.git?rev=2dac1a4#2dac1a421619bf7b386dea63d3ae25a3bc4abc43)": "0ny03ibf8vvdvcmcvzlvngx80rvmh47bx517iqc5wh74yzdmdlsn",
-  "actix-web-static-files 3.0.5 (git+https://github.com/MarinPostma/actix-web-static-files.git?rev=6db8c3e#6db8c3e2940d61659581492b5e9c9b9062567613)": "1q00s1w2ry6kl7j4bn4q1xqpdn90sc3icjm2wml8fn4rszamhnqy",
-  "assert-json-diff 1.0.1 (git+https://github.com/qdequele/assert-json-diff?branch=master#9012a0c8866d0f2db0ef9a6242e4a19d1e8c67e4)": "1inv5y75acrw0vhpsc32rh5h0701vnm7c4lcsqcdzd8sdy76cisl",
-  "grenad 0.1.0 (git+https://github.com/Kerollmops/grenad.git?rev=3adcb26#3adcb267dcbc590c7da10eb5f887a254865b3dbe)": "03zzi59yk2rgasdzsf7rgz26vpk5060vlfskls9cb556wiizh6cl",
-  "heed 0.12.0 (git+https://github.com/Kerollmops/heed?tag=v0.12.1#8e5dc6d71c8166a8d7d0db059e6e51478942b551)": "09h9i693jiy3ybvc5acj8giszsv3kchpaxs4ld2ha81zxcmmfkrw",
-  "heed-traits 0.7.0 (git+https://github.com/Kerollmops/heed?tag=v0.12.1#8e5dc6d71c8166a8d7d0db059e6e51478942b551)": "09h9i693jiy3ybvc5acj8giszsv3kchpaxs4ld2ha81zxcmmfkrw",
-  "heed-types 0.7.2 (git+https://github.com/Kerollmops/heed?tag=v0.12.1#8e5dc6d71c8166a8d7d0db059e6e51478942b551)": "09h9i693jiy3ybvc5acj8giszsv3kchpaxs4ld2ha81zxcmmfkrw",
-  "lmdb-rkv-sys 0.15.0 (git+https://github.com/meilisearch/lmdb-rs#d0b50d02938ee84e4e4372697ea991fe2a4cae3b)": "0pqar429y4qzxmyr6daw32syvggm4dk7cs7g01lp6f8a6cvbbwkc",
-  "meilisearch-tokenizer 0.2.5 (git+https://github.com/meilisearch/tokenizer.git?tag=v0.2.5#c0b5cf741ed9485147f2cbe523f2214d4fa4c395)": "0hvf92z24adqwhh81r9arirhrvgyp1wva9g2wsrir4xqvaqdzdr5",
-  "milli 0.10.2 (git+https://github.com/meilisearch/milli.git?tag=v0.10.2#879d5e8799836d93f8995810965b6797be4f69d1)": "09gdf4mwrn3ka1iqh3h33b86p68c8ichkkkd4231igl11wxj91d1",
-  "pest 2.1.3 (git+https://github.com/pest-parser/pest.git?rev=51fd1d49f1041f7839975664ef71fe15c7dcaf67#51fd1d49f1041f7839975664ef71fe15c7dcaf67)": "1l2ixz723f58ksdm0j12z9zw5cnap0fhcd5kbhbz5ndazy8sn5rf"
-}

pkgs/servers/search/meilisearch/default.nix

@@ -1,51 +1,30 @@
-{ pkgs
+{ stdenv
 , lib
-, stdenv
-, buildRustCrate
-, defaultCrateOverrides
+, rustPlatform
 , fetchFromGitHub
 , Security
-, features ? [ ]
+, DiskArbitration
+, Foundation
 }:
 
-let
-  version = "0.21.1";
+let version = "0.23.1";
+in
+rustPlatform.buildRustPackage {
+  pname = "meilisearch";
+  inherit version;
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "MeiliSearch";
     rev = "v${version}";
-    sha256 = "sha256-wyyhTNhVw8EJhahstLK+QuEhufQC68rMpw/ngK8FL8Y=";
+    sha256 = "sha256-4F7noByC9ZgqYwPfkm8VE15QU2jbBvUAH4Idxa+J+Aw=";
   };
-  customBuildRustCrateForPkgs = pkgs: buildRustCrate.override {
-    defaultCrateOverrides = defaultCrateOverrides // {
-      meilisearch-http = attrs: {
-        src = "${src}/meilisearch-http";
-        buildInputs = lib.optionals stdenv.isDarwin [ Security ];
-      };
-      meilisearch-error = attrs: {
-        src = "${src}/meilisearch-error";
-      };
-    };
-  };
-  cargo_nix = import ./Cargo.nix {
-    inherit pkgs;
-    buildRustCrateForPkgs = customBuildRustCrateForPkgs;
-  };
-  meilisearch-http = cargo_nix.workspaceMembers."meilisearch-http".build.override {
-    inherit features;
-  };
-in
-stdenv.mkDerivation {
-  pname = "meilisearch";
-  inherit version src;
-  dontUnpack = true;
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ${meilisearch-http}/bin/meilisearch $out/bin/meilisearch
-  '';
-  dontCheck = true;
-  dontFixup = true;
+  cargoPatches = [
+    # feature mini-dashboard tries to download a file from the internet
+    # feature analitycs should be opt-in
+    ./remove-default-feature.patch
+  ];
+  cargoSha256 = "sha256-dz+1IQZRSeMEagI2dnOtR3A8prg4UZ2Om0pd1BUhuhE=";
+  buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];
   meta = with lib; {
     description = "Powerful, fast, and an easy to use search engine ";
     homepage = https://docs.meilisearch.com/;

pkgs/servers/search/meilisearch/remove-default-feature.patch

@@ -0,0 +1,13 @@
+diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml
+index de418cd4..ecc78d6f 100644
+--- a/meilisearch-http/Cargo.toml
++++ b/meilisearch-http/Cargo.toml
+@@ -92,7 +92,7 @@ mini-dashboard = [
+     "zip",
+ ]
+ analytics = ["whoami", "reqwest"]
+-default = ["analytics", "mini-dashboard"]
++default = []
+ 
+ [target.'cfg(target_os = "linux")'.dependencies]
+ tikv-jemallocator = "0.4.1"

pkgs/servers/search/meilisearch/unify-pest-dependency-version.patch

@@ -1,74 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index e92c0ed0..63bb0996 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1700,7 +1700,7 @@ dependencies = [
-  "obkv",
-  "once_cell",
-  "ordered-float",
-- "pest 2.1.3 (git+https://github.com/pest-parser/pest.git?rev=51fd1d49f1041f7839975664ef71fe15c7dcaf67)",
-+ "pest",
-  "pest_derive",
-  "rayon",
-  "roaring",
-@@ -1939,15 +1939,6 @@ version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
- 
--[[package]]
--name = "pest"
--version = "2.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
--dependencies = [
-- "ucd-trie",
--]
--
- [[package]]
- name = "pest"
- version = "2.1.3"
-@@ -1962,7 +1953,7 @@ version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
- dependencies = [
-- "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pest",
-  "pest_generator",
- ]
- 
-@@ -1972,7 +1963,7 @@ version = "2.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
- dependencies = [
-- "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pest",
-  "pest_meta",
-  "proc-macro2 1.0.27",
-  "quote 1.0.9",
-@@ -1986,7 +1977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
- dependencies = [
-  "maplit",
-- "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pest",
-  "sha-1 0.8.2",
- ]
- 
-diff --git a/Cargo.toml b/Cargo.toml
-index a1dca038..405f210a 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -1,8 +1,9 @@
- [workspace]
--members = [
--    "meilisearch-http",
--    "meilisearch-error",
--]
-+members = ["meilisearch-http", "meilisearch-error"]
-+resolver = "2"
- 
- [profile.release]
- debug = true
-+
-+[patch.crates-io]
-+pest = { git = "https://github.com/pest-parser/pest.git", rev = "51fd1d49f1041f7839975664ef71fe15c7dcaf67" }

pkgs/top-level/all-packages.nix

@@ -6916,8 +6916,7 @@ with pkgs;
   };
 
   meilisearch = callPackage ../servers/search/meilisearch {
-    inherit (darwin.apple_sdk.frameworks) Security;
-    inherit pkgs;
+    inherit (darwin.apple_sdk.frameworks) Security DiskArbitration Foundation;
   };
 
   memtester = callPackage ../tools/system/memtester { };