From 502856a4a268f096c841d0fb77f05a3cacd7cb98 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sat, 15 Jun 2024 21:31:33 -0400 Subject: [PATCH] use pinned revs of git cargo deps where possible should reduce all but rocksdb from here: https://github.com/chaotic-cx/nyx/blob/0a48586e8c81ce5647915a1664d104616d5704b6/pkgs/conduwuit-git/pins.json Co-authored-by: PedroHLC Signed-off-by: strawberry --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 9 ++++++--- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4cc7b8c..b716b1c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -302,7 +302,7 @@ dependencies = [ [[package]] name = "axum-server" version = "0.6.0" -source = "git+https://github.com/girlbossceo/axum-server?branch=phlip9/fix-graceful-shutdown#8e3368d899079818934e61cc9c839abcbbcada8a" +source = "git+https://github.com/girlbossceo/axum-server?rev=8e3368d899079818934e61cc9c839abcbbcada8a#8e3368d899079818934e61cc9c839abcbbcada8a" dependencies = [ "arc-swap", "bytes", @@ -3075,7 +3075,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.10.1" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "assign", "js_int", @@ -3095,7 +3095,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "js_int", "ruma-common", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.18.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "as_variant", "assign", @@ -3130,7 +3130,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.13.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "as_variant", "base64 0.22.1", @@ -3160,7 +3160,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.28.1" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "as_variant", "indexmap 2.2.6", @@ -3183,7 +3183,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "js_int", "ruma-common", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.5" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "js_int", "thiserror", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "js_int", "ruma-common", @@ -3214,7 +3214,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.13.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "once_cell", "proc-macro-crate", @@ -3229,7 +3229,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "js_int", "ruma-common", @@ -3241,7 +3241,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.15.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -3257,7 +3257,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.11.0" -source = "git+https://github.com/girlbossceo/ruwuma?branch=conduwuit-changes#fd686e77950680462377c9105dfb4136dd49c7a0" +source = "git+https://github.com/girlbossceo/ruwuma?rev=fd686e77950680462377c9105dfb4136dd49c7a0#fd686e77950680462377c9105dfb4136dd49c7a0" dependencies = [ "itertools 0.12.1", "js_int", diff --git a/Cargo.toml b/Cargo.toml index b7994847..4c10bb0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -273,7 +273,8 @@ version = "0.1.2" # Used for matrix spec type definitions and helpers [workspace.dependencies.ruma] git = "https://github.com/girlbossceo/ruwuma" -branch = "conduwuit-changes" +#branch = "conduwuit-changes" +rev = "fd686e77950680462377c9105dfb4136dd49c7a0" features = [ "compat", "rand", @@ -300,7 +301,7 @@ features = [ [workspace.dependencies.ruma-identifiers-validation] git = "https://github.com/girlbossceo/ruwuma" -branch = "conduwuit-changes" +rev = "fd686e77950680462377c9105dfb4136dd49c7a0" [workspace.dependencies.rust-rocksdb] path = "deps/rust-rocksdb" @@ -427,6 +428,7 @@ version = "0.29.2" # backport of [https://github.com/tokio-rs/tracing/pull/2956] to the 0.1.x branch of tracing. # we can switch back to upstream if #2956 is merged and backported in the upstream repo. +# https://github.com/girlbossceo/tracing/commit/b348dca742af641c47bc390261f60711c2af573c [patch.crates-io.tracing-subscriber] git = "https://github.com/girlbossceo/tracing" rev = "b348dca742af641c47bc390261f60711c2af573c" @@ -441,9 +443,10 @@ git = "https://github.com/girlbossceo/tracing" rev = "b348dca742af641c47bc390261f60711c2af573c" # fixes hyper graceful shutdowns [https://github.com/programatik29/axum-server/issues/114] +# https://github.com/girlbossceo/axum-server/commit/8e3368d899079818934e61cc9c839abcbbcada8a [patch.crates-io.axum-server] git = "https://github.com/girlbossceo/axum-server" -branch = "phlip9/fix-graceful-shutdown" +rev = "8e3368d899079818934e61cc9c839abcbbcada8a" # # Our crates