auxolotl/labs
24
9
Fork 5
Code Issues1 Pull requests2 Projects Releases Packages Wiki Activity Actions

chore: format code

Browse source
This commit is contained in:
Jake Hamilton 2025-03-11 22:47:02 -07:00
parent a17ac0ff2b
commit 397419d8ab
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
17 changed files with 511 additions and 501 deletions

6
.editorconfig Normal file
View file

@ -0,0 +1,6 @@
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
indent_style = space
indent_size = 2

10
lib/src/attrs/default.nix
View file

@ -30,10 +30,12 @@ lib: {
process currentPath values process currentPath values
); );
in in
process [ ] [ process
x [ ]
y [
]; x
y
];
## Merge two attribute sets recursively. Any values that are _not_ attribute sets ## Merge two attribute sets recursively. Any values that are _not_ attribute sets
## will be overridden with the value from `y` first if it exists and then `x` ## will be overridden with the value from `y` first if it exists and then `x`

33
lib/src/dag/default.test.nix
View file

@ -75,10 +75,13 @@ in
"entries.between" = "entries.between" =
let let
expected = true; expected = true;
graph = lib.dag.entries.between "example" [ ] [ ] [ graph =
null lib.dag.entries.between "example" [ ]
null [ ]
]; [
null
null
];
actual = lib.dag.validate.graph graph; actual = lib.dag.validate.graph graph;
in in
actual == expected; actual == expected;
@ -97,10 +100,13 @@ in
"entries.before" = "entries.before" =
let let
expected = true; expected = true;
graph = lib.dag.entries.before "example" [ ] [ graph =
null lib.dag.entries.before "example"
null [ ]
]; [
null
null
];
actual = lib.dag.validate.graph graph; actual = lib.dag.validate.graph graph;
in in
actual == expected; actual == expected;
@ -108,10 +114,13 @@ in
"entries.after" = "entries.after" =
let let
expected = true; expected = true;
graph = lib.dag.entries.after "example" [ ] [ graph =
null lib.dag.entries.after "example"
null [ ]
]; [
null
null
];
actual = lib.dag.validate.graph graph; actual = lib.dag.validate.graph graph;
in in
actual == expected; actual == expected;

10
lib/src/default.nix
View file

@ -56,10 +56,12 @@ let
if isSingleValue || isComplete then builtins.elemAt values 0 else process currentPath values if isSingleValue || isComplete then builtins.elemAt values 0 else process currentPath values
); );
in in
process [ ] [ process
x [ ]
y [
]; x
y
];
## Merge two attribute sets recursively. Any values that are _not_ attribute sets ## Merge two attribute sets recursively. Any values that are _not_ attribute sets
## will be overridden with the value from `y` first if it exists and then `x` ## will be overridden with the value from `y` first if it exists and then `x`

50
lib/src/modules/default.test.nix
View file

@ -299,13 +299,16 @@ in
} }
]; ];
}; };
actual = lib.modules.combine [ ] [ actual =
(lib.modules.normalize "/aux/example.nix" "example" { lib.modules.combine
config = { [ ]
x = 1; [
}; (lib.modules.normalize "/aux/example.nix" "example" {
}) config = {
]; x = 1;
};
})
];
in in
actual == expected; actual == expected;
@ -318,22 +321,25 @@ in
value = 2; value = 2;
} }
]; ];
actual = lib.modules.combine [ ] [ actual =
(lib.modules.normalize "/aux/example1.nix" "example2" { lib.modules.combine
options = { [ ]
x = lib.options.create { }; [
}; (lib.modules.normalize "/aux/example1.nix" "example2" {
options = {
x = lib.options.create { };
};
config = { config = {
x = 1; x = 1;
}; };
}) })
(lib.modules.normalize "/aux/example2.nix" "example2" { (lib.modules.normalize "/aux/example2.nix" "example2" {
config = { config = {
y = 2; y = 2;
}; };
}) })
]; ];
in in
(actual.unmatched == unmatched) && actual.matched ? x; (actual.unmatched == unmatched) && actual.matched ? x;
}; };

285
lib/src/types/default.nix
View file

@ -49,18 +49,18 @@ lib: {
## ##
## @type Attrs -> Attrs ## @type Attrs -> Attrs
create = create =
settings@{ name settings@{
, description ? name name,
, fallback ? { } description ? name,
, check ? lib.fp.const true fallback ? { },
, merge ? lib.options.merge.default check ? lib.fp.const true,
, functor ? lib.types.functor name merge ? lib.options.merge.default,
, mergeType ? lib.types.merge functor functor ? lib.types.functor name,
, getSubOptions ? lib.fp.const { } mergeType ? lib.types.merge functor,
, getSubModules ? null getSubOptions ? lib.fp.const { },
, withSubModules ? lib.fp.const null getSubModules ? null,
, children ? { } withSubModules ? lib.fp.const null,
, children ? { },
}: }:
{ {
__type__ = "type"; __type__ = "type";
@ -118,16 +118,13 @@ lib: {
else else
builtins.typeOf value; builtins.typeOf value;
commonType = builtins.foldl' commonType = builtins.foldl' (
( type: definition:
type: definition: if getType definition.value != type then
if getType definition.value != type then builtins.throw "The option `${identifier}` has conflicting definitions in ${serializedFiles}"
builtins.throw "The option `${identifier}` has conflicting definitions in ${serializedFiles}" else
else type
type ) (getType first.value) definitions;
)
(getType first.value)
definitions;
mergeStringifiableAttrs = lib.options.merge.one; mergeStringifiableAttrs = lib.options.merge.one;
@ -143,12 +140,10 @@ lib: {
location: definitions: x: location: definitions: x:
let let
resolvedLocation = location ++ [ "<function body>" ]; resolvedLocation = location ++ [ "<function body>" ];
resolvedDefinitions = builtins.map resolvedDefinitions = builtins.map (definition: {
(definition: { __file__ = definition.__file__;
__file__ = definition.__file__; value = definition.value x;
value = definition.value x; }) definitions;
})
definitions;
in in
lib.types.any.merge resolvedLocation resolvedDefinitions; lib.types.any.merge resolvedLocation resolvedDefinitions;
@ -205,15 +200,14 @@ lib: {
## @type Int -> Int -> Attrs ## @type Int -> Int -> Attrs
between = between =
start: end: start: end:
assert lib.errors.trace assert lib.errors.trace (
( start <= end
start <= end ) "lib.types.ints.between start must be less than or equal to end";
) "lib.types.ints.between start must be less than or equal to end"; lib.types.withCheck lib.types.int (value: value >= start && value <= end)
lib.types.withCheck lib.types.int (value: value >= start && value <= end) // {
// { name = "IntBetween";
name = "IntBetween"; description = "integer between ${description start end}";
description = "integer between ${description start end}"; };
};
## Create a type that allows an integer value between a given range with a specific ## Create a type that allows an integer value between a given range with a specific
## number of bits. ## number of bits.
@ -323,15 +317,14 @@ lib: {
## @type Int -> Int -> Attrs ## @type Int -> Int -> Attrs
between = between =
start: end: start: end:
assert lib.errors.trace assert lib.errors.trace (
( start <= end
start <= end ) "lib.types.numbers.between start must be less than or equal to end";
) "lib.types.numbers.between start must be less than or equal to end"; lib.types.withCheck lib.types.number (value: value >= start && value <= end)
lib.types.withCheck lib.types.number (value: value >= start && value <= end) // {
// { name = "NumberBetween";
name = "NumberBetween"; description = "numbereger between ${description start end}";
description = "numbereger between ${description start end}"; };
};
in in
{ {
inherit between; inherit between;
@ -486,12 +479,10 @@ lib: {
let let
normalize = normalize =
definition: definition:
builtins.mapAttrs builtins.mapAttrs (name: value: {
(name: value: { __file__ = definition.__file__;
__file__ = definition.__file__; value = value;
value = value; }) definition.value;
})
definition.value;
normalized = builtins.map normalize definitions; normalized = builtins.map normalize definitions;
zipper = zipper =
name: definitions: (lib.options.merge.definitions (location ++ [ name ]) type definitions).optional; name: definitions: (lib.options.merge.definitions (location ++ [ name ]) type definitions).optional;
@ -528,19 +519,17 @@ lib: {
let let
normalize = normalize =
definition: definition:
builtins.mapAttrs builtins.mapAttrs (name: value: {
(name: value: { __file__ = definition.__file__;
__file__ = definition.__file__; value = value;
value = value; }) definition.value;
})
definition.value;
normalized = builtins.map normalize definitions; normalized = builtins.map normalize definitions;
zipper = zipper =
name: definitions: name: definitions:
let let
merged = lib.options.merge.definitions (location ++ [ name ]) type definitions; merged = lib.options.merge.definitions (location ++ [ name ]) type definitions;
in in
merged.optional.value or type.fallback.value or merged.merged; merged.optional.value or type.fallback.value or merged.merged;
in in
builtins.zipAttrsWith zipper normalized; builtins.zipAttrsWith zipper normalized;
getSubOptions = prefix: type.getSubOptions (prefix ++ [ "<name>" ]); getSubOptions = prefix: type.getSubOptions (prefix ++ [ "<name>" ]);
@ -616,28 +605,25 @@ lib: {
merge = merge =
location: definitions: location: definitions:
let let
result = lib.lists.mapWithIndex1 result = lib.lists.mapWithIndex1 (
( i: definition:
i: definition: lib.lists.mapWithIndex1 (
lib.lists.mapWithIndex1 j: value:
( let
j: value: resolved =
let lib.options.merge.definitions
resolved = (location ++ [ "[definition ${builtins.toString i}-entry ${builtins.toString j}]" ])
lib.options.merge.definitions (location ++ [ "[definition ${builtins.toString i}-entry ${builtins.toString j}]" ]) type
type [
[ {
{ file = definition.file;
file = definition.file; value = value;
value = value; }
} ];
]; in
in resolved.optional
resolved.optional ) definition.value
) ) definitions;
definition.value
)
definitions;
merged = lib.lists.flatten result; merged = lib.lists.flatten result;
filtered = builtins.filter (definition: definition ? value) merged; filtered = builtins.filter (definition: definition ? value) merged;
@ -792,11 +778,11 @@ lib: {
## ##
## @type { modules :: List Module, args? :: Attrs, description? :: String | Null, shorthand? :: Bool } -> Attrs ## @type { modules :: List Module, args? :: Attrs, description? :: String | Null, shorthand? :: Bool } -> Attrs
of = of =
settings@{ modules settings@{
, args ? { } modules,
, description ? null args ? { },
, shorthand ? true description ? null,
, shorthand ? true,
}: }:
let let
getModules = builtins.map ( getModules = builtins.map (
@ -805,12 +791,9 @@ lib: {
let let
# TODO: Figure out if we can apply additional attributes to the generated module. # TODO: Figure out if we can apply additional attributes to the generated module.
# Currently this causes issues to do with redefined options. # Currently this causes issues to do with redefined options.
rest = builtins.removeAttrs rest = builtins.removeAttrs (lib.attrs.filter (
(lib.attrs.filter name: value: builtins.elem name lib.modules.VALID_KEYS
( ) definition.value) [ "freeform" ];
name: value: builtins.elem name lib.modules.VALID_KEYS
)
definition.value) [ "freeform" ];
in in
if definition.value ? config then if definition.value ? config then
rest rest
@ -921,10 +904,10 @@ lib: {
## ##
## @type { module :: Module, name? :: String, description? :: String } -> Attrs ## @type { module :: Module, name? :: String, description? :: String } -> Attrs
portable = portable =
{ name ? "PortableSubmodule" {
, description ? "portable submodule" name ? "PortableSubmodule",
, module description ? "portable submodule",
, module,
}: }:
let let
normalize = normalize =
@ -948,44 +931,50 @@ lib: {
builtins.concatLists normalized; builtins.concatLists normalized;
}; };
base = { config }: { base =
options = { { config }:
__modules__ = lib.options.create { {
description = "User specified modules to be evaluated."; options = {
type = lib.types.list.of (initial // { merge = lib.options.merge.one; }); __modules__ = lib.options.create {
internal = true; description = "User specified modules to be evaluated.";
default.value = [ ]; type = lib.types.list.of (initial // { merge = lib.options.merge.one; });
}; internal = true;
default.value = [ ];
};
extend = lib.options.create { extend = lib.options.create {
description = "Extend the submodule configuration."; description = "Extend the submodule configuration.";
type = lib.types.function lib.types.raw; type = lib.types.function lib.types.raw;
internal = true; internal = true;
writable = false; writable = false;
default.value = module: default.value =
let module:
normalized = let
if builtins.isList module then module normalized =
else if builtins.isFunction module || module ? config then if builtins.isList module then
[ module ] module
else [{ config = module; }]; else if builtins.isFunction module || module ? config then
[ module ]
else
[ { config = module; } ];
modules = config.__modules__ ++ normalized; modules = config.__modules__ ++ normalized;
result = lib.modules.run { result = lib.modules.run {
modules = [ modules = [
module module
base base
{ config.__modules__ = modules; } { config.__modules__ = modules; }
] ++ modules; ] ++ modules;
}; };
in in
result.config; result.config;
};
}; };
}; };
};
transform = location: value: transform =
location: value:
let let
modules = lib.lists.from.any (normalize value); modules = lib.lists.from.any (normalize value);
@ -1001,11 +990,10 @@ lib: {
result.config; result.config;
final = lib.types.raw // { final = lib.types.raw // {
merge = location: definitions: merge =
location: definitions:
let let
modules = lib.lists.flatten ( modules = lib.lists.flatten (builtins.map (definition: normalize definition.value) definitions);
builtins.map (definition: normalize definition.value) definitions
);
result = lib.modules.run { result = lib.modules.run {
prefix = location; prefix = location;
@ -1021,7 +1009,8 @@ lib: {
type = lib.types.coerceWithLocation initial transform final; type = lib.types.coerceWithLocation initial transform final;
in in
type // { type
// {
inherit name description; inherit name description;
children = type.children // { children = type.children // {
inherit module base; inherit module base;
@ -1051,12 +1040,10 @@ lib: {
merge = location: definitions: { merge = location: definitions: {
includes = includes =
modules modules
++ builtins.map ++ builtins.map (definition: {
(definition: { __file__ = "${definition.__file__}; via ${lib.options.getIdentifier location}";
__file__ = "${definition.__file__}; via ${lib.options.getIdentifier location}"; includes = [ definition.value ];
includes = [ definition.value ]; }) definitions;
})
definitions;
}; };
getSubOptions = submodule.getSubOptions; getSubOptions = submodule.getSubOptions;
getSubModules = submodule.getSubModules; getSubModules = submodule.getSubModules;
@ -1092,12 +1079,10 @@ lib: {
location: definitions: location: definitions:
let let
first = builtins.elemAt definitions 0; first = builtins.elemAt definitions 0;
modules = builtins.map modules = builtins.map (definition: {
(definition: { __file__ = definition.__file__;
__file__ = definition.__file__; options = lib.options.create { type = definition.value; };
options = lib.options.create { type = definition.value; }; }) definitions;
})
definitions;
merged = lib.modules.fixup location (lib.options.merge.declarations location modules); merged = lib.modules.fixup location (lib.options.merge.declarations location modules);
in in
if builtins.length definitions == 1 then first.value else merged.type; if builtins.length definitions == 1 then first.value else merged.type;
@ -1330,12 +1315,10 @@ lib: {
merge = merge =
location: definitions: location: definitions:
submodule.merge location ( submodule.merge location (
builtins.map builtins.map (definition: {
(definition: { __file__ = definition.__file__;
__file__ = definition.__file__; value = normalize definition;
value = normalize definition; }) definitions
})
definitions
); );
}; };
}; };

32
lib/src/types/default.test.nix
View file

@ -5,19 +5,21 @@ in
"PortableSubmodule" = { "PortableSubmodule" = {
"is portable" = "is portable" =
let let
submodule = { config }: { submodule =
options = { { config }:
primitive = lib.options.create { {
type = lib.types.string; options = {
default.value = "<default>"; primitive = lib.options.create {
}; type = lib.types.string;
default.value = "<default>";
};
computed = lib.options.create { computed = lib.options.create {
type = lib.types.string; type = lib.types.string;
default.value = "computed: ${config.primitive}"; default.value = "computed: ${config.primitive}";
};
}; };
}; };
};
option = lib.options.create { option = lib.options.create {
default.value = { }; default.value = { };
@ -29,11 +31,13 @@ in
moduleA = { moduleA = {
options.a = option; options.a = option;
}; };
moduleB = { config }: { moduleB =
options.b = option; { config }:
{
options.b = option;
config.b = config.a; config.b = config.a;
}; };
moduleC = { moduleC = {
config.b.primitive = "custom"; config.b.primitive = "custom";
}; };

6
tidepool/src/export.nix
View file

@ -24,8 +24,10 @@ in
cross-foundation-glibc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.glibc; cross-foundation-glibc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.glibc;
cross-foundation-binutils-x86_64-linux = config.packages.cross.x86_64-linux.foundation.binutils; cross-foundation-binutils-x86_64-linux = config.packages.cross.x86_64-linux.foundation.binutils;
cross-tool-foundation-gcc-newlib-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-newlib; cross-tool-foundation-gcc-newlib-x86_64-linux =
cross-tool-foundation-gcc-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-cross; config.packages.cross-tools.x86_64-linux.foundation.gcc-newlib;
cross-tool-foundation-gcc-x86_64-linux =
config.packages.cross-tools.x86_64-linux.foundation.gcc-cross;
cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc-bootstrap; cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc-bootstrap;
example-a = config.packages.foundation.gcc.versions.latest.extend { example-a = config.packages.foundation.gcc.versions.latest.extend {

16
tidepool/src/lib/packages.nix
View file

@ -211,15 +211,13 @@ in
path: path:
let let
dependencies = lib.attrs.selectOrThrow path collected; dependencies = lib.attrs.selectOrThrow path collected;
hooks = builtins.map hooks = builtins.map (
( dependency:
dependency: let
let getHooks = dependency.hooks or (lib.fp.const { });
getHooks = dependency.hooks or (lib.fp.const { }); in
in getHooks ctx
getHooks ctx ) dependencies;
)
dependencies;
in in
hooks; hooks;
in in

19
tidepool/src/lib/types.nix
View file

@ -263,7 +263,8 @@ in
type = lib.types.function lib.types.raw; type = lib.types.function lib.types.raw;
internal = true; internal = true;
writable = false; writable = false;
default.value = module: default.value =
module:
let let
normalized = normalized =
if builtins.isList module then if builtins.isList module then
@ -271,17 +272,19 @@ in
else if builtins.isFunction module || module ? config then else if builtins.isFunction module || module ? config then
[ module ] [ module ]
else else
[{ [
config = module; {
}]; config = module;
}
];
modules = config.__modules__ ++ normalized; modules = config.__modules__ ++ normalized;
result = lib.modules.run { result = lib.modules.run {
modules = [ modules = [
submodule submodule
{ config.__modules__ = modules; } { config.__modules__ = modules; }
] ++ modules; ] ++ modules;
}; };
in in
result.config; result.config;

103
tidepool/src/packages/default.nix
View file

@ -4,7 +4,10 @@ let
doubles = lib.systems.doubles.all; doubles = lib.systems.doubles.all;
packages = builtins.removeAttrs config.packages [ "cross" "cross-tools" ]; packages = builtins.removeAttrs config.packages [
"cross"
"cross-tools"
];
in in
{ {
includes = [ includes = [
@ -64,64 +67,60 @@ in
config = { config = {
packages.cross-tools = lib.attrs.generate doubles ( packages.cross-tools = lib.attrs.generate doubles (
system: system:
builtins.mapAttrs builtins.mapAttrs (
( namespace:
namespace: builtins.mapAttrs (
builtins.mapAttrs ( name: alias:
name: alias: let
let setTarget =
setTarget = package:
package: package
package // {
// { __modules__ = package.__modules__ ++ [
__modules__ = package.__modules__ ++ [ {
{ config.platform = {
config.platform = { target = lib.modules.override 5 system;
target = lib.modules.override 5 system; };
}; }
} ];
]; };
};
updated = alias // { updated = alias // {
versions = builtins.mapAttrs (version: package: setTarget package) alias.versions; versions = builtins.mapAttrs (version: package: setTarget package) alias.versions;
}; };
in in
updated updated
)
) )
packages ) packages
); );
packages.cross = lib.attrs.generate doubles ( packages.cross = lib.attrs.generate doubles (
system: system:
builtins.mapAttrs builtins.mapAttrs (
( namespace:
namespace: builtins.mapAttrs (
builtins.mapAttrs ( name: alias:
name: alias: let
let setPlatform =
setPlatform = package:
package: package
package // {
// { __modules__ = package.__modules__ ++ [
__modules__ = package.__modules__ ++ [ {
{ config.platform = {
config.platform = { host = lib.modules.override 5 system;
host = lib.modules.override 5 system; target = lib.modules.override 5 system;
target = lib.modules.override 5 system; };
}; }
} ];
]; };
};
updated = alias // { updated = alias // {
versions = builtins.mapAttrs (version: package: setPlatform package) alias.versions; versions = builtins.mapAttrs (version: package: setPlatform package) alias.versions;
}; };
in in
updated updated
)
) )
packages ) packages
); );
}; };
} }

63
tidepool/src/packages/foundation/binutils/default.nix
View file

@ -1,8 +1,8 @@
{ lib {
, lib' lib,
, config lib',
, options config,
, options,
}: }:
let let
inherit (config) inherit (config)
@ -56,13 +56,12 @@ in
only = { only = {
gcc = lib.modules.when (!isBootstrapped) ( gcc = lib.modules.when (!isBootstrapped) (
if isCross then if isCross then
packages.foundation.gcc-cross.versions.latest.extend packages.foundation.gcc-cross.versions.latest.extend {
{ platform = lib.modules.override 0 {
platform = lib.modules.override 0 { inherit (config.platform) build target;
inherit (config.platform) build target; host = config.platform.build;
host = config.platform.build; };
}; }
}
else else
packages.foundation.gcc.versions.latest packages.foundation.gcc.versions.latest
); );
@ -85,26 +84,28 @@ in
}; };
}; };
env = { env =
PATH = lib.paths.bin ( {
lib.lists.when (isBootstrapped) [ foundation.stage2-gcc ] PATH = lib.paths.bin (
lib.lists.when (isBootstrapped) [ foundation.stage2-gcc ]
++ [ ++ [
foundation.stage2-gcc foundation.stage2-gcc
foundation.stage2-binutils foundation.stage2-binutils
foundation.stage2-gnumake foundation.stage2-gnumake
foundation.stage2-gnupatch foundation.stage2-gnupatch
foundation.stage2-gnused foundation.stage2-gnused
foundation.stage2-gnugrep foundation.stage2-gnugrep
foundation.stage2-gawk foundation.stage2-gawk
foundation.stage2-diffutils foundation.stage2-diffutils
foundation.stage2-findutils foundation.stage2-findutils
foundation.stage2-gnutar foundation.stage2-gnutar
foundation.stage1-xz foundation.stage1-xz
] ]
); );
} // (lib.attrs.when (isCross) { }
LDFLAGS_FOR_TARGET = "-B${config.deps.build.only.glibc.package}/lib -L${config.deps.build.only.glibc.package}/lib -I${config.deps.build.only.glibc.package}/include"; // (lib.attrs.when (isCross) {
}); LDFLAGS_FOR_TARGET = "-B${config.deps.build.only.glibc.package}/lib -L${config.deps.build.only.glibc.package}/lib -I${config.deps.build.only.glibc.package}/include";
});
phases = phases =
let let

135
tidepool/src/packages/foundation/gcc/bootstrap.nix
View file

@ -8,77 +8,74 @@ in
{ {
config.packages.foundation.gcc-bootstrap = { config.packages.foundation.gcc-bootstrap = {
versions = { versions = {
"latest" = config.packages.foundation.gcc.versions.latest.extend "latest" = config.packages.foundation.gcc.versions.latest.extend (
( { config }:
{ config }: {
{ config = {
config = { meta = {
meta = { platforms = lib.modules.override 0 [
platforms = lib.modules.override 0 [ "i686-linux"
"i686-linux"
];
};
deps = {
build = {
build = {
gcc = lib.modules.override 0 (
packages.foundation.gcc-cross.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = "i686-linux";
};
}
);
binutils = lib.modules.override 0 (
packages.foundation.binutils.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = config.platform.host;
};
}
);
glibc = lib.modules.override 0 (
packages.foundation.glibc.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = config.platform.host;
};
}
);
};
};
};
env = {
LIBRARY_PATH = lib.modules.override 0 "${config.deps.build.build.glibc.package}/lib";
LDFLAGS_FOR_TARGET =
lib.modules.override 0
"-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
};
configureFlags = lib.modules.override 0 [
"--prefix=${builtins.placeholder "out"}"
# Pretend we're native even though we're not
"--build=${config.platform.target.triple}"
"--host=${config.platform.host.triple}"
"--target=${config.platform.target.triple}"
"--with-as=${config.deps.build.build.binutils.package}/bin/as"
"--with-ld=${config.deps.build.build.binutils.package}/bin/ld"
"--enable-languages=c,c++"
"--disable-bootstrap"
"--disable-libsanitizer"
"--disable-multilib"
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
"--with-gxx-include-dir=${placeholder "out"}/include/c++/${config.version}/"
"--with-build-sysroot=/"
]; ];
}; };
}
); deps = {
build = {
build = {
gcc = lib.modules.override 0 (
packages.foundation.gcc-cross.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = "i686-linux";
};
}
);
binutils = lib.modules.override 0 (
packages.foundation.binutils.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = config.platform.host;
};
}
);
glibc = lib.modules.override 0 (
packages.foundation.glibc.versions.latest.extend {
platform = lib.modules.override 0 {
build = "i686-linux";
target = config.platform.target;
host = config.platform.host;
};
}
);
};
};
};
env = {
LIBRARY_PATH = lib.modules.override 0 "${config.deps.build.build.glibc.package}/lib";
LDFLAGS_FOR_TARGET = lib.modules.override 0 "-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
};
configureFlags = lib.modules.override 0 [
"--prefix=${builtins.placeholder "out"}"
# Pretend we're native even though we're not
"--build=${config.platform.target.triple}"
"--host=${config.platform.host.triple}"
"--target=${config.platform.target.triple}"
"--with-as=${config.deps.build.build.binutils.package}/bin/as"
"--with-ld=${config.deps.build.build.binutils.package}/bin/ld"
"--enable-languages=c,c++"
"--disable-bootstrap"
"--disable-libsanitizer"
"--disable-multilib"
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
"--with-gxx-include-dir=${placeholder "out"}/include/c++/${config.version}/"
"--with-build-sysroot=/"
];
};
}
);
}; };
}; };
} }

