diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 293b1dd..7ca5ad8 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -2,30 +2,9 @@ let inherit pkgs; - inherit pythonPkgs; selfprivacy-api = - { buildPythonPackage - , fetchPypi - , flask - , flask-restful - , flask-cors - , setuptools - , portalocker - , flask-swagger - , flask-swagger-ui - , pytz - , pytest - , pytest-mock - , pytest-datadir - , huey - , gevent - , mnemonic - , pydantic - , strawberry_graphql - , psutil - }: - buildPythonPackage rec { + pythonPkgs.buildPythonPackage rec { pname = "selfprivacy-api"; version = "1.2.6"; src = builtins.fetchGit { @@ -33,7 +12,7 @@ let rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8"; ref = "test-branch"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPkgs; [ flask flask-restful flask-cors diff --git a/pkgs/selfprivacy-graphql-api/default.nix b/pkgs/selfprivacy-graphql-api/default.nix index bf7ec0a..79fd5e7 100644 --- a/pkgs/selfprivacy-graphql-api/default.nix +++ b/pkgs/selfprivacy-graphql-api/default.nix @@ -2,27 +2,8 @@ let inherit pkgs; - inherit pythonPkgs; selfprivacy-graphql-api = - { buildPythonPackage - , fetchPypi - , setuptools - , portalocker - , pytz - , pytest - , pytest-mock - , pytest-datadir - , huey - , gevent - , mnemonic - , pydantic - , typing-extensions - , strawberry_graphql - , psutil - , fastapi - , uvicorn - }: pythonPkgs.buildPythonApplication rec { pname = "selfprivacy-graphql-api"; version = "2.0.0"; @@ -31,7 +12,7 @@ let rev = "43675b2d1d1e8b9ff3a66b47afbb73ff3de63425"; ref = "fastapi"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPkgs; [ setuptools portalocker pytz