From 8a8d2b81f465bb693c676a285f1ba93b4d3a8931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 9 Dec 2024 15:35:22 +0100 Subject: [PATCH] make sure that clang-tools is in the same version across all platforms We noticed when upgrading nixpkgs in nix, that clang-format would produce different results on macOS vs Linux. This is not great behaviour especially in CI, because you cannot win. This is because llvmPackage might be in a different version. To solve this, we now always depend on the latest version. --- nix/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/tools.nix b/nix/tools.nix index c21d3987..7bcfda95 100644 --- a/nix/tools.nix +++ b/nix/tools.nix @@ -11,7 +11,7 @@ , callPackage , cargo , checkmake -, clang-tools +, llvmPackages_latest , clippy , cljfmt , cmake-format @@ -96,6 +96,7 @@ let }; in { + clang-tools = llvmPackages_latest.clang-tools; inherit actionlint alejandra @@ -106,7 +107,6 @@ in cabal-fmt cabal-gild cargo - clang-tools clippy cljfmt cmake-format