From e63461deca6549fb8fcca959d019ed726e3a85f3 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 d0854c5e..0d47a12a 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1752,7 +1752,7 @@
   "moduleExtensions": {
     "//elisp:extensions.bzl%elisp": {
       "general": {
-        "bzlTransitiveDigest": "76spJdwoVkdr9JFZ2JgqKZd1dmeDFFa65INnUrmrHnU=",
+        "bzlTransitiveDigest": "wf3NgyV1Yu0b2fY4Gv37iKs+7LKFxRGDRS3bCzoXCXo=",
         "accumulatedFileDigests": {},
         "envVariables": {},
         "generatedRepoSpecs": {
diff --git a/elisp/repositories.bzl b/elisp/repositories.bzl
index 86f15ed3..74c21d04 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(
         "BUILD.bazel",
         Label("//elisp:BUILD.template"),
diff --git a/examples/ext/MODULE.bazel.lock b/examples/ext/MODULE.bazel.lock
index 67fcb67e..f619bcbb 100644
--- a/examples/ext/MODULE.bazel.lock
+++ b/examples/ext/MODULE.bazel.lock
@@ -1305,7 +1305,7 @@
     },
     "@@phst_rules_elisp~override//elisp:extensions.bzl%elisp": {
       "general": {
-        "bzlTransitiveDigest": "76spJdwoVkdr9JFZ2JgqKZd1dmeDFFa65INnUrmrHnU=",
+        "bzlTransitiveDigest": "wf3NgyV1Yu0b2fY4Gv37iKs+7LKFxRGDRS3bCzoXCXo=",
         "accumulatedFileDigests": {},
         "envVariables": {},
         "generatedRepoSpecs": {