@@ -32,7 +32,7 @@ let
3232 '';
3333 in {
3434
35− llvm = callPackage ./llvm.nix { };
35+ llvm = callPackage ./llvm { };
3636
3737 clang-unwrapped = callPackage ./clang {
3838 inherit (tools) lld;
@@ -80,11 +80,11 @@ let
8080 extraBuildCommands = mkExtraBuildCommands cc;
8181 };
8282
83− lld = callPackage ./lld.nix {
83+ lld = callPackage ./lld {
8484 libunwind = libraries.libunwind;
8585 };
8686
87− lldb = callPackage ./lldb.nix {
87+ lldb = callPackage ./lldb {
8888 inherit (darwin) libobjc bootstrap_cmds;
8989 inherit (darwin.apple_sdk.libs) xpc;
9090 inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
@@ -172,7 +172,7 @@ let
172172 callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
173173 in {
174174
175− compiler-rt = callPackage ./compiler-rt.nix ({} //
175+ compiler-rt = callPackage ./compiler-rt ({} //
176176 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
177177 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
178178 }));
@@ -186,7 +186,7 @@ let
186186 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
187187 }));
188188
189− libcxxabi = callPackage ./libc++abi.nix ({} //
189+ libcxxabi = callPackage ./libc++abi ({} //
190190 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
191191 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
192192 libunwind = libraries.libunwind;
@@ -194,7 +194,7 @@ let
194194
195195 openmp = callPackage ./openmp.nix {};
196196
197− libunwind = callPackage ./libunwind.nix ({} //
197+ libunwind = callPackage ./libunwind ({} //
198198 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
199199 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
200200 }));