From 66983aae89ba6cf425a5674b82db20145a2720d9 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Tue, 26 Sep 2023 20:07:36 -0700 Subject: [PATCH] build: upgrade holochain to 0.2.2 --- Cargo.lock | 136 +++--- Cargo.toml | 5 +- .../zomes/coordinator/agent_pins/Cargo.toml | 1 - .../zomes/coordinator/follows/Cargo.toml | 1 - .../zomes/coordinator/likes/Cargo.toml | 1 - .../zomes/coordinator/mews/Cargo.toml | 2 +- .../zomes/coordinator/profiles/Cargo.toml | 2 +- .../zomes/integrity/agent_pins/Cargo.toml | 1 - .../zomes/integrity/follows/Cargo.toml | 1 - .../mewsfeed/zomes/integrity/likes/Cargo.toml | 1 - dnas/mewsfeed/zomes/integrity/mews/Cargo.toml | 2 +- .../zomes/integrity/profiles/Cargo.toml | 2 +- flake.lock | 451 ++---------------- flake.nix | 2 - 14 files changed, 135 insertions(+), 473 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a9f6e62..59a7275a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,6 @@ version = "0.0.1" dependencies = [ "agent_pins_integrity", "hdk", - "holochain_integrity_types", "serde", ] @@ -32,7 +31,6 @@ name = "agent_pins_integrity" version = "0.0.1" dependencies = [ "hdi", - "holochain_integrity_types", "serde", ] @@ -117,7 +115,7 @@ checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object 0.31.1", @@ -264,6 +262,12 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -320,7 +324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "libc", "scopeguard", "windows-sys 0.33.0", @@ -400,7 +404,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -409,7 +413,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -419,7 +423,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] @@ -431,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", "memoffset 0.9.0", "scopeguard", @@ -443,7 +447,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -559,6 +563,12 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "either" version = "1.8.1" @@ -662,7 +672,6 @@ dependencies = [ "follows_types", "hc_link_pagination", "hdk", - "holochain_integrity_types", "serde", ] @@ -671,7 +680,6 @@ name = "follows_integrity" version = "0.0.1" dependencies = [ "hdi", - "holochain_integrity_types", "serde", ] @@ -807,7 +815,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -872,7 +880,8 @@ dependencies = [ [[package]] name = "hc_zome_profiles_coordinator" version = "0.2.0" -source = "git+https://github.com/holochain-open-dev/profiles?branch=build/upgrade-0.2.1#c8945544363853fdf7f22f998ef34dfa7596a0a3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bae0ee9f90bdaa1fb3f0888817fd37447e8fd1ebf2b494cf81b1270188d75b2" dependencies = [ "derive_more", "hc_zome_profiles_integrity", @@ -883,7 +892,8 @@ dependencies = [ [[package]] name = "hc_zome_profiles_integrity" version = "0.2.0" -source = "git+https://github.com/holochain-open-dev/profiles?branch=build/upgrade-0.2.1#c8945544363853fdf7f22f998ef34dfa7596a0a3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536920780e20fffc9757a8f762f235b64fe1bb847d0bf494a927e22aa530be58" dependencies = [ "derive_more", "hdi", @@ -892,9 +902,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6115e6d52f5da0fe55ec9608ff93e5e61211a66a3628f97e0cbbfd4131787cf6" +checksum = "9b12f620a0d22b7dcd534a849f0024b0b47c4343b15f1c0ec02e37f4990f6f16" dependencies = [ "hdk_derive", "holo_hash", @@ -909,9 +919,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5690ef906744725fcd16ae3d13b0e2ba22f046f4a9be2dc21ec2e4b3cf049a" +checksum = "8d50da8f292a1b819ae6a7651e9c3cb2ec97f00729125ad9ec3d31df8154eef7" dependencies = [ "getrandom", "hdi", @@ -929,9 +939,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d220ca3a6c5992600052e025f0c3f2342d6a4cf7fe52687135acda9128a62eae" +checksum = "fc855dc170fec9ca44d2b21cba90fb961ef92acadaae0f0c7d090312a6212552" dependencies = [ "darling 0.14.4", "heck", @@ -972,14 +982,15 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39f740985893adf2be5ad75987456ed2ce2f1d6d53cdf534e4fbe96ebae0940" +checksum = "2a5aa5c7b7c2d99ba6769e58ead10d5d4ead9036724a54a7fcea1c0203aac00e" dependencies = [ "base64", "blake2b_simd", "derive_more", "holochain_serialized_bytes", + "holochain_util", "holochain_wasmer_common", "kitsune_p2p_dht_arc", "serde", @@ -989,12 +1000,13 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92876d5a2fa142858efe38fe4f6b9f25ae1be9441bf90cb516ed613df77f50d" +checksum = "fdfffeca0c6dea328a1ff7097946a951035dd137f4b9ad0db00f5377cd6c9326" dependencies = [ "holo_hash", "holochain_serialized_bytes", + "holochain_util", "kitsune_p2p_dht", "kitsune_p2p_timestamp", "paste", @@ -1029,6 +1041,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "holochain_util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c507f39c150414b64bb2fe8da311dc4e925435be887f8dfc3a97f8183d829878" +dependencies = [ + "cfg-if 0.1.10", + "derive_more", + "dunce", + "futures", + "num_cpus", + "once_cell", +] + [[package]] name = "holochain_wasmer_common" version = "0.0.84" @@ -1060,9 +1086,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5017d60431ed65bdb25974fdd98a267fccf0436725952cdd8ac0cce660c6c79" +checksum = "7b77f5caa760c7b34019739fb3b0a986a235fa0a09086b8eaff8cf7a72a2a6ce" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -1151,7 +1177,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -1204,12 +1230,13 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9845f57ef9189f403609ada819b26ca87e96ccf95fef02bebcdf83faa65b1924" +checksum = "cb0b2032c0ee5683bc4d4c7c705f545992655bd5dc6235e62d0f916197a5c0af" dependencies = [ "base64", "derive_more", + "holochain_util", "kitsune_p2p_dht_arc", "serde", "serde_bytes", @@ -1218,9 +1245,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a29e6b5eeb78b37d9d0040855603f3a00c6c7055d933a6e5b6b31aa9529b326" +checksum = "e15586a9b4f1ec2190d1b92b706995f15a871003955548e6be434cadd75413dd" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1230,9 +1257,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb834fef2af5271ec002e2726b2be7755e9d7b7b666a5dcfa3847b3a3a89cfd" +checksum = "bf6ff683970365a1c3b71192a116abeb986512ced906e4e25cc7ad40bf65b1b3" dependencies = [ "colored", "derivative", @@ -1254,9 +1281,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2d4d68c154cdc5391ea986eb278f5b34707908cf63674d9fe8e7142d49c449" +checksum = "f71f358459319708884f9295f122cb7b69a8589300fb232b573a36af04d0a7bc" dependencies = [ "derive_more", "gcollections", @@ -1267,9 +1294,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46a356525779ac9b2b4956cee7ea523c8723f1955596d5e070faac2723a0b65" +checksum = "3e173408aabd1fccedec2ba096b8feac7ef769c435294607f4ae5bc5b83ebc9e" dependencies = [ "chrono", "derive_more", @@ -1300,7 +1327,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "winapi", ] @@ -1315,7 +1342,6 @@ name = "likes" version = "0.0.1" dependencies = [ "hdk", - "holochain_integrity_types", "likes_integrity", "serde", ] @@ -1325,7 +1351,6 @@ name = "likes_integrity" version = "0.0.1" dependencies = [ "hdi", - "holochain_integrity_types", "serde", ] @@ -1608,7 +1633,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -1659,11 +1684,10 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prefix_index" -version = "0.5.0" -source = "git+https://github.com/holochain-open-dev/holochain-prefix-index?tag=0.6.0#1659caae0f61f6d57ea461ada4e0a2cdc3b67891" +version = "0.7.0" +source = "git+https://github.com/holochain-open-dev/holochain-prefix-index?tag=0.7.0#de4b2d13f17c39e24d1ac3f089bcc0859a9e1e59" dependencies = [ "hdk", - "holochain_integrity_types", "rand", "serde", ] @@ -2040,9 +2064,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] @@ -2067,9 +2091,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", @@ -2094,7 +2118,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -2240,7 +2264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "fastrand", "redox_syscall", "rustix", @@ -2369,7 +2393,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -2484,7 +2508,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] @@ -2547,7 +2571,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "indexmap 1.9.3", "js-sys", "loupe", @@ -2660,7 +2684,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "enum-iterator", "enumset", "leb128", @@ -2686,7 +2710,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "enumset", "leb128", "loupe", @@ -2752,7 +2776,7 @@ checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" dependencies = [ "backtrace", "cc", - "cfg-if", + "cfg-if 1.0.0", "corosensei", "enum-iterator", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 122d6416..534d7c4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,9 +3,8 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "crates/*"] resolver = "2" [workspace.dependencies] -hdi = "=0.3.1" -hdk = "=0.2.1" -holochain_integrity_types = "=0.2.1" +hdi = "=0.3.2" +hdk = "=0.2.2" serde = "1" paste = "1.0" diff --git a/dnas/mewsfeed/zomes/coordinator/agent_pins/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/agent_pins/Cargo.toml index b5931fa0..098ecc17 100644 --- a/dnas/mewsfeed/zomes/coordinator/agent_pins/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/agent_pins/Cargo.toml @@ -9,7 +9,6 @@ name = "agent_pins" [dependencies] hdk = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } diff --git a/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml index 6dcd6e32..b6942d0c 100644 --- a/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml @@ -9,7 +9,6 @@ name = "follows" [dependencies] hdk = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } follows_integrity = { workspace = true } hc_link_pagination = { workspace = true } diff --git a/dnas/mewsfeed/zomes/coordinator/likes/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/likes/Cargo.toml index 135917af..1aa0002e 100644 --- a/dnas/mewsfeed/zomes/coordinator/likes/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/likes/Cargo.toml @@ -9,7 +9,6 @@ name = "likes" [dependencies] hdk = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } diff --git a/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml index 844c2618..e1d92665 100644 --- a/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml @@ -12,7 +12,7 @@ hdk = { workspace = true } serde = { workspace = true } regex = "1" mews_integrity = { workspace = true } -prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.6.0", module = "lib/prefix_index" } +prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.7.0", module = "lib/prefix_index" } profiles_integrity = { workspace = true } mews_types = { workspace = true } rand = "0.8.5" diff --git a/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml index fd869a58..776fd210 100644 --- a/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml +++ b/dnas/mewsfeed/zomes/coordinator/profiles/Cargo.toml @@ -13,4 +13,4 @@ hdk = { workspace = true } serde = { workspace = true } profiles_integrity = { workspace = true } -hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles", branch = "build/upgrade-0.2.1", module = "crates/coordinator" } +hc_zome_profiles_coordinator = "0.2.0" \ No newline at end of file diff --git a/dnas/mewsfeed/zomes/integrity/agent_pins/Cargo.toml b/dnas/mewsfeed/zomes/integrity/agent_pins/Cargo.toml index ffc28758..a92a5e5e 100644 --- a/dnas/mewsfeed/zomes/integrity/agent_pins/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/agent_pins/Cargo.toml @@ -9,6 +9,5 @@ name = "agent_pins_integrity" [dependencies] hdi = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } diff --git a/dnas/mewsfeed/zomes/integrity/follows/Cargo.toml b/dnas/mewsfeed/zomes/integrity/follows/Cargo.toml index 0cd5836c..a363eef6 100644 --- a/dnas/mewsfeed/zomes/integrity/follows/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/follows/Cargo.toml @@ -9,6 +9,5 @@ name = "follows_integrity" [dependencies] hdi = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } diff --git a/dnas/mewsfeed/zomes/integrity/likes/Cargo.toml b/dnas/mewsfeed/zomes/integrity/likes/Cargo.toml index 97f0161f..172e8f51 100644 --- a/dnas/mewsfeed/zomes/integrity/likes/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/likes/Cargo.toml @@ -9,6 +9,5 @@ name = "likes_integrity" [dependencies] hdi = { workspace = true } -holochain_integrity_types = { workspace = true } serde = { workspace = true } diff --git a/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml b/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml index f5d00d75..185d9915 100644 --- a/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml @@ -11,5 +11,5 @@ name = "mews_integrity" hdi = { workspace = true } hdk = { workspace = true } serde = { workspace = true } -prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.6.0", module = "lib/prefix_index" } +prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index", tag = "0.7.0", module = "lib/prefix_index" } mews_types = { workspace = true } \ No newline at end of file diff --git a/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml b/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml index 8a7ffb09..6be46ac0 100644 --- a/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml +++ b/dnas/mewsfeed/zomes/integrity/profiles/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"] name = "profiles_integrity" [dependencies] -hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles", branch = "build/upgrade-0.2.1", module = "crates/integrity" } +hc_zome_profiles_integrity = "0.2.0" hdi = { workspace = true } diff --git a/flake.lock b/flake.lock index f482e97f..b2d67029 100644 --- a/flake.lock +++ b/flake.lock @@ -17,23 +17,6 @@ "type": "github" } }, - "cargo-chef_2": { - "flake": false, - "locked": { - "lastModified": 1672901199, - "narHash": "sha256-MHTuR4aQ1rQaBKx1vWDy2wbvcT0ZAzpkVB2zylSC+k0=", - "owner": "LukeMathWalker", - "repo": "cargo-chef", - "rev": "5c9f11578a2e0783cce27666737d50f84510b8b5", - "type": "github" - }, - "original": { - "owner": "LukeMathWalker", - "ref": "main", - "repo": "cargo-chef", - "type": "github" - } - }, "cargo-rdme": { "flake": false, "locked": { @@ -51,23 +34,6 @@ "type": "github" } }, - "cargo-rdme_2": { - "flake": false, - "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", - "owner": "orium", - "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", - "type": "github" - }, - "original": { - "owner": "orium", - "ref": "v1.1.0", - "repo": "cargo-rdme", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -92,31 +58,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "holonix", - "holochain", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1675475924, - "narHash": "sha256-KWdfV9a6+zG6Ij/7PZYLnomjBZZUu8gdRy+hfjGrrJQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "1bde9c762ebf26de9f8ecf502357c92105bc4577", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "crate2nix": { "flake": false, "locked": { @@ -133,22 +74,6 @@ "type": "github" } }, - "crate2nix_2": { - "flake": false, - "locked": { - "lastModified": 1675642992, - "narHash": "sha256-uDBDZuiq7qyg82Udp82/r4zg5HKfIzBQqgl2U9THiQM=", - "owner": "kolloch", - "repo": "crate2nix", - "rev": "45fc83132c8c91c77a1cd61fe0c945411d1edba8", - "type": "github" - }, - "original": { - "owner": "kolloch", - "repo": "crate2nix", - "type": "github" - } - }, "empty": { "flake": false, "locked": { @@ -165,22 +90,6 @@ "type": "github" } }, - "empty_2": { - "flake": false, - "locked": { - "lastModified": 1683792623, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "owner": "steveej", - "repo": "empty", - "rev": "8e328e450e4cd32e072eba9e99fe92cf2a1ef5cf", - "type": "github" - }, - "original": { - "owner": "steveej", - "repo": "empty", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -213,38 +122,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -262,23 +139,6 @@ "type": "indirect" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1675295133, - "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -295,21 +155,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems" }, @@ -327,104 +172,36 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "holochain": { - "inputs": { - "cargo-chef": "cargo-chef_2", - "cargo-rdme": "cargo-rdme_2", - "crane": "crane_2", - "crate2nix": "crate2nix_2", - "empty": "empty_2", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", - "holochain": [ - "holonix", - "holochain", - "empty" - ], - "lair": [ - "holonix", - "holochain", - "empty" - ], - "launcher": [ - "holonix", - "holochain", - "empty" - ], - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3", - "scaffolding": [ - "holonix", - "holochain", - "empty" - ], - "versions": "versions" - }, - "locked": { - "lastModified": 1690227710, - "narHash": "sha256-HRVEz5Ldg2+pqciOpZ9fNdMfU93r/3LmUsbTA9jfDIY=", - "owner": "holochain", - "repo": "holochain", - "rev": "3f594f1a5cef41e896b99b6b46d336d54da3299d", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-0.2.1", - "repo": "holochain", - "type": "github" - } - }, - "holochain_2": { "flake": false, "locked": { - "lastModified": 1686257124, - "narHash": "sha256-SvXGHOr96ob/NfQCeVJ2J4LWc83qkZn+/pnE9qVNB+I=", + "lastModified": 1692965835, + "narHash": "sha256-tylLGAliWQnnYjTdjTN8N7xxlcHgso085wkQ8NgmOpI=", "owner": "holochain", "repo": "holochain", - "rev": "db5b8b27da3bf296958c3bf54ac3950dc60a39c8", + "rev": "6d424d347d5296bc8e92ff5233f5a6ed22ed736f", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.1.5", + "ref": "holochain-0.1.6", "repo": "holochain", "type": "github" } }, - "holochain_3": { + "holochain_2": { "flake": false, "locked": { - "lastModified": 1690227710, - "narHash": "sha256-HRVEz5Ldg2+pqciOpZ9fNdMfU93r/3LmUsbTA9jfDIY=", + "lastModified": 1694632043, + "narHash": "sha256-5QWUpWnwuzUi3hROrOZyQNla8iGdr+oGCH2nniRePBE=", "owner": "holochain", "repo": "holochain", - "rev": "3f594f1a5cef41e896b99b6b46d336d54da3299d", + "rev": "1f59d33623031eefe76b5f3573970c9c33f21877", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.2.1", + "ref": "holochain-0.2.2", "repo": "holochain", "type": "github" } @@ -438,7 +215,10 @@ "empty": "empty", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "holochain": "holochain", + "holochain": [ + "holonix", + "empty" + ], "lair": [ "holonix", "empty" @@ -447,25 +227,23 @@ "holonix", "empty" ], - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", "repo-git": "repo-git", - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_2", "scaffolding": [ "holonix", "empty" ], - "versions": [ - "versions" - ] + "versions": "versions" }, "locked": { - "lastModified": 1694163327, - "narHash": "sha256-bZinDVDRa3aKshL2KaI5Nna3ohtwu1q27z8Z+IbwJrk=", + "lastModified": 1695752636, + "narHash": "sha256-rfKrmWw36fD4b+hn5aKHRIlVI1aqV0MLJ0IyklmrX6M=", "owner": "holochain", "repo": "holochain", - "rev": "78ae6e3a7d69a906e6112b09fada7ac43b0b1eea", + "rev": "91ee7b705ef256fbb05233dbdb928532fb301dc1", "type": "github" }, "original": { @@ -477,16 +255,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1682356264, - "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", + "lastModified": 1691746070, + "narHash": "sha256-CHsTI4yIlkfnYWx2sNgzAoDBvKTLIChybzyJNbB1sMU=", "owner": "holochain", "repo": "lair", - "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", + "rev": "6ab41b60744515f1760669db6fc5272298a5f324", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.2.4", + "ref": "lair_keystore-v0.3.0", "repo": "lair", "type": "github" } @@ -494,16 +272,16 @@ "lair_2": { "flake": false, "locked": { - "lastModified": 1682356264, - "narHash": "sha256-5ZYJ1gyyL3hLR8hCjcN5yremg8cSV6w1iKCOrpJvCmc=", + "lastModified": 1691746070, + "narHash": "sha256-CHsTI4yIlkfnYWx2sNgzAoDBvKTLIChybzyJNbB1sMU=", "owner": "holochain", "repo": "lair", - "rev": "43be404da0fd9d57bf4429c44def405bd6490f61", + "rev": "6ab41b60744515f1760669db6fc5272298a5f324", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.2.4", + "ref": "lair_keystore-v0.3.0", "repo": "lair", "type": "github" } @@ -557,28 +335,13 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1675361037, - "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "lastModified": 1695145219, + "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "type": "github" }, "original": { @@ -605,39 +368,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "pre-commit-hooks-nix": { "flake": false, "locked": { @@ -654,22 +384,6 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { - "flake": false, - "locked": { - "lastModified": 1676513100, - "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "repo-git": { "flake": false, "locked": { @@ -721,70 +435,18 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "holonix", - "holochain", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "holonix", - "holochain", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "holonix", - "holochain", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689647697, - "narHash": "sha256-8ZX/DVpKLmr85FRKILb+2p+JuxfLQ49LjXG/gmwsoIU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ed2774a9131ddad12e552ba04bd92f87df04a28b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ "holonix", "nixpkgs" ] }, "locked": { - "lastModified": 1694139063, - "narHash": "sha256-M2dhhe6IzHmS0zQkmnzbcG98jEQGZ4UcS3VcT+rG/Do=", + "lastModified": 1695694299, + "narHash": "sha256-0CucEiOZzOVHwmGDJKNXLj7aDYOqbRtqChp9nbGrh18=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "46dbbcaf435b0d22b149684589b9b059f73f4ffc", + "rev": "c89a55d2d91cf55234466934b25deeffa365188a", "type": "github" }, "original": { @@ -796,11 +458,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1686617155, - "narHash": "sha256-ZeWnh27JNb/abu/ii8e3u4DHns49MOFMNXGPGFPqS0k=", + "lastModified": 1695419457, + "narHash": "sha256-QhRm86kTX84GLP2qR+ICBgjkb2aOupV7/L+0g5imlfE=", "owner": "holochain", "repo": "scaffolding", - "rev": "861397c975542306be6d8529e5c6bdb21c7ba6a6", + "rev": "d873219e9061a3a045b872aa95a5db42e545e620", "type": "github" }, "original": { @@ -813,11 +475,11 @@ "scaffolding_2": { "flake": false, "locked": { - "lastModified": 1692147670, - "narHash": "sha256-jFt4LTUaUZTiOg2DLlbUqyeV2edfUxiJSljRjVJlObE=", + "lastModified": 1695674679, + "narHash": "sha256-IwgQbgitUo61ZXYSXBAro5ThfYy/yMGmzZGTb3c6sT0=", "owner": "holochain", "repo": "scaffolding", - "rev": "8a63d356a0856643769adc567e078796c6509511", + "rev": "821439b8dd49d5ce594be04c4720df25e88a4dbc", "type": "github" }, "original": { @@ -842,31 +504,16 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "versions": { "inputs": { - "holochain": "holochain_2", + "holochain": "holochain", "lair": "lair", "launcher": "launcher", "scaffolding": "scaffolding" }, "locked": { - "lastModified": 1686618210, - "narHash": "sha256-lXY9ob0WAekcoEgWcFL3cJiPkwoKlsR2OMqG0S3vXzA=", + "lastModified": 1695429997, + "narHash": "sha256-2vXCykfKGm61+9uu6h+0mvzKwyfvdRFlRM7qpX1E3zQ=", "path": "./versions/0_1", "type": "path" }, @@ -879,18 +526,18 @@ }, "versions_2": { "inputs": { - "holochain": "holochain_3", + "holochain": "holochain_2", "lair": "lair_2", "launcher": "launcher_2", "scaffolding": "scaffolding_2" }, "locked": { "dir": "versions/0_2", - "lastModified": 1694163327, - "narHash": "sha256-bZinDVDRa3aKshL2KaI5Nna3ohtwu1q27z8Z+IbwJrk=", + "lastModified": 1695752636, + "narHash": "sha256-rfKrmWw36fD4b+hn5aKHRIlVI1aqV0MLJ0IyklmrX6M=", "owner": "holochain", "repo": "holochain", - "rev": "78ae6e3a7d69a906e6112b09fada7ac43b0b1eea", + "rev": "91ee7b705ef256fbb05233dbdb928532fb301dc1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6a03a6c6..e720c3b2 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ versions.url = "github:holochain/holochain?dir=versions/0_2"; holonix.url = "github:holochain/holochain"; - holonix.inputs.versions.follows = "versions"; - holonix.inputs.holochain.url = "github:holochain/holochain/holochain-0.2.1"; }; outputs = inputs@{ holonix, ... }: