From 547266a7052de33e396c91671dff477fe3b21a79 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Mon, 21 Apr 2025 21:20:31 -0700 Subject: [PATCH] Fix imports for letterbox-* packages --- Cargo.lock | 43 +++++++++++++++++++++++++++++++------ procmail2notmuch/Cargo.toml | 4 ++-- server/Cargo.toml | 4 ++-- shared/Cargo.toml | 2 +- web/Cargo.toml | 4 ++-- 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54c8a4f..26210be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3008,14 +3008,28 @@ dependencies = [ "tracing", ] +[[package]] +name = "letterbox-notmuch" +version = "0.16.0" +source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/" +checksum = "f7cdd2798042f4cc63342d798f450e7152231f4f592b3142cd63a0a9f4b879d8" +dependencies = [ + "log", + "mailparse", + "serde", + "serde_json", + "thiserror 2.0.12", + "tracing", +] + [[package]] name = "letterbox-procmail2notmuch" version = "0.16.0" dependencies = [ "anyhow", "clap", - "letterbox-notmuch", - "letterbox-shared", + "letterbox-notmuch 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "serde", "sqlx", "tokio 1.44.2", @@ -3041,8 +3055,8 @@ dependencies = [ "futures 0.3.31", "headers", "html-escape", - "letterbox-notmuch", - "letterbox-shared", + "letterbox-notmuch 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "linkify", "log", "lol_html", @@ -3070,7 +3084,22 @@ name = "letterbox-shared" version = "0.16.0" dependencies = [ "build-info", - "letterbox-notmuch", + "letterbox-notmuch 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "regex", + "serde", + "sqlx", + "strum_macros 0.27.1", + "tracing", +] + +[[package]] +name = "letterbox-shared" +version = "0.16.0" +source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/" +checksum = "18fcc018014a200754ea7524f41fc4e5e14f5edc4cb0ca5d7afbaa476cb0d297" +dependencies = [ + "build-info", + "letterbox-notmuch 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "regex", "serde", "sqlx", @@ -3092,8 +3121,8 @@ dependencies = [ "graphql_client", "human_format", "itertools", - "letterbox-notmuch", - "letterbox-shared", + "letterbox-notmuch 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", + "letterbox-shared 0.16.0 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)", "log", "seed", "seed_hooks", diff --git a/procmail2notmuch/Cargo.toml b/procmail2notmuch/Cargo.toml index 610afc9..d58d675 100644 --- a/procmail2notmuch/Cargo.toml +++ b/procmail2notmuch/Cargo.toml @@ -13,8 +13,8 @@ version.workspace = true [dependencies] anyhow = "1.0.69" clap = { version = "4.5.37", features = ["derive", "env"] } -letterbox-notmuch = { version = "0.16.0", path = "../notmuch" } -letterbox-shared = { version = "0.16.0", path = "../shared" } +letterbox-notmuch = { version = "0.16.0", registry = "xinu" } +letterbox-shared = { version = "0.16.0", registry = "xinu" } serde = { version = "1.0.219", features = ["derive"] } sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] } tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] } diff --git a/server/Cargo.toml b/server/Cargo.toml index bb28b0d..b5b7f3c 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -27,8 +27,8 @@ css-inline = "0.14.0" futures = "0.3.31" headers = "0.4.0" html-escape = "0.2.13" -letterbox-notmuch = { version = "0.16.0", path = "../notmuch" } -letterbox-shared = { version = "0.16.0", path = "../shared", registry = "xinu" } +letterbox-notmuch = { version = "0.16.0", registry = "xinu" } +letterbox-shared = { version = "0.16.0", registry = "xinu" } linkify = "0.10.0" log = "0.4.17" lol_html = "2.0.0" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 3ce73f8..96dd880 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -12,7 +12,7 @@ version.workspace = true [dependencies] build-info = "0.0.40" -letterbox-notmuch = { version = "0.16.0", path = "../notmuch", registry = "xinu" } +letterbox-notmuch = { version = "0.16.0", registry = "xinu" } regex = "1.11.1" serde = { version = "1.0.147", features = ["derive"] } sqlx = "0.8.5" diff --git a/web/Cargo.toml b/web/Cargo.toml index 2bde8cb..c1f193e 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100" uuid = { version = "1.13.1", features = [ "js", ] } # direct dep to set js feature, prevents Rng issues -letterbox-shared = { version = "0.16.0", path = "../shared", registry = "xinu" } -letterbox-notmuch = { version = "0.16.0", path = "../notmuch", registry = "xinu" } +letterbox-shared = { version = "0.16.0", registry = "xinu" } +letterbox-notmuch = { version = "0.16.0", registry = "xinu" } seed_hooks = { version = "0.4.0", registry = "xinu" } strum_macros = "0.27.1" gloo-console = "0.3.0"