diff --git a/flake.nix b/flake.nix index dae3fff..bad4475 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,5 @@ { outputs = _: { - lib = let - jailLib = import ./lib.nix; - in { - init = pkgs: jailLib { inherit pkgs; }; - extend = jailLib; - }; + lib = import ./lib; }; } diff --git a/base-permissions.nix b/lib/base-permissions.nix similarity index 100% rename from base-permissions.nix rename to lib/base-permissions.nix diff --git a/combinators.nix b/lib/combinators.nix similarity index 100% rename from combinators.nix rename to lib/combinators.nix diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 0000000..612d62e --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,6 @@ +let + jailNix = import ./jail.nix; +in { + init = pkgs: jailNix { inherit pkgs; }; + extend = jailNix; +} diff --git a/helpers.nix b/lib/helpers.nix similarity index 100% rename from helpers.nix rename to lib/helpers.nix diff --git a/lib.nix b/lib/jail.nix similarity index 100% rename from lib.nix rename to lib/jail.nix diff --git a/tests/flake.nix b/tests/flake.nix index 33f97d4..567063f 100644 --- a/tests/flake.nix +++ b/tests/flake.nix @@ -5,7 +5,7 @@ outputs = { nixpkgs, ... }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; lib = pkgs.lib; - jail-nix.lib.extend = import ../lib.nix; + jail-nix.lib = import ../lib; ansi = clrCode: "[${toString clrCode}m"; green = ansi 32; diff --git a/website/flake.nix b/website/flake.nix index bdd0ff0..9b86de2 100644 --- a/website/flake.nix +++ b/website/flake.nix @@ -38,7 +38,7 @@ helpers = throw "Docs must not depend on helpers"; } [ - (import ../combinators.nix) + (import ../lib/combinators.nix) (lib.filterAttrs (_: v: !(v ? deprecated && v.deprecated))) (lib.mapAttrsToList formatCombinatorDoc) (lib.concatStringsSep "\n\n")