From acdb2bea876aaadf30430e2ea3cbef62808ca24c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Oct 2020 14:38:36 +0200
Subject: lib.mapNixDir1: prefix names starting with a digit

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

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index f02959bba..be9f60f3b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -60,13 +60,17 @@ let
     }.${typeOf x};
 
     mapNixDir1 = f: dirPath:
+      let
+        toPackageName = name:
+          if test "^[0-9].*" name then "_${name}" else name;
+      in
       listToAttrs
         (map
           (relPath: let
             name = removeSuffix ".nix" relPath;
             path = dirPath + "/${relPath}";
           in
-            nameValuePair name (f path))
+            nameValuePair (toPackageName name) (f path))
           (filter
             (name: name != "default.nix" && !hasPrefix "." name)
             (attrNames (readDir dirPath))));
-- 
cgit v1.2.3


From 4d5c1b6dbed3c07c030e1dfe9f033f707608d84a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 16 Oct 2020 22:25:35 +0200
Subject: types.net: add mac option

---
 lib/types.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/types.nix b/lib/types.nix
index 3eda2262f..689a2c807 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -116,6 +116,10 @@ rec {
         type = listOf hostname;
         default = [];
       };
+      mac = mkOption {
+        type = nullOr str;
+        default = null;
+      };
       ip4 = mkOption {
         type = nullOr (submodule {
           options = {
-- 
cgit v1.2.3