Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-01 09:40:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix discrepencies with colmena eval

Browse source
This commit is contained in:
Julien Malka 2024-05-18 21:53:23 +02:00
parent a02b992cfd
commit 1034619dd8
Signed by: Luj
GPG key ID: 6FC74C847011FD83
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
default.nix
View file

@ -7,8 +7,10 @@ let
version = "nixos-unstable"; version = "nixos-unstable";
}; };
}; };
nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final);
lib = 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 ( machines_plats = lib.lists.unique (
lib.mapAttrsToList (_name: value: value.arch) ( lib.mapAttrsToList (_name: value: value.arch) (
lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines
@ -52,9 +54,12 @@ rec {
in in
{ {
meta = { meta = {
nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; }; nodeNixpkgs = builtins.mapAttrs (
nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) deployableConfigurations; n: _: import lib.luj.machines.${n}.nixpkgs_version
specialArgs.lib = lib; ) deployableConfigurations;
nodeSpecialArgs = builtins.mapAttrs (
n: v: v._module.specialArgs // { lib = mkLibForMachine n; }
) deployableConfigurations;
}; };
} }
// builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) deployableConfigurations; // builtins.mapAttrs (_: v: { imports = v._module.args.modules; }) deployableConfigurations;