From ead46754b4b4b1ef2ca932079be420dbc718f056 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 27 Apr 2022 23:09:27 +0200
Subject: [PATCH 1/3] etebase-server: fix build

For some reason the pyproject build setp started to fail. Since the
pyproject.toml is basically empty I'm switching this project to the
format "other".
---
 pkgs/servers/etebase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix
index e340d1ff2a5..8b567951588 100644
--- a/pkgs/servers/etebase/default.nix
+++ b/pkgs/servers/etebase/default.nix
@@ -12,7 +12,7 @@ in
 buildPythonPackage rec {
   pname = "etebase-server";
   version = "0.8.3";
-  format = "pyproject";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "etesync";

From efcc1cf8874a279fe57daeb10e233723a3ec324c Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 27 Apr 2022 23:12:01 +0200
Subject: [PATCH 2/3] etebase-server: fix dependencies

Add missing dependencies & remove unused ones.
---
 pkgs/servers/etebase/default.nix | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix
index 8b567951588..9ed14ac5503 100644
--- a/pkgs/servers/etebase/default.nix
+++ b/pkgs/servers/etebase/default.nix
@@ -1,13 +1,5 @@
-{ 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";
@@ -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 = ''

From 3d3929c26018682049046d616e2bb78a869a353c Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 27 Apr 2022 23:45:17 +0200
Subject: [PATCH 3/3] maintainers: update felschr

---
 maintainers/maintainer-list.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 36d7ae48119..9a515d6ddfb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4092,11 +4092,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";