From 1683de93383e8cd17dfa2e1206d965093e57c8bb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 15 May 2016 23:22:32 +0200
Subject: syntax

---
 custom/uucp.nix | 4 ++--
 hel.nix         | 4 ++--
 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
   portSpec = name: ''
     port ${name}
     type pipe
-    protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
+    protocol ${if builtins.hasAttr name config.services.uucp.protocols then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
     reliable true
     command ${pkgs.openssh}/bin/ssh -x -o batchmode=yes ${name}
   '';
@@ -17,7 +17,7 @@ let
     chat ""
     protocol ${if config.services.uucp.protocols ? name then config.services.uucp.protocols."${name}" else config.services.uucp.defaultProtocol}
     command-path ${concatStringsSep " " config.services.uucp.commandPath}
-    commands ${concatStringsSep " " (if config.services.uucp.commands ? name then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)}
+    commands ${concatStringsSep " " (if builtins.hasAttr name config.services.uucp.commands then config.services.uucp.commands."${name}" else config.services.uucp.defaultCommands)}
   '';
 in {
   options = {
diff --git a/hel.nix b/hel.nix
index b9628a65..bf669120 100644
--- a/hel.nix
+++ b/hel.nix
@@ -122,10 +122,10 @@
       commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" ];
       defaultCommands = [];
       protocols = {
-        isaac = "g";
+        "isaac" = "g";
       };
       commands = {
-        isaac = ["recv-media"];
+        "isaac" = ["recv-media"];
       };
     };
   };
-- 
cgit v1.2.3