Unverified Commit c46d5140 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #232171 from fabaff/fdroidserver-fix 

fdroidserver: 2.1.1 -> 2.2.1
parents eb38da8f b70ddf12

pkgs/development/tools/fdroidserver/default.nix

+25 −7
Original line number Diff line number Diff line
@@ -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 = version;

    sha256 = "0qg4vxjcgm05dqk3kyj8lry9wh5bxy0qwz70fiyxb5bi1kwai9ss";

    rev = "refs/tags/${version}";

    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,17 +62,25 @@ python.pkgs.buildPythonApplication rec { 
    yamllint

  ];



  makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ];

  makeWrapperArgs = [

    "--prefix"

    "PATH"

    ":"

    "${lib.makeBinPath [ apksigner ]}"

  ];



  # 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 ];

  };