ref: reduce eval.nix contract forther
- module export contratcts can now bypass the eval.nix iface - enabled by:9bd5e7bb2540664fe1c728c85f80375fe0cbf9fa
This commit is contained in:
parent
c82517fc12
commit
83a919bdb0
2 changed files with 4 additions and 7 deletions
|
@ -17,10 +17,6 @@
|
|||
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
colmenaOptions = import ./src/nix/hive/options.nix;
|
||||
colmenaModules = import ./src/nix/hive/modules.nix;
|
||||
evalNix = import ./src/nix/hive/eval.nix {
|
||||
hermetic = true;
|
||||
inherit colmenaOptions colmenaModules;
|
||||
};
|
||||
in utils.lib.eachSystem supportedSystems (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
|
@ -86,7 +82,10 @@
|
|||
overlay = final: prev: {
|
||||
colmena = final.callPackage ./package.nix { };
|
||||
};
|
||||
inherit (evalNix) nixosModules;
|
||||
nixosModules = {
|
||||
inherit (colmenaOptions) deploymentOptions metaOptions;
|
||||
inherit (colmenaModules) keyChownModule keyServiceModule;
|
||||
};
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
|
|
|
@ -211,6 +211,4 @@ in {
|
|||
metaConfig;
|
||||
|
||||
meta = hive.meta;
|
||||
|
||||
nixosModules = { inherit (colmenaOptions) deploymentOptions; };
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue