From 9e5163b955c31036c649a9adb9b0bd0cb6b9acfa Mon Sep 17 00:00:00 2001 From: ziad-fernride Date: Mon, 4 Dec 2023 09:42:09 +0100 Subject: [PATCH 1/2] pure bzlmod implementation --- MODULE.bazel | 33 +++++++++++++++++++++++++++++++++ WORKSPACE | 29 ----------------------------- extensions.bzl | 6 ++++++ 3 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 MODULE.bazel create mode 100644 extensions.bzl diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 0000000..6f29520 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,33 @@ +module( + name = "rules_appimage", + version = "1.3.0", +) + +bazel_dep(name = "aspect_rules_py", version = "0.4.0") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "platforms", version = "0.0.8") +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "rules_python", version = "0.26.0") + +rules_appimage = use_extension("//:extensions.bzl", "appimage_ext_dependencies") +use_repo( + rules_appimage, + "appimage_runtime_aarch64", + "appimage_runtime_i386", + "appimage_runtime_armv7e-m", + "appimage_runtime_x86_64", + "appimagetool.png", + "squashfs-tools", +) + +register_toolchains("//appimage:all") + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") +python.toolchain(python_version = "3.11") +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") +pip.parse( + hub_name = "rules_appimage_py_deps", + python_version = "3.11", + requirements_lock = "//:requirements.txt", +) +use_repo(pip, "rules_appimage_py_deps") diff --git a/WORKSPACE b/WORKSPACE index d077833..e69de29 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,29 +0,0 @@ -workspace(name = "rules_appimage") - -load("//:deps.bzl", "rules_appimage_deps") - -rules_appimage_deps() - -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains") - -py_repositories() - -python_register_toolchains( - name = "rules_appimage_python", - python_version = "3.11", -) - -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 = 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/extensions.bzl b/extensions.bzl new file mode 100644 index 0000000..9c72803 --- /dev/null +++ b/extensions.bzl @@ -0,0 +1,6 @@ +load("//:deps.bzl", "rules_appimage_deps") + +def _appimage_ext_dependencies_impl(_): + rules_appimage_deps() + +appimage_ext_dependencies = module_extension(implementation = _appimage_ext_dependencies_impl) From 6cbafa4ff3de4982e04de50f5a633329ef6f0bac Mon Sep 17 00:00:00 2001 From: ziad-fernride Date: Mon, 4 Dec 2023 09:44:02 +0100 Subject: [PATCH 2/2] lint --- extensions.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions.bzl b/extensions.bzl index 9c72803..99653c4 100644 --- a/extensions.bzl +++ b/extensions.bzl @@ -1,3 +1,5 @@ +"""bzlmod Extensions.""" + load("//:deps.bzl", "rules_appimage_deps") def _appimage_ext_dependencies_impl(_):