Merge branch 'main' into moduleLocation

This commit is contained in:
Yang, Bo 2023-07-22 18:07:20 -07:00 committed by GitHub
commit f359432597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 443 additions and 85 deletions

View file

@ -1,4 +1,4 @@
toplevel@{ config, lib, flake-parts-lib, getSystemIgnoreWarning, ... }:
toplevel@{ lib, flake-parts-lib, getSystemIgnoreWarning, ... }:
let
inherit (flake-parts-lib)
mkPerSystemOption;
@ -37,7 +37,7 @@ in
};
};
config = {
_module.args.final = lib.mkDefault (pkgs.extend (toplevel.config.flake.overlays.default));
_module.args.final = lib.mkDefault (pkgs.extend toplevel.config.flake.overlays.default);
};
});
};

View file

@ -1,10 +1,8 @@
{ config, self, lib, flake-parts-lib, moduleLocation, ... }:
{ self, lib, flake-parts-lib, moduleLocation, ... }:
let
inherit (lib)
filterAttrs
mapAttrs
mkOption
optionalAttrs
types
;
inherit (flake-parts-lib)