From 76e961264b362b05feb9fac0436e05b8416f31cd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 29 Sep 2026 14:08:47 +0200 Subject: ... --- overlays/etebase-server/collection_uid.patch | 35 ++++++++++++++++++++++++++++ overlays/etebase-server/default.nix | 14 +++++++++++ 2 files changed, 49 insertions(+) create mode 100644 overlays/etebase-server/collection_uid.patch create mode 100644 overlays/etebase-server/default.nix (limited to 'overlays/etebase-server') diff --git a/overlays/etebase-server/collection_uid.patch b/overlays/etebase-server/collection_uid.patch new file mode 100644 index 00000000..cff550ba --- /dev/null +++ b/overlays/etebase-server/collection_uid.patch @@ -0,0 +1,35 @@ +diff --git i/etebase_server/fastapi/routers/collection.py w/etebase_server/fastapi/routers/collection.py +index bb01474..35c1f4b 100644 +--- i/etebase_server/fastapi/routers/collection.py ++++ w/etebase_server/fastapi/routers/collection.py +@@ -5,7 +5,7 @@ from django.core import exceptions as django_exceptions + from django.core.files.base import ContentFile + from django.db import IntegrityError, transaction + from django.db.models import Q, QuerySet +-from fastapi import APIRouter, BackgroundTasks, Depends, Request, status ++from fastapi import APIRouter, BackgroundTasks, Depends, Request, Path, status + + from etebase_server.django import models + from etebase_server.myauth.models import UserType +@@ -576,9 +576,9 @@ def fetch_updates( + + @item_router.post("/item/transaction/", dependencies=[Depends(has_write_access), *PERMISSIONS_READWRITE]) + def item_transaction( +- collection_uid: str, + data: ItemBatchIn, + background_tasks: BackgroundTasks, ++ collection_uid: str = Path(...), + stoken: t.Optional[str] = None, + user: UserType = Depends(get_authenticated_user), + ): +@@ -589,9 +589,9 @@ def item_transaction( + + @item_router.post("/item/batch/", dependencies=[Depends(has_write_access), *PERMISSIONS_READWRITE]) + def item_batch( +- collection_uid: str, + data: ItemBatchIn, + background_tasks: BackgroundTasks, ++ collection_uid: str = Path(...), + stoken: t.Optional[str] = None, + user: UserType = Depends(get_authenticated_user), + ): diff --git a/overlays/etebase-server/default.nix b/overlays/etebase-server/default.nix new file mode 100644 index 00000000..22a2d324 --- /dev/null +++ b/overlays/etebase-server/default.nix @@ -0,0 +1,14 @@ +{ final, prev, ... }: { + etebase-server = prev.etebase-server.overrideAttrs (oldAttrs: { + src = final.fetchFromGitHub { + owner = "PrivateBasicsApp"; + repo = "EteSyncServer"; + rev = "master"; + hash = "sha256-zHpQwIwPHi007cx8VwVqWoZXG8dgeJaxWY5XYn3a5/0="; + }; + + patches = (oldAttrs.patches or []) ++ [ + ./collection_uid.patch + ]; + }); +} -- cgit v1.2.3