Merge pull request #2394 from iteratee/kb/bazel86

Fixes for Bazel 8.6

Author: mergify[bot]

MODULE.bazel

@@ -13,7 +13,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_license",
-    version = "0.0.7",
+    version = "1.0.0",
 )
 bazel_dep(
     name = "protobuf",

extensions/stack_snapshot.bzl

@@ -194,7 +194,8 @@ def _add_packages(conf, module, root_or_rules_haskell):
             # Some packages have default components set
             conf.components[package_name] = package_tag.components
         if package_tag.components_args:
-            conf.components[package_name] = package_tag.components_args
+            for (local_name, target) in package_tag.components_args.items():
+                conf.components_args[package_name + ":" + local_name] = target
         if package_tag.components_dependencies:
             conf.components_dependencies[package_name] = json.encode(package_tag.components_dependencies)
         if package_tag.extra_deps:
@@ -298,7 +299,7 @@ def _stack_snapshot_impl(mctx):
             if module.tags.haddock:
                 _assert_unique_tag(module.tags.haddock, "haddock", module)
                 haddock_tag = module.tags.haddock[0]
-                kwargs["haddock"] = haddock_tag.label
+                kwargs["haddock"] = haddock_tag.value
         else:
             _assert_no_root_tags(module)
 

haskell/cabal.bzl

@@ -197,7 +197,8 @@ def _prepare_cabal_inputs(
         generate_paths_module,
         is_library = False,  # @unused
         dynamic_file = None,
-        static_binary = True):
+        static_binary = True,
+        label = None):
     """Compute Cabal wrapper, arguments, inputs."""
     with_profiling = is_profiling_enabled(hs)
 
@@ -349,6 +350,10 @@ def _prepare_cabal_inputs(
     # Redundant with _binary_paths() above, but better be explicit when we can.
     path_args.extend([_cabal_tool_flag(tool_flag) for tool_flag in tool_inputs.to_list() if _cabal_tool_flag(tool_flag)])
 
+    repo_name = "_main"
+    if generate_paths_module and label and label.repo_name:
+        repo_name = label.repo_name
+
     args = struct(
         component = component,
         pkg_name = package_id,
@@ -364,6 +369,7 @@ def _prepare_cabal_inputs(
         ghc_version = ghc_version,
         cabal_basename = cabal.basename,
         cabal_dirname = cabal.dirname,
+        repo_name = repo_name,
         extra_ldflags_file = extra_ldflags_file.path if extra_ldflags_file else None,
         package_databases = [p.path for p in package_databases.to_list()],
     )
@@ -479,7 +485,7 @@ def _haskell_cabal_library_impl(ctx):
 
     is_empty = False
     ignore_setup = False
-    with_haddock = hs.tools_config.supports_haddock
+    with_haddock = hs.tools_config.supports_haddock and ctx.attr.haddock
     if ctx.attr.cabal_args:
         cabal_args = ctx.attr.cabal_args[HaskellCabalArgsInfo]
 
@@ -598,6 +604,7 @@ def _haskell_cabal_library_impl(ctx):
         generate_paths_module = ctx.attr.generate_paths_module,
         dynamic_file = dynamic_library,
         transitive_haddocks = _gather_transitive_haddocks(ctx.attr.deps) if with_haddock else depset([]),
+        label = ctx.label,
     )
     outputs = [
         package_database,
@@ -933,6 +940,7 @@ def _haskell_cabal_binary_impl(ctx):
         dynamic_file = binary,
         transitive_haddocks = _gather_transitive_haddocks(ctx.attr.deps) if hs.tools_config.supports_haddock else depset([]),
         static_binary = static_binary,
+        label = ctx.label,
     )
     (_, runghc_manifest) = ctx.resolve_tools(tools = [ctx.attr._runghc])
     json_args = ctx.actions.declare_file("{}_cabal_wrapper_args.json".format(ctx.label.name))

haskell/private/cabal_wrapper.py

@@ -263,6 +263,7 @@ def distdir_prefix():
             is_windows = is_windows,
             cabal_basename = json_args["cabal_basename"],
             cabal_dirname = json_args["cabal_dirname"],
+            repo_name = json_args["repo_name"],
             ghc = ghc,
             libdir = os.path.basename(libdir),
             dynlibdir = os.path.basename(dynlibdir),

haskell/private/generate_cabal_paths_module.py

@@ -42,7 +42,7 @@ def normalise_arch(arch):
     return arch
 
 def generate_cabal_paths_module(component_name, ghc_version, is_windows, cabal_basename, cabal_dirname,
-                                ghc, libdir, dynlibdir, bindir, datadir, pkgroot, workspace):
+                                repo_name, ghc, libdir, dynlibdir, bindir, datadir, pkgroot, workspace):
 
     # cabal calls ghc --info to recover the target arch and os, and uses these in path names.
     # https://github.com/haskell/cabal/blob/496d6fcc26779e754523a6cc7576aea49ef8056e/Cabal/src/Distribution/Simple/GHC/Internal.hs#L87
