From 0d94eb0a0534a8348821cf64d7b48cb7b347695d Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Thu, 21 Oct 2021 22:34:10 +0200
Subject: [PATCH 1/4] python3Packages.py-synologydsm-api: enable tests

Download sources from GitHub since PyPI package doesn't contain tests.
---
 .../py-synologydsm-api/default.nix            | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index 3aa0fe76fff..ffdd24efe49 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytestCheckHook
+, poetry-core
 , urllib3
 , requests
 }:
@@ -8,18 +10,25 @@
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
   version = "1.0.2";
+  format = "pyproject";
 
-  src = fetchPypi {
-    pname = "synologydsm-api";
-    inherit version;
-    sha256 = "42ea453ef5734dd5b8163e3d18ef309658f0298411720e6b834bededd28c5d53";
+  src = fetchFromGitHub {
+    owner = "hacf-fr";
+    repo = "synologydsm-api";
+    rev = "v${version}";
+    sha256 = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8=";
   };
 
+  nativeBuildInputs = [ poetry-core ];
   propagatedBuildInputs = [ urllib3 requests ];
+  pythonImportsCheck = [ "synology_dsm" ];
+  checkInputs = [ pytestCheckHook ];
 
-  pythonImportsCheck = [
-    "synology_dsm"
-  ];
+  postPatch = ''
+    # was fixed upstream but not released, remove after upgrade to version > 1.0.2
+    substituteInPlace pyproject.toml \
+      --replace "poetry.masonry.api" "poetry.core.masonry.api"
+  '';
 
   meta = with lib; {
     description = "Python API for Synology DSM";

From 76445df05b0bcf133ce69a265b60cd86e2091ab4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Oct 2021 00:18:39 +0200
Subject: [PATCH 2/4] home-assistant: test synology_dsm component

---
 pkgs/servers/home-assistant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ef1ce97ae74..8bc4a292d8b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -640,6 +640,7 @@ in with py.pkgs; buildPythonApplication rec {
     "switcher_kis"
     "syncthing"
     "syncthru"
+    "synology_dsm"
     "system_health"
     "system_log"
     "tado"

From 538e0e0aab31672df392dfb8864dc87ab349e025 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Oct 2021 01:12:17 +0200
Subject: [PATCH 3/4] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index ee17623c0c5..5a2582bcb75 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -845,7 +845,7 @@
     "syncthing" = ps: with ps; [ aiosyncthing ];
     "syncthru" = ps: with ps; [ pysyncthru url-normalize ];
     "synology_chat" = ps: with ps; [ ];
-    "synology_dsm" = ps: with ps; [ ]; # missing inputs: py-synologydsm-api
+    "synology_dsm" = ps: with ps; [ py-synologydsm-api ];
     "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
     "syslog" = ps: with ps; [ ];
     "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ];

From 32060ee592bd1a37113fd3a66300ddcf0610ef79 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Oct 2021 01:13:35 +0200
Subject: [PATCH 4/4] python3Packages.py-synologydsm-api: 1.0.2 -> 1.0.4

---
 .../python-modules/py-synologydsm-api/default.nix    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index ffdd24efe49..73ac2fcc019 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
-  version = "1.0.2";
+  version = "1.0.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
-    owner = "hacf-fr";
+    owner = "mib1185";
     repo = "synologydsm-api";
     rev = "v${version}";
-    sha256 = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8=";
+    sha256 = "1f9fbcp6dbh1c7q1cpppwggnw4m89w14cjdgl64f1bzv72rggpn1";
   };
 
   nativeBuildInputs = [ poetry-core ];
@@ -24,12 +24,6 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "synology_dsm" ];
   checkInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    # was fixed upstream but not released, remove after upgrade to version > 1.0.2
-    substituteInPlace pyproject.toml \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api"
-  '';
-
   meta = with lib; {
     description = "Python API for Synology DSM";
     homepage = "https://github.com/hacf-fr/synologydsm-api";