Merge branch 'master' into renovate/zlib-1.x

mergify[bot] · web-flow · commit 800790d09096 · 2024-04-10T08:41:22.000Z
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -4,5 +4,13 @@
         "github>tweag/renovate-presets:mergify"
     ],
     "ignorePaths": ["registry/**"],
+    "packageRules": [
+        {
+            "matchFiles": [
+                "rules_haskell_nix/MODULE.bazel"
+            ],
+            "enabled": false
+        }
+    ],
     "gitAuthor": "Renovate Bot <bot@renovateapp.com>"
 }
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -31,7 +31,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_sh",
-    version = "0.3.0",
+    version = "0.4.0",
 )
 bazel_dep(
     name = "bazel_skylib",
diff --git a/haskell/cabal.bzl b/haskell/cabal.bzl
@@ -2136,7 +2136,7 @@ haskell_cabal_binary(
     setup_deps = {setup_deps},
     tools = {tools},
     visibility = ["@{workspace}-exe//{name}:__pkg__"],
-    cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w"],
+    cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w", "--ghc-option=-static"],
     verbose = {verbose},
 )
 """.format(
diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl
@@ -31,10 +31,10 @@ def rules_haskell_dependencies():
         http_archive,
         name = "platforms",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
+            "https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz",
         ],
-        sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74",
+        sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b",
     )
 
     maybe(
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -45,7 +45,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "platforms",
-    version = "0.0.8",
+    version = "0.0.9",
 )
 bazel_dep(
     name = "rules_cc",
@@ -210,7 +210,7 @@ go_sdk.download(
 
 bazel_dep(
     name = "gazelle",
-    version = "0.33.0",
+    version = "0.36.0",
 )
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
diff --git a/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel b/rules_haskell_tests/tests/bzlmod_runfiles/other_module/MODULE.bazel
@@ -17,5 +17,5 @@ bazel_dep(
 )
 bazel_dep(
     name = "platforms",
-    version = "0.0.8",
+    version = "0.0.9",
 )
diff --git a/tutorial/MODULE.bazel b/tutorial/MODULE.bazel
@@ -1,6 +1,6 @@
 bazel_dep(
     name = "platforms",
-    version = "0.0.8",
+    version = "0.0.9",
 )
 
 # rules_haskell_nix must come before rules_haskell so that nix

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ bazel_dep(`
`31`	`31`	`)`
`32`	`32`	`bazel_dep(`
`33`	`33`	`name = "rules_sh",`
`34`		`- version = "0.3.0",`
	`34`	`+ version = "0.4.0",`
`35`	`35`	`)`
`36`	`36`	`bazel_dep(`
`37`	`37`	`name = "bazel_skylib",`
Original file line number	Diff line number	Diff line change
`@@ -2136,7 +2136,7 @@ haskell_cabal_binary(`
`2136`	`2136`	`setup_deps = {setup_deps},`
`2137`	`2137`	`tools = {tools},`
`2138`	`2138`	`visibility = ["@{workspace}-exe//{name}:__pkg__"],`
`2139`		`- cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w"],`
	`2139`	`+ cabalopts = ["--ghc-option=-w", "--ghc-option=-optF=-w", "--ghc-option=-static"],`
`2140`	`2140`	`verbose = {verbose},`
`2141`	`2141`	`)`
`2142`	`2142`	`""".format(`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ bazel_dep(`
`45`	`45`	`)`
`46`	`46`	`bazel_dep(`
`47`	`47`	`name = "platforms",`
`48`		`- version = "0.0.8",`
	`48`	`+ version = "0.0.9",`
`49`	`49`	`)`
`50`	`50`	`bazel_dep(`
`51`	`51`	`name = "rules_cc",`
`@@ -210,7 +210,7 @@ go_sdk.download(`
`210`	`210`
`211`	`211`	`bazel_dep(`
`212`	`212`	`name = "gazelle",`
`213`		`- version = "0.33.0",`
	`213`	`+ version = "0.36.0",`
`214`	`214`	`)`
`215`	`215`
`216`	`216`	`go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ bazel_dep(`
`17`	`17`	`)`
`18`	`18`	`bazel_dep(`
`19`	`19`	`name = "platforms",`
`20`		`- version = "0.0.8",`
	`20`	`+ version = "0.0.9",`
`21`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`bazel_dep(`
`2`	`2`	`name = "platforms",`
`3`		`- version = "0.0.8",`
	`3`	`+ version = "0.0.9",`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`# rules_haskell_nix must come before rules_haskell so that nix`