diff --git a/flake.nix b/flake.nix index 1c0488b..4090f7a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,13 @@ lib = let runJail = import ./lib.nix; in { - init = pkgs: name: exe: getOpts: runJail { - inherit pkgs name exe getOpts; + init = pkgs: name: exe: applyCombinators: runJail { + inherit pkgs name exe applyCombinators; }; - extend = { pkgs, additionalCombinators }: name: exe: getOpts: runJail { + extend = { pkgs, additionalCombinators }: name: exe: applyCombinators: runJail { inherit pkgs name exe; - getOpts = combinators: getOpts (combinators // additionalCombinators combinators); + applyCombinators = combinators: applyCombinators (combinators // additionalCombinators combinators); }; }; }; diff --git a/lib.nix b/lib.nix index e80f891..594f20f 100644 --- a/lib.nix +++ b/lib.nix @@ -1,4 +1,4 @@ -{ pkgs, name, exe, getOpts }: let +{ pkgs, name, exe, applyCombinators }: let inherit (pkgs) lib; helpers = rec { @@ -52,7 +52,7 @@ in lib.pipe initial-state ( ]) # apply user combinators - ++ getOpts combinators + ++ applyCombinators combinators # apply post-user combinators ++ (with combinators; [