fdroidserver: 2016-05-31 -> 1.1, and move out of pythonPackages

This commit is contained in:
Philipp Middendorf 2019-01-28 15:51:17 +01:00
parent cdc3ee316f
commit 72857e2850
4 changed files with 60 additions and 37 deletions

View File

@ -1,35 +0,0 @@
{ stdenv
, buildPythonPackage
, fetchFromGitLab
, libcloud
, pyyaml
, paramiko
, pyasn1
, pyasn1-modules
, pillow
, mwclient
, GitPython
, isPy3k
}:
buildPythonPackage rec {
version = "2016-05-31";
pname = "fdroidserver-git";
disabled = ! isPy3k;
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
};
propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
meta = with stdenv.lib; {
homepage = https://f-droid.org;
description = "Server and tools for F-Droid, the Free Software repository system for Android";
license = licenses.agpl3;
};
}

View File

@ -0,0 +1,58 @@
{ docker
, fetchFromGitLab
, python
, lib }:
python.pkgs.buildPythonApplication rec {
version = "1.1";
pname = "fdroidserver";
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
rev = version;
sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5";
};
patchPhase = ''
substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules"
'';
preConfigure = ''
${python.interpreter} setup.py compile_catalog
'';
postInstall = ''
install -m 0755 gradlew-fdroid $out/bin
'';
buildInputs = [ python.pkgs.Babel ];
propagatedBuildInputs = with python.pkgs; [
androguard
clint
defusedxml
docker
docker-py
GitPython
libcloud
mwclient
paramiko
pillow
pyasn1
pyasn1-modules
python-vagrant
pyyaml
qrcode
requests
ruamel_yaml
];
meta = with lib; {
homepage = https://f-droid.org;
description = "Server and tools for F-Droid, the Free Software repository system for Android";
license = licenses.agpl3;
maintainers = [ lib.maintainers.pmiddend ];
};
}

View File

@ -1350,6 +1350,8 @@ in
fd = callPackage ../tools/misc/fd { };
fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
filebench = callPackage ../tools/misc/filebench { };
fileshelter = callPackage ../servers/web-apps/fileshelter { };

View File

@ -2389,8 +2389,6 @@ in {
pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
fdroidserver = callPackage ../development/python-modules/fdroidserver { };
filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
pycodestyle = callPackage ../development/python-modules/pycodestyle { };