diff --git a/default.nix b/default.nix index fd68388..267b6d5 100644 --- a/default.nix +++ b/default.nix @@ -3,35 +3,5 @@ let in self: super: rec { - python39 = super.pkgs.python39.override { - packageOverrides = self: super: { - strawberry_graphql = super.buildPythonPackage - rec { - pname = "strawberry-graphql"; - version = "0.114.5"; - format = "pyproject"; - patches = [ - ./strawberry-graphql/strawberry-graphql.patch - ]; - propagatedBuildInputs = with super.pkgs; [ - typing-extensions - graphql-core - python-multipart - python-dateutil - flask - pydantic - pygments - poetry - ]; - - src = super.fetchPypi { - inherit pname version; - sha256 = "b6e007281cf29a66eeba66a512744853d8aa53b4ca2525befb6f350bb7b24df6"; - }; - }; - }; - }; - - python39Packages = python39.pkgs; selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {}; } diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix index 2c83f99..2ed7daa 100644 --- a/pkgs/selfprivacy-api/default.nix +++ b/pkgs/selfprivacy-api/default.nix @@ -21,7 +21,6 @@ let , mnemonic , pydantic , typing-extensions - , strawberry_graphql }: buildPythonPackage rec { pname = "selfprivacy-api"; @@ -45,7 +44,28 @@ let huey gevent mnemonic - strawberry_graphql + (buildPythonPackage rec { + pname = "strawberry-graphql"; + version = "0.114.5"; + format = "pyproject"; + patches = [ + ./strawberry-graphql.patch + ]; + propagatedBuildInputs = [ + typing-extensions + graphql-core + python-multipart + python-dateutil + flask + pydantic + pygments + poetry + ]; + src = fetchPypi { + inherit pname version; + sha256 = "b6e007281cf29a66eeba66a512744853d8aa53b4ca2525befb6f350bb7b24df6"; + }; + }) ]; meta = { description = '' diff --git a/pkgs/strawberry-graphql/strawberry-graphql.patch b/pkgs/selfprivacy-api/strawberry-graphql.patch similarity index 100% rename from pkgs/strawberry-graphql/strawberry-graphql.patch rename to pkgs/selfprivacy-api/strawberry-graphql.patch diff --git a/pkgs/strawberry-graphql/default.nix b/pkgs/strawberry-graphql/default.nix deleted file mode 100644 index 78dde12..0000000 --- a/pkgs/strawberry-graphql/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildPythonPackage } - -buildPythonPackage rec { - pname = "strawberry-graphql"; - version = "0.114.5"; - format = "pyproject"; - patches = [ - ./strawberry-graphql.patch - ]; - propagatedBuildInputs = [ - typing-extensions - graphql-core - python-multipart - python-dateutil - flask - pydantic - pygments - poetry - ]; - - src = fetchPypi { - inherit pname version; - sha256 = "b6e007281cf29a66eeba66a512744853d8aa53b4ca2525befb6f350bb7b24df6"; - }; - - meta = with lib; { - homepage = "https://strawberry.rocks/"; - license = "MIT"; - }; -}