164
tidepool/src/packages/foundation/gcc/cross.nix
View file

@ -9,96 +9,90 @@ in
{ {
config.packages.foundation.gcc-cross = { config.packages.foundation.gcc-cross = {
versions = { versions = {
"latest" = config.packages.foundation.gcc.versions.latest.extend "latest" = config.packages.foundation.gcc.versions.latest.extend (
( { config }:
{ config }: {
{ config =
config = let
let programPrefix = lib.strings.when (
programPrefix = lib.strings.when config.platform.build.triple != config.platform.target.triple
( ) "${config.platform.target.triple}-";
config.platform.build.triple != config.platform.target.triple in
) "${config.platform.target.triple}-"; {
in meta = {
{ platforms = lib.modules.override 0 [
meta = { "i686-linux"
platforms = lib.modules.override 0 [ ];
"i686-linux" };
];
};
deps = { deps = {
build = {
build = { build = {
build = { binutils = (
binutils = ( packages.foundation.binutils.versions.latest.extend {
packages.foundation.binutils.versions.latest.extend { platform = lib.modules.override 0 config.platform;
platform = lib.modules.override 0 config.platform; }
} );
); glibc = (
glibc = ( packages.foundation.glibc.versions.latest.extend {
packages.foundation.glibc.versions.latest.extend { platform = lib.modules.override 0 {
platform = lib.modules.override 0 { inherit (config.platform) build target;
inherit (config.platform) build target; host = config.platform.target;
host = config.platform.target; };
}; }
} );
); linux-headers = (
linux-headers = ( packages.foundation.linux-headers.versions.latest.extend {
packages.foundation.linux-headers.versions.latest.extend { platform.target = lib.modules.override 0 config.platform.target;
platform.target = lib.modules.override 0 config.platform.target; }
} );
);
};
}; };
}; };
env = {
# LIBRARY_PATH = lib.modules.override 0 "${foundation.stage1-musl}/lib";
CC = lib.modules.override 0 "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
CXX = lib.modules.override 0 "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
CFLAGS_FOR_TARGET =
lib.modules.override 0
"-Wl,-dynamic-linker -Wl,${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2 -B${config.deps.build.build.glibc.package}/lib";
LDFLAGS_FOR_TARGET =
lib.modules.override 0
"-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
};
configureFlags = lib.modules.override 0 [
"--prefix=${builtins.placeholder "out"}"
"--build=${config.platform.build.triple}"
"--host=${config.platform.host.triple}"
"--target=${config.platform.target.triple}"
"--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
"--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
"--enable-languages=c,c++"
"--disable-libsanitizer"
"--disable-lto"
"--disable-multilib"
"--with-headers=${config.deps.build.build.glibc.package}/include"
"--with-build-sysroot=/"
# "--with-sysroot=${config.deps.build.build.glibc.package}"
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
];
phases.configure = lib.modules.override 0 ''
# Configure
mkdir build
cd build
echo PATH=$PATH
# TODO(vlinkz) Hack to fix missing crti.o and crtn.o. Figure out how to properly find their paths.
mkdir gcc
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} gcc
mkdir -p x86_64-unknown-linux-gnu/libstdc++-v3/src
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} x86_64-unknown-linux-gnu/libstdc++-v3/src
bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
'';
}; };
}
); env = {
# LIBRARY_PATH = lib.modules.override 0 "${foundation.stage1-musl}/lib";
CC = lib.modules.override 0 "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
CXX = lib.modules.override 0 "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
CFLAGS_FOR_TARGET = lib.modules.override 0 "-Wl,-dynamic-linker -Wl,${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2 -B${config.deps.build.build.glibc.package}/lib";
LDFLAGS_FOR_TARGET = lib.modules.override 0 "-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
};
configureFlags = lib.modules.override 0 [
"--prefix=${builtins.placeholder "out"}"
"--build=${config.platform.build.triple}"
"--host=${config.platform.host.triple}"
"--target=${config.platform.target.triple}"
"--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
"--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
"--enable-languages=c,c++"
"--disable-libsanitizer"
"--disable-lto"
"--disable-multilib"
"--with-headers=${config.deps.build.build.glibc.package}/include"
"--with-build-sysroot=/"
# "--with-sysroot=${config.deps.build.build.glibc.package}"
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
];
phases.configure = lib.modules.override 0 ''
# Configure
mkdir build
cd build
echo PATH=$PATH
# TODO(vlinkz) Hack to fix missing crti.o and crtn.o. Figure out how to properly find their paths.
mkdir gcc
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} gcc
mkdir -p x86_64-unknown-linux-gnu/libstdc++-v3/src
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} x86_64-unknown-linux-gnu/libstdc++-v3/src
bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
'';
};
}
);
}; };
}; };
} }

