newedge/liminix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change output references from attrset to lambda

Browse Source 
this is so that we can distinguish a ref from a literal parameter that
might be a attrset
This commit is contained in:
Daniel Barlow
2024-08-23 22:25:57 +01:00
parent dd75322c10
commit 9c30b6f882
6 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hostapd/service.nix
View File

@@ -30,7 +30,7 @@ let
literal_or_output = o: ({
string = builtins.toJSON;
int = builtins.toJSON;
set = (o: "output(${builtins.toJSON o.service}, ${builtins.toJSON o.path})");
lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
}.${builtins.typeOf o}) o;
conf =

9
modules/ppp/default.nix
View File

@@ -40,12 +40,12 @@ in {
description = "ethernet interface to run PPPoE over";
};
username = mkOption {
type = types.nullOr liminix.lib.types.replacable;
type = types.nullOr (liminix.lib.types.replacable types.str);
default = null;
description = "username";
};
password = mkOption {
type = types.nullOr liminix.lib.types.replacable;
type = types.nullOr (liminix.lib.types.replacable types.str);
default = null;
description = "password";
};
@@ -83,12 +83,12 @@ in {
description = "hostname or address of the L2TP network server";
};
username = mkOption {
type = types.nullOr liminix.lib.types.replacable;
type = types.nullOr (liminix.lib.types.replacable types.str);
default = null;
description = "username";
};
password = mkOption {
type = types.nullOr liminix.lib.types.replacable;
type = types.nullOr (liminix.lib.types.replacable types.str);
default = null;
description = "password";
};
@@ -116,6 +116,7 @@ in {
};
ppp-options = mkOption {
type = types.listOf types.str;
default = [];
description = "options supplied on ppp command line";
};
};

2
modules/ppp/l2tp.nix
View File

@@ -44,7 +44,7 @@ let
let v = o: ({
string = builtins.toJSON;
int = builtins.toJSON;
set = (o: "output(${builtins.toJSON o.service}, ${builtins.toJSON o.path})");
lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
}.${builtins.typeOf o}) o;
in o: "{{ ${v o} }}";

2
modules/ppp/pppoe.nix
View File

@@ -44,7 +44,7 @@ let
let v = o: ({
string = builtins.toJSON;
int = builtins.toJSON;
set = (o: "output(${builtins.toJSON o.service}, ${builtins.toJSON o.path})");
lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
}.${builtins.typeOf o}) o;
in o: "{{ ${v o} }}";
ppp-options' =