summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-05-15 23:22:32 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-05-15 23:22:32 +0200
commit1683de93383e8cd17dfa2e1206d965093e57c8bb (patch)
tree3ff6d48945fbba4b3968902e06897facce012cb0
parente27a28dd6b899629d11c44baff72f19340ef0cf1 (diff)
downloadnixos-1683de93383e8cd17dfa2e1206d965093e57c8bb.tar
nixos-1683de93383e8cd17dfa2e1206d965093e57c8bb.tar.gz
nixos-1683de93383e8cd17dfa2e1206d965093e57c8bb.tar.bz2
nixos-1683de93383e8cd17dfa2e1206d965093e57c8bb.tar.xz
nixos-1683de93383e8cd17dfa2e1206d965093e57c8bb.zip
syntax
-rw-r--r--custom/uucp.nix4
-rw-r--r--hel.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/custom/uucp.nix b/custom/uucp.nix
index b58268ae..7035b934 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -6,7 +6,7 @@ let
6 portSpec = name: '' 6 portSpec = name: ''
7 port ${name} 7 port ${name}
8 type pipe 8 type pipe
9 protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} 9 protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
10 reliable true 10 reliable true
11 command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name} 11 command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name}
12 ''; 12 '';
@@ -17,7 +17,7 @@ let
17 chat "" 17 chat ""
18 protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol} 18 protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
19 command-path ${concatStringsSep " " config.services.uucp.commandPath} 19 command-path ${concatStringsSep " " config.services.uucp.commandPath}
20 commands ${concatStringsSep " " (if config.services.uucp.commands ? name then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)} 20 commands ${concatStringsSep " " (if builtins.hasAttr name config.services.uucp.commands then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)}
21 ''; 21 '';
22in { 22in {
23 options = { 23 options = {
diff --git a/hel.nix b/hel.nix
index b9628a65..bf669120 100644
--- a/hel.nix
+++ b/hel.nix
@@ -122,10 +122,10 @@
122 commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" ]; 122 commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" ];
123 defaultCommands = []; 123 defaultCommands = [];
124 protocols = { 124 protocols = {
125 isaac = "g"; 125 "isaac" = "g";
126 }; 126 };
127 commands = { 127 commands = {
128 isaac = ["recv-media"]; 128 "isaac" = ["recv-media"];
129 }; 129 };
130 }; 130 };
131 }; 131 };