From 2f8fe7baa116a8d1f05f7079f2c25716ffacc837 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <p.stephani2@gmail.com>
Date: Tue, 9 Jan 2024 16:58:05 +0100
Subject: [PATCH] Remove workaround for
 https://github.com/bazelbuild/bazel/issues/15916.

The fix is included in all versions of Bazel starting with 6.0.
---
 MODULE.bazel.lock              | 2 +-
 elisp/repositories.bzl         | 3 ---
 examples/ext/MODULE.bazel.lock | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 1cff34cd..2f4b6f05 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1757,7 +1757,7 @@
   "moduleExtensions": {
     "//elisp:extensions.bzl%elisp": {
       "general": {
-        "bzlTransitiveDigest": "8bIdVPmSHF+R3oPAC86fxQ3fscN2v5UkeptMmV8Voq4=",
+        "bzlTransitiveDigest": "51tGbtBvlxLC4A5FNRQCG0Wis2WwW6zTKZ8b0qDz+xk=",
         "accumulatedFileDigests": {},
         "envVariables": {},
         "generatedRepoSpecs": {
diff --git a/elisp/repositories.bzl b/elisp/repositories.bzl
index f8280bc5..de811b15 100644
--- a/elisp/repositories.bzl
+++ b/elisp/repositories.bzl
@@ -103,9 +103,6 @@ def _elisp_http_archive_impl(repository_ctx):
         stripPrefix = repository_ctx.attr.strip_prefix,
     )
     defs_bzl = str(repository_ctx.attr._defs_bzl)
-    if not defs_bzl.startswith("@"):
-        # Work around https://github.com/bazelbuild/bazel/issues/15916.
-        defs_bzl = "@" + defs_bzl
     repository_ctx.template(
         "WORKSPACE.bazel",
         Label("//elisp:WORKSPACE.template"),
diff --git a/examples/ext/MODULE.bazel.lock b/examples/ext/MODULE.bazel.lock
index 24b4f4f5..b33b2525 100644
--- a/examples/ext/MODULE.bazel.lock
+++ b/examples/ext/MODULE.bazel.lock
@@ -1308,7 +1308,7 @@
     },
     "@@phst_rules_elisp~override//elisp:extensions.bzl%elisp": {
       "general": {
-        "bzlTransitiveDigest": "8bIdVPmSHF+R3oPAC86fxQ3fscN2v5UkeptMmV8Voq4=",
+        "bzlTransitiveDigest": "51tGbtBvlxLC4A5FNRQCG0Wis2WwW6zTKZ8b0qDz+xk=",
         "accumulatedFileDigests": {},
         "envVariables": {},
         "generatedRepoSpecs": {