From 119707d35948ecfaf8fdf8189b92ef1e979d7922 Mon Sep 17 00:00:00 2001 From: niten Date: Fri, 17 Nov 2023 09:34:55 -0800 Subject: [PATCH] Include fudo-lib for ip functions --- flake.nix | 11 ++++++++--- reverse-zone.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ae20b22..32e6df8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,17 @@ { description = "Authoritative DNS Server"; - inputs = { nixpkgs.url = "nixpkgs/nixos-23.05"; }; + inputs = { + nixpkgs.url = "nixpkgs/nixos-23.05"; + fudo-lib.url = "git+https://git.fudo.org/fudo-nix/lib.git"; + }; - outputs = { self, nixpkgs, ... }: { + outputs = { self, nixpkgs, fudo-lib, ... }: { nixosModules = rec { default = authoritativeDns; - authoritativeDns = { ... }: { imports = [ ./authoritative-dns.nix ]; }; + authoritativeDns = { ... }: { + imports = [ ./authoritative-dns.nix fudo-lib.nixosModules.lib ]; + }; }; }; } diff --git a/reverse-zone.nix b/reverse-zone.nix index 49b05ad..a390a02 100644 --- a/reverse-zone.nix +++ b/reverse-zone.nix @@ -6,7 +6,7 @@ with pkgs.lib; let - inherit (pkgs.lib.fudo.ip) + inherit (pkgs.lib.ip) networkMinIp networkMaxIp ipv4OnNetwork getNetworkMask getNetworkBase; range = base: top: