pkgs/default: s/nixpkgs.lib/lib/

This commit is contained in:
Astro 2023-11-13 23:35:30 +01:00
parent 93a1ac7ee9
commit aa81a890f3
1 changed files with 7 additions and 7 deletions

View File

@ -7,11 +7,11 @@ let
inherit (pkgs) lib;
export-openwrt-models = pkgs.writeText "openwrt-models.nix" (
nixpkgs.lib.generators.toPretty {} self.lib.openwrtModels
lib.generators.toPretty {} self.lib.openwrtModels
);
export-config = pkgs.writeText "config.nix" (
nixpkgs.lib.generators.toPretty {} (
nixpkgs.lib.recursiveUpdate
lib.generators.toPretty {} (
lib.recursiveUpdate
config
{ site.dns.localZones = self.lib.dns.localZones; }
));
@ -55,7 +55,7 @@ let
"${hostName}-rootfs" = mkRootfs hostName;
}) {} (
builtins.attrNames (
nixpkgs.lib.filterAttrs (_: { role, ... }: builtins.elem role ["server" "container"])
lib.filterAttrs (_: { role, ... }: builtins.elem role ["server" "container"])
config.site.hosts
)
);
@ -68,7 +68,7 @@ let
"${hostName}-lxc-config" = mkLxcConfig hostName;
}) {} (
builtins.attrNames (
nixpkgs.lib.filterAttrs (_: { role, ... }: role == "container")
lib.filterAttrs (_: { role, ... }: role == "container")
config.site.hosts
)
);
@ -81,7 +81,7 @@ let
});
}) {} (
builtins.attrNames (
nixpkgs.lib.filterAttrs (_: { role, ... }: role == "server")
lib.filterAttrs (_: { role, ... }: role == "server")
config.site.hosts
)
);
@ -95,7 +95,7 @@ let
"${hostName}-image" = openwrt.buildImage hostName;
}) {} (
builtins.attrNames (
nixpkgs.lib.filterAttrs (_: { role, ... }:
lib.filterAttrs (_: { role, ... }:
role == "ap"
) config.site.hosts
)