commit 2477802ea5089e93051521be10fdc870ae6177a3
parent 8329770143ddd719d67f4902026de6b691f6da37
Author: triesap <tyson@radroots.org>
Date: Sat, 18 Jul 2026 07:31:57 +0000
build: preserve patched SQLite dependency source
- retain the path-patched SQLite API in Crane dependency-only builds.
- scope dependency cache invalidation to the patched SQLite subtree.
- align tracked TOML files with the canonical formatter.
- qualify the standalone flake and contract command surfaces.
Diffstat:
5 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -160,7 +160,9 @@ serde = { version = "1", default-features = false, features = [
"alloc",
] }
serde_json = { version = "1", default-features = false, features = ["alloc"] }
-secp256k1 = { version = "0.29.1", default-features = false, features = ["alloc"] }
+secp256k1 = { version = "0.29.1", default-features = false, features = [
+ "alloc",
+] }
sha2 = { version = "0.10", default-features = false }
sha3 = { version = "0.10", default-features = false }
sntrup761 = { version = "0.4.0", default-features = false, features = [
diff --git a/build/nix/common.nix b/build/nix/common.nix
@@ -26,6 +26,12 @@ let
]
);
};
+ sqlitePatchSource = lib.fileset.toSource {
+ root = root;
+ fileset = lib.fileset.intersection (lib.fileset.fromSource repoSource) (
+ lib.fileset.unions [ ../../crates/libsqlite3_sys_3_53_3 ]
+ );
+ };
baseEnv = {
CARGO_TERM_COLOR = "always";
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
@@ -123,7 +129,18 @@ let
PKG_CONFIG_PATH
;
};
- cargoArtifacts = craneLib.buildDepsOnly commonCraneArgs;
+ cargoArtifacts = craneLib.buildDepsOnly (
+ commonCraneArgs
+ // {
+ dummySrc = craneLib.mkDummySrc {
+ src = cargoSource;
+ extraDummyScript = ''
+ rm -rf "$out/crates/libsqlite3_sys_3_53_3"
+ cp -R ${sqlitePatchSource}/crates/libsqlite3_sys_3_53_3 "$out/crates/"
+ '';
+ };
+ }
+ );
xtaskPackage = craneLib.buildPackage (
commonCraneArgs
// {
diff --git a/contracts/operations.toml b/contracts/operations.toml
@@ -290,10 +290,7 @@ vector = "contracts/conformance/vectors/blossom/bud11_claims.v1.json"
domain = "blossom"
id = "blossom.decode_verify_authorization_header"
stability = "beta"
-inputs = [
- "String",
- "RadrootsBlossomAuthorizationValidation",
-]
+inputs = ["String", "RadrootsBlossomAuthorizationValidation"]
outputs = ["RadrootsNostrVerifiedBlossomAuthorization"]
error_class = "decode_error"
deterministic = true
diff --git a/crates/authority/Cargo.toml b/crates/authority/Cargo.toml
@@ -25,7 +25,9 @@ radroots_event = { workspace = true, default-features = false }
radroots_nostr = { workspace = true, optional = true, default-features = false }
[dev-dependencies]
-serde_json = { workspace = true, default-features = false, features = ["alloc"] }
+serde_json = { workspace = true, default-features = false, features = [
+ "alloc",
+] }
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
diff --git a/crates/libsqlite3_sys_3_53_3/Cargo.toml b/crates/libsqlite3_sys_3_53_3/Cargo.toml
@@ -12,10 +12,7 @@ autoexamples = false
autotests = false
autobenches = false
description = "Native bindings to the libsqlite3 library"
-keywords = [
- "sqlite",
- "ffi",
-]
+keywords = ["sqlite", "ffi"]
categories = ["external-ffi-bindings"]
license = "MIT"
repository = "https://github.com/rusqlite/rusqlite"
@@ -28,37 +25,17 @@ sqlite_source_id = "2026-06-26 20:14:12 d4c0e51e4aeb96955b99185ab9cde75c339e2c29
sqlite_amalgamation_sha3_256 = "d45c688a8cb23f68611a894a756a12d7eb6ab6e9e2468ca70adbeab3808b5ab9"
[features]
-buildtime_bindgen = [
- "bindgen",
- "pkg-config",
- "vcpkg",
-]
-bundled = [
- "cc",
- "bundled_bindings",
-]
-bundled-windows = [
- "cc",
- "bundled_bindings",
-]
+buildtime_bindgen = ["bindgen", "pkg-config", "vcpkg"]
+bundled = ["cc", "bundled_bindings"]
+bundled-windows = ["cc", "bundled_bindings"]
bundled_bindings = []
column_metadata = []
default = []
in_gecko = []
-loadable_extension = [
- "prettyplease",
- "quote",
- "syn",
-]
-min_sqlite_version_3_34_1 = [
- "pkg-config",
- "vcpkg",
-]
+loadable_extension = ["prettyplease", "quote", "syn"]
+min_sqlite_version_3_34_1 = ["pkg-config", "vcpkg"]
preupdate_hook = ["buildtime_bindgen"]
-session = [
- "preupdate_hook",
- "buildtime_bindgen",
-]
+session = ["preupdate_hook", "buildtime_bindgen"]
unlock_notify = []
wasm32-wasi-vfs = []
with-asan = []
@@ -92,11 +69,7 @@ default-features = false
[build-dependencies.syn]
version = "2.0.89"
-features = [
- "full",
- "extra-traits",
- "visit-mut",
-]
+features = ["full", "extra-traits", "visit-mut"]
optional = true
[build-dependencies.vcpkg]