Register migration

default.nix

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

pkgs/selfprivacy-graphql-api/default.nix

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