diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
new file mode 100644
index 000000000000..df13e8d7519a
--- /dev/null
+++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aiohttp
+, aresponses
+, asynctest
+, buildPythonPackage
+, aio-geojson-client
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, pytz
+}:
+
+buildPythonPackage rec {
+  pname = "aio-geojson-generic-client";
+  version = "0.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "exxamalte";
+    repo = "python-aio-geojson-generic-client";
+    rev = "v${version}";
+    hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    aio-geojson-client
+    pytz
+  ];
+
+  checkInputs = [
+    aresponses
+    asynctest
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "aio_geojson_generic_client"
+  ];
+
+  meta = with lib; {
+    description = "Python library for accessing GeoJSON feeds";
+    homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 89f2c310f299..3088fd368c28 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -947,7 +947,8 @@
       geniushub-client
     ];
     "geo_json_events" = ps: with ps; [
-    ]; # missing inputs: aio_geojson_generic_client
+      aio-geojson-generic-client
+    ];
     "geo_location" = ps: with ps; [
     ];
     "geo_rss_events" = ps: with ps; [
@@ -3300,6 +3301,7 @@
     "generic"
     "generic_hygrostat"
     "generic_thermostat"
+    "geo_json_events"
     "geo_location"
     "geo_rss_events"
     "geofency"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f5e1cea55f57..723bf8e63e2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -229,6 +229,8 @@ in {
 
   aio-geojson-client = callPackage ../development/python-modules/aio-geojson-client { };
 
+  aio-geojson-generic-client = callPackage ../development/python-modules/aio-geojson-generic-client { };
+
   aio-geojson-geonetnz-quakes = callPackage ../development/python-modules/aio-geojson-geonetnz-quakes { };
 
   aio-geojson-geonetnz-volcano = callPackage ../development/python-modules/aio-geojson-geonetnz-volcano { };