dan/liminix
1
0
Fork 5
Code

Compare commits

base: dan:277c91acdf917522302f29e10f46b39221ef94f1
Branches Tags
dan:main
dan:nftables-turned
dan:firescape
dan:runciter
dan:wip-pstore-tls
dan:fallover
dan:lte
dan:gateway-profile
dan:tftpboot-append-dtb
dan:mainline-omnia-wip
dan:armv7
dan:hark-how-all-the-belkin-rings
dan:first-do-no-arm
dan:doc-do-over
dan:module-based-network
..
compare: dan:cc47515cf8289b76e2f1f56545a866e5b8de6b46
Branches Tags
dan:main
dan:nftables-turned
dan:firescape
dan:runciter
dan:wip-pstore-tls
dan:fallover
dan:lte
dan:gateway-profile
dan:tftpboot-append-dtb
dan:mainline-omnia-wip
dan:armv7
dan:hark-how-all-the-belkin-rings
dan:first-do-no-arm
dan:doc-do-over
dan:module-based-network

No commits in common. "277c91acdf917522302f29e10f46b39221ef94f1" and "cc47515cf8289b76e2f1f56545a866e5b8de6b46" have entirely different histories.
277c91acdf ... cc47515cf8

4 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
modules/ppp/common.nix
View File

@ -78,6 +78,6 @@ let
inherit dependencies; inherit dependencies;
}; };
in svc.secrets.subscriber.build { in svc.secrets.subscriber.build {
watch = lib.filter (n: typeOf n=="lambda") [ username password ]; watch = [ username password ];
inherit service; inherit service;
} }

1
modules/ppp/default.nix
View File

@ -25,7 +25,6 @@ let
inherit description; inherit description;
}; };
in { in {
imports = [ ../secrets ];
options = { options = {
system.service.pppoe = mkOption { system.service.pppoe = mkOption {
type = liminix.lib.types.serviceDefn; type = liminix.lib.types.serviceDefn;

6
modules/secrets/subscriber.nix
View File

@ -5,7 +5,7 @@
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
inherit (builtins) length head toString; inherit (builtins) length head toString;
inherit (lib) unique optional optionals; inherit (lib) unique optional;
inherit (service) name; inherit (service) name;
watched-services = unique (map (f: f "service") watch); watched-services = unique (map (f: f "service") watch);
@ -46,6 +46,6 @@ in service.overrideAttrs(o: {
buildInputs = (lim.orEmpty o.buildInputs) ++ buildInputs = (lim.orEmpty o.buildInputs) ++
optional (watched-service != null) watcher; optional (watched-service != null) watcher;
dependencies = (lim.orEmpty o.dependencies) ++ dependencies = (lim.orEmpty o.dependencies) ++
optionals (watched-service != null) optional (watched-service != null) watcher ++
[ watcher watched-service ]; optional (watched-service != null) watched-service;
}) })

1
pkgs/write-fennel/default.nix
View File

@ -31,7 +31,6 @@ stdenv.mkDerivation {
echo "#!${lua}/bin/lua ${luaFlags}" echo "#!${lua}/bin/lua ${luaFlags}"
echo "package.path = ${lib.strings.escapeShellArg (concatStringsSep "" luapath)} .. package.path" echo "package.path = ${lib.strings.escapeShellArg (concatStringsSep "" luapath)} .. package.path"
echo "package.cpath = ${lib.strings.escapeShellArg (concatStringsSep "" luacpath)} .. package.cpath" echo "package.cpath = ${lib.strings.escapeShellArg (concatStringsSep "" luacpath)} .. package.cpath"
echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
echo "local ok, ll = pcall(require,'lualinux'); if ok then ll.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end" echo "local ok, ll = pcall(require,'lualinux'); if ok then ll.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
fennel ${if macropath != "" then "--add-macro-path ${lib.strings.escapeShellArg macropath}" else ""} ${if correlate then "--correlate" else ""} --compile ${source} fennel ${if macropath != "" then "--add-macro-path ${lib.strings.escapeShellArg macropath}" else ""} ${if correlate then "--correlate" else ""} --compile ${source}
) > ${name}.lua ) > ${name}.lua