From fafc831d6be643ea184d117b2c8f48efa241e826 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 18 Mar 2022 09:34:09 +0100 Subject: ... --- flake.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index f5008748..e380463b 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ inherit (nixpkgs) lib; utils = import ./utils { inherit lib; }; inherit (utils) nixImport overrideModule; - inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists; + inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep; accountUserName = accountName: let @@ -210,6 +210,11 @@ filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs); in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides)); + nixPath = forAllSystems (system: _: concatStringsSep ":" [ + "nixpkgs=${nixpkgs.legacyPackages.${system}.path}" + "nixpkgs-overlays=${self.overlays-path.${system}}" + ]); + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; }; } -- cgit v1.2.3