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: /nt/mix is structured as a nt.mix modules
|
||||||
# WARNING: this file is strictly for bootstrapping mix
|
# WARNING: this file is strictly for bootstrapping mix
|
||||||
{
|
{this, ...}:
|
||||||
this,
|
this.bootstrap {nt = this;} [
|
||||||
bootstrap,
|
./mixture.nix
|
||||||
...
|
./import.nix
|
||||||
}: let
|
]
|
||||||
inputs = {
|
|
||||||
inherit bootstrap;
|
|
||||||
this = mix;
|
|
||||||
nt = this;
|
|
||||||
};
|
|
||||||
|
|
||||||
mix = bootstrap inputs [
|
|
||||||
./mix.nix
|
|
||||||
./import.nix
|
|
||||||
];
|
|
||||||
in
|
|
||||||
mix
|
|
||||||
|
|
|
||||||
|
|
@ -2,19 +2,14 @@
|
||||||
this,
|
this,
|
||||||
mix,
|
mix,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
inputs = {
|
mix.newMixture {nt = this;} (mixture: {
|
||||||
nt = this;
|
includes = {
|
||||||
inherit mix;
|
public = [
|
||||||
|
./mixture.nix
|
||||||
|
];
|
||||||
|
protected = [
|
||||||
|
./import.nix
|
||||||
|
];
|
||||||
};
|
};
|
||||||
in
|
})
|
||||||
mix.newMixture inputs (mixture: {
|
|
||||||
includes = {
|
|
||||||
public = [
|
|
||||||
./mixture.nix
|
|
||||||
];
|
|
||||||
protected = [
|
|
||||||
./import.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{this, ...}: let
|
{nt, ...}: let
|
||||||
inherit
|
inherit
|
||||||
(builtins)
|
(builtins)
|
||||||
isAttrs
|
isAttrs
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit
|
inherit
|
||||||
(this)
|
(nt)
|
||||||
enfIsPrimitive
|
enfIsPrimitive
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit
|
inherit
|
||||||
(this.std)
|
(nt.std)
|
||||||
hasInfix
|
hasInfix
|
||||||
mergeAttrsList
|
mergeAttrsList
|
||||||
nameValuePair
|
nameValuePair
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,14 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit
|
inherit
|
||||||
(nt.parse)
|
(this)
|
||||||
projectOnto
|
mkIncludes
|
||||||
|
mkSubMods
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit
|
inherit
|
||||||
(this.mix)
|
(nt.parse)
|
||||||
mkIncludes
|
projectOnto
|
||||||
mkSubMods
|
|
||||||
;
|
;
|
||||||
in {
|
in {
|
||||||
newMixture = inputs: modBuilder: let
|
newMixture = inputs: modBuilder: let
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue