From aa2112a7f1fdd0e109748097ffba1acae28f24f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Feb 2023 19:40:54 -0800
Subject: [PATCH 1/5] python310Packages.jaraco-email: init at 3.1.0

---
 .../python-modules/jaraco-email/default.nix   | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/jaraco-email/default.nix

diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix
new file mode 100644
index 000000000000..b99eff746f47
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools
+, setuptools-scm
+, jaraco_text
+, jaraco_collections
+, keyring
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-email";
+  version = "3.1.0";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.email";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    jaraco_text
+    jaraco_collections
+    keyring
+  ];
+
+  pythonImportsCheck = [ "jaraco.email" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst";
+    description = "E-mail facilities by jaraco";
+    homepage = "https://github.com/jaraco/jaraco.email";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22be0e013bbc..4fcaaae23b68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4792,6 +4792,8 @@ self: super: with self; {
 
   jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
 
+  jaraco-email = callPackage ../development/python-modules/jaraco-email { };
+
   jaraco-context = callPackage ../development/python-modules/jaraco-context { };
 
   jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };

From f47461478d1877079f8ed143dbc5713fbdfb09bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Feb 2023 19:34:47 -0800
Subject: [PATCH 2/5] python310Packages.jaraco-net: init at 9.3.0

---
 .../python-modules/jaraco-net/default.nix     | 97 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 99 insertions(+)
 create mode 100644 pkgs/development/python-modules/jaraco-net/default.nix

diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix
new file mode 100644
index 000000000000..d4ff9e929460
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco-net/default.nix
@@ -0,0 +1,97 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools
+, setuptools-scm
+, more-itertools
+, beautifulsoup4
+, mechanize
+, keyring
+, requests
+, feedparser
+, jaraco_text
+, jaraco_logging
+, jaraco-email
+, jaraco_functools
+, jaraco_collections
+, path
+, python-dateutil
+, pathvalidate
+, jsonpickle
+, ifconfig-parser
+, pytestCheckHook
+, cherrypy
+, importlib-resources
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-net";
+  version = "9.3.0";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.net";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Ks8e3xPjIWgSO0PSpjMYftxAuDt3ilogoDFuJqfN74o=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    more-itertools
+    beautifulsoup4
+    mechanize
+    keyring
+    requests
+    feedparser
+    jaraco_text
+    jaraco_logging
+    jaraco-email
+    jaraco_functools
+    jaraco_collections
+    path
+    python-dateutil
+    pathvalidate
+    jsonpickle
+  ] ++ lib.optionals stdenv.isDarwin [
+    ifconfig-parser
+  ];
+
+  pythonImportsCheck = [ "jaraco.net" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    cherrypy
+    importlib-resources
+    requests-mock
+  ];
+
+  disabledTestPaths = [
+    # doesn't actually contain tests
+    "fabfile.py"
+    # require networking
+    "jaraco/net/ntp.py"
+    "jaraco/net/scanner.py"
+    "tests/test_cookies.py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst";
+    description = "Networking tools by jaraco";
+    homepage = "https://github.com/jaraco/jaraco.net";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fcaaae23b68..5ccf22c6a6a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4802,6 +4802,8 @@ self: super: with self; {
 
   jaraco_logging = callPackage ../development/python-modules/jaraco_logging { };
 
+  jaraco-net = callPackage ../development/python-modules/jaraco-net { };
+
   jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
 
   jaraco-test = callPackage ../development/python-modules/jaraco-test { };

From 3168323c61467373b7d01fa66621335974439823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Feb 2023 20:12:57 -0800
Subject: [PATCH 3/5] python310Packages.bx-py-utils: init at 75

---
 .../python-modules/bx-py-utils/default.nix    | 73 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/development/python-modules/bx-py-utils/default.nix

diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
new file mode 100644
index 000000000000..c3072f914342
--- /dev/null
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry-core
+, beautifulsoup4
+, boto3
+, lxml
+, pdoc
+, pytestCheckHook
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "bx-py-utils";
+  version = "75";
+
+  disabled = pythonOlder "3.9";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "boxine";
+    repo = "bx_py_utils";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+RHt5QTXxuaY1tDe1M66TrQfT9I7X56oVQAW36mzSwM=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  pythonImportsCheck = [
+    "bx_py_utils.anonymize"
+    "bx_py_utils.auto_doc"
+    "bx_py_utils.compat"
+    "bx_py_utils.dict_utils"
+    "bx_py_utils.environ"
+    "bx_py_utils.error_handling"
+    "bx_py_utils.file_utils"
+    "bx_py_utils.graphql_introspection"
+    "bx_py_utils.hash_utils"
+    "bx_py_utils.html_utils"
+    "bx_py_utils.iteration"
+    "bx_py_utils.path"
+    "bx_py_utils.processify"
+    "bx_py_utils.rison"
+    "bx_py_utils.stack_info"
+    "bx_py_utils.string_utils"
+    "bx_py_utils.test_utils"
+    "bx_py_utils.text_tools"
+  ];
+
+  nativeCheckInputs = [
+    beautifulsoup4
+    boto3
+    lxml
+    pdoc
+    pytestCheckHook
+    requests-mock
+  ];
+
+  disabledTestPaths = [
+    "bx_py_utils_tests/tests/test_project_setup.py"
+  ];
+
+  meta = {
+    description = "Various Python utility functions";
+    homepage = "https://github.com/boxine/bx_py_utils";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ccf22c6a6a9..d660cdd748ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1487,6 +1487,8 @@ self: super: with self; {
 
   bundlewrap = callPackage ../development/python-modules/bundlewrap { };
 
+  bx-py-utils = callPackage ../development/python-modules/bx-py-utils { };
+
   bx-python = callPackage ../development/python-modules/bx-python { };
 
   bwapy = callPackage ../development/python-modules/bwapy { };

From f7ff88d7952c106d0c5bb617d82412b4a2796897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Feb 2023 19:21:32 -0800
Subject: [PATCH 4/5] python310Packages.jaraco-abode: init at 3.2.1

---
 .../python-modules/abodepy/default.nix        | 26 -----
 .../python-modules/jaraco-abode/default.nix   | 99 +++++++++++++++++++
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  4 +-
 4 files changed, 102 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/abodepy/default.nix
 create mode 100644 pkgs/development/python-modules/jaraco-abode/default.nix

diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix
deleted file mode 100644
index 42a6d8be2d2f..000000000000
--- a/pkgs/development/python-modules/abodepy/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond
-, requests, isPy3k, requests-mock }:
-
-buildPythonPackage rec {
-  pname = "abodepy";
-  version = "1.2.2";
-
-  disabled = !isPy3k;
-
-  src = fetchFromGitHub {
-    owner = "MisterWil";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-GrvNCgWGGBbUUONwS18csh4/A0MMkSk5Z6LlDhlQqok=";
-  };
-
-  propagatedBuildInputs = [ colorlog lomond requests ];
-  nativeCheckInputs = [ pytestCheckHook requests-mock ];
-
-  meta = with lib; {
-    homepage = "https://github.com/MisterWil/abodepy";
-    description = "An Abode alarm Python library running on Python 3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jamiemagee ];
-  };
-}
diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix
new file mode 100644
index 000000000000..0f56965ebd68
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco-abode/default.nix
@@ -0,0 +1,99 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, fetchPypi
+, fetchpatch
+, setuptools
+, setuptools-scm
+, requests
+, lomond
+, colorlog
+, keyring
+, requests-toolbelt
+, jaraco_collections
+, jaraco-context
+, jaraco_classes
+, jaraco-net
+, more-itertools
+, importlib-resources
+, bx-py-utils
+, platformdirs
+, jaraco_itertools
+, pytestCheckHook
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-abode";
+  version = "3.2.1";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.abode";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E=";
+  };
+
+  patches = [
+    # https://github.com/jaraco/jaraco.abode/issues/19
+    (fetchpatch {
+      name = "specify-options-package-data.patch";
+      url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch";
+      hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    requests
+    lomond
+    colorlog
+    keyring
+    requests-toolbelt
+    jaraco_collections
+    jaraco-context
+    jaraco_classes
+    jaraco-net
+    more-itertools
+    importlib-resources
+    bx-py-utils
+    platformdirs
+    jaraco_itertools
+  ];
+
+  pythonImportsCheck = [ "jaraco.abode" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  preCheck = ''
+    export HOME=$TEMP
+  '';
+
+  disabledTests = [
+    "_cookie_string"
+    "test_cookies"
+    "test_empty_cookies"
+    "test_invalid_cookies"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/jaraco/jaraco.abode";
+    description = "Library interfacing to the Abode home security system";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jamiemagee dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7616bbc588c8..d9728d8cb5ad 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -33,6 +33,7 @@ in
   ### Deprecated aliases - for backward compatibility
 
 mapAliases ({
+  abodepy = jaraco-abode; # added 2023-02-01
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d660cdd748ac..c56ae45f278f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18,8 +18,6 @@ self: super: with self; {
 
   aardwolf = callPackage ../development/python-modules/aardwolf { };
 
-  abodepy = callPackage ../development/python-modules/abodepy { };
-
   absl-py = callPackage ../development/python-modules/absl-py { };
 
   accuweather = callPackage ../development/python-modules/accuweather { };
@@ -4790,6 +4788,8 @@ self: super: with self; {
 
   janus = callPackage ../development/python-modules/janus { };
 
+  jaraco-abode = callPackage ../development/python-modules/jaraco-abode { };
+
   jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
 
   jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };

From e6638023aa7d87f38e1d410f653ead0e31be6043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Feb 2023 20:23:11 -0800
Subject: [PATCH 5/5] home-assistant: support abode component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 189c09afa42f..1d1e2a94ae11 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -7,7 +7,8 @@
     "3_day_blinds" = ps: with ps; [
     ];
     "abode" = ps: with ps; [
-    ]; # missing inputs: jaraco.abode
+      jaraco-abode
+    ];
     "accuweather" = ps: with ps; [
       accuweather
     ];
@@ -4427,6 +4428,7 @@
   };
   # components listed in tests/components for which all dependencies are packaged
   supportedComponentsWithTests = [
+    "abode"
     "accuweather"
     "acmeda"
     "adax"