Remove buildifier_test-workspace.patch

tweag · Nov 21, 2023 · ac09daa · ac09daa
1 parent 67a4178
commit ac09daa
Showing 4 changed files with 3 additions and 49 deletions.
diff --git a/buildifier/buildifier_test-workspace.patch b/buildifier/buildifier_test-workspace.patch
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -67,9 +67,6 @@ def repositories(*, bzlmod):
     http_archive(
         name = "com_github_bazelbuild_buildtools",
         sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
-        # 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.4.0",
         urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"],
     )

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/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl
@@ -66,9 +66,6 @@ def repositories(*, bzlmod):
     http_archive(
         name = "com_github_bazelbuild_buildtools",
         sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
-        # 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.4.0",
         urls = ["https://github.com/bazelbuild/buildtools/archive/v6.4.0.tar.gz"],
     )