From 960db9bafcb06108c7e5ad3c1a3a9caae297ec05 Mon Sep 17 00:00:00 2001
From: Felix Schröter <dev@felschr.com>
Date: Tue, 3 Jan 2023 21:27:08 +0100
Subject: etebase-server: 0.10.0 -> 0.11.0

---
 pkgs/servers/etebase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix
index e84a3b45ce94c..6f38b3f43e485 100644
--- a/pkgs/servers/etebase/default.nix
+++ b/pkgs/servers/etebase/default.nix
@@ -5,14 +5,14 @@
 
 buildPythonPackage rec {
   pname = "etebase-server";
-  version = "0.10.0";
+  version = "0.11.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "server";
-    rev = "v${version}";
-    sha256 = "sha256-z6aiXSWdLcDfOpqC5epsclXWxJq59MqWDQOnnFqGwz4=";
+    rev = version;
+    sha256 = "sha256-+MSNX+CFmIQII+SFjM2TQKCgRMOTdsOIVAP8ur4WjQY=";
   };
 
   patches = [ ./secret.patch ];
-- 
cgit 1.4.1


From 81af5f82eb56ea51dbc31106d023600377611c14 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jan 2023 10:41:25 +0100
Subject: etebase-server: add changelog to meta

---
 pkgs/servers/etebase/default.nix | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix
index 6f38b3f43e485..079b87fe9a73e 100644
--- a/pkgs/servers/etebase/default.nix
+++ b/pkgs/servers/etebase/default.nix
@@ -1,7 +1,18 @@
-{ lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3
-, fastapi, msgpack, pynacl, redis, typing-extensions
-, withLdap ? true, python-ldap
-, withPostgres ? true, psycopg2 }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, aiofiles
+, django_3
+, fastapi
+, msgpack
+, pynacl
+, redis
+, typing-extensions
+, withLdap ? true
+, python-ldap
+, withPostgres ? true
+, psycopg2
+}:
 
 buildPythonPackage rec {
   pname = "etebase-server";
@@ -11,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "server";
-    rev = version;
-    sha256 = "sha256-+MSNX+CFmIQII+SFjM2TQKCgRMOTdsOIVAP8ur4WjQY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+MSNX+CFmIQII+SFjM2TQKCgRMOTdsOIVAP8ur4WjQY=";
   };
 
   patches = [ ./secret.patch ];
@@ -25,8 +36,11 @@ buildPythonPackage rec {
     pynacl
     redis
     typing-extensions
-  ] ++ lib.optional withLdap python-ldap
-    ++ lib.optional withPostgres psycopg2;
+  ] ++ lib.optional withLdap [
+    python-ldap
+  ] ++ lib.optional withPostgres [
+    psycopg2
+  ];
 
   installPhase = ''
     mkdir -p $out/bin $out/lib
@@ -38,7 +52,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/etesync/server";
-    description = "An Etebase (EteSync 2.0) server so you can run your own.";
+    description = "An Etebase (EteSync 2.0) server so you can run your own";
+    changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ felschr ];
   };
-- 
cgit 1.4.1