From 9f664fb68b3ae1a6296e0779da335c2865058ab4 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Wed, 27 Nov 2024 01:38:36 +0800
Subject: [PATCH] fdroidserver: 2.3a2 -> 2.3.0

---
 pkgs/by-name/fd/fdroidserver/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix
index 494dcb78a905..473a1dd4cf32 100644
--- a/pkgs/by-name/fd/fdroidserver/package.nix
+++ b/pkgs/by-name/fd/fdroidserver/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.3a2";
+  version = "2.3.1";
 in
 python3Packages.buildPythonApplication {
   pname = "fdroidserver";
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication {
     owner = "fdroid";
     repo = "fdroidserver";
     rev = version;
-    hash = "sha256-nsAFBZqxo4XVWU6nBjo2T6VhU8U4I8h/FRXd1L240rk=";
+    hash = "sha256-1jJwKvxm33Hge35dhqy5HgXzyokj8a2XhWvCmScj5bA=";
   };
 
   pythonRelaxDeps = [
@@ -30,6 +30,10 @@ python3Packages.buildPythonApplication {
     "pyasn1-modules"
   ];
 
+  pythonRemoveDeps = [
+    "puremagic" # Only used as a fallback when magic is not installed
+  ];
+
   postPatch = ''
     substituteInPlace fdroidserver/common.py \
       --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
@@ -55,16 +59,18 @@ python3Packages.buildPythonApplication {
 
   dependencies = with python3Packages; [
     androguard
-    platformdirs
+    biplist
     clint
     defusedxml
     gitpython
     libcloud
     libvirt
+    magic
     mwclient
     oscrypto
     paramiko
     pillow
+    platformdirs
     pyasn1
     pyasn1-modules
     pycountry