mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 18:30:43 -06:00
evaluate lib then inherit from it
This commit is contained in:
parent
3fc0eb9608
commit
a9627da325
2 changed files with 8 additions and 5 deletions
|
@ -3,17 +3,17 @@
|
||||||
self,
|
self,
|
||||||
}: let
|
}: let
|
||||||
inherit (inputs) nixpkgs;
|
inherit (inputs) nixpkgs;
|
||||||
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
|
|
||||||
inherit (nixpkgs.lib) hasSuffix nixosSystem genAttrs;
|
|
||||||
inherit (nixpkgs.lib.filesystem) listFilesRecursive;
|
|
||||||
|
|
||||||
lib = nixpkgs.lib.extend (import ./extended.nix);
|
lib = nixpkgs.lib.extend (import ./extended.nix);
|
||||||
|
|
||||||
|
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
|
||||||
|
inherit (lib) hasSuffix nixosSystem genAttrs isNixFile;
|
||||||
|
inherit (lib.filesystem) listFilesRecursive;
|
||||||
|
|
||||||
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||||
supportedSystems = ["x86_64-linux"];
|
supportedSystems = ["x86_64-linux"];
|
||||||
in rec {
|
in rec {
|
||||||
forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system});
|
forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system});
|
||||||
|
|
||||||
isNixFile = path: hasSuffix ".nix" path;
|
|
||||||
buildOizys = _:
|
buildOizys = _:
|
||||||
forAllSystems (
|
forAllSystems (
|
||||||
pkgs: let
|
pkgs: let
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
final: prev: let
|
final: prev: let
|
||||||
|
inherit (final) hasSuffix;
|
||||||
runes = import ../modules/runes;
|
runes = import ../modules/runes;
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
isNixFile = path: hasSuffix ".nix" path;
|
||||||
mkIfIn = name: list: prev.mkIf (builtins.elem name list);
|
mkIfIn = name: list: prev.mkIf (builtins.elem name list);
|
||||||
mkRune = {
|
mkRune = {
|
||||||
rune,
|
rune,
|
||||||
|
|
Loading…
Reference in a new issue