spacefrogg
/
nixredo
1
0
Fork 0
Code Releases Activity

Move src filter into redo.getSrc.

master
Michael Raitza 2021-02-17 14:42:43 +01:00
parent e6729e269f
commit 7405c29521
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builder.nix
View File

@ -12,7 +12,12 @@ let
with builtins; with builtins;
let let
# Funktionalise pkgs; our main entry point to resolve default*nix build scripts. # Funktionalise pkgs; our main entry point to resolve default*nix build scripts.
funcPkgs = { __functor = self: arg: resolve arg; } // pkgs; getSrc = filterSource
(path: type: baseNameOf path != ".git" && baseNameOf path != ".envrc" && (all (x: path != x) filter));
funcPkgs = {
__functor = self: arg: resolve arg;
redo.getSrc = getSrc;
} // pkgs;
_builder = let _builder = let
imported = (tryEval (let imported = (tryEval (let
@ -22,9 +27,7 @@ let
in if imported.success in if imported.success
then imported.value then imported.value
else { else {
src = filterSource src = getSrc (/. + root);
(path: type: baseNameOf path != ".git" && baseNameOf path != ".envrc" && (all (x: path != x) filter))
(/. + root);
builder = let builder = let
relPath = dirOf (removePrefix (root + "/") builder); relPath = dirOf (removePrefix (root + "/") builder);
in '' in ''