@@ -125,6 +125,13 @@ def generate_cabal_paths_module(component_name, ghc_version, is_windows, cabal_b
 
 """
 
+    if repo_name == "_main":
+        base_data_path = workspace + path_separator + cabal_dirname
+    else:
+        base_data_path = repo_name
+        if cabal_dirname.startswith("external" + path_separator + repo_name):
+            base_data_path = cabal_dirname.removeprefix("external" + path_separator)
+
     rebindable_syntax_pragma = ("{-# LANGUAGE NoRebindableSyntax #-}"
                                 if supports_rebindable_syntax else "")
     if supports_cpp:
@@ -177,7 +184,7 @@ def generate_cabal_paths_module(component_name, ghc_version, is_windows, cabal_b
 {version_definition}
 
 s = [pathSeparator]
-dataDirWorkspacePath = "{workspace}"++s++"{cabal_dirname}"++s++"_install"++s++"{datadir}"
+dataDirWorkspacePath = "{base_data_path}"++s++"_install"++s++"{datadir}"
 packageName = "{component_name}"
 
 libdir = "{libdir}"
@@ -257,6 +264,7 @@ def generate_cabal_paths_module(component_name, ghc_version, is_windows, cabal_b
         bindir = bindir,
         datadir = datadir,
         cabal_dirname = cabal_dirname,
+        base_data_path = base_data_path,
         workspace = workspace,
         other_functions = other_functions,
     )

rules_haskell_nix/MODULE.bazel

@@ -28,6 +28,10 @@ bazel_dep(
     name = "platforms",
     version = "1.0.0",
 )
+bazel_dep(
+    name = "rules_license",
+    version = "1.0.0",
+)
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "rules_shell", version = "0.2.0")
 

rules_haskell_nix/nixpkgs.bzl

@@ -1,6 +1,6 @@
 """Workspace rules (Nixpkgs)"""
 
-load("@bazel_tools//tools/cpp:lib_cc_configure.bzl", "get_cpu_value")
+load("@rules_haskell//haskell:private/get_cpu_value.bzl", "get_cpu_value")
 load(
     "@rules_haskell//haskell:private/pkgdb_to_bzl.bzl",
     "pkgdb_to_bzl",

rules_haskell_nix/private/declare_toolchains.bzl

@@ -10,7 +10,7 @@ They are however visible from the `nix_haskell_toolchains_configurations` reposi
   - `toolchains` contains the configuration of these toolchains.
 """
 
-load("@bazel_tools//tools/cpp:lib_cc_configure.bzl", "get_cpu_value")
+load("@rules_haskell//haskell:private/get_cpu_value.bzl", "get_cpu_value")
 load(
     "@nix_haskell_toolchains_configurations//:nix_haskell_toolchains_configurations.bzl",
     "ghc_labels",

rules_haskell_tests/MODULE.bazel

@@ -118,6 +118,7 @@ use_repo(
     "library_repo",
     "os_info",
     "zlib.hs",
+    "runfiles_repo",
 )
 
 non_modules_deps_1 = use_extension("//:non_module_deps_1.bzl", "non_module_deps_1")

rules_haskell_tests/non_module_deps.bzl

@@ -88,6 +88,13 @@ cc_library(
         urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"],
     )
 
+    http_archive(
+        name = "runfiles_repo",
+        build_file = "//tests:haskell_cabal_datafiles/BUILD.external-repo",
+        url = "file:./tests/haskell_cabal_datafiles/external-repo.tar",
+        integrity = "sha256-pQVTQmtR1JaDPeLQvAOhUrHZIHKhlpxUP00XowH5PoQ=",
+    )
+
 def _non_module_deps_impl(_ctx):
     repositories(bzlmod = True)