diff --git a/flake.lock b/flake.lock index 027e33f..d643bfb 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,16 @@ "dns": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1737653493, - "narHash": "sha256-qTbv8Pm9WWF63M5Fj0Od9E54/lsbMSQUBHw/s30eFok=", + "lastModified": 1768143854, + "narHash": "sha256-E5/kyPz4zAZn/lZdvqlF83jMgCWNxmqYjjWuadngCbk=", "owner": "nix-community", "repo": "dns.nix", - "rev": "96e548ae8bd44883afc5bddb9dacd0502542276d", + "rev": "a97cf4156e9f044fe4bed5be531061000dfabb07", "type": "github" }, "original": { @@ -36,26 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1616989418, - "narHash": "sha256-LcOn5wHR/1JwClfY/Ai/b+pSRY+d23QtIPQHwPAyHHI=", + "lastModified": 1768701115, + "narHash": "sha256-kkRg+hOTrRye6nDf6WBG8Ue7/ETUhfXdFSIVEXV2XXo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d8e05e088ad91b7c62886a2175f38bfa443db2c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1739776882, - "narHash": "sha256-PAiogZP1rLOwSkoL8eNgnbcobe5AqIq+Zc8A9NNFv+A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1ead14e49dfa47e91e68df64ef3dbf036809c742", + "rev": "a48c9dbce9a434f3647d4d9eab783eca11a242c4", "type": "github" }, "original": { @@ -68,7 +55,7 @@ "root": { "inputs": { "dns": "dns", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index e634000..1d762ad 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; dns.url = "github:nix-community/dns.nix"; + dns.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = diff --git a/zones/reverse-ipv6.nix b/zones/reverse-ipv6.nix index 67b2a66..e2b556b 100644 --- a/zones/reverse-ipv6.nix +++ b/zones/reverse-ipv6.nix @@ -21,13 +21,13 @@ let nibbleCount = builtins.foldl' builtins.add 0 (map builtins.stringLength parts); zeros = lib.concatStrings (builtins.genList (i: "0") (32 - nibbleCount)); in - lib.replaceStrings [ "XXXX" ] [ zeros ] addr; + lib.replaceString "XXXX" zeros addr; # Translate an IPv6 address (e.g. 2001:700:300:1900::1) into the fully expanded 20010700030019000000000000000001 normalizev6 = addr: (lib.pipe addr [ - (lib.replaceStrings [ "::" ] [ ":XXXX:" ]) + (lib.replaceString "::" ":XXXX:") (lib.splitString ":") (map padTo4) (map (lib.splitString ""))