alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

meilisearch: 0.9.0 -> 0.21.1

Browse source
This commit is contained in:
happysalada 2021-09-02 14:34:47 +09:00 • committed by Raphael Megzari
parent 22fb1d38bf
commit 3584ad8d57
5 changed files with 11528 additions and 19 deletions

11200
pkgs/servers/search/meilisearch/Cargo.nix Normal file
View file

File diff suppressed because it is too large Load diff

13
pkgs/servers/search/meilisearch/crate-hashes.json Normal file
View file

@ -0,0 +1,13 @@
{
"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"
}

258
pkgs/servers/search/meilisearch/default.nix
View file

@ -1,29 +1,251 @@
{ lib, stdenv
{ lib
, stdenv
, rustPlatform
, buildRustCrate
, defaultCrateOverrides
, fetchFromGitHub
, IOKit
, Security
, libiconv
, pkg-config
, zlib
, features ? [ ]
}:
rustPlatform.buildRustPackage rec {
pname = "meilisearch";
version = "0.9.0";
let
src = fetchFromGitHub {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "v${version}";
sha256 = "00i5vsbcyrbsvhr5n1b3pxa87v0kfw6pg931i2kzyf4wh021k6sw";
rev = "v0.21.1";
sha256 = "sha256-wyyhTNhVw8EJhahstLK+QuEhufQC68rMpw/ngK8FL8Y=";
};
cargoSha256 = "1icxpragn69c95i5gyx0b07gw4h82r8fsv0nvns0v8dxqisz877k";
buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ];
meta = with lib; {
description = "Ultra relevant and instant full-text search API";
homepage = "https://meilisearch.com/";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ];
custom = pkgs: buildRustCrate.override {
defaultCrateOverrides = defaultCrateOverrides // {
meilisearch-http = attrs: {
src = "${src}/meilisearch-http";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
};
meilisearch-error = attrs: {
src = "${src}/meilisearch-error";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
bitflags = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
const_fn = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
encoding_rs = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
futures-core = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
futures-task = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
httparse = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
indexmap = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
libc = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
log = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
memchr = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
paste = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
futures-util = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
proc-macro-hack = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
serde = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
tokio = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
typenum = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
proc-macro2 = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
generic-array = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
ahash = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
standback = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
syn = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
anyhow = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
crc32fast = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
crossbeam-utils = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
futures-channel = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
fst = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
getrandom = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
hashbrown = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
memoffset = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
miniz_oxide = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
crossbeam-epoch = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
num-traits = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
num-integer = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
proc-macro-error-attr = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
proc-macro-nested = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
rayon-core = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
rayon = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
brotli-sys = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
lmdb-rkv-sys = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
libz-sys = attrs: {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
extraLinkFlags = [ "-L${zlib.out}/lib" ];
};
rustversion = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
ryu = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
snap = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
ring = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
jieba-rs = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
logging_timer_proc_macros = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
zstd-sys = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
zstd-safe = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
async-trait = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
actix-macros = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
actix-web-codegen = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
concat-arrays = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
async-stream-impl = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
enum-iterator-derive = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
futures-macro = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
proc-macro-error = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
pest_derive = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
serde_derive = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
getset = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
pin-project-internal = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
structopt-derive = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
derive_more = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
thiserror-impl = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
time-macros-impl = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
tokio-macros = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
time = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
zerocopy-derive = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
cookie = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
serde_json = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
vergen = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
};
};
};
cargo_nix = import ./Cargo.nix {
buildRustCrateForPkgs = custom;
};
in
cargo_nix.workspaceMembers."meilisearch-http".build.override {
inherit features;
}

74
pkgs/servers/search/meilisearch/unify-pest-dependency-version.patch Normal file
View file

@ -0,0 +1,74 @@
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" }

2
pkgs/top-level/all-packages.nix
View file

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