🐉 Bump LLVM to 196dca7 (#248)

Also bumps a few trivial dependencies.
eomii · May 31, 2024 · a8a26cc · a8a26cc
1 parent 3ee8095
commit a8a26cc
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 67 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-8.0.0-pre.20240422.4
+8.0.0-pre.20240516.1
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -11,11 +11,11 @@ bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 
 # Various utility functions such as path manipulations and templating.
-bazel_dep(name = "bazel_skylib", version = "1.6.1")
+bazel_dep(name = "bazel_skylib", version = "1.7.0")
 
 # Documentation. These should be dev_dependencies, but that doesn't work at the
 # moment. This is a bug.
-bazel_dep(name = "rules_java", version = "7.5.0", dev_dependency = False)
+bazel_dep(name = "rules_java", version = "7.6.1", dev_dependency = False)
 bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = False)
 
 # The LLVM project. We override the specific commit below.
@@ -27,15 +27,15 @@ llvm_project_overlay = use_extension(
     "llvm_project_overlay",
 )
 llvm_project_overlay.configure(
-    commit = "5bde8017a1109128d011510dcf4ba79140a224fe",
+    commit = "196dca7561b4c3865ef7d5e45c22d215619d7385",
     patches = [
         "@rules_ll//patches:mallinfo2_patch.diff",
         "@rules_ll//patches:rules_ll_overlay_patch.diff",
         "@rules_ll//patches:llvm-project-fix-zlib-includes.diff",
         "@rules_ll//patches:llvm-add-missing-cuda-cmath-header.diff",
         "@rules_ll//patches:llvm-project-bundle-with-bash.diff",
     ],
-    sha256 = "1627942a74a7397968cf251dde9485080ccf3d8a0de6a40340033fe6d00e3103",
+    sha256 = "7d097fe703ca41f5458ca5809f21fdb8ca13e2e6c28b3d3de85c700e43ccc7ed",
     targets = [
         "AMDGPU",
         "NVPTX",

diff --git a/examples/.bazelversion b/examples/.bazelversion
@@ -1 +1 @@
-8.0.0-pre.20240422.4
+8.0.0-pre.20240516.1
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -1,4 +1,4 @@
-bazel_dep(name = "bazel_skylib", version = "1.6.1")
+bazel_dep(name = "bazel_skylib", version = "1.7.0")
 bazel_dep(name = "rules_ll", version = "0")
 local_path_override(
     module_name = "rules_ll",

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,18 +10,17 @@
       follows = "nativelink/nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
-    pre-commit-hooks = {
+    git-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     nativelink = {
       # Note: Keep this commit in sync with the LRE commit in `ll/init.bzl`.
-      url = "github:TraceMachina/nativelink/75105df746c626da76f74e412764e6755296a8ab";
+      url = "github:TraceMachina/nativelink/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55";
 
       # This repository provides the autogenerated LRE toolchains which are
       # dependent on the nixpkgs version in the nativelink repository. To keep
@@ -31,7 +30,7 @@
 
       inputs.flake-utils.follows = "flake-utils";
       inputs.flake-parts.follows = "flake-parts";
-      inputs.pre-commit-hooks.follows = "pre-commit-hooks";
+      inputs.git-hooks.follows = "git-hooks";
     };
   };
 
@@ -47,7 +46,7 @@
     , flake-utils
     , nativelink
     , nixpkgs
-    , pre-commit-hooks
+    , git-hooks
     , ...
     } @ inputs:
     flake-parts.lib.mkFlake { inherit inputs; }
@@ -56,7 +55,7 @@
           "x86_64-linux"
         ];
         imports = [
-          inputs.pre-commit-hooks.flakeModule
+          inputs.git-hooks.flakeModule
           inputs.nativelink.flakeModule
           ./flake-module.nix
         ];

diff --git a/ll/init.bzl b/ll/init.bzl
@@ -17,11 +17,11 @@ def _initialize_rules_ll_impl(_):
     http_archive(
         name = "local-remote-execution",
         urls = [
-            "https://github.com/TraceMachina/nativelink/archive/75105df746c626da76f74e412764e6755296a8ab.zip",
+            "https://github.com/TraceMachina/nativelink/archive/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55.zip",
         ],
-        integrity = "sha256-Hh1GUUSJfW//nztQyhxsK+MpZ2okM24sJ+OJYXn89Yo=",
+        integrity = "sha256-Mbj9ElJLpsgtESsLTOEFWNgmy3jqHBrb1IiH5PPctEs=",
         # Note: Keep this in sync with `flake.nix` and `devtools/up.sh`.
-        strip_prefix = "nativelink-75105df746c626da76f74e412764e6755296a8ab/local-remote-execution",
+        strip_prefix = "nativelink-c42fd0d9f93b5f41f2df6d23d529ce40d1568c55/local-remote-execution",
     )
 
     http_archive(

diff --git a/templates/default/.bazelversion b/templates/default/.bazelversion
@@ -1 +1 @@
-8.0.0-pre.20240422.4
+8.0.0-pre.20240516.1
diff --git a/templates/default/flake.nix b/templates/default/flake.nix
@@ -26,8 +26,7 @@
       inputs.flake-utils.follows = "flake-utils";
     };
     nativelink = {
-      # Note: Keep this commit in sync with the LRE commit in `MODULE.bazel`.
-      url = "github:TraceMachina/nativelink/75105df746c626da76f74e412764e6755296a8ab";
+      url = "github:TraceMachina/nativelink/c42fd0d9f93b5f41f2df6d23d529ce40d1568c55";
 
       # This repository provides the autogenerated LRE toolchains which are
       # dependent on the nixpkgs version in the nativelink repository. To keep