default.nix

@@ -3,8 +3,36 @@ 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=";
+        };
+      };
+    };
+  };
+  pythonPackages = python39.pkgs;
+  selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {};
   selfprivacy-graphql-api = super.callPackage ./pkgs/selfprivacy-graphql-api {
     nixpkgs = pkgs;
-    pythonPkgs = super.python310Packages;
+    pythonPkgs = pythonPackages;
   };
 }

pkgs/selfprivacy-api/default.nix

@@ -0,0 +1,53 @@
+{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
+
+let
+  inherit (nixpkgs) pkgs;
+  inherit pythonPkgs;
+
+  selfprivacy-api =
+    { buildPythonPackage
+    , flask
+    , flask-restful
+    , setuptools
+    , portalocker
+    , flask-swagger
+    , flask-swagger-ui
+    , pytz
+    , pytest
+    , pytest-mock
+    , pytest-datadir
+    , huey
+    , gevent
+    , mnemonic
+    }:
+    buildPythonPackage rec {
+      pname = "selfprivacy-api";
+      version = "1.2.6";
+      src = builtins.fetchGit {
+        url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
+        rev = "401dff23fb9223e8a0a4bd3ee942c61e471a07ab";
+      };
+      propagatedBuildInputs = [
+        flask
+        flask-restful
+        setuptools
+        portalocker
+        flask-swagger
+        flask-swagger-ui
+        pytz
+        pytest
+        pytest-mock
+        pytest-datadir
+        huey
+        gevent
+        mnemonic
+      ];
+      meta = {
+        description = ''
+          SelfPrivacy Server Management API
+        '';
+      };
+    };
+  drv = pythonPkgs.callPackage selfprivacy-api { };
+in
+if pkgs.lib.inNixShell then drv.env else drv

pkgs/selfprivacy-graphql-api/default.nix

@@ -18,18 +18,17 @@ let
     , mnemonic
     , pydantic
     , typing-extensions
-    , strawberry-graphql
+    , strawberry_graphql
     , psutil
     , fastapi
     , uvicorn
-    , redis
     }:
     pythonPkgs.buildPythonApplication rec {
       pname = "selfprivacy-graphql-api";
-      version = "2.4.3";
+      version = "2.0.9";
       src = builtins.fetchGit {
         url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
-        rev = "cbd3cafe0a19d15f54e7915300b1142067d1c1bc";
+        rev = "0a09a338b850704f221bd9b451519290584ef209";
       };
       propagatedBuildInputs = [
         setuptools
@@ -43,11 +42,10 @@ let
         mnemonic
         pydantic
         typing-extensions
-        strawberry-graphql
+        strawberry_graphql
         psutil
         fastapi
         uvicorn
-        redis
       ];
       meta = {
         description = ''