From f10e8df3b91be91e8f9c0ae939f44835a0e0a219 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 13 Dec 2021 12:31:01 +0100
Subject: [PATCH] python3Packages.{aiopvapi,twentemilieu,wled}: fix merge

---
 pkgs/development/python-modules/aiopvapi/default.nix     | 9 ---------
 pkgs/development/python-modules/twentemilieu/default.nix | 1 -
 pkgs/development/python-modules/wled/default.nix         | 4 ++--
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix
index 0c0d19540212..3aa3116b0f5e 100644
--- a/pkgs/development/python-modules/aiopvapi/default.nix
+++ b/pkgs/development/python-modules/aiopvapi/default.nix
@@ -22,15 +22,6 @@ buildPythonPackage rec {
     sha256 = "18gbz9rcf183syvxvvhhl62af3b7463rlqxxs49w4m805hkvirdp";
   };
 
-  patches = [
-    (fetchpatch {
-      # Drop loop= kwarg from async_timeout and ClientSession calls
-      # https://github.com/sander76/aio-powerview-api/pull/13
-      url = "https://github.com/sander76/aio-powerview-api/commit/7be67268050fbbf7652ce5a020d2ff26f34d0b27.patch";
-      sha256 = "sha256-7QPwrMP1Sbrayg63YZJcRkVDAqcm6hqh0fuJdrUk5WY=";
-    })
-  ];
-
   propagatedBuildInputs = [
     aiohttp
     async-timeout
diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix
index 1e235ccdfb3f..a8a0fd0c99a6 100644
--- a/pkgs/development/python-modules/twentemilieu/default.nix
+++ b/pkgs/development/python-modules/twentemilieu/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, poetry-core
 , aiohttp
 , yarl
 , aresponses
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index a31030d50640..886ffea60b79 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -2,20 +2,20 @@
 , aiohttp
 , awesomeversion
 , backoff
+, buildPythonPackage
 , cachetools
+, fetchFromGitHub
 , poetry-core
 , yarl
 , aresponses
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
-, yarl
 }:
 
 buildPythonPackage rec {
   pname = "wled";
   version = "0.10.2";
-  disabled = pythonOlder "3.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";