diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index fe02973643..ab340b559a 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -137,12 +137,8 @@ use_repo( "alex", "ghcide", "ghcide-exe", - "rules_haskell_stack", - "rules_haskell_stack_update", "stackage-pinning-test", "stackage-pinning-test-unpinned", - "stackage-zlib", - "stackage-zlib-unpinned", "stackage_asterius", "stackage_asterius-unpinned", ) @@ -339,9 +335,13 @@ stack_snapshot = use_extension( ) use_repo( stack_snapshot, + "rules_haskell_stack", + "rules_haskell_stack_update", "stackage", "stackage-exe", "stackage-unpinned", + "stackage-zlib", + "stackage-zlib-unpinned", ) stack_snapshot.package( name = "proto-lens-protoc", @@ -439,3 +439,22 @@ stack_snapshot.stack_snapshot_json( "mac", ], ) + +# In a separate repo because not all platforms support zlib. +stack_snapshot.snapshot( + name = "stackage-zlib", + local_snapshot = "//:stackage_snapshot.yaml", +) +stack_snapshot.package( + name = "zlib", + snapshot = "stackage-zlib", + extra_deps = ["//tests:zlib"], +) +stack_snapshot.stack_snapshot_json( + label = "//:stackage-zlib-snapshot.json", + snapshot = "stackage-zlib", + os = [ + "linux", + "mac", + ], +) diff --git a/rules_haskell_tests/non_module_deps_2.bzl b/rules_haskell_tests/non_module_deps_2.bzl index 7d08e306bb..bb8f647778 100644 --- a/rules_haskell_tests/non_module_deps_2.bzl +++ b/rules_haskell_tests/non_module_deps_2.bzl @@ -22,16 +22,6 @@ _empty_repo = repository_rule( ) def repositories(*, bzlmod): - # In a separate repo because not all platforms support zlib. - stack_snapshot( - name = "stackage-zlib", - extra_deps = {"zlib": ["//tests:zlib"]}, - local_snapshot = "//:stackage_snapshot.yaml", - packages = ["zlib"], - stack_snapshot_json = "//:stackage-zlib-snapshot.json" if not is_windows else None, - label_builder = label_builder, - ) - stack_snapshot( name = "ghcide", setup_stack = False,