roll rusqlite back due to Windows breakage

This commit is contained in:
Damien Elmes 2021-11-18 21:39:23 +10:00
parent d31dccc388
commit 8b3d964866
11 changed files with 45 additions and 29 deletions

8
Cargo.lock generated
View file

@ -1063,9 +1063,9 @@ checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
version = "0.23.1" version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2" checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d"
dependencies = [ dependencies = [
"cc", "cc",
"pkg-config", "pkg-config",
@ -1962,9 +1962,9 @@ dependencies = [
[[package]] [[package]]
name = "rusqlite" name = "rusqlite"
version = "0.26.1" version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7" checksum = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"fallible-iterator", "fallible-iterator",

View file

@ -338,7 +338,7 @@ alias(
alias( alias(
name = "rusqlite", name = "rusqlite",
actual = "@raze__rusqlite__0_26_1//:rusqlite", actual = "@raze__rusqlite__0_25_3//:rusqlite",
tags = [ tags = [
"cargo-raze", "cargo-raze",
"manual", "manual",

View file

@ -1043,12 +1043,12 @@ def raze_fetch_remote_crates():
maybe( maybe(
http_archive, http_archive,
name = "raze__libsqlite3_sys__0_23_1", name = "raze__libsqlite3_sys__0_22_2",
url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.23.1/download", url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.22.2/download",
type = "tar.gz", type = "tar.gz",
sha256 = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2", sha256 = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d",
strip_prefix = "libsqlite3-sys-0.23.1", strip_prefix = "libsqlite3-sys-0.22.2",
build_file = Label("//cargo/remote:BUILD.libsqlite3-sys-0.23.1.bazel"), build_file = Label("//cargo/remote:BUILD.libsqlite3-sys-0.22.2.bazel"),
) )
maybe( maybe(
@ -1913,12 +1913,12 @@ def raze_fetch_remote_crates():
maybe( maybe(
http_archive, http_archive,
name = "raze__rusqlite__0_26_1", name = "raze__rusqlite__0_25_3",
url = "https://crates.io/api/v1/crates/rusqlite/0.26.1/download", url = "https://crates.io/api/v1/crates/rusqlite/0.25.3/download",
type = "tar.gz", type = "tar.gz",
sha256 = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7", sha256 = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3",
strip_prefix = "rusqlite-0.26.1", strip_prefix = "rusqlite-0.25.3",
build_file = Label("//cargo/remote:BUILD.rusqlite-0.26.1.bazel"), build_file = Label("//cargo/remote:BUILD.rusqlite-0.25.3.bazel"),
) )
maybe( maybe(

View file

@ -928,7 +928,7 @@
}, },
{ {
"name": "libsqlite3-sys", "name": "libsqlite3-sys",
"version": "0.23.1", "version": "0.22.2",
"authors": "The rusqlite developers", "authors": "The rusqlite developers",
"repository": "https://github.com/rusqlite/rusqlite", "repository": "https://github.com/rusqlite/rusqlite",
"license": "MIT", "license": "MIT",
@ -1657,7 +1657,7 @@
}, },
{ {
"name": "rusqlite", "name": "rusqlite",
"version": "0.26.1", "version": "0.25.3",
"authors": "The rusqlite developers", "authors": "The rusqlite developers",
"repository": "https://github.com/rusqlite/rusqlite", "repository": "https://github.com/rusqlite/rusqlite",
"license": "MIT", "license": "MIT",

View file

@ -64,18 +64,27 @@ cargo_build_script(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.23.1", version = "0.22.2",
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
"@raze__cc__1_0_72//:cc", "@raze__cc__1_0_72//:cc",
"@raze__pkg_config__0_3_22//:pkg_config", "@raze__pkg_config__0_3_22//:pkg_config",
] + selects.with_or({
# cfg(target_env = "msvc")
(
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@raze__vcpkg__0_2_15//:vcpkg", "@raze__vcpkg__0_2_15//:vcpkg",
], ],
"//conditions:default": [],
}),
) )
rust_library( rust_library(
name = "libsqlite3_sys", name = "libsqlite3_sys",
srcs = glob(["**/*.rs"]), srcs = glob(["**/*.rs"]),
aliases = {
},
crate_features = [ crate_features = [
"bundled", "bundled",
"bundled_bindings", "bundled_bindings",
@ -97,9 +106,16 @@ rust_library(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.23.1", version = "0.22.2",
# buildifier: leave-alone # buildifier: leave-alone
deps = [ deps = [
":libsqlite3_sys_build_script", ":libsqlite3_sys_build_script",
] + selects.with_or({
# cfg(target_env = "msvc")
(
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
], ],
"//conditions:default": [],
}),
) )

View file

@ -55,14 +55,14 @@ rust_library(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.26.1", version = "0.25.3",
# buildifier: leave-alone # buildifier: leave-alone
deps = [ deps = [
"@raze__bitflags__1_3_2//:bitflags", "@raze__bitflags__1_3_2//:bitflags",
"@raze__fallible_iterator__0_2_0//:fallible_iterator", "@raze__fallible_iterator__0_2_0//:fallible_iterator",
"@raze__fallible_streaming_iterator__0_1_9//:fallible_streaming_iterator", "@raze__fallible_streaming_iterator__0_1_9//:fallible_streaming_iterator",
"@raze__hashlink__0_7_0//:hashlink", "@raze__hashlink__0_7_0//:hashlink",
"@raze__libsqlite3_sys__0_23_1//:libsqlite3_sys", "@raze__libsqlite3_sys__0_22_2//:libsqlite3_sys",
"@raze__memchr__2_4_1//:memchr", "@raze__memchr__2_4_1//:memchr",
"@raze__smallvec__1_7_0//:smallvec", "@raze__smallvec__1_7_0//:smallvec",
], ],

View file

@ -338,7 +338,7 @@ alias(
alias( alias(
name = "rusqlite", name = "rusqlite",
actual = "@raze__rusqlite__0_26_1//:rusqlite", actual = "@raze__rusqlite__0_25_3//:rusqlite",
tags = [ tags = [
"cargo-raze", "cargo-raze",
"manual", "manual",

View file

@ -61,7 +61,7 @@ reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b
"rustls-tls-webpki-roots", "rustls-tls-webpki-roots",
"rustls-tls-native-roots", "rustls-tls-native-roots",
] } ] }
rusqlite = { version = "0.26.1", features = ["trace", "functions", "collation", "bundled"] } rusqlite = { version = "0.25.3", features = ["trace", "functions", "collation", "bundled"] }
scopeguard = "1.1.0" scopeguard = "1.1.0"
serde = "1.0.130" serde = "1.0.130"
serde_derive = "1.0.130" serde_derive = "1.0.130"

View file

@ -338,7 +338,7 @@ alias(
alias( alias(
name = "rusqlite", name = "rusqlite",
actual = "@raze__rusqlite__0_26_1//:rusqlite", actual = "@raze__rusqlite__0_25_3//:rusqlite",
tags = [ tags = [
"cargo-raze", "cargo-raze",
"manual", "manual",

View file

@ -338,7 +338,7 @@ alias(
alias( alias(
name = "rusqlite", name = "rusqlite",
actual = "@raze__rusqlite__0_26_1//:rusqlite", actual = "@raze__rusqlite__0_25_3//:rusqlite",
tags = [ tags = [
"cargo-raze", "cargo-raze",
"manual", "manual",

View file

@ -338,7 +338,7 @@ alias(
alias( alias(
name = "rusqlite", name = "rusqlite",
actual = "@raze__rusqlite__0_26_1//:rusqlite", actual = "@raze__rusqlite__0_25_3//:rusqlite",
tags = [ tags = [
"cargo-raze", "cargo-raze",
"manual", "manual",