Merge pull request #269615 from NixOS/backport-268168-to-release-23.11 (fa2be23f) · Commits · nix / nixpkgs

lib/systems/default.nix

+92 −92

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ rec {
		else args';

		# TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
		rust = assert !(args ? rust && args ? rustc); args.rust or args.rustc or {};
		rust = args.rust or args.rustc or {};

		final = {
		# Prefer to parse `config` as it is strictly more informative.
		@@ -169,96 +169,6 @@ rec {
		# TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs.
		rustc = args.rustc or {};

		rust = rust // {
		# Once args.rustc.platform.target-family is deprecated and
		# removed, there will no longer be any need to modify any
		# values from args.rust.platform, so we can drop all the
		# "args ? rust" etc. checks, and merge args.rust.platform in
		# /after/.
		platform = rust.platform or {} // {
		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
		arch =
		/**/ if rust ? platform then rust.platform.arch
		else if final.isAarch32 then "arm"
		else if final.isMips64 then "mips64" # never add "el" suffix
		else if final.isPower64 then "powerpc64" # never add "le" suffix
		else final.parsed.cpu.name;

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
		os =
		/**/ if rust ? platform then rust.platform.os or "none"
		else if final.isDarwin then "macos"
		else final.parsed.kernel.name;

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
		target-family =
		/**/ if args ? rust.platform.target-family then args.rust.platform.target-family
		else if args ? rustc.platform.target-family
		then
		(
		# Since https://github.com/rust-lang/rust/pull/84072
		# `target-family` is a list instead of single value.
		let
		f = args.rustc.platform.target-family;
		in
		if builtins.isList f then f else [ f ]
		)
		else lib.optional final.isUnix "unix"
		++ lib.optional final.isWindows "windows";

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor
		vendor = let
		inherit (final.parsed) vendor;
		in rust.platform.vendor or {
		"w64" = "pc";
		}.${vendor.name} or vendor.name;
		};

		# The name of the rust target, even if it is custom. Adjustments are
		# because rust has slightly different naming conventions than we do.
		rustcTarget = let
		inherit (final.parsed) cpu kernel abi;
		cpu_ = rust.platform.arch or {
		"armv7a" = "armv7";
		"armv7l" = "armv7";
		"armv6l" = "arm";
		"armv5tel" = "armv5te";
		"riscv64" = "riscv64gc";
		}.${cpu.name} or cpu.name;
		vendor_ = final.rust.platform.vendor;
		in rust.config
		or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";

		# The name of the rust target if it is standard, or the json file
		# containing the custom target spec.
		rustcTargetSpec =
		/**/ if rust ? platform
		then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform)
		else final.rust.rustcTarget;

		# The name of the rust target if it is standard, or the
		# basename of the file containing the custom target spec,
		# without the .json extension.
		#
		# This is the name used by Cargo for target subdirectories.
		cargoShortTarget =
		lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}");

		# When used as part of an environment variable name, triples are
		# uppercased and have all hyphens replaced by underscores:
		#
		# https://github.com/rust-lang/cargo/pull/9169
		# https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
		cargoEnvVarTarget =
		lib.strings.replaceStrings ["-"] ["_"]
		(lib.strings.toUpper final.rust.cargoShortTarget);

		# True if the target is no_std
		# https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
		isNoStdTarget =
		builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"];
		};

		linuxArch =
		if final.isAarch32 then "arm"
		else if final.isAarch64 then "arm64"
		@@ -356,7 +266,97 @@ rec {

		}) // mapAttrs (n: v: v final.parsed) inspect.predicates
		// mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates
		// args;
		// args // {
		rust = rust // {
		# Once args.rustc.platform.target-family is deprecated and
		# removed, there will no longer be any need to modify any
		# values from args.rust.platform, so we can drop all the
		# "args ? rust" etc. checks, and merge args.rust.platform in
		# /after/.
		platform = rust.platform or {} // {
		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
		arch =
		/**/ if rust ? platform then rust.platform.arch
		else if final.isAarch32 then "arm"
		else if final.isMips64 then "mips64" # never add "el" suffix
		else if final.isPower64 then "powerpc64" # never add "le" suffix
		else final.parsed.cpu.name;

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
		os =
		/**/ if rust ? platform then rust.platform.os or "none"
		else if final.isDarwin then "macos"
		else final.parsed.kernel.name;

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
		target-family =
		/**/ if args ? rust.platform.target-family then args.rust.platform.target-family
		else if args ? rustc.platform.target-family
		then
		(
		# Since https://github.com/rust-lang/rust/pull/84072
		# `target-family` is a list instead of single value.
		let
		f = args.rustc.platform.target-family;
		in
		if builtins.isList f then f else [ f ]
		)
		else lib.optional final.isUnix "unix"
		++ lib.optional final.isWindows "windows";

		# https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor
		vendor = let
		inherit (final.parsed) vendor;
		in rust.platform.vendor or {
		"w64" = "pc";
		}.${vendor.name} or vendor.name;
		};

		# The name of the rust target, even if it is custom. Adjustments are
		# because rust has slightly different naming conventions than we do.
		rustcTarget = let
		inherit (final.parsed) cpu kernel abi;
		cpu_ = rust.platform.arch or {
		"armv7a" = "armv7";
		"armv7l" = "armv7";
		"armv6l" = "arm";
		"armv5tel" = "armv5te";
		"riscv64" = "riscv64gc";
		}.${cpu.name} or cpu.name;
		vendor_ = final.rust.platform.vendor;
		in rust.config
		or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";

		# The name of the rust target if it is standard, or the json file
		# containing the custom target spec.
		rustcTargetSpec = rust.rustcTargetSpec or (
		/**/ if rust ? platform
		then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform)
		else final.rust.rustcTarget);

		# The name of the rust target if it is standard, or the
		# basename of the file containing the custom target spec,
		# without the .json extension.
		#
		# This is the name used by Cargo for target subdirectories.
		cargoShortTarget =
		lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}");

		# When used as part of an environment variable name, triples are
		# uppercased and have all hyphens replaced by underscores:
		#
		# https://github.com/rust-lang/cargo/pull/9169
		# https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
		cargoEnvVarTarget =
		lib.strings.replaceStrings ["-"] ["_"]
		(lib.strings.toUpper final.rust.cargoShortTarget);

		# True if the target is no_std
		# https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
		isNoStdTarget =
		builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"];
		};
		};
		in assert final.useAndroidPrebuilt -> final.isAndroid;
		assert lib.foldl
		(pass: { assertion, message }:

pkgs/top-level/all-packages.nix

+4 −7

Original line number	Diff line number	Diff line
		@@ -16937,13 +16937,10 @@ with pkgs;
		# https://github.com/NixOS/nixpkgs/issues/89426
		rustc-wasm32 = (rustc.override {
		stdenv = stdenv.override {
		targetPlatform = stdenv.targetPlatform // {
		parsed = {
		cpu.name = "wasm32";
		vendor.name = "unknown";
		kernel.name = "unknown";
		abi.name = "unknown";
		};
		targetPlatform = lib.systems.elaborate {
		# lib.systems.elaborate won't recognize "unknown" as the last component.
		config = "wasm32-unknown-wasi";
		rust.config = "wasm32-unknown-unknown";
		};
		};
		}).overrideAttrs (old: {