Unverified Commit f9c1b429 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #254518 from linsui/fdroidserver 

fdroidserver: use ruamel.yaml 0.17.21
parents 806bd037 a4a5d651

pkgs/development/tools/fdroidserver/default.nix

+34 −9
Original line number Diff line number Diff line 
{ 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
@@ -58,7 +78,13 @@ python.pkgs.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

  ];
@@ -81,7 +107,6 @@ python.pkgs.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 ];

  };



}