diff --git a/src/modules/_template/implementation.nix b/src/modules/_template/implementation.nix index 5856f802..f312ce3a 100644 --- a/src/modules/_template/implementation.nix +++ b/src/modules/_template/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; in { config = { diff --git a/src/modules/_template/interface.nix b/src/modules/_template/interface.nix index a13caca5..eda9b20c 100644 --- a/src/modules/_template/interface.nix +++ b/src/modules/_template/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/builders/implementation.nix b/src/modules/builders/implementation.nix index 64b0f804..b397cba9 100644 --- a/src/modules/builders/implementation.nix +++ b/src/modules/builders/implementation.nix @@ -1,6 +1,5 @@ {config, ...}: let - lib = config.lib; - l = lib // builtins; + l = config.lib; defaults = { # TODO: define a priority in each builder and remove the defaults here. rust = "build-rust-package"; @@ -19,7 +18,7 @@ in { builders = funcs.import_ collectedModules; buildersBySubsystem = - lib.mapAttrs + l.mapAttrs ( subsystem: builders: builders diff --git a/src/modules/discoverers.default-discoverer/implementation.nix b/src/modules/discoverers.default-discoverer/implementation.nix index e11a7ef1..3788fc01 100644 --- a/src/modules/discoverers.default-discoverer/implementation.nix +++ b/src/modules/discoverers.default-discoverer/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; translatorsWithDiscoverFunc = l.filter diff --git a/src/modules/dlib.construct/implementation.nix b/src/modules/dlib.construct/implementation.nix index 5ebad67e..2202ca18 100644 --- a/src/modules/dlib.construct/implementation.nix +++ b/src/modules/dlib.construct/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; in { config.dlib.construct = { discoveredProject = { diff --git a/src/modules/dlib.construct/interface.nix b/src/modules/dlib.construct/interface.nix index 1d54e6e6..68e0fb54 100644 --- a/src/modules/dlib.construct/interface.nix +++ b/src/modules/dlib.construct/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.dlib.construct = { diff --git a/src/modules/dlib.parsing/implementation.nix b/src/modules/dlib.parsing/implementation.nix index 053cbb72..a488232f 100644 --- a/src/modules/dlib.parsing/implementation.nix +++ b/src/modules/dlib.parsing/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; idToLicenseKey = l.mapAttrs' diff --git a/src/modules/dlib.parsing/interface.nix b/src/modules/dlib.parsing/interface.nix index d76c2873..c0c43d3f 100644 --- a/src/modules/dlib.parsing/interface.nix +++ b/src/modules/dlib.parsing/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.dlib = { diff --git a/src/modules/dlib.simpleTranslate2/implementation.nix b/src/modules/dlib.simpleTranslate2/implementation.nix index 2a53d9ea..4734f778 100644 --- a/src/modules/dlib.simpleTranslate2/implementation.nix +++ b/src/modules/dlib.simpleTranslate2/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; expectedFields = [ "name" diff --git a/src/modules/dlib.simpleTranslate2/interface.nix b/src/modules/dlib.simpleTranslate2/interface.nix index 0730f732..511e659d 100644 --- a/src/modules/dlib.simpleTranslate2/interface.nix +++ b/src/modules/dlib.simpleTranslate2/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.dlib.simpleTranslate2 = { diff --git a/src/modules/dlib/implementation.nix b/src/modules/dlib/implementation.nix index 4b572b9b..c6aeadca 100644 --- a/src/modules/dlib/implementation.nix +++ b/src/modules/dlib/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; # INTERNAL diff --git a/src/modules/dlib/interface.nix b/src/modules/dlib/interface.nix index 0d2d2a71..567ff0ac 100644 --- a/src/modules/dlib/interface.nix +++ b/src/modules/dlib/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.dlib = { diff --git a/src/modules/dream2nix-interface/implementation.nix b/src/modules/dream2nix-interface/implementation.nix index 3edae242..4cb53804 100644 --- a/src/modules/dream2nix-interface/implementation.nix +++ b/src/modules/dream2nix-interface/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; b = builtins; inherit (config) dream2nixConfig pkgs utils dlib lib; diff --git a/src/modules/dream2nix-interface/interface.nix b/src/modules/dream2nix-interface/interface.nix index 98ae1d9c..e8e17e52 100644 --- a/src/modules/dream2nix-interface/interface.nix +++ b/src/modules/dream2nix-interface/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/externals/implementation.nix b/src/modules/externals/implementation.nix index 639010cd..a6351a6c 100644 --- a/src/modules/externals/implementation.nix +++ b/src/modules/externals/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; inherit (config) pkgs externalSources; in { config = { diff --git a/src/modules/externals/interface.nix b/src/modules/externals/interface.nix index 2cbd70ec..45a36cac 100644 --- a/src/modules/externals/interface.nix +++ b/src/modules/externals/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/fetchers/interface.nix b/src/modules/fetchers/interface.nix index f7690177..34acf5be 100644 --- a/src/modules/fetchers/interface.nix +++ b/src/modules/fetchers/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/functions.combined-fetcher/implementation.nix b/src/modules/functions.combined-fetcher/implementation.nix index 09e9fbef..5f3340c1 100644 --- a/src/modules/functions.combined-fetcher/implementation.nix +++ b/src/modules/functions.combined-fetcher/implementation.nix @@ -18,7 +18,7 @@ ... } @ args: let b = builtins; - l = lib // builtins; + l = config.lib; # resolve to individual fetcher calls defaultFetched = (defaultFetcher args).fetchedSources; diff --git a/src/modules/functions.combined-fetcher/interface.nix b/src/modules/functions.combined-fetcher/interface.nix index c09af2f5..cbe31aec 100644 --- a/src/modules/functions.combined-fetcher/interface.nix +++ b/src/modules/functions.combined-fetcher/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/functions.default-fetcher/interface.nix b/src/modules/functions.default-fetcher/interface.nix index 248fbba0..22dca226 100644 --- a/src/modules/functions.default-fetcher/interface.nix +++ b/src/modules/functions.default-fetcher/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/functions.discoverers/implementation.nix b/src/modules/functions.discoverers/implementation.nix index 238bb7f2..a52159cc 100644 --- a/src/modules/functions.discoverers/implementation.nix +++ b/src/modules/functions.discoverers/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; dlib = config.dlib; /* diff --git a/src/modules/functions.discoverers/interface.nix b/src/modules/functions.discoverers/interface.nix index 6980d982..867f7ab8 100644 --- a/src/modules/functions.discoverers/interface.nix +++ b/src/modules/functions.discoverers/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.functions.discoverers = { diff --git a/src/modules/functions.fetchers/interface.nix b/src/modules/functions.fetchers/interface.nix index 5f9079d6..d699b232 100644 --- a/src/modules/functions.fetchers/interface.nix +++ b/src/modules/functions.fetchers/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/functions.updaters/interface.nix b/src/modules/functions.updaters/interface.nix index b9d903eb..bdd1d2a4 100644 --- a/src/modules/functions.updaters/interface.nix +++ b/src/modules/functions.updaters/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.functions.updaters = { diff --git a/src/modules/interfaces.fetcher/interface.nix b/src/modules/interfaces.fetcher/interface.nix index e5ca2dc6..06526289 100644 --- a/src/modules/interfaces.fetcher/interface.nix +++ b/src/modules/interfaces.fetcher/interface.nix @@ -1,5 +1,5 @@ -{framework, ...}: let - l = framework.lib // builtins; +{lib, ...}: let + l = lib // builtins; t = l.types; outputsOptions = { diff --git a/src/modules/updaters/implementation.nix b/src/modules/updaters/implementation.nix index aa41429a..0f8b7a56 100644 --- a/src/modules/updaters/implementation.nix +++ b/src/modules/updaters/implementation.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; updatersDir = ../../updaters; updaterNames = l.attrNames ( l.filterAttrs diff --git a/src/modules/updaters/interface.nix b/src/modules/updaters/interface.nix index 4d87d7dd..b8cdaeb9 100644 --- a/src/modules/updaters/interface.nix +++ b/src/modules/updaters/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options = { diff --git a/src/modules/utils.dream-lock/implementation.nix b/src/modules/utils.dream-lock/implementation.nix index f60cda12..ca2f7bae 100644 --- a/src/modules/utils.dream-lock/implementation.nix +++ b/src/modules/utils.dream-lock/implementation.nix @@ -1,6 +1,6 @@ {config, ...}: let b = builtins; - l = config.lib // builtins; + l = config.lib; replaceRootSources = { dreamLock, diff --git a/src/modules/utils.dream-lock/interface.nix b/src/modules/utils.dream-lock/interface.nix index 0125f0fa..4699ee76 100644 --- a/src/modules/utils.dream-lock/interface.nix +++ b/src/modules/utils.dream-lock/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils.dream-lock = { diff --git a/src/modules/utils.index/implementation.nix b/src/modules/utils.index/implementation.nix index 9eef1f59..5ac56f64 100644 --- a/src/modules/utils.index/implementation.nix +++ b/src/modules/utils.index/implementation.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config) pkgs utils; - l = config.lib // builtins; + l = config.lib; generatePackagesFromLocksTree = { source ? throw "pass source", diff --git a/src/modules/utils.index/interface.nix b/src/modules/utils.index/interface.nix index 6130063f..796b3db2 100644 --- a/src/modules/utils.index/interface.nix +++ b/src/modules/utils.index/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils = { diff --git a/src/modules/utils.override/interface.nix b/src/modules/utils.override/interface.nix index a30f83a8..671b4815 100644 --- a/src/modules/utils.override/interface.nix +++ b/src/modules/utils.override/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils = { diff --git a/src/modules/utils.toTOML/interface.nix b/src/modules/utils.toTOML/interface.nix index adfbf606..47dd11bd 100644 --- a/src/modules/utils.toTOML/interface.nix +++ b/src/modules/utils.toTOML/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils = { diff --git a/src/modules/utils.translator/implementation.nix b/src/modules/utils.translator/implementation.nix index 3bf02308..696a613b 100644 --- a/src/modules/utils.translator/implementation.nix +++ b/src/modules/utils.translator/implementation.nix @@ -1,6 +1,6 @@ {config, ...}: let b = builtins; - l = config.lib // builtins; + l = config.lib; overrideWarning = fields: args: l.filterAttrs ( diff --git a/src/modules/utils.translator/interface.nix b/src/modules/utils.translator/interface.nix index 8b2796ad..910094aa 100644 --- a/src/modules/utils.translator/interface.nix +++ b/src/modules/utils.translator/interface.nix @@ -1,5 +1,5 @@ {config, ...}: let - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils = { diff --git a/src/modules/utils/implementation.nix b/src/modules/utils/implementation.nix index 90b1446c..ca2e3057 100644 --- a/src/modules/utils/implementation.nix +++ b/src/modules/utils/implementation.nix @@ -2,7 +2,7 @@ # for now this will have to suffice {config, ...}: let b = builtins; - l = config.lib // builtins; + l = config.lib; inherit (config.pkgs) diff --git a/src/modules/utils/interface.nix b/src/modules/utils/interface.nix index 5715124f..0f822f90 100644 --- a/src/modules/utils/interface.nix +++ b/src/modules/utils/interface.nix @@ -1,6 +1,6 @@ {config, ...}: let inherit (config.dlib) mkFunction; - l = config.lib // builtins; + l = config.lib; t = l.types; in { options.utils = {