Merge pull request #54813 from plapadoo/fdroidserver-update

fdroidserver: 2016-05-31 -> 1.1

pkgs/development/python-modules/androguard/default.nix

@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib,
+  asn1crypto, click, pydot, ipython, pyqt5, pyperclip }:
+
+buildPythonPackage rec {
+  version = "3.3.3";
+  pname = "androguard";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zlmn3byh2whg7k2xmcd7yy43lcawhryjnzcxr9bhn54709b6iyd";
+  };
+
+  propagatedBuildInputs = [
+    future
+    networkx
+    pygments
+    lxml
+    colorama
+    matplotlib
+    asn1crypto
+    click
+    pydot
+    ipython
+    pyqt5
+    pyperclip
+  ];
+
+  # Tests are not shipped on PyPI.
+  doCheck = false;
+
+  meta = {
+    description = "Tool and python library to interact with Android Files";
+    homepage = https://github.com/androguard/androguard;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}

pkgs/development/python-modules/docker-py/default.nix

@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
+
+buildPythonPackage rec {
+  version = "1.10.6";
+  pname = "docker-py";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
+  };
+
+  # The tests access the network.
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    six
+    requests
+    websocket_client
+    docker_pycreds
+  ];
+
+  meta = {
+    description = "Python library for the Docker Remote API";
+    homepage = https://github.com/docker/docker-py/;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}

pkgs/development/python-modules/python-vagrant/default.nix

@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.5.15";
+  pname = "python-vagrant";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg";
+  };
+
+  # The tests try to connect to qemu
+  doCheck = false;
+
+  meta = {
+    description = "Python module that provides a thin wrapper around the vagrant command line executable";
+    homepage = https://github.com/todddeluca/python-vagrant;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}

pkgs/development/tools/fdroidserver/default.nix

@@ -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 ];
+  };
+
+}

pkgs/top-level/all-packages.nix

@@ -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 { };

pkgs/top-level/python-packages.nix

@@ -158,6 +158,8 @@ in {
 
   alerta-server = callPackage ../development/python-modules/alerta-server { };
 
+  androguard = callPackage ../development/python-modules/androguard { };
+
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
   agate-excel = callPackage ../development/python-modules/agate-excel { };
@@ -1642,6 +1644,8 @@ in {
 
   docker = callPackage ../development/python-modules/docker {};
 
+  docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {});
+
   dockerpty = callPackage ../development/python-modules/dockerpty {};
 
   docker_pycreds = callPackage ../development/python-modules/docker-pycreds {};
@@ -2385,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 { };
@@ -4328,6 +4330,8 @@ in {
 
   python-daemon = callPackage ../development/python-modules/python-daemon { };
 
+  python-vagrant = callPackage ../development/python-modules/python-vagrant { };
+
   sympy = callPackage ../development/python-modules/sympy { };
 
   pilkit = callPackage ../development/python-modules/pilkit { };