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

mergify[bot] · web-flow · commit b2fb38b218f7 · 2023-11-08T09:15:24.000Z
Combined PRs
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -17,7 +17,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "protobuf",
-    version = "3.19.6",
+    version = "21.7",
     repo_name = "com_google_protobuf",
 )
 bazel_dep(
@@ -34,7 +34,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.4.2",
+    version = "1.5.0",
 )
 bazel_dep(
     name = "rules_proto",
@@ -144,7 +144,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "stardoc",
-    version = "0.5.4",
+    version = "0.6.2",
     dev_dependency = True,
     repo_name = "io_bazel_stardoc",
 )
diff --git a/docs/templates/metadata/aspect.vm b/docs/templates/metadata/aspect.vm
@@ -1,3 +1,4 @@
   - name: ${aspectName}
     type: aspect
-    summary: ${aspectInfo.getDocString().split("\n").get(0)}
+    summary: ${aspectInfo.getDocString().replaceFirst("(?s)
+.*", "")}
diff --git a/docs/templates/metadata/func.vm b/docs/templates/metadata/func.vm
@@ -1,3 +1,4 @@
   - name: ${funcInfo.functionName}
     type: function
-    summary: ${funcInfo.docString.split("\n").get(0)}
+    summary: ${funcInfo.docString.replaceFirst("(?s)
+.*", "")}
diff --git a/docs/templates/metadata/provider.vm b/docs/templates/metadata/provider.vm
@@ -1,3 +1,4 @@
   - name: ${providerName}
     type: provider
-    summary: ${providerInfo.docString.split("\n").get(0)}
+    summary: ${providerInfo.docString.replaceFirst("(?s)
+.*", "")}
diff --git a/docs/templates/metadata/rule.vm b/docs/templates/metadata/rule.vm
@@ -1,3 +1,4 @@
   - name: ${ruleName}
     type: rule
-    summary: ${ruleInfo.docString.split("\n").get(0)}
+    summary: ${ruleInfo.docString.replaceFirst("(?s)
+.*", "")}
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -35,7 +35,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.4.2",
+    version = "1.5.0",
 )
 
 non_module_deps = use_extension(":non_module_deps.bzl", "non_module_deps")
diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl
@@ -42,10 +42,10 @@ def rules_haskell_dependencies():
         http_archive,
         name = "bazel_skylib",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
         ],
-        sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
+        sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
     )
 
     maybe(
@@ -117,10 +117,10 @@ def rules_haskell_dependencies():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        sha256 = "87407cd28e7a9c95d9f61a098a53cf031109d451a7763e7dd1253abf8b4df422",
-        strip_prefix = "protobuf-3.19.1",
+        sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
+        strip_prefix = "protobuf-21.7",
         urls = [
-            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.19.1.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
         ],
     )
 
@@ -153,6 +153,15 @@ def rules_haskell_dependencies():
         strip_prefix = "zlib-1.3",
         urls = ["https://github.com/madler/zlib/archive/v1.3.tar.gz"],
     )
+    maybe(
+        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",
+        ],
+        sha256 = "451e08a4d78988c06fa3f9306ec813b836b1d076d0f055595444ba4ff22b867f",
+    )
 
     # For --incompatible_disable_starlark_host_transitions support (default in bazel 7)
     # Temporarily overrides the rules_licence that comes with bazel to workaround
diff --git a/rules_haskell_nix/MODULE.bazel b/rules_haskell_nix/MODULE.bazel
@@ -23,7 +23,7 @@ bazel_dep(
     name = "platforms",
     version = "0.0.8",
 )
-bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
 
 bazel_dep(name = "rules_go", version = "0.41.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
 
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -57,7 +57,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.4.2",
+    version = "1.5.0",
 )
 bazel_dep(
     name = "rules_java",
@@ -73,7 +73,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_bazel_lib",
-    version = "1.36.0",
+    version = "1.37.0",
 )
 bazel_dep(
     name = "rules_proto",
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 = "cbf473d630ab67b36461d83b38fdc44e56f45b78d03c405e4958280211124d79",
-    strip_prefix = "bazel-lib-1.36.0",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.36.0/bazel-lib-v1.36.0.tar.gz",
+    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",
 )
 
 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
@@ -31,9 +31,9 @@ def repositories(*, bzlmod):
     # module rules_bazel_integration_test requires bazel >= 6.1.0
     http_archive(
         name = "rules_bazel_integration_test",
-        sha256 = "567ef30550a90c0dc22a9076743b2b2715b4d7148b4d573bdcc61aaa5d0177b3",
+        sha256 = "6e65d497c68f5794349bfa004369e144063686ce1ebd0227717cd23285be45ef",
         urls = [
-            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.18.0/rules_bazel_integration_test.v0.18.0.tar.gz",
+            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.20.0/rules_bazel_integration_test.v0.20.0.tar.gz",
         ],
     )
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ bazel_dep(`
`17`	`17`	`)`
`18`	`18`	`bazel_dep(`
`19`	`19`	`name = "protobuf",`
`20`		`- version = "3.19.6",`
	`20`	`+ version = "21.7",`
`21`	`21`	`repo_name = "com_google_protobuf",`
`22`	`22`	`)`
`23`	`23`	`bazel_dep(`
`@@ -34,7 +34,7 @@ bazel_dep(`
`34`	`34`	`)`
`35`	`35`	`bazel_dep(`
`36`	`36`	`name = "bazel_skylib",`
`37`		`- version = "1.4.2",`
	`37`	`+ version = "1.5.0",`
`38`	`38`	`)`
`39`	`39`	`bazel_dep(`
`40`	`40`	`name = "rules_proto",`
`@@ -144,7 +144,7 @@ bazel_dep(`
`144`	`144`	`)`
`145`	`145`	`bazel_dep(`
`146`	`146`	`name = "stardoc",`
`147`		`- version = "0.5.4",`
	`147`	`+ version = "0.6.2",`
`148`	`148`	`dev_dependency = True,`
`149`	`149`	`repo_name = "io_bazel_stardoc",`
`150`	`150`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ bazel_dep(`
`35`	`35`	`)`
`36`	`36`	`bazel_dep(`
`37`	`37`	`name = "bazel_skylib",`
`38`		`- version = "1.4.2",`
	`38`	`+ version = "1.5.0",`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`non_module_deps = use_extension(":non_module_deps.bzl", "non_module_deps")`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ bazel_dep(`
`23`	`23`	`name = "platforms",`
`24`	`24`	`version = "0.0.8",`
`25`	`25`	`)`
`26`		`-bazel_dep(name = "bazel_skylib", version = "1.4.2")`
	`26`	`+bazel_dep(name = "bazel_skylib", version = "1.5.0")`
`27`	`27`
`28`	`28`	`bazel_dep(name = "rules_go", version = "0.41.0", dev_dependency = True, repo_name = "io_bazel_rules_go")`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ bazel_dep(`
`57`	`57`	`)`
`58`	`58`	`bazel_dep(`
`59`	`59`	`name = "bazel_skylib",`
`60`		`- version = "1.4.2",`
	`60`	`+ version = "1.5.0",`
`61`	`61`	`)`
`62`	`62`	`bazel_dep(`
`63`	`63`	`name = "rules_java",`
`@@ -73,7 +73,7 @@ bazel_dep(`
`73`	`73`	`)`
`74`	`74`	`bazel_dep(`
`75`	`75`	`name = "aspect_bazel_lib",`
`76`		`- version = "1.36.0",`
	`76`	`+ version = "1.37.0",`
`77`	`77`	`)`
`78`	`78`	`bazel_dep(`
`79`	`79`	`name = "rules_proto",`