Merge pull request #427 from nix-community/cleanup

Cleanup

src/modules/_template/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 in {
   config = {
 

src/modules/_template/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

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

src/modules/discoverers.default-discoverer/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 
   translatorsWithDiscoverFunc =
     l.filter

src/modules/dlib.construct/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 in {
   config.dlib.construct = {
     discoveredProject = {

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 = {

src/modules/dlib.parsing/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 
   idToLicenseKey =
     l.mapAttrs'

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 = {

src/modules/dlib.simpleTranslate2/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 
   expectedFields = [
     "name"

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 = {

src/modules/dlib/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
 
   # INTERNAL
 

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 = {

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;

src/modules/dream2nix-interface/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

src/modules/externals/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   inherit (config) pkgs externalSources;
 in {
   config = {

src/modules/externals/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

src/modules/fetchers/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

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;

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 = {

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 = {

src/modules/functions.discoverers/implementation.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   dlib = config.dlib;
 
   /*

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 = {

src/modules/functions.fetchers/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

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 = {

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 = {

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

src/modules/updaters/interface.nix

@@ -1,5 +1,5 @@
 {config, ...}: let
-  l = config.lib // builtins;
+  l = config.lib;
   t = l.types;
 in {
   options = {

src/modules/utils.dream-lock/implementation.nix

@@ -1,6 +1,6 @@
 {config, ...}: let
   b = builtins;
-  l = config.lib // builtins;
+  l = config.lib;
 
   replaceRootSources = {
     dreamLock,

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 = {

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",

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 = {

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 = {

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 = {

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 (

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 = {

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)

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 = {