stockholm: add slib.npath
This commit is contained in:
parent
db0e7dfe82
commit
8e3d27a949
10
default.nix
10
default.nix
@ -14,12 +14,12 @@ let stockholm = {
|
|||||||
krebs = import ./krebs (args // { inherit lib stockholm; });
|
krebs = import ./krebs (args // { inherit lib stockholm; });
|
||||||
|
|
||||||
lib = let
|
lib = let
|
||||||
nlib = import <nixpkgs/lib>;
|
nlib = import (slib.npath "lib");
|
||||||
klib = import (slib.kpath "4lib") { lib = nlib; };
|
klib = import (slib.kpath "4lib") { lib = nlib; };
|
||||||
slib = rec {
|
slib = rec {
|
||||||
nspath = ns: p: ./. + "/${ns}/${p}";
|
npath = p: <nixpkgs> + "/${p}";
|
||||||
kpath = nspath "krebs";
|
kpath = p: ./. + "/krebs/${p}";
|
||||||
upath = nspath current-user-name;
|
upath = p: ./. + "/${current-user-name}/${p}";
|
||||||
};
|
};
|
||||||
ulib = let p = slib.upath "4lib"; in
|
ulib = let p = slib.upath "4lib"; in
|
||||||
nlib.optionalAttrs (klib.dir.has-default-nix p)
|
nlib.optionalAttrs (klib.dir.has-default-nix p)
|
||||||
@ -44,7 +44,7 @@ let stockholm = {
|
|||||||
in kpkgs // upkgs;
|
in kpkgs // upkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
eval = config: import <nixpkgs/nixos/lib/eval-config.nix> {
|
eval = config: import (lib.npath "nixos/lib/eval-config.nix") {
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit lib;
|
inherit lib;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user