Changeset View
Changeset View
Standalone View
Standalone View
games/anki/files/patch-defs.bzl
| Avoid loading of Rust and Python PIP rules as both tries to load their | Avoid loading of Rust and Python PIP rules as both tries to load their | ||||
| dependencies (cargo crates, Python packages) during the build process. | dependencies (cargo crates, Python packages) during the build process. | ||||
| Also define local repositories to use "www/node" and "www/yarn" from the | Also define local repositories to use "www/node" and "www/yarn" from the | ||||
| Ports tree. | Ports tree. | ||||
| --- defs.bzl.orig 2021-07-30 08:30:37 UTC | --- defs.bzl.orig 2022-06-24 05:10:06 UTC | ||||
| +++ defs.bzl | +++ defs.bzl | ||||
| @@ -1,13 +1,11 @@ | @@ -1,6 +1,5 @@ load("@bazel_skylib//lib:versions.bzl", "versions") | ||||
| load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") | load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") | ||||
| load("@bazel_skylib//lib:versions.bzl", "versions") | load("@bazel_skylib//lib:versions.bzl", "versions") | ||||
| -load("@rules_rust//rust:repositories.bzl", "rust_repositories") | -load("@rules_rust//rust:repositories.bzl", "rust_repositories") | ||||
| load("@ankidesktop//cargo:crates.bzl", "raze_fetch_remote_crates") | load("@ankidesktop//cargo:crates.bzl", "raze_fetch_remote_crates") | ||||
| load(":python.bzl", "setup_local_python") | load("//python:python.bzl", "setup_local_python") | ||||
| load("//proto:protobuf.bzl", "setup_protobuf_binary") | load("//proto:protobuf.bzl", "setup_protobuf_binary") | ||||
| load("//proto:format.bzl", "setup_clang_format") | @@ -17,14 +16,6 @@ def setup_deps(): | ||||
| load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") | |||||
| load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") | |||||
| -load("@com_github_ali5h_rules_pip//:defs.bzl", "pip_import") | |||||
| load("//pip/pyqt5:defs.bzl", "install_pyqt5") | |||||
| load("@esbuild_toolchain//:esbuild_repo.bzl", "esbuild_dependencies") | |||||
| @@ -18,13 +16,6 @@ def setup_deps(): | |||||
| versions.check(minimum_bazel_version = "3.7.0") | versions.check(minimum_bazel_version = "3.7.0") | ||||
| - rust_repositories( | - rust_repositories( | ||||
| - edition = "2018", | - edition = "2021", | ||||
| - include_rustc_srcs = False, | - include_rustc_srcs = False, | ||||
| - version = "1.58.1", | |||||
| - ) | - ) | ||||
| - | - | ||||
| - raze_fetch_remote_crates() | - raze_fetch_remote_crates() | ||||
| - | - | ||||
| setup_local_python(name = "python") | setup_local_python(name = "python") | ||||
| setup_protobuf_binary(name = "com_google_protobuf") | setup_protobuf_binary(name = "com_google_protobuf") | ||||
| @@ -33,18 +24,16 @@ def setup_deps(): | @@ -33,13 +24,6 @@ def setup_deps(): | ||||
| native.register_toolchains("@python//:python3_toolchain") | native.register_toolchains("@python//:python3_toolchain") | ||||
| - pip_import( | - pip_parse( | ||||
| - name = "py_deps", | - name = "py_deps", | ||||
| - requirements = "@ankidesktop//pip:requirements.txt", | - requirements_lock = "@ankidesktop//python:requirements.txt", | ||||
| - python_runtime = "@python//:python", | - python_interpreter_target = "@python//:python", | ||||
| - extra_pip_args = ["--require-hashes"], | |||||
| - ) | - ) | ||||
| - | - | ||||
| install_pyqt5( | install_pyqt( | ||||
| name = "pyqt5", | name = "pyqt6", | ||||
| python_runtime = "@python//:python", | python_runtime = "@python//:python", | ||||
| ) | @@ -60,7 +44,9 @@ def setup_deps(): | ||||
| - node_repositories(package_json = ["@ankidesktop//ts:package.json"]) | node_repositories( | ||||
| + node_repositories( | package_json = ["@ankidesktop//:package.json"], | ||||
| + package_json = ["@ankidesktop//ts:package.json"], | - node_version = "16.13.2", | ||||
| + node_version = "16.15.1", | |||||
| + vendored_node = "@local_node//:node", | + vendored_node = "@local_node//:node", | ||||
| + vendored_yarn = "@local_node//:yarn", | + vendored_yarn = "@local_node//:yarn", | ||||
| + ) | ) | ||||
| yarn_install( | yarn_install( | ||||
| name = "npm", | |||||