2 files changed, 35 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/servers/home-assistant/cli.nix b/nixpkgs/pkgs/servers/home-assistant/cli.nix
index 90e4b0c736d5..a8cbc66f30b9 100644
--- a/nixpkgs/pkgs/servers/home-assistant/cli.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/cli.nix
@@ -3,11 +3,11 @@
 
 python36.pkgs.buildPythonApplication rec {
   pname = "homeassistant-cli";
-  version = "0.4.4";
+  version = "0.5.0";
 
   src = python36.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "ad3722062ffb7b4fa730f61991b831dbf083e4e079c560993a023ce4bb11c55d";
+    sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d";
   };
 
   postPatch = ''
@@ -20,7 +20,7 @@ python36.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python36.pkgs; [
-    requests pyyaml netdisco click click-log tabulate idna jsonpath_rw jinja2 dateparser
+    requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp
   ];
 
   LC_ALL = "en_US.UTF-8";
diff --git a/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
new file mode 100644
index 000000000000..85d12cf07beb
--- /dev/null
+++ b/nixpkgs/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, fetchpatch }:
+
+stdenv.mkDerivation rec {
+  name = "tt-rss-plugin-auth-ldap-${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "hydrian";
+    repo = "TTRSS-Auth-LDAP";
+    rev = version;
+    sha256 = "1mg9jff2m0ajxql1vd1g7hsxfbv9smhrmjg4j2gvvjbii45ry0jh";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Mic92/TTRSS-Auth-LDAP/commit/7534fa54babc377a070e05e326a46a252b5e3884.patch";
+      sha256 = "1p7zas0n627z0g226dp5m5dg1ai2z3vi69n3xivp517iv3lch70l";
+    })
+  ];
+
+  installPhase = ''
+    install -D plugins/auth_ldap/init.php $out/auth_ldap/init.php
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Plugin for TT-RSS to authenticate users via ldap";
+    license = licenses.gpl3;
+    homepage = https://github.com/hydrian/TTRSS-Auth-LDAP;
+    maintainers = with maintainers; [ mic92 ];
+    platforms = platforms.all;
+  };
+}