fix package name

default.nix

@@ -3,36 +3,10 @@ let
 in
 
 self: super: rec {
-  python39 = super.python39.override {
-    packageOverrides = python-self: python-super: {
-      strawberry_graphql = python-super.buildPythonPackage rec {
-        pname = "strawberry-graphql";
-        version = "0.123.0";
-        format = "pyproject";
-        patches = [
-          ./strawberry-graphql.patch
-        ];
-        propagatedBuildInputs = with self.python39Packages; [
-          typing-extensions
-          graphql-core
-          python-multipart
-          python-dateutil
-          flask
-          pydantic
-          pygments
-          poetry
-        ];
-        src = python-super.fetchPypi {
-          inherit pname version;
-          sha256 = "sha256-KsmZ5Xv8tUg6yBxieAEtvoKoRG60VS+iVGV0X6oCExo=";
-        };
-      };
-    };
+  selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {
+    nixpkgs = pkgs;
   };
-  pythonPackages = python39.pkgs;
-  selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {};
   selfprivacy-graphql-api = super.callPackage ./pkgs/selfprivacy-graphql-api {
     nixpkgs = pkgs;
-    pythonPkgs = pythonPackages;
   };
 }

pkgs/selfprivacy-api/default.nix

@@ -6,8 +6,10 @@ let
 
   selfprivacy-api =
     { buildPythonPackage
+    , fetchPypi
     , flask
     , flask-restful
+    , flask-cors
     , setuptools
     , portalocker
     , flask-swagger
@@ -19,17 +21,22 @@ let
     , huey
     , gevent
     , mnemonic
+    , pydantic
+    , strawberry-graphql
+    , psutil
     }:
-    buildPythonPackage rec {
+    pythonPkgs.buildPythonPackage rec {
       pname = "selfprivacy-api";
       version = "1.2.6";
       src = builtins.fetchGit {
         url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
-        rev = "401dff23fb9223e8a0a4bd3ee942c61e471a07ab";
+        rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8";
+        ref = "test-branch";
       };
       propagatedBuildInputs = [
         flask
         flask-restful
+        flask-cors
         setuptools
         portalocker
         flask-swagger
@@ -41,6 +48,9 @@ let
         huey
         gevent
         mnemonic
+        pydantic
+        strawberry-graphql
+        psutil
       ];
       meta = {
         description = ''

pkgs/selfprivacy-graphql-api/default.nix

@@ -18,18 +18,18 @@ let
     , mnemonic
     , pydantic
     , typing-extensions
-    , strawberry_graphql
+    , strawberry-graphql
     , psutil
     , fastapi
     , uvicorn
     }:
     pythonPkgs.buildPythonApplication rec {
       pname = "selfprivacy-graphql-api";
-      version = "2.0.9";
+      version = "2.0.0";
       src = builtins.fetchGit {
-        url = "https://git.selfprivacy.org/houkime/selfprivacy-rest-api.git";
-        ref = "deploy";
-        #rev = "0a09a338b850704f221bd9b451519290584ef209";
+        url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
+        rev = "7fe51eb665f0f8ab18638af3cc4452f9c0d87b34";
+        ref = "fastapi";
       };
       propagatedBuildInputs = [
         setuptools
@@ -43,7 +43,7 @@ let
         mnemonic
         pydantic
         typing-extensions
-        strawberry_graphql
+        strawberry-graphql
         psutil
         fastapi
         uvicorn