From 5adea35bee61a3b71c5909a39e33d3609764d087 Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Tue, 5 Dec 2023 17:26:16 +0000 Subject: [PATCH 1/6] update flake.nix --- src/scaffold/app/nix.rs | 86 +++++++++++++++++++++++++++++------------ src/scaffold/web_app.rs | 2 +- 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/scaffold/app/nix.rs b/src/scaffold/app/nix.rs index ab6e116fa..58032ec47 100644 --- a/src/scaffold/app/nix.rs +++ b/src/scaffold/app/nix.rs @@ -9,47 +9,83 @@ use crate::error::{ScaffoldError, ScaffoldResult}; use crate::file_tree::*; use crate::versions::holochain_nix_version; -pub fn flake_nix() -> FileTree { +pub fn flake_nix(holo_enabled: bool) -> FileTree { let holochain_nix_version = holochain_nix_version(); - file!(format!( - r#"{{ - description = "Template for Holochain app development"; - inputs = {{ - versions.url = "github:holochain/holochain?dir=versions/{holochain_nix_version}"; + // Define the holo-specific parts + let holo_specific = if holo_enabled { + "holoDevServerChannel = \"alpha\";" + } else { + "" + }; + + let additional_packages = if holo_enabled { + "pkgs.curl\n # more packages go here" + } else { + "# more packages go here" + }; + + let extra_content = if holo_enabled { + r#"extraSubstitutors = [ "https://cache.holo.host" ]; + trustedPublicKeys = [ + "cache.holo.host-2:ZJCkX3AUYZ8soxTLfTb60g+F3MkWD7hkH9y8CgqwhDQ=" + ]; + + shellHook = '' + nix-env -f "https://hydra.holo.host/channel/custom/holo-nixpkgs/${{inputs.holoDevServerChannel}}/holo-nixpkgs/nixexprs.tar.xz" -iA holo-dev-server + '';"# + } else { + "" + }; + + // Format the final file content with the conditional parts + let file_content = file!(format!( + r#" +description = "Template for Holochain app development"; + +inputs = {{ + versions.url = "github:holochain/holochain?dir=versions/{}"; holochain-flake.url = "github:holochain/holochain"; holochain-flake.inputs.versions.follows = "versions"; nixpkgs.follows = "holochain-flake/nixpkgs"; flake-parts.follows = "holochain-flake/flake-parts"; - }}; + {} +}}; - outputs = inputs: +outputs = inputs: inputs.flake-parts.lib.mkFlake - {{ + {{ inherit inputs; - }} - {{ + }} + {{ systems = builtins.attrNames inputs.holochain-flake.devShells; perSystem = - {{ inputs' - , config - , pkgs - , system - , ... - }}: {{ + {{ inputs' + , config + , pkgs + , system + , ... + }}: {{ devShells.default = pkgs.mkShell {{ - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; - packages = [ + inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; + packages = [ pkgs.nodejs-18_x - # more packages go here - ]; + {} + ]; + {} }}; - }}; - }}; -}}"# - )) + }}; + }}; +"#, + holochain_nix_version, + holo_specific, + additional_packages, + extra_content + )); + + file_content } pub fn setup_nix_developer_environment(dir: &PathBuf) -> ScaffoldResult<()> { diff --git a/src/scaffold/web_app.rs b/src/scaffold/web_app.rs index 65ec37020..47d688d90 100644 --- a/src/scaffold/web_app.rs +++ b/src/scaffold/web_app.rs @@ -41,7 +41,7 @@ fn web_app_skeleton( app_file_tree .dir_content_mut() .ok_or(ScaffoldError::PathNotFound(PathBuf::new()))? - .insert(OsString::from("flake.nix"), flake_nix()); + .insert(OsString::from("flake.nix"), flake_nix(holo_enabled)); } if scaffold_template { app_file_tree From 7925f629b386a2c10fb75f25d0503a1aa3baab4f Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Tue, 5 Dec 2023 17:26:16 +0000 Subject: [PATCH 2/6] update flake.nix --- src/scaffold/app/nix.rs | 86 +++++++++++++++++++++++++++++------------ src/scaffold/web_app.rs | 2 +- 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/src/scaffold/app/nix.rs b/src/scaffold/app/nix.rs index 0843543c7..c7888f004 100644 --- a/src/scaffold/app/nix.rs +++ b/src/scaffold/app/nix.rs @@ -9,47 +9,83 @@ use crate::error::{ScaffoldError, ScaffoldResult}; use crate::file_tree::*; use crate::versions::holochain_nix_version; -pub fn flake_nix() -> FileTree { +pub fn flake_nix(holo_enabled: bool) -> FileTree { let holochain_nix_version = holochain_nix_version(); - file!(format!( - r#"{{ - description = "Template for Holochain app development"; - inputs = {{ - versions.url = "github:holochain/holochain?dir=versions/{holochain_nix_version}"; + // Define the holo-specific parts + let holo_specific = if holo_enabled { + "holoDevServerChannel = \"alpha\";" + } else { + "" + }; + + let additional_packages = if holo_enabled { + "pkgs.curl\n # more packages go here" + } else { + "# more packages go here" + }; + + let extra_content = if holo_enabled { + r#"extraSubstitutors = [ "https://cache.holo.host" ]; + trustedPublicKeys = [ + "cache.holo.host-2:ZJCkX3AUYZ8soxTLfTb60g+F3MkWD7hkH9y8CgqwhDQ=" + ]; + + shellHook = '' + nix-env -f "https://hydra.holo.host/channel/custom/holo-nixpkgs/${{inputs.holoDevServerChannel}}/holo-nixpkgs/nixexprs.tar.xz" -iA holo-dev-server + '';"# + } else { + "" + }; + + // Format the final file content with the conditional parts + let file_content = file!(format!( + r#" +description = "Template for Holochain app development"; + +inputs = {{ + versions.url = "github:holochain/holochain?dir=versions/{}"; holochain-flake.url = "github:holochain/holochain"; holochain-flake.inputs.versions.follows = "versions"; nixpkgs.follows = "holochain-flake/nixpkgs"; flake-parts.follows = "holochain-flake/flake-parts"; - }}; + {} +}}; - outputs = inputs: +outputs = inputs: inputs.flake-parts.lib.mkFlake - {{ + {{ inherit inputs; - }} - {{ + }} + {{ systems = builtins.attrNames inputs.holochain-flake.devShells; perSystem = - {{ inputs' - , config - , pkgs - , system - , ... - }}: {{ + {{ inputs' + , config + , pkgs + , system + , ... + }}: {{ devShells.default = pkgs.mkShell {{ - inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; - packages = [ + inputsFrom = [ inputs'.holochain-flake.devShells.holonix ]; + packages = [ pkgs.nodejs-18_x - # more packages go here - ]; + {} + ]; + {} }}; - }}; - }}; -}}"# - )) + }}; + }}; +"#, + holochain_nix_version, + holo_specific, + additional_packages, + extra_content + )); + + file_content } pub fn setup_nix_developer_environment(dir: &PathBuf) -> ScaffoldResult<()> { diff --git a/src/scaffold/web_app.rs b/src/scaffold/web_app.rs index 65ec37020..47d688d90 100644 --- a/src/scaffold/web_app.rs +++ b/src/scaffold/web_app.rs @@ -41,7 +41,7 @@ fn web_app_skeleton( app_file_tree .dir_content_mut() .ok_or(ScaffoldError::PathNotFound(PathBuf::new()))? - .insert(OsString::from("flake.nix"), flake_nix()); + .insert(OsString::from("flake.nix"), flake_nix(holo_enabled)); } if scaffold_template { app_file_tree From 733a9e68593524a72607a24a34dec63df9cb94c1 Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Wed, 6 Dec 2023 14:58:19 +0000 Subject: [PATCH 3/6] fix flake --- Cargo.lock | 1639 +++++++++++++++++++-------------------- Cargo.toml | 2 +- src/scaffold/app/nix.rs | 15 +- 3 files changed, 787 insertions(+), 869 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f859dc7d8..e8b767276 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,11 +14,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "gimli 0.28.0", + "gimli 0.27.3", ] [[package]] @@ -41,9 +41,9 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.10", "once_cell", @@ -52,22 +52,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.10", "once_cell", "version_check", - "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -108,6 +107,21 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 1.0.2", + "colorchoice", + "is-terminal", + "utf8parse", +] + [[package]] name = "anstream" version = "0.6.4" @@ -117,22 +131,22 @@ dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", - "anstyle-wincon", + "anstyle-wincon 3.0.2", "colorchoice", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -148,19 +162,29 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", ] +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "8c6f84b74db2535ebae81eede2f39b947dcbf01d093ae5f791e5dd414a1bf289" [[package]] name = "approx" @@ -173,9 +197,9 @@ dependencies = [ [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" dependencies = [ "derive_arbitrary", ] @@ -229,20 +253,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener", "futures-core", ] [[package]] name = "async-executor" -version = "1.6.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -255,7 +279,7 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io 1.13.0", + "async-io", "async-lock", "blocking", "futures-lite", @@ -275,56 +299,37 @@ dependencies = [ "futures-lite", "log", "parking", - "polling 2.8.0", - "rustix 0.37.27", + "polling", + "rustix 0.37.23", "slab", - "socket2 0.4.10", + "socket2 0.4.9", "waker-fn", ] -[[package]] -name = "async-io" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" -dependencies = [ - "async-lock", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling 3.3.0", - "rustix 0.38.21", - "slab", - "tracing", - "waker-fn", - "windows-sys 0.48.0", -] - [[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener 2.5.3", + "event-listener", ] [[package]] name = "async-process" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ - "async-io 1.13.0", + "async-io", "async-lock", - "async-signal", + "autocfg 1.1.0", "blocking", "cfg-if 1.0.0", - "event-listener 3.0.1", + "event-listener", "futures-lite", - "rustix 0.38.21", + "rustix 0.37.23", + "signal-hook", "windows-sys 0.48.0", ] @@ -339,24 +344,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.1.0", - "async-lock", - "atomic-waker", - "cfg-if 1.0.0", - "futures-core", - "futures-io", - "rustix 0.38.21", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - [[package]] name = "async-std" version = "1.12.0" @@ -366,7 +353,7 @@ dependencies = [ "async-attributes", "async-channel", "async-global-executor", - "async-io 1.13.0", + "async-io", "async-lock", "async-process", "crossbeam-utils 0.8.16", @@ -408,15 +395,15 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -425,9 +412,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -469,16 +456,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.1", + "object 0.31.1", "rustc-demangle", ] @@ -499,9 +486,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bimap" @@ -544,9 +531,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitvec" @@ -573,13 +560,13 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq 0.2.6", ] [[package]] @@ -602,25 +589,24 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", "async-lock", "async-task", - "fastrand 2.0.1", - "futures-io", + "atomic-waker", + "fastrand 1.9.0", "futures-lite", - "piper", - "tracing", + "log", ] [[package]] name = "bloomfilter" -version = "1.0.12" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92db7965d438b8b4b1c1d0aedd188440a1084593c9eb7f6657e3df7e906d934" +checksum = "8129c0ab340c1b0caf6dbc587e814d04ba811e336dcf8fc268c04e047428ebb0" dependencies = [ "bit-vec", "getrandom 0.2.10", @@ -640,9 +626,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", "serde", @@ -664,9 +650,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecheck" @@ -692,15 +678,15 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" -version = "1.5.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -715,9 +701,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "c_linked_list" @@ -751,7 +737,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.18", "serde", "serde_json", "thiserror", @@ -759,9 +745,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "libc", ] @@ -790,17 +776,18 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", + "time 0.1.45", "wasm-bindgen", - "windows-targets 0.48.5", + "winapi 0.3.9", ] [[package]] @@ -837,9 +824,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive 4.4.7", @@ -847,11 +834,11 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ - "anstream", + "anstream 0.6.4", "anstyle", "clap_lex 0.6.0", "strsim 0.10.0", @@ -926,9 +913,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils 0.8.16", ] @@ -954,9 +941,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" [[package]] name = "contrafact" @@ -1033,20 +1020,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - [[package]] name = "corosensei" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" +checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", @@ -1057,9 +1035,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1086,7 +1064,7 @@ dependencies = [ "gimli 0.26.2", "log", "regalloc", - "smallvec 1.11.1", + "smallvec 1.11.0", "target-lexicon", ] @@ -1119,7 +1097,7 @@ checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" dependencies = [ "cranelift-codegen", "log", - "smallvec 1.11.1", + "smallvec 1.11.0", "target-lexicon", ] @@ -1399,12 +1377,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - [[package]] name = "dashmap" version = "4.0.2" @@ -1417,22 +1389,22 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.2", - "lock_api 0.4.11", + "hashbrown 0.14.0", + "lock_api 0.4.10", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.8", ] [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "degit" @@ -1462,9 +1434,9 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", @@ -1657,9 +1629,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] @@ -1686,9 +1658,9 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb" dependencies = [ "enumset_derive", ] @@ -1707,9 +1679,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "log", ] @@ -1736,30 +1708,30 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.5" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ + "errno-dragonfly", "libc", "windows-sys 0.48.0", ] [[package]] -name = "event-listener" -version = "2.5.3" +name = "errno-dragonfly" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] [[package]] name = "event-listener" -version = "3.0.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "failure" @@ -1806,9 +1778,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "filetime" @@ -1824,9 +1796,9 @@ dependencies = [ [[package]] name = "fixt" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bbd3dde3f166a47832a20fa1d0c61d5b68a79bedf370782441709d82f6ae69e" +checksum = "df61abe8ae0f550f1b1326a130c77afa3dd3e80fedd5f6d7535df2c948b86d89" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -1841,9 +1813,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1939,9 +1911,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1954,9 +1926,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1964,9 +1936,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-cpupool" @@ -1980,9 +1952,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1991,9 +1963,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -2012,9 +1984,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", @@ -2023,15 +1995,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -2041,9 +2013,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -2144,12 +2116,12 @@ version = "0.3.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a34addaffa7d2c80637807444f171c646cad7549fcdac8019544034678f76d5" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "mockall", "must_future", "paste", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tracing-futures", ] @@ -2160,7 +2132,7 @@ version = "0.4.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52cb0746ab4cf003d75cdbaaae2cf95139ec9607ae46bd5c68721bda2ca0c824" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "tracing", ] @@ -2177,9 +2149,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "globset" @@ -2188,7 +2160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.7.0", + "bstr 1.6.0", "fnv", "log", "regex", @@ -2213,14 +2185,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c5d2f987ee8f6dff3fa1a352058dc59b990e447e4c7846aa7d804971314f7b" dependencies = [ "dashmap 4.0.2", - "futures 0.3.29", + "futures 0.3.28", "futures-timer", "no-std-compat", "nonzero_ext", "parking_lot 0.11.2", "quanta", "rand 0.8.5", - "smallvec 1.11.1", + "smallvec 1.11.0", ] [[package]] @@ -2243,11 +2215,11 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", @@ -2255,16 +2227,16 @@ dependencies = [ "http 0.2.9", "indexmap 1.9.3", "slab", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-util", "tracing", ] [[package]] name = "handlebars" -version = "4.4.0" +version = "4.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" +checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" dependencies = [ "log", "pest", @@ -2290,7 +2262,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.6", ] [[package]] @@ -2299,7 +2271,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.6", ] [[package]] @@ -2308,26 +2280,26 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.3", ] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.3", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.0", ] [[package]] @@ -2336,7 +2308,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded13e388a81713db6919cd750e6113acf2fe5afbaedf8aff79780ec4fc47425" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "one_err", "rmp-serde 1.1.2", "rmpv", @@ -2347,9 +2319,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b12f620a0d22b7dcd534a849f0024b0b47c4343b15f1c0ec02e37f4990f6f16" +checksum = "6568919485f54572855a9f7629f2814d11d76f8f5affa848bae2f426d0634c22" dependencies = [ "hdk_derive", "holo_hash", @@ -2364,9 +2336,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d50da8f292a1b819ae6a7651e9c3cb2ec97f00729125ad9ec3d31df8154eef7" +checksum = "ff843e6ee200443fcfe4a9a1008386fac5bb41b1a36764b61ade96769a84b38c" dependencies = [ "getrandom 0.2.10", "hdi", @@ -2384,9 +2356,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855dc170fec9ca44d2b21cba90fb961ef92acadaae0f0c7d090312a6212552" +checksum = "d773202681553c81ee86b4fc0d9c865cb8839bf936a3c55030e796a789069736" dependencies = [ "darling 0.14.4", "heck 0.4.1", @@ -2400,12 +2372,13 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64 0.21.5", - "bytes 1.5.0", + "base64 0.13.1", + "bitflags 1.3.2", + "bytes 1.4.0", "headers-core", "http 0.2.9", "httpdate", @@ -2448,9 +2421,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2460,16 +2433,16 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5aa5c7b7c2d99ba6769e58ead10d5d4ead9036724a54a7fcea1c0203aac00e" +checksum = "9756c43b8162a6bc08d04922fc6efe05669e9663a505f0cf84e77e96ad330baf" dependencies = [ "arbitrary", "base64 0.13.1", "blake2b_simd 0.5.11", "derive_more", "fixt", - "futures 0.3.29", + "futures 0.3.28", "holochain_serialized_bytes", "holochain_util", "holochain_wasmer_common", @@ -2484,9 +2457,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7557f2e6d4e64912264b16befa6144da01c2484459492d8a71560d20024178d8" +checksum = "3f499af2aee576c37ed6a06647426169f5c1ddcefe88016733e274372838edb9" dependencies = [ "anyhow", "arbitrary", @@ -2503,7 +2476,7 @@ dependencies = [ "either", "fallible-iterator", "fixt", - "futures 0.3.29", + "futures 0.3.28", "get_if_addrs", "getrandom 0.2.10", "ghost_actor 0.3.0-alpha.6", @@ -2559,7 +2532,7 @@ dependencies = [ "tempfile", "thiserror", "tiny-keccak", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", "toml 0.5.11", "tracing", @@ -2568,7 +2541,7 @@ dependencies = [ "tx5-go-pion-turn", "tx5-signal-srv", "unwrap_to", - "url 2.4.1", + "url 2.4.0", "url2", "url_serde", "uuid 0.7.4", @@ -2577,16 +2550,16 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8611a6406313dd46692c97cbf0025dc4ad77a27ac4da622441dec69408054a0" +checksum = "1a2cfb20c822a9fda2978fde8811c0d74d37ad1381d4b65bed97ace03dda5826" dependencies = [ "async-trait", "derive_more", "either", "fallible-iterator", "fixt", - "futures 0.3.29", + "futures 0.3.28", "ghost_actor 0.3.0-alpha.6", "hdk", "hdk_derive", @@ -2604,16 +2577,16 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tracing-futures", ] [[package]] name = "holochain_conductor_api" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4696d86bc639c07469f95d369d1e93d5a50f9afd782ed14fa74e7040293a133a" +checksum = "914ce50552e2407b6f61178b8034628a3692926e9191ac2a9ab3b44d0dfe6120" dependencies = [ "derive_more", "directories", @@ -2636,9 +2609,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfffeca0c6dea328a1ff7097946a951035dd137f4b9ad0db00f5377cd6c9326" +checksum = "a3c4a6e37dc8cbeac95a3e1a1eaf64d7c616b82431944115183cbf9c9aeead90" dependencies = [ "arbitrary", "derive_builder", @@ -2657,12 +2630,12 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03dedeb6f3e244558f491356c4a00da9c5a44a05ca683e460c6e5434ed2e149" +checksum = "dbe449970f44c5337086032ad795144efa8500c46b119291326cb7a6d71eb8b7" dependencies = [ "base64 0.13.1", - "futures 0.3.29", + "futures 0.3.28", "holo_hash", "holochain_serialized_bytes", "holochain_zome_types", @@ -2676,20 +2649,20 @@ dependencies = [ "serde_bytes", "sodoken", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", ] [[package]] name = "holochain_p2p" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191b0cb1239fe04754ae08f67e2608d385e05dae065c80617c75f9ec2e15e75c" +checksum = "c756e67c78f1eeb8c74a0dc2a43a3ee1119606cc72701212b19d1ebaa085e2b3" dependencies = [ "async-trait", "derive_more", "fixt", - "futures 0.3.29", + "futures 0.3.28", "ghost_actor 0.3.0-alpha.6", "holo_hash", "holochain_keystore", @@ -2706,13 +2679,13 @@ dependencies = [ "serde_bytes", "serde_json", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", ] [[package]] name = "holochain_scaffolding_cli" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anyhow", "assert_cmd", @@ -2738,7 +2711,7 @@ dependencies = [ "quote", "regex", "rmpv", - "semver 1.0.20", + "semver 1.0.18", "serde", "serde_json", "serde_yaml 0.8.26", @@ -2747,7 +2720,7 @@ dependencies = [ "temp-dir", "thiserror", "time 0.3.23", - "tokio 1.33.0", + "tokio 1.31.0", "toml 0.5.11", ] @@ -2779,9 +2752,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5164e2866480b8103b255cf2b0581dbdd3371da9efe5e86704975294af20e4f" +checksum = "fb2d9008b1bf1c35c3f158da2057d8263f67175178e914f07930831fe91bd5d3" dependencies = [ "anyhow", "async-trait", @@ -2794,7 +2767,7 @@ dependencies = [ "failure", "fallible-iterator", "fixt", - "futures 0.3.29", + "futures 0.3.28", "getrandom 0.2.10", "holo_hash", "holochain_serialized_bytes", @@ -2823,16 +2796,16 @@ dependencies = [ "sqlformat 0.1.8", "tempfile", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tracing-futures", ] [[package]] name = "holochain_state" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2a4dee4a5f1ef7b350f078965fe01afd54e3a89167c6d4fc991ae9f2a20141" +checksum = "37de07264c95e1e7229bcb1e7fdb637d79012791fbe9ee36a9736836e420dfbd" dependencies = [ "async-recursion", "base64 0.13.1", @@ -2844,7 +2817,7 @@ dependencies = [ "derive_more", "either", "fallible-iterator", - "futures 0.3.29", + "futures 0.3.28", "getrandom 0.2.10", "holo_hash", "holochain_keystore", @@ -2865,16 +2838,16 @@ dependencies = [ "shrinkwraprs", "tempfile", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tracing-futures", ] [[package]] name = "holochain_test_wasm_common" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a1a19d8dca8938fcb55e4ae43bb57887f2887155677e7906a1e0bc3160a2124" +checksum = "bedd733208ff24c2e64548a3d23842c53d9c846c0f73c620ee19435f0307b5e9" dependencies = [ "hdk", "serde", @@ -2882,9 +2855,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83611dcbb9be2afd7a4416793dc75f5d5d1f2975d4c0898162a3b680ecf1935c" +checksum = "c1b4651853c4f3bb44a3f1c5ffd41f2d7f29e03db98d5153161ee5f1a9131739" dependencies = [ "chrono", "derive_more", @@ -2900,9 +2873,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4f7e4ecd2eeeae836ec487b3213c7498ed339a3d88e7ec649aa9d3ad6a8c55" +checksum = "05df6f74c8d5022b97b71ecb28485c8b502f3c232afe8baf3eaf82de0f6ae1c5" dependencies = [ "anyhow", "arbitrary", @@ -2918,7 +2891,7 @@ dependencies = [ "either", "fixt", "flate2", - "futures 0.3.29", + "futures 0.3.28", "getrandom 0.2.10", "holo_hash", "holochain_keystore", @@ -2952,34 +2925,34 @@ dependencies = [ "strum_macros 0.18.0", "tempfile", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "wasmer-middlewares", ] [[package]] name = "holochain_util" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507f39c150414b64bb2fe8da311dc4e925435be887f8dfc3a97f8183d829878" +checksum = "fc771b636f31071efee6840b421c9fafe8bbe16559e62fa72f859803fb1aaf74" dependencies = [ "backtrace", "cfg-if 0.1.10", "derive_more", "dunce", - "futures 0.3.29", + "futures 0.3.28", "num_cpus", "once_cell", "rpassword 7.2.0", "sodoken", - "tokio 1.33.0", + "tokio 1.31.0", ] [[package]] name = "holochain_wasm_test_utils" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222fa67d927a0c1cd0288ea1763dd2d36d66bf4c280147561011a2321d0b6908" +checksum = "fa09446024c383d33576816c54075bd66d04e3e9726cf0114690903739c62da1" dependencies = [ "holochain_types", "holochain_util", @@ -3037,11 +3010,11 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2975619b1a263030e02766e4440bd3a4d69457ea2588a68c9c68d884ad1fbb98" +checksum = "99acb0b3a73661fd64f7c96b29184651c1c0407d9ac11b66c305eb0050f9fb4e" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "ghost_actor 0.4.0-alpha.5", "holochain_serialized_bytes", "must_future", @@ -3051,7 +3024,7 @@ dependencies = [ "serde_bytes", "stream-cancel", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", "tokio-tungstenite 0.13.0", "tracing", @@ -3062,9 +3035,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b77f5caa760c7b34019739fb3b0a986a235fa0a09086b8eaff8cf7a72a2a6ce" +checksum = "e65e6e564fbea4eb006a59fb3a75133f42661753f953b32641d0d433bb226174" dependencies = [ "arbitrary", "contrafact", @@ -3132,7 +3105,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "fnv", "itoa 1.0.9", ] @@ -3155,7 +3128,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "http 0.2.9", "pin-project-lite", ] @@ -3174,18 +3147,18 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.1" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2" +checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "backtrace", "os_info", "serde", "serde_derive", - "toml 0.7.8", - "uuid 1.5.0", + "toml 0.7.6", + "uuid 1.4.1", ] [[package]] @@ -3230,19 +3203,19 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", - "h2 0.3.21", + "h2 0.3.20", "http 0.2.9", "http-body 0.4.5", "httparse", "httpdate", "itoa 1.0.9", "pin-project-lite", - "socket2 0.4.10", - "tokio 1.33.0", + "socket2 0.4.9", + "tokio 1.31.0", "tower-service", "tracing", "want 0.3.1", @@ -3267,25 +3240,25 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "hyper 0.14.27", "native-tls", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-native-tls", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows", ] [[package]] @@ -3420,12 +3393,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.0", ] [[package]] @@ -3443,17 +3416,17 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ - "ahash 0.8.6", - "clap 4.4.7", + "ahash 0.8.3", + "clap 4.4.11", "crossbeam-channel", "crossbeam-utils 0.8.16", - "dashmap 5.5.3", + "dashmap 5.5.0", "env_logger", - "indexmap 2.1.0", + "indexmap 2.0.0", "is-terminal", "itoa 1.0.9", "log", @@ -3479,7 +3452,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", ] [[package]] @@ -3510,7 +3483,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -3526,9 +3499,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" @@ -3536,8 +3509,8 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.21", + "hermit-abi 0.3.2", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -3547,7 +3520,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "868ab2c0c71eff3fca21f4ea4673ade85ca0149c45a55c79016147562737aef8" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "paste", ] @@ -3569,15 +3542,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.8" @@ -3592,9 +3556,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3620,19 +3584,19 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ed18511743698999bdfddeb90c3c814bc2d32acf7c8a5bce883f2c1e97d67" +checksum = "d7ec5203a2bfcc5e6f0c84367f51ac1491b8d0ec4af41759863bc3fce14f4f09" dependencies = [ "arbitrary", "arrayref", "base64 0.13.1", "blake2b_simd 0.5.11", "bloomfilter", - "bytes 1.5.0", + "bytes 1.4.0", "derive_more", "fixt", - "futures 0.3.29", + "futures 0.3.28", "ghost_actor 0.3.0-alpha.6", "governor", "holochain_trace", @@ -3652,13 +3616,13 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "rand 0.8.5", - "reqwest 0.11.22", + "reqwest 0.11.18", "serde", "serde_bytes", "serde_json", "shrinkwraprs", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", "tracing", "tx5", @@ -3667,9 +3631,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0b2032c0ee5683bc4d4c7c705f545992655bd5dc6235e62d0f916197a5c0af" +checksum = "0a581c9c6e762a2fde360641e162e9c1384d6c508ad4da9d59ff902003262ebc" dependencies = [ "arbitrary", "base64 0.13.1", @@ -3683,9 +3647,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15586a9b4f1ec2190d1b92b706995f15a871003955548e6be434cadd75413dd" +checksum = "9f4aa00dd7253f936aaee72e494db3de81dac9a051f768827e8bedb91a324763" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3695,12 +3659,12 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831f6acbe8deee4ee85153b1055a6be4635658273f51df248084f4504e869755" +checksum = "89a69cfc4fa25126de6504e38c867a8b8868467bb2b9024ff8d42ea768ccd3c1" dependencies = [ "clap 3.2.25", - "futures 0.3.29", + "futures 0.3.28", "kitsune_p2p_types", "once_cell", "parking_lot 0.11.2", @@ -3709,20 +3673,20 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "tokio 1.33.0", + "tokio 1.31.0", "warp", ] [[package]] name = "kitsune_p2p_dht" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6ff683970365a1c3b71192a116abeb986512ced906e4e25cc7ad40bf65b1b3" +checksum = "1646c207ebd2477468fe7f1fb65ae8d79cf51d88a6048926baeda66568930f92" dependencies = [ "colored", "derivative", "derive_more", - "futures 0.3.29", + "futures 0.3.28", "gcollections", "intervallum", "kitsune_p2p_dht_arc", @@ -3739,9 +3703,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f358459319708884f9295f122cb7b69a8589300fb232b573a36af04d0a7bc" +checksum = "062325e9bc7110fe96057f8e221b073d9a2975681e832d0951c8c84aec310519" dependencies = [ "derive_more", "gcollections", @@ -3753,12 +3717,12 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6317d77bc3ffa8c36e5351bad1552320690edb8ebb27d3ca1b8f44ad4d0759a5" +checksum = "fa02f5c60619b55e843103c5d5c80f21b5095de9392f62b7613c4ba71ec1d927" dependencies = [ "derive_more", - "futures 0.3.29", + "futures 0.3.28", "human-repr", "kitsune_p2p_timestamp", "kitsune_p2p_types", @@ -3768,15 +3732,15 @@ dependencies = [ "serde", "serde_bytes", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", ] [[package]] name = "kitsune_p2p_mdns" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16b6a872bf984119c80c26cc92488763e96c396b5c091b28d5b66aad030bd61" +checksum = "01c7d1f5e952ed0df199316a97774765963b3dfedfd416117b7e39054266f6fb" dependencies = [ "async-stream", "base64 0.13.1", @@ -3785,40 +3749,41 @@ dependencies = [ "futures-util", "libmdns", "mdns", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", ] [[package]] name = "kitsune_p2p_proxy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dabca0ae25126cf5cc64dda4ed0db3c80640020036d5e16300e0212266da430" +checksum = "e3474a2bacca7bcd9faf014f6ff902d8524ace026d992e18da0ff6375ba79cde" dependencies = [ "base64 0.13.1", "blake2b_simd 0.5.11", "derive_more", - "futures 0.3.29", + "futures 0.3.28", "holochain_trace", "kitsune_p2p_transport_quic", "kitsune_p2p_types", "nanoid 0.3.0", "parking_lot 0.11.2", "rmp-serde 0.15.5", - "rustls 0.20.9", + "rustls", + "sct", "serde", "serde_bytes", "structopt", - "tokio 1.33.0", + "tokio 1.31.0", "tracing-subscriber", "webpki 0.21.4", ] [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e173408aabd1fccedec2ba096b8feac7ef769c435294607f4ae5bc5b83ebc9e" +checksum = "41451ee2b505c4b489e5f23e098ad423d477d2e40b01ea7b93b17a1887407592" dependencies = [ "arbitrary", "chrono", @@ -3829,34 +3794,34 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720caff39a7d58c8543726159facb41aac16645158460ed74fb0a5ca747ef64c" +checksum = "bad4579f38ca3b6d628097da212a9e18ca28a53a08cf051f3ac0f9cb91ff33cd" dependencies = [ - "blake2b_simd 1.0.2", - "futures 0.3.29", + "blake2b_simd 1.0.1", + "futures 0.3.28", "if-addrs 0.8.0", "kitsune_p2p_types", "nanoid 0.4.0", "once_cell", "quinn", "rcgen 0.9.3", - "rustls 0.20.9", + "rustls", "serde", - "tokio 1.33.0", - "webpki 0.22.4", + "tokio 1.31.0", + "webpki 0.22.2", ] [[package]] name = "kitsune_p2p_types" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00adde41d1b8f9f5c40fd6281662b3030f5a6ea21ddff081c8dd346e18f6eab5" +checksum = "a7c3098c2b1ede33599d16c84a391b02cce5de2fee53fe212220bccff83b9151" dependencies = [ "arbitrary", "base64 0.13.1", "derive_more", - "futures 0.3.29", + "futures 0.3.28", "ghost_actor 0.3.0-alpha.6", "holochain_trace", "kitsune_p2p_bin_data", @@ -3871,18 +3836,19 @@ dependencies = [ "parking_lot 0.11.2", "paste", "rmp-serde 0.15.5", - "rustls 0.20.9", + "rustls", "serde", "serde_bytes", "serde_json", "shrinkwraprs", "sysinfo 0.27.8", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", - "url 2.4.1", + "ureq", + "url 2.4.0", "url2", - "webpki 0.22.4", + "webpki 0.22.2", ] [[package]] @@ -3904,7 +3870,7 @@ dependencies = [ "pretty_assertions 1.4.0", "rpassword 7.2.0", "rusqlite", - "sqlformat 0.2.2", + "sqlformat 0.2.1", "structopt", "sysinfo 0.28.4", "tracing-subscriber", @@ -3928,11 +3894,11 @@ dependencies = [ "serde_json", "serde_yaml 0.9.25", "time 0.3.23", - "tokio 1.33.0", + "tokio 1.31.0", "toml 0.5.11", - "toml 0.7.8", + "toml 0.7.6", "tracing", - "url 2.4.1", + "url 2.4.0", "winapi 0.3.9", "zeroize", ] @@ -3951,31 +3917,27 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" -version = "2.0.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", - "core2", "crc32fast", - "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "2.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ - "core2", - "hashbrown 0.13.2", "rle-decode-fast", ] @@ -4001,9 +3963,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmdns" @@ -4019,17 +3981,17 @@ dependencies = [ "multimap", "nix", "rand 0.8.5", - "socket2 0.4.10", + "socket2 0.4.9", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "winapi 0.3.9", ] [[package]] name = "libsodium-sys-stable" -version = "1.20.3" +version = "1.19.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc31f983531631496f4e621110cd81468ab78b65dee0046cfddea83caa2c327" +checksum = "c380d5be44ec310e371ff404e923e39464ca21ebef0a1468f4bfbbc92af547f5" dependencies = [ "cc", "libc", @@ -4067,9 +4029,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -4082,9 +4044,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg 1.1.0", "scopeguard", @@ -4176,9 +4138,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ "autocfg 1.1.0", "rawpointer", @@ -4208,9 +4170,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" @@ -4306,9 +4268,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -4362,18 +4324,18 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07707c320cdf007f36f450de93074425885fad116d55bda2b87e96bd216d6a0" +checksum = "0d101996f9edc5228cf670a06ada7f53348fe409796df84b5f44cc0c8e648a60" dependencies = [ "arbitrary", - "bytes 1.5.0", + "bytes 1.4.0", "derive_more", "either", "flate2", - "futures 0.3.29", + "futures 0.3.28", "holochain_util", - "reqwest 0.11.22", + "reqwest 0.11.18", "rmp-serde 0.15.5", "serde", "serde_bytes", @@ -4388,7 +4350,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "encoding_rs", "futures-util", "http 0.2.9", @@ -4415,7 +4377,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a160ffed3c2f98d2906c67a9b6e4e1f09cca7e17e3f780286a349061459eeebe" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "pin-utils", ] @@ -4583,9 +4545,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -4646,9 +4608,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg 1.1.0", "libm", @@ -4660,7 +4622,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.2", "libc", ] @@ -4708,9 +4670,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -4741,11 +4703,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.58" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4773,9 +4735,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.94" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -4802,9 +4764,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.6.1" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "ouroboros" @@ -4862,9 +4824,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -4905,7 +4867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.11", + "lock_api 0.4.10", "parking_lot_core 0.8.6", ] @@ -4915,8 +4877,8 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "lock_api 0.4.11", - "parking_lot_core 0.9.9", + "lock_api 0.4.10", + "parking_lot_core 0.9.8", ] [[package]] @@ -4956,7 +4918,7 @@ dependencies = [ "cloudabi", "libc", "redox_syscall 0.1.57", - "smallvec 1.11.1", + "smallvec 1.11.0", "winapi 0.3.9", ] @@ -4970,21 +4932,21 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.16", - "smallvec 1.11.1", + "smallvec 1.11.0", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "smallvec 1.11.1", - "windows-targets 0.48.5", + "redox_syscall 0.3.5", + "smallvec 1.11.0", + "windows-targets 0.48.2", ] [[package]] @@ -5022,20 +4984,19 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ - "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -5043,9 +5004,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", @@ -5056,9 +5017,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -5087,9 +5048,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -5103,17 +5064,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2" -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - [[package]] name = "pkg-config" version = "0.3.27" @@ -5146,20 +5096,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "polling" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" -dependencies = [ - "cfg-if 1.0.0", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.21", - "tracing", - "windows-sys 0.48.0", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -5277,9 +5213,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -5332,7 +5268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" dependencies = [ "idna 0.2.3", - "url 2.4.1", + "url 2.4.0", ] [[package]] @@ -5366,17 +5302,17 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "futures-channel", "futures-util", "fxhash", "quinn-proto", "quinn-udp", - "rustls 0.20.9", + "rustls", "thiserror", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", - "webpki 0.22.4", + "webpki 0.22.2", ] [[package]] @@ -5385,18 +5321,18 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "fxhash", "rand 0.8.5", - "ring 0.16.20", - "rustls 0.20.9", + "ring", + "rustls", "rustls-native-certs", "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.4", + "webpki 0.22.2", ] [[package]] @@ -5408,16 +5344,16 @@ dependencies = [ "futures-util", "libc", "quinn-proto", - "socket2 0.4.10", - "tokio 1.33.0", + "socket2 0.4.9", + "tokio 1.31.0", "tracing", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -5666,9 +5602,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -5676,12 +5612,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ + "crossbeam-channel", "crossbeam-deque 0.8.3", "crossbeam-utils 0.8.16", + "num_cpus", ] [[package]] @@ -5691,7 +5629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring 0.16.20", + "ring", "time 0.3.23", "yasna", ] @@ -5703,7 +5641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring 0.16.20", + "ring", "time 0.3.23", "yasna", "zeroize", @@ -5742,15 +5680,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" version = "0.4.3" @@ -5770,19 +5699,19 @@ checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" dependencies = [ "log", "rustc-hash", - "smallvec 1.11.1", + "smallvec 1.11.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", ] [[package]] @@ -5796,13 +5725,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.7.4", ] [[package]] @@ -5813,9 +5742,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "region" @@ -5831,9 +5760,9 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" dependencies = [ "bytecheck", ] @@ -5874,16 +5803,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.5", - "bytes 1.5.0", + "base64 0.21.2", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.21", + "h2 0.3.20", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", @@ -5899,22 +5828,21 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", - "system-configuration", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-native-tls", "tower-service", - "url 2.4.1", + "url 2.4.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.50.0", + "winreg 0.10.1", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" dependencies = [ "bytemuck", ] @@ -5929,25 +5857,11 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted 0.7.1", + "untrusted", "web-sys", "winapi 0.3.9", ] -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom 0.2.10", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - [[package]] name = "rkyv" version = "0.7.42" @@ -5962,7 +5876,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.5.0", + "uuid 1.4.1", ] [[package]] @@ -6064,12 +5978,12 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "smallvec 1.11.1", + "smallvec 1.11.0", ] [[package]] @@ -6099,14 +6013,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.18", ] [[package]] name = "rustix" -version = "0.37.27" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", @@ -6118,39 +6032,27 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.9" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring 0.16.20", - "sct", - "webpki 0.22.4", -] - -[[package]] -name = "rustls" -version = "0.21.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" -dependencies = [ - "log", - "ring 0.17.5", - "rustls-webpki 0.101.7", + "ring", "sct", + "webpki 0.22.2", ] [[package]] @@ -6180,27 +6082,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.5", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "base64 0.21.2", ] [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6256,12 +6148,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -6319,9 +6211,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -6381,11 +6273,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.0.0", "itoa 1.0.9", "ryu", "serde", @@ -6393,9 +6285,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -6464,7 +6356,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.0.0", "itoa 1.0.9", "ryu", "serde", @@ -6508,9 +6400,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -6519,9 +6411,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.7" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] @@ -6545,6 +6437,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -6574,18 +6476,18 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "siphasher" -version = "1.0.0" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" dependencies = [ "serde", ] [[package]] name = "slab" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg 1.1.0", ] @@ -6601,15 +6503,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -6617,9 +6519,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", "windows-sys 0.48.0", @@ -6637,7 +6539,7 @@ dependencies = [ "once_cell", "one_err", "parking_lot 0.12.1", - "tokio 1.33.0", + "tokio 1.31.0", ] [[package]] @@ -6665,11 +6567,11 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" dependencies = [ - "itertools 0.11.0", + "itertools 0.10.5", "nom 7.1.3", "unicode_categories", ] @@ -6707,7 +6609,7 @@ checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" dependencies = [ "futures-core", "pin-project", - "tokio 1.33.0", + "tokio 1.31.0", ] [[package]] @@ -6881,27 +6783,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -6921,19 +6802,19 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "task-motel" -version = "0.1.0" +version = "0.1.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228e85537ffb5943539a46bf561786323f6112114005ba055e496192a6f8f41" +checksum = "767559c8f4ccd87d0191b0ca6bf4480a06bb7e8d98de2169e48d6b6ed18af1a6" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "parking_lot 0.12.1", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", ] @@ -6945,22 +6826,22 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.21", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -6971,7 +6852,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.21", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -7061,18 +6942,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d9207952ae1a003f42d3d5e892dac3c6ba42aa6ac0c79a6a91a2b5cb4253e75c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "f1728216d3244de4f14f14f8c15c79be1a7c67867d28d69b719690e2a19fb445" dependencies = [ "proc-macro2", "quote", @@ -7183,19 +7064,19 @@ dependencies = [ [[package]] name = "tokio" -version = "1.33.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.4.0", "libc", - "mio 0.8.9", + "mio 0.8.8", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -7260,7 +7141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.33.0", + "tokio 1.31.0", ] [[package]] @@ -7288,9 +7169,9 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.9", - "tokio 1.33.0", - "webpki 0.22.4", + "rustls", + "tokio 1.31.0", + "webpki 0.22.2", ] [[package]] @@ -7301,7 +7182,7 @@ checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-util", ] @@ -7368,7 +7249,7 @@ dependencies = [ "log", "native-tls", "pin-project", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-native-tls", "tungstenite 0.12.0", ] @@ -7381,12 +7262,12 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "rustls 0.20.9", + "rustls", "rustls-native-certs", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-rustls", "tungstenite 0.18.0", - "webpki 0.22.4", + "webpki 0.22.2", ] [[package]] @@ -7397,21 +7278,21 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "tokio 1.33.0", + "tokio 1.31.0", "tungstenite 0.20.1", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "futures-core", "futures-sink", "pin-project-lite", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", ] @@ -7426,9 +7307,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -7438,20 +7319,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -7479,10 +7360,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -7491,9 +7373,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", @@ -7502,9 +7384,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -7522,12 +7404,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "lazy_static", "log", - "once_cell", "tracing-core", ] @@ -7554,7 +7436,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.11.1", + "smallvec 1.11.0", "thread_local", "time 0.3.23", "tracing", @@ -7608,7 +7490,7 @@ checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.5.0", + "bytes 1.4.0", "http 0.2.9", "httparse", "input_buffer", @@ -7616,7 +7498,7 @@ dependencies = [ "native-tls", "rand 0.8.5", "sha-1 0.9.8", - "url 2.4.1", + "url 2.4.0", "utf-8", ] @@ -7628,17 +7510,17 @@ checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.5.0", + "bytes 1.4.0", "http 0.2.9", "httparse", "log", "rand 0.8.5", - "rustls 0.20.9", + "rustls", "sha1", "thiserror", - "url 2.4.1", + "url 2.4.0", "utf-8", - "webpki 0.22.4", + "webpki 0.22.2", ] [[package]] @@ -7648,7 +7530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.5.0", + "bytes 1.4.0", "data-encoding", "http 0.2.9", "httparse", @@ -7656,18 +7538,18 @@ dependencies = [ "rand 0.8.5", "sha1", "thiserror", - "url 2.4.1", + "url 2.4.0", "utf-8", ] [[package]] name = "tx5" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76decf02d813606a817a33793aa5b7bf3cbf8d85d1623157ca7b05ef939c5e1" +checksum = "c20ea30df2cb7172c8410c51ae620cb61e8fb63c3f2b0e560646a81cbe6ac04d" dependencies = [ - "bytes 1.5.0", - "futures 0.3.29", + "bytes 1.4.0", + "futures 0.3.28", "influxive-otel-atomic-obs", "once_cell", "parking_lot 0.12.1", @@ -7675,20 +7557,20 @@ dependencies = [ "rand-utf8", "serde", "serde_json", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "ts_opentelemetry_api", "tx5-core", "tx5-go-pion", "tx5-signal", - "url 2.4.1", + "url 2.4.0", ] [[package]] name = "tx5-core" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062c8fa9036a5f4e2795e5d6abe1b2e4591f36d0480732ddc0e7405a7489d01f" +checksum = "ef6c9332a03a5dec9bc20c227ca52d6918ad74472b37921252179f190dc5e312" dependencies = [ "base64 0.13.1", "dirs 5.0.1", @@ -7699,27 +7581,28 @@ dependencies = [ "sha2", "tempfile", "tracing", - "url 2.4.1", + "url 2.4.0", ] [[package]] name = "tx5-go-pion" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc0ceeb67c3c846ea7bb6f5d30088f75359a5a55646d80f6a01a3ec235a2eb5" +checksum = "943dd802f81376a72a38a7eeaa7ee128bc221826495f0346b875358db2c53d56" dependencies = [ + "futures 0.3.28", "parking_lot 0.12.1", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tx5-go-pion-sys", - "url 2.4.1", + "url 2.4.0", ] [[package]] name = "tx5-go-pion-sys" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12b039d7f78e57ab84b7db1293cd194147895b7b43a6a8910f1e82268756fbe" +checksum = "f9f7f7a8f6dcf97e956cc8f899f01233b83e7a684b95a4ab9d501ec25596f6b7" dependencies = [ "Inflector", "base64 0.13.1", @@ -7736,9 +7619,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e0194742195d3676fa8c2907995676604cd3ebf8e17fe7f0e9a50495092b945" +checksum = "13c585cb964f1bffba37ab1bfc4f372ede0c7906e2c92ce69231ecf2d8857613" dependencies = [ "base64 0.13.1", "dirs 5.0.1", @@ -7746,7 +7629,7 @@ dependencies = [ "if-addrs 0.10.2", "once_cell", "sha2", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tx5-core", "zip", @@ -7754,48 +7637,48 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7698b18a456f298ae7c4bb3c2a5e76c7193242f0a53d91866cc9507e1ff4373b" +checksum = "61ed634434030914bf893eb5d3c3f32b0c0516c9352ca14ccccbcc997178eb23" dependencies = [ - "futures 0.3.29", + "futures 0.3.28", "lair_keystore_api", "once_cell", "parking_lot 0.12.1", "rand 0.8.5", "rand-utf8", "rcgen 0.10.0", - "ring 0.16.20", - "rustls 0.20.9", + "ring", + "rustls", "rustls-native-certs", "rustls-pemfile 1.0.3", "serde_json", "sha2", - "socket2 0.5.5", - "tokio 1.33.0", + "socket2 0.5.3", + "tokio 1.31.0", "tokio-rustls", "tokio-tungstenite 0.18.0", "tracing", "tx5-core", - "url 2.4.1", + "url 2.4.0", "webpki-roots 0.23.1", ] [[package]] name = "tx5-signal-srv" -version = "0.0.2-alpha" +version = "0.0.3-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd44a26819757459b14994e728adeeb05931ca95605e54eb7733d01f3f130f8" +checksum = "811e5205cef837d9aae13933a6b42677e193845d03ff708dbae29131b89e019e" dependencies = [ - "clap 4.4.7", + "clap 4.4.11", "dirs 5.0.1", - "futures 0.3.29", + "futures 0.3.28", "if-addrs 0.10.2", "once_cell", "prometheus", "rand 0.8.5", "sodoken", - "tokio 1.33.0", + "tokio 1.31.0", "tracing", "tracing-subscriber", "tx5-core", @@ -7804,9 +7687,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -7816,9 +7699,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicase" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ "version_check", ] @@ -7831,9 +7714,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -7852,9 +7735,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -7880,12 +7763,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "unwrap_to" version = "0.1.0" @@ -7905,17 +7782,18 @@ dependencies = [ [[package]] name = "ureq" -version = "2.8.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" dependencies = [ - "base64 0.21.5", + "base64 0.13.1", + "flate2", "log", "once_cell", - "rustls 0.21.8", - "rustls-webpki 0.101.7", - "url 2.4.1", - "webpki-roots 0.25.2", + "rustls", + "url 2.4.0", + "webpki 0.22.2", + "webpki-roots 0.22.6", ] [[package]] @@ -7931,9 +7809,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -7948,7 +7826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c89cd13f1de9862d363308f5ffdadcd2b64b2a4a812fb296a80b7d3e80011b1e" dependencies = [ "serde", - "url 2.4.1", + "url 2.4.0", ] [[package]] @@ -7991,9 +7869,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.5.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", ] @@ -8006,9 +7884,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "vcpkg" @@ -8039,15 +7917,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", "winapi-util", @@ -8079,7 +7957,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" dependencies = [ - "bytes 1.5.0", + "bytes 1.4.0", "futures-channel", "futures-util", "headers", @@ -8096,7 +7974,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", - "tokio 1.33.0", + "tokio 1.31.0", "tokio-stream", "tokio-tungstenite 0.20.1", "tokio-util", @@ -8124,9 +8002,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -8134,9 +8012,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -8149,9 +8027,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -8161,9 +8039,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8171,9 +8049,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -8184,15 +8062,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.36.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ae0be20bf87918df4fa831bfbbd0b491d24aee407ed86360eae4c2c5608d38" +checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" dependencies = [ "leb128", ] @@ -8248,7 +8126,7 @@ dependencies = [ "rkyv", "serde", "serde_bytes", - "smallvec 1.11.1", + "smallvec 1.11.0", "target-lexicon", "thiserror", "wasmer-types", @@ -8268,7 +8146,7 @@ dependencies = [ "loupe", "more-asserts", "rayon", - "smallvec 1.11.1", + "smallvec 1.11.0", "target-lexicon", "tracing", "wasmer-compiler", @@ -8448,9 +8326,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "67.0.0" +version = "62.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c2933efd77ff2398b83817a98984ffe4b67aefd9aa1d2c8e68e19b553f1c38" +checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" dependencies = [ "leb128", "memchr", @@ -8460,18 +8338,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.78" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02905d13751dcb18f4e19f489d37a1bf139f519feaeef28d072a41a78e69a74" +checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -8483,45 +8361,47 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring", + "untrusted", ] [[package]] name = "webpki" -version = "0.22.4" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "rustls-webpki 0.100.3", + "webpki 0.22.2", ] [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] [[package]] name = "which" -version = "4.4.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "home", + "libc", "once_cell", - "rustix 0.38.21", ] [[package]] @@ -8554,9 +8434,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi 0.3.9", ] @@ -8568,12 +8448,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.48.2", ] [[package]] @@ -8619,7 +8499,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.48.2", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -8639,17 +8528,32 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows_aarch64_gnullvm 0.48.2", + "windows_aarch64_msvc 0.48.2", + "windows_i686_gnu 0.48.2", + "windows_i686_msvc 0.48.2", + "windows_x86_64_gnu 0.48.2", + "windows_x86_64_gnullvm 0.48.2", + "windows_x86_64_msvc 0.48.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -8660,9 +8564,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -8678,9 +8588,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -8696,9 +8612,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.48.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -8714,9 +8636,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -8732,9 +8660,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.48.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -8744,9 +8678,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -8762,15 +8702,21 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d" dependencies = [ "memchr", ] @@ -8786,12 +8732,11 @@ dependencies = [ [[package]] name = "winreg" -version = "0.50.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", + "winapi 0.3.9", ] [[package]] @@ -8846,26 +8791,6 @@ dependencies = [ "time 0.3.23", ] -[[package]] -name = "zerocopy" -version = "0.7.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50cbb27c30666a6108abd6bc7577556265b44f243e2be89a8bc4e07a528c107" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25f293fe55f0a48e7010d65552bb63704f6ceb55a1a385da10d41d8f78e4a3d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "zeroize" version = "1.6.0" diff --git a/Cargo.toml b/Cargo.toml index 47d947c50..718e72d4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "holochain_scaffolding_cli" -version = "0.1.11" +version = "0.1.12" description = "CLI to easily generate and modify holochain apps" license = "CAL-1.0" homepage = "https://developer.holochain.org" diff --git a/src/scaffold/app/nix.rs b/src/scaffold/app/nix.rs index c7888f004..ef769167c 100644 --- a/src/scaffold/app/nix.rs +++ b/src/scaffold/app/nix.rs @@ -13,12 +13,6 @@ pub fn flake_nix(holo_enabled: bool) -> FileTree { let holochain_nix_version = holochain_nix_version(); // Define the holo-specific parts - let holo_specific = if holo_enabled { - "holoDevServerChannel = \"alpha\";" - } else { - "" - }; - let additional_packages = if holo_enabled { "pkgs.curl\n # more packages go here" } else { @@ -32,7 +26,7 @@ pub fn flake_nix(holo_enabled: bool) -> FileTree { ]; shellHook = '' - nix-env -f "https://hydra.holo.host/channel/custom/holo-nixpkgs/${{inputs.holoDevServerChannel}}/holo-nixpkgs/nixexprs.tar.xz" -iA holo-dev-server + nix-env -f "https://hydra.holo.host/channel/custom/holo-nixpkgs/alpha/holo-nixpkgs/nixexprs.tar.xz" -iA holo-dev-server '';"# } else { "" @@ -40,7 +34,7 @@ pub fn flake_nix(holo_enabled: bool) -> FileTree { // Format the final file content with the conditional parts let file_content = file!(format!( - r#" + r#"{{ description = "Template for Holochain app development"; inputs = {{ @@ -51,7 +45,6 @@ inputs = {{ nixpkgs.follows = "holochain-flake/nixpkgs"; flake-parts.follows = "holochain-flake/flake-parts"; - {} }}; outputs = inputs: @@ -60,6 +53,7 @@ outputs = inputs: inherit inputs; }} {{ + systems = builtins.attrNames inputs.holochain-flake.devShells; perSystem = {{ inputs' @@ -78,9 +72,8 @@ outputs = inputs: }}; }}; }}; -"#, +}}"#, holochain_nix_version, - holo_specific, additional_packages, extra_content )); From 023496d391f4e009c40f059fbffc5f87e3a3e03e Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Thu, 7 Dec 2023 13:20:42 +0000 Subject: [PATCH 4/6] add test --- run_test.sh | 214 ++++++++++++++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 98 deletions(-) diff --git a/run_test.sh b/run_test.sh index 6f4af3594..4461418a8 100755 --- a/run_test.sh +++ b/run_test.sh @@ -38,113 +38,131 @@ npm t npm run package " -rm -rf /tmp/forum-vue -cd /tmp - -hc-scaffold web-app forum-vue --setup-nix true --template vue -cd forum-vue - -hc-scaffold dna forum -hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -hc-scaffold collection global all_posts post -hc-scaffold collection by-author posts_by_author post -hc-scaffold collection global all_likes like -hc-scaffold collection global all_posts_entry_hash post:EntryHash -hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash - -hc-scaffold link-type post like --delete true --bidireccional false -hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true +# rm -rf /tmp/forum-vue +# cd /tmp + +# hc-scaffold web-app forum-vue --setup-nix true --template vue +# cd forum-vue + +# hc-scaffold dna forum +# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +# hc-scaffold collection global all_posts post +# hc-scaffold collection by-author posts_by_author post +# hc-scaffold collection global all_likes like +# hc-scaffold collection global all_posts_entry_hash post:EntryHash +# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash + +# hc-scaffold link-type post like --delete true --bidireccional false +# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + +# nix develop --command bash -c " +# set -e +# npm i +# npm run build -w ui +# npm t +# npm run package +# " + +# rm -rf /tmp/forum-lit +# cd /tmp + +# hc-scaffold web-app forum-lit --setup-nix true --template lit +# cd forum-lit + +# hc-scaffold dna forum +# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +# hc-scaffold collection global all_posts post +# hc-scaffold collection by-author posts_by_author post +# hc-scaffold collection global all_posts_entry_hash post:EntryHash +# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash +# hc-scaffold collection global all_likes like + +# hc-scaffold link-type post like --delete true --bidireccional false +# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + +# nix develop --command bash -c " +# set -e +# npm i +# npm run build -w ui +# npm run format -w ui +# npm run lint -w ui +# npm t +# npm run package +# " + + +# rm -rf /tmp/forum-vanilla +# cd /tmp + +# hc-scaffold web-app forum-vanilla --setup-nix true --template vanilla +# cd forum-vanilla + +# hc-scaffold dna forum +# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +# hc-scaffold collection global all_posts post +# hc-scaffold collection by-author posts_by_author post +# hc-scaffold collection global all_posts_entry_hash post:EntryHash +# hc-scaffold collection global all_likes like +# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash + +# hc-scaffold link-type post like --delete true --bidireccional false +# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + + +# nix develop --command bash -c " +# set -e +# npm i +# npm t +# npm run package +# " + +# rm -rf /tmp/hello-world +# cd /tmp + +# hc-scaffold example hello-world +# cd hello-world nix develop --command bash -c " set -e npm i -npm run build -w ui -npm t -npm run package -" - -rm -rf /tmp/forum-lit -cd /tmp - -hc-scaffold web-app forum-lit --setup-nix true --template lit -cd forum-lit - -hc-scaffold dna forum -hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -hc-scaffold collection global all_posts post -hc-scaffold collection by-author posts_by_author post -hc-scaffold collection global all_posts_entry_hash post:EntryHash -hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash -hc-scaffold collection global all_likes like - -hc-scaffold link-type post like --delete true --bidireccional false -hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true - -nix develop --command bash -c " -set -e -npm i -npm run build -w ui -npm run format -w ui -npm run lint -w ui -npm t -npm run package +npm t " - -rm -rf /tmp/forum-vanilla +rm -rf /tmp/holo-flake cd /tmp -hc-scaffold web-app forum-vanilla --setup-nix true --template vanilla -cd forum-vanilla - -hc-scaffold dna forum -hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -hc-scaffold collection global all_posts post -hc-scaffold collection by-author posts_by_author post -hc-scaffold collection global all_posts_entry_hash post:EntryHash -hc-scaffold collection global all_likes like -hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash - -hc-scaffold link-type post like --delete true --bidireccional false -hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true - +hc-scaffold web-app holo-flake --setup-nix true --template vue --holo +cd holo-flake nix develop --command bash -c " set -e -npm i -npm t -npm run package -" - -rm -rf /tmp/hello-world -cd /tmp - -hc-scaffold example hello-world -cd hello-world -nix develop --command bash -c " -set -e -npm i -npm t -" +# Check if holo-dev-server is in the path +if command -v holo-dev-server >/dev/null 2>&1; then + echo 'holo-dev-server is available in the PATH' +else + echo 'holo-dev-server is NOT available in the PATH' + exit 1 +fi +" \ No newline at end of file From 72c7a00686f24315500c3914d5d7e2d09aa4710b Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Thu, 7 Dec 2023 13:22:53 +0000 Subject: [PATCH 5/6] revert version bump --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 718e72d4b..47d947c50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "holochain_scaffolding_cli" -version = "0.1.12" +version = "0.1.11" description = "CLI to easily generate and modify holochain apps" license = "CAL-1.0" homepage = "https://developer.holochain.org" From 0dc202f7776ba7ff58f3cbbbbbb712ef7a96bffa Mon Sep 17 00:00:00 2001 From: Alastair Ong Date: Thu, 7 Dec 2023 13:27:56 +0000 Subject: [PATCH 6/6] uncomment tests --- Cargo.lock | 2 +- run_test.sh | 208 ++++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8b767276..7a6ead41c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2685,7 +2685,7 @@ dependencies = [ [[package]] name = "holochain_scaffolding_cli" -version = "0.1.12" +version = "0.1.11" dependencies = [ "anyhow", "assert_cmd", diff --git a/run_test.sh b/run_test.sh index 4461418a8..1406daa39 100755 --- a/run_test.sh +++ b/run_test.sh @@ -38,110 +38,110 @@ npm t npm run package " -# rm -rf /tmp/forum-vue -# cd /tmp - -# hc-scaffold web-app forum-vue --setup-nix true --template vue -# cd forum-vue - -# hc-scaffold dna forum -# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -# hc-scaffold collection global all_posts post -# hc-scaffold collection by-author posts_by_author post -# hc-scaffold collection global all_likes like -# hc-scaffold collection global all_posts_entry_hash post:EntryHash -# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash - -# hc-scaffold link-type post like --delete true --bidireccional false -# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true - -# nix develop --command bash -c " -# set -e -# npm i -# npm run build -w ui -# npm t -# npm run package -# " - -# rm -rf /tmp/forum-lit -# cd /tmp - -# hc-scaffold web-app forum-lit --setup-nix true --template lit -# cd forum-lit - -# hc-scaffold dna forum -# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -# hc-scaffold collection global all_posts post -# hc-scaffold collection by-author posts_by_author post -# hc-scaffold collection global all_posts_entry_hash post:EntryHash -# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash -# hc-scaffold collection global all_likes like - -# hc-scaffold link-type post like --delete true --bidireccional false -# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true - -# nix develop --command bash -c " -# set -e -# npm i -# npm run build -w ui -# npm run format -w ui -# npm run lint -w ui -# npm t -# npm run package -# " - - -# rm -rf /tmp/forum-vanilla -# cd /tmp - -# hc-scaffold web-app forum-vanilla --setup-nix true --template vanilla -# cd forum-vanilla - -# hc-scaffold dna forum -# hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ -# hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea -# hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post -# hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ -# hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash - -# hc-scaffold collection global all_posts post -# hc-scaffold collection by-author posts_by_author post -# hc-scaffold collection global all_posts_entry_hash post:EntryHash -# hc-scaffold collection global all_likes like -# hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash - -# hc-scaffold link-type post like --delete true --bidireccional false -# hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true -# hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false -# hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true - - -# nix develop --command bash -c " -# set -e -# npm i -# npm t -# npm run package -# " - -# rm -rf /tmp/hello-world -# cd /tmp - -# hc-scaffold example hello-world -# cd hello-world +rm -rf /tmp/forum-vue +cd /tmp + +hc-scaffold web-app forum-vue --setup-nix true --template vue +cd forum-vue + +hc-scaffold dna forum +hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +hc-scaffold collection global all_posts post +hc-scaffold collection by-author posts_by_author post +hc-scaffold collection global all_likes like +hc-scaffold collection global all_posts_entry_hash post:EntryHash +hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash + +hc-scaffold link-type post like --delete true --bidireccional false +hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + +nix develop --command bash -c " +set -e +npm i +npm run build -w ui +npm t +npm run package +" + +rm -rf /tmp/forum-lit +cd /tmp + +hc-scaffold web-app forum-lit --setup-nix true --template lit +cd forum-lit + +hc-scaffold dna forum +hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +hc-scaffold collection global all_posts post +hc-scaffold collection by-author posts_by_author post +hc-scaffold collection global all_posts_entry_hash post:EntryHash +hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash +hc-scaffold collection global all_likes like + +hc-scaffold link-type post like --delete true --bidireccional false +hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + +nix develop --command bash -c " +set -e +npm i +npm run build -w ui +npm run format -w ui +npm run lint -w ui +npm t +npm run package +" + + +rm -rf /tmp/forum-vanilla +cd /tmp + +hc-scaffold web-app forum-vanilla --setup-nix true --template vanilla +cd forum-vanilla + +hc-scaffold dna forum +hc-scaffold zome posts --integrity dnas/forum/zomes/integrity/ --coordinator dnas/forum/zomes/coordinator/ +hc-scaffold entry-type post --reference-entry-hash false --crud crud --link-from-original-to-each-update true --fields title:String:TextField,content:String:TextArea +hc-scaffold entry-type comment --reference-entry-hash false --crud crud --link-from-original-to-each-update false --fields post_hash:ActionHash::Post +hc-scaffold entry-type like --reference-entry-hash false --crud crd --fields like_hash:Option\::Like,string_list:Vec\ +hc-scaffold entry-type certificate --reference-entry-hash true --crud cr --fields post_hash:ActionHash::Post,agent:AgentPubKey::certified,certifications_hashes:Vec\::Certificate,certificate_type:Enum::CertificateType:TypeOne.TypeTwo,dna_hash:DnaHash + +hc-scaffold collection global all_posts post +hc-scaffold collection by-author posts_by_author post +hc-scaffold collection global all_posts_entry_hash post:EntryHash +hc-scaffold collection global all_likes like +hc-scaffold collection by-author posts_by_author_entry_hash post:EntryHash + +hc-scaffold link-type post like --delete true --bidireccional false +hc-scaffold link-type comment like:EntryHash --delete true --bidireccional true +hc-scaffold link-type certificate:EntryHash like --delete false --bidireccional false +hc-scaffold link-type agent:creator post:EntryHash --delete false --bidireccional true + + +nix develop --command bash -c " +set -e +npm i +npm t +npm run package +" + +rm -rf /tmp/hello-world +cd /tmp + +hc-scaffold example hello-world +cd hello-world nix develop --command bash -c " set -e