From a427304e6bb464e5c194965171e39cfb114f2edb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 07:49:49 +0000 Subject: [PATCH 1/3] chore(deps): update dependency com_google_protobuf to v28 --- haskell/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index 018585342..81fde7556 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -121,10 +121,10 @@ def rules_haskell_dependencies(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de", - strip_prefix = "protobuf-21.12", + sha256 = "13e7749c30bc24af6ee93e092422f9dc08491c7097efa69461f88eb5f61805ce", + strip_prefix = "protobuf-28.0", urls = [ - "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.0.tar.gz", ], ) From 455129d397d67a77794d758f1460e8ff4f155190 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 2 Sep 2024 10:02:15 +0200 Subject: [PATCH 2/3] Specify C++14 standard for nixpkgs cc toolchain --- examples/WORKSPACE | 1 + examples/arm/WORKSPACE | 1 + non_module_dev_deps.bzl | 1 + rules_haskell_tests/non_module_deps_1.bzl | 1 + rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE | 1 + .../repl/haskell_module_repl_cross_library_deps_test/WORKSPACE | 1 + .../tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE | 1 + .../tests/repl-targets/hs_bin_repl_test/WORKSPACE | 1 + .../tests/repl-targets/hs_lib_repl_test/WORKSPACE | 1 + .../tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE | 1 + start | 1 + tutorial/WORKSPACE | 1 + 12 files changed, 12 insertions(+) diff --git a/examples/WORKSPACE b/examples/WORKSPACE index 68e54689b..95cfdabcf 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -32,6 +32,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure") nixpkgs_cc_configure( # Don't override the default cc toolchain needed for bindist mode. name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/examples/arm/WORKSPACE b/examples/arm/WORKSPACE index 935604acf..9cb4246b1 100644 --- a/examples/arm/WORKSPACE +++ b/examples/arm/WORKSPACE @@ -57,6 +57,7 @@ nixpkgs_cc_configure( nixpkgs_cc_configure( name = "nixpkgs_config_cc_arm", attribute_path = "cc-aarch64", + cc_std = "c++14", exec_constraints = [ "@platforms//cpu:x86_64", "@platforms//os:linux", diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl index 44f5cd1ff..aa127d1e4 100644 --- a/non_module_dev_deps.bzl +++ b/non_module_dev_deps.bzl @@ -103,6 +103,7 @@ def repositories(*, bzlmod): name = "nixpkgs_config_cc", repository = "@nixpkgs_default", register = not bzlmod, + cc_std = "c++14", ) nixpkgs_package( diff --git a/rules_haskell_tests/non_module_deps_1.bzl b/rules_haskell_tests/non_module_deps_1.bzl index 8f83ee0d0..fbdb0bb72 100644 --- a/rules_haskell_tests/non_module_deps_1.bzl +++ b/rules_haskell_tests/non_module_deps_1.bzl @@ -89,6 +89,7 @@ filegroup( name = "nixpkgs_config_cc", repository = "@nixpkgs_default", register = not bzlmod, + cc_std = "c++14", ) rules_haskell_asterius_toolchains( diff --git a/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE b/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE index fdb1600ae..2cb5a4ea1 100644 --- a/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE +++ b/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE @@ -28,6 +28,7 @@ load( nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE index ef39657ea..68e827a72 100644 --- a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE +++ b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE @@ -33,6 +33,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure") nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE index 2732ad060..bd47beec9 100644 --- a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE +++ b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE @@ -33,6 +33,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure") nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE index f1e11041e..28d9633cd 100644 --- a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE +++ b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE @@ -27,6 +27,7 @@ load( nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE index 04153e6a2..22a762e32 100644 --- a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE +++ b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE @@ -36,6 +36,7 @@ load( nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE index 88c98d20f..4ff6e4f5a 100644 --- a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE +++ b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE @@ -27,6 +27,7 @@ load( nixpkgs_cc_configure( name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) diff --git a/start b/start index e56ae1224..1634bec38 100755 --- a/start +++ b/start @@ -333,6 +333,7 @@ EOF nixpkgs_cc_configure( repository = "@nixpkgs", + cc_std = "c++14", ) nixpkgs_python_configure( diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE index 52789c30d..24feed73b 100644 --- a/tutorial/WORKSPACE +++ b/tutorial/WORKSPACE @@ -30,6 +30,7 @@ load( nixpkgs_cc_configure( # Don't override the default cc toolchain needed for bindist mode. name = "nixpkgs_config_cc", + cc_std = "c++14", repository = "@rules_haskell//nixpkgs:default.nix", ) From 2ec4f214c99e0e63ad6bf3f92be489de0308b6f1 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 14 May 2024 07:49:10 +0200 Subject: [PATCH 3/3] Add `com_google_absl` to dependencies It is needed by com_google_protobuf. --- haskell/repositories.bzl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/haskell/repositories.bzl b/haskell/repositories.bzl index 81fde7556..4fc03a56e 100644 --- a/haskell/repositories.bzl +++ b/haskell/repositories.bzl @@ -127,6 +127,15 @@ def rules_haskell_dependencies(): "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.0.tar.gz", ], ) + maybe( + http_archive, + name = "com_google_absl", + urls = [ + "https://github.com/abseil/abseil-cpp/releases/download/20240116.0/abseil-cpp-20240116.0.tar.gz", + ], + sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", + strip_prefix = "abseil-cpp-20240116.0", + ) maybe( http_archive,