Merge pull request #2175 from tweag/cb/cleanup-optional-version

Cleanup and fix CI jobs for Darwin

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-12, windows-latest]
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:

haskell/haddock.bzl

@@ -89,16 +89,13 @@ def _haskell_doc_aspect_impl(target, ctx):
     html_dir = ctx.actions.declare_directory(html_dir_raw)
     haddock_file = ctx.actions.declare_file(_get_haddock_path(package_id))
 
-    # XXX Haddock really wants a version number, so invent one from
-    # thin air. See https://github.com/haskell/haddock/issues/898.
+    args = ctx.actions.args()
+    args.add("--package-name={0}".format(package_id))
+
     if target[HaskellLibraryInfo].version:
         version = target[HaskellLibraryInfo].version
-    else:
-        version = "0"
+        args.add("--package-version={0}".format(version))
 
-    args = ctx.actions.args()
-    args.add("--package-name={0}".format(package_id))
-    args.add("--package-version={0}".format(version))
     args.add_all([
         "-D",
         haddock_file.path,