diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d386ed624478..5c7b0d434e2f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2896,17 +2896,11 @@ name = "Brandon Elam Barker"; }; bbenne10 = { - email = "Bryan.Bennett@protonmail.com"; + email = "Bryan.Bennett+nixpkgs@proton.me"; matrix = "@bryan.bennett:matrix.org"; github = "bbenne10"; githubId = 687376; name = "Bryan Bennett"; - keys = [ - { - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - } - ]; }; bbenno = { email = "nix@bbenno.com"; diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 55daa60befe2..b47cef41fc9c 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -1,12 +1,21 @@ { lib, buildPythonPackage, - dulwich, fetchFromGitHub, - mock, - pytestCheckHook, pythonOlder, setuptools, + + # optional dependencies + azure-storage-blob, + boto3, + dulwich, + google-cloud-storage, + pymongo, + redis, + + # testing + mock, + pytestCheckHook, six, }: @@ -26,12 +35,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ - dulwich + nativeCheckInputs = [ mock pytestCheckHook six - ]; + ] ++ optional-dependencies.git; pythonImportsCheck = [ "simplekv" ]; @@ -40,11 +48,28 @@ buildPythonPackage rec { "test_concurrent_mkdir" ]; + optional-dependencies = { + amazon = [ boto3 ]; + azure = [ azure-storage-blob ]; + google = [ google-cloud-storage ]; + redis = [ redis ]; + mongodb = [ pymongo ]; + git = [ dulwich ]; + /* + Additional potential dependencies not exposed here: + sqlalchemy: Our version is too new for simplekv + appengine-python-standard: Not packaged in nixpkgs + */ + }; + meta = with lib; { description = "Simple key-value store for binary data"; homepage = "https://github.com/mbr/simplekv"; changelog = "https://github.com/mbr/simplekv/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ + fab + bbenne10 + ]; }; }