Merge branch 'master' into fix-test-ghc-patches

Author: mergify[bot]

.bazelrc.bzlmod

@@ -3,4 +3,5 @@ common --noenable_bzlmod
 
 common:bzlmod --enable_bzlmod
 # Note, have to use /// to make Bazel not crash on Windows
-common --registry=file:///%workspace%/registry --registry=https://bcr.bazel.build
+common:common --registry=file:///%workspace%/registry --registry=https://bcr.bazel.build
+

.bazelrc.common

@@ -3,6 +3,9 @@
 # Global Configuration
 # --------------------
 
+# enable common config by default (needed for renovate to ignore the file: registry)
+common --config common
+
 # Force TLS 1.2. With TLS 1.3, we run into the following error on Darwin.
 # > No subject alternative DNS name matching github-releases.githubusercontent.com found.
 # It looks like this is a result of SNI being broken on TLS 1.3 which results

MODULE.bazel

@@ -119,27 +119,27 @@ use_repo(npm, "rules_haskell_npm")
 #### Development dependencies ####
 bazel_dep(
     name = "rules_nixpkgs_core",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_cc",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_python",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_go",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_posix",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 bazel_dep(
@@ -150,7 +150,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_nixpkgs_nodejs",
-    version = "0.9.0",
+    version = "0.10.0",
     dev_dependency = True,
 )
 

examples/.bazelrc.bzlmod

@@ -1,2 +1,2 @@
 common:bzlmod --enable_bzlmod
-common --registry=file://%workspace%/../registry --registry=https://bcr.bazel.build
+common:common --registry=file://%workspace%/../registry --registry=https://bcr.bazel.build

examples/MODULE.bazel

@@ -5,7 +5,7 @@ module(
 
 bazel_dep(
     name = "rules_nixpkgs_core",
-    version = "0.9.0",
+    version = "0.10.0",
 )
 bazel_dep(
     name = "rules_haskell_nix",

haskell/repositories.bzl

@@ -9,8 +9,8 @@ load(
 )
 load(":private/ghc_ci.bzl", "ghc_default_version")
 
-_rules_nixpkgs_version = "7e627d76ba65d6c42586fc265e46bd370672b4eb"
-_rules_nixpkgs_sha256 = "714a0bec45d23bfc23604de5d292a68f6e12272b303fb7bf33567d2878f52612"
+_rules_nixpkgs_version = "0.10.0"
+_rules_nixpkgs_sha256 = "980edfceef2e59e1122d9be6c52413bc298435f0a3d452532b8a48d7562ffd67"
 
 _rules_sh_version = "v0.3.0"
 _rules_sh_sha256 = "d668bb32f112ead69c58bde2cae62f6b8acefe759a8c95a2d80ff6a85af5ac5e"
@@ -77,12 +77,18 @@ def rules_haskell_dependencies():
         #
         # See https://github.com/tweag/rules_nixpkgs/issues/182 for the rational
 
-        strip_prefix = "rules_nixpkgs-%s" % _rules_nixpkgs_version.lstrip("v")
+        strip_prefix = "rules_nixpkgs-%s" % _rules_nixpkgs_version
+
+        rules_nixpkgs_url = \
+            "https://github.com/tweag/rules_nixpkgs/releases/download/v{version}/{prefix}.tar.gz".format(
+                version = _rules_nixpkgs_version,
+                prefix = strip_prefix,
+            )
 
         http_archive(
             name = "io_tweag_rules_nixpkgs",
             strip_prefix = strip_prefix,
-            urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
+            urls = [rules_nixpkgs_url],
             sha256 = _rules_nixpkgs_sha256,
         )
 
@@ -96,15 +102,15 @@ def rules_haskell_dependencies():
         http_archive(
             name = "rules_nixpkgs_core",
             strip_prefix = strip_prefix + "/core",
-            urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
+            urls = [rules_nixpkgs_url],
             sha256 = _rules_nixpkgs_sha256,
         )
 
         for toolchain in ["cc", "java", "python", "go", "rust", "posix", "nodejs"]:
             http_archive(
                 name = "rules_nixpkgs_" + toolchain,
                 strip_prefix = strip_prefix + "/toolchains/" + toolchain,
-                urls = ["https://github.com/tweag/rules_nixpkgs/archive/%s.tar.gz" % _rules_nixpkgs_version],
+                urls = [rules_nixpkgs_url],
                 sha256 = _rules_nixpkgs_sha256,
             )
 

registry/modules/rules_nixpkgs_cc/0.9.0/MODULE.bazel renamed to registry/modules/rules_nixpkgs_cc/0.10.0/MODULE.bazel

@@ -1,8 +1,8 @@
 module(
     name = "rules_nixpkgs_cc",
-    version = "0.9.0",
+    version = "0.10.0",
 )
 
-bazel_dep(name = "rules_nixpkgs_core", version = "0.9.0")
+bazel_dep(name = "rules_nixpkgs_core", version = "0.10.0")
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
 bazel_dep(name = "rules_cc", version = "0.0.1")

registry/modules/rules_nixpkgs_cc/0.10.0/source.json

@@ -0,0 +1,5 @@
+{
+    "integrity": "sha256-mA7fzu8uWeESLZvmxSQTvCmENfCj1FJTK4pI11Yv/Wc=",
+    "strip_prefix": "rules_nixpkgs-0.10.0/toolchains/cc",
+    "url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"
+}

registry/modules/rules_nixpkgs_cc/0.9.0/source.json

@@ -12,6 +12,6 @@
       "name": "Andreas Herrmann"
     }
   ],
-  "versions": ["0.9.0"],
+  "versions": ["0.10.0"],
   "yanked_versions": []
 }