Commit b70ddf12 authored by Fabian Affolter's avatar Fabian Affolter
Browse files

fdroidserver: 2.1.1 -> 2.2.1 

Diff: https://gitlab.com/fdroid/fdroidserver/-/compare/refs/tags/2.1.1...2.2.1

Changelog: https://github.com/f-droid/fdroidserver/blob/2.2.1/CHANGELOG.md
parent b59d345f

pkgs/development/tools/fdroidserver/default.nix

+18 −3
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 = "refs/tags/${version}";

    sha256 = "0qg4vxjcgm05dqk3kyj8lry9wh5bxy0qwz70fiyxb5bi1kwai9ss";

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

  ];



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

  makeWrapperArgs = [

    "--prefix"

    "PATH"

    ":"

    "${lib.makeBinPath [ apksigner ]}"

  ];



  # no tests

  doCheck = false;