digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 00:37:23 +03:00
Code Issues Projects Releases Wiki Activity

Update rules_haskell (#7077)

Browse Source 
* Update rules_haskell

Removes the warning about Bazel 3.3.1 being too recent.

* Remove unused rules_haskell patch

changelog_begin
changelog_end

* fmt

Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
This commit is contained in:
Andreas Herrmann 2020-08-11 12:14:56 +02:00 committed by GitHub
parent 27f76c4386
commit 27e7d4cf69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WORKSPACE
View File

@ -443,7 +443,6 @@ haskell_register_ghc_nixpkgs(
"@com_github_digital_asset_daml//:profiling_build": ["-fprof-auto"],
"//conditions:default": [],
},
is_static = True,
locale_archive = "@glibc_locales//:locale-archive",
nix_file = "//nix:bazel.nix",
nix_file_deps = nix_ghc_deps,
@ -453,6 +452,7 @@ haskell_register_ghc_nixpkgs(
"-Wwarn",
],
repositories = dev_env_nix_repos,
static_runtime = True,
version = "8.6.5",
)

316
bazel_tools/haskell-profiling.patch
View File

@ -1,316 +0,0 @@
diff --git a/haskell/cabal.bzl b/haskell/cabal.bzl
index e44f9b45..6f73fa8f 100644
--- a/haskell/cabal.bzl
+++ b/haskell/cabal.bzl
@@ -249,11 +249,9 @@ def _prepare_cabal_inputs(
depset(transitive_link_libs),
depset(transitive_haddocks),
setup_dep_info.interface_dirs,
- setup_dep_info.static_libraries,
- setup_dep_info.dynamic_libraries,
+ setup_dep_info.hs_libraries,
dep_info.interface_dirs,
- dep_info.static_libraries,
- dep_info.dynamic_libraries,
+ dep_info.hs_libraries,
tool_inputs,
],
)
@@ -338,13 +336,19 @@ def _haskell_cabal_library_impl(ctx):
else:
haddock_file = None
haddock_html_dir = None
- static_library_filename = "_install/lib/libHS{}.a".format(package_id)
- if with_profiling:
- static_library_filename = "_install/lib/libHS{}_p.a".format(package_id)
- static_library = hs.actions.declare_file(
- static_library_filename,
+ vanilla_library = hs.actions.declare_file(
+ "_install/lib/libHS{}.a".format(package_id),
sibling = cabal,
)
+ if with_profiling:
+ profiling_library = hs.actions.declare_file(
+ "_install/lib/libHS{}_p.a".format(package_id),
+ sibling = cabal,
+ )
+ static_library = profiling_library
+ else:
+ profiling_library = None
+ static_library = vanilla_library
if hs.toolchain.is_static:
dynamic_library = None
else:
@@ -387,13 +391,15 @@ def _haskell_cabal_library_impl(ctx):
outputs = [
package_database,
interfaces_dir,
- static_library,
+ vanilla_library,
data_dir,
]
if ctx.attr.haddock:
outputs.extend([haddock_file, haddock_html_dir])
if dynamic_library != None:
outputs.append(dynamic_library)
+ if with_profiling:
+ outputs.append(profiling_library)
ctx.actions.run(
executable = c.cabal_wrapper,
arguments = [c.args],
@@ -419,15 +425,11 @@ def _haskell_cabal_library_impl(ctx):
source_files = depset(),
extra_source_files = depset(),
import_dirs = set.empty(),
- static_libraries = depset(
- direct = [static_library],
- transitive = [dep_info.static_libraries],
+ hs_libraries = depset(
+ direct = [lib for lib in [vanilla_library, dynamic_library, profiling_library] if lib],
+ transitive = [dep_info.hs_libraries],
order = "topological",
),
- dynamic_libraries = depset(
- direct = [dynamic_library] if dynamic_library != None else [],
- transitive = [dep_info.dynamic_libraries],
- ),
interface_dirs = depset([interfaces_dir], transitive = [dep_info.interface_dirs]),
compile_flags = [],
)
@@ -668,8 +670,7 @@ def _haskell_cabal_binary_impl(ctx):
source_files = depset(),
extra_source_files = depset(),
import_dirs = set.empty(),
- static_libraries = dep_info.static_libraries,
- dynamic_libraries = dep_info.dynamic_libraries,
+ hs_libraries = dep_info.hs_libraries,
interface_dirs = dep_info.interface_dirs,
compile_flags = [],
)
diff --git a/haskell/doctest.bzl b/haskell/doctest.bzl
index 1578efbc..2e32d3fe 100644
--- a/haskell/doctest.bzl
+++ b/haskell/doctest.bzl
@@ -128,7 +128,7 @@ def _haskell_doctest_single(target, ctx):
hs_info.package_databases,
hs_info.interface_dirs,
hs_info.extra_source_files,
- hs_info.dynamic_libraries,
+ hs_info.hs_libraries,
cc_info.compilation_context.headers,
depset(get_ghci_library_files(hs, cc_libraries_info, cc.transitive_libraries)),
depset(
diff --git a/haskell/haddock.bzl b/haskell/haddock.bzl
index 18265c08..dfcff942 100644
--- a/haskell/haddock.bzl
+++ b/haskell/haddock.bzl
@@ -162,7 +162,7 @@ def _haskell_doc_aspect_impl(target, ctx):
target[HaskellInfo].interface_dirs,
target[HaskellInfo].source_files,
target[HaskellInfo].extra_source_files,
- target[HaskellInfo].dynamic_libraries,
+ target[HaskellInfo].hs_libraries,
depset(cc_libraries),
depset(transitive = [depset(i) for i in transitive_haddocks.values()]),
target[CcInfo].compilation_context.headers,
diff --git a/haskell/private/actions/compile.bzl b/haskell/private/actions/compile.bzl
index 5bec4abc..b31790fc 100644
--- a/haskell/private/actions/compile.bzl
+++ b/haskell/private/actions/compile.bzl
@@ -347,12 +347,10 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
depset(cc.hdrs),
dep_info.package_databases,
dep_info.interface_dirs,
- dep_info.static_libraries,
- dep_info.dynamic_libraries,
+ dep_info.hs_libraries,
plugin_dep_info.package_databases,
plugin_dep_info.interface_dirs,
- plugin_dep_info.static_libraries,
- plugin_dep_info.dynamic_libraries,
+ plugin_dep_info.hs_libraries,
depset(get_ghci_library_files(hs, cc.cc_libraries_info, cc.transitive_libraries + cc.plugin_libraries)),
java.inputs,
preprocessors.inputs,
diff --git a/haskell/private/actions/info.bzl b/haskell/private/actions/info.bzl
index 692b4906..ab4e5f84 100644
--- a/haskell/private/actions/info.bzl
+++ b/haskell/private/actions/info.bzl
@@ -133,7 +133,7 @@ def library_info_output_groups(
transitive = [
hs_info.package_databases,
hs_info.interface_dirs,
- hs_info.dynamic_libraries,
+ hs_info.hs_libraries,
],
),
"haskell_library_info": depset([proto_file]),
diff --git a/haskell/private/actions/link.bzl b/haskell/private/actions/link.bzl
index e9782573..18ac11b1 100644
--- a/haskell/private/actions/link.bzl
+++ b/haskell/private/actions/link.bzl
@@ -129,8 +129,7 @@ def link_binary(
inputs = depset(transitive = [
depset(extra_srcs),
dep_info.package_databases,
- dep_info.dynamic_libraries,
- dep_info.static_libraries,
+ dep_info.hs_libraries,
depset([cache_file] + object_files),
pkg_info_inputs,
depset(static_libs + dynamic_libs),
@@ -248,7 +247,7 @@ def link_library_dynamic(hs, cc, posix, dep_info, extra_srcs, object_files, my_p
inputs = depset([cache_file] + object_files, transitive = [
extra_srcs,
dep_info.package_databases,
- dep_info.dynamic_libraries,
+ dep_info.hs_libraries,
pkg_info_inputs,
depset(static_libs + dynamic_libs),
]),
diff --git a/haskell/private/dependencies.bzl b/haskell/private/dependencies.bzl
index f7090725..33a97e64 100644
--- a/haskell/private/dependencies.bzl
+++ b/haskell/private/dependencies.bzl
@@ -21,13 +21,8 @@ def gather_dep_info(ctx, deps):
for dep in deps
if HaskellInfo in dep
])
- static_libraries = depset(transitive = [
- dep[HaskellInfo].static_libraries
- for dep in deps
- if HaskellInfo in dep
- ])
- dynamic_libraries = depset(transitive = [
- dep[HaskellInfo].dynamic_libraries
+ hs_libraries = depset(transitive = [
+ dep[HaskellInfo].hs_libraries
for dep in deps
if HaskellInfo in dep
])
@@ -62,8 +57,7 @@ def gather_dep_info(ctx, deps):
acc = HaskellInfo(
package_databases = package_databases,
version_macros = set.empty(),
- static_libraries = static_libraries,
- dynamic_libraries = dynamic_libraries,
+ hs_libraries = hs_libraries,
interface_dirs = interface_dirs,
source_files = source_files,
import_dirs = import_dirs,
@@ -79,8 +73,7 @@ def gather_dep_info(ctx, deps):
acc = HaskellInfo(
package_databases = acc.package_databases,
version_macros = set.mutable_union(acc.version_macros, binfo.version_macros),
- static_libraries = depset(transitive = [acc.static_libraries, binfo.static_libraries]),
- dynamic_libraries = acc.dynamic_libraries,
+ hs_libraries = depset(transitive = [acc.hs_libraries, binfo.hs_libraries]),
interface_dirs = acc.interface_dirs,
import_dirs = import_dirs,
compile_flags = compile_flags,
@@ -97,8 +90,7 @@ def gather_dep_info(ctx, deps):
import_dirs = acc.import_dirs,
source_files = acc.source_files,
compile_flags = acc.compile_flags,
- static_libraries = acc.static_libraries,
- dynamic_libraries = acc.dynamic_libraries,
+ hs_libraries = acc.hs_libraries,
extra_source_files = acc.extra_source_files,
interface_dirs = acc.interface_dirs,
)
diff --git a/haskell/private/haskell_impl.bzl b/haskell/private/haskell_impl.bzl
index 7ddb4625..a53b2d62 100644
--- a/haskell/private/haskell_impl.bzl
+++ b/haskell/private/haskell_impl.bzl
@@ -232,8 +232,7 @@ def _haskell_binary_common_impl(ctx, is_test):
source_files = c.source_files,
extra_source_files = c.extra_source_files,
import_dirs = c.import_dirs,
- static_libraries = dep_info.static_libraries,
- dynamic_libraries = dep_info.dynamic_libraries,
+ hs_libraries = dep_info.hs_libraries,
interface_dirs = dep_info.interface_dirs,
compile_flags = c.compile_flags,
)
@@ -405,19 +404,8 @@ def haskell_library_impl(ctx):
my_pkg_id,
with_profiling = with_profiling,
)
-
- # NOTE We have to use lists for static libraries because the order is
- # important for linker. Linker searches for unresolved symbols to the
- # left, i.e. you first feed a library which has unresolved symbols and
- # then you feed the library which resolves the symbols.
- static_libraries = depset(
- direct = [static_library],
- transitive = [dep_info.static_libraries],
- order = "topological",
- )
else:
static_library = None
- static_libraries = dep_info.static_libraries
if with_shared and srcs_files:
dynamic_library = link_library_dynamic(
@@ -430,10 +418,8 @@ def haskell_library_impl(ctx):
my_pkg_id,
user_compile_flags,
)
- dynamic_libraries = depset([dynamic_library], transitive = [dep_info.dynamic_libraries])
else:
dynamic_library = None
- dynamic_libraries = dep_info.dynamic_libraries
conf_file, cache_file = package(
hs,
@@ -468,8 +454,10 @@ def haskell_library_impl(ctx):
source_files = c.source_files,
extra_source_files = c.extra_source_files,
import_dirs = set.mutable_union(c.import_dirs, export_infos.import_dirs),
- static_libraries = depset(transitive = [static_libraries, export_infos.static_libraries]),
- dynamic_libraries = depset(transitive = [dynamic_libraries, export_infos.dynamic_libraries]),
+ hs_libraries = depset(
+ direct = [lib for lib in [static_library, dynamic_library] if lib],
+ transitive = [dep_info.hs_libraries, export_infos.hs_libraries],
+ ),
interface_dirs = depset(transitive = [interface_dirs, export_infos.interface_dirs]),
compile_flags = c.compile_flags,
)
@@ -815,8 +803,8 @@ def haskell_import_impl(ctx):
source_files = depset(),
extra_source_files = depset(),
import_dirs = set.empty(),
- static_libraries = depset(),
- dynamic_libraries = depset(),
+ # XXX: Track toolchain library files of all relevant GHC ways.
+ hs_libraries = depset(),
interface_dirs = depset(),
compile_flags = [],
)
diff --git a/haskell/providers.bzl b/haskell/providers.bzl
index fb220e16..ab2cc586 100644
--- a/haskell/providers.bzl
+++ b/haskell/providers.bzl
@@ -8,8 +8,7 @@ HaskellInfo = provider(
"import_dirs": "Import hierarchy roots.",
"source_files": "Depset of files that contain Haskell modules.",
"extra_source_files": "Depset of non-Haskell source files.",
- "static_libraries": "Ordered collection of compiled library archives.",
- "dynamic_libraries": "Depset of dynamic libraries.",
+ "hs_libraries": "Depset of compiled Haskell libraries in all available GHC ways.",
"interface_dirs": "Depset of interface dirs belonging to the packages.",
"compile_flags": "Arguments that were used to compile the code.",
},
diff --git a/tests/library-linkstatic-flag/get_library_files.bzl b/tests/library-linkstatic-flag/get_library_files.bzl
index 0c73965c..e3413ecf 100644
--- a/tests/library-linkstatic-flag/get_library_files.bzl
+++ b/tests/library-linkstatic-flag/get_library_files.bzl
@@ -12,7 +12,7 @@ def _get_libraries_as_runfiles_impl(ctx):
return [DefaultInfo(
# not necessarily complete
files = depset(
- transitive = [bi.static_libraries, bi.dynamic_libraries],
+ transitive = [bi.hs_libraries],
),
)]

32
bazel_tools/haskell-strict-source-names.patch
View File

@ -181,7 +181,7 @@ index e89fc402..c0604c45 100644
deps: List of other Haskell libraries to be linked to this target.
data: See [Bazel documentation](https://docs.bazel.build/versions/master/be/common-definitions.html#common.data).,
diff --git a/haskell/private/actions/compile.bzl b/haskell/private/actions/compile.bzl
index d1bf0bd1..0f7c6198 100644
index cb5b6ece..f4fa21a9 100644
--- a/haskell/private/actions/compile.bzl
+++ b/haskell/private/actions/compile.bzl
@@ -10,7 +10,6 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
@ -192,7 +192,7 @@ index d1bf0bd1..0f7c6198 100644
"target_unique_name",
)
load(":private/pkg_id.bzl", "pkg_id")
@@ -89,7 +88,7 @@ def _process_hsc_file(hs, cc, hsc_flags, hsc_inputs, hsc_file):
@@ -104,7 +103,7 @@ def _process_hsc_file(hs, cc, hsc_flags, hsc_inputs, hsc_file):
return hs_out, idir
@ -201,7 +201,7 @@ index d1bf0bd1..0f7c6198 100644
"""Compute variables common to all compilation targets (binary and library).
Returns:
@@ -99,8 +98,8 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
@@ -114,8 +113,8 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
inputs: default inputs
input_manifests: input manifests
outputs: default outputs
@ -212,7 +212,7 @@ index d1bf0bd1..0f7c6198 100644
source_files: set of files that contain Haskell modules
extra_source_files: depset of non-Haskell source files
import_dirs: c2hs Import hierarchy roots
@@ -121,32 +120,51 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
@@ -136,32 +135,51 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
]
compile_flags += cc_args
@ -284,7 +284,7 @@ index d1bf0bd1..0f7c6198 100644
# Default compiler flags.
compile_flags += hs.toolchain.compiler_flags
@@ -267,9 +285,9 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
@@ -282,9 +300,9 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
# Output directories
args.add_all([
"-odir",
@ -296,7 +296,7 @@ index d1bf0bd1..0f7c6198 100644
])
# Interface files with profiling have to have the extension "p_hi":
@@ -339,9 +357,9 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
@@ -354,9 +372,9 @@ def _compilation_defaults(hs, cc, java, posix, dep_info, plugin_dep_info, srcs,
plugin_tool_inputs,
]),
input_manifests = preprocessors.input_manifests + plugin_tool_input_manifests,
@ -309,7 +309,7 @@ index d1bf0bd1..0f7c6198 100644
source_files = source_files,
extra_source_files = extra_source_files,
import_dirs = import_dirs,
@@ -370,7 +388,7 @@ def compile_binary(
@@ -385,7 +403,7 @@ def compile_binary(
dep_info,
plugin_dep_info,
srcs,
@ -318,7 +318,7 @@ index d1bf0bd1..0f7c6198 100644
import_dir_map,
extra_srcs,
user_compile_flags,
@@ -390,7 +408,7 @@ def compile_binary(
@@ -405,7 +423,7 @@ def compile_binary(
modules: set of module names
source_files: set of Haskell source files
"""
@ -327,7 +327,7 @@ index d1bf0bd1..0f7c6198 100644
c.args.add_all(["-main-is", main_function])
if dynamic:
# For binaries, GHC creates .o files even for code to be
@@ -402,10 +420,9 @@ def compile_binary(
@@ -417,10 +435,9 @@ def compile_binary(
coverage_data = []
if inspect_coverage:
c.args.add_all(_hpc_compiler_args(hs))
@ -340,7 +340,7 @@ index d1bf0bd1..0f7c6198 100644
hs.toolchain.actions.run_ghc(
hs,
@@ -420,7 +437,7 @@ def compile_binary(
@@ -435,7 +452,7 @@ def compile_binary(
)
return struct(
@ -349,7 +349,7 @@ index d1bf0bd1..0f7c6198 100644
source_files = c.source_files,
extra_source_files = c.extra_source_files,
import_dirs = c.import_dirs,
@@ -436,6 +453,7 @@ def compile_library(
@@ -451,6 +468,7 @@ def compile_library(
dep_info,
plugin_dep_info,
srcs,
@ -357,7 +357,7 @@ index d1bf0bd1..0f7c6198 100644
import_dir_map,
extra_srcs,
user_compile_flags,
@@ -457,7 +475,7 @@ def compile_library(
@@ -472,7 +490,7 @@ def compile_library(
source_files: set of Haskell module files
import_dirs: import directories that should make all modules visible (for GHCi)
"""
@ -366,7 +366,7 @@ index d1bf0bd1..0f7c6198 100644
if with_shared:
c.args.add("-dynamic-too")
if not hs.toolchain.is_darwin and not hs.toolchain.is_windows:
@@ -467,11 +485,10 @@ def compile_library(
@@ -482,11 +500,10 @@ def compile_library(
coverage_data = []
if hs.coverage_enabled:
c.args.add_all(_hpc_compiler_args(hs))
@ -381,7 +381,7 @@ index d1bf0bd1..0f7c6198 100644
if srcs:
hs.toolchain.actions.run_ghc(
@@ -485,76 +502,13 @@ def compile_library(
@@ -500,76 +517,13 @@ def compile_library(
env = c.env,
arguments = c.args,
)
@ -712,7 +712,7 @@ index a122332c..bcb83c73 100644
return conf_file, cache_file
diff --git a/haskell/private/haskell_impl.bzl b/haskell/private/haskell_impl.bzl
index 219b8cb9..38b1eb9d 100644
index 3705f167..ae2f8405 100644
--- a/haskell/private/haskell_impl.bzl
+++ b/haskell/private/haskell_impl.bzl
@@ -11,10 +11,6 @@ load(
@ -767,7 +767,7 @@ index 219b8cb9..38b1eb9d 100644
+ module_map = determine_module_names(srcs_files)
with_shared = not ctx.attr.linkstatic
if with_profiling or hs.toolchain.is_static:
if with_profiling or hs.toolchain.static_runtime:
@@ -384,6 +383,7 @@ def haskell_library_impl(ctx):
dep_info,
plugin_dep_info,

2
compatibility/WORKSPACE
View File

@ -112,11 +112,11 @@ haskell_register_ghc_bindists(
haskell_register_ghc_nixpkgs(
attribute_path = "ghcStatic",
build_file = "@io_tweag_rules_nixpkgs//nixpkgs:BUILD.pkg",
is_static = True,
locale_archive = "@glibc_locales//:locale-archive",
nix_file = "@daml//nix:bazel.nix",
nix_file_deps = nix_ghc_deps,
repositories = dev_env_nix_repos,
static_runtime = True,
version = "8.6.5",
)

4
deps.bzl
View File

@ -33,8 +33,8 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
rules_scala_version = "152715b05547f160a512bae9b3d9e77a4888e243"
rules_scala_sha256 = "9b117bf591780b5665a8271d83c2530943330f06e2dd99574ca9cf538009d09d"
rules_haskell_version = "eb16a5401770098a801775ea3a893b09cafe054c"
rules_haskell_sha256 = "2fcab6b01a184435359f6bcbb9403f0457c2a4e0f1b1a4572b9d7f89d2fc5431"
rules_haskell_version = "130121dac45dc726175fbb15230c02325b6fe73a"
rules_haskell_sha256 = "423112ebcd17ae609caf6b76c75d5785f58a41a197fb62545d46f89bd66b508c"
rules_nixpkgs_version = "659cf9db456f5a3c1a5a27747116fc50b709cdab"
rules_nixpkgs_sha256 = "6a76b8004ad94daa9ce7e95d902c790646f8abd598ae9f1b1978fb74a95e9ebd"
buildifier_version = "3.3.0"