JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

top-level: Splice in more package sets for new types of deps

Browse Source 
This is done in preparation for the next commit where, among other
changes, I add support for the new `dep*` attributes.
This commit is contained in:
John Ericson 2017-06-02 12:22:36 -04:00 committed by John Ericson
parent 281fb9c222
commit bb18a3b573
1 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pkgs/top-level/splice.nix
View File

@ -24,25 +24,52 @@
lib: pkgs: actuallySplice: lib: pkgs: actuallySplice:
let let
defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg; defaultBuildBuildScope = pkgs.buildPackages.buildPackages // pkgs.buildPackages.buildPackages.xorg;
defaultBuildHostScope = pkgs.buildPackages // pkgs.buildPackages.xorg;
defaultBuildTargetScope =
if pkgs.targetPlatform == pkgs.hostPlatform
then defaultBuildHostScope
else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope;
defaultHostHostScope = {}; # unimplemented
# TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing
# these attributes. We should have a more general solution for selecting # these attributes. We should have a more general solution for selecting
# whether `nativeDrv` or `crossDrv` is the default in `defaultScope`. # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`.
pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs; pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs;
defaultRunScope = pkgsWithoutFetchers // pkgs.xorg; targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages;
defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg;
defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {};
splicer = buildPkgs: runPkgs: let splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget:
mash = buildPkgs // runPkgs; pkgsHostHost: pkgsHostTarget:
pkgsTargetTarget: let
mash =
# Other pkgs sets
pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget
# The same pkgs sets one probably intends
// pkgsBuildHost // pkgsHostTarget;
merge = name: { merge = name: {
inherit name; inherit name;
value = let value = let
defaultValue = mash.${name}; defaultValue = mash.${name};
# `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity. # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
buildValue = buildPkgs.${name} or {}; valueBuildBuild = pkgsBuildBuild.${name} or {};
runValue = runPkgs.${name} or {}; valueBuildHost = pkgsBuildHost.${name} or {};
valueBuildTarget = pkgsBuildTarget.${name} or {};
valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer.";
valueHostTarget = pkgsHostTarget.${name} or {};
valueTargetTarget = pkgsTargetTarget.${name} or {};
augmentedValue = defaultValue augmentedValue = defaultValue
// (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; }) # TODO(@Ericson2314): Stop using old names after transition period
// (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; }); // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; })
// (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; })
// {
__spliced =
(lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
// (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
// { hostHost = valueHostHost; }
// (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget;
});
};
# Get the set of outputs of a derivation. If one derivation fails to # 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 # evaluate we don't want to diverge the entire splice, so we fall back
# on {} # on {}
@ -55,10 +82,15 @@ let
in in
# The derivation along with its outputs, which we recur # The derivation along with its outputs, which we recur
# on to splice them together. # on to splice them together.
if lib.isDerivation defaultValue then augmentedValue if lib.isDerivation defaultValue then augmentedValue // splicer
// splicer (tryGetOutputs buildValue) (getOutputs runValue) (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget)
(tryGetOutputs valueHostHost) (getOutputs valueHostTarget)
(tryGetOutputs valueTargetTarget)
# Just recur on plain attrsets # Just recur on plain attrsets
else if lib.isAttrs defaultValue then splicer buildValue runValue else if lib.isAttrs defaultValue then splicer
valueBuildBuild valueBuildHost valueBuildTarget
{} valueHostTarget
valueTargetTarget
# Don't be fancy about non-derivations. But we could have used used # Don't be fancy about non-derivations. But we could have used used
# `__functor__` for functions instead. # `__functor__` for functions instead.
else defaultValue; else defaultValue;
@ -67,11 +99,16 @@ let
splicedPackages = splicedPackages =
if actuallySplice if actuallySplice
then splicer defaultBuildScope defaultRunScope // { then
# These should never be spliced under any circumstances splicer
inherit (pkgs) pkgs buildPackages targetPackages defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope
buildPlatform targetPlatform hostPlatform; defaultHostHostScope defaultHostTargetScope
} defaultTargetTargetScope
// {
# These should never be spliced under any circumstances
inherit (pkgs) pkgs buildPackages targetPackages
buildPlatform targetPlatform hostPlatform;
}
else pkgs // pkgs.xorg; else pkgs // pkgs.xorg;
in in