ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

ref: reduce eval.nix contract forther

Browse source 
- module export contratcts can now bypass the eval.nix iface
- enabled by:9bd5e7bb2540664fe1c728c85f80375fe0cbf9fa
This commit is contained in:
David Arnold 2022-05-26 17:23:39 -05:00
parent c82517fc12
commit 83a919bdb0
No known key found for this signature in database
GPG key ID: 0318D822BAC965CC
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -17,10 +17,6 @@
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
colmenaOptions = import ./src/nix/hive/options.nix; colmenaOptions = import ./src/nix/hive/options.nix;
colmenaModules = import ./src/nix/hive/modules.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 in utils.lib.eachSystem supportedSystems (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -86,7 +82,10 @@
overlay = final: prev: { overlay = final: prev: {
colmena = final.callPackage ./package.nix { }; colmena = final.callPackage ./package.nix { };
}; };
inherit (evalNix) nixosModules; nixosModules = {
inherit (colmenaOptions) deploymentOptions metaOptions;
inherit (colmenaModules) keyChownModule keyServiceModule;
};
}; };
nixConfig = { nixConfig = {

2
src/nix/hive/eval.nix
View file

@ -211,6 +211,4 @@ in {
metaConfig; metaConfig;
meta = hive.meta; meta = hive.meta;
nixosModules = { inherit (colmenaOptions) deploymentOptions; };
} }