Merge pull request #333146 from ExpidusOS/feat/llvm-clean (7248a7fd) · Commits · mdf / nixpkgs

pkgs/development/compilers/llvm/common/default.nix

+1 −3

Original line number	Diff line number	Diff line
		@@ -89,9 +89,7 @@ let
		}
		);
		in
		{
		llef = callPackage ./lldb-plugins/llef.nix { };
		}
		lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
		);

		tools = lib.makeExtensible (

+23 −20

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		stdenv,
		gcc12Stdenv,
		pkgs,
		recurseIntoAttrs,
		# This is the default binutils, but with this version of LLD rather
		# than the default LLVM version's, if LLD is the choice. We use these for
		# the `useLLVM` bootstrapping below.
		@@ -51,6 +52,7 @@ let
		args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
		in
		lib.nameValuePair attrName (
		recurseIntoAttrs (
		callPackage ./common {
		inherit (stdenvAdapters) overrideCC;
		buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools;
		@@ -70,8 +72,9 @@ let
		version
		;
		}
		)
		);

		llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions;
		in
		llvmPackages
		llvmPackages // { inherit mkPackage; }

+1 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,7 @@ mapAliases ({
		linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
		linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";

		llvmPackages_git = (recurseIntoAttrs (callPackages ../development/compilers/llvm { })).git;
		llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;

		lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08
		lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19