Merge branch 'master' into circleci-run-linters-first

Author: mboes

.circleci/config.yml

@@ -46,19 +46,13 @@ jobs:
           name: Bazel linter
           shell: /bin/bash -eilo pipefail
           command: |
-            nix-shell --run 'CC=$(which clang) bazel run //:buildifier'
-      - run:
-          name: Build
-          shell: /bin/bash -eilo pipefail
-          command: |
-            nix-shell --run 'CC=$(which clang) bazel build --jobs=2 //...'
-      - run:
+            nix-shell --run 'bazel run //:buildifier'
           name: Run tests
           shell: /bin/bash -eilo pipefail
           # bazel does not support recursive bazel call, so we
           # cannot use bazel run here because the test runner uses
           # bazel
-          command: nix-shell --run 'CC=$(which clang) bazel build //tests:run-tests && ./bazel-bin/tests/run-tests'
+          command: nix-shell --arg docTools false --pure --run 'bazel build //tests:run-tests && ./bazel-bin/tests/run-tests'
 
 workflows:
   version: 2

.netlify/build.sh

@@ -19,6 +19,10 @@ awk '
   # Note: awk -i inplace not available
 mv WORKSPACE.tmp WORKSPACE
 
+# We don't want to be depending on Nixpkgs for documentation
+# generation either.
+sed -i 's/vendored_node = "@nixpkgs_nodejs"/vendored_node = None/' WORKSPACE
+
 bazel build //docs:api_html
 unzip -d public bazel-bin/docs/api_html-skydoc.zip
 cp start public

.netlify/install.sh

@@ -2,7 +2,7 @@
 
 set -eux
 
-V=0.16.0
+V=0.20.0
 
 curl -LO https://github.com/bazelbuild/bazel/releases/download/$V/bazel-$V-installer-linux-x86_64.sh
 chmod +x bazel-$V-installer-linux-x86_64.sh

README.md

@@ -41,7 +41,7 @@ The full reference documentation for rules is at https://haskell.build.
 
 ## Setup
 
-You'll need [Bazel >= 0.14.0][bazel-getting-started] installed.
+You'll need [Bazel >= 0.20.0][bazel-getting-started] installed.
 
 ### The easy way
 

WORKSPACE

@@ -37,9 +37,9 @@ haskell_nixpkgs_package(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "d625beb4a43304409429a0466bb4fb44c89f7e7d90aeced972b8a61dbe92c80b",
-    strip_prefix = "protobuf-7b28271a61a3da0a37f6fda399b0c4c86464e5b3",
-    urls = ["https://github.com/google/protobuf/archive/7b28271a61a3da0a37f6fda399b0c4c86464e5b3.zip"],  # 2018-11-16
+    sha256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a",
+    strip_prefix = "protobuf-3.6.1.3",
+    urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.tar.gz"],
 )
 
 nixpkgs_local_repository(
@@ -130,9 +130,9 @@ import_packages(name = "hackage")
 
 # zlib as a Haskell library
 
-new_http_archive(
+http_archive(
     name = "haskell_zlib",
-    build_file = "tests/BUILD.zlib",
+    build_file = "//tests:BUILD.zlib",
     strip_prefix = "zlib-0.6.2",
     urls = ["https://hackage.haskell.org/package/zlib-0.6.2/zlib-0.6.2.tar.gz"],
 )
@@ -150,46 +150,77 @@ local_repository(
 
 # For Skydoc
 
+nixpkgs_package(
+    name = "nixpkgs_nodejs",
+    # XXX Indirection derivation to make all of NodeJS rooted in
+    # a single directory. We shouldn't need this, but it's
+    # a workaround for
+    # https://github.com/bazelbuild/bazel/issues/2927.
+    nix_file_content = """
+    with import <nixpkgs> {};
+    runCommand "nodejs-rules_haskell" { buildInputs = [ nodejs ]; } ''
+      mkdir -p $out/nixpkgs_nodejs
+      cd $out/nixpkgs_nodejs
+      for i in ${nodejs}/*; do ln -s $i; done
+      ''
+    """,
+    repository = "@nixpkgs",
+)
+
+http_archive(
+    name = "build_bazel_rules_nodejs",
+    sha256 = "f79f605a920145216e64991d6eff4e23babc48810a9efd63a31744bb6637b01e",
+    strip_prefix = "rules_nodejs-b4dad57d2ecc63d74db1f5523593639a635e447d",
+    # Tip of https://github.com/bazelbuild/rules_nodejs/pull/471.
+    urls = ["https://github.com/mboes/rules_nodejs/archive/b4dad57d2ecc63d74db1f5523593639a635e447d.tar.gz"],
+)
+
 http_archive(
     name = "io_bazel_rules_sass",
-    sha256 = "14536292b14b5d36d1d72ae68ee7384a51e304fa35a3c4e4db0f4590394f36ad",
-    strip_prefix = "rules_sass-0.0.3",
-    urls = ["https://github.com/bazelbuild/rules_sass/archive/0.0.3.tar.gz"],
+    sha256 = "1e135452dc627f52eab39a50f4d5b8d13e8ed66cba2e6da56ac4cbdbd776536c",
+    strip_prefix = "rules_sass-1.15.2",
+    urls = ["https://github.com/bazelbuild/rules_sass/archive/1.15.2.tar.gz"],
 )
 
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+load("@io_bazel_rules_sass//:package.bzl", "rules_sass_dependencies")
+
+rules_sass_dependencies()
+
+load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
 
 sass_repositories()
 
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+
+node_repositories(
+    vendored_node = "@nixpkgs_nodejs",
+)
+
 http_archive(
     name = "io_bazel_skydoc",
-    sha256 = "12a82b494a40c4ef96230bc66aeff654420dd39a537eb3064ff18ce1838f1fb7",
-    strip_prefix = "skydoc-9bbdf62c03b5c3fed231604f78d3976f47753d79",
-    urls = ["https://github.com/mrkkrp/skydoc/archive/9bbdf62c03b5c3fed231604f78d3976f47753d79.tar.gz"],
+    sha256 = "19eb6c162075707df5703c274d3348127625873dbfa5ff83b1ef4b8f5dbaa449",
+    strip_prefix = "skydoc-0.2.0",
+    urls = ["https://github.com/bazelbuild/skydoc/archive/0.2.0.tar.gz"],
 )
 
-load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
+load("@io_bazel_skydoc//:setup.bzl", "skydoc_repositories")
 
 skydoc_repositories()
 
 # For buildifier
 
-# XXX Need a patched version of rules_go to workaround warnings fixed
-# by https://github.com/NixOS/nixpkgs/pull/28029 on NixOS. Revert to
-# official release once fix hits Nixpkgs master.
 http_archive(
     name = "io_bazel_rules_go",
-    strip_prefix = "rules_go-6a2b1f780b475a75a7baae5b441635c566f0ed8a",
-    urls = ["https://github.com/mboes/rules_go/archive/6a2b1f780b475a75a7baae5b441635c566f0ed8a.tar.gz"],
+    sha256 = "8be57ff66da79d9e4bd434c860dce589195b9101b2c187d144014bbca23b5166",
+    strip_prefix = "rules_go-0.16.3",
+    urls = ["https://github.com/bazelbuild/rules_go/archive/0.16.3.tar.gz"],
 )
 
-bazelbuild_buildtools_rev = "4a7914a1466ff7388c934bfcd43a3852928536f6"
-
 http_archive(
     name = "com_github_bazelbuild_buildtools",
-    sha256 = "45775c7bb7ee7656e9df4ca4278f977c8e4e260aff755734734c19321e14bc84",
-    strip_prefix = "buildtools-%s" % bazelbuild_buildtools_rev,
-    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % bazelbuild_buildtools_rev,
+    sha256 = "d42e4c9727958bc5814d3bc44f19db5a24f419436cbba09f1e8913eb4a09da31",
+    strip_prefix = "buildtools-0.19.2.1",
+    urls = ["https://github.com/bazelbuild/buildtools/archive/0.19.2.1.tar.gz"],
 )
 
 load(

haskell/c2hs.bzl

@@ -88,9 +88,11 @@ c2hs_library = rule(
             allow_single_file = True,
             default = Label("@io_tweag_rules_haskell//haskell:private/c2hs_wrapper.sh"),
         ),
+        "_cc_toolchain": attr.label(
+            default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
+        ),
     },
     toolchains = [
         "@io_tweag_rules_haskell//haskell:toolchain",
-        "@bazel_tools//tools/cpp:toolchain_type",
     ],
 )

haskell/cc.bzl

@@ -3,6 +3,12 @@
 These rules are temporary and will be deprecated in the future.
 """
 
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
+load(
+    "@bazel_tools//tools/build_defs/cc:action_names.bzl",
+    "CPP_LINK_DYNAMIC_LIBRARY_ACTION_NAME",
+    "C_COMPILE_ACTION_NAME",
+)
 load(":private/path_utils.bzl", "ln")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load(":private/set.bzl", "set")
@@ -83,19 +89,47 @@ def cc_interop_info(ctx):
 
     include_args = ["-I" + include for include in include_directories]
 
-    # TODO Replace with https://github.com/bazelbuild/bazel/issues/4571
-    # when ready.
-    cc_toolchain = ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"]
+    # XXX Workaround https://github.com/bazelbuild/bazel/issues/6874.
+    # Should be find_cpp_toolchain() instead.
+    cc_toolchain = ctx.attr._cc_toolchain[cc_common.CcToolchainInfo]
+    feature_configuration = cc_common.configure_features(
+        cc_toolchain = cc_toolchain,
+        requested_features = ctx.features,
+        unsupported_features = ctx.disabled_features,
+    )
+    compile_variables = cc_common.create_compile_variables(
+        feature_configuration = feature_configuration,
+        cc_toolchain = cc_toolchain,
+    )
+    compiler_flags = cc_common.get_memory_inefficient_command_line(
+        feature_configuration = feature_configuration,
+        action_name = C_COMPILE_ACTION_NAME,
+        variables = compile_variables,
+    )
+    link_variables = cc_common.create_link_variables(
+        feature_configuration = feature_configuration,
+        cc_toolchain = cc_toolchain,
+        is_linking_dynamic_library = False,
+        is_static_linking_mode = True,
+    )
+    linker_flags = cc_common.get_memory_inefficient_command_line(
+        feature_configuration = feature_configuration,
+        action_name = CPP_LINK_DYNAMIC_LIBRARY_ACTION_NAME,
+        variables = link_variables,
+    )
+
+    # XXX Workaround https://github.com/bazelbuild/bazel/issues/6876.
+    linker_flags = [flag for flag in linker_flags if flag not in ["-shared"]]
 
     return CcInteropInfo(
         hdrs = hdrs.to_list(),
         cpp_flags = cpp_flags,
         include_args = include_args,
-        compiler_flags = cc_toolchain.compiler_options(),
+        compiler_flags = compiler_flags,
         # XXX this might not be the right set of flags for all situations,
         # but this will anyways all be replaced (once implemented) by
         # https://github.com/bazelbuild/bazel/issues/4571.
-        linker_flags = cc_toolchain.mostly_static_link_options(True),
+        linker_flags = linker_flags,
     )
 
 def _cc_import_impl(ctx):

haskell/doctest.bzl

@@ -5,8 +5,8 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
 load(":private/context.bzl", "haskell_context")
 load(
     ":private/path_utils.bzl",
-    "get_external_libs_path",
     "get_lib_name",
+    "make_external_libs_path",
 )
 load(":private/set.bzl", "set")
 load(
@@ -108,9 +108,9 @@ def _haskell_doctest_single(target, ctx):
     args.add(ctx.attr.doctest_flags)
 
     # External libraries.
-    external_libs = set.from_list(build_info.external_libraries.values())
+    external_libraries = build_info.external_libraries
     seen_libs = set.empty()
-    for lib in set.to_list(external_libs):
+    for lib in [e.mangled_lib for e in set.to_list(build_info.external_libraries)]:
         lib_name = get_lib_name(lib)
         if not set.is_member(seen_libs, lib_name):
             set.mutable_insert(seen_libs, lib_name)
@@ -147,7 +147,7 @@ def _haskell_doctest_single(target, ctx):
             set.to_depset(build_info.interface_dirs),
             set.to_depset(build_info.dynamic_libraries),
             set.to_depset(header_files),
-            set.to_depset(external_libs),
+            depset([e.mangled_lib for e in set.to_list(external_libraries)]),
             depset([exposed_modules_file]),
             depset(
                 toolchain.doctest +
@@ -167,7 +167,7 @@ def _haskell_doctest_single(target, ctx):
         # in this case.
         env = dicts.add(
             {
-                "LD_LIBRARY_PATH": get_external_libs_path(external_libs),
+                "LD_LIBRARY_PATH": make_external_libs_path(external_libraries),
             },
             hs.env,
         ),

haskell/haddock.bzl

@@ -94,7 +94,7 @@ def _haskell_doc_aspect_impl(target, ctx):
             set.to_depset(target[HaskellBuildInfo].package_caches),
             set.to_depset(target[HaskellBuildInfo].interface_dirs),
             set.to_depset(target[HaskellBuildInfo].dynamic_libraries),
-            depset(target[HaskellBuildInfo].external_libraries.values()),
+            depset([e.mangled_lib for e in set.to_list(target[HaskellBuildInfo].external_libraries)]),
             depset(transitive_haddocks.values()),
             depset(transitive_html.values()),
             # Need to give source files this way because the source_files field of

haskell/haskell.bzl

@@ -90,6 +90,9 @@ _haskell_common_attrs = {
         cfg = "host",
         default = Label("@io_tweag_rules_haskell//haskell:ls_modules"),
     ),
+    "_cc_toolchain": attr.label(
+        default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
+    ),
 }
 
 def _mk_binary_rule(**kwargs):
@@ -135,7 +138,6 @@ def _mk_binary_rule(**kwargs):
         },
         toolchains = [
             "@io_tweag_rules_haskell//haskell:toolchain",
-            "@bazel_tools//tools/cpp:toolchain_type",
         ],
         **kwargs
     )
@@ -200,7 +202,6 @@ haskell_library = rule(
     },
     toolchains = [
         "@io_tweag_rules_haskell//haskell:toolchain",
-        "@bazel_tools//tools/cpp:toolchain_type",
     ],
 )
 """Build a library from Haskell source.