diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index f2887d95c94d..f103e1f17e88 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -20,8 +20,9 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-nN2aNNBq2YDOY9H9682hvwrlI5WTg7s1EPi68UuBTBM="; + cargoPatches = [ ./update-wasm-bindgen.patch ]; + + cargoHash = "sha256-d6PLrs/n9riQ9oQTWn+6Ec1E5JhJZ7akDg8/UB21GzI="; checkFlags = [ # Fails for 1.6.0, but binary works fine @@ -32,7 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - nativeCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "Impossibly fast web search, made for static sites"; diff --git a/pkgs/applications/misc/stork/update-wasm-bindgen.patch b/pkgs/applications/misc/stork/update-wasm-bindgen.patch new file mode 100644 index 000000000000..56e276302323 --- /dev/null +++ b/pkgs/applications/misc/stork/update-wasm-bindgen.patch @@ -0,0 +1,253 @@ +diff --git a/Cargo.lock b/Cargo.lock +index df6305c..ec55cb0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "aho-corasick" +@@ -292,7 +292,7 @@ dependencies = [ + "proc-macro2", + "quote", + "smallvec", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -302,7 +302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -334,7 +334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -347,7 +347,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustc_version", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -585,7 +585,7 @@ dependencies = [ + "markup5ever", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -911,9 +911,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + + [[package]] + name = "once_cell" +-version = "1.8.0" ++version = "1.21.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + + [[package]] + name = "oorandom" +@@ -1036,7 +1036,7 @@ dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1135,11 +1135,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + + [[package]] + name = "proc-macro2" +-version = "1.0.32" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" + dependencies = [ +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -1156,9 +1156,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" + dependencies = [ + "proc-macro2", + ] +@@ -1357,6 +1357,12 @@ dependencies = [ + "semver", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++ + [[package]] + name = "ryu" + version = "1.0.5" +@@ -1464,7 +1470,7 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1535,7 +1541,7 @@ checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1671,6 +1677,17 @@ dependencies = [ + "unicode-xid", + ] + ++[[package]] ++name = "syn" ++version = "2.0.101" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ + [[package]] + name = "tempfile" + version = "3.3.0" +@@ -1750,7 +1767,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.82", + ] + + [[package]] +@@ -1885,6 +1902,12 @@ version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + ++[[package]] ++name = "unicode-ident" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" ++ + [[package]] + name = "unicode-linebreak" + version = "0.1.2" +@@ -1992,26 +2015,27 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.101", + "wasm-bindgen-shared", + ] + +@@ -2029,9 +2053,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -2039,22 +2063,25 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.101", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.78" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "web-sys"