From 7405c295218b73dac020f95c6b6357e1e1ba5887 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 17 Feb 2021 14:42:43 +0100 Subject: [PATCH] Move src filter into redo.getSrc. --- builder.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/builder.nix b/builder.nix index 7e65ffb..5ecf5c2 100644 --- a/builder.nix +++ b/builder.nix @@ -12,7 +12,12 @@ let with builtins; let # 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 imported = (tryEval (let @@ -22,9 +27,7 @@ let in if imported.success then imported.value else { - src = filterSource - (path: type: baseNameOf path != ".git" && baseNameOf path != ".envrc" && (all (x: path != x) filter)) - (/. + root); + src = getSrc (/. + root); builder = let relPath = dirOf (removePrefix (root + "/") builder); in ''