From 95286fdee15a60a51326e753ec29a09659a0211b Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Tue, 7 Jan 2025 22:48:56 +0300 Subject: [PATCH 1/4] Bump dependencies --- Cargo.lock | 105 +++++++++++++++++++++++++++++++++--------------- Cargo.toml | 2 +- src/versions.rs | 10 ++--- 3 files changed, 79 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae6f806d..6621d886 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -1408,9 +1408,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.5.0-dev.3" +version = "0.5.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ef5f1b831a64ab1e1d2a2d6c76b8140c59660cd9b6c745eaf0c4b0d03b9257" +checksum = "6a9c4647a73b4a1231074a98ec4721b8df111001edeb77f782d4b1697e19e5f4" dependencies = [ "base64 0.22.1", "blake2b_simd", @@ -1432,9 +1432,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.5.0-dev.3" +version = "0.5.0-dev.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835be40ef1c0dffbfa111991611169a886506c48d45c91dce9523eae7639a14" +checksum = "bf58653e896d28f0e8a16b0520595ff677b0a1595d145284fcffdb36f66dc93a" dependencies = [ "derive_builder", "holo_hash", @@ -1451,9 +1451,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.5.0-dev.6" +version = "0.5.0-dev.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652f589efaa3d2dc997a0f25430685750ec7e848272f4211ccfbdd3c938cdc5e" +checksum = "a72ed37aaa206646f724a15d1292233e298280837b0fb6fe310343e0e68e36cf" dependencies = [ "base64 0.22.1", "derive_more", @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.5.0-dev.6" +version = "0.5.0-dev.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d0d29ea16d4962ce2f38ea2d1d37f2f4dc1fcb36873aff6bba2b46ae66fa5c" +checksum = "2c7cd265b4495c6bb6e425d0f3d8700fc4322bf5f158662b02aef64d53922c66" dependencies = [ "anyhow", "async-trait", @@ -1627,9 +1627,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.5.0-dev.6" +version = "0.5.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8425aee4d7828a6bb792262f12d5073173864fd0dc11b78c205329f4f16e9df8" +checksum = "5c6e28b9162bbae726991f35f61c37f3455d476ed4d10968c9d91c700cb5e6f0" dependencies = [ "anyhow", "async-trait", @@ -1710,9 +1710,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.5.0-dev.6" +version = "0.5.0-dev.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9a6ecee3de89277f3711c4fa41d9627287b494a2e043b3dd43afd284b328bc" +checksum = "4050368431ec1d6db8d510f40413115755e0efa1c5809430f245860ef175daac" dependencies = [ "derive_builder", "derive_more", @@ -1873,7 +1873,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2295,9 +2295,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.5.0-dev.5" +version = "0.5.0-dev.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ddf3e3d9110d1a1567033c75a592e667cb8813cb095ed23db657489d805327" +checksum = "600a31d76e71b5df842b2e1337ed61f6d9d3ae6a2ecc271d2a35d563bc5917c2" dependencies = [ "base64 0.22.1", "derive_more", @@ -2326,9 +2326,9 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d28639d61fce26c920ba0a786cd662d609cd40832762c74716df1355cf53db" +checksum = "d9b6f792c308afb82ceac6035fcf0ad321eaf271b892d08789d822e78b112a4d" dependencies = [ "lair_keystore_api", "pretty_assertions", @@ -2342,9 +2342,9 @@ dependencies = [ [[package]] name = "lair_keystore_api" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b5bd4a14c91039d6d28aaffe11c36060ec0e542123c81f901f661e3cfcb94f" +checksum = "f5d6aa053bddb4e4c36652217349511ea9c51f1bdaf60530a7013d2d4c91204e" dependencies = [ "base64 0.22.1", "dunce", @@ -2357,7 +2357,6 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "time", "tokio", "toml", "tracing", @@ -2374,9 +2373,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libflate" @@ -4394,15 +4393,14 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" dependencies = [ - "cfg-if 1.0.0", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", "windows", ] @@ -5145,11 +5143,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", + "windows-core 0.57.0", "windows-targets 0.52.6", ] @@ -5162,17 +5160,60 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "windows-registry" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-strings", "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.2.0" @@ -5188,7 +5229,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", "windows-targets 0.52.6", ] diff --git a/Cargo.toml b/Cargo.toml index cbc6959e..edc08f37 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ name = "holochain_scaffolding_cli" path = "src/lib.rs" [dependencies] -holochain_types = "0.5.0-dev.6" +holochain_types = "0.5.0-dev.12" mr_bundle = "0.5.0-dev.1" dirs = "5.0.1" diff --git a/src/versions.rs b/src/versions.rs index 639f83bf..50fd31ef 100644 --- a/src/versions.rs +++ b/src/versions.rs @@ -1,8 +1,8 @@ /// npm: -pub const TRYORAMA_VERSION: &str = "^0.18.0-dev.1"; +pub const TRYORAMA_VERSION: &str = "^0.18.0-dev.3"; /// npm: -pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.19.0-dev.5"; +pub const HOLOCHAIN_CLIENT_VERSION: &str = "^0.19.0-dev.6"; /// npm: pub const HC_SPIN_VERSION: &str = "^0.500.0-dev.0"; @@ -11,13 +11,13 @@ pub const HC_SPIN_VERSION: &str = "^0.500.0-dev.0"; pub const WEB_SDK_VERSION: &str = "^0.6.20-prerelease"; /// crates.io -pub const HDI_VERSION: &str = "0.6.0-dev.4"; +pub const HDI_VERSION: &str = "0.6.0-dev.8"; /// crates.io -pub const HDK_VERSION: &str = "0.5.0-dev.6"; +pub const HDK_VERSION: &str = "0.5.0-dev.11"; /// crates.io -pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.6"; +pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.12"; /// source: /// From bc3ffe35d03e4950a0793ce3d1871ff934c041fa Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Tue, 7 Jan 2025 22:49:22 +0300 Subject: [PATCH 2/4] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6621d886..42510d0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1491,7 +1491,7 @@ dependencies = [ [[package]] name = "holochain_scaffolding_cli" -version = "0.500.0-dev.4" +version = "0.500.0-dev.5" dependencies = [ "anyhow", "build-fs-tree", diff --git a/Cargo.toml b/Cargo.toml index edc08f37..596f8448 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "holochain_scaffolding_cli" -version = "0.500.0-dev.4" +version = "0.500.0-dev.5" description = "CLI to easily generate and modify holochain apps" license = "CAL-1.0" homepage = "https://developer.holochain.org" From 7087f7ad5afba8c9a3c2aece97b9d54ee227fb3f Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Tue, 7 Jan 2025 22:49:51 +0300 Subject: [PATCH 3/4] Nix flake update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 0846def6..a1f6b933 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1732407143, - "narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=", + "lastModified": 1736101677, + "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", "owner": "ipetkov", "repo": "crane", - "rev": "f2b4b472983817021d9ffb60838b2b36b9376b20", + "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1731921057, - "narHash": "sha256-8Qn6yXNVRTAiKCwlZpD9PDW6JQZh7lgOEa9kmnsbXnM=", + "lastModified": 1732649741, + "narHash": "sha256-Hn9ckh1eZblZ1uZ2SDsoEjgFbkRE4FCyPWp19duZOlU=", "owner": "holochain", "repo": "scaffolding", - "rev": "2c5dc235c2e42b458bbc40cdd8c35bf588a2c40c", + "rev": "bf8826dc48b5d828c62bd2ea8bf40c7ea471642d", "type": "github" }, "original": { @@ -70,16 +70,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1732065228, - "narHash": "sha256-4QBB/HAv6MoVaHVYsbhhvj2UnfIT0bCb0cgcoeNn07A=", + "lastModified": 1735693835, + "narHash": "sha256-9iitTY//PWt/90Tniiph3YhznfCy59OmxSoHoe9xMdg=", "owner": "holochain", "repo": "holochain", - "rev": "0069772823ce6f761f793544ca7ec8877cd47a39", + "rev": "240821a59a50bfbea1bf05aa8b16a9124f1c9caa", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.5.0-dev.6", + "ref": "holochain-0.5.0-dev.12", "repo": "holochain", "type": "github" } @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1732545695, - "narHash": "sha256-+p04s8LxW92CPkPmmofi1mHDmuJWW1L/6X89q2XqC2c=", + "lastModified": 1735915411, + "narHash": "sha256-d8O9kfrtpyXJ+t6wvKYgaBh1Xj5qVNdsJoPJU6qXUw8=", "owner": "holochain", "repo": "holonix", - "rev": "5cad4eae276f3e84083d363595b415e22e1f6407", + "rev": "a1f275bf4a470ecd473eb962691823855d5462af", "type": "github" }, "original": { @@ -121,16 +121,16 @@ "lair-keystore": { "flake": false, "locked": { - "lastModified": 1726865440, - "narHash": "sha256-+ARQs+Sfmh8QXMyjjHjm6Ib8Ag86Jm2vnyB6l3zTCgA=", + "lastModified": 1732721902, + "narHash": "sha256-D8sXIpOptaXib5bc6zS7KsGzu4D08jaL8Fx1W/mlADE=", "owner": "holochain", "repo": "lair", - "rev": "9f306efed597765b70da704e1739ecc67f2510e0", + "rev": "e82937521ae9b7bdb30c8b0736c13cd4220a0223", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.5.2", + "ref": "lair_keystore-v0.5.3", "repo": "lair", "type": "github" } @@ -153,14 +153,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "root": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1732588352, - "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=", + "lastModified": 1736216977, + "narHash": "sha256-EMueGrzBpryM8mgOyoyJ7DdNRRk09ug1ggcLLp0WrCQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb", + "rev": "bbe7e4e7a70d235db4bbdcabbf8a2f6671881dd7", "type": "github" }, "original": { From 65f8d5b3e3c81be02f0a31d84c28a6a86a52984c Mon Sep 17 00:00:00 2001 From: Collins Muriuki Date: Thu, 9 Jan 2025 17:37:36 +0300 Subject: [PATCH 4/4] Bump to holochain dev.13 --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- src/versions.rs | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 42510d0a..cbdba5c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1432,9 +1432,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.5.0-dev.6" +version = "0.5.0-dev.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf58653e896d28f0e8a16b0520595ff677b0a1595d145284fcffdb36f66dc93a" +checksum = "1f4685dacfebc5baa4692b7ac526e341c60ed8834d411365303be95cf59da455" dependencies = [ "derive_builder", "holo_hash", @@ -1451,9 +1451,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.5.0-dev.11" +version = "0.5.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a72ed37aaa206646f724a15d1292233e298280837b0fb6fe310343e0e68e36cf" +checksum = "fa6cde5f26e5a9c1e0b66c4248cb924b65cb1f392eeeb7197327c3cc3ba46267" dependencies = [ "base64 0.22.1", "derive_more", @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.5.0-dev.11" +version = "0.5.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7cd265b4495c6bb6e425d0f3d8700fc4322bf5f158662b02aef64d53922c66" +checksum = "a8b422d87bf69230a90001e174bedd4e37c26504e862c1611a18c367b3506c58" dependencies = [ "anyhow", "async-trait", @@ -1627,9 +1627,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.5.0-dev.12" +version = "0.5.0-dev.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6e28b9162bbae726991f35f61c37f3455d476ed4d10968c9d91c700cb5e6f0" +checksum = "5e1989b9fa6038cab1071318f2a0e896fa3c3a28dc8e875cc9bbe552eed14213" dependencies = [ "anyhow", "async-trait", @@ -1710,9 +1710,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.5.0-dev.10" +version = "0.5.0-dev.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4050368431ec1d6db8d510f40413115755e0efa1c5809430f245860ef175daac" +checksum = "83185babddadd94093c1c16d6bc94b3eeb336703121b0f21f02f6c80b82db0ad" dependencies = [ "derive_builder", "derive_more", diff --git a/Cargo.toml b/Cargo.toml index 596f8448..b003a623 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ name = "holochain_scaffolding_cli" path = "src/lib.rs" [dependencies] -holochain_types = "0.5.0-dev.12" +holochain_types = "0.5.0-dev.13" mr_bundle = "0.5.0-dev.1" dirs = "5.0.1" diff --git a/src/versions.rs b/src/versions.rs index 50fd31ef..6f246842 100644 --- a/src/versions.rs +++ b/src/versions.rs @@ -11,13 +11,13 @@ pub const HC_SPIN_VERSION: &str = "^0.500.0-dev.0"; pub const WEB_SDK_VERSION: &str = "^0.6.20-prerelease"; /// crates.io -pub const HDI_VERSION: &str = "0.6.0-dev.8"; +pub const HDI_VERSION: &str = "0.6.0-dev.9"; /// crates.io -pub const HDK_VERSION: &str = "0.5.0-dev.11"; +pub const HDK_VERSION: &str = "0.5.0-dev.12"; /// crates.io -pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.12"; +pub const HOLOCHAIN_VERSION: &str = "0.5.0-dev.13"; /// source: ///