Compare commits
26 Commits
master
...
restic-rew
Author | SHA1 | Date |
---|---|---|
Inex Code | 0d5b0e8fa2 | |
Inex Code | 58b94398e1 | |
Inex Code | 45c4cda9b7 | |
Inex Code | e513a4376f | |
Inex Code | 98223f0d11 | |
NaiJi ✨ | e56ccb74b2 | |
Inex Code | 12aabacba6 | |
Inex Code | 4bb5724a6f | |
Inex Code | f694baf75d | |
Inex Code | fa6a7ec995 | |
Inex Code | 101a568dc2 | |
Inex Code | bb5769efed | |
Inex Code | 2ad99dc3f5 | |
Inex Code | 71d390b498 | |
Inex Code | 92224c5f53 | |
Inex Code | 73e816cd08 | |
Inex Code | 8592abe56c | |
Inex Code | ad9ed5b3da | |
Inex Code | c3fe5d3898 | |
Inex Code | 6485b78f38 | |
Inex Code | ede514b193 | |
Inex Code | a5b2538829 | |
Inex Code | 6bcfa9452f | |
Inex Code | 746e8ad4ec | |
Inex Code | 4958fa8f84 | |
Inex Code | de5ed98a5c |
30
default.nix
30
default.nix
|
@ -3,36 +3,8 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
self: super: rec {
|
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 {
|
selfprivacy-graphql-api = super.callPackage ./pkgs/selfprivacy-graphql-api {
|
||||||
nixpkgs = pkgs;
|
nixpkgs = pkgs;
|
||||||
pythonPkgs = pythonPackages;
|
pythonPkgs = super.python310Packages;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
{ 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
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python39Packages }:
|
{ nixpkgs ? import <nixpkgs> { }, pythonPkgs ? nixpkgs.pkgs.python310Packages }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (nixpkgs) pkgs;
|
inherit (nixpkgs) pkgs;
|
||||||
|
@ -18,17 +18,19 @@ let
|
||||||
, mnemonic
|
, mnemonic
|
||||||
, pydantic
|
, pydantic
|
||||||
, typing-extensions
|
, typing-extensions
|
||||||
, strawberry_graphql
|
, strawberry-graphql
|
||||||
, psutil
|
, psutil
|
||||||
, fastapi
|
, fastapi
|
||||||
, uvicorn
|
, uvicorn
|
||||||
|
, redis
|
||||||
}:
|
}:
|
||||||
pythonPkgs.buildPythonApplication rec {
|
pythonPkgs.buildPythonApplication rec {
|
||||||
pname = "selfprivacy-graphql-api";
|
pname = "selfprivacy-graphql-api";
|
||||||
version = "2.0.9";
|
version = "2.4.1";
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git";
|
||||||
rev = "0a09a338b850704f221bd9b451519290584ef209";
|
rev = "8b840d4c2cff45845b01a9b654654eb620f9333f";
|
||||||
|
ref = "backup-reason-fix";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
setuptools
|
setuptools
|
||||||
|
@ -42,10 +44,11 @@ let
|
||||||
mnemonic
|
mnemonic
|
||||||
pydantic
|
pydantic
|
||||||
typing-extensions
|
typing-extensions
|
||||||
strawberry_graphql
|
strawberry-graphql
|
||||||
psutil
|
psutil
|
||||||
fastapi
|
fastapi
|
||||||
uvicorn
|
uvicorn
|
||||||
|
redis
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
description = ''
|
description = ''
|
||||||
|
|
Loading…
Reference in New Issue