From bec562981304f4997fd129b81c3aa49b72e93a0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Mar 2025 09:56:48 +0100 Subject: [PATCH 1/5] python313Packages.simplekv: fix inputs --- pkgs/development/python-modules/simplekv/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 55daa60befe2..364b7156ba5f 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ - dulwich + dependencies = [ dulwich ]; + + nativeCheckInputs = [ mock pytestCheckHook six From 55fc5541738eda81a2876e5efa1a4001c4781a92 Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Mon, 10 Mar 2025 16:09:32 -0400 Subject: [PATCH 2/5] python313Packages.simplekv: Move dulwich to nativeCheckInputs --- pkgs/development/python-modules/simplekv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 364b7156ba5f..42d0ffa39a54 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -26,9 +26,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ dulwich ]; - nativeCheckInputs = [ + dulwich mock pytestCheckHook six From 613cca1638182c1d4ca3edc3264c323b9e61c3b9 Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Mon, 10 Mar 2025 16:10:01 -0400 Subject: [PATCH 3/5] python313Packages.simplekv: Add dependency groups for backends --- .../python-modules/simplekv/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 42d0ffa39a54..85828fdb1ead 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, }: @@ -27,11 +36,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; nativeCheckInputs = [ - dulwich mock pytestCheckHook six - ]; + ] ++ optional-dependencies.git; pythonImportsCheck = [ "simplekv" ]; @@ -40,6 +48,20 @@ 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"; From 01b6a6d00f7ab75cfc16721b840d3a32c416ced1 Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Mon, 10 Mar 2025 16:14:12 -0400 Subject: [PATCH 4/5] python313Packages.simplekv: Add bbenne10 as maintainer --- pkgs/development/python-modules/simplekv/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix index 85828fdb1ead..b47cef41fc9c 100644 --- a/pkgs/development/python-modules/simplekv/default.nix +++ b/pkgs/development/python-modules/simplekv/default.nix @@ -67,6 +67,9 @@ buildPythonPackage rec { 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 + ]; }; } From 15e3bd7ab07cbb2c761615c759ff1af0c8521b3f Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Mon, 10 Mar 2025 16:14:36 -0400 Subject: [PATCH 5/5] maintainer-list: update bbenne10 information --- maintainers/maintainer-list.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b9cc3b38425e..3086156ab95b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2726,17 +2726,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";