From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 81FAE1C5DB; Fri, 2 Apr 2021 23:55:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 42AC11C5BE; Fri, 2 Apr 2021 23:54:52 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 3938D1C5B0; Fri, 2 Apr 2021 23:54:50 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by atuin.qyliss.net (Postfix) with ESMTPS id EB3261C5AF for ; Fri, 2 Apr 2021 23:54:44 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B20915C0113; Fri, 2 Apr 2021 19:54:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 02 Apr 2021 19:54:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=yPCDGhjmwG6BSw7Rf6V9+OQaFK HpRhpIZzn6FTr91Q4=; b=M8iDp5suCVyx8T/iIojo2t6uPWPoCGLi6v/OQxbvMt 9aZ21gNcJS4caKCbX0F1Sj8ioTNgbdmFtVK8nvDpuGAVqWggQJ+uS1i9ppgD6NM5 xg1exan54uv+AG/OfD762HickNhcxfOIk0GFJ4uA51pYwfZqsbWgEuhHaMddzI0h ev7B79HvaAWi9W0lYnNpFyNXu3OOFfYRkM2Z0alB//2d0uz3ifv+66XOvtwECSBz y0MNXcqEJP9HeMWoEK/PeLsOA6H92KDSwBoEWRd0VtEAMQ00qo+XCjRwcZzISjss yGIt1IGeNSOfPAjUp/uArWFC0HYsxwoYsoxywCdWqU0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=yPCDGh jmwG6BSw7Rf6V9+OQaFKHpRhpIZzn6FTr91Q4=; b=j7T0Ef5GzARhgx0lKVN0hi ohM6TbCerbtH8T+E6Xn9APVHp2X43IjHR0wfFMMaAJ6CIqXreNwqLdjjr5XQVWGM vIFvos/t4niJb5bK8MsSEoaVT1ZBNmUJJnn4g7Q8ehZ0RMaXoVfUwrUciTKQgogM 3BxB8H4AbXPPQJImCfpW1Lm95BqGbYBj4GoILFKweLLnynt596N3Gs0yTeOdQ1/R Bq+D6AvkW+Nc5Q33yETRGIoCrvIf0WGjL2Eu8DFwfbzB7dFKLKF6qVwPTh8AXiJl oAOOz28ieBTbkVWcToWyuyjnvylDxLD8Hac44dRJj5pzlSuK3hL9YYAxJrCIOVxw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudeijedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhffkfggtgesghdtreertddttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepleelgf ekhfelheeiueffjefhffeghfelkefhieelueetveeikeekveeigeeugfejnecuffhomhgr ihhnpehgihhthhhusgdrtghomhenucfkphepjeelrddvfedurddvgeefrddvtddunecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhih shhsrgdrihhs X-ME-Proxy: Received: from x220.qyliss.net (p4fe7f3c9.dip0.t-ipconnect.de [79.231.243.201]) by mail.messagingengine.com (Postfix) with ESMTPA id 9AF1824005B; Fri, 2 Apr 2021 19:54:42 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 1B8305B6; Fri, 2 Apr 2021 23:54:40 +0000 (UTC) From: Alyssa Ross To: Jamie McClymont Subject: Re: [RFC PATCH 0/8] Update chromiumPacakges In-Reply-To: <0100017891d36f4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@email.amazonses.com> References: <0100017891d36f4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@email.amazonses.com> Date: Fri, 02 Apr 2021 23:54:37 +0000 Message-ID: <87sg48w8ci.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Message-ID-Hash: DU64XCG6KYCKN6SIIPNU5ILKKEJY3OXO X-Message-ID-Hash: DU64XCG6KYCKN6SIIPNU5ILKKEJY3OXO X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: devel@spectrum-os.org X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jamie McClymont writes: > Hi all > > Here's a nearly-complete(?) attempt at bumping chromiumOSPackages. > > Everything under chromiumOSPackages and spectrumPackages builds except cr= osvm > (and therefore spectrum-vm). I've added platform2 as a dependency (a few = rust > crates from there are now used) and bumped the cargoSha256, so the vendor= FOD > now builds happily, but the actual `cargo build` fails with: > >> error: the lock file /build/src/platform/crosvm/Cargo.lock needs to be u= pdated but --frozen was passed to prevent this >> If you want to try to generate the lock file without accessing the netwo= rk, use the --offline flag. > > I haven't dealt with buildRustPackage before, so I'm not sure if this is a > standard thing that any frequent buildRustPackage user will know how to f= ix, or > if we're running in to an odd edge-case - emailing it in as-is in the hop= es that > it's the former :) This is not uncommon -- maybe we could have a better error message for it in Nixpkgs (or maybe we do already and we're just not seeing that in Spectrum's Nixpkgs, which is by now quite outdated!). It means that the Cargo.lock file in the sources doesn't match up with what the Cargo.toml file (and any Cargo.toml files of local dependencies like things in platform2) are asking for. The error message comes from Cargo wanting to talk to the network to recreate the lockfile. To fix this, we can regenerate the lockfile with `cargo generate-lockfile', and then use the cargoPatches attribute to apply a patch that fixes it. With that changed, and a few new dependencies added, I was able to get crosvm most of the way through a build (diff below). The only problem now is that the boot test doesn't work. I bisected that to the following crosvm commit: > e4cbef4caf66779e5f8734c63fb591c991bf9674 is the first bad commit > commit e4cbef4caf66779e5f8734c63fb591c991bf9674 > Author: Zach Reizner > Date: Fri Feb 21 14:42:32 2020 -0800 > > tests: enable logging for boot test >=20=20=20=20 > The logs are important for diagnosing errors for the boot integration > testing. This change enables those logs. But it's bed time for me now, so that's where I'll have to leave it for tonight. Maybe you can figure it out. :) BTW: your patches aren't threaded properly -- they're in response to an email that was either never sent or never arrived, rather than to this one. Just in case you didn't realise -- it's not a big deal and I made the same mistake just last week. :) Anyway, here's what I have so far: diff --git c/pkgs/os-specific/linux/chromium-os/crosvm/default.nix i/pkgs/o= s-specific/linux/chromium-os/crosvm/default.nix index 1013e7817e4..03025d914cd 100644 =2D-- c/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ i/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, rustPlatform, fetchFromGitiles, upstreamInfo =2D, pkgconfig, minijail, dtc, libusb1, libcap, linux +, pkgconfig, minigbm, minijail, wayland, wayland-protocols, dtc, libusb1, = libcap +, linux }: =20 let @@ -38,15 +39,17 @@ in =20 sourceRoot =3D "src/platform/crosvm"; =20 + cargoPatches =3D [ ./Regenerate-Cargo.lock.patch ]; + patches =3D [ ./default-seccomp-policy-dir.diff ]; =20 =2D cargoSha256 =3D "02y4wvm2l54f3y0dzcfyzay4hsy7b1q8x9kshqidi9pvh09if7x= 4"; + cargoSha256 =3D "0rrhgchrf6ac5393rxlkff0kd3xs7xixxshcdpag3lxjgg0j62af"; =20 =2D nativeBuildInputs =3D [ pkgconfig ]; + nativeBuildInputs =3D [ pkgconfig wayland ]; =20 =2D buildInputs =3D [ dtc libcap libusb1 minijail ]; + buildInputs =3D [ dtc libcap libusb1 minigbm minijail wayland wayland-= protocols ]; =20 postPatch =3D '' sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \ diff --git c/pkgs/os-specific/linux/chromium-os/crosvm/Regenerate-Cargo.loc= k.patch i/pkgs/os-specific/linux/chromium-os/crosvm/Regenerate-Cargo.lock.p= atch new file mode 100644 index 00000000000..07dbd5469e7 =2D-- /dev/null +++ i/pkgs/os-specific/linux/chromium-os/crosvm/Regenerate-Cargo.lock.patch @@ -0,0 +1,681 @@ +From 972ee713ae8e48c3a99fbddca68018e20bb148c7 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 2 Apr 2021 16:38:28 +0000 +Subject: [PATCH crosvm] Regenerate Cargo.lock + +--- + Cargo.lock | 327 +++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 240 insertions(+), 87 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 3179b43f5..c82916b06 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -26,7 +26,7 @@ name =3D "acpi_tables" + version =3D "0.1.0" + dependencies =3D [ + "data_model", +- "tempfile", ++ "tempfile 3.0.7", + ] +=20 + [[package]] +@@ -61,9 +61,9 @@ version =3D "0.1.0" +=20 + [[package]] + name =3D "async-trait" +-version =3D "0.1.36" ++version =3D "0.1.48" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d038= 5eb92" ++checksum =3D "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b935= 76adf" + dependencies =3D [ + "proc-macro2", + "quote", +@@ -113,9 +113,9 @@ dependencies =3D [ +=20 + [[package]] + name =3D "bitflags" +-version =3D "1.1.0" ++version =3D "1.2.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c= 281fd" ++checksum =3D "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d6= 91693" +=20 + [[package]] + name =3D "cc" +@@ -129,6 +129,12 @@ version =3D "0.1.10" + source =3D "registry+https://github.com/rust-lang/crates.io-index" + checksum =3D "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a3610= 40822" +=20 ++[[package]] ++name =3D "cfg-if" ++version =3D "1.0.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2d= a40fd" ++ + [[package]] + name =3D "cras-sys" + version =3D "0.1.0" +@@ -189,7 +195,7 @@ dependencies =3D [ + "resources", + "rutabaga_gfx", + "sync", +- "tempfile", ++ "tempfile 3.2.0", + "thiserror", + "vhost", + "vm_control", +@@ -262,7 +268,7 @@ dependencies =3D [ + "rutabaga_gfx", + "sync", + "syscall_defines", +- "tempfile", ++ "tempfile 3.0.7", + "tpm2", + "usb_util", + "vfio_sys", +@@ -285,7 +291,7 @@ dependencies =3D [ + "protobuf", + "protos", + "remain", +- "tempfile", ++ "tempfile 3.2.0", + "vm_memory", + ] +=20 +@@ -295,6 +301,12 @@ version =3D "1.2.0" + source =3D "registry+https://github.com/rust-lang/crates.io-index" + checksum =3D "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9= b6650" +=20 ++[[package]] ++name =3D "either" ++version =3D "1.6.1" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4= e9457" ++ + [[package]] + name =3D "enumn" + version =3D "0.1.0" +@@ -318,9 +330,9 @@ dependencies =3D [ +=20 + [[package]] + name =3D "futures" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8c= a5987" ++checksum =3D "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163e= a14c1" + dependencies =3D [ + "futures-channel", + "futures-core", +@@ -333,9 +345,9 @@ dependencies =3D [ +=20 + [[package]] + name =3D "futures-channel" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc89= 99b86" ++checksum =3D "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2a= d2939" + dependencies =3D [ + "futures-core", + "futures-sink", +@@ -343,15 +355,15 @@ dependencies =3D [ +=20 + [[package]] + name =3D "futures-core" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec= 10866" ++checksum =3D "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a91= 12c94" +=20 + [[package]] + name =3D "futures-executor" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe162= 7c231" ++checksum =3D "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9= c0ad1" + dependencies =3D [ + "futures-core", + "futures-task", +@@ -360,15 +372,15 @@ dependencies =3D [ +=20 + [[package]] + name =3D "futures-io" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d2= 0b5ff" ++checksum =3D "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db28= 7ba59" +=20 + [[package]] + name =3D "futures-macro" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e= 87764" ++checksum =3D "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37= fbfb7" + dependencies =3D [ + "proc-macro-hack", + "proc-macro2", +@@ -378,21 +390,21 @@ dependencies =3D [ +=20 + [[package]] + name =3D "futures-sink" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd= 43c16" ++checksum =3D "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525= b8bb3" +=20 + [[package]] + name =3D "futures-task" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd66= 9e5f9" ++checksum =3D "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c= 9df80" +=20 + [[package]] + name =3D "futures-util" +-version =3D "0.3.1" ++version =3D "0.3.13" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc= 39e76" ++checksum =3D "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963= d96d1" + dependencies =3D [ + "futures-channel", + "futures-core", +@@ -401,6 +413,7 @@ dependencies =3D [ + "futures-sink", + "futures-task", + "memchr", ++ "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", +@@ -409,11 +422,11 @@ dependencies =3D [ +=20 + [[package]] + name =3D "gdbstub" +-version =3D "0.4.0" ++version =3D "0.4.5" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "347c27d24b8ac4a2bcad3ff3d0695271a0510c020bd8134b53d189e973e= d58bf" ++checksum =3D "d79a8fc10e9c4a4009deacc1d1e632cc2860c63c5169abc737f838e0753= 4ab1a" + dependencies =3D [ +- "cfg-if", ++ "cfg-if 0.1.10", + "log", + "managed", + "num-traits", +@@ -422,13 +435,24 @@ dependencies =3D [ +=20 + [[package]] + name =3D "getopts" +-version =3D "0.2.18" ++version =3D "0.2.21" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f26695= 1b797" ++checksum =3D "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371= eebd5" + dependencies =3D [ + "unicode-width", + ] +=20 ++[[package]] ++name =3D "getrandom" ++version =3D "0.2.2" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156= 732c8" ++dependencies =3D [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi", ++] ++ + [[package]] + name =3D "gpu_buffer" + version =3D "0.1.0" +@@ -448,6 +472,15 @@ dependencies =3D [ + "linux_input_sys", + ] +=20 ++[[package]] ++name =3D "hermit-abi" ++version =3D "0.1.18" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7f= bcc5c" ++dependencies =3D [ ++ "libc", ++] ++ + [[package]] + name =3D "hypervisor" + version =3D "0.1.0" +@@ -496,7 +529,7 @@ version =3D "0.1.0" + dependencies =3D [ + "base", + "libc", +- "tempfile", ++ "tempfile 3.2.0", + "vm_memory", + ] +=20 +@@ -524,9 +557,9 @@ dependencies =3D [ +=20 + [[package]] + name =3D "libc" +-version =3D "0.2.65" ++version =3D "0.2.92" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5= c24e8" ++checksum =3D "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c49= 86714" +=20 + [[package]] + name =3D "libchromeos" +@@ -538,6 +571,7 @@ dependencies =3D [ + "libc", + "log", + "protobuf", ++ "thiserror", + ] +=20 + [[package]] +@@ -580,11 +614,11 @@ dependencies =3D [ +=20 + [[package]] + name =3D "log" +-version =3D "0.4.5" ++version =3D "0.4.14" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e56= 7113f" ++checksum =3D "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362= c2710" + dependencies =3D [ +- "cfg-if", ++ "cfg-if 1.0.0", + ] +=20 + [[package]] +@@ -595,9 +629,9 @@ checksum =3D "0ca88d725a0a943b096803bd34e73a4437208b60= 77654cc4ecb2947a5f91618d" +=20 + [[package]] + name =3D "memchr" +-version =3D "2.3.0" ++version =3D "2.3.4" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c= 72223" ++checksum =3D "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284= b1525" +=20 + [[package]] + name =3D "memoffset" +@@ -666,19 +700,20 @@ dependencies =3D [ +=20 + [[package]] + name =3D "num-traits" +-version =3D "0.2.12" ++version =3D "0.2.14" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29f= fd611" ++checksum =3D "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd0= 99290" + dependencies =3D [ + "autocfg", + ] +=20 + [[package]] + name =3D "num_cpus" +-version =3D "1.9.0" ++version =3D "1.13.0" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530af= a9238" ++checksum =3D "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f= 766b3" + dependencies =3D [ ++ "hermit-abi", + "libc", + ] +=20 +@@ -693,21 +728,27 @@ dependencies =3D [ +=20 + [[package]] + name =3D "paste" +-version =3D "1.0.2" ++version =3D "1.0.5" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde858= 8ed97" ++checksum =3D "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40= dfe58" ++ ++[[package]] ++name =3D "pin-project-lite" ++version =3D "0.2.6" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa3= 7e905" +=20 + [[package]] + name =3D "pin-utils" +-version =3D "0.1.0-alpha.4" ++version =3D "0.1.0" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f= 7b587" ++checksum =3D "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c= 9f184" +=20 + [[package]] + name =3D "pkg-config" +-version =3D "0.3.11" ++version =3D "0.3.19" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f5= 2452f" ++checksum =3D "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce652123= 0884c" +=20 + [[package]] + name =3D "poll_token_derive" +@@ -729,65 +770,67 @@ dependencies =3D [ + ] +=20 + [[package]] +-name =3D "proc-macro-hack" +-version =3D "0.5.11" ++name =3D "ppv-lite86" ++version =3D "0.2.10" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2= ebfc5" +-dependencies =3D [ +- "proc-macro2", +- "quote", +- "syn", +-] ++checksum =3D "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510= a4857" ++ ++[[package]] ++name =3D "proc-macro-hack" ++version =3D "0.5.19" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59= fe0e5" +=20 + [[package]] + name =3D "proc-macro-nested" +-version =3D "0.1.3" ++version =3D "0.1.7" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9= eb42e" ++checksum =3D "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0= c1086" +=20 + [[package]] + name =3D "proc-macro2" +-version =3D "1.0.8" ++version =3D "1.0.26" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb= 88548" ++checksum =3D "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992= c9cec" + dependencies =3D [ + "unicode-xid", + ] +=20 + [[package]] + name =3D "protobuf" +-version =3D "2.8.1" ++version =3D "2.22.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687= caa20" ++checksum =3D "1b7f4a129bb3754c25a4e04032a90173c68f85168f77118ac4cb4936e7f= 06f92" +=20 + [[package]] + name =3D "protobuf-codegen" +-version =3D "2.8.1" ++version =3D "2.22.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "12c6abd78435445fc86898ebbd0521a68438063d4a73e23527b7134e6bf= 58b4a" ++checksum =3D "e5d2fa3a461857508103b914da60dd7b489c1a834967c2e214ecc1496f0= c486a" + dependencies =3D [ + "protobuf", + ] +=20 + [[package]] + name =3D "protoc" +-version =3D "2.8.1" ++version =3D "2.22.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "3998c4bc0af8ccbd3cc68245ee9f72663c5ae2fb78bc48ff7719aef1156= 2edea" ++checksum =3D "e6653d384a260fedff0a466e894e05c5b8d75e261a14e9f93e81e43ef86= cad23" + dependencies =3D [ + "log", ++ "which", + ] +=20 + [[package]] + name =3D "protoc-rust" +-version =3D "2.8.1" ++version =3D "2.22.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "234c97039c32bb58a883d0deafa57db37e59428ce536f3bdfe1c46cffec= 04113" ++checksum =3D "e5198afa8fca3f419b36db9a70ede51ff845938ef0386b49f4b02a5a322= 015a6" + dependencies =3D [ + "protobuf", + "protobuf-codegen", + "protoc", +- "tempfile", ++ "tempfile 3.2.0", + ] +=20 + [[package]] +@@ -811,28 +854,86 @@ dependencies =3D [ +=20 + [[package]] + name =3D "quote" +-version =3D "1.0.2" ++version =3D "1.0.9" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b32= 16cfe" ++checksum =3D "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1a= b32a7" + dependencies =3D [ + "proc-macro2", + ] +=20 ++[[package]] ++name =3D "rand" ++version =3D "0.8.3" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447bae= b8d7e" ++dependencies =3D [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name =3D "rand_chacha" ++version =3D "0.3.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b601= 7ae0d" ++dependencies =3D [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name =3D "rand_core" ++version =3D "0.6.2" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d= 06ae7" ++dependencies =3D [ ++ "getrandom", ++] ++ ++[[package]] ++name =3D "rand_hc" ++version =3D "0.3.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b23= 22a73" ++dependencies =3D [ ++ "rand_core", ++] ++ + [[package]] + name =3D "rand_ish" + version =3D "0.1.0" +=20 + [[package]] +-name =3D "remain" +-version =3D "0.2.1" ++name =3D "redox_syscall" ++version =3D "0.2.5" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "99c861227fc40c8da6fdaa3d58144ac84c0537080a43eb1d7d45c28f88d= cb888" ++checksum =3D "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4= 507d9" ++dependencies =3D [ ++ "bitflags", ++] ++ ++[[package]] ++name =3D "remain" ++version =3D "0.2.2" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "70ba1e78fa68412cb93ef642fd4d20b9a941be49ee9333875ebaf131126= 73ea7" + dependencies =3D [ + "proc-macro2", + "quote", + "syn", + ] +=20 ++[[package]] ++name =3D "remove_dir_all" ++version =3D "0.5.3" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5= ef8e7" ++dependencies =3D [ ++ "winapi", ++] ++ + [[package]] + name =3D "resources" + version =3D "0.1.0" +@@ -860,9 +961,9 @@ checksum =3D "c111b5bd5695e56cffe5129854aa230b39c93a30= 5372fdbb2668ca2394eea9f8" +=20 + [[package]] + name =3D "syn" +-version =3D "1.0.14" ++version =3D "1.0.68" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547= ac8f5" ++checksum =3D "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e= 8fd87" + dependencies =3D [ + "proc-macro2", + "quote", +@@ -883,7 +984,7 @@ dependencies =3D [ + "poll_token_derive", + "sync", + "syscall_defines", +- "tempfile", ++ "tempfile 3.0.7", + ] +=20 + [[package]] +@@ -898,19 +999,33 @@ dependencies =3D [ + ] +=20 + [[package]] +-name =3D "thiserror" +-version =3D "1.0.20" ++name =3D "tempfile" ++version =3D "3.2.0" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3= d0d08" ++checksum =3D "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d87= 0eb22" ++dependencies =3D [ ++ "cfg-if 1.0.0", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name =3D "thiserror" ++version =3D "1.0.24" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254= fa98e" + dependencies =3D [ + "thiserror-impl", + ] +=20 + [[package]] + name =3D "thiserror-impl" +-version =3D "1.0.20" ++version =3D "1.0.24" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b88= 41793" ++checksum =3D "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b38= 1f3c0" + dependencies =3D [ + "proc-macro2", + "quote", +@@ -934,15 +1049,15 @@ dependencies =3D [ +=20 + [[package]] + name =3D "unicode-width" +-version =3D "0.1.5" ++version =3D "0.1.8" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa= 46526" ++checksum =3D "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2f= fb1e3" +=20 + [[package]] + name =3D "unicode-xid" +-version =3D "0.2.0" ++version =3D "0.2.1" + source =3D "registry+https://github.com/rust-lang/crates.io-index" +-checksum =3D "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a7= 5097c" ++checksum =3D "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39= dd564" +=20 + [[package]] + name =3D "usb_sys" +@@ -1015,6 +1130,44 @@ dependencies =3D [ + "syscall_defines", + ] +=20 ++[[package]] ++name =3D "wasi" ++version =3D "0.10.2+wasi-snapshot-preview1" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb= 327c6" ++ ++[[package]] ++name =3D "which" ++version =3D "4.1.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cb= a3dfe" ++dependencies =3D [ ++ "either", ++ "libc", ++] ++ ++[[package]] ++name =3D "winapi" ++version =3D "0.3.9" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b0= 0f419" ++dependencies =3D [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name =3D "winapi-i686-pc-windows-gnu" ++version =3D "0.4.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab5= 1b7b6" ++ ++[[package]] ++name =3D "winapi-x86_64-pc-windows-gnu" ++version =3D "0.4.0" ++source =3D "registry+https://github.com/rust-lang/crates.io-index" ++checksum =3D "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc193= 1183f" ++ + [[package]] + name =3D "wire_format_derive" + version =3D "0.1.0" +--=20 +2.30.0 + --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEH9wgcxqlHM/ARR3h+dvtSFmyccAFAmBnrr0ACgkQ+dvtSFmy ccA7rQ//e4Q0DLwcESNMztVnPekxFo2MQKAfJnD5pYqxoDzUb/giIKewI6wb6VIi AxveO1HScuFy8i9zzSIqPsM2/+8nyx+uQvyPFcsJ0ZOcjrsxMcF+He7eUUNCpcTa Ll8r6LfOlp6NEo/odX3tnP8Iz8EyjvvQc6n7iDFBZA+TSQY+FL4S1zROlrszFHSp i4h1mM6PcEo0SPInhFhJgLdPlMaRlvJ+PEDa/BdKDnivhfW/py0cocOjY/eOiVWz L/mODXQ42+CGOPU8y1fk+PjEkbMFpjEAQNmoxsuOqt/L8RZiHtyDPvCGq5Kiqkkr U4uYIdS80g+r/+hGuITOvqFAfE2LCwS8YJilC+FBFpIzo8QyI2RYQux/4cn0ph30 vm+Ghkf975POdANqNasx68B5iYH3s9NPhDOrK1UvCslnUw6zNdiUWD9TiU9lAB+6 xvJJS+BtWAF9cczWL5i9ALGWNXg7xrlkjsTOmKKw5XaVHyUEt6SC+7lz/gvlbPxa WyEvCDJ4HEJ0LPV2K/0Do74xgrjpv4A4zAxpA0X2BWdkqBDKyLCGBPYLbxOwBiLn vvxQK4BbmnRJS5642Si7C3zV587bn+VmXo1OJRQuukNpy4sg92gYz+lvEDoMDYk4 yDHRSc8QlfnTGj9Dx4i+I+SLhLZM/tvnBVeSNUXz2rI71eQssPY= =xXL9 -----END PGP SIGNATURE----- --=-=-=--