start to untangle lib

This commit is contained in:
Jeff Hykin 2024-05-25 11:44:17 -04:00
parent ab9110a43b
commit 97466d7f6d

View file

@ -11,13 +11,22 @@ let
} }
); );
static = loadStatic ../.; static = loadStatic ../.;
untangledLib = {
# constants
sourceTypes = static.setup.sourceTypes;
licenses = static.setup.licenses;
maintainers = static.setup.maintainers;
teams = static.setup.teams;
builtins = builtins;# just to be overridable
loadStatic = loadStatic;
};
inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible; inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible;
lib = makeExtensible (self: let lib = makeExtensible (self: let
callLibs = file: import file { lib = self; }; callLibs = file: import file { lib = self; };
in { in untangledLib // {
builtins = builtins;
# often used, or depending on very little # often used, or depending on very little
trivial = callLibs ./trivial.nix; trivial = callLibs ./trivial.nix;
fixedPoints = callLibs ./fixed-points.nix; fixedPoints = callLibs ./fixed-points.nix;
@ -31,8 +40,6 @@ let
# packaging # packaging
customisation = callLibs ./customisation.nix; customisation = callLibs ./customisation.nix;
derivations = callLibs ./derivations.nix; derivations = callLibs ./derivations.nix;
maintainers = static.setup.maintainers;
teams = static.setup.teams;
meta = callLibs ./meta.nix; meta = callLibs ./meta.nix;
versions = callLibs ./versions.nix; versions = callLibs ./versions.nix;
@ -42,8 +49,6 @@ let
types = callLibs ./types.nix; types = callLibs ./types.nix;
# constants # constants
licenses = static.setup.licenses;
sourceTypes = static.setup.sourceTypes;
systems = callLibs ./systems; systems = callLibs ./systems;
# serialization # serialization
@ -163,7 +168,5 @@ let
runTests testAllTrue; runTests testAllTrue;
inherit (self.versions) inherit (self.versions)
splitVersion; splitVersion;
loadStatic = loadStatic;
}); });
in lib in lib