From 4f74abf105f58a5bae86563ea6fb82cc19f88c0c Mon Sep 17 00:00:00 2001
From: inexcode <github@inex.rocks>
Date: Fri, 12 Aug 2022 21:35:42 +0400
Subject: [PATCH] roll back

---
 default.nix                              |  6 ++---
 pkgs/selfprivacy-api/default.nix         | 29 ++++++++++++++++++++----
 pkgs/selfprivacy-graphql-api/default.nix | 27 ++++++++++++++++++----
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/default.nix b/default.nix
index f34f1a2..dc446d2 100644
--- a/default.nix
+++ b/default.nix
@@ -31,13 +31,11 @@ self: super: rec {
   };
   pythonPackages = python39.pkgs;
   selfprivacy-api = super.callPackage ./pkgs/selfprivacy-api {
-    pkgs = pkgs;
+    nixpkgs = pkgs;
     pythonPkgs = pythonPackages;
-    lib = pkgs.lib;
   };
   selfprivacy-graphql-api = super.callPackage ./pkgs/selfprivacy-graphql-api {
-    pkgs = pkgs;
+    nixpkgs = pkgs;
     pythonPkgs = pythonPackages;
-    lib = pkgs.lib;
   };
 }
diff --git a/pkgs/selfprivacy-api/default.nix b/pkgs/selfprivacy-api/default.nix
index 7ca5ad8..dd66ee5 100644
--- a/pkgs/selfprivacy-api/default.nix
+++ b/pkgs/selfprivacy-api/default.nix
@@ -1,9 +1,30 @@
-{ pkgs, pythonPkgs, lib }:
+{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
 
 let
-  inherit pkgs;
+  inherit (nixpkgs) 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
+    }:
     pythonPkgs.buildPythonPackage rec {
       pname = "selfprivacy-api";
       version = "1.2.6";
@@ -12,7 +33,7 @@ let
         rev = "9132b70e709b19ddc393859ce23f8a5c342fa4e8";
         ref = "test-branch";
       };
-      propagatedBuildInputs = with pythonPkgs; [
+      propagatedBuildInputs = [
         flask
         flask-restful
         flask-cors
@@ -39,4 +60,4 @@ let
     };
   drv = pythonPkgs.callPackage selfprivacy-api { };
 in
-if lib.inNixShell then drv.env else drv
+if pkgs.lib.inNixShell then drv.env else drv
diff --git a/pkgs/selfprivacy-graphql-api/default.nix b/pkgs/selfprivacy-graphql-api/default.nix
index 79fd5e7..ffa25a3 100644
--- a/pkgs/selfprivacy-graphql-api/default.nix
+++ b/pkgs/selfprivacy-graphql-api/default.nix
@@ -1,9 +1,28 @@
-{ pkgs, pythonPkgs, lib }:
+{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
 
 let
-  inherit pkgs;
+  inherit (nixpkgs) 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";
@@ -12,7 +31,7 @@ let
         rev = "43675b2d1d1e8b9ff3a66b47afbb73ff3de63425";
         ref = "fastapi";
       };
-      propagatedBuildInputs = with pythonPkgs; [
+      propagatedBuildInputs = [
         setuptools
         portalocker
         pytz
@@ -40,4 +59,4 @@ let
     };
   drv = pythonPkgs.callPackage selfprivacy-graphql-api { };
 in
-if lib.inNixShell then drv.env else drv
+if pkgs.lib.inNixShell then drv.env else drv