mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radicle: Import the new SQLite library with bundled binary 

This commit addresses a workaround previously implemented to
include the SQLite library bundled inside the binary.

The upstream have successfully merged the patch that implements this
solution [1], allowing us to safely incorporate it
into our codebase.

[1] Link to the merged patch: https://github.com/stainless-steel/sqlite/pull/71/files

Fixes: 431a389944
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
This commit is contained in:
Vincenzo Palazzo 2023-07-12 13:30:12 +02:00 committed by Alexis Sellier
parent 4869fe26e2
commit a41f67d9ef
No known key found for this signature in database
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Cargo.lock generated
View File

@ -1930,7 +1930,6 @@ dependencies = [
"serde_json", "serde_json",
"siphasher", "siphasher",
"sqlite", "sqlite",
"sqlite3-src",
"tempfile", "tempfile",
"thiserror", "thiserror",
"unicode-normalization", "unicode-normalization",
@ -2691,9 +2690,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlite" name = "sqlite"
version = "0.30.4" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b1908664131c21a38e5b531344d52a196ec338af5bf44f7fa2c83d539e9561d" checksum = "f3ddda64c469a257a3b31298805427784d992c226c94b81003f96e8b122286ad"
dependencies = [ dependencies = [
"libc", "libc",
"sqlite3-sys", "sqlite3-sys",
@ -2701,9 +2700,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlite3-src" name = "sqlite3-src"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1815a7a02c996eb8e5c64f61fcb6fd9b12e593ce265c512c5853b2513635691" checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454"
dependencies = [ dependencies = [
"cc", "cc",
"pkg-config", "pkg-config",
@ -2711,9 +2710,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlite3-sys" name = "sqlite3-sys"
version = "0.14.0" version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d47c99824fc55360ba00caf28de0b8a0458369b832e016a64c13af0ad9fbb9ee" checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b"
dependencies = [ dependencies = [
"libc", "libc",
"sqlite3-src", "sqlite3-src",

2
radicle-crypto/Cargo.toml
View File

@ -18,7 +18,7 @@ cyphernet = { version = "0.2.0", optional = true, features = ["ed25519"] }
multibase = { version = "0.9.1" } multibase = { version = "0.9.1" }
ec25519 = { version = "0.1.0", features = [] } ec25519 = { version = "0.1.0", features = [] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
sqlite = { version = "0.30.3", optional = true } sqlite = { version = "0.31.0", optional = true }
thiserror = { version = "1" } thiserror = { version = "1" }
zeroize = { version = "1.5.7" } zeroize = { version = "1.5.7" }

2
radicle-node/Cargo.toml
View File

@ -30,7 +30,7 @@ qcheck = { version = "1", default-features = false, optional = true }
# N.b. this is required to use macros, even though it's re-exported # N.b. this is required to use macros, even though it's re-exported
# through radicle # through radicle
radicle-git-ext = { version = "0.6.0", features = ["serde"] } radicle-git-ext = { version = "0.6.0", features = ["serde"] }
sqlite = { version = "0.30.3" } sqlite = { version = "0.31.0" }
scrypt = { version = "0.10.0", default-features = false } scrypt = { version = "0.10.0", default-features = false }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] } serde_json = { version = "1", features = ["preserve_order"] }

6
radicle/Cargo.toml
View File

@ -23,7 +23,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] } serde_json = { version = "1", features = ["preserve_order"] }
siphasher = { version = "0.3.10" } siphasher = { version = "0.3.10" }
radicle-git-ext = { version = "0.6.0", features = ["serde"] } radicle-git-ext = { version = "0.6.0", features = ["serde"] }
sqlite = { version = "0.30.3" } sqlite = { version = "0.31.0", features = ["bundled"] }
tempfile = { version = "3.3.0" } tempfile = { version = "3.3.0" }
thiserror = { version = "1" } thiserror = { version = "1" }
unicode-normalization = { version = "0.1" } unicode-normalization = { version = "0.1" }
@ -56,10 +56,6 @@ version = "1"
default-features = false default-features = false
optional = true optional = true
[dependencies.sqlite3-src]
version = "0.4"
features = ["bundled"]
[dev-dependencies] [dev-dependencies]
pretty_assertions = { version = "1.3.0" } pretty_assertions = { version = "1.3.0" }
qcheck-macros = { version = "1", default-features = false } qcheck-macros = { version = "1", default-features = false }