Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
1 change: 1 addition & 0 deletions examples/arm/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 12 additions & 3 deletions haskell/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,21 @@ 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",
],
)
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,
Expand Down
1 change: 1 addition & 0 deletions non_module_dev_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def repositories(*, bzlmod):
name = "nixpkgs_config_cc",
repository = "@nixpkgs_default",
register = not bzlmod,
cc_std = "c++14",
)

nixpkgs_package(
Expand Down
1 change: 1 addition & 0 deletions rules_haskell_tests/non_module_deps_1.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ filegroup(
name = "nixpkgs_config_cc",
repository = "@nixpkgs_default",
register = not bzlmod,
cc_std = "c++14",
)

rules_haskell_asterius_toolchains(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ load(

nixpkgs_cc_configure(
name = "nixpkgs_config_cc",
cc_std = "c++14",
repository = "@rules_haskell//nixpkgs:default.nix",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ load(

nixpkgs_cc_configure(
name = "nixpkgs_config_cc",
cc_std = "c++14",
repository = "@rules_haskell//nixpkgs:default.nix",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ load(

nixpkgs_cc_configure(
name = "nixpkgs_config_cc",
cc_std = "c++14",
repository = "@rules_haskell//nixpkgs:default.nix",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ load(

nixpkgs_cc_configure(
name = "nixpkgs_config_cc",
cc_std = "c++14",
repository = "@rules_haskell//nixpkgs:default.nix",
)

Expand Down
1 change: 1 addition & 0 deletions start
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ EOF

nixpkgs_cc_configure(
repository = "@nixpkgs",
cc_std = "c++14",
)

nixpkgs_python_configure(
Expand Down
1 change: 1 addition & 0 deletions tutorial/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down
Loading