Skip to content

Commit a8a26cc

Browse files
authored
🐉 Bump LLVM to 196dca7 (#248)
Also bumps a few trivial dependencies.
1 parent 3ee8095 commit a8a26cc

File tree

9 files changed

+62
-67
lines changed

9 files changed

+62
-67
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0-pre.20240422.4
1+
8.0.0-pre.20240516.1

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ bazel_dep(name = "platforms", version = "0.0.10")
1111
bazel_dep(name = "rules_cc", version = "0.0.9")
1212

1313
# Various utility functions such as path manipulations and templating.
14-
bazel_dep(name = "bazel_skylib", version = "1.6.1")
14+
bazel_dep(name = "bazel_skylib", version = "1.7.0")
1515

1616
# Documentation. These should be dev_dependencies, but that doesn't work at the
1717
# moment. This is a bug.
18-
bazel_dep(name = "rules_java", version = "7.5.0", dev_dependency = False)
18+
bazel_dep(name = "rules_java", version = "7.6.1", dev_dependency = False)
1919
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = False)
2020

2121
# The LLVM project. We override the specific commit below.
@@ -27,15 +27,15 @@ llvm_project_overlay = use_extension(
2727
"llvm_project_overlay",
2828
)
2929
llvm_project_overlay.configure(
30-
commit = "5bde8017a1109128d011510dcf4ba79140a224fe",
30+
commit = "196dca7561b4c3865ef7d5e45c22d215619d7385",
3131
patches = [
3232
"@rules_ll//patches:mallinfo2_patch.diff",
3333
"@rules_ll//patches:rules_ll_overlay_patch.diff",
3434
"@rules_ll//patches:llvm-project-fix-zlib-includes.diff",
3535
"@rules_ll//patches:llvm-add-missing-cuda-cmath-header.diff",
3636
"@rules_ll//patches:llvm-project-bundle-with-bash.diff",
3737
],
38-
sha256 = "1627942a74a7397968cf251dde9485080ccf3d8a0de6a40340033fe6d00e3103",
38+
sha256 = "7d097fe703ca41f5458ca5809f21fdb8ca13e2e6c28b3d3de85c700e43ccc7ed",
3939
targets = [
4040
"AMDGPU",
4141
"NVPTX",

examples/.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0-pre.20240422.4
1+
8.0.0-pre.20240516.1

examples/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
bazel_dep(name = "bazel_skylib", version = "1.6.1")
1+
bazel_dep(name = "bazel_skylib", version = "1.7.0")
22
bazel_dep(name = "rules_ll", version = "0")
33
local_path_override(
44
module_name = "rules_ll",

flake.lock

Lines changed: 45 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010
follows = "nativelink/nixpkgs";
1111
};
1212
flake-utils.url = "github:numtide/flake-utils";
13-
pre-commit-hooks = {
13+
git-hooks = {
1414
url = "github:cachix/pre-commit-hooks.nix";
1515
inputs.nixpkgs.follows = "nixpkgs";
16-
inputs.flake-utils.follows = "flake-utils";
1716
};
1817
flake-parts = {
1918
url = "github:hercules-ci/flake-parts";
2019
inputs.nixpkgs-lib.follows = "nixpkgs";
2120
};
2221
nativelink = {
2322
# Note: Keep this commit in sync with the LRE commit in `ll/init.bzl`.
24-
url = "github:TraceMachina/nativelink/75105df746c626da76f74e412764e6755296a8ab";
23+
url = "github:TraceMachina/nativelink/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55";
2524

2625
# This repository provides the autogenerated LRE toolchains which are
2726
# dependent on the nixpkgs version in the nativelink repository. To keep
@@ -31,7 +30,7 @@
3130

3231
inputs.flake-utils.follows = "flake-utils";
3332
inputs.flake-parts.follows = "flake-parts";
34-
inputs.pre-commit-hooks.follows = "pre-commit-hooks";
33+
inputs.git-hooks.follows = "git-hooks";
3534
};
3635
};
3736

@@ -47,7 +46,7 @@
4746
, flake-utils
4847
, nativelink
4948
, nixpkgs
50-
, pre-commit-hooks
49+
, git-hooks
5150
, ...
5251
} @ inputs:
5352
flake-parts.lib.mkFlake { inherit inputs; }
@@ -56,7 +55,7 @@
5655
"x86_64-linux"
5756
];
5857
imports = [
59-
inputs.pre-commit-hooks.flakeModule
58+
inputs.git-hooks.flakeModule
6059
inputs.nativelink.flakeModule
6160
./flake-module.nix
6261
];

ll/init.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ def _initialize_rules_ll_impl(_):
1717
http_archive(
1818
name = "local-remote-execution",
1919
urls = [
20-
"https://github.com/TraceMachina/nativelink/archive/75105df746c626da76f74e412764e6755296a8ab.zip",
20+
"https://github.com/TraceMachina/nativelink/archive/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55.zip",
2121
],
22-
integrity = "sha256-Hh1GUUSJfW//nztQyhxsK+MpZ2okM24sJ+OJYXn89Yo=",
22+
integrity = "sha256-Mbj9ElJLpsgtESsLTOEFWNgmy3jqHBrb1IiH5PPctEs=",
2323
# Note: Keep this in sync with `flake.nix` and `devtools/up.sh`.
24-
strip_prefix = "nativelink-75105df746c626da76f74e412764e6755296a8ab/local-remote-execution",
24+
strip_prefix = "nativelink-c42fd0d9f93b5f41f2df6d23d529ce40d1568c55/local-remote-execution",
2525
)
2626

2727
http_archive(

templates/default/.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0-pre.20240422.4
1+
8.0.0-pre.20240516.1

templates/default/flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
inputs.flake-utils.follows = "flake-utils";
2727
};
2828
nativelink = {
29-
# Note: Keep this commit in sync with the LRE commit in `MODULE.bazel`.
30-
url = "github:TraceMachina/nativelink/75105df746c626da76f74e412764e6755296a8ab";
29+
url = "github:TraceMachina/nativelink/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55";
3130

3231
# This repository provides the autogenerated LRE toolchains which are
3332
# dependent on the nixpkgs version in the nativelink repository. To keep

0 commit comments

Comments
 (0)