Upgrade all dependencies (#239)

* Upgrade all dependencies

We now no longer need a nightly version of the Rust toolchain to build
jrsonnet. The latest stable version works perfectly fine. However, we do
still need a nightly version of the host tools to make bindeps work.

Because we now also set the host tools repo name properly, we no longer
need to juggle with Rust in examples/MODULE.bazel.

Fixes: #224 #225 #226 #228 #229 #230 #234 #235 #236 #237 #238

* Add a workaround for aspect_bazel_lib not wrapping platform labels

* Make import paths in jsonnet_to_json_test() work with modern Bazel

Modern Bazel no longer includes files in the runfiles directory using
the long path layout. We now only need to use short paths.
Unfortunately, Bazel lacks some proper APIs for generating those in
pieces, so we need to do some string substitution.

Author: EdSchouten

MODULE.bazel

@@ -3,11 +3,11 @@ module(
     version = "0.6.0",
 )
 
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "jsonnet", version = "0.20.0")
-bazel_dep(name = "jsonnet_go", version = "0.20.0")
-bazel_dep(name = "rules_python", version = "1.2.0")
-bazel_dep(name = "rules_rust", version = "0.54.1")
+bazel_dep(name = "bazel_skylib", version = "1.8.0")
+bazel_dep(name = "jsonnet", version = "0.21.0")
+bazel_dep(name = "jsonnet_go", version = "0.21.0")
+bazel_dep(name = "rules_python", version = "1.5.0")
+bazel_dep(name = "rules_rust", version = "0.62.0")
 
 jsonnet = use_extension("//jsonnet:extensions.bzl", "jsonnet")
 use_repo(jsonnet, "rules_jsonnet_toolchain")
@@ -16,23 +16,22 @@ register_toolchains("@rules_jsonnet_toolchain//:toolchain")
 
 rust_host = use_extension("@rules_rust//rust:extensions.bzl", "rust_host_tools")
 rust_host.host_tools(
-    version = "nightly/2024-05-02",
+    name = "rust_host_tools_jsonnet",
+    sha256s = {
+        "2025-07-01/rustc-nightly-aarch64-apple-darwin.tar.xz": "b5fb4b5272fea4d4ef6e3896e484e9748fda4f29be428ae3a55c22f70566b54c",
+        "2025-07-01/clippy-nightly-aarch64-apple-darwin.tar.xz": "a0715713220f6cb56031a86c91de7a26d1f89d149afc2e01af625a89ca63f673",
+        "2025-07-01/cargo-nightly-aarch64-apple-darwin.tar.xz": "4eb240f69df9f9159c6fef128c3b7c24e5e1ae8aaf1357de4924fd518bd54941",
+        "2025-07-01/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "ab8d9977ba3187819008b70dab317654bb290fc220cfea35b4f2ea165ce32e70",
+        "2025-07-01/rust-std-nightly-aarch64-apple-darwin.tar.xz": "da6c8e6f256bb6512485db068d35109a3c77ccac678bc28134665cd1b547863b",
+    },
+    version = "nightly/2025-07-01",
 )
+use_repo(rust_host, "rust_host_tools_jsonnet")
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
     edition = "2021",
-    sha256s = {
-        "2024-05-01/rustc-nightly-aarch64-apple-darwin.tar.xz": "3c3d4693b8e846c9c250bb14a97654657ca62a5eb20617a875c34462582daf83",
-        "2024-05-01/clippy-nightly-aarch64-apple-darwin.tar.xz": "379e22e343a7b1c2e39b030810ff633d800d0daae0f8fd6bf00181402c42be4e",
-        "2024-05-01/cargo-nightly-aarch64-apple-darwin.tar.xz": "899aec41e675146359d30a296db488f114cd280aef9dea566e178a8bb6f33774",
-        "2024-05-01/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "4b04ceaf724bea888fb1e5e6bd9a9a963196f585d4f73036e783a2c51d4e907e",
-        "2024-05-01/rust-std-nightly-aarch64-apple-darwin.tar.xz": "bf52ea3e1ac669455694079fb83b6bd0d446e759b9ab3502f75615d538e646a0",
-    },
-    # Nightly version is required to be able to depend on a binary dependency
-    # with Cargo.
-    # See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies.
-    versions = ["nightly/2024-05-01"],
+    versions = ["1.88.0"],
 )
 use_repo(rust, "rust_toolchains")
 
