alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #170672 from felschr/fix/etebase-server

Browse source 
Fix etebase-server pyproject build error
This commit is contained in:
Sandro 2022-04-29 19:07:17 +02:00 committed by GitHub
parent cb9550ab71 3d3929c260
commit f410841566
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
maintainers/maintainer-list.nix
View file

@ -4105,11 +4105,18 @@
matrix = "@felschr:matrix.org";
github = "felschr";
githubId = 3314323;
name = "Felix Tenley";
keys = [{
longkeyid = "ed25519/0x910ACB9F6BD26F58";
fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
}];
name = "Felix Schröter";
keys = [
{
# historical
longkeyid = "ed25519/0x910ACB9F6BD26F58";
fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
}
{
longkeyid = "ed25519/0x671E39E6744C807D";
fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D";
}
];
};
ffinkdevs = {
email = "fink@h0st.space";

31
pkgs/servers/etebase/default.nix
View file

@ -1,18 +1,10 @@
{ lib, stdenv, python3, fetchFromGitHub }:
let
py = python3.override {
packageOverrides = self: super: {
django = super.django_3;
};
};
in
with py.pkgs;
{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3
, fastapi, msgpack, pynacl, typing-extensions }:
buildPythonPackage rec {
pname = "etebase-server";
version = "0.8.3";
format = "pyproject";
format = "other";
src = fetchFromGitHub {
owner = "etesync";
@ -23,21 +15,14 @@ buildPythonPackage rec {
patches = [ ./secret.patch ];
propagatedBuildInputs = with pythonPackages; [
asgiref
cffi
django
django-cors-headers
djangorestframework
drf-nested-routers
propagatedBuildInputs = [
aioredis
aiofiles
django_3
fastapi
msgpack
psycopg2
pycparser
pynacl
pytz
six
sqlparse
typing-extensions
];
installPhase = ''