Merge pull request #210233 from sumnerevans/vdirsyncer-fix-google-storage-type

vdirsyncer: fix Google integration

3 files changed, 44 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/aiohttp-oauthlib/default.nix b/pkgs/development/python-modules/aiohttp-oauthlib/default.nix
new file mode 100644
index 0000000000000..92981ea952c7a
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-oauthlib/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, oauthlib
+, aiohttp
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp-oauthlib";
+  version = "0.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-iTzRpZ3dDC5OmA46VE+XELfE/7nie0zQOLUf4dcDk7c=";
+  };
+
+  propagatedBuildInputs = [
+    oauthlib
+    aiohttp
+  ];
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  # Package has no tests.
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://git.sr.ht/~whynothugo/aiohttp-oauthlib";
+    description = "oauthlib integration for aiohttp clients";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sumnerevans ];
+  };
+}
diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 0ddc9b988aae5..c61ec16b87bb0 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -13,6 +13,7 @@
 , pytest-subtesthack
 , setuptools-scm
 , aiostream
+, aiohttp-oauthlib
 , aiohttp
 , pytest-asyncio
 , trustme
@@ -49,6 +50,7 @@ buildPythonPackage rec {
     requests-toolbelt
     aiostream
     aiohttp
+    aiohttp-oauthlib
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5190af5f0cc46..0fc94994a679a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -198,6 +198,8 @@ self: super: with self; {
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
+  aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { };
+
   aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { };
 
   aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };