Merge pull request #2050 from tweag/cleanup-deprecated

Cleanup: remove deprecated options and targets

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -10,8 +10,41 @@ env:
   cache-version: 0
 
 jobs:
+  lint:
+    name: Format & Lint
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-lint
+      cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Configure
+        env:
+          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
+        run: |
+          # Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
+          # See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
+          [[ ${{ runner.os }} == Linux ]] && sudo sysctl -w net.ipv4.tcp_keepalive_time=60
+          if [ -z "$BUILDBUDDY_API_KEY" ]; then
+              cache_setting='--noremote_upload_local_results'
+          else
+              cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
+          fi
+          cat >.bazelrc.local <<EOF
+          common --config=ci
+          build $cache_setting
+          EOF
+          cat >~/.netrc <<EOF
+          machine api.github.com
+                  password ${{ secrets.GITHUB_TOKEN }}
+          EOF
+      - run: |
+          bazelisk test buildifier:buildifier_test
+
   test-nixpkgs:
     name: Build & Test - Nixpkgs
+    needs:
+      - lint
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.module }}-${{ matrix.bzlmod }}-${{ matrix.ghc }}-nixpkgs
       cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
@@ -115,6 +148,8 @@ jobs:
 
   test-bindist:
     name: Build & Test - bindist
+    needs:
+      - lint
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.module }}-${{ matrix.bzlmod }}-${{ matrix.ghc }}-bindist
       cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Unreleased
+
+### Removed
+
+* remove `compiler_flags` option which was deprecated since 0.14 from macros and rules
+* remove `<name>-repl` aliases for repl targets introduced in 0.7
+* remove deprecated nixpkgs platform aliases introduced in 0.13
+
 ## [0.17] 2023-10-19
 
 [0.17]: https://github.com/tweag/rules_haskell/compare/v0.16...v0.17

buildifier/BUILD.bazel

@@ -4,10 +4,17 @@ buildifier_exclude_patterns = [
     "./vendor/**",
 ]
 
+_lint_warnings = [
+    "load",
+    "unused-variable",
+]
+
 # Run this to fix the errors in BUILD files.
 buildifier(
     name = "buildifier",
     exclude_patterns = buildifier_exclude_patterns,
+    lint_mode = "fix",
+    lint_warnings = _lint_warnings,
     verbose = True,
 )
 
@@ -33,9 +40,12 @@ buildifier_test(
         "@examples//:all_files",
         "@tutorial//:all_files",
     ],
+    lint_mode = "warn",
+    lint_warnings = _lint_warnings,
     mode = "diff",
     tags = [
         "dont_test_on_windows",
+        "manual",
     ],
 )
 

docs/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("@rules_haskell//docs/pandoc:pandoc.bzl", "set_site_end_location")
@@ -34,6 +35,17 @@ libraries = [
     "c2hs",
 ]
 
+# moved here so that //haskell is not dependent upon rules_nixpkgs_*
+bzl_library(
+    name = "haskell_nix",
+    srcs = ["//haskell:nixpkgs.bzl"],
+    deps = [
+        "//haskell",
+        "@rules_nixpkgs_core//:nixpkgs",
+        "@rules_nixpkgs_posix//:posix",
+    ],
+)
+
 [
     (
         # Extract API documentation metadata to generate navigation and index.
@@ -47,7 +59,10 @@ libraries = [
             provider_template = ":templates/metadata/provider.vm",
             rule_template = ":templates/metadata/rule.vm",
             tags = ["dont_test_on_windows"],
-            deps = ["//haskell"],
+            deps = [
+                ":haskell_nix",
+                "//haskell",
+            ],
         ),
         # Generate markdown API documentation.
         stardoc(
@@ -60,7 +75,10 @@ libraries = [
             provider_template = ":templates/markdown/provider.vm",
             rule_template = ":templates/markdown/rule.vm",
             tags = ["dont_test_on_windows"],
-            deps = ["//haskell"],
+            deps = [
+                ":haskell_nix",
+                "//haskell",
+            ],
         ),
         # Convert markdown to html.
         genrule(

docs/haskell.rst

@@ -239,7 +239,7 @@ a single ``BUILD.bazel`` as follows::
   haskell_binary(
       name = "demorgan",
       srcs = ["Main.hs"],
-      compiler_flags = ["-threaded"],
+      ghcopts = ["-threaded"],
       deps = [":base", ":booleans"],
   )
 
@@ -317,7 +317,7 @@ And at the ``main/BUILD.bazel`` file::
   haskell_binary(
       name = "demorgan",
       srcs = ["Main.hs"],
-      compiler_flags = ["-threaded"],
+      ghcopts = ["-threaded"],
       deps = [":base", "//lib:booleans"],
   )
 

examples/WORKSPACE

@@ -10,7 +10,6 @@ local_repository(
     path = "arm",
 )
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies")
 
 rules_haskell_dependencies()

extensions/rules_haskell_dependencies.bzl

@@ -7,7 +7,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@rules_haskell//tools:os_info.bzl", "os_info")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
 
-def repositories(*, bzlmod):
+def repositories(*, bzlmod):  # @unused
     rules_haskell_dependencies_bzlmod()
 
     # Some helpers for platform-dependent configuration

haskell/BUILD.bazel

@@ -100,8 +100,6 @@ bzl_library(
         "@bazel_skylib//lib:shell",
         "@bazel_skylib//lib:versions",
         "@bazel_skylib//rules:expand_template",
-        "@rules_nixpkgs_core//:nixpkgs",
-        "@rules_nixpkgs_posix//:posix",
         "@rules_sh//sh:posix",
     ],
 )

haskell/asterius/defs.bzl

@@ -47,7 +47,7 @@ asterius_toolchain = rule(
 # select the asterius platform.
 # We also set the asterius_targets_browser back to it's default value
 # as it in not needed anymore.
-def _asterius_transition_impl(settings, attr):
+def _asterius_transition_impl(_settings, _attr):
     return {
         "//command_line_option:platforms": "@rules_haskell//haskell/asterius:asterius_platform",
         "@rules_haskell_asterius_build_setting//:asterius_targets_browser": False,
@@ -64,7 +64,7 @@ _asterius_transition = transition(
 
 # ahc_dist targets used by asterius_webpack rules must be configured for the browser.
 # We use the following transition for this purpose.
-def _set_ahc_dist_browser_target_impl(settings, attr):
+def _set_ahc_dist_browser_target_impl(_settings, _attr):
     return {"@rules_haskell_asterius_build_setting//:asterius_targets_browser": True}
 
 _set_ahc_dist_browser_target = transition(

haskell/asterius/repositories.bzl

@@ -3,10 +3,8 @@ load(
     "//haskell:private/workspace_utils.bzl",
     "define_rule",
     "execute_or_fail_loudly",
-    "find_python",
     "resolve_labels",
 )
-load("//haskell:private/validate_attrs.bzl", "check_deprecated_attribute_usage")
 load(
     "//haskell:private/pkgdb_to_bzl.bzl",
     "pkgdb_to_bzl",
@@ -279,7 +277,7 @@ def rules_haskell_asterius_toolchains(
         version = AHC_DEFAULT_VERSION,
         ghcopts = [],
         cabalopts = [],
-        repl_ghci_args = [],
+        repl_ghci_args = [],  # @unused
         locale = None,
         register = True):
     """