Upgrade rules-haskell (#12580)

Spun out from the GHC 9 upgrade. changelog_begin changelog_end
digital-asset · Jan 26, 2022 · 7bcce7c · 7bcce7c
1 parent 159f384
commit 7bcce7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 95 deletions.
diff --git a/bazel_tools/haskell-cabal-reproducible.patch b/bazel_tools/haskell-cabal-reproducible.patch
diff --git a/bazel_tools/haskell-windows-extra-libraries.patch b/bazel_tools/haskell-windows-extra-libraries.patch
@@ -1,10 +1,10 @@
 diff --git a/haskell/private/actions/package.bzl b/haskell/private/actions/package.bzl
-index bebeaa1a..f8fecb63 100644
+index fddf30fd..564da872 100644
 --- a/haskell/private/actions/package.bzl
 +++ b/haskell/private/actions/package.bzl
-@@ -98,7 +98,12 @@ def package(
-         "library-dirs": ["${pkgroot}"] + extra_lib_dirs,
-         "dynamic-library-dirs": ["${pkgroot}"] + extra_dynamic_lib_dirs,
+@@ -105,7 +105,12 @@ def package(
+         "library-dirs": [pkgroot_lib_path] + extra_lib_dirs,
+         "dynamic-library-dirs": [pkgroot_lib_path] + extra_dynamic_lib_dirs,
          "hs-libraries": [pkg_id.library_name(hs, my_pkg_id)] if has_hs_library else [],
 -        "extra-libraries": extra_libs,
 +        "extra-libraries": extra_libs + ([

diff --git a/deps.bzl b/deps.bzl
@@ -33,17 +33,14 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 rules_scala_version = "17791a18aa966cdf2babb004822e6c70a7decc76"
 rules_scala_sha256 = "a8faef92f59a4f1428ed9a93c7c313a996466a66ad64c119fc49b5c7dea98c59"
 
-rules_haskell_version = "a7241fa64c7cd36462a1f6ac4c660d1247d5e07b"
-rules_haskell_sha256 = "9ca581c79dbda507da05ca4c3e958eb5865c9fbc7e393656cdcb8216b20d8821"
+rules_haskell_version = "156b091fc1b8d0736ad9f072cdc9abdadacbf57f"
+rules_haskell_sha256 = "e3fb9e6da187d0ef79f1e6240325092c011dd1c7db207cd3f3793806642bd2c4"
 rules_haskell_patches = [
     # This is a daml specific patch and not upstreamable.
     "@com_github_digital_asset_daml//bazel_tools:haskell-windows-extra-libraries.patch",
     # This should be made configurable in rules_haskell.
     # Remove this patch once that's available.
     "@com_github_digital_asset_daml//bazel_tools:haskell-opt.patch",
-    # This can be removed once the following upstream PR has been merged:
-    # https://github.com/tweag/rules_haskell/pull/1648
-    "@com_github_digital_asset_daml//bazel_tools:haskell-cabal-reproducible.patch",
 ]
 rules_nixpkgs_version = "81f61c4b5afcf50665b7073f7fce4c1755b4b9a3"
 rules_nixpkgs_sha256 = "33fd540d0283cf9956d0a5a640acb1430c81539a84069114beaf9640c96d221a"