From 9d616f18980530816244525075758a9758c4cf72 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 6 Jul 2024 14:16:42 -0400 Subject: [PATCH 1/4] fdroidserver: reformat --- .../tools/fdroidserver/default.nix | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index e8790999e153..72d37f79aa44 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,27 +1,28 @@ -{ lib -, fetchFromGitLab -, fetchPypi -, apksigner -, buildPythonApplication -, python3 -, installShellFiles -, androguard -, babel -, clint -, defusedxml -, gitpython -, libcloud -, mwclient -, paramiko -, pillow -, pyasn1 -, pyasn1-modules -, python-vagrant -, pyyaml -, qrcode -, requests -, ruamel-yaml -, yamllint +{ + lib, + fetchFromGitLab, + fetchPypi, + apksigner, + buildPythonApplication, + python3, + installShellFiles, + androguard, + babel, + clint, + defusedxml, + gitpython, + libcloud, + mwclient, + paramiko, + pillow, + pyasn1, + pyasn1-modules, + python-vagrant, + pyyaml, + qrcode, + requests, + ruamel-yaml, + yamllint, }: buildPythonApplication rec { @@ -57,13 +58,9 @@ buildPythonApplication rec { --bash completion/bash-completion ''; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ - babel - ]; + buildInputs = [ babel ]; propagatedBuildInputs = [ androguard @@ -100,16 +97,17 @@ buildPythonApplication rec { # no tests doCheck = false; - pythonImportsCheck = [ - "fdroidserver" - ]; + pythonImportsCheck = [ "fdroidserver" ]; meta = with lib; { homepage = "https://gitlab.com/fdroid/fdroidserver"; changelog = "https://gitlab.com/fdroid/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; [ linsui jugendhacker ]; + maintainers = with maintainers; [ + linsui + jugendhacker + ]; mainProgram = "fdroid"; }; } From 77f1f868d8d8e07894b13b1a8d5c3360274954a3 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 6 Jul 2024 14:17:07 -0400 Subject: [PATCH 2/4] fdroidserver: --replace -> --replace-fail --- 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 72d37f79aa44..c48ec0f1445e 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace fdroidserver/common.py \ - --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" ''; preConfigure = '' From f97b7bd453b90fd0824a36e08cd56ad53a3e03ae Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 6 Jul 2024 14:23:25 -0400 Subject: [PATCH 3/4] fdroidserver: refactor --- pkgs/development/tools/fdroidserver/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index c48ec0f1445e..00bf04a08df6 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -25,9 +25,13 @@ yamllint, }: -buildPythonApplication rec { - pname = "fdroidserver"; +let version = "unstable-2023-10-23"; +in +buildPythonApplication { + pname = "fdroidserver"; + inherit version; + format = "setuptools"; src = fetchFromGitLab { @@ -99,12 +103,12 @@ buildPythonApplication rec { pythonImportsCheck = [ "fdroidserver" ]; - meta = with lib; { + meta = { homepage = "https://gitlab.com/fdroid/fdroidserver"; changelog = "https://gitlab.com/fdroid/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; [ + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ linsui jugendhacker ]; From d1b3b72e843e15a60e688700cec4e038cadfe7c7 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 6 Jul 2024 14:26:08 -0400 Subject: [PATCH 4/4] fdroidserver: unstable-2023-10-23 -> 2.3a1 --- pkgs/development/tools/fdroidserver/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 00bf04a08df6..dd3f45769a50 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -3,6 +3,7 @@ fetchFromGitLab, fetchPypi, apksigner, + appdirs, buildPythonApplication, python3, installShellFiles, @@ -13,6 +14,7 @@ gitpython, libcloud, mwclient, + oscrypto, paramiko, pillow, pyasn1, @@ -22,26 +24,28 @@ qrcode, requests, ruamel-yaml, + sdkmanager, yamllint, }: let - version = "unstable-2023-10-23"; + version = "2.3a1"; in buildPythonApplication { pname = "fdroidserver"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "f4b10cf83935432d19948dac669964384bef0728"; - hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; + rev = "2.3a1"; + hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA="; }; pythonRelaxDeps = [ + "androguard" "pyasn1" "pyasn1-modules" ]; @@ -68,11 +72,13 @@ buildPythonApplication { propagatedBuildInputs = [ androguard + appdirs clint defusedxml gitpython libcloud mwclient + oscrypto paramiko pillow pyasn1 @@ -88,6 +94,7 @@ buildPythonApplication { hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; })) + sdkmanager yamllint ];