fix overcomplicated module
This commit is contained in:
parent
645a1edc2b
commit
73720c33ba
4 changed files with 23 additions and 40 deletions
|
|
@ -1,19 +1,7 @@
|
|||
# WARNING: /nt/mix is structured as a nt.mix modules
|
||||
# WARNING: this file is strictly for bootstrapping mix
|
||||
{
|
||||
this,
|
||||
bootstrap,
|
||||
...
|
||||
}: let
|
||||
inputs = {
|
||||
inherit bootstrap;
|
||||
this = mix;
|
||||
nt = this;
|
||||
};
|
||||
|
||||
mix = bootstrap inputs [
|
||||
./mix.nix
|
||||
{this, ...}:
|
||||
this.bootstrap {nt = this;} [
|
||||
./mixture.nix
|
||||
./import.nix
|
||||
];
|
||||
in
|
||||
mix
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,8 @@
|
|||
this,
|
||||
mix,
|
||||
...
|
||||
}: let
|
||||
inputs = {
|
||||
nt = this;
|
||||
inherit mix;
|
||||
};
|
||||
in
|
||||
mix.newMixture inputs (mixture: {
|
||||
}:
|
||||
mix.newMixture {nt = this;} (mixture: {
|
||||
includes = {
|
||||
public = [
|
||||
./mixture.nix
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{this, ...}: let
|
||||
{nt, ...}: let
|
||||
inherit
|
||||
(builtins)
|
||||
isAttrs
|
||||
|
|
@ -8,12 +8,12 @@
|
|||
;
|
||||
|
||||
inherit
|
||||
(this)
|
||||
(nt)
|
||||
enfIsPrimitive
|
||||
;
|
||||
|
||||
inherit
|
||||
(this.std)
|
||||
(nt.std)
|
||||
hasInfix
|
||||
mergeAttrsList
|
||||
nameValuePair
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
...
|
||||
}: let
|
||||
inherit
|
||||
(nt.parse)
|
||||
projectOnto
|
||||
(this)
|
||||
mkIncludes
|
||||
mkSubMods
|
||||
;
|
||||
|
||||
inherit
|
||||
(this.mix)
|
||||
mkIncludes
|
||||
mkSubMods
|
||||
(nt.parse)
|
||||
projectOnto
|
||||
;
|
||||
in {
|
||||
newMixture = inputs: modBuilder: let
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue