
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:
nix-build ci -A fmt.check
This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).
This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).
Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase
).
If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
145 lines
4.5 KiB
Nix
145 lines
4.5 KiB
Nix
{
|
|
rustcVersion,
|
|
rustcSha256,
|
|
enableRustcDev ? true,
|
|
bootstrapVersion,
|
|
bootstrapHashes,
|
|
selectRustPackage,
|
|
rustcPatches ? [ ],
|
|
llvmShared,
|
|
llvmSharedForBuild,
|
|
llvmSharedForHost,
|
|
llvmSharedForTarget,
|
|
llvmPackages, # Exposed through rustc for LTO in Firefox
|
|
}:
|
|
{
|
|
stdenv,
|
|
lib,
|
|
newScope,
|
|
callPackage,
|
|
pkgsBuildBuild,
|
|
pkgsBuildHost,
|
|
pkgsBuildTarget,
|
|
pkgsTargetTarget,
|
|
makeRustPlatform,
|
|
wrapRustcWith,
|
|
}:
|
|
|
|
let
|
|
# Use `import` to make sure no packages sneak in here.
|
|
lib' = import ../../../build-support/rust/lib {
|
|
inherit
|
|
lib
|
|
stdenv
|
|
pkgsBuildHost
|
|
pkgsBuildTarget
|
|
pkgsTargetTarget
|
|
;
|
|
};
|
|
# Allow faster cross compiler generation by reusing Build artifacts
|
|
fastCross =
|
|
(stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform);
|
|
in
|
|
{
|
|
lib = lib';
|
|
|
|
# Backwards compat before `lib` was factored out.
|
|
inherit (lib')
|
|
toTargetArch
|
|
toTargetOs
|
|
toRustTarget
|
|
toRustTargetSpec
|
|
IsNoStdTarget
|
|
toRustTargetForUseInEnvVars
|
|
envVars
|
|
;
|
|
|
|
# This just contains tools for now. But it would conceivably contain
|
|
# libraries too, say if we picked some default/recommended versions to build
|
|
# by Hydra.
|
|
#
|
|
# In the end game, rustc, the rust standard library (`core`, `std`, etc.),
|
|
# and cargo would themselves be built with `buildRustCreate` like
|
|
# everything else. Tools and `build.rs` and procedural macro dependencies
|
|
# would be taken from `buildRustPackages` (and `bootstrapRustPackages` for
|
|
# anything provided prebuilt or their build-time dependencies to break
|
|
# cycles / purify builds). In this way, nixpkgs would be in control of all
|
|
# bootstrapping.
|
|
packages = {
|
|
prebuilt = callPackage ./bootstrap.nix {
|
|
version = bootstrapVersion;
|
|
hashes = bootstrapHashes;
|
|
};
|
|
stable = lib.makeScope newScope (
|
|
self:
|
|
let
|
|
# Like `buildRustPackages`, but may also contain prebuilt binaries to
|
|
# break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
|
|
# nothing in the final package set should refer to this.
|
|
bootstrapRustPackages =
|
|
if fastCross then
|
|
pkgsBuildBuild.rustPackages
|
|
else
|
|
self.buildRustPackages.overrideScope (
|
|
_: _:
|
|
lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
|
|
(selectRustPackage pkgsBuildHost).packages.prebuilt
|
|
);
|
|
bootRustPlatform = makeRustPlatform bootstrapRustPackages;
|
|
in
|
|
{
|
|
# Packages suitable for build-time, e.g. `build.rs`-type stuff.
|
|
buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // {
|
|
# Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here.
|
|
buildRustPackages = self.buildRustPackages // {
|
|
__attrsFailEvaluation = true;
|
|
};
|
|
};
|
|
# Analogous to stdenv
|
|
rustPlatform = makeRustPlatform self.buildRustPackages;
|
|
rustc-unwrapped = self.callPackage ./rustc.nix ({
|
|
version = rustcVersion;
|
|
sha256 = rustcSha256;
|
|
inherit enableRustcDev;
|
|
inherit
|
|
llvmShared
|
|
llvmSharedForBuild
|
|
llvmSharedForHost
|
|
llvmSharedForTarget
|
|
llvmPackages
|
|
fastCross
|
|
;
|
|
|
|
patches = rustcPatches;
|
|
|
|
# Use boot package set to break cycle
|
|
inherit (bootstrapRustPackages) cargo rustc rustfmt;
|
|
});
|
|
rustc = wrapRustcWith {
|
|
inherit (self) rustc-unwrapped;
|
|
sysroot = if fastCross then self.rustc-unwrapped else null;
|
|
};
|
|
rustfmt = self.callPackage ./rustfmt.nix {
|
|
inherit (self.buildRustPackages) rustc;
|
|
};
|
|
cargo =
|
|
if (!fastCross) then
|
|
self.callPackage ./cargo.nix {
|
|
# Use boot package set to break cycle
|
|
rustPlatform = bootRustPlatform;
|
|
}
|
|
else
|
|
self.callPackage ./cargo_cross.nix { };
|
|
cargo-auditable = self.callPackage ./cargo-auditable.nix { };
|
|
cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { };
|
|
clippy = self.callPackage ./clippy.nix {
|
|
# We want to use self, not buildRustPackages, so that
|
|
# buildPackages.clippy uses the cross compiler and supports
|
|
# linting for the target platform.
|
|
rustPlatform = makeRustPlatform self;
|
|
};
|
|
}
|
|
);
|
|
};
|
|
}
|