yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

eval-clan-modules: don't re-import nixpkgs

Browse Source
This commit is contained in:
Jörg Thalheim
2024-10-09 13:43:54 +02:00
parent e6a1bcadf1
commit da56927968
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/default.nix
View File

@@ -5,7 +5,10 @@
... ...
}: }:
let let
eval = import ./eval-clan-modules { inherit clan-core nixpkgs lib; }; eval = import ./eval-clan-modules {
inherit clan-core lib;
pkgs = nixpkgs.legacyPackages.x86_64-linux;
};
in in
{ {
inherit (eval) evalClanModules evalClanModulesWithRoles; inherit (eval) evalClanModules evalClanModulesWithRoles;

6
lib/eval-clan-modules/default.nix
View File

@@ -1,18 +1,18 @@
{ {
nixpkgs,
clan-core, clan-core,
lib, lib,
pkgs,
}: }:
let let
inherit (import nixpkgs { system = "x86_64-linux"; }) pkgs;
inherit (clan-core) clanModules; inherit (clan-core) clanModules;
baseModule = { baseModule = {
imports = (import (pkgs.path + "/nixos/modules/module-list.nix")) ++ [ imports = (import (pkgs.path + "/nixos/modules/module-list.nix")) ++ [
{ {
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.pkgs = pkgs;
clan.core.name = "dummy"; clan.core.name = "dummy";
system.stateVersion = lib.version;
} }
]; ];
}; };