mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo.git
synced 2024-11-22 20:21:27 +00:00
roll back
This commit is contained in:
parent
f991c626f8
commit
4f74abf105
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue