From 09370e800a62d672bf92c0b18da0731aa2856829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Wed, 22 Jan 2020 16:39:49 +0100
Subject: [PATCH] fix: traadfri

---
 configs/traadfri.nix | 13 +++++--------
 modules/traadfri.nix |  6 +++---
 packages/libcoap.nix |  6 +++---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/configs/traadfri.nix b/configs/traadfri.nix
index 9297660..b391eef 100644
--- a/configs/traadfri.nix
+++ b/configs/traadfri.nix
@@ -8,14 +8,11 @@
     host = "192.168.178.28";
     key = lib.strings.fileContents <shared-secrets/traadfri.key>;
     rooms = {
-      bedroom = 131074;
-      corridor = 131076;
-      kitchen = 131075;
-      living-room = 131073;
-    };
-    bulbs = {
-      bedread = 65546;
-      livingread = 65537;
+      bedroom = 131082;
+      corridor = 131080;
+      kitchen = 131081;
+      living-room = 131079;
     };
+    bulbs.bedside = 65537;
   };
 }
diff --git a/modules/traadfri.nix b/modules/traadfri.nix
index 6e68d25..9ecfb70 100644
--- a/modules/traadfri.nix
+++ b/modules/traadfri.nix
@@ -6,11 +6,11 @@ let
     let traadfri-package = pkgs.fetchFromGitHub {
       owner = "kmein";
       repo = "traadfri";
-      rev = "652741b23213f6491ff3679f969716fdebde9bc3";
-      sha256 = "0rvnc95yww4sc9qkg1pvdcgin3vx381fhx8kwcb6hlg30lpdhhrz";
+      rev = "7b30d404ecd2d9ff06c60ed33967448e8c2f42f5";
+      sha256 = "1ff37k86vi7bnng3vna8myfkyqbkg25w6ds7gl94m4hax8wikz26";
     };
     in pkgs.python3Packages.callPackage traadfri-package {
-      libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> {};
+      libcoap = pkgs.callPackage <niveum/packages/libcoap.nix> { tls = true; };
     };
 in
 {
diff --git a/packages/libcoap.nix b/packages/libcoap.nix
index 68ed787..138b601 100644
--- a/packages/libcoap.nix
+++ b/packages/libcoap.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, automake, autoconf, which, libtool, stdenv }:
+{ lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls, tls ? false }:
 stdenv.mkDerivation {
   name = "libcoap";
   src = fetchFromGitHub {
@@ -13,12 +13,12 @@ stdenv.mkDerivation {
     autoconf
     which
     libtool
-  ];
+  ] ++ lib.optional tls gnutls;
   preConfigure = "./autogen.sh";
   configureFlags = [
     "--disable-documentation"
     "--disable-shared"
-  ];
+  ] ++ lib.optional tls "--enable-dtls";
   meta = with stdenv.lib; {
     homepage = "https://github.com/obgm/libcoap";
     description = "A CoAP (RFC 7252) implementation in C";