Merge pull request #2054 from tweag/combined-prs-branch

Combined PRs
tweag · Nov 21, 2023 · d32cc8d · d32cc8d
2 parents 67b3975 + 9b96e12
commit d32cc8d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 63 deletions.
diff --git a/buildifier/buildifier_test-workspace.patch b/buildifier/buildifier_test-workspace.patch
diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl
@@ -157,10 +157,10 @@ def rules_haskell_dependencies():
         http_archive,
         name = "rules_pkg",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.1/rules_pkg-0.7.1.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
         ],
-        sha256 = "451e08a4d78988c06fa3f9306ec813b836b1d076d0f055595444ba4ff22b867f",
+        sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
     )
 
     # For --incompatible_disable_starlark_host_transitions support (default in bazel 7)

diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -66,12 +66,9 @@ def repositories(*, bzlmod):
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a",
-        # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too
-        patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"],
-        patch_args = ["-p1"],
-        strip_prefix = "buildtools-6.3.3",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"],
+        sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
+        strip_prefix = "buildtools-6.4.0",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"],
     )
 
     nixpkgs_local_repository(

diff --git a/rules_haskell_nix/WORKSPACE.bzlmod b/rules_haskell_nix/WORKSPACE.bzlmod
@@ -13,12 +13,9 @@ nixpkgs_package(
 
 http_archive(
     name = "com_github_bazelbuild_buildtools",
-    patch_args = ["-p1"],
-    # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too
-    patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"],
-    sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a",
-    strip_prefix = "buildtools-6.3.3",
+    sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
+    strip_prefix = "buildtools-6.4.0",
     urls = [
-        "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.3.3.tar.gz",
+        "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.4.0.tar.gz",
     ],
 )
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -73,7 +73,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_bazel_lib",
-    version = "1.37.0",
+    version = "1.38.1",
 )
 bazel_dep(
     name = "rules_proto",
@@ -234,7 +234,7 @@ use_repo(
 # Java dependencies for the //tests/java_classpath test
 bazel_dep(
     name = "rules_jvm_external",
-    version = "5.1",
+    version = "5.3",
 )
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE
@@ -27,9 +27,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # For testing if bzlmod is enabled
 http_archive(
     name = "aspect_bazel_lib",
-    sha256 = "ce259cbac2e94a6dff01aff9455dcc844c8af141503b02a09c2642695b7b873e",
-    strip_prefix = "bazel-lib-1.37.0",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.37.0/bazel-lib-v1.37.0.tar.gz",
+    sha256 = "262e3d6693cdc16dd43880785cdae13c64e6a3f63f75b1993c716295093d117f",
+    strip_prefix = "bazel-lib-1.38.1",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.1/bazel-lib-v1.38.1.tar.gz",
 )
 
 load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")

diff --git a/rules_haskell_tests/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl
@@ -65,12 +65,9 @@ def repositories(*, bzlmod):
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a",
-        # fix runner.bash.template always returning success, format MODULE.bazel and WORKSPACE.bzlmod too
-        patches = ["@rules_haskell//buildifier:buildifier_test-workspace.patch"],
-        patch_args = ["-p1"],
-        strip_prefix = "buildtools-6.3.3",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"],
+        sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
+        strip_prefix = "buildtools-6.4.0",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"],
     )
 
     http_archive(