diff --git a/WORKSPACE b/WORKSPACE index a87da26..d077833 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,22 +4,6 @@ load("//:deps.bzl", "rules_appimage_deps") rules_appimage_deps() -register_toolchains("//appimage:all") - -# Below this is the Python setup for testing the rules_appimage Python rules. -# This is _not_ required for _using_ the rules_appimage rules. - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") - -maybe( - http_archive, - name = "rules_python", - sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b", - strip_prefix = "rules_python-0.26.0", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") py_repositories() @@ -29,15 +13,17 @@ python_register_toolchains( python_version = "3.11", ) -load("@rules_appimage_python//:defs.bzl", "interpreter") +load("@rules_appimage_python//:defs.bzl", rules_appimage_py_interpreter = "interpreter") load("@rules_python//python:pip.bzl", "pip_parse") pip_parse( name = "rules_appimage_py_deps", - python_interpreter_target = interpreter, - requirements_lock = "//:requirements.txt", + python_interpreter_target = rules_appimage_py_interpreter, + requirements_lock = "@rules_appimage//:requirements.txt", ) load("@rules_appimage_py_deps//:requirements.bzl", "install_deps") install_deps() + +register_toolchains("@rules_appimage//appimage:all") diff --git a/deps.bzl b/deps.bzl index 74cb8aa..25e9911 100644 --- a/deps.bzl +++ b/deps.bzl @@ -58,3 +58,13 @@ def rules_appimage_deps(): strip_prefix = "zstd-1.5.5", url = "https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz", ) + + # rules python is needed to provide the bzlmod/workspace-agnostic bazel-runfiles pip requirement for mkappimage. + # Don't forget to add the setup steps to the main WORKSPACE file! You can find them in the release notes as well. + maybe( + http_archive, + name = "rules_python", + sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b", + strip_prefix = "rules_python-0.26.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz", + )