fix: pass snowfall-config through to modules
This commit is contained in:
parent
7d7546913d
commit
66e1335803
14 changed files with 24 additions and 3 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,11 @@ core-inputs:
|
||||||
user-options:
|
user-options:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
raw-snowfall-config = user-options.snowfall or { };
|
||||||
|
snowfall-config = raw-snowfall-config // {
|
||||||
|
root = raw-snowfall-config.root or user-options.src;
|
||||||
|
};
|
||||||
|
|
||||||
user-inputs = user-options.inputs // { src = user-options.src; };
|
user-inputs = user-options.inputs // { src = user-options.src; };
|
||||||
|
|
||||||
inherit (core-inputs.nixpkgs.lib) assertMsg fix filterAttrs mergeAttrs fold recursiveUpdate callPackageWith;
|
inherit (core-inputs.nixpkgs.lib) assertMsg fix filterAttrs mergeAttrs fold recursiveUpdate callPackageWith;
|
||||||
|
|
@ -60,7 +65,7 @@ let
|
||||||
snowfall-lib = fix (snowfall-lib:
|
snowfall-lib = fix (snowfall-lib:
|
||||||
let
|
let
|
||||||
attrs = {
|
attrs = {
|
||||||
inherit snowfall-lib core-inputs user-inputs;
|
inherit snowfall-lib snowfall-config core-inputs user-inputs;
|
||||||
};
|
};
|
||||||
libs = builtins.map
|
libs = builtins.map
|
||||||
(dir: import "${snowfall-lib-root}/${dir}" attrs)
|
(dir: import "${snowfall-lib-root}/${dir}" attrs)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
@ -31,7 +32,7 @@ in
|
||||||
# Type: Path -> Path
|
# Type: Path -> Path
|
||||||
# Usage: get-snowfall-file "systems"
|
# Usage: get-snowfall-file "systems"
|
||||||
# result: "/user-source/snowfall-dir/systems"
|
# result: "/user-source/snowfall-dir/systems"
|
||||||
get-snowfall-file = path: "${user-inputs.snowfall.root or user-inputs.src}/${path}";
|
get-snowfall-file = path: "${snowfall-config.root}/${path}";
|
||||||
|
|
||||||
# Get a file path relative to the this flake.
|
# Get a file path relative to the this flake.
|
||||||
# Type: Path -> Path
|
# Type: Path -> Path
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,8 @@
|
||||||
{ core-inputs, user-inputs, snowfall-lib }:
|
{ core-inputs
|
||||||
|
, user-inputs
|
||||||
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (core-inputs.nixpkgs.lib)
|
inherit (core-inputs.nixpkgs.lib)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ core-inputs
|
{ core-inputs
|
||||||
, user-inputs
|
, user-inputs
|
||||||
, snowfall-lib
|
, snowfall-lib
|
||||||
|
, snowfall-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue