From e020d1a4dcc4eabaeb4cf097849584f08d743eab Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 11 Sep 2023 18:40:39 +0800
Subject: [PATCH 1/3] fdroidserver: use python deps from input

---
 .../tools/fdroidserver/default.nix            | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index e960e62fca05..1b037a894a4c 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -1,10 +1,30 @@
 { lib
 , fetchFromGitLab
-, python
+, fetchPypi
 , apksigner
+, buildPythonApplication
+, python3
+, pythonRelaxDepsHook
+, androguard
+, babel
+, clint
+, defusedxml
+, gitpython
+, libcloud
+, mwclient
+, paramiko
+, pillow
+, pyasn1
+, pyasn1-modules
+, python-vagrant
+, pyyaml
+, qrcode
+, requests
+, ruamel-yaml
+, yamllint
 }:
 
-python.pkgs.buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "fdroidserver";
   version = "2.2.1";
   format = "setuptools";
@@ -27,7 +47,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   preConfigure = ''
-    ${python.pythonForBuild.interpreter} setup.py compile_catalog
+    ${python3.pythonForBuild.interpreter} setup.py compile_catalog
   '';
 
   postInstall = ''
@@ -35,15 +55,15 @@ python.pkgs.buildPythonApplication rec {
     install -m 0755 gradlew-fdroid $out/bin
   '';
 
-  nativeBuildInputs = with python.pkgs; [
+  nativeBuildInputs = [
     pythonRelaxDepsHook
   ];
 
-  buildInputs = with python.pkgs; [
+  buildInputs = [
     babel
   ];
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = [
     androguard
     clint
     defusedxml
@@ -83,5 +103,4 @@ python.pkgs.buildPythonApplication rec {
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ obfusk ];
   };
-
 }

From 96a2ad272774f77b98561275c6ed411251424d69 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 11 Sep 2023 18:41:08 +0800
Subject: [PATCH 2/3] fdroidserver: use ruamel.yaml 0.17.21

The output is changed in the newer versions.
---
 pkgs/development/tools/fdroidserver/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index 1b037a894a4c..e64eed80c6f5 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -78,7 +78,13 @@ buildPythonApplication rec {
     pyyaml
     qrcode
     requests
-    ruamel-yaml
+    (ruamel-yaml.overrideAttrs (old: {
+      src = fetchPypi {
+        pname = "ruamel.yaml";
+        version = "0.17.21";
+        hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
+      };
+    }))
     yamllint
   ];
 

From a4a5d65150c2251e5afbebbbe4771d2df60b612a Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Tue, 12 Sep 2023 01:36:07 +0800
Subject: [PATCH 3/3] fdroidserver: remove obfusk from maintainer and add
 linsui and jugendhacker

---
 pkgs/development/tools/fdroidserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
index e64eed80c6f5..da7b0d662b32 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -107,6 +107,6 @@ buildPythonApplication rec {
     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.agpl3Plus;
-    maintainers = with maintainers; [ obfusk ];
+    maintainers = with maintainers; [ linsui jugendhacker ];
   };
 }