diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 61df0f25..071724ce 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -176,7 +176,7 @@ "moduleExtensions": { "//elisp:extensions.bzl%elisp": { "general": { - "bzlTransitiveDigest": "zgbDl5zj0hKKzgBi6WmpFDtEPkp923MXq9Jgon+F/vg=", + "bzlTransitiveDigest": "Ohei8xR6MAPWcBFGjHeBJJtJS2JGdv/Bn/anHa525TY=", "usagesDigest": "liZMS9ce4oz8dRujaSwrLfy/k+xo9hJ7wigNq+eJYmM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, diff --git a/elisp/extensions.bzl b/elisp/extensions.bzl index 7181b5db..ef76dbbe 100644 --- a/elisp/extensions.bzl +++ b/elisp/extensions.bzl @@ -1,4 +1,4 @@ -# Copyright 2023, 2024, 2025 Google LLC +# Copyright 2023, 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ def _elisp_http_archive_impl(ctx): """Implementation of the `elisp_http_archive` repository rule.""" ctx.download_and_extract( url = ctx.attr.urls, - integrity = ctx.attr.integrity, + integrity = ctx.attr.integrity or fail("missing archive checksum"), stripPrefix = ctx.attr.strip_prefix, ) ctx.template( @@ -84,9 +84,6 @@ def _elisp_http_archive_impl(ctx): executable = False, ) -# FIXME: Remove this rule and inline its implementation once -# https://github.com/bazelbuild/bazel/issues/24829 is fixed in all supported -# versions of Bazel. _elisp_http_archive = repository_rule( doc = _HTTP_ARCHIVE_DOC.format(kind = "repository rule"), attrs = _HTTP_ARCHIVE_ATTRS | { @@ -102,7 +99,7 @@ def _elisp_impl(ctx): _elisp_http_archive( name = arch.name, urls = arch.urls, - integrity = arch.integrity or fail("missing archive checksum"), + integrity = arch.integrity, strip_prefix = arch.strip_prefix, target_name = arch.target_name, exclude = arch.exclude, diff --git a/examples/ext/MODULE.bazel.lock b/examples/ext/MODULE.bazel.lock index 306c2f66..6c08669e 100644 --- a/examples/ext/MODULE.bazel.lock +++ b/examples/ext/MODULE.bazel.lock @@ -185,7 +185,7 @@ }, "@@phst_rules_elisp+//elisp:extensions.bzl%elisp": { "general": { - "bzlTransitiveDigest": "zgbDl5zj0hKKzgBi6WmpFDtEPkp923MXq9Jgon+F/vg=", + "bzlTransitiveDigest": "Ohei8xR6MAPWcBFGjHeBJJtJS2JGdv/Bn/anHa525TY=", "usagesDigest": "6mFjFWWQGjuMfZ4GX13pmOeiqlTo8nyRVAXYA9HOCGI=", "recordedFileInputs": {}, "recordedDirentsInputs": {},