diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7f8b613187635..bd36d3d75a719 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -228,6 +228,7 @@
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   fare = "Francois-Rene Rideau <fahree@gmail.com>";
+  f-breidenstein = "Felix Breidenstein <mail@felixbreidenstein.de>";
   fgaz = "Francesco Gazzetta <francygazz@gmail.com>";
   FireyFly = "Jonas Höglund <nix@firefly.nu>";
   flokli = "Florian Klink <flokli@flokli.de>";
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
new file mode 100644
index 0000000000000..76dba87f9648b
--- /dev/null
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }:
+
+buildPythonPackage rec {
+  pname = "astral";
+  version = "1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7";
+  };
+
+  propagatedBuildInputs = [ pytz ];
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    py.test -k "not test_GoogleLocator"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Calculations for the position of the sun and the moon";
+    homepage = https://github.com/sffjunkie/astral/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix
new file mode 100644
index 0000000000000..2f89313bcb0cd
--- /dev/null
+++ b/pkgs/development/python-modules/vincenty/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  version = "0.1.4";
+  pname = "vincenty";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0nkqhbhrqar4jab7rvxfyjh2sh8d9v6ir861f6yrqdjzhggg58pa";
+  };
+
+  # Project does not have any tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/maurycyp/vincenty/;
+    description = " Calculate the geographical distance between 2 points with extreme accuracy";
+    license = licenses.unlicense;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ f-breidenstein ];
+  };
+}
+
+
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
new file mode 100644
index 0000000000000..c2ea5c2822927
--- /dev/null
+++ b/pkgs/servers/home-assistant/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, fetchurl, python3Packages, git, nmap }:
+
+python3Packages.buildPythonApplication rec {
+  version = "0.60.1";
+  pname = "homeassistant";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant";
+    repo = "home-assistant";
+    rev = version;
+    sha256 = "164a87dh4zxw1a5nmlgwjc1nls0d4jjhdy5pzz43pgnwhhflbph3";
+  };
+
+  postPatch = ''
+	sed -i 's/yarl==/yarl>=/' setup.py
+	sed -i 's/aiohttp==/aiohttp>=/' setup.py
+  '';
+
+  propagatedBuildInputs = with python3Packages; [ astral certifi netifaces pip vincenty webcolors pyyaml yarl
+                                                  aiohttp-cors voluptuous async-timeout requests aiohttp jinja2
+                                                  pytz chardet setuptools_scm typing git nmap ];
+
+
+ #checkInputs = [ python3Packages.pytest python3Packages.sqlalchemy ];
+ # Disable tests for now due to many failing checks caused by network and fs access
+ doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://home-assistant.io/;
+    description = "An open-source home automation platform running on Python 3";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ f-breidenstein ];
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a25521ce53758..a0fbb8d8ce40b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11851,6 +11851,8 @@ with pkgs;
 
   hbase = callPackage ../servers/hbase {};
 
+  home-assistant = callPackage ../servers/home-assistant { };
+
   hiawatha = callPackage ../servers/http/hiawatha {};
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47563ac163b35..9433edc3c856d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -165,6 +165,8 @@ in {
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 
+  astral = callPackage ../development/python-modules/astral { };
+
   astropy = callPackage ../development/python-modules/astropy {  };
 
   augeas = callPackage ../development/python-modules/augeas {
@@ -22591,6 +22593,8 @@ EOF
 
   vine = callPackage ../development/python-modules/vine { };
 
+  vincenty = callPackage ../development/python-modules/vincenty { };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";