GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix latest Rusqlite on Windows

Browse source 
https://github.com/bazelbuild/rules_rust/pull/1025
This commit is contained in:
Damien Elmes 2021-11-19 08:36:57 +10:00
parent 8b3d964866
commit 11042a16ce
12 changed files with 32 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

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

2
cargo/BUILD.bazel
View file

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

20
cargo/crates.bzl
View file

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

4
cargo/licenses.json
View file

@ -928,7 +928,7 @@
}, },
{ {
"name": "libsqlite3-sys", "name": "libsqlite3-sys",
"version": "0.22.2", "version": "0.23.1",
"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.25.3", "version": "0.26.1",
"authors": "The rusqlite developers", "authors": "The rusqlite developers",
"repository": "https://github.com/rusqlite/rusqlite", "repository": "https://github.com/rusqlite/rusqlite",
"license": "MIT", "license": "MIT",

26
cargo/remote/BUILD.libsqlite3-sys-0.22.2.bazel → cargo/remote/BUILD.libsqlite3-sys-0.23.1.bazel vendored
View file

@ -64,27 +64,18 @@ cargo_build_script(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.22.2", version = "0.23.1",
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({ "@raze__vcpkg__0_2_15//:vcpkg",
# cfg(target_env = "msvc") ],
(
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@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",
@ -106,16 +97,9 @@ rust_library(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.22.2", version = "0.23.1",
# 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": [],
}),
) )

4
cargo/remote/BUILD.rusqlite-0.25.3.bazel → cargo/remote/BUILD.rusqlite-0.26.1.bazel vendored
View file

@ -55,14 +55,14 @@ rust_library(
"cargo-raze", "cargo-raze",
"manual", "manual",
], ],
version = "0.25.3", version = "0.26.1",
# 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_22_2//:libsqlite3_sys", "@raze__libsqlite3_sys__0_23_1//: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",
], ],

2
pylib/rsbridge/cargo/BUILD.bazel
View file

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

6
repos.bzl
View file

@ -34,11 +34,11 @@ def register_repos():
maybe( maybe(
http_archive, http_archive,
name = "rules_rust", name = "rules_rust",
strip_prefix = "rules_rust-anki-2021-11-18", strip_prefix = "rules_rust-anki-2021-11-19",
urls = [ urls = [
"https://github.com/ankitects/rules_rust/archive/anki-2021-11-18.tar.gz", "https://github.com/ankitects/rules_rust/archive/anki-2021-11-19.tar.gz",
], ],
sha256 = "4d93bbf52c0b7f979da42f5481166221fcadca46c10d9f478a1b299229a9b6f3", sha256 = "c0fb4ce7c616a19b73967ea763cdc0481287d56482115ca67c7a52b883f1b408",
) )
# python # python

2
rslib/Cargo.toml
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.25.3", features = ["trace", "functions", "collation", "bundled"] } rusqlite = { version = "0.26.1", 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"

2
rslib/cargo/BUILD.bazel
View file

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

2
rslib/i18n/cargo/BUILD.bazel
View file

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

2
rslib/i18n_helpers/cargo/BUILD.bazel
View file

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