forked from auxolotl/labs
feat: working transient deps
This commit is contained in:
parent
0f602b1cb7
commit
008632bc8b
GPG key ID:
9762169A1B35EA68
|
|
@ -3,10 +3,10 @@
|
|||
"lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"dirtyRev": "a707b0f06be6b36bcbfe88d0a9a5b9a803983a06-dirty",
|
||||
"dirtyShortRev": "a707b0f-dirty",
|
||||
"lastModified": 1719079124,
|
||||
"narHash": "sha256-4HwA3q5f7SUBmcXX9Vz9WsA9oHBQ/GiZTwE4iSVq9s8=",
|
||||
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
|
||||
"dirtyShortRev": "2be3111-dirty",
|
||||
"lastModified": 1719251485,
|
||||
"narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
|
||||
"type": "git",
|
||||
"url": "file:../?dir=lib"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,46 +4,39 @@ lib: {
|
|||
## Merge a list of option definitions into a single value.
|
||||
##
|
||||
## @type Location -> List Definition -> Any
|
||||
default =
|
||||
location: definitions:
|
||||
let
|
||||
default = location: definitions: let
|
||||
values = lib.options.getDefinitionValues definitions;
|
||||
first = builtins.elemAt values 0;
|
||||
mergedFunctions = x: lib.options.mergeDefault location (builtins.map (f: f x) values);
|
||||
mergedLists = builtins.concatLists values;
|
||||
mergedAttrs = builtins.foldl' lib.attrs.merge { } values;
|
||||
mergedAttrs = builtins.foldl' lib.attrs.merge {} values;
|
||||
mergedBools = builtins.any lib.bools.or false values;
|
||||
mergedStrings = lib.strings.concat values;
|
||||
in
|
||||
if builtins.length values == 1 then
|
||||
builtins.elemAt values 0
|
||||
else if builtins.all builtins.isFunction values then
|
||||
mergedFunctions
|
||||
else if builtins.all builtins.isList values then
|
||||
mergedLists
|
||||
else if builtins.all builtins.isAttrs values then
|
||||
mergedAttrs
|
||||
else if builtins.all builtins.isBool values then
|
||||
mergedBools
|
||||
else if builtins.all lib.strings.isString values then
|
||||
mergedStrings
|
||||
else if builtins.all builtins.isInt values && builtins.all (x: x == first) values then
|
||||
first
|
||||
if builtins.length values == 1
|
||||
then builtins.elemAt values 0
|
||||
else if builtins.all builtins.isFunction values
|
||||
then mergedFunctions
|
||||
else if builtins.all builtins.isList values
|
||||
then mergedLists
|
||||
else if builtins.all builtins.isAttrs values
|
||||
then mergedAttrs
|
||||
else if builtins.all builtins.isBool values
|
||||
then mergedBools
|
||||
else if builtins.all lib.strings.isString values
|
||||
then mergedStrings
|
||||
else if builtins.all builtins.isInt values && builtins.all (x: x == first) values
|
||||
then first
|
||||
# TODO: Improve this error message to show the location and definitions for the option.
|
||||
else
|
||||
builtins.throw "Cannot merge definitions.";
|
||||
else builtins.throw "Cannot merge definitions.";
|
||||
|
||||
## Merge multiple option definitions together.
|
||||
##
|
||||
## @type Location -> Type -> List Definition
|
||||
definitions =
|
||||
location: type: definitions:
|
||||
let
|
||||
definitions = location: type: definitions: let
|
||||
identifier = lib.options.getIdentifier location;
|
||||
resolve =
|
||||
definition:
|
||||
let
|
||||
properties = builtins.addErrorContext "while evaluating definitions from `${definition.__file__}`:" (
|
||||
resolve = definition: let
|
||||
properties = builtins.addErrorContext "while evaluating definitions from `${definition.__file__ or "<unknown>"}`:" (
|
||||
lib.modules.apply.properties definition.value
|
||||
);
|
||||
normalize = value: {
|
||||
|
|
@ -57,27 +50,27 @@ lib: {
|
|||
overridden = lib.modules.apply.overrides resolved;
|
||||
|
||||
values =
|
||||
if builtins.any (definition: lib.types.is "order" definition.value) overridden.values then
|
||||
lib.modules.apply.order overridden.values
|
||||
else
|
||||
overridden.values;
|
||||
if builtins.any (definition: lib.types.is "order" definition.value) overridden.values
|
||||
then lib.modules.apply.order overridden.values
|
||||
else overridden.values;
|
||||
|
||||
isDefined = values != [ ];
|
||||
isDefined = values != [];
|
||||
|
||||
invalid = builtins.filter (definition: !(type.check definition.value)) values;
|
||||
|
||||
merged =
|
||||
if isDefined then
|
||||
if builtins.all (definition: type.check definition.value) values then
|
||||
type.merge location values
|
||||
else
|
||||
builtins.throw "A definition for `${identifier}` is not of type `${type.description}`. Definition values:${lib.options.getDefinitions invalid}"
|
||||
else
|
||||
builtins.throw "The option `${identifier}` is used but not defined.";
|
||||
if isDefined
|
||||
then
|
||||
if builtins.all (definition: type.check definition.value) values
|
||||
then type.merge location values
|
||||
else builtins.throw "A definition for `${identifier}` is not of type `${type.description}`. Definition values:${lib.options.getDefinitions invalid}"
|
||||
else builtins.throw "The option `${identifier}` is used but not defined.";
|
||||
|
||||
optional = if isDefined then { value = merged; } else { };
|
||||
in
|
||||
{
|
||||
optional =
|
||||
if isDefined
|
||||
then {value = merged;}
|
||||
else {};
|
||||
in {
|
||||
inherit
|
||||
isDefined
|
||||
values
|
||||
|
|
@ -94,28 +87,25 @@ lib: {
|
|||
## Merge multiple option declarations together.
|
||||
##
|
||||
## @type Location -> List Option
|
||||
declarations =
|
||||
location: options:
|
||||
let
|
||||
merge =
|
||||
result: option:
|
||||
let
|
||||
declarations = location: options: let
|
||||
merge = result: option: let
|
||||
mergedType = result.type.mergeType option.options.type.functor;
|
||||
isTypeMergeable = mergedType != null;
|
||||
shared = name: option.options ? ${name} && result ? ${name};
|
||||
typeSet = lib.attrs.when ((shared "type") && isTypeMergeable) { type = mergedType; };
|
||||
typeSet = lib.attrs.when ((shared "type") && isTypeMergeable) {type = mergedType;};
|
||||
files = result.declarations;
|
||||
serializedFiles = builtins.concatStringsSep " and " files;
|
||||
getSubModules = option.options.type.getSubModules or null;
|
||||
submodules =
|
||||
if getSubModules != null then
|
||||
if getSubModules != null
|
||||
then
|
||||
builtins.map (module: {
|
||||
__file__ = option.__file__;
|
||||
includes = [ module ];
|
||||
}) getSubModules
|
||||
includes = [module];
|
||||
})
|
||||
getSubModules
|
||||
++ result.options
|
||||
else
|
||||
result.options;
|
||||
else result.options;
|
||||
in
|
||||
if
|
||||
shared "default"
|
||||
|
|
@ -123,65 +113,57 @@ lib: {
|
|||
|| shared "description"
|
||||
|| shared "apply"
|
||||
|| (shared "type" && !isTypeMergeable)
|
||||
then
|
||||
builtins.throw "The option `${lib.options.getIdentifier location}` in `${option.__file__}` is already declared in ${serializedFiles}"
|
||||
then builtins.throw "The option `${lib.options.getIdentifier location}` in `${option.__file__}` is already declared in ${serializedFiles}"
|
||||
else
|
||||
option.options
|
||||
// result
|
||||
// {
|
||||
declarations = result.declarations ++ [ option.__file__ ];
|
||||
declarations = result.declarations ++ [option.__file__];
|
||||
options = submodules;
|
||||
}
|
||||
// typeSet;
|
||||
in
|
||||
builtins.foldl' merge {
|
||||
inherit location;
|
||||
declarations = [ ];
|
||||
options = [ ];
|
||||
} options;
|
||||
declarations = [];
|
||||
options = [];
|
||||
}
|
||||
options;
|
||||
|
||||
## Merge an option, only supporting a single unique definition.
|
||||
##
|
||||
## @type String -> Location -> List Definition -> Any
|
||||
unique =
|
||||
message: location: definitions:
|
||||
let
|
||||
unique = message: location: definitions: let
|
||||
identifier = lib.options.getIdentifier location;
|
||||
total = builtins.length definitions;
|
||||
first = builtins.elemAt definitions 0;
|
||||
in
|
||||
if total == 1 then
|
||||
first.value
|
||||
else if total == 0 then
|
||||
builtins.throw "Cannot merge unused option `${identifier}`.\n${message}"
|
||||
else
|
||||
builtins.throw "The option `${identifier}` is defined multiple times, but must be unique.\n${message}\nDefinitions:${lib.options.getDefinitions definitions}";
|
||||
if total == 1
|
||||
then first.value
|
||||
else if total == 0
|
||||
then builtins.throw "Cannot merge unused option `${identifier}`.\n${message}"
|
||||
else builtins.throw "The option `${identifier}` is defined multiple times, but must be unique.\n${message}\nDefinitions:${lib.options.getDefinitions definitions}";
|
||||
|
||||
## Merge a single instance of an option.
|
||||
##
|
||||
## @type Location -> List Definition -> Any
|
||||
one = lib.options.merge.unique "";
|
||||
|
||||
equal =
|
||||
location: definitions:
|
||||
let
|
||||
equal = location: definitions: let
|
||||
identifier = lib.options.getIdentifier location;
|
||||
first = builtins.elemAt definitions 0;
|
||||
rest = builtins.tail definitions;
|
||||
merge =
|
||||
x: y:
|
||||
if x != y then
|
||||
builtins.throw "The option `${identifier}` has conflicting definitions:${lib.options.getDefinitions definitions}"
|
||||
else
|
||||
x;
|
||||
merge = x: y:
|
||||
if x != y
|
||||
then builtins.throw "The option `${identifier}` has conflicting definitions:${lib.options.getDefinitions definitions}"
|
||||
else x;
|
||||
merged = builtins.foldl' merge first rest;
|
||||
in
|
||||
if builtins.length definitions == 0 then
|
||||
builtins.throw "Cannot merge unused option `${identifier}`."
|
||||
else if builtins.length definitions == 1 then
|
||||
first.value
|
||||
else
|
||||
merged.value;
|
||||
if builtins.length definitions == 0
|
||||
then builtins.throw "Cannot merge unused option `${identifier}`."
|
||||
else if builtins.length definitions == 1
|
||||
then first.value
|
||||
else merged.value;
|
||||
};
|
||||
|
||||
## Check whether a value is an option.
|
||||
|
|
@ -192,18 +174,16 @@ lib: {
|
|||
## Create an option.
|
||||
##
|
||||
## @type { type? :: String | Null, apply? :: (a -> b) | Null, default? :: { value :: a, text :: String }, example? :: String | Null, visible? :: Bool | Null, internal? :: Bool | Null, writable? :: Bool | Null, description? :: String | Null } -> Option a
|
||||
create =
|
||||
settings@{
|
||||
create = settings @ {
|
||||
type ? lib.types.unspecified,
|
||||
apply ? null,
|
||||
default ? { },
|
||||
default ? {},
|
||||
example ? null,
|
||||
visible ? null,
|
||||
internal ? null,
|
||||
writable ? null,
|
||||
description ? null,
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
__type__ = "option";
|
||||
inherit
|
||||
type
|
||||
|
|
@ -220,9 +200,7 @@ lib: {
|
|||
## Create a sink option.
|
||||
##
|
||||
## @type @alias lib.options.create
|
||||
sink =
|
||||
settings:
|
||||
let
|
||||
sink = settings: let
|
||||
defaults = {
|
||||
internal = true;
|
||||
visible = false;
|
||||
|
|
@ -246,9 +224,7 @@ lib: {
|
|||
## Convert a list of option identifiers into a single identifier.
|
||||
##
|
||||
## @type List String -> String
|
||||
getIdentifier =
|
||||
location:
|
||||
let
|
||||
getIdentifier = location: let
|
||||
special = [
|
||||
# lib.types.attrs.of (lib.types.submodule {})
|
||||
"<name>"
|
||||
|
|
@ -257,25 +233,26 @@ lib: {
|
|||
# lib.types.function
|
||||
"<function body>"
|
||||
];
|
||||
escape = part: if builtins.elem part special then part else lib.strings.escape.nix.identifier part;
|
||||
escape = part:
|
||||
if builtins.elem part special
|
||||
then part
|
||||
else lib.strings.escape.nix.identifier part;
|
||||
in
|
||||
lib.strings.concatMapSep "." escape location;
|
||||
|
||||
## Get a string message of the definitions for an option.
|
||||
##
|
||||
## @type List Definition -> String
|
||||
getDefinitions =
|
||||
definitions:
|
||||
let
|
||||
serialize =
|
||||
definition:
|
||||
let
|
||||
valueWithRecursionLimit = lib.generators.withRecursion {
|
||||
getDefinitions = definitions: let
|
||||
serialize = definition: let
|
||||
valueWithRecursionLimit =
|
||||
lib.generators.withRecursion {
|
||||
limit = 10;
|
||||
throw = false;
|
||||
} definition.value;
|
||||
}
|
||||
definition.value;
|
||||
|
||||
eval = builtins.tryEval (lib.generators.pretty { } valueWithRecursionLimit);
|
||||
eval = builtins.tryEval (lib.generators.pretty {} valueWithRecursionLimit);
|
||||
|
||||
lines = lib.strings.split "\n" eval.value;
|
||||
linesLength = builtins.length lines;
|
||||
|
|
@ -286,27 +263,24 @@ lib: {
|
|||
value = builtins.concatStringsSep "\n " (firstFiveLines ++ ellipsis);
|
||||
|
||||
result =
|
||||
if !eval.success then
|
||||
""
|
||||
else if linesLength > 1 then
|
||||
":\n " + value
|
||||
else
|
||||
": " + value;
|
||||
in
|
||||
"\n- In `${definition.__file__}`${result}";
|
||||
if !eval.success
|
||||
then ""
|
||||
else if linesLength > 1
|
||||
then ":\n " + value
|
||||
else ": " + value;
|
||||
in "\n- In `${definition.__file__}`${result}";
|
||||
in
|
||||
lib.strings.concatMap serialize definitions;
|
||||
|
||||
## Run a set of definitions, calculating the resolved value and associated information.
|
||||
##
|
||||
## @type Location -> Option -> List Definition -> String & { value :: Any, highestPriority :: Int, isDefined :: Bool, files :: List String, definitions :: List Any, definitionsWithLocations :: List Definition }
|
||||
run =
|
||||
location: option: definitions:
|
||||
let
|
||||
run = location: option: definitions: let
|
||||
identifier = lib.options.getIdentifier location;
|
||||
|
||||
definitionsWithDefault =
|
||||
if option ? default && option.default ? value then
|
||||
if option ? default && option.default ? value
|
||||
then
|
||||
[
|
||||
{
|
||||
__file__ = builtins.head option.declarations;
|
||||
|
|
@ -314,25 +288,28 @@ lib: {
|
|||
}
|
||||
]
|
||||
++ definitions
|
||||
else
|
||||
definitions;
|
||||
else definitions;
|
||||
|
||||
merged =
|
||||
if option.writable or null == false && builtins.length definitionsWithDefault > 1 then
|
||||
let
|
||||
separatedDefinitions = builtins.map (
|
||||
if option.writable or null == false && builtins.length definitionsWithDefault > 1
|
||||
then let
|
||||
separatedDefinitions =
|
||||
builtins.map (
|
||||
definition:
|
||||
definition
|
||||
// {
|
||||
value = (lib.options.merge.definitions location option.type [ definition ]).merged;
|
||||
value = (lib.options.merge.definitions location option.type [definition]).merged;
|
||||
}
|
||||
) definitionsWithDefault;
|
||||
)
|
||||
definitionsWithDefault;
|
||||
in
|
||||
builtins.throw "The option `${identifier}` is not writable, but is set more than once:${lib.options.getDefinitions separatedDefinitions}"
|
||||
else
|
||||
lib.options.merge.definitions location option.type definitionsWithDefault;
|
||||
else lib.options.merge.definitions location option.type definitionsWithDefault;
|
||||
|
||||
value = if option.apply or null != null then option.apply merged.merged else merged.merged;
|
||||
value =
|
||||
if option.apply or null != null
|
||||
then option.apply merged.merged
|
||||
else merged.merged;
|
||||
in
|
||||
option
|
||||
// {
|
||||
|
|
|
|||
|
|
@ -1048,7 +1048,7 @@ lib: {
|
|||
merge = location: definitions: let
|
||||
process = value:
|
||||
if initial.check value
|
||||
then (builtins.trace "transforming...") transform value
|
||||
then transform value
|
||||
else value;
|
||||
normalize = definition: definition // {value = process definition.value;};
|
||||
normalized = builtins.map normalize definitions;
|
||||
|
|
@ -1068,6 +1068,43 @@ lib: {
|
|||
};
|
||||
};
|
||||
|
||||
## Create a type that allows a value which is either the final type or is transformable
|
||||
## to the final type.
|
||||
##
|
||||
## @type Attrs -> (Any -> Any) -> Attrs -> Attrs
|
||||
coerceWithLocation = initial: transform: final: let
|
||||
in
|
||||
if initial.getSubModules != null
|
||||
then builtins.throw "lib.types.coerceWithLocation's first argument may not have submodules, but got ${initial.description}"
|
||||
else
|
||||
lib.types.create {
|
||||
name = "Coerce";
|
||||
description = "${initial.description} that is transformed to ${final.description}";
|
||||
fallback = final.fallback;
|
||||
check = value: final.check value || (initial.check value && final.check (transform [] value));
|
||||
merge = location: definitions: let
|
||||
process = value:
|
||||
if initial.check value
|
||||
then transform location value
|
||||
else value;
|
||||
normalize = definition: definition // {value = process definition.value;};
|
||||
normalized = builtins.map normalize definitions;
|
||||
in
|
||||
final.merge location normalized;
|
||||
getSubOptions = final.getSubOptions;
|
||||
getSubModules = final.getSubModules;
|
||||
withSubModules = modules: lib.types.coerceWithLocation initial transform (final.withSubModules modules);
|
||||
mergeType = x: y: null;
|
||||
functor =
|
||||
lib.types.functor "coerceWithLocation"
|
||||
// {
|
||||
wrapped = final;
|
||||
};
|
||||
children = {
|
||||
inherit initial final;
|
||||
};
|
||||
};
|
||||
|
||||
dag = {
|
||||
## Create a type that allows a DAG (Directed Acyclic Graph) of a given type.
|
||||
##
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "foundation",
|
||||
"dirtyRev": "a707b0f06be6b36bcbfe88d0a9a5b9a803983a06-dirty",
|
||||
"dirtyShortRev": "a707b0f-dirty",
|
||||
"lastModified": 1719079124,
|
||||
"narHash": "sha256-hz9vVcHSvlq/W01UOh/GqPFUoH9DzCFB16n23oj7fnQ=",
|
||||
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
|
||||
"dirtyShortRev": "2be3111-dirty",
|
||||
"lastModified": 1719251485,
|
||||
"narHash": "sha256-9G1TPBdlQNXCZf6A66bCT9m2vhodkSF+rDtqOVuFteY=",
|
||||
"type": "git",
|
||||
"url": "file:../?dir=foundation"
|
||||
},
|
||||
|
|
@ -24,10 +24,10 @@
|
|||
"lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"dirtyRev": "a707b0f06be6b36bcbfe88d0a9a5b9a803983a06-dirty",
|
||||
"dirtyShortRev": "a707b0f-dirty",
|
||||
"lastModified": 1719079124,
|
||||
"narHash": "sha256-hz9vVcHSvlq/W01UOh/GqPFUoH9DzCFB16n23oj7fnQ=",
|
||||
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
|
||||
"dirtyShortRev": "2be3111-dirty",
|
||||
"lastModified": 1719251485,
|
||||
"narHash": "sha256-9G1TPBdlQNXCZf6A66bCT9m2vhodkSF+rDtqOVuFteY=",
|
||||
"type": "git",
|
||||
"url": "file:../?dir=lib"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -83,7 +83,13 @@ in {
|
|||
}
|
||||
);
|
||||
in
|
||||
built // {inherit (package) meta;};
|
||||
built
|
||||
// {
|
||||
inherit (package) meta;
|
||||
extras = {
|
||||
inherit package;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
# This file handles creating all of the exports for this project and is not
|
||||
# exported itself.
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
}: let
|
||||
lib' = config.lib;
|
||||
{config}: let
|
||||
inherit (config) lib;
|
||||
in {
|
||||
freeform = lib.types.any;
|
||||
# freeform = lib.types.any;
|
||||
|
||||
config = {
|
||||
exports = {
|
||||
lib = config.lib;
|
||||
inherit lib;
|
||||
modules = import ./modules.nix;
|
||||
|
||||
packages = {
|
||||
|
|
@ -25,7 +22,7 @@ in {
|
|||
# };
|
||||
# }))
|
||||
# .config;
|
||||
# foundation-gcc = config.packages.foundation.gcc;
|
||||
foundation-gcc = config.packages.foundation.gcc;
|
||||
# foundation-binutils = config.packages.foundation.binutils;
|
||||
# foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
|
||||
# platform.host = lib.modules.overrides.force "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{
|
||||
lib,
|
||||
lib',
|
||||
config,
|
||||
}: {
|
||||
}: let
|
||||
lib' = config.lib;
|
||||
in {
|
||||
config = {
|
||||
lib.packages = {
|
||||
dependencies = {
|
||||
|
|
@ -20,52 +21,85 @@
|
|||
in
|
||||
builtins.head sorted;
|
||||
|
||||
resolve = package:
|
||||
if package ? versions
|
||||
resolve = alias:
|
||||
if alias ? versions
|
||||
then
|
||||
package.versions.${config.preferences.packages.version}
|
||||
or (package.versions.${lib'.packages.getLatest package})
|
||||
else package;
|
||||
alias.versions.${config.preferences.packages.version}
|
||||
or (alias.versions.${lib'.packages.getLatest alias})
|
||||
else alias;
|
||||
|
||||
build = package: build: host: target: let
|
||||
resolved = lib'.packages.resolve package;
|
||||
build = alias: build: host: target: let
|
||||
package = lib'.packages.resolve alias;
|
||||
|
||||
buildDependencies = build': host': target':
|
||||
builtins.mapAttrs (name: dep: lib'.packages.build dep build' host' target');
|
||||
|
||||
result = resolved.extend (
|
||||
result = lib.modules.run {
|
||||
modules =
|
||||
package.__modules__
|
||||
++ [
|
||||
lib'.types.package.children.submodule
|
||||
(
|
||||
{config}: {
|
||||
config = {
|
||||
__modules__ = package.__modules__;
|
||||
platform = {
|
||||
build = build;
|
||||
host = host;
|
||||
target = lib.modules.override 150 target;
|
||||
build = lib.modules.overrides.force (lib'.systems.withBuildInfo build);
|
||||
host = lib.modules.overrides.force (lib'.systems.withBuildInfo host);
|
||||
target = lib.modules.overrides.force (lib'.systems.withBuildInfo target);
|
||||
};
|
||||
|
||||
deps = {
|
||||
build = {
|
||||
only = buildDependencies build build build resolved.deps.build.only;
|
||||
build = buildDependencies build build target resolved.deps.build.build;
|
||||
host = buildDependencies build host target resolved.deps.build.host;
|
||||
target = buildDependencies build target target resolved.deps.build.target;
|
||||
};
|
||||
host = {
|
||||
only = buildDependencies host host host resolved.deps.host.only;
|
||||
host = buildDependencies host host target resolved.deps.host.host;
|
||||
target = buildDependencies host target target resolved.deps.host.target;
|
||||
};
|
||||
target = {
|
||||
only = buildDependencies target target target resolved.deps.target.only;
|
||||
target = buildDependencies target target target resolved.deps.target.target;
|
||||
};
|
||||
};
|
||||
|
||||
package = config.builder.build config;
|
||||
# NOTE: This does not seem to work and instead the pre-existing deps are used.
|
||||
# This causes an issue because the platforms will be wrong.
|
||||
# deps = {
|
||||
# build = {
|
||||
# only = buildDependencies build build build package.deps.build.only;
|
||||
# build = buildDependencies build build target package.deps.build.build;
|
||||
# host = buildDependencies build host target package.deps.build.host;
|
||||
# target = buildDependencies build target target package.deps.build.target;
|
||||
# };
|
||||
# host = {
|
||||
# only = buildDependencies host host host package.deps.host.only;
|
||||
# host = buildDependencies host host target package.deps.host.host;
|
||||
# target = buildDependencies host target target package.deps.host.target;
|
||||
# };
|
||||
# target = {
|
||||
# only = buildDependencies target target target package.deps.target.only;
|
||||
# target = buildDependencies target target target package.deps.target.target;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
);
|
||||
)
|
||||
];
|
||||
};
|
||||
|
||||
resolved =
|
||||
result.config
|
||||
// {
|
||||
deps = {
|
||||
build = {
|
||||
only = buildDependencies build build build package.deps.build.only;
|
||||
build = buildDependencies build build target package.deps.build.build;
|
||||
host = buildDependencies build host target package.deps.build.host;
|
||||
target = buildDependencies build target target package.deps.build.target;
|
||||
};
|
||||
host = {
|
||||
only = buildDependencies host host host package.deps.host.only;
|
||||
host = buildDependencies host host target package.deps.host.host;
|
||||
target = buildDependencies host target target package.deps.host.target;
|
||||
};
|
||||
target = {
|
||||
only = buildDependencies target target target package.deps.target.only;
|
||||
target = buildDependencies target target target package.deps.target.target;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
result;
|
||||
resolved
|
||||
// {
|
||||
package = resolved.builder.build resolved;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,8 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
lib',
|
||||
config,
|
||||
}: {
|
||||
}: let
|
||||
inherit (config) preferences builders;
|
||||
|
||||
lib' = config.lib;
|
||||
in {
|
||||
config = {
|
||||
lib.types = {
|
||||
license = let
|
||||
|
|
@ -52,6 +55,12 @@
|
|||
in
|
||||
lib.types.either type (lib.types.list.of type);
|
||||
|
||||
platform =
|
||||
lib.types.coerce
|
||||
lib.types.string
|
||||
lib'.systems.withBuildInfo
|
||||
lib'.systems.types.platformWithBuildInfo;
|
||||
|
||||
builder = lib.types.submodule {
|
||||
freeform = lib.types.any;
|
||||
|
||||
|
|
@ -63,194 +72,89 @@
|
|||
};
|
||||
};
|
||||
|
||||
packages = lib.types.attrs.of (lib'.types.alias);
|
||||
packages = lib.types.attrs.of (lib.types.attrs.of lib'.types.alias);
|
||||
|
||||
alias = lib.types.attrs.of (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
versions = lib.options.create {
|
||||
description = "All available package versions.";
|
||||
type = lib.types.attrs.of lib'.types.package.base;
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
dependencies = lib.types.attrs.of (
|
||||
lib.types.nullish (lib'.types.package.resolved)
|
||||
);
|
||||
|
||||
package = {
|
||||
resolved = let
|
||||
dependencies = let
|
||||
initial =
|
||||
lib.types.raw
|
||||
(lib.types.attrs.lazy lib.types.any)
|
||||
// {
|
||||
check = value:
|
||||
!(value ? __merged__)
|
||||
&& lib.types.raw.check
|
||||
value;
|
||||
lib.types.attrs.any.check value
|
||||
&& value ? versions;
|
||||
};
|
||||
|
||||
transform = value: let
|
||||
package = lib'.packages.resolve value;
|
||||
packageSubmodule = package.extend (args: {
|
||||
options.__export__ = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
default.value = {
|
||||
inherit (args) options config;
|
||||
};
|
||||
};
|
||||
|
||||
config.__export__ = {
|
||||
inherit (args) options config;
|
||||
};
|
||||
});
|
||||
type = lib'.types.package.base.withSubModules (lib'.types.package.base.getSubModules
|
||||
++ [
|
||||
(args: {
|
||||
options.__export__ = lib.options.create {
|
||||
type = lib.types.raw;
|
||||
default.value = {
|
||||
inherit (args) options config;
|
||||
};
|
||||
};
|
||||
|
||||
config.__export__ = {
|
||||
inherit (args) options config;
|
||||
};
|
||||
})
|
||||
]);
|
||||
typeSubmodule = lib.modules.run {
|
||||
modules = type.getSubModules;
|
||||
args = type.functor.payload.args;
|
||||
};
|
||||
|
||||
getOptions = export: let
|
||||
process = path: option:
|
||||
if builtins.isAttrs option
|
||||
then
|
||||
if lib.types.is "option" option
|
||||
then [
|
||||
{
|
||||
inherit path;
|
||||
option = option;
|
||||
}
|
||||
]
|
||||
else
|
||||
builtins.concatLists (
|
||||
lib.attrs.mapToList
|
||||
(name: value: process (path ++ [name]) value)
|
||||
option
|
||||
)
|
||||
else [];
|
||||
in
|
||||
process [] export.options;
|
||||
lib.types.attrs.of (lib.types.coerce initial lib'.packages.resolve lib'.types.package);
|
||||
|
||||
packageOptions = getOptions packageSubmodule.__export__;
|
||||
typeOptions = getOptions typeSubmodule.config.__export__;
|
||||
|
||||
customOptions =
|
||||
builtins.filter
|
||||
(
|
||||
packageOption:
|
||||
builtins.all (typeOption: packageOption.path != typeOption.path) typeOptions
|
||||
)
|
||||
packageOptions;
|
||||
|
||||
packageOptionsIds = builtins.map (option: builtins.concatStringsSep "." option.path) packageOptions;
|
||||
typeOptionsIds = builtins.map (option: builtins.concatStringsSep "." option.path) typeOptions;
|
||||
customOptionsIds = builtins.map (option: builtins.concatStringsSep "." option.path) customOptions;
|
||||
|
||||
resolvedOptions =
|
||||
builtins.foldl' (
|
||||
resolved: option: let
|
||||
first = builtins.head option.path;
|
||||
generated = lib.attrs.set option.path option.option;
|
||||
in
|
||||
if first == "__export__" || first == "__module__" || first == "__merged__"
|
||||
then resolved
|
||||
else lib.attrs.mergeRecursive resolved generated
|
||||
) {}
|
||||
customOptions;
|
||||
in
|
||||
# (builtins.trace (builtins.deepSeq packageOptionsIds packageOptionsIds))
|
||||
# (builtins.trace (builtins.deepSeq typeOptionsIds typeOptionsIds))
|
||||
# (builtins.trace (builtins.deepSeq customOptionsIds customOptionsIds))
|
||||
# (builtins.trace packageSubmodule.__export__.config)
|
||||
(args: {
|
||||
__file__ = packageSubmodule.__export__.config.__file__ or "virtual:tidepool/src/lib/types.nix";
|
||||
|
||||
options =
|
||||
resolvedOptions
|
||||
// {
|
||||
__merged__ = lib.options.create {
|
||||
type = lib.types.bool;
|
||||
default.value = true;
|
||||
};
|
||||
};
|
||||
|
||||
config =
|
||||
builtins.removeAttrs package ["extend" "package" "platform"]
|
||||
// {
|
||||
platform = {
|
||||
build = lib.modules.overrides.default package.platform.build.triple;
|
||||
host = lib.modules.overrides.default package.platform.host.triple;
|
||||
target = lib.modules.overrides.default package.platform.target.triple;
|
||||
};
|
||||
};
|
||||
# // {
|
||||
# builder =
|
||||
# (builtins.trace "builder")
|
||||
# (builtins.trace (args.config ? builder))
|
||||
# lib.modules.alias
|
||||
# packageSubmodule.__export__.options.builder;
|
||||
# };
|
||||
});
|
||||
in
|
||||
lib.types.coerce initial transform lib'.types.package.base;
|
||||
|
||||
base = lib.types.submodule (
|
||||
{
|
||||
config,
|
||||
meta,
|
||||
}: {
|
||||
alias = lib.types.submodule {
|
||||
options = {
|
||||
extend = lib.options.create {
|
||||
description = "Extend the package's submodules with additional configuration.";
|
||||
type = lib.types.function lib.types.raw;
|
||||
default.value = value: let
|
||||
result = meta.extend {
|
||||
stable = lib.options.create {
|
||||
description = "The stable version of the package.";
|
||||
type = lib.types.nullish lib'.types.package;
|
||||
};
|
||||
|
||||
latest = lib.options.create {
|
||||
description = "The latest version of the package.";
|
||||
type = lib'.types.package;
|
||||
};
|
||||
|
||||
versions = lib.options.create {
|
||||
description = "Available versions of the package.";
|
||||
type = lib.types.attrs.of lib'.types.package;
|
||||
default.value = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
package = let
|
||||
normalize = value:
|
||||
if builtins.isFunction value || builtins.isList value
|
||||
then value
|
||||
else if value ? __modules__
|
||||
then value.__modules__
|
||||
else {
|
||||
config = value;
|
||||
};
|
||||
|
||||
initial = lib.types.create {
|
||||
name = "PackageConfig";
|
||||
description = "configuration for a package";
|
||||
check = value: builtins.isFunction value || builtins.isAttrs value || builtins.isList value;
|
||||
merge = location: definitions: let
|
||||
normalized =
|
||||
builtins.map
|
||||
(definition: lib.lists.from.any (normalize definition.value))
|
||||
definitions;
|
||||
in
|
||||
builtins.concatLists
|
||||
normalized;
|
||||
};
|
||||
|
||||
transform = location: value: let
|
||||
modules =
|
||||
if builtins.isAttrs value
|
||||
then [{config = value;}]
|
||||
else lib.lists.from.any value;
|
||||
lib.lists.from.any (normalize value);
|
||||
|
||||
result = lib.modules.run {
|
||||
prefix = location;
|
||||
modules =
|
||||
modules
|
||||
++ [submodule {config.__modules__ = modules;}];
|
||||
};
|
||||
in
|
||||
result.config;
|
||||
};
|
||||
|
||||
name = lib.options.create {
|
||||
description = "The name of the package.";
|
||||
type = lib.types.string;
|
||||
default = {
|
||||
text = "\${config.pname}-\${config.version}";
|
||||
value =
|
||||
if config.pname != null && config.version != null
|
||||
then "${config.pname}-${config.version}"
|
||||
else "";
|
||||
};
|
||||
};
|
||||
final = lib.types.attrs.any;
|
||||
|
||||
pname = lib.options.create {
|
||||
description = "The program name for the package";
|
||||
type = lib.types.nullish lib.types.string;
|
||||
default.value = null;
|
||||
};
|
||||
|
||||
version = lib.options.create {
|
||||
description = "The version for the package.";
|
||||
type = lib.types.nullish lib.types.version;
|
||||
default.value = null;
|
||||
submodule = {config}: {
|
||||
options = {
|
||||
__modules__ = lib.options.create {
|
||||
description = "User specified modules for the package definition.";
|
||||
type = lib.types.list.of (initial
|
||||
// {
|
||||
merge = lib.options.merge.one;
|
||||
});
|
||||
# writable = false;
|
||||
internal = true;
|
||||
default.value = [];
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -306,57 +210,55 @@
|
|||
platform = {
|
||||
build = lib.options.create {
|
||||
description = "The build platform for the package.";
|
||||
type = lib.types.string;
|
||||
default.value = "x86_64-linux";
|
||||
apply = raw: let
|
||||
system = lib'.systems.from.string raw;
|
||||
x = lib'.systems.withBuildInfo raw;
|
||||
in
|
||||
x;
|
||||
type = lib'.types.platform;
|
||||
default.value = lib'.systems.withBuildInfo "x86_64-linux";
|
||||
};
|
||||
|
||||
host = lib.options.create {
|
||||
description = "The host platform for the package.";
|
||||
type = lib.types.string;
|
||||
default.value = "x86_64-linux";
|
||||
# apply = raw: let
|
||||
# system = lib'.systems.from.string raw;
|
||||
# in {
|
||||
# inherit raw system;
|
||||
|
||||
# double = lib'.systems.into.double system;
|
||||
# triple = lib'.systems.into.triple system;
|
||||
# };
|
||||
apply = raw: let
|
||||
system = lib'.systems.from.string raw;
|
||||
x = lib'.systems.withBuildInfo raw;
|
||||
in
|
||||
x;
|
||||
type = lib'.types.platform;
|
||||
default.value = lib'.systems.withBuildInfo "x86_64-linux";
|
||||
};
|
||||
|
||||
target = lib.options.create {
|
||||
description = "The target platform for the package.";
|
||||
type = lib.types.string;
|
||||
default.value = "x86_64-linux";
|
||||
# apply = raw: let
|
||||
# system = lib'.systems.from.string raw;
|
||||
# in {
|
||||
# inherit raw system;
|
||||
|
||||
# double = lib'.systems.into.double system;
|
||||
# triple = lib'.systems.into.triple system;
|
||||
# };
|
||||
apply = raw: let
|
||||
system = lib'.systems.from.string raw;
|
||||
x = lib'.systems.withBuildInfo raw;
|
||||
in
|
||||
x;
|
||||
type = lib'.types.platform;
|
||||
default.value = lib'.systems.withBuildInfo "x86_64-linux";
|
||||
};
|
||||
};
|
||||
|
||||
name = lib.options.create {
|
||||
description = "The name of the package.";
|
||||
type = lib.types.string;
|
||||
default = {
|
||||
text = "\${config.pname}-\${config.version}";
|
||||
value =
|
||||
if config.pname != null && config.version != null
|
||||
then "${config.pname}-${config.version}"
|
||||
else "";
|
||||
};
|
||||
};
|
||||
|
||||
pname = lib.options.create {
|
||||
description = "The program name for the package";
|
||||
type = lib.types.nullish lib.types.string;
|
||||
default.value = null;
|
||||
};
|
||||
|
||||
version = lib.options.create {
|
||||
description = "The version for the package.";
|
||||
type = lib.types.nullish lib.types.version;
|
||||
default.value = null;
|
||||
};
|
||||
|
||||
builder = lib.options.create {
|
||||
description = "The builder for the package.";
|
||||
type = lib'.types.builder;
|
||||
};
|
||||
|
||||
phases = lib.options.create {
|
||||
description = "The phases for the package.";
|
||||
type = lib.types.dag.of (lib.types.either lib.types.string (lib.types.function lib.types.string));
|
||||
type = lib.types.dag.of lib.types.string;
|
||||
default.value = {};
|
||||
};
|
||||
|
||||
|
|
@ -366,9 +268,10 @@
|
|||
default.value = {};
|
||||
};
|
||||
|
||||
builder = lib.options.create {
|
||||
description = "The builder for the package.";
|
||||
type = lib'.types.builder;
|
||||
package = lib.options.create {
|
||||
description = "The built derivation.";
|
||||
type = lib.types.derivation;
|
||||
default.value = config.builder.build config;
|
||||
};
|
||||
|
||||
deps = {
|
||||
|
|
@ -432,15 +335,23 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
package = lib.options.create {
|
||||
description = "The built derivation.";
|
||||
type = lib.types.derivation;
|
||||
default.value = config.builder.build config;
|
||||
type =
|
||||
(lib.types.coerceWithLocation initial transform final)
|
||||
// {
|
||||
name = "Package";
|
||||
description = "a package definition";
|
||||
};
|
||||
in
|
||||
type
|
||||
// {
|
||||
children =
|
||||
type.children
|
||||
// {
|
||||
inherit submodule;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ in {
|
|||
platforms = ["i686-linux"];
|
||||
};
|
||||
|
||||
name = "${config.pname}-${config.version}";
|
||||
|
||||
pname = "a";
|
||||
version = "1.0.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
{
|
||||
lib',
|
||||
config,
|
||||
}: let
|
||||
inherit (config) builders packages;
|
||||
{config}: let
|
||||
inherit (config) lib builders packages;
|
||||
in {
|
||||
config.packages.aux.b = {
|
||||
versions = {
|
||||
"latest" = {config}: {
|
||||
options = {
|
||||
custom = lib'.options.create {
|
||||
type = lib'.types.bool;
|
||||
custom = lib.options.create {
|
||||
type = lib.types.bool;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -18,6 +15,8 @@ in {
|
|||
platforms = ["i686-linux"];
|
||||
};
|
||||
|
||||
name = "${config.pname}-${config.version}";
|
||||
|
||||
custom = true;
|
||||
|
||||
pname = "b";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
lib',
|
||||
config,
|
||||
}: let
|
||||
doubles = lib'.systems.doubles.all;
|
||||
{config}: let
|
||||
inherit (config) lib;
|
||||
|
||||
doubles = lib.systems.doubles.all;
|
||||
|
||||
packages = builtins.removeAttrs config.packages ["cross"];
|
||||
in {
|
||||
|
|
@ -17,13 +15,13 @@ in {
|
|||
packages = lib.options.create {
|
||||
description = "The package set.";
|
||||
type = lib.types.submodule {
|
||||
freeform = lib.types.attrs.of (lib.types.submodule {freeform = lib'.types.alias;});
|
||||
freeform = lib.types.packages;
|
||||
|
||||
options.cross = lib.attrs.generate doubles (
|
||||
system:
|
||||
lib.options.create {
|
||||
description = "The cross-compiled package set for the ${system} target.";
|
||||
type = lib'.types.packages;
|
||||
type = lib.types.packages;
|
||||
default = {};
|
||||
}
|
||||
);
|
||||
|
|
@ -49,38 +47,39 @@ in {
|
|||
builtins.mapAttrs (
|
||||
name: alias: let
|
||||
setHost = package:
|
||||
if package != {}
|
||||
then
|
||||
(package.extend (
|
||||
{config}: {
|
||||
config = {
|
||||
platform = {
|
||||
host = lib.modules.overrides.force system;
|
||||
target = lib.modules.overrides.default system;
|
||||
};
|
||||
package;
|
||||
# if package != {}
|
||||
# then
|
||||
# (package.extend (
|
||||
# {config}: {
|
||||
# config = {
|
||||
# platform = {
|
||||
# host = lib.modules.overrides.force system;
|
||||
# target = lib.modules.overrides.default system;
|
||||
# };
|
||||
|
||||
deps = {
|
||||
build = {
|
||||
only = setHost package.deps.build.only;
|
||||
build = setHost package.deps.build.build;
|
||||
host = setHost package.deps.build.host;
|
||||
target = setHost package.deps.build.target;
|
||||
};
|
||||
host = {
|
||||
only = setHost package.deps.host.only;
|
||||
host = setHost package.deps.host.host;
|
||||
target = setHost package.deps.host.target;
|
||||
};
|
||||
target = {
|
||||
only = setHost package.deps.target.only;
|
||||
target = setHost package.deps.target.target;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
))
|
||||
.config
|
||||
else package;
|
||||
# deps = {
|
||||
# build = {
|
||||
# only = setHost package.deps.build.only;
|
||||
# build = setHost package.deps.build.build;
|
||||
# host = setHost package.deps.build.host;
|
||||
# target = setHost package.deps.build.target;
|
||||
# };
|
||||
# host = {
|
||||
# only = setHost package.deps.host.only;
|
||||
# host = setHost package.deps.host.host;
|
||||
# target = setHost package.deps.host.target;
|
||||
# };
|
||||
# target = {
|
||||
# only = setHost package.deps.target.only;
|
||||
# target = setHost package.deps.target.target;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
# ))
|
||||
# .config
|
||||
# else package;
|
||||
|
||||
updated =
|
||||
alias
|
||||
|
|
|
|||
Loading…
Reference in a new issue