Skip to content

Commit fc17a8c

Browse files
Use bazel_7
1 parent 649799b commit fc17a8c

3 files changed

Lines changed: 1 addition & 10 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,7 @@ jobs:
9797
run: |
9898
mkdir -p ~/repo-cache ~/disk-cache
9999
echo common --repo_env=BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 > .bazelrc.local
100-
echo common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 >> .bazelrc.local
101-
echo common --incompatible_enable_cc_toolchain_resolution >> .bazelrc.local
102100
echo common --toolchain_resolution_debug=cc >> .bazelrc.local
103-
echo build --crosstool_top=@nixpkgs_config_cc//:toolchain >> .bazelrc.local
104101
105102
- name: Clean stack caches
106103
run: rm -rf ~/.stack

WORKSPACE

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,9 @@ nixpkgs_local_repository(
4848
load(
4949
"@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",
5050
"nixpkgs_package",
51-
"nixpkgs_cc_configure",
5251
"nixpkgs_python_configure",
5352
)
5453

55-
nixpkgs_cc_configure(
56-
name = "nixpkgs_config_cc",
57-
repository = "@rules_haskell//nixpkgs:default.nix",
58-
)
59-
6054
nixpkgs_python_configure(repository = "@nixpkgs")
6155

6256
load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mkShell {
1313
LANG="C.UTF-8";
1414

1515
buildInputs = [
16-
bazel_6
16+
bazel_7
1717
git
1818
gnused
1919
nix

0 commit comments

Comments
 (0)