From facbcdafc891094fa62857089b13fcc9926a4485 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 11 Dec 2018 21:59:41 +0100
Subject: lib.setAttr: RIP

---
 lib/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/default.nix')

diff --git a/lib/default.nix b/lib/default.nix
index bf8c65e2..54597e5f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -29,8 +29,6 @@ let
       listToAttrs (map (name: nameValuePair name set.${name})
                        (filter (flip hasAttr set) names));
 
-    setAttr = name: value: set: set // { ${name} = value; };
-
     test = re: x: isString x && testString re x;
 
     testString = re: x: match re x != null;
-- 
cgit v1.2.3


From b6e1cef6a5d0235a049b8d7606ebf053d8ab1516 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 11 Dec 2018 22:47:27 +0100
Subject: lib.normalize-ip6-addr: only normalize addrs w/o ::

---
 lib/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/default.nix')

diff --git a/lib/default.nix b/lib/default.nix
index 54597e5f..e352c7be 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -107,7 +107,11 @@ let
           in
             a: concatStringsSep ":" (map f (splitString ":" a));
       in
-        a: toLower (group-zeros (drop-leading-zeros a));
+        a:
+          toLower
+            (if test ".*::.*" a
+              then a
+              else group-zeros (drop-leading-zeros a));
   };
 in
 
-- 
cgit v1.2.3