From 745b00b9fc4a41834cfbfd9e9e17b99d55b6963a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:50:08 +0000 Subject: [PATCH 1/5] chore(deps): update dependency rules_cc to v0.2.0 --- examples/MODULE.bazel | 2 +- haskell/repositories.bzl | 6 +++--- rules_haskell_tests/MODULE.bazel | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index 274651e91..888039eab 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -27,7 +27,7 @@ bazel_dep( bazel_dep( name = "rules_cc", - version = "0.0.9", + version = "0.2.0", ) bazel_dep( name = "rules_sh", diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index cbae1b0a4..ee3fd8d23 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -50,9 +50,9 @@ def rules_haskell_dependencies(): maybe( http_archive, name = "rules_cc", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"], - sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf", - strip_prefix = "rules_cc-0.0.9", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.2.0/rules_cc-0.2.0.tar.gz"], + sha256 = "ae244f400218f4a12ee81658ff246c0be5cb02c5ca2de5519ed505a6795431e9", + strip_prefix = "rules_cc-0.2.0", ) maybe( diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel index 4d683634d..4cce6cfb5 100644 --- a/rules_haskell_tests/MODULE.bazel +++ b/rules_haskell_tests/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( ) bazel_dep( name = "rules_cc", - version = "0.0.9", + version = "0.2.0", ) bazel_dep( name = "rules_sh", From 4a480417b1da9bdff226a6348e45b14d54ea4793 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 14 Aug 2025 13:31:13 +0200 Subject: [PATCH 2/5] Add rules_cc workspace setup code --- WORKSPACE | 10 ++++++++++ examples/WORKSPACE | 10 ++++++++++ examples/arm/WORKSPACE | 10 ++++++++++ rules_haskell_tests/WORKSPACE | 10 ++++++++++ tutorial/WORKSPACE | 10 ++++++++++ 5 files changed, 50 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index b7168fd60..55dd5ed0b 100755 --- a/WORKSPACE +++ b/WORKSPACE @@ -9,6 +9,16 @@ load("//haskell:repositories.bzl", "rules_haskell_dependencies") rules_haskell_dependencies() +load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") + +rules_cc_dependencies() + +rules_cc_toolchains() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( diff --git a/examples/WORKSPACE b/examples/WORKSPACE index ef867b014..2db451247 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -14,6 +14,16 @@ load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") rules_haskell_dependencies() +load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") + +rules_cc_dependencies() + +rules_cc_toolchains() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs") GHC_VERSION = "9.4.8" diff --git a/examples/arm/WORKSPACE b/examples/arm/WORKSPACE index 935604acf..185ef29be 100644 --- a/examples/arm/WORKSPACE +++ b/examples/arm/WORKSPACE @@ -16,6 +16,16 @@ load( rules_haskell_dependencies() +load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") + +rules_cc_dependencies() + +rules_cc_toolchains() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + load( "@rules_haskell//haskell:cabal.bzl", "stack_snapshot", diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE index d0a737e51..7ff455101 100644 --- a/rules_haskell_tests/WORKSPACE +++ b/rules_haskell_tests/WORKSPACE @@ -14,6 +14,16 @@ load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") rules_haskell_dependencies() +load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") + +rules_cc_dependencies() + +rules_cc_toolchains() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + load("//:non_module_deps.bzl", "repositories") repositories(bzlmod = False) diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE index 00e9b43fb..bc4d51538 100644 --- a/tutorial/WORKSPACE +++ b/tutorial/WORKSPACE @@ -9,6 +9,16 @@ load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") rules_haskell_dependencies() +load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") + +rules_cc_dependencies() + +rules_cc_toolchains() + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs") GHC_VERSION = "9.4.8" From e0fee9c504bdb9e89e72add6c3d1886faecb38cc Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 14 Aug 2025 13:43:41 +0200 Subject: [PATCH 3/5] Add bazel_features Seems like rules_cc fails to define it in `rules_cc_dependencies`. --- haskell/repositories.bzl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index ee3fd8d23..74993cc55 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -47,6 +47,14 @@ def rules_haskell_dependencies(): sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", ) + maybe( + http_archive, + name = "bazel_features", + sha256 = "bdc12fcbe6076180d835c9dd5b3685d509966191760a0eb10b276025fcb76158", + strip_prefix = "bazel_features-1.17.0", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.17.0/bazel_features-v1.17.0.tar.gz", + ) + maybe( http_archive, name = "rules_cc", From 5730a9016a8743ebb0af18d11f48ae4dbf7dc5fa Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 14 Aug 2025 13:53:57 +0200 Subject: [PATCH 4/5] Initialize bazel_features --- WORKSPACE | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 55dd5ed0b..2fb675b0d 100755 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,6 +15,10 @@ rules_cc_dependencies() rules_cc_toolchains() +load("@bazel_features//:deps.bzl", "bazel_features_deps") + +bazel_features_deps() + load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") compatibility_proxy_repo() From 373201be8978e3f29222207c77584e85b6361db4 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 14 Aug 2025 14:20:42 +0200 Subject: [PATCH 5/5] Define `host_platform` repository --- WORKSPACE | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 2fb675b0d..5600dbad9 100755 --- a/WORKSPACE +++ b/WORKSPACE @@ -9,6 +9,10 @@ load("//haskell:repositories.bzl", "rules_haskell_dependencies") rules_haskell_dependencies() +load("@platforms//host:extension.bzl", "host_platform_repo") + +host_platform_repo(name = "host_platform") + load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") rules_cc_dependencies()