diff --git a/default.nix b/default.nix index b04472fa..7503b38a 100644 --- a/default.nix +++ b/default.nix @@ -20,13 +20,11 @@ let flake = projectModules: self.flakeWith { inherit projectModules; }; auto = projectModules: - self.flake ([{ auto = true; ifd = false; }] ++ toList projectModules); + self.flakeWith { extraModules = [{ auto = true; ifd = false; }]; modules = toList projectModules; }; pro = projectModules: self.flakeWith { extraModules = [(import ./modules/pro.nix)]; projectModules = toList projectModules; }; - overrides = import ./lib/overrides.nix { inherit (inputs.nixpkgs) lib; }; - spec = import ./lib/deps/spec.nix { inherit (self) lib; }; }); diff --git a/test/deps/dep2/flake.nix b/test/deps/dep2/flake.nix index 32262cf7..4daecc22 100644 --- a/test/deps/dep2/flake.nix +++ b/test/deps/dep2/flake.nix @@ -3,8 +3,7 @@ inputs.hix.url = path:HIX; - outputs = { hix, ... }: - hix.lib.flake { + outputs = { hix, ... }: hix.lib.flake { packages.dep2 = { src = ./.; library.enable = true; diff --git a/test/deps/root/flake.nix b/test/deps/root/flake.nix index 2128be2d..5567bf7f 100644 --- a/test/deps/root/flake.nix +++ b/test/deps/root/flake.nix @@ -5,8 +5,7 @@ inputs.dep1.url = path:BASE/dep1; inputs.dep2.url = path:BASE/dep2; - outputs = { hix, dep1, dep2, ... }: - hix.lib.flake ({ config, lib, ... }: { + outputs = { hix, dep1, dep2, ... }: hix.lib.flake ({ config, lib, ... }: { main = "root"; packages = { root = {