diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 385a315f9c87..3cf47e5a7334 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -261,7 +261,6 @@ let inherit (prevStage."llvmPackages_${llvmVersion}") compiler-rt libcxx; }; llvmLibrariesDarwinDepsNoCC = prevStage: { inherit (prevStage.darwin) libcxx; }; - llvmLibrariesDeps = _: { }; llvmToolsPackages = prevStage: { inherit (prevStage."llvmPackages_${llvmVersion}") @@ -666,7 +665,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isBuiltByBootstrapFilesCompiler [ (stage1Packages prevStage) (darwinPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkDarwinPackages prevStage) @@ -739,7 +737,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ]; assert allDeps isBuiltByNixpkgsCompiler [ - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) ]; @@ -757,7 +754,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (stage1Packages prevStage) (disallowedPackages prevStage) (bintoolsPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) { inherit (prevStage) ccWrapperStdenv; @@ -818,7 +814,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ]; assert allDeps isBuiltByNixpkgsCompiler [ - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (sdkPackages prevStage) (sdkDarwinPackages prevStage) @@ -837,7 +832,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check mergeDisjointAttrs [ (stage1Packages prevStage) (disallowedPackages prevStage) - (llvmLibrariesDeps prevStage) (sdkPackages prevStage) { inherit (prevStage) ccWrapperStdenv; @@ -894,7 +888,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check assert allDeps isBuiltByNixpkgsCompiler [ (bintoolsPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (llvmToolsDeps prevStage) (llvmToolsPackages prevStage) @@ -915,7 +908,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check mergeDisjointAttrs [ (bintoolsPackages prevStage) (disallowedPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkPackagesNoCC prevStage) @@ -965,7 +957,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (lib.filterAttrs (_: pkg: lib.getName pkg != "pkg-config-wrapper") (stage1Packages prevStage)) # pkg-config is a wrapper (bintoolsPackages prevStage) (darwinPackages prevStage) - (llvmLibrariesDeps prevStage) (llvmLibrariesPackages prevStage) (llvmToolsDeps prevStage) (llvmToolsPackages prevStage) @@ -1099,7 +1090,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check overrides = self: super: mergeDisjointAttrs [ - (llvmLibrariesDeps prevStage) (llvmToolsDeps prevStage) (sdkPackages prevStage) (sdkPackagesNoCC prevStage)