From b59d345f0b74220ae404e6dac4d81704e7cc76f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 May 2023 09:35:21 +0200
Subject: [PATCH 1/2] fdroidserver: update meta

---
 pkgs/development/tools/fdroidserver/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index fd15f24e5390..dedfb080ea2f 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -11,7 +11,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
-    rev = version;
+    rev = "refs/tags/${version}";
     sha256 = "0qg4vxjcgm05dqk3kyj8lry9wh5bxy0qwz70fiyxb5bi1kwai9ss";
   };
 
@@ -57,12 +57,15 @@ python.pkgs.buildPythonApplication rec {
   # no tests
   doCheck = false;
 
-  pythonImportsCheck = [ "fdroidserver" ];
+  pythonImportsCheck = [
+    "fdroidserver"
+  ];
 
   meta = with lib; {
-    homepage = "https://f-droid.org";
+    homepage = "https://github.com/f-droid/fdroidserver";
+    changelog = "https://github.com/f-droid/fdroidserver/blob/${version}/CHANGELOG.md";
     description = "Server and tools for F-Droid, the Free Software repository system for Android";
-    license = licenses.agpl3;
+    license = licenses.agpl3Plus;
     maintainers = with maintainers; [ obfusk ];
   };
 

From b70ddf1272bed0a6173ff87dd456f5da9da60cbc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 May 2023 09:40:36 +0200
Subject: [PATCH 2/2] fdroidserver: 2.1.1 -> 2.2.1

Diff: https://gitlab.com/fdroid/fdroidserver/-/compare/refs/tags/2.1.1...2.2.1

Changelog: https://github.com/f-droid/fdroidserver/blob/2.2.1/CHANGELOG.md
---
 .../tools/fdroidserver/default.nix            | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index dedfb080ea2f..e960e62fca05 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -6,15 +6,21 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "fdroidserver";
-  version = "2.1.1";
+  version = "2.2.1";
+  format = "setuptools";
 
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
     rev = "refs/tags/${version}";
-    sha256 = "0qg4vxjcgm05dqk3kyj8lry9wh5bxy0qwz70fiyxb5bi1kwai9ss";
+    sha256 = "sha256-+Y1YTgELsX834WIrhx/NX34yLMHdkKM+YUNvnHPiC/s=";
   };
 
+  pythonRelaxDeps = [
+    "pyasn1"
+    "pyasn1-modules"
+  ];
+
   postPatch = ''
     substituteInPlace fdroidserver/common.py \
       --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
@@ -29,6 +35,10 @@ python.pkgs.buildPythonApplication rec {
     install -m 0755 gradlew-fdroid $out/bin
   '';
 
+  nativeBuildInputs = with python.pkgs; [
+    pythonRelaxDepsHook
+  ];
+
   buildInputs = with python.pkgs; [
     babel
   ];
@@ -52,7 +62,12 @@ python.pkgs.buildPythonApplication rec {
     yamllint
   ];
 
-  makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ];
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    "${lib.makeBinPath [ apksigner ]}"
+  ];
 
   # no tests
   doCheck = false;