diff options
Diffstat (limited to '')
-rw-r--r-- | misc/shimmy/Makefile | 16 | ||||
-rw-r--r-- | misc/shimmy/Makefile.crates | 25 | ||||
-rw-r--r-- | misc/shimmy/distinfo | 54 | ||||
-rw-r--r-- | misc/shimmy/files/patch-Cargo.lock | 800 | ||||
-rw-r--r-- | misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs (renamed from misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs) | 4 |
5 files changed, 72 insertions, 827 deletions
diff --git a/misc/shimmy/Makefile b/misc/shimmy/Makefile index df77d8544476..d2180d088041 100644 --- a/misc/shimmy/Makefile +++ b/misc/shimmy/Makefile @@ -1,6 +1,6 @@ PORTNAME= shimmy DISTVERSIONPREFIX= v -DISTVERSION= 1.7.0 +DISTVERSION= 1.7.3 CATEGORIES= misc MAINTAINER= tagattie@FreeBSD.org @@ -14,7 +14,6 @@ USES= cargo llvm USE_GITHUB= yes GH_ACCOUNT= Michael-A-Kuykendall -GH_TUPLE= ggml-org:llama.cpp:128d522c04286e019666bd6ee4d18e3fbf8772e2:llama_cpp/../${_CARGO_GIT_WRKDIR}/llama-cpp-sys-2/llama.cpp CARGO_FEATURES= llama-opencl CARGO_TEST_ARGS=--lib @@ -37,19 +36,10 @@ VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_USES= localbase:ldflags -VULKAN_VARS= CARGO_FEATURES+="llama-vulkan llama-cpp-2/vulkan" - -.include <bsd.port.pre.mk> - -_CARGO_GIT_WRKDIR!= ${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-fetch.awk /dev/null | \ - ${CUT} -f 4 -d ' ' - -post-patch: - @${BSDMAKE} PATCHDIR=${FILESDIR}/llama-cpp-rs \ - WRKSRC=${WRKDIR}/${_CARGO_GIT_WRKDIR} do-patch +VULKAN_VARS= CARGO_FEATURES+="llama-vulkan shimmy-llama-cpp-2/vulkan" do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/shimmy/Makefile.crates b/misc/shimmy/Makefile.crates index ccf014191140..7b9d80e46a6a 100644 --- a/misc/shimmy/Makefile.crates +++ b/misc/shimmy/Makefile.crates @@ -9,6 +9,7 @@ CARGO_CRATES= addr2line-0.25.1 \ anstyle-query-1.1.4 \ anstyle-wincon-3.0.10 \ anyhow-1.0.100 \ + assert_cmd-2.0.17 \ async-trait-0.1.89 \ atomic-waker-1.1.2 \ autocfg-1.5.0 \ @@ -21,6 +22,7 @@ CARGO_CRATES= addr2line-0.25.1 \ bitflags-1.3.2 \ bitflags-2.9.4 \ block-buffer-0.10.4 \ + bstr-1.12.0 \ bumpalo-3.19.0 \ byteorder-1.5.0 \ bytes-1.10.1 \ @@ -50,10 +52,12 @@ CARGO_CRATES= addr2line-0.25.1 \ crunchy-0.2.4 \ crypto-common-0.1.6 \ data-encoding-2.9.0 \ + difflib-0.4.0 \ digest-0.10.7 \ dirs-5.0.1 \ dirs-sys-0.4.1 \ displaydoc-0.2.5 \ + doc-comment-0.3.3 \ either-1.15.0 \ encoding_rs-0.8.35 \ enumflags2-0.7.12 \ @@ -63,10 +67,14 @@ CARGO_CRATES= addr2line-0.25.1 \ fastrand-2.3.0 \ find-msvc-tools-0.1.3 \ find_cuda_helper-0.2.0 \ + float-cmp-0.10.0 \ fnv-1.0.7 \ form_urlencoded-1.2.2 \ + futures-0.3.31 \ futures-channel-0.3.31 \ futures-core-0.3.31 \ + futures-executor-0.3.31 \ + futures-io-0.3.31 \ futures-macro-0.3.31 \ futures-sink-0.3.31 \ futures-task-0.3.31 \ @@ -114,7 +122,7 @@ CARGO_CRATES= addr2line-0.25.1 \ jobserver-0.1.34 \ js-sys-0.3.81 \ lazy_static-1.5.0 \ - libc-0.2.176 \ + libc-0.2.177 \ libloading-0.8.9 \ libredox-0.1.10 \ linux-raw-sys-0.11.0 \ @@ -132,6 +140,7 @@ CARGO_CRATES= addr2line-0.25.1 \ miniz_oxide-0.8.9 \ mio-1.0.4 \ nom-7.1.3 \ + normalize-line-endings-0.3.0 \ ntapi-0.4.1 \ nu-ansi-term-0.50.1 \ num-traits-0.2.19 \ @@ -150,6 +159,9 @@ CARGO_CRATES= addr2line-0.25.1 \ plotters-svg-0.3.7 \ potential_utf-0.1.3 \ ppv-lite86-0.2.21 \ + predicates-3.1.3 \ + predicates-core-1.0.9 \ + predicates-tree-1.0.12 \ prettyplease-0.2.37 \ proc-macro2-1.0.101 \ quote-1.0.41 \ @@ -176,8 +188,10 @@ CARGO_CRATES= addr2line-0.25.1 \ ryu-1.0.20 \ safetensors-0.4.5 \ same-file-1.0.6 \ + scc-2.4.0 \ scopeguard-1.2.0 \ sct-0.7.1 \ + sdd-3.0.10 \ self_cell-1.2.0 \ serde-1.0.228 \ serde_core-1.0.228 \ @@ -185,8 +199,12 @@ CARGO_CRATES= addr2line-0.25.1 \ serde_json-1.0.145 \ serde_path_to_error-0.1.20 \ serde_urlencoded-0.7.1 \ + serial_test-3.2.0 \ + serial_test_derive-3.2.0 \ sha1-0.10.6 \ sharded-slab-0.1.7 \ + shimmy-llama-cpp-2-0.1.123 \ + shimmy-llama-cpp-sys-2-0.1.123 \ shlex-1.3.0 \ signal-hook-registry-1.4.6 \ slab-0.4.11 \ @@ -204,6 +222,7 @@ CARGO_CRATES= addr2line-0.25.1 \ system-configuration-0.5.1 \ system-configuration-sys-0.5.0 \ tempfile-3.23.0 \ + termtree-0.5.1 \ thiserror-1.0.69 \ thiserror-impl-1.0.69 \ thread_local-1.1.9 \ @@ -237,6 +256,7 @@ CARGO_CRATES= addr2line-0.25.1 \ uuid-1.18.1 \ valuable-0.1.1 \ version_check-0.9.5 \ + wait-timeout-0.2.1 \ walkdir-2.5.0 \ want-0.3.1 \ wasi-0.11.1+wasi-snapshot-preview1 \ @@ -304,5 +324,4 @@ CARGO_CRATES= addr2line-0.25.1 \ zerofrom-derive-0.1.6 \ zerotrie-0.2.2 \ zerovec-0.11.4 \ - zerovec-derive-0.11.1 \ - llama-cpp-2,llama-cpp-sys-2@git+https://github.com/Michael-A-Kuykendall/llama-cpp-rs?branch=feat%2Fmoe-cpu-offload\#6c9a7044bbf83f7de16b39c15a3d00c1a239f3e0 + zerovec-derive-0.11.1 diff --git a/misc/shimmy/distinfo b/misc/shimmy/distinfo index 1bc0218473b5..53e77f9100d2 100644 --- a/misc/shimmy/distinfo +++ b/misc/shimmy/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1759990085 +TIMESTAMP = 1760302059 SHA256 (rust/crates/addr2line-0.25.1.crate) = 1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b SIZE (rust/crates/addr2line-0.25.1.crate) = 43134 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -21,6 +21,8 @@ SHA256 (rust/crates/anstyle-wincon-3.0.10.crate) = 3e0633414522a32ffaac8ac6cc8f7 SIZE (rust/crates/anstyle-wincon-3.0.10.crate) = 12558 SHA256 (rust/crates/anyhow-1.0.100.crate) = a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61 SIZE (rust/crates/anyhow-1.0.100.crate) = 54059 +SHA256 (rust/crates/assert_cmd-2.0.17.crate) = 2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66 +SIZE (rust/crates/assert_cmd-2.0.17.crate) = 26914 SHA256 (rust/crates/async-trait-0.1.89.crate) = 9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb SIZE (rust/crates/async-trait-0.1.89.crate) = 32171 SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0 @@ -45,6 +47,8 @@ SHA256 (rust/crates/bitflags-2.9.4.crate) = 2261d10cca569e4643e526d8dc2e62e433cc SIZE (rust/crates/bitflags-2.9.4.crate) = 47950 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538 +SHA256 (rust/crates/bstr-1.12.0.crate) = 234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4 +SIZE (rust/crates/bstr-1.12.0.crate) = 351557 SHA256 (rust/crates/bumpalo-3.19.0.crate) = 46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43 SIZE (rust/crates/bumpalo-3.19.0.crate) = 96414 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b @@ -103,6 +107,8 @@ SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 SHA256 (rust/crates/data-encoding-2.9.0.crate) = 2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476 SIZE (rust/crates/data-encoding-2.9.0.crate) = 21564 +SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8 +SIZE (rust/crates/difflib-0.4.0.crate) = 7638 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292 SIZE (rust/crates/digest-0.10.7.crate) = 19557 SHA256 (rust/crates/dirs-5.0.1.crate) = 44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225 @@ -111,6 +117,8 @@ SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab86275776 SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719 SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0 SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219 +SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10 +SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123 SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719 SIZE (rust/crates/either-1.15.0.crate) = 20114 SHA256 (rust/crates/encoding_rs-0.8.35.crate) = 75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3 @@ -129,14 +137,22 @@ SHA256 (rust/crates/find-msvc-tools-0.1.3.crate) = 0399f9d26e5191ce32c498bebd31e SIZE (rust/crates/find-msvc-tools-0.1.3.crate) = 30486 SHA256 (rust/crates/find_cuda_helper-0.2.0.crate) = f9f9e65c593dd01ac77daad909ea4ad17f0d6d1776193fc8ea766356177abdad SIZE (rust/crates/find_cuda_helper-0.2.0.crate) = 2768 +SHA256 (rust/crates/float-cmp-0.10.0.crate) = b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8 +SIZE (rust/crates/float-cmp-0.10.0.crate) = 10702 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1 SIZE (rust/crates/fnv-1.0.7.crate) = 11266 SHA256 (rust/crates/form_urlencoded-1.2.2.crate) = cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf SIZE (rust/crates/form_urlencoded-1.2.2.crate) = 9347 +SHA256 (rust/crates/futures-0.3.31.crate) = 65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876 +SIZE (rust/crates/futures-0.3.31.crate) = 54953 SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10 SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971 SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e SIZE (rust/crates/futures-core-0.3.31.crate) = 14318 +SHA256 (rust/crates/futures-executor-0.3.31.crate) = 1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f +SIZE (rust/crates/futures-executor-0.3.31.crate) = 17965 +SHA256 (rust/crates/futures-io-0.3.31.crate) = 9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6 +SIZE (rust/crates/futures-io-0.3.31.crate) = 9047 SHA256 (rust/crates/futures-macro-0.3.31.crate) = 162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650 SIZE (rust/crates/futures-macro-0.3.31.crate) = 11341 SHA256 (rust/crates/futures-sink-0.3.31.crate) = e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7 @@ -231,8 +247,8 @@ SHA256 (rust/crates/js-sys-0.3.81.crate) = ec48937a97411dcb524a265206ccd4c90bb71 SIZE (rust/crates/js-sys-0.3.81.crate) = 56399 SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025 -SHA256 (rust/crates/libc-0.2.176.crate) = 58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174 -SIZE (rust/crates/libc-0.2.176.crate) = 790040 +SHA256 (rust/crates/libc-0.2.177.crate) = 2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976 +SIZE (rust/crates/libc-0.2.177.crate) = 792045 SHA256 (rust/crates/libloading-0.8.9.crate) = d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55 SIZE (rust/crates/libloading-0.8.9.crate) = 30222 SHA256 (rust/crates/libredox-0.1.10.crate) = 416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb @@ -267,6 +283,8 @@ SHA256 (rust/crates/mio-1.0.4.crate) = 78bed444cc8a2160f01cbcf811ef18cac863ad68a SIZE (rust/crates/mio-1.0.4.crate) = 104212 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a SIZE (rust/crates/nom-7.1.3.crate) = 117570 +SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be +SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737 SHA256 (rust/crates/ntapi-0.4.1.crate) = e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4 SIZE (rust/crates/ntapi-0.4.1.crate) = 126552 SHA256 (rust/crates/nu-ansi-term-0.50.1.crate) = d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399 @@ -303,6 +321,12 @@ SHA256 (rust/crates/potential_utf-0.1.3.crate) = 84df19adbe5b5a0782edcab45899906 SIZE (rust/crates/potential_utf-0.1.3.crate) = 9698 SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9 SIZE (rust/crates/ppv-lite86-0.2.21.crate) = 22522 +SHA256 (rust/crates/predicates-3.1.3.crate) = a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573 +SIZE (rust/crates/predicates-3.1.3.crate) = 24063 +SHA256 (rust/crates/predicates-core-1.0.9.crate) = 727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa +SIZE (rust/crates/predicates-core-1.0.9.crate) = 8618 +SHA256 (rust/crates/predicates-tree-1.0.12.crate) = 72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c +SIZE (rust/crates/predicates-tree-1.0.12.crate) = 8392 SHA256 (rust/crates/prettyplease-0.2.37.crate) = 479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b SIZE (rust/crates/prettyplease-0.2.37.crate) = 72033 SHA256 (rust/crates/proc-macro2-1.0.101.crate) = 89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de @@ -355,10 +379,14 @@ SHA256 (rust/crates/safetensors-0.4.5.crate) = 44560c11236a6130a46ce36c836a62936 SIZE (rust/crates/safetensors-0.4.5.crate) = 21800 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 +SHA256 (rust/crates/scc-2.4.0.crate) = 46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc +SIZE (rust/crates/scc-2.4.0.crate) = 145014 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414 SIZE (rust/crates/sct-0.7.1.crate) = 27501 +SHA256 (rust/crates/sdd-3.0.10.crate) = 490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca +SIZE (rust/crates/sdd-3.0.10.crate) = 32748 SHA256 (rust/crates/self_cell-1.2.0.crate) = 0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749 SIZE (rust/crates/self_cell-1.2.0.crate) = 16883 SHA256 (rust/crates/serde-1.0.228.crate) = 9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e @@ -373,10 +401,18 @@ SHA256 (rust/crates/serde_path_to_error-0.1.20.crate) = 10a9ff822e371bb5403e391e SIZE (rust/crates/serde_path_to_error-0.1.20.crate) = 18046 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822 +SHA256 (rust/crates/serial_test-3.2.0.crate) = 1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9 +SIZE (rust/crates/serial_test-3.2.0.crate) = 9232 +SHA256 (rust/crates/serial_test_derive-3.2.0.crate) = 5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef +SIZE (rust/crates/serial_test_derive-3.2.0.crate) = 6992 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba SIZE (rust/crates/sha1-0.10.6.crate) = 13517 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227 +SHA256 (rust/crates/shimmy-llama-cpp-2-0.1.123.crate) = 7202bdb73b956d4d3126bcd87845d227c7f5b453ba824bfccc3e7d11fdd2b92f +SIZE (rust/crates/shimmy-llama-cpp-2-0.1.123.crate) = 51688 +SHA256 (rust/crates/shimmy-llama-cpp-sys-2-0.1.123.crate) = cf105c1264729706662288ec8314a1ad1716071eddd54bdfc305be231786414b +SIZE (rust/crates/shimmy-llama-cpp-sys-2-0.1.123.crate) = 2567695 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64 SIZE (rust/crates/shlex-1.3.0.crate) = 18713 SHA256 (rust/crates/signal-hook-registry-1.4.6.crate) = b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b @@ -411,6 +447,8 @@ SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683 SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730 SHA256 (rust/crates/tempfile-3.23.0.crate) = 2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16 SIZE (rust/crates/tempfile-3.23.0.crate) = 43063 +SHA256 (rust/crates/termtree-0.5.1.crate) = 8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683 +SIZE (rust/crates/termtree-0.5.1.crate) = 8498 SHA256 (rust/crates/thiserror-1.0.69.crate) = b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52 SIZE (rust/crates/thiserror-1.0.69.crate) = 22198 SHA256 (rust/crates/thiserror-impl-1.0.69.crate) = 4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1 @@ -477,6 +515,8 @@ SHA256 (rust/crates/valuable-0.1.1.crate) = ba73ea9cf16a25df0c8caa16c51acb937d57 SIZE (rust/crates/valuable-0.1.1.crate) = 28679 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a SIZE (rust/crates/version_check-0.9.5.crate) = 15554 +SHA256 (rust/crates/wait-timeout-0.2.1.crate) = 09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11 +SIZE (rust/crates/wait-timeout-0.2.1.crate) = 11435 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b SIZE (rust/crates/walkdir-2.5.0.crate) = 23951 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e @@ -613,9 +653,5 @@ SHA256 (rust/crates/zerovec-0.11.4.crate) = e7aa2bd55086f1ab526693ecbe444205da57 SIZE (rust/crates/zerovec-0.11.4.crate) = 125080 SHA256 (rust/crates/zerovec-derive-0.11.1.crate) = 5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f SIZE (rust/crates/zerovec-derive-0.11.1.crate) = 21294 -SHA256 (Michael-A-Kuykendall-llama-cpp-rs-6c9a7044bbf83f7de16b39c15a3d00c1a239f3e0_GH0.tar.gz) = 408d631340630bc8ad53ee0239a2db1f46954853d5539bad6c6c73e930d071c4 -SIZE (Michael-A-Kuykendall-llama-cpp-rs-6c9a7044bbf83f7de16b39c15a3d00c1a239f3e0_GH0.tar.gz) = 87588 -SHA256 (Michael-A-Kuykendall-shimmy-v1.7.0_GH0.tar.gz) = 693be6630afc837f325e1f498af33fffc49b8cbab45e96909abc775cd6cfa0e7 -SIZE (Michael-A-Kuykendall-shimmy-v1.7.0_GH0.tar.gz) = 206968849 -SHA256 (ggml-org-llama.cpp-128d522c04286e019666bd6ee4d18e3fbf8772e2_GH0.tar.gz) = e5032ccdf009794d70905736464a15bbb285fbc7e6242513a78abc9aaf618b23 -SIZE (ggml-org-llama.cpp-128d522c04286e019666bd6ee4d18e3fbf8772e2_GH0.tar.gz) = 25886906 +SHA256 (Michael-A-Kuykendall-shimmy-v1.7.3_GH0.tar.gz) = a420c069d254314a11db7908b19d1f0cd32f56786d0d88701d96e91b2adb7d82 +SIZE (Michael-A-Kuykendall-shimmy-v1.7.3_GH0.tar.gz) = 5221988 diff --git a/misc/shimmy/files/patch-Cargo.lock b/misc/shimmy/files/patch-Cargo.lock deleted file mode 100644 index d195afe12be9..000000000000 --- a/misc/shimmy/files/patch-Cargo.lock +++ /dev/null @@ -1,800 +0,0 @@ ---- Cargo.lock.orig 2025-10-09 02:55:29 UTC -+++ Cargo.lock -@@ -4,9 +4,9 @@ name = "addr2line" - - [[package]] - name = "addr2line" --version = "0.24.2" -+version = "0.25.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" - dependencies = [ - "gimli", - ] -@@ -43,9 +43,9 @@ name = "anstream" - - [[package]] - name = "anstream" --version = "0.6.20" -+version = "0.6.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" -+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" - dependencies = [ - "anstyle", - "anstyle-parse", -@@ -58,9 +58,9 @@ name = "anstyle" - - [[package]] - name = "anstyle" --version = "1.0.11" -+version = "1.0.13" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" -+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - - [[package]] - name = "anstyle-parse" -@@ -93,9 +93,9 @@ name = "anyhow" - - [[package]] - name = "anyhow" --version = "1.0.99" -+version = "1.0.100" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" -+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" - - [[package]] - name = "async-trait" -@@ -180,9 +180,9 @@ name = "backtrace" - - [[package]] - name = "backtrace" --version = "0.3.75" -+version = "0.3.76" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" - dependencies = [ - "addr2line", - "cfg-if", -@@ -190,7 +190,7 @@ dependencies = [ - "miniz_oxide", - "object", - "rustc-demangle", -- "windows-targets 0.52.6", -+ "windows-link", - ] - - [[package]] -@@ -214,7 +214,7 @@ dependencies = [ - "bitflags 2.9.4", - "cexpr", - "clang-sys", -- "itertools", -+ "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", -@@ -308,7 +308,7 @@ dependencies = [ - "num-traits", - "serde", - "wasm-bindgen", -- "windows-link 0.2.0", -+ "windows-link", - ] - - [[package]] -@@ -351,9 +351,9 @@ name = "clap" - - [[package]] - name = "clap" --version = "4.5.47" -+version = "4.5.48" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" -+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" - dependencies = [ - "clap_builder", - "clap_derive", -@@ -361,9 +361,9 @@ name = "clap_builder" - - [[package]] - name = "clap_builder" --version = "4.5.47" -+version = "4.5.48" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" -+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" - dependencies = [ - "anstream", - "anstyle", -@@ -441,7 +441,7 @@ dependencies = [ - "clap", - "criterion-plot", - "is-terminal", -- "itertools", -+ "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", -@@ -462,7 +462,7 @@ dependencies = [ - checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" - dependencies = [ - "cast", -- "itertools", -+ "itertools 0.10.5", - ] - - [[package]] -@@ -602,7 +602,7 @@ dependencies = [ - checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" - dependencies = [ - "libc", -- "windows-sys 0.59.0", -+ "windows-sys 0.61.2", - ] - - [[package]] -@@ -729,9 +729,9 @@ name = "gimli" - - [[package]] - name = "gimli" --version = "0.31.1" -+version = "0.32.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - - [[package]] - name = "glob" -@@ -760,19 +760,20 @@ name = "half" - - [[package]] - name = "half" --version = "2.6.0" -+version = "2.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" -+checksum = "e54c115d4f30f52c67202f079c5f9d8b49db4691f460fdb0b4c2e838261b2ba5" - dependencies = [ - "cfg-if", - "crunchy", -+ "zerocopy", - ] - - [[package]] - name = "hashbrown" --version = "0.15.5" -+version = "0.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" - - [[package]] - name = "heck" -@@ -941,7 +942,7 @@ dependencies = [ - "js-sys", - "log", - "wasm-bindgen", -- "windows-core 0.62.0", -+ "windows-core 0.62.2", - ] - - [[package]] -@@ -1062,9 +1063,9 @@ name = "indexmap" - - [[package]] - name = "indexmap" --version = "2.11.3" -+version = "2.11.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92119844f513ffa41556430369ab02c295a3578af21cf945caa3e9e0c2481ac3" -+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" - dependencies = [ - "equivalent", - "hashbrown", -@@ -1114,6 +1115,15 @@ dependencies = [ - ] - - [[package]] -+name = "itertools" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -+dependencies = [ -+ "either", -+] -+ -+[[package]] - name = "itoa" - version = "1.0.15" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1131,9 +1141,9 @@ name = "js-sys" - - [[package]] - name = "js-sys" --version = "0.3.80" -+version = "0.3.81" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" -+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" - dependencies = [ - "once_cell", - "wasm-bindgen", -@@ -1147,18 +1157,18 @@ name = "libc" - - [[package]] - name = "libc" --version = "0.2.175" -+version = "0.2.176" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" -+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" - - [[package]] - name = "libloading" --version = "0.8.8" -+version = "0.8.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" -+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" - dependencies = [ - "cfg-if", -- "windows-targets 0.48.5", -+ "windows-link", - ] - - [[package]] -@@ -1186,6 +1196,7 @@ version = "0.1.123" - [[package]] - name = "llama-cpp-2" - version = "0.1.123" -+source = "git+https://github.com/Michael-A-Kuykendall/llama-cpp-rs?branch=feat%2Fmoe-cpu-offload#6c9a7044bbf83f7de16b39c15a3d00c1a239f3e0" - dependencies = [ - "enumflags2", - "llama-cpp-sys-2", -@@ -1197,6 +1208,7 @@ version = "0.1.123" - [[package]] - name = "llama-cpp-sys-2" - version = "0.1.123" -+source = "git+https://github.com/Michael-A-Kuykendall/llama-cpp-rs?branch=feat%2Fmoe-cpu-offload#6c9a7044bbf83f7de16b39c15a3d00c1a239f3e0" - dependencies = [ - "bindgen", - "cc", -@@ -1208,11 +1220,10 @@ name = "lock_api" - - [[package]] - name = "lock_api" --version = "0.4.13" -+version = "0.4.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" -+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" - dependencies = [ -- "autocfg", - "scopeguard", - ] - -@@ -1239,9 +1250,9 @@ name = "memchr" - - [[package]] - name = "memchr" --version = "2.7.5" -+version = "2.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" -+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" - - [[package]] - name = "memmap2" -@@ -1340,9 +1351,9 @@ name = "object" - - [[package]] - name = "object" --version = "0.36.7" -+version = "0.37.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" - dependencies = [ - "memchr", - ] -@@ -1373,9 +1384,9 @@ name = "parking_lot" - - [[package]] - name = "parking_lot" --version = "0.12.4" -+version = "0.12.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" -+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" - dependencies = [ - "lock_api", - "parking_lot_core", -@@ -1383,15 +1394,15 @@ name = "parking_lot_core" - - [[package]] - name = "parking_lot_core" --version = "0.9.11" -+version = "0.9.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" -+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" - dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", -- "windows-targets 0.52.6", -+ "windows-link", - ] - - [[package]] -@@ -1479,9 +1490,9 @@ name = "quote" - - [[package]] - name = "quote" --version = "1.0.40" -+version = "1.0.41" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" - dependencies = [ - "proc-macro2", - ] -@@ -1544,9 +1555,9 @@ name = "redox_syscall" - - [[package]] - name = "redox_syscall" --version = "0.5.17" -+version = "0.5.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" -+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" - dependencies = [ - "bitflags 2.9.4", - ] -@@ -1564,9 +1575,9 @@ name = "regex" - - [[package]] - name = "regex" --version = "1.11.2" -+version = "1.11.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" -+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" - dependencies = [ - "aho-corasick", - "memchr", -@@ -1576,9 +1587,9 @@ name = "regex-automata" - - [[package]] - name = "regex-automata" --version = "0.4.10" -+version = "0.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" -+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" - dependencies = [ - "aho-corasick", - "memchr", -@@ -1668,7 +1679,7 @@ dependencies = [ - "errno", - "libc", - "linux-raw-sys", -- "windows-sys 0.59.0", -+ "windows-sys 0.61.2", - ] - - [[package]] -@@ -1757,9 +1768,9 @@ name = "serde" - - [[package]] - name = "serde" --version = "1.0.225" -+version = "1.0.228" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d" -+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" - dependencies = [ - "serde_core", - "serde_derive", -@@ -1767,18 +1778,18 @@ name = "serde_core" - - [[package]] - name = "serde_core" --version = "1.0.225" -+version = "1.0.228" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383" -+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.225" -+version = "1.0.228" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516" -+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" - dependencies = [ - "proc-macro2", - "quote", -@@ -1843,7 +1854,7 @@ name = "shimmy" - - [[package]] - name = "shimmy" --version = "1.6.0" -+version = "1.7.0" - dependencies = [ - "anyhow", - "async-trait", -@@ -1925,9 +1936,9 @@ name = "stable_deref_trait" - - [[package]] - name = "stable_deref_trait" --version = "1.2.0" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - - [[package]] - name = "strsim" -@@ -2017,15 +2028,15 @@ name = "tempfile" - - [[package]] - name = "tempfile" --version = "3.22.0" -+version = "3.23.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" -+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" - dependencies = [ - "fastrand", - "getrandom 0.3.3", - "once_cell", - "rustix", -- "windows-sys 0.59.0", -+ "windows-sys 0.61.2", - ] - - [[package]] -@@ -2300,9 +2311,9 @@ name = "typenum" - - [[package]] - name = "typenum" --version = "1.18.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" -+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" - - [[package]] - name = "unicode-ident" -@@ -2415,9 +2426,9 @@ name = "wasm-bindgen" - - [[package]] - name = "wasm-bindgen" --version = "0.2.103" -+version = "0.2.104" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" -+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" - dependencies = [ - "cfg-if", - "once_cell", -@@ -2428,9 +2439,9 @@ name = "wasm-bindgen-backend" - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.103" -+version = "0.2.104" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" -+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" - dependencies = [ - "bumpalo", - "log", -@@ -2442,9 +2453,9 @@ name = "wasm-bindgen-futures" - - [[package]] - name = "wasm-bindgen-futures" --version = "0.4.53" -+version = "0.4.54" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0b221ff421256839509adbb55998214a70d829d3a28c69b4a6672e9d2a42f67" -+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" - dependencies = [ - "cfg-if", - "js-sys", -@@ -2455,9 +2466,9 @@ name = "wasm-bindgen-macro" - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.103" -+version = "0.2.104" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" -+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -2465,9 +2476,9 @@ name = "wasm-bindgen-macro-support" - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.103" -+version = "0.2.104" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" -+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" - dependencies = [ - "proc-macro2", - "quote", -@@ -2478,18 +2489,18 @@ name = "wasm-bindgen-shared" - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.103" -+version = "0.2.104" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" -+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "web-sys" --version = "0.3.80" -+version = "0.3.81" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" -+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" - dependencies = [ - "js-sys", - "wasm-bindgen", -@@ -2523,7 +2534,7 @@ dependencies = [ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" - dependencies = [ -- "windows-sys 0.48.0", -+ "windows-sys 0.61.2", - ] - - [[package]] -@@ -2553,22 +2564,22 @@ name = "windows-core" - - [[package]] - name = "windows-core" --version = "0.62.0" -+version = "0.62.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" -+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" - dependencies = [ - "windows-implement", - "windows-interface", -- "windows-link 0.2.0", -+ "windows-link", - "windows-result", - "windows-strings", - ] - - [[package]] - name = "windows-implement" --version = "0.60.0" -+version = "0.60.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" - dependencies = [ - "proc-macro2", - "quote", -@@ -2577,9 +2588,9 @@ name = "windows-interface" - - [[package]] - name = "windows-interface" --version = "0.59.1" -+version = "0.59.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" - dependencies = [ - "proc-macro2", - "quote", -@@ -2588,32 +2599,26 @@ name = "windows-link" - - [[package]] - name = "windows-link" --version = "0.1.3" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" -+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - - [[package]] --name = "windows-link" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" -- --[[package]] - name = "windows-result" --version = "0.4.0" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" -+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" - dependencies = [ -- "windows-link 0.2.0", -+ "windows-link", - ] - - [[package]] - name = "windows-strings" --version = "0.5.0" -+version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" -+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" - dependencies = [ -- "windows-link 0.2.0", -+ "windows-link", - ] - - [[package]] -@@ -2649,10 +2654,19 @@ dependencies = [ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" - dependencies = [ -- "windows-targets 0.53.3", -+ "windows-targets 0.53.5", - ] - - [[package]] -+name = "windows-sys" -+version = "0.61.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -+dependencies = [ -+ "windows-link", -+] -+ -+[[package]] - name = "windows-targets" - version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2685,19 +2699,19 @@ name = "windows-targets" - - [[package]] - name = "windows-targets" --version = "0.53.3" -+version = "0.53.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" -+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" - dependencies = [ -- "windows-link 0.1.3", -- "windows_aarch64_gnullvm 0.53.0", -- "windows_aarch64_msvc 0.53.0", -- "windows_i686_gnu 0.53.0", -- "windows_i686_gnullvm 0.53.0", -- "windows_i686_msvc 0.53.0", -- "windows_x86_64_gnu 0.53.0", -- "windows_x86_64_gnullvm 0.53.0", -- "windows_x86_64_msvc 0.53.0", -+ "windows-link", -+ "windows_aarch64_gnullvm 0.53.1", -+ "windows_aarch64_msvc 0.53.1", -+ "windows_i686_gnu 0.53.1", -+ "windows_i686_gnullvm 0.53.1", -+ "windows_i686_msvc 0.53.1", -+ "windows_x86_64_gnu 0.53.1", -+ "windows_x86_64_gnullvm 0.53.1", -+ "windows_x86_64_msvc 0.53.1", - ] - - [[package]] -@@ -2714,9 +2728,9 @@ name = "windows_aarch64_gnullvm" - - [[package]] - name = "windows_aarch64_gnullvm" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" -+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - - [[package]] - name = "windows_aarch64_msvc" -@@ -2732,9 +2746,9 @@ name = "windows_aarch64_msvc" - - [[package]] - name = "windows_aarch64_msvc" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" -+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - - [[package]] - name = "windows_i686_gnu" -@@ -2750,9 +2764,9 @@ name = "windows_i686_gnu" - - [[package]] - name = "windows_i686_gnu" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" -+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - - [[package]] - name = "windows_i686_gnullvm" -@@ -2762,9 +2776,9 @@ name = "windows_i686_gnullvm" - - [[package]] - name = "windows_i686_gnullvm" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" -+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - - [[package]] - name = "windows_i686_msvc" -@@ -2780,9 +2794,9 @@ name = "windows_i686_msvc" - - [[package]] - name = "windows_i686_msvc" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" -+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - - [[package]] - name = "windows_x86_64_gnu" -@@ -2798,9 +2812,9 @@ name = "windows_x86_64_gnu" - - [[package]] - name = "windows_x86_64_gnu" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" -+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - - [[package]] - name = "windows_x86_64_gnullvm" -@@ -2816,9 +2830,9 @@ name = "windows_x86_64_gnullvm" - - [[package]] - name = "windows_x86_64_gnullvm" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" -+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - - [[package]] - name = "windows_x86_64_msvc" -@@ -2834,9 +2848,9 @@ name = "windows_x86_64_msvc" - - [[package]] - name = "windows_x86_64_msvc" --version = "0.53.0" -+version = "0.53.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" -+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - - [[package]] - name = "winreg" diff --git a/misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs index a1d21fbdbdda..3c6a0ab9435a 100644 --- a/misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs +++ b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs @@ -1,5 +1,5 @@ ---- llama-cpp-sys-2/build.rs.orig 2025-10-06 14:29:33 UTC -+++ llama-cpp-sys-2/build.rs +--- cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/build.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/build.rs @@ -20,6 +20,7 @@ enum TargetOs { Apple(AppleVariant), Linux, |