From aa81a890f3de418f77dceddff4f09fd779ccd7f7 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 13 Nov 2023 23:35:30 +0100 Subject: [PATCH] pkgs/default: s/nixpkgs.lib/lib/ --- nix/pkgs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index d458033..be53ebb 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -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 )