@@ -52,5 +51,7 @@ crate.annotation(
     crate = "jrsonnet",
     gen_binaries = ["jrsonnet"],
 )
-crate.from_specs()
+crate.from_specs(
+    host_tools = "@rust_host_tools_jsonnet",
+)
 use_repo(crate, "crates")

docs/MODULE.bazel

@@ -3,11 +3,15 @@ module(
     version = "0.0.0",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
-bazel_dep(name = "stardoc", version = "0.7.2")
-
+bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
+bazel_dep(name = "stardoc", version = "0.8.0")
 bazel_dep(name = "rules_jsonnet", version = "0.0.0")
 local_path_override(
     module_name = "rules_jsonnet",
     path = "..",
 )
+
+single_version_override(
+    module_name = "aspect_bazel_lib",
+    patches = ["//:aspect_bazel_lib-label.diff"],
+)

docs/aspect_bazel_lib-label.diff

@@ -0,0 +1,13 @@
+diff --git lib/private/docs.bzl lib/private/docs.bzl
+index feeb852..0395e3d 100644
+--- lib/private/docs.bzl
++++ lib/private/docs.bzl
+@@ -20,7 +20,7 @@ def stardoc_with_diff_test(
+     target_compatible_with = kwargs.pop("target_compatible_with", select({
+         # stardoc produces different line endings on Windows
+         # which makes the diff_test fail
+-        "@platforms//os:windows": ["@platforms//:incompatible"],
++        Label("@platforms//os:windows"): ["@platforms//:incompatible"],
+         "//conditions:default": [],
+     }))
+ 

docs/jsonnet.md

@@ -191,7 +191,7 @@ Example:
 | <a id="jsonnet_to_json-deps"></a>deps |  List of targets that are required by the `srcs` Jsonnet files.   | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional |  `[]`  |
 | <a id="jsonnet_to_json-src"></a>src |  The `.jsonnet` file to convert to JSON.   | <a href="https://bazel.build/concepts/labels">Label</a> | optional |  `None`  |
 | <a id="jsonnet_to_json-data"></a>data |  -   | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional |  `[]`  |
-| <a id="jsonnet_to_json-outs"></a>outs |  Names of the output `.json` files to be generated by this rule.<br><br>If you are generating only a single JSON file and are not using jsonnet multiple output files, then this attribute should only contain the file name of the JSON file you are generating.<br><br>If you are generating multiple JSON files using jsonnet multiple file output (`jsonnet -m`), then list the file names of all the JSON files to be generated. The file names specified here must match the file names specified in your `src` Jsonnet file.<br><br>For the case where multiple file output is used but only for generating one output file, set the `multiple_outputs` attribute to 1 to explicitly enable the `-m` flag for multiple file output.<br><br>This attribute is incompatible with `out_dir`.   | List of labels | optional |  `[]`  |
+| <a id="jsonnet_to_json-outs"></a>outs |  Names of the output `.json` files to be generated by this rule.<br><br>If you are generating only a single JSON file and are not using jsonnet multiple output files, then this attribute should only contain the file name of the JSON file you are generating.<br><br>If you are generating multiple JSON files using jsonnet multiple file output (`jsonnet -m`), then list the file names of all the JSON files to be generated. The file names specified here must match the file names specified in your `src` Jsonnet file.<br><br>For the case where multiple file output is used but only for generating one output file, set the `multiple_outputs` attribute to 1 to explicitly enable the `-m` flag for multiple file output.<br><br>This attribute is incompatible with `out_dir`.   | List of labels; <a href="https://bazel.build/reference/be/common-definitions#configurable-attributes">nonconfigurable</a> | optional |  `[]`  |
 | <a id="jsonnet_to_json-code_vars"></a>code_vars |  Deprecated (use 'ext_code').   | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | optional |  `{}`  |
 | <a id="jsonnet_to_json-ext_code"></a>ext_code |  -   | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | optional |  `{}`  |
 | <a id="jsonnet_to_json-ext_code_envs"></a>ext_code_envs |  -   | List of strings | optional |  `[]`  |

examples/MODULE.bazel

@@ -23,10 +23,3 @@ local_path_override(
     module_name = "other_toolchain_module",
     path = "other_toolchain_module",
 )
-
-bazel_dep(name = "rules_rust", version = "0.45.1")
-
-rust_host = use_extension("@rules_rust//rust:extensions.bzl", "rust_host_tools")
-rust_host.host_tools(
-    version = "nightly/2024-05-02",
-)

jsonnet/jsonnet.bzl

@@ -20,14 +20,25 @@ _JSONNET_FILETYPE = [
     ".json",
 ]
 
-def _get_import_paths(label, files, imports):
+def _get_import_paths(label, files, imports, short_path):
+    # TODO: Is there a cleaner way to compute the short paths here?
     return [
         # Implicitly add the workspace root as an import path.
-        paths.join(".", file.root.path, label.workspace_root)
+        paths.join(
+            ".",
+            "" if short_path else file.root.path,
+            label.workspace_root.replace("external/", "../") if short_path else label.workspace_root,
+        )
         for file in files
     ] + [
         # Explicitly provided import paths.
-        paths.join(".", file.root.path, label.workspace_root, label.package, im)
+        paths.join(
+            ".",
+            "" if short_path else file.root.path,
+            label.workspace_root.replace("external/", "../") if short_path else label.workspace_root,
+            label.package,
+            im,
+        )
         for file in files
         for im in imports
     ]
@@ -44,15 +55,21 @@ def _setup_deps(deps):
             dependencies
         imports: List of Strings containing import flags set by transitive
             dependency targets.
+        short_imports: List of Strings containing import flags set by
+            transitive dependency targets, when invoking Jsonnet as part
+            of a test where dependencies are stored in runfiles.
     """
     transitive_sources = []
     imports = []
+    short_imports = []
     for dep in deps:
         transitive_sources.append(dep[JsonnetLibraryInfo].transitive_jsonnet_files)
         imports.append(dep[JsonnetLibraryInfo].imports)
+        short_imports.append(dep[JsonnetLibraryInfo].short_imports)
 
     return struct(
         imports = depset(transitive = imports),
+        short_imports = depset(transitive = short_imports),
         transitive_sources = depset(transitive = transitive_sources, order = "postorder"),
     )
 
@@ -63,9 +80,13 @@ def _jsonnet_library_impl(ctx):
     depinfo = _setup_deps(ctx.attr.deps)
     sources = depset(ctx.files.srcs, transitive = [depinfo.transitive_sources])
     imports = depset(
-        _get_import_paths(ctx.label, ctx.files.srcs, ctx.attr.imports),
+        _get_import_paths(ctx.label, ctx.files.srcs, ctx.attr.imports, False),
         transitive = [depinfo.imports],
     )
+    short_imports = depset(
+        _get_import_paths(ctx.label, ctx.files.srcs, ctx.attr.imports, True),
+        transitive = [depinfo.short_imports],
+    )
 
     return [
         DefaultInfo(
@@ -80,6 +101,7 @@ def _jsonnet_library_impl(ctx):
         ),
         JsonnetLibraryInfo(
             imports = imports,
+            short_imports = short_imports,
             transitive_jsonnet_files = sources,
         ),
     ]
@@ -173,7 +195,7 @@ def _jsonnet_to_json_impl(ctx):
             "set -e;",
             ctx.toolchains["//jsonnet:toolchain_type"].jsonnetinfo.compiler.path,
         ] +
-        ["-J " + shell.quote(im) for im in _get_import_paths(ctx.label, [ctx.file.src], ctx.attr.imports)] +
+        ["-J " + shell.quote(im) for im in _get_import_paths(ctx.label, [ctx.file.src], ctx.attr.imports, False)] +
         ["-J " + shell.quote(im) for im in depinfo.imports.to_list()] +
         other_args +
         ["--ext-str %s=%s" %
@@ -388,8 +410,8 @@ def _jsonnet_to_json_test_impl(ctx):
     other_args = ctx.attr.extra_args + (["-y"] if ctx.attr.yaml_stream else [])
     jsonnet_command = " ".join(
         ["OUTPUT=$(%s" % ctx.toolchains["//jsonnet:toolchain_type"].jsonnetinfo.compiler.short_path] +
-        ["-J " + shell.quote(im) for im in _get_import_paths(ctx.label, [ctx.file.src], ctx.attr.imports)] +
-        ["-J " + shell.quote(im) for im in depinfo.imports.to_list()] +
+        ["-J " + shell.quote(im) for im in _get_import_paths(ctx.label, [ctx.file.src], ctx.attr.imports, True)] +
+        ["-J " + shell.quote(im) for im in depinfo.short_imports.to_list()] +
         other_args +
         ["--ext-str %s=%s" %
          (_quote(key), _quote(val)) for key, val in jsonnet_ext_strs.items()] +