
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.
214 lines
7.3 KiB
Nix
214 lines
7.3 KiB
Nix
# The `splicedPackages' package set, and its use by `callPackage`
|
|
#
|
|
# The `buildPackages` pkg set is a new concept, and the vast majority package
|
|
# expression (the other *.nix files) are not designed with it in mind. This
|
|
# presents us with a problem with how to get the right version (build-time vs
|
|
# run-time) of a package to a consumer that isn't used to thinking so cleverly.
|
|
#
|
|
# The solution is to splice the package sets together as we do below, so every
|
|
# `callPackage`d expression in fact gets both versions. Each derivation (and
|
|
# each derivation's outputs) consists of the run-time version, augmented with
|
|
# a `__spliced.buildHost` field for the build-time version, and
|
|
# `__spliced.hostTarget` field for the run-time version.
|
|
#
|
|
# For performance reasons, rather than uniformally splice in all cases, we only
|
|
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
|
|
# parameter there the boolean value of that equality check.
|
|
lib: pkgs: actuallySplice:
|
|
|
|
let
|
|
|
|
spliceReal =
|
|
{
|
|
pkgsBuildBuild,
|
|
pkgsBuildHost,
|
|
pkgsBuildTarget,
|
|
pkgsHostHost,
|
|
pkgsHostTarget,
|
|
pkgsTargetTarget,
|
|
}:
|
|
let
|
|
mash =
|
|
# Other pkgs sets
|
|
pkgsBuildBuild
|
|
// pkgsBuildTarget
|
|
// pkgsHostHost
|
|
// pkgsTargetTarget
|
|
# The same pkgs sets one probably intends
|
|
// pkgsBuildHost
|
|
// pkgsHostTarget;
|
|
merge = name: {
|
|
inherit name;
|
|
value =
|
|
let
|
|
defaultValue = mash.${name};
|
|
# `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
|
|
valueBuildBuild = pkgsBuildBuild.${name} or { };
|
|
valueBuildHost = pkgsBuildHost.${name} or { };
|
|
valueBuildTarget = pkgsBuildTarget.${name} or { };
|
|
valueHostHost = pkgsHostHost.${name} or { };
|
|
valueHostTarget = pkgsHostTarget.${name} or { };
|
|
valueTargetTarget = pkgsTargetTarget.${name} or { };
|
|
augmentedValue = defaultValue // {
|
|
__spliced =
|
|
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
|
|
// (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
|
|
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
|
|
// (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
|
|
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
|
|
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) {
|
|
targetTarget = valueTargetTarget;
|
|
});
|
|
};
|
|
# Get the set of outputs of a derivation. If one derivation fails to
|
|
# evaluate we don't want to diverge the entire splice, so we fall back
|
|
# on {}
|
|
tryGetOutputs =
|
|
value0:
|
|
let
|
|
inherit (builtins.tryEval value0) success value;
|
|
in
|
|
getOutputs (lib.optionalAttrs success value);
|
|
getOutputs =
|
|
value: lib.genAttrs (value.outputs or (lib.optional (value ? out) "out")) (output: value.${output});
|
|
in
|
|
# The derivation along with its outputs, which we recur
|
|
# on to splice them together.
|
|
if lib.isDerivation defaultValue then
|
|
augmentedValue
|
|
// spliceReal {
|
|
pkgsBuildBuild = tryGetOutputs valueBuildBuild;
|
|
pkgsBuildHost = tryGetOutputs valueBuildHost;
|
|
pkgsBuildTarget = tryGetOutputs valueBuildTarget;
|
|
pkgsHostHost = tryGetOutputs valueHostHost;
|
|
pkgsHostTarget = getOutputs valueHostTarget;
|
|
pkgsTargetTarget = tryGetOutputs valueTargetTarget;
|
|
# Just recur on plain attrsets
|
|
}
|
|
else if lib.isAttrs defaultValue then
|
|
spliceReal {
|
|
pkgsBuildBuild = valueBuildBuild;
|
|
pkgsBuildHost = valueBuildHost;
|
|
pkgsBuildTarget = valueBuildTarget;
|
|
pkgsHostHost = valueHostHost;
|
|
pkgsHostTarget = valueHostTarget;
|
|
pkgsTargetTarget = valueTargetTarget;
|
|
# Don't be fancy about non-derivations. But we could have used used
|
|
# `__functor__` for functions instead.
|
|
}
|
|
else
|
|
defaultValue;
|
|
};
|
|
in
|
|
lib.listToAttrs (map merge (lib.attrNames mash));
|
|
|
|
splicePackages =
|
|
{
|
|
pkgsBuildBuild,
|
|
pkgsBuildHost,
|
|
pkgsBuildTarget,
|
|
pkgsHostHost,
|
|
pkgsHostTarget,
|
|
pkgsTargetTarget,
|
|
}@args:
|
|
if actuallySplice then spliceReal args else pkgsHostTarget;
|
|
|
|
splicedPackages =
|
|
splicePackages {
|
|
inherit (pkgs)
|
|
pkgsBuildBuild
|
|
pkgsBuildHost
|
|
pkgsBuildTarget
|
|
pkgsHostHost
|
|
pkgsHostTarget
|
|
pkgsTargetTarget
|
|
;
|
|
}
|
|
// {
|
|
# These should never be spliced under any circumstances
|
|
inherit (pkgs)
|
|
pkgsBuildBuild
|
|
pkgsBuildHost
|
|
pkgsBuildTarget
|
|
pkgsHostHost
|
|
pkgsHostTarget
|
|
pkgsTargetTarget
|
|
buildPackages
|
|
pkgs
|
|
targetPackages
|
|
;
|
|
};
|
|
|
|
splicedPackagesWithXorg =
|
|
splicedPackages
|
|
// builtins.removeAttrs splicedPackages.xorg [
|
|
"callPackage"
|
|
"newScope"
|
|
"overrideScope"
|
|
"packages"
|
|
];
|
|
|
|
packagesWithXorg =
|
|
pkgs
|
|
// builtins.removeAttrs pkgs.xorg [
|
|
"callPackage"
|
|
"newScope"
|
|
"overrideScope"
|
|
"packages"
|
|
];
|
|
|
|
pkgsForCall = if actuallySplice then splicedPackagesWithXorg else packagesWithXorg;
|
|
|
|
in
|
|
|
|
{
|
|
inherit splicePackages;
|
|
|
|
# We use `callPackage' to be able to omit function arguments that can be
|
|
# obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
|
|
# `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
|
|
callPackage = pkgs.newScope { };
|
|
|
|
callPackages = lib.callPackagesWith pkgsForCall;
|
|
|
|
newScope = extra: lib.callPackageWith (pkgsForCall // extra);
|
|
|
|
# prefill 2 fields of the function for convenience
|
|
makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
|
|
makeScopeWithSplicing' = lib.makeScopeWithSplicing' {
|
|
inherit splicePackages;
|
|
inherit (pkgs) newScope;
|
|
};
|
|
|
|
# generate 'otherSplices' for 'makeScopeWithSplicing'
|
|
generateSplicesForMkScope =
|
|
attrs:
|
|
let
|
|
split =
|
|
X:
|
|
[ X ]
|
|
++ (
|
|
if builtins.isList attrs then
|
|
attrs
|
|
else if builtins.isString attrs then
|
|
lib.splitString "." attrs
|
|
else
|
|
throw "generateSplicesForMkScope must be passed a list of string or string"
|
|
);
|
|
bad = throw "attribute should be found";
|
|
in
|
|
{
|
|
selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") bad pkgs;
|
|
selfBuildHost = lib.attrByPath (split "pkgsBuildHost") bad pkgs;
|
|
selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") bad pkgs;
|
|
selfHostHost = lib.attrByPath (split "pkgsHostHost") bad pkgs;
|
|
selfHostTarget = lib.attrByPath (split "pkgsHostTarget") bad pkgs;
|
|
selfTargetTarget = lib.attrByPath (split "pkgsTargetTarget") { } pkgs;
|
|
};
|
|
|
|
# Haskell package sets need this because they reimplement their own
|
|
# `newScope`.
|
|
__splicedPackages =
|
|
if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
|
|
}
|