git.delta.rocks / jrsonnet / refs/commits / b05f31720fbc

difftreelog

fix nix import paths

Yaroslav Bolyukin2020-11-30parent: #c00e294.patch.diff
in: trunk

1 file changed

modifiedlib/default.nixdiffbeforeafterboth
1818
19 }19 }
20 )20 )
21 ] ++ common.modules ++ import ./modules/modules.nix {21 ] ++ common.modules ++ import ../modules/modules.nix {
22 pkgs = nixpkgs;22 pkgs = nixpkgs;
23 lib = nixpkgs.lib;23 lib = nixpkgs.lib;
24 };24 };
2525
26 specialArgs = {26 specialArgs = {
27 fleet = import ./lib/fleetLib.nix {27 fleet = import ./fleetLib.nix {
28 inherit nixpkgs hosts;28 inherit nixpkgs hosts;
29 };29 };
30 };30 };
31 };31 };
32 configuredHosts = root.config.hosts;32 configuredHosts = root.config.hosts;
33 configuredSecrets = root.config.secrets;33 configuredSecrets = root.config.secrets;
34 configuredSystems = listToAttrs (34 configuredSystems = nixpkgs.lib.listToAttrs (
35 map (35 map (
36 name: {36 name: {
37 inherit name; value = nixpkgs.lib.nixosSystem {37 inherit name; value = nixpkgs.lib.nixosSystem {