Merge branch 'master' into ghc-9.4.6

mergify[bot] · web-flow · commit 540aa48a3ff4 · 2023-11-13T09:51:36.000Z
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -42,7 +42,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_rules_js",
-    version = "1.33.1",
+    version = "1.33.3",
 )
 bazel_dep(
     name = "rules_sh",
diff --git a/WORKSPACE b/WORKSPACE
@@ -29,9 +29,9 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "rules_proto",
-    sha256 = "b9776d391f9de6391d46423ed052b4d5f0e5813180be03e50af385e1759fb688",
-    strip_prefix = "rules_proto-52b80440af594d64d4e356f1e9a68059f7f204db",
-    urls = ["https://github.com/bazelbuild/rules_proto/archive/52b80440af594d64d4e356f1e9a68059f7f204db.tar.gz"],
+    sha256 = "c6d6f9bfd39b6417724fd4a504767aa1e8dbfe828d9d41ab4ccd1976aba53fb4",
+    strip_prefix = "rules_proto-7188888362a203892dec354f52623f9970bff48c",
+    urls = ["https://github.com/bazelbuild/rules_proto/archive/7188888362a203892dec354f52623f9970bff48c.tar.gz"],
 )
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
diff --git a/haskell/private/ghc_bindist_generated.json b/haskell/private/ghc_bindist_generated.json
@@ -432,5 +432,27 @@
             "https://downloads.haskell.org/~ghc/9.6.3/ghc-9.6.3-x86_64-unknown-mingw32.tar.xz",
             "0cc0e2d290a87c540268e62cc71f8eced2a24f621beeb524cce61bebf644f064"
         ]
+    },
+    "9.8.1": {
+        "linux_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-deb9-linux.tar.xz",
+            "9bfd288e495488ac352de045cc8b3bab509070a5b818cc36b2dfe6097dd7c872"
+        ],
+        "linux_arm64": [
+            "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-aarch64-deb10-linux.tar.xz",
+            "aab7af72614f8bf9ca624407aa4dbc69bc009c2b4cc1a0f3c062008db81bdb95"
+        ],
+        "darwin_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-apple-darwin.tar.xz",
+            "1ea10e3b4b81b4159737128434babefff891b68345e48516828547ad8949820e"
+        ],
+        "darwin_arm64": [
+            "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-aarch64-apple-darwin.tar.xz",
+            "a38bb06f60c92d348e3ee927a4a88e88488f874e99f440d06244a4e4f9db9e3b"
+        ],
+        "windows_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-unknown-mingw32.tar.xz",
+            "eb74654419cb646e9d2e362b57f2f81bc9f5231bceb543b14cb0341aedb07fa3"
+        ]
     }
 }
diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl
@@ -117,19 +117,19 @@ def rules_haskell_dependencies():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
-        strip_prefix = "protobuf-21.7",
+        sha256 = "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de",
+        strip_prefix = "protobuf-21.12",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.tar.gz",
         ],
     )
 
     maybe(
         http_archive,
         name = "aspect_rules_js",
-        sha256 = "a949d56fed8fa0a8dd82a0a660acc949253a05b2b0c52a07e4034e27f11218f6",
-        strip_prefix = "rules_js-1.33.1",
-        url = "https://github.com/aspect-build/rules_js/releases/download/v1.33.1/rules_js-v1.33.1.tar.gz",
+        sha256 = "295a73d963bad4b04a3c488d60dc8a76a659ee64708be3a66be75726e6277c7e",
+        strip_prefix = "rules_js-1.33.3",
+        url = "https://github.com/aspect-build/rules_js/releases/download/v1.33.3/rules_js-v1.33.3.tar.gz",
     )
 
     rules_haskell_dependencies_bzlmod()
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -66,12 +66,12 @@ def repositories(*, bzlmod):
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
+        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.1.2",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.1.2.tar.gz"],
+        strip_prefix = "buildtools-6.3.3",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"],
     )
 
     nixpkgs_local_repository(
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -69,7 +69,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_rules_js",
-    version = "1.33.1",
+    version = "1.33.3",
 )
 bazel_dep(
     name = "aspect_bazel_lib",
diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE
@@ -45,9 +45,9 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "rules_proto",
-    sha256 = "b9776d391f9de6391d46423ed052b4d5f0e5813180be03e50af385e1759fb688",
-    strip_prefix = "rules_proto-52b80440af594d64d4e356f1e9a68059f7f204db",
-    urls = ["https://github.com/bazelbuild/rules_proto/archive/52b80440af594d64d4e356f1e9a68059f7f204db.tar.gz"],
+    sha256 = "c6d6f9bfd39b6417724fd4a504767aa1e8dbfe828d9d41ab4ccd1976aba53fb4",
+    strip_prefix = "rules_proto-7188888362a203892dec354f52623f9970bff48c",
+    urls = ["https://github.com/bazelbuild/rules_proto/archive/7188888362a203892dec354f52623f9970bff48c.tar.gz"],
 )
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
diff --git a/rules_haskell_tests/non_module_deps.bzl b/rules_haskell_tests/non_module_deps.bzl
@@ -65,12 +65,12 @@ def repositories(*, bzlmod):
     # no modules are provided at the moment for buildifier
     http_archive(
         name = "com_github_bazelbuild_buildtools",
-        sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
+        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.1.2",
-        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.1.2.tar.gz"],
+        strip_prefix = "buildtools-6.3.3",
+        urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.3.tar.gz"],
     )
 
     http_archive(

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ bazel_dep(`
`42`	`42`	`)`
`43`	`43`	`bazel_dep(`
`44`	`44`	`name = "aspect_rules_js",`
`45`		`- version = "1.33.1",`
	`45`	`+ version = "1.33.3",`
`46`	`46`	`)`
`47`	`47`	`bazel_dep(`
`48`	`48`	`name = "rules_sh",`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ bazel_dep(`
`69`	`69`	`)`
`70`	`70`	`bazel_dep(`
`71`	`71`	`name = "aspect_rules_js",`
`72`		`- version = "1.33.1",`
	`72`	`+ version = "1.33.3",`
`73`	`73`	`)`
`74`	`74`	`bazel_dep(`
`75`	`75`	`name = "aspect_bazel_lib",`