58
tidepool/src/packages/foundation/gcc/default.nix
View file

@ -107,10 +107,9 @@ in
(config.platform.target.triple != config.platform.host.triple) (config.platform.target.triple != config.platform.host.triple)
&& (config.platform.host.triple == config.platform.target.triple); && (config.platform.host.triple == config.platform.target.triple);
programPrefix = lib.strings.when programPrefix = lib.strings.when (
( config.platform.build.triple != config.platform.target.triple
config.platform.build.triple != config.platform.target.triple ) "${config.platform.target.triple}-";
) "${config.platform.target.triple}-";
libc = if isBootstrapped then foundation.stage1-musl else config.deps.build.build.glibc.package; libc = if isBootstrapped then foundation.stage1-musl else config.deps.build.build.glibc.package;
libcLd = libcLd =
@ -148,22 +147,25 @@ in
env = env =
{ {
PATH = lib.modules.when (isBuildBootstrapped) ( PATH = lib.modules.when (isBuildBootstrapped) (
lib.paths.bin ([ lib.paths.bin (
foundation.stage2-gnumake [
foundation.stage2-gnused foundation.stage2-gnumake
foundation.stage2-gnugrep foundation.stage2-gnused
foundation.stage2-gnupatch foundation.stage2-gnugrep
foundation.stage2-gawk foundation.stage2-gnupatch
foundation.stage2-diffutils foundation.stage2-gawk
foundation.stage2-findutils foundation.stage2-diffutils
foundation.stage2-gnutar foundation.stage2-findutils
foundation.stage2-gzip foundation.stage2-gnutar
foundation.stage2-bzip2 foundation.stage2-gzip
foundation.stage1-xz foundation.stage2-bzip2
] ++ (lib.lists.when (isBootstrapped) [ foundation.stage1-xz
foundation.stage2-gcc ]
foundation.stage2-binutils ++ (lib.lists.when (isBootstrapped) [
])) foundation.stage2-gcc
foundation.stage2-binutils
])
)
); );
CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${libcLd}"; CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${libcLd}";
} }
@ -186,7 +188,9 @@ in
else else
[ [
"-Wl,-dynamic-linker" "-Wl,-dynamic-linker"
"-Wl,${config.deps.build.build.glibc.package}/lib/ld-linux${lib.strings.when (target.isx86 && target.is64bit) "-x86-64"}.so.2" "-Wl,${config.deps.build.build.glibc.package}/lib/ld-linux${
lib.strings.when (target.isx86 && target.is64bit) "-x86-64"
}.so.2"
"-B${config.deps.build.build.glibc.package}/lib" "-B${config.deps.build.build.glibc.package}/lib"
# "-idirafter ${config.deps.build.build.glibc.package}/include" # "-idirafter ${config.deps.build.build.glibc.package}/include"
]; ];
@ -246,7 +250,7 @@ in
patch = '' patch = ''
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches} ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
${lib.strings.when (isBootstrapped && !(crossTool || cross))'' ${lib.strings.when (isBootstrapped && !(crossTool || cross)) ''
# force musl even if host triple is gnu # force musl even if host triple is gnu
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
''} ''}
@ -267,12 +271,10 @@ in
install = '' install = ''
# Install # Install
${ ${lib.strings.when (host.is64bit) ''
lib.strings.when (host.is64bit) '' mkdir -p $out/lib
mkdir -p $out/lib ln -s lib $out/lib64
ln -s lib $out/lib64 ''}
''
}
make -j $NIX_BUILD_CORES install make -j $NIX_BUILD_CORES install
''; '';
}; };

7
tidepool/src/packages/foundation/gcc/newlib.nix
View file

@ -13,10 +13,9 @@ in
{ {
config = config =
let let
programPrefix = lib.strings.when programPrefix = lib.strings.when (
( config.platform.build.triple != config.platform.target.triple
config.platform.build.triple != config.platform.target.triple ) "${config.platform.target.triple}-";
) "${config.platform.target.triple}-";
in in
{ {
meta = { meta = {

15
tidepool/src/packages/foundation/linux-headers/default.nix
View file

@ -1,8 +1,8 @@
{ lib {
, lib' lib,
, config lib',
, options config,
, options,
}: }:
let let
inherit (config) inherit (config)
@ -28,7 +28,10 @@ in
config = { config = {
meta = { meta = {
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [
"x86_64-linux"
"i686-linux"
];
}; };
pname = "linux-headers"; pname = "linux-headers";