From a8a26cc78c43896b179caaa263857bd6c88a1da9 Mon Sep 17 00:00:00 2001 From: Aaron Siddhartha Mondal Date: Fri, 31 May 2024 15:09:05 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=89=20Bump=20LLVM=20to=20196dca7=20(#2?= =?UTF-8?q?48)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also bumps a few trivial dependencies. --- .bazelversion | 2 +- MODULE.bazel | 8 +-- examples/.bazelversion | 2 +- examples/MODULE.bazel | 2 +- flake.lock | 93 ++++++++++++++++----------------- flake.nix | 11 ++-- ll/init.bzl | 6 +-- templates/default/.bazelversion | 2 +- templates/default/flake.nix | 3 +- 9 files changed, 62 insertions(+), 67 deletions(-) diff --git a/.bazelversion b/.bazelversion index 461b0de..949d73f 100644 --- 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 index 25a7af1..596af6c 100644 --- 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,7 +27,7 @@ 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", @@ -35,7 +35,7 @@ llvm_project_overlay.configure( "@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 index 461b0de..949d73f 100644 --- 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 index d2a6c71..92336e2 100644 --- 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 index 1fd36f1..4d3ace5 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -75,10 +75,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -105,25 +128,25 @@ "flake-utils": [ "flake-utils" ], + "git-hooks": [ + "git-hooks" + ], "nix2container": "nix2container", "nixpkgs": "nixpkgs", - "pre-commit-hooks": [ - "pre-commit-hooks" - ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715873512, - "narHash": "sha256-8KFyIwvfiiB3Bw5ti/KIG4d0TE2sG7PZmnQBqEzSgOw=", + "lastModified": 1717158304, + "narHash": "sha256-jEWVdMPaINgwrVotYTBfLus3tinbwNNo4v9rfqM5z80=", "owner": "TraceMachina", "repo": "nativelink", - "rev": "75105df746c626da76f74e412764e6755296a8ab", + "rev": "c42fd0d9f93b5f41f2df6d23d529ce40d1568c55", "type": "github" }, "original": { "owner": "TraceMachina", "repo": "nativelink", - "rev": "75105df746c626da76f74e412764e6755296a8ab", + "rev": "c42fd0d9f93b5f41f2df6d23d529ce40d1568c55", "type": "github" } }, @@ -154,11 +177,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -184,42 +207,16 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "git-hooks": "git-hooks", "nativelink": "nativelink", "nixpkgs": [ "nativelink", "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" + ] } }, "rust-overlay": { @@ -234,11 +231,11 @@ ] }, "locked": { - "lastModified": 1715393623, - "narHash": "sha256-nSUFcUqyTQQ/aYFIB05mpCzytcKvfKMy3ZQAe0fP26A=", + "lastModified": 1717035469, + "narHash": "sha256-MzH+yjKULH3HCRj9QCTwBvqq4LZkR0ZqRE/QfGOGC2E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8eb8671512cb0c72c748058506e50c54fb5d8e2b", + "rev": "095702e63a40e86f339d11864da9dc965b70a01e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 59f5cc8..4d581b1 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,9 @@ 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"; @@ -21,7 +20,7 @@ }; 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 index b766a41..6ca263c 100644 --- 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 index 461b0de..949d73f 100644 --- 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 index 1efec58..344750d 100644 --- 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