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

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

@ -30,7 +30,9 @@ lib: {
process currentPath values
);
in
process [ ] [
process
[ ]
[
x
y
];

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

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

4
lib/src/default.nix
View file

@ -56,7 +56,9 @@ let
if isSingleValue || isComplete then builtins.elemAt values 0 else process currentPath values
);
in
process [ ] [
process
[ ]
[
x
y
];

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

@ -299,7 +299,10 @@ in
}
];
};
actual = lib.modules.combine [ ] [
actual =
lib.modules.combine
[ ]
[
(lib.modules.normalize "/aux/example.nix" "example" {
config = {
x = 1;
@ -318,7 +321,10 @@ in
value = 2;
}
];
actual = lib.modules.combine [ ] [
actual =
lib.modules.combine
[ ]
[
(lib.modules.normalize "/aux/example1.nix" "example2" {
options = {
x = lib.options.create { };

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

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

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

@ -5,7 +5,9 @@ in
"PortableSubmodule" = {
"is portable" =
let
submodule = { config }: {
submodule =
{ config }:
{
options = {
primitive = lib.options.create {
type = lib.types.string;
@ -29,7 +31,9 @@ in
moduleA = {
options.a = option;
};
moduleB = { config }: {
moduleB =
{ config }:
{
options.b = option;
config.b = config.a;

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-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-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-cross;
cross-tool-foundation-gcc-newlib-x86_64-linux =
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;
example-a = config.packages.foundation.gcc.versions.latest.extend {

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

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

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

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

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

@ -4,7 +4,10 @@ let
doubles = lib.systems.doubles.all;
packages = builtins.removeAttrs config.packages [ "cross" "cross-tools" ];
packages = builtins.removeAttrs config.packages [
"cross"
"cross-tools"
];
in
{
includes = [
@ -64,8 +67,7 @@ in
config = {
packages.cross-tools = lib.attrs.generate doubles (
system:
builtins.mapAttrs
(
builtins.mapAttrs (
namespace:
builtins.mapAttrs (
name: alias:
@ -89,13 +91,11 @@ in
in
updated
)
)
packages
) packages
);
packages.cross = lib.attrs.generate doubles (
system:
builtins.mapAttrs
(
builtins.mapAttrs (
namespace:
builtins.mapAttrs (
name: alias:
@ -120,8 +120,7 @@ in
in
updated
)
)
packages
) packages
);
};
}

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

@ -1,8 +1,8 @@
{ lib
, lib'
, config
, options
,
{
lib,
lib',
config,
options,
}:
let
inherit (config)
@ -56,8 +56,7 @@ in
only = {
gcc = lib.modules.when (!isBootstrapped) (
if isCross then
packages.foundation.gcc-cross.versions.latest.extend
{
packages.foundation.gcc-cross.versions.latest.extend {
platform = lib.modules.override 0 {
inherit (config.platform) build target;
host = config.platform.build;
@ -85,7 +84,8 @@ in
};
};
env = {
env =
{
PATH = lib.paths.bin (
lib.lists.when (isBootstrapped) [ foundation.stage2-gcc ]
++ [
@ -102,7 +102,8 @@ in
foundation.stage1-xz
]
);
} // (lib.attrs.when (isCross) {
}
// (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";
});

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

@ -8,8 +8,7 @@ in
{
config.packages.foundation.gcc-bootstrap = {
versions = {
"latest" = config.packages.foundation.gcc.versions.latest.extend
(
"latest" = config.packages.foundation.gcc.versions.latest.extend (
{ config }:
{
config = {
@ -55,9 +54,7 @@ in
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";
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 [

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

@ -9,14 +9,12 @@ in
{
config.packages.foundation.gcc-cross = {
versions = {
"latest" = config.packages.foundation.gcc.versions.latest.extend
(
"latest" = config.packages.foundation.gcc.versions.latest.extend (
{ config }:
{
config =
let
programPrefix = lib.strings.when
(
programPrefix = lib.strings.when (
config.platform.build.triple != config.platform.target.triple
) "${config.platform.target.triple}-";
in
@ -56,12 +54,8 @@ in
# 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";
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 [

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

@ -107,8 +107,7 @@ in
(config.platform.target.triple != config.platform.host.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.target.triple}-";
@ -148,7 +147,8 @@ in
env =
{
PATH = lib.modules.when (isBuildBootstrapped) (
lib.paths.bin ([
lib.paths.bin (
[
foundation.stage2-gnumake
foundation.stage2-gnused
foundation.stage2-gnugrep
@ -160,10 +160,12 @@ in
foundation.stage2-gzip
foundation.stage2-bzip2
foundation.stage1-xz
] ++ (lib.lists.when (isBootstrapped) [
]
++ (lib.lists.when (isBootstrapped) [
foundation.stage2-gcc
foundation.stage2-binutils
]))
])
)
);
CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${libcLd}";
}
@ -186,7 +188,9 @@ in
else
[
"-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"
# "-idirafter ${config.deps.build.build.glibc.package}/include"
];
@ -267,12 +271,10 @@ in
install = ''
# Install
${
lib.strings.when (host.is64bit) ''
${lib.strings.when (host.is64bit) ''
mkdir -p $out/lib
ln -s lib $out/lib64
''
}
''}
make -j $NIX_BUILD_CORES install
'';
};

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

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

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

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