From 8ff1491313d6e7da555f4e00587b72febf6d08d8 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Mon, 2 Sep 2024 16:16:22 +0200 Subject: [PATCH 1/2] update all dependencies --- Cargo.lock | 684 ++++++++++++++++++++++++++++-------------- Cargo.toml | 38 +-- rust-tests/Cargo.toml | 2 +- 3 files changed, 485 insertions(+), 239 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a187330c..1f1c6f26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -176,9 +182,9 @@ checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-broadcast" @@ -190,6 +196,18 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-channel" version = "2.3.1" @@ -227,7 +245,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -244,6 +262,17 @@ dependencies = [ "futures-lite 1.13.0", ] +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-io" version = "1.13.0" @@ -277,7 +306,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.34", + "rustix 0.38.35", "slab", "tracing", "windows-sys 0.59.0", @@ -322,10 +351,30 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] +[[package]] +name = "async-process" +version = "2.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +dependencies = [ + "async-channel", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.35", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "async-recursion" version = "1.1.1" @@ -334,7 +383,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -349,7 +398,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.35", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -363,13 +412,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -383,7 +432,7 @@ dependencies = [ "http-content-range", "itertools 0.12.1", "memmap2 0.9.4", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "thiserror", "tokio", @@ -429,7 +478,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -645,9 +694,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", @@ -660,6 +709,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -714,9 +769,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.15" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -728,7 +783,7 @@ version = "0.1.3" source = "git+https://github.com/ruben-arts/clap-markdown?branch=main#bc771f47df47b7b3968c8d08c89372fcd91b5be3" dependencies = [ "clap", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -755,9 +810,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.16" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c677cd0126f3026d8b093fa29eae5d812fde5c05bc66dbb29d0374eea95113a" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" dependencies = [ "clap", ] @@ -781,7 +836,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1007,7 +1062,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1018,7 +1073,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1041,6 +1096,35 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-secret-service" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa0c241c01ad8d99a78d553567d38f873dd3ac16eca33a5370d650ab25584e" +dependencies = [ + "aes", + "block-padding", + "cbc", + "dbus", + "futures-util", + "hkdf", + "num", + "once_cell", + "rand", + "sha2", +] + [[package]] name = "deranged" version = "0.3.11" @@ -1070,7 +1154,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1113,7 +1197,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1170,6 +1254,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enum-as-inner" version = "0.6.0" @@ -1179,7 +1269,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1191,7 +1281,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1212,7 +1302,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1290,9 +1380,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "file_url" @@ -1309,9 +1399,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -1327,12 +1417,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1398,7 +1488,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.52.0", ] @@ -1493,7 +1583,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1508,7 +1598,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -1670,7 +1760,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1679,9 +1769,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1689,7 +1779,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1883,7 +1973,7 @@ checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ "http 1.1.0", "http-serde", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "time", ] @@ -1964,7 +2054,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2005,7 +2095,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tower-service", - "webpki-roots 0.26.3", + "webpki-roots 0.26.5", ] [[package]] @@ -2144,9 +2234,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2317,16 +2407,30 @@ dependencies = [ "byteorder", "lazy_static", "linux-keyutils", - "secret-service", + "secret-service 3.1.0", "security-framework", "windows-sys 0.52.0", ] +[[package]] +name = "keyring" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030a9b84bb2a2f3673d4c8b8236091ed5d8f6b66a56d8085471d8abd5f3c6a80" +dependencies = [ + "byteorder", + "dbus-secret-service", + "secret-service 4.0.0", + "security-framework", + "windows-sys 0.59.0", + "zbus 4.4.0", +] + [[package]] name = "lazy-regex" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576c8060ecfdf2e56995cf3274b4f2d71fa5e4fa3607c1c0b63c10180ee58741" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -2335,14 +2439,14 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9efb9e65d4503df81c615dc33ff07042a9408ac7f26b45abee25566f7fbfd12c" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2417,9 +2521,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] [[package]] name = "libloading" @@ -2630,7 +2743,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2641,7 +2754,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2685,6 +2798,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.8.11" @@ -2744,6 +2866,19 @@ dependencies = [ "memoffset 0.7.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.1", +] + [[package]] name = "nom" version = "7.1.3" @@ -2881,9 +3016,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.3" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2917,7 +3052,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -2986,7 +3121,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -3154,7 +3289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -3187,7 +3322,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "unicase", ] @@ -3218,7 +3353,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -3240,7 +3375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -3263,7 +3398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.4.0", + "indexmap 2.5.0", "quick-xml", "serde", "time", @@ -3295,7 +3430,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", "windows-sys 0.59.0", ] @@ -3333,11 +3468,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -3357,7 +3492,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "version_check", "yansi", ] @@ -3383,7 +3518,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "pep440_rs", "pep508_rs", "serde", @@ -3401,9 +3536,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "a2d2fb862b7ba45e615c1429def928f2e15f815bdf933b27a2d3824e224c1f46" dependencies = [ "bytes", "pin-project-lite", @@ -3419,9 +3554,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "ea0a9b3a42929fad8a7c3de7f86ce0814cfa893328157672680e9fb1145549c5" dependencies = [ "bytes", "rand", @@ -3449,9 +3584,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3514,9 +3649,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.5" +version = "0.27.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3f7c4e9c778e82c86e4a176e116d7f6d4cd5b91f07e299ba7cba403a1f0ed9" +checksum = "70e94e9ac249e66d45f10216692c29750f39cb95f4ea701c623f0b3138c24fdb" dependencies = [ "anyhow", "clap", @@ -3526,7 +3661,7 @@ dependencies = [ "fs-err", "futures", "humantime", - "indexmap 2.4.0", + "indexmap 2.5.0", "indicatif", "itertools 0.13.0", "memchr", @@ -3536,12 +3671,12 @@ dependencies = [ "rattler_cache", "rattler_conda_types 0.27.2", "rattler_digest 1.0.1", - "rattler_networking 0.21.1", - "rattler_package_streaming 0.22.2", + "rattler_networking 0.21.2", + "rattler_package_streaming 0.22.3", "rattler_shell", "reflink-copy", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "simple_spawn_blocking", "smallvec", @@ -3581,7 +3716,7 @@ dependencies = [ "goblin", "hex", "ignore", - "indexmap 2.4.0", + "indexmap 2.5.0", "indicatif", "insta", "itertools 0.13.0", @@ -3600,8 +3735,8 @@ dependencies = [ "rattler_digest 1.0.1", "rattler_index", "rattler_installs_packages", - "rattler_networking 0.21.1", - "rattler_package_streaming 0.22.2", + "rattler_networking 0.21.2", + "rattler_package_streaming 0.22.3", "rattler_redaction", "rattler_repodata_gateway", "rattler_shell", @@ -3610,7 +3745,7 @@ dependencies = [ "rayon", "reflink-copy", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "rstest", "scroll", @@ -3639,15 +3774,15 @@ dependencies = [ "walkdir", "which", "xz2", - "zip 2.1.6", + "zip 2.2.0", "zstd 0.13.2", ] [[package]] name = "rattler_cache" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6281470abcc12960b6c71a579a264c444238f329551677393f00acf1d554ce3" +checksum = "534344446506ef7b6035b2a3d75937b8375dea7a99da6eeb3631fd478782fa34" dependencies = [ "anyhow", "digest", @@ -3657,9 +3792,9 @@ dependencies = [ "parking_lot", "rattler_conda_types 0.27.2", "rattler_digest 1.0.1", - "rattler_networking 0.21.1", - "rattler_package_streaming 0.22.2", - "reqwest 0.12.5", + "rattler_networking 0.21.2", + "rattler_package_streaming 0.22.3", + "reqwest 0.12.7", "reqwest-middleware", "thiserror", "tokio", @@ -3678,7 +3813,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -3713,7 +3848,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -3779,7 +3914,7 @@ dependencies = [ "fs-err", "rattler_conda_types 0.27.2", "rattler_digest 1.0.1", - "rattler_package_streaming 0.22.2", + "rattler_package_streaming 0.22.3", "serde_json", "tracing", "walkdir", @@ -3813,7 +3948,7 @@ dependencies = [ "http 1.1.0", "http-cache-semantics", "include_dir", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.12.1", "miette 7.2.0", "mime", @@ -3827,7 +3962,7 @@ dependencies = [ "pyproject-toml", "rattler_digest 0.19.5", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "resolvo 0.4.1", "serde", @@ -3853,7 +3988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4961d74ca0a15a62c83e439dfd9f440f35f8c31dfb71afe990b2d8fbf916f7a" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -3863,7 +3998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18011e84fcc8dba03a4af5b70cbb99362968cdace525139df430b4f268ef58e0" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -3881,9 +4016,9 @@ dependencies = [ "getrandom", "http 1.1.0", "itertools 0.13.0", - "keyring", + "keyring 2.3.3", "netrc-rs", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "retry-policies", "serde", @@ -3895,9 +4030,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d635bd42b45a0446ba7cfe21ac07e6efc6016e28ef35c40f6b6e3aa22681667f" +checksum = "c53c13a325db9d307886a6a31c3c88a3126b006fe618974b528b6dcf1943ece1" dependencies = [ "anyhow", "async-trait", @@ -3909,9 +4044,9 @@ dependencies = [ "google-cloud-auth", "http 1.1.0", "itertools 0.13.0", - "keyring", + "keyring 3.2.1", "netrc-rs", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "retry-policies", "serde", @@ -3941,15 +4076,15 @@ dependencies = [ "tokio", "tokio-util", "url", - "zip 2.1.6", + "zip 2.2.0", "zstd 0.13.2", ] [[package]] name = "rattler_package_streaming" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753acc6ff608668f88852d2dfa0c334e046253dd9e40dce5fb2f50427eb3b9f4" +checksum = "fe4f972fe90d9ebbb055ca3cf3527d9206ff908fee1a39f880d5db209c729976" dependencies = [ "bzip2", "chrono", @@ -3957,9 +4092,9 @@ dependencies = [ "num_cpus", "rattler_conda_types 0.27.2", "rattler_digest 1.0.1", - "rattler_networking 0.21.1", + "rattler_networking 0.21.2", "rattler_redaction", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "serde_json", "tar", @@ -3969,7 +4104,7 @@ dependencies = [ "tokio-util", "tracing", "url", - "zip 2.1.6", + "zip 2.2.0", "zstd 0.13.2", ] @@ -3979,16 +4114,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b8739ebf209f017d70f4a27b2726358bade979cc3327b1765163c93a18d46f" dependencies = [ - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "url", ] [[package]] name = "rattler_repodata_gateway" -version = "0.21.6" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6be244c76607297d7c27e9c74870f9d2875f1acccaec827fc57f9eaa7144251" +checksum = "e7b4e6ee72bad488f18de5bdff0fb22f4a2d91a950e4d8b5b01700d4bfcae9c7" dependencies = [ "anyhow", "async-compression", @@ -4017,9 +4152,9 @@ dependencies = [ "rattler_cache", "rattler_conda_types 0.27.2", "rattler_digest 1.0.1", - "rattler_networking 0.21.1", + "rattler_networking 0.21.2", "rattler_redaction", - "reqwest 0.12.5", + "reqwest 0.12.7", "reqwest-middleware", "rmp-serde", "serde", @@ -4044,7 +4179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "470fb87026522cb8bdf914b7d044644889d62d91e18f57d3e01f90983a4d49b1" dependencies = [ "enum_dispatch", - "indexmap 2.4.0", + "indexmap 2.5.0", "itertools 0.13.0", "rattler_conda_types 0.27.2", "serde_json", @@ -4076,9 +4211,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2097076b49e143fa7b70a63fac0dcc917dfade64b9706e50e8335a1eb5b1e184" +checksum = "cdf264a6dff4b04c99c51a27b8008a1d250540a802179858b7e1b6f4b7c97689" dependencies = [ "archspec", "libloading", @@ -4123,9 +4258,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -4149,7 +4284,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -4159,7 +4294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" dependencies = [ "cfg-if", - "rustix 0.38.34", + "rustix 0.38.35", "windows 0.58.0", ] @@ -4254,21 +4389,21 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "async-compression", "base64 0.22.1", "bytes", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", @@ -4304,8 +4439,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.3", - "winreg 0.52.0", + "webpki-roots 0.26.5", + "windows-registry", ] [[package]] @@ -4317,7 +4452,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.1.0", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "thiserror", "tower-service", @@ -4421,13 +4556,13 @@ checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "regex", "relative-path", "rustc_version", - "syn 2.0.74", + "syn 2.0.77", "unicode-ident", ] @@ -4456,9 +4591,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -4479,9 +4614,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -4511,16 +4646,16 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.3", @@ -4566,9 +4701,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -4628,7 +4763,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -4657,7 +4792,26 @@ dependencies = [ "rand", "serde", "sha2", - "zbus", + "zbus 3.15.2", +] + +[[package]] +name = "secret-service" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" +dependencies = [ + "aes", + "cbc", + "futures-util", + "generic-array", + "hkdf", + "num", + "once_cell", + "rand", + "serde", + "sha2", + "zbus 4.4.0", ] [[package]] @@ -4691,9 +4845,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.207" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -4711,22 +4865,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.207" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "memchr", "ryu", @@ -4741,7 +4895,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -4775,7 +4929,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -4792,7 +4946,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -4801,7 +4955,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -5051,7 +5205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5091,7 +5245,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5140,9 +5294,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5160,6 +5314,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sysctl" @@ -5235,9 +5392,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.59.0", ] @@ -5247,7 +5404,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] @@ -5279,7 +5436,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5356,9 +5513,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -5380,7 +5537,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5467,18 +5624,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.40", ] @@ -5489,7 +5635,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -5543,7 +5689,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5628,7 +5774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -5655,9 +5801,9 @@ checksum = "04645b6c01cfb2ddabffc7c67ae6bfe7c3e28a5c37d729f6bb498e784f1fd70c" [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -5903,7 +6049,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -5937,7 +6083,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5979,22 +6125,22 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] [[package]] name = "which" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "rustix 0.38.34", + "rustix 0.38.35", "winsafe", ] @@ -6079,7 +6225,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -6090,7 +6236,18 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] @@ -6288,16 +6445,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winsafe" version = "0.0.19" @@ -6321,7 +6468,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "rustix 0.38.35", ] [[package]] @@ -6372,12 +6519,12 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ - "async-broadcast", + "async-broadcast 0.5.1", "async-executor", - "async-fs", + "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.8.0", - "async-process", + "async-process 1.8.1", "async-recursion", "async-task", "async-trait", @@ -6390,7 +6537,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix", + "nix 0.26.4", "once_cell", "ordered-stream", "rand", @@ -6402,9 +6549,47 @@ dependencies = [ "uds_windows", "winapi", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 3.15.2", + "zbus_names 2.6.1", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast 0.7.1", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-process 2.2.4", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.4.0", + "zbus_names 3.0.0", + "zvariant 4.2.0", ] [[package]] @@ -6418,7 +6603,20 @@ dependencies = [ "quote", "regex", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -6429,7 +6627,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 3.15.2", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.2.0", ] [[package]] @@ -6450,7 +6659,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.77", ] [[package]] @@ -6481,16 +6690,16 @@ dependencies = [ [[package]] name = "zip" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.4.0", + "indexmap 2.5.0", "memchr", "thiserror", "time", @@ -6569,7 +6778,20 @@ dependencies = [ "libc", "serde", "static_assertions", - "zvariant_derive", + "zvariant_derive 3.15.2", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.2.0", ] [[package]] @@ -6582,7 +6804,20 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.77", + "zvariant_utils 2.1.0", ] [[package]] @@ -6595,3 +6830,14 @@ dependencies = [ "quote", "syn 1.0.109", ] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] diff --git a/Cargo.toml b/Cargo.toml index a60e02f9..61e030ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,18 +42,18 @@ name = "rattler-build" required-features = ["recipe-generation"] [dependencies] -serde = { version = "1.0.204", features = ["derive"] } +serde = { version = "1.0.209", features = ["derive"] } serde_yaml = "0.9.34" -rattler = { version = "0.27.5", default-features = false, features = [ +rattler = { version = "0.27.6", default-features = false, features = [ "cli-tools", "indicatif", ] } rattler_conda_types = { version = "0.27.2", default-features = false } rattler_digest = { version = "1.0.1", default-features = false, features = ["serde"] } rattler_index = { version = "0.19.24", default-features = false } -rattler_networking = { version = "0.21.1", default-features = false } +rattler_networking = { version = "0.21.2", default-features = false } rattler_redaction = { version = "0.1.1" } -rattler_repodata_gateway = { version = "0.21.6", default-features = false, features = [ +rattler_repodata_gateway = { version = "0.21.8", default-features = false, features = [ "gateway", ] } rattler_shell = { version = "0.21.6", default-features = false, features = [ @@ -63,23 +63,23 @@ rattler_solve = { version = "1.0.3", default-features = false, features = [ "resolvo", "serde", ] } -rattler_virtual_packages = { version = "1.0.3", default-features = false } -rattler_package_streaming = { version = "0.22.2", default-features = false } +rattler_virtual_packages = { version = "1.0.4", default-features = false } +rattler_package_streaming = { version = "0.22.3", default-features = false } anyhow = "1.0.86" walkdir = "2.5.0" sha2 = "0.10.8" hex = "0.4.3" -serde_json = "1.0.121" -reqwest = { version = "0.12.5", default-features = false, features = [ +serde_json = "1.0.127" +reqwest = { version = "0.12.7", default-features = false, features = [ "multipart", ] } -tokio = { version = "1.39.2", features = ["rt", "macros", "rt-multi-thread", "process"] } +tokio = { version = "1.40.0", features = ["rt", "macros", "rt-multi-thread", "process"] } itertools = "0.13.0" content_inspector = "0.2.4" serde_with = "3.9.0" url = "2.5.2" tracing = "0.1.40" -clap = { version = "4.5.13", features = ["derive", "env", "cargo"] } +clap = { version = "4.5.16", features = ["derive", "env", "cargo"] } minijinja = { version = "=1.0.14", features = [ "unstable_machinery", "custom_syntax", @@ -101,7 +101,7 @@ futures = "0.3.30" indicatif = "0.17.8" console = { version = "0.15.8", features = ["windows-console-colors"] } thiserror = "1.0.63" -tempfile = "3.10.1" +tempfile = "3.12.0" chrono = "0.4.38" sha1 = "0.10.6" spdx = "0.10.6" @@ -110,27 +110,27 @@ globset = "0.4.14" clap-verbosity-flag = "2.2.1" tracing-core = "0.1.32" petgraph = "0.6.5" -indexmap = "2.3.0" -dunce = "1.0.4" +indexmap = "2.5.0" +dunce = "1.0.5" fs-err = "2.11.0" -which = "6.0.2" -clap_complete = "4.5.12" +which = "6.0.3" +clap_complete = "4.5.24" clap_complete_nushell = "4.5.3" tokio-util = "0.7.11" tar = "0.4.41" -zip = { version = "2.1.6", default-features = false, features = [ +zip = { version = "2.2.0", default-features = false, features = [ "flate2", "deflate", ] } bzip2 = "0.4.4" base64 = "0.22.1" -flate2 = "1.0.30" +flate2 = "1.0.33" xz2 = "0.1.7" zstd = "0.13.2" toml = "0.8.19" memmap2 = "0.9.4" -reqwest-middleware = "0.3.2" +reqwest-middleware = "0.3.3" rattler_installs_packages = { version = "0.9.0", default-features = false, optional = true } async-once-cell = "0.5.3" terminal_size = "0.3.0" @@ -143,7 +143,7 @@ tui-input = { version = "0.9.0", optional = true } reflink-copy = "0.1.19" rayon = "1.10.0" patch = "0.7.0" -regex = "1.10.5" +regex = "1.10.6" # we have a patched version of clap-markdown clap-markdown = { version = "=0.1.3", optional = true } async-recursion = "1.1.1" diff --git a/rust-tests/Cargo.toml b/rust-tests/Cargo.toml index d1c5d2d6..89c9726a 100644 --- a/rust-tests/Cargo.toml +++ b/rust-tests/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] glob = "0.3.1" rattler_package_streaming = { version = "0.21.7", default-features = false } -serde_json = "1.0.121" +serde_json = "1.0.127" sha1 = "0.10.6" duct = "0.13.7" From 0563bea56834825bde7d10b3d0ee84e027b263d0 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Mon, 2 Sep 2024 22:27:34 +0200 Subject: [PATCH 2/2] release 0.21.0 and rattler update --- Cargo.lock | 64 ++++++++++++++++++++++---------------------- Cargo.toml | 18 ++++++------- src/render/solver.rs | 3 ++- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f1c6f26..928b353e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3649,9 +3649,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.6" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e94e9ac249e66d45f10216692c29750f39cb95f4ea701c623f0b3138c24fdb" +checksum = "aeb1c7900d09582a363f48ced3edeb1a97ae41c6b8a47e867fd41d61cd01c099" dependencies = [ "anyhow", "clap", @@ -3669,10 +3669,10 @@ dependencies = [ "once_cell", "parking_lot", "rattler_cache", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "rattler_networking 0.21.2", - "rattler_package_streaming 0.22.3", + "rattler_package_streaming 0.22.4", "rattler_shell", "reflink-copy", "regex", @@ -3690,7 +3690,7 @@ dependencies = [ [[package]] name = "rattler-build" -version = "0.20.0" +version = "0.21.0" dependencies = [ "ansi-to-tui", "anyhow", @@ -3731,12 +3731,12 @@ dependencies = [ "petgraph", "ratatui", "rattler", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "rattler_index", "rattler_installs_packages", "rattler_networking 0.21.2", - "rattler_package_streaming 0.22.3", + "rattler_package_streaming 0.22.4", "rattler_redaction", "rattler_repodata_gateway", "rattler_shell", @@ -3780,9 +3780,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534344446506ef7b6035b2a3d75937b8375dea7a99da6eeb3631fd478782fa34" +checksum = "5cb85c55b25504c924bb3118d550e0f0faa98ae6d2c1f1649f2542d8b283902e" dependencies = [ "anyhow", "digest", @@ -3790,10 +3790,10 @@ dependencies = [ "fxhash", "itertools 0.13.0", "parking_lot", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "rattler_networking 0.21.2", - "rattler_package_streaming 0.22.3", + "rattler_package_streaming 0.22.4", "reqwest 0.12.7", "reqwest-middleware", "thiserror", @@ -3838,9 +3838,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4dc7a58ae237e3f57310095033da58b37d98ce7c167bc928b0f81951279c514" +checksum = "4fd487490f51a206e9551e109ccbcdb3d1b3755fbe9c51aa55483c15299a7417" dependencies = [ "chrono", "dirs", @@ -3907,14 +3907,14 @@ dependencies = [ [[package]] name = "rattler_index" -version = "0.19.24" +version = "0.19.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665dccb14dc21342a87dcb9d095bc1d3b96e76b65e4cfda86d1e65e3b8c06c79" +checksum = "23265b2e3cc753c95d173cb0e42ec1b0198a4d298c5d196b5e19083822724994" dependencies = [ "fs-err", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", - "rattler_package_streaming 0.22.3", + "rattler_package_streaming 0.22.4", "serde_json", "tracing", "walkdir", @@ -4082,15 +4082,15 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4f972fe90d9ebbb055ca3cf3527d9206ff908fee1a39f880d5db209c729976" +checksum = "df5c10938fee28ecbeb7ab1c4d499fe6a4d5be5db7d72007a0fccac81ae95d34" dependencies = [ "bzip2", "chrono", "futures-util", "num_cpus", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "rattler_networking 0.21.2", "rattler_redaction", @@ -4121,9 +4121,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b4e6ee72bad488f18de5bdff0fb22f4a2d91a950e4d8b5b01700d4bfcae9c7" +checksum = "223d58601452dc8e169393666a31377e4583e2f7fc1c82a626dac31c353534f1" dependencies = [ "anyhow", "async-compression", @@ -4150,7 +4150,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "rattler_cache", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "rattler_networking 0.21.2", "rattler_redaction", @@ -4174,14 +4174,14 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470fb87026522cb8bdf914b7d044644889d62d91e18f57d3e01f90983a4d49b1" +checksum = "4f9d5ae403e5aa7bc3068c1d649d80e807b88f18ef82d6e82df0313004b80d2d" dependencies = [ "enum_dispatch", "indexmap 2.5.0", "itertools 0.13.0", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "serde_json", "shlex", "sysinfo", @@ -4192,14 +4192,14 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2afc9a5f77abdc151bd99be9339078e1b6f9bfdbad04705bbb50c30ae11f50" +checksum = "6cd622a01da7534b598c3ad7bbc8d0f979438236757087f4dae04ce7f2a1dd8f" dependencies = [ "chrono", "futures", "itertools 0.13.0", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "rattler_digest 1.0.1", "resolvo 0.7.0", "serde", @@ -4211,16 +4211,16 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf264a6dff4b04c99c51a27b8008a1d250540a802179858b7e1b6f4b7c97689" +checksum = "aaf0ffd2b8bf06758524325e52ed45749fb20fe23bbaa818a56f5482855e4ef7" dependencies = [ "archspec", "libloading", "nom", "once_cell", "plist", - "rattler_conda_types 0.27.2", + "rattler_conda_types 0.27.3", "regex", "serde", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 61e030ad..b60214a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust-tests"] [package] name = "rattler-build" -version = "0.20.0" +version = "0.21.0" authors = ["rattler-build contributors "] homepage = "https://github.com/prefix-dev/rattler-build" edition = "2021" @@ -44,27 +44,27 @@ required-features = ["recipe-generation"] [dependencies] serde = { version = "1.0.209", features = ["derive"] } serde_yaml = "0.9.34" -rattler = { version = "0.27.6", default-features = false, features = [ +rattler = { version = "0.27.7", default-features = false, features = [ "cli-tools", "indicatif", ] } -rattler_conda_types = { version = "0.27.2", default-features = false } +rattler_conda_types = { version = "0.27.3", default-features = false } rattler_digest = { version = "1.0.1", default-features = false, features = ["serde"] } -rattler_index = { version = "0.19.24", default-features = false } +rattler_index = { version = "0.19.25", default-features = false } rattler_networking = { version = "0.21.2", default-features = false } rattler_redaction = { version = "0.1.1" } -rattler_repodata_gateway = { version = "0.21.8", default-features = false, features = [ +rattler_repodata_gateway = { version = "0.21.9", default-features = false, features = [ "gateway", ] } -rattler_shell = { version = "0.21.6", default-features = false, features = [ +rattler_shell = { version = "0.21.7", default-features = false, features = [ "sysinfo", ] } -rattler_solve = { version = "1.0.3", default-features = false, features = [ +rattler_solve = { version = "1.0.4", default-features = false, features = [ "resolvo", "serde", ] } -rattler_virtual_packages = { version = "1.0.4", default-features = false } -rattler_package_streaming = { version = "0.22.3", default-features = false } +rattler_virtual_packages = { version = "1.1.0", default-features = false } +rattler_package_streaming = { version = "0.22.4", default-features = false } anyhow = "1.0.86" walkdir = "2.5.0" sha2 = "0.10.8" diff --git a/src/render/solver.rs b/src/render/solver.rs index 44b22122..d21c793d 100644 --- a/src/render/solver.rs +++ b/src/render/solver.rs @@ -13,6 +13,7 @@ use rattler::install::{DefaultProgressFormatter, IndicatifReporter, Installer}; use rattler_conda_types::{Channel, GenericVirtualPackage, MatchSpec, Platform, RepoDataRecord}; use rattler_repodata_gateway::Gateway; use rattler_solve::{resolvo::Solver, ChannelPriority, SolveStrategy, SolverImpl, SolverTask}; +use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides}; use url::Url; use crate::tool_configuration; @@ -90,7 +91,7 @@ pub async fn create_environment( let virtual_packages = tool_configuration.fancy_log_handler.wrap_in_progress( "determining virtual packages", move || { - rattler_virtual_packages::VirtualPackage::current().map(|vpkgs| { + VirtualPackage::detect(&VirtualPackageOverrides::default()).map(|vpkgs| { vpkgs .iter() .map(|vpkg| GenericVirtualPackage::from(vpkg.clone()))