kylekrein/snowfall-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: internal namespacing and callPackageWith for better ux

Browse source
This commit is contained in:
Jake Hamilton 2023-01-15 14:52:52 -08:00
parent 0ba4256dbd
commit 7def9101de
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
7 changed files with 70 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/internal/default.nix
View file

@ -4,7 +4,7 @@
}:
let
inherit (core-inputs.nixpkgs.lib) assertMsg fix fold filterAttrs;
inherit (core-inputs.nixpkgs.lib) assertMsg fix fold filterAttrs callPackageWith;
core-inputs-libs = snowfall-lib.flake.get-libs (snowfall-lib.flake.without-self core-inputs);
user-inputs-libs = snowfall-lib.flake.get-libs (snowfall-lib.flake.without-self user-inputs);
@ -27,10 +27,13 @@ let
attrs = {
inputs = snowfall-lib.flake.without-snowfall-inputs user-inputs;
snowfall-inputs = core-inputs;
lib = snowfall-lib.attrs.merge-shallow [ base-lib user-lib ];
lib = snowfall-lib.attrs.merge-shallow [
base-lib
{ internal = user-lib; }
];
};
libs = builtins.map
(path: import path attrs)
(path: callPackageWith attrs path { })
user-lib-modules;
in
snowfall-lib.attrs.merge-deep libs
@ -38,7 +41,7 @@ let
system-lib = snowfall-lib.attrs.merge-shallow [
base-lib
user-lib
{ internal = user-lib; }
];
in
{