mirror of
https://github.com/JulienMalka/snowfield.git
synced 2025-03-25 21:30:52 +01:00
fix: fix discrepencies with colmena eval
This commit is contained in:
parent
a02b992cfd
commit
1034619dd8
1 changed files with 10 additions and 5 deletions
15
default.nix
15
default.nix
|
@ -7,8 +7,10 @@ let
|
|||
version = "nixos-unstable";
|
||||
};
|
||||
};
|
||||
nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
|
||||
lib = nixpkgs.lib.extend (import ./lib inputs_final);
|
||||
lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final);
|
||||
mkLibForMachine =
|
||||
machine:
|
||||
(import "${lib.luj.machines.${machine}.nixpkgs_version}/lib").extend (import ./lib inputs_final);
|
||||
machines_plats = lib.lists.unique (
|
||||
lib.mapAttrsToList (_name: value: value.arch) (
|
||||
lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines
|
||||
|
@ -52,9 +54,12 @@ rec {
|
|||
in
|
||||
{
|
||||
meta = {
|
||||
nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
|
||||
nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) deployableConfigurations;
|
||||
specialArgs.lib = lib;
|
||||
nodeNixpkgs = builtins.mapAttrs (
|
||||
n: _: import lib.luj.machines.${n}.nixpkgs_version
|
||||
) deployableConfigurations;
|
||||
nodeSpecialArgs = builtins.mapAttrs (
|
||||
n: v: v._module.specialArgs // { lib = mkLibForMachine n; }
|
||||
) deployableConfigurations;
|
||||
};
|
||||
}
|
||||
// builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) deployableConfigurations;
|
||||
|
|
Loading…
Add table
Reference in a new issue