git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54813 from plapadoo/fdroidserver-update

fdroidserver: 2016-05-31 -> 1.1

commitdfc8ec8da7dac4096a2c2311de5acf6a8b2a9b19 authorRobert Schütz <rschuetz17@gmail.com> dateWed 30 Jan 2019, 10:33 (8 years ago) parentd16535772857e2
7 files changed+152−37
pkgs/development/python-modules/androguard/default.nix+37 pkgs/development/python-modules/docker-py/default.nix+28 pkgs/development/python-modules/fdroidserver/default.nix−35 pkgs/development/python-modules/python-vagrant/default.nix+21 pkgs/development/tools/fdroidserver/default.nix+58 pkgs/top-level/all-packages.nix+2 pkgs/top-level/python-packages.nix+6−2
pkgs/development/python-modules/androguard/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib,
2+ asn1crypto, click, pydot, ipython, pyqt5, pyperclip }:
3+
4+buildPythonPackage rec {
5+ version = "3.3.3";
6+ pname = "androguard";
7+
8+ src = fetchPypi {
9+ inherit pname version;
10+ sha256 = "1zlmn3byh2whg7k2xmcd7yy43lcawhryjnzcxr9bhn54709b6iyd";
11+ };
12+
13+ propagatedBuildInputs = [
14+ future
15+ networkx
16+ pygments
17+ lxml
18+ colorama
19+ matplotlib
20+ asn1crypto
21+ click
22+ pydot
23+ ipython
24+ pyqt5
25+ pyperclip
26+ ];
27+
28+ # Tests are not shipped on PyPI.
29+ doCheck = false;
30+
31+ meta = {
32+ description = "Tool and python library to interact with Android Files";
33+ homepage = https://github.com/androguard/androguard;
34+ license = lib.licenses.asl20;
35+ maintainers = [ lib.maintainers.pmiddend ];
36+ };
37+}
pkgs/development/python-modules/docker-py/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
2+
3+buildPythonPackage rec {
4+ version = "1.10.6";
5+ pname = "docker-py";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
10+ };
11+
12+ # The tests access the network.
13+ doCheck = false;
14+
15+ propagatedBuildInputs = [
16+ six
17+ requests
18+ websocket_client
19+ docker_pycreds
20+ ];
21+
22+ meta = {
23+ description = "Python library for the Docker Remote API";
24+ homepage = https://github.com/docker/docker-py/;
25+ license = lib.licenses.asl20;
26+ maintainers = [ lib.maintainers.pmiddend ];
27+ };
28+}
pkgs/development/python-modules/fdroidserver/default.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitLab
4−, libcloud
5−, pyyaml
6−, paramiko
7−, pyasn1
8−, pyasn1-modules
9−, pillow
10−, mwclient
11−, GitPython
12−, isPy3k
13−}:
14−
15−buildPythonPackage rec {
16− version = "2016-05-31";
17− pname = "fdroidserver-git";
18− disabled = ! isPy3k;
19−
20− src = fetchFromGitLab {
21− owner = "fdroid";
22− repo = "fdroidserver";
23− rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
24− sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
25− };
26−
27− propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
28−
29− meta = with stdenv.lib; {
30− homepage = https://f-droid.org;
31− description = "Server and tools for F-Droid, the Free Software repository system for Android";
32− license = licenses.agpl3;
33− };
34−
35−}
pkgs/development/python-modules/python-vagrant/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ lib, buildPythonPackage, fetchPypi }:
2+
3+buildPythonPackage rec {
4+ version = "0.5.15";
5+ pname = "python-vagrant";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg";
10+ };
11+
12+ # The tests try to connect to qemu
13+ doCheck = false;
14+
15+ meta = {
16+ description = "Python module that provides a thin wrapper around the vagrant command line executable";
17+ homepage = https://github.com/todddeluca/python-vagrant;
18+ license = lib.licenses.mit;
19+ maintainers = [ lib.maintainers.pmiddend ];
20+ };
21+}
pkgs/development/tools/fdroidserver/default.nixnew file+58
@@ -0,0 +1,58 @@
1+{ docker
2+, fetchFromGitLab
3+, python
4+, lib }:
5+
6+python.pkgs.buildPythonApplication rec {
7+ version = "1.1";
8+ pname = "fdroidserver";
9+
10+ src = fetchFromGitLab {
11+ owner = "fdroid";
12+ repo = "fdroidserver";
13+ rev = version;
14+ sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5";
15+ };
16+
17+ patchPhase = ''
18+ substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
19+ substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules"
20+ '';
21+
22+ preConfigure = ''
23+ ${python.interpreter} setup.py compile_catalog
24+ '';
25+ postInstall = ''
26+ install -m 0755 gradlew-fdroid $out/bin
27+ '';
28+
29+ buildInputs = [ python.pkgs.Babel ];
30+
31+ propagatedBuildInputs = with python.pkgs; [
32+ androguard
33+ clint
34+ defusedxml
35+ docker
36+ docker-py
37+ GitPython
38+ libcloud
39+ mwclient
40+ paramiko
41+ pillow
42+ pyasn1
43+ pyasn1-modules
44+ python-vagrant
45+ pyyaml
46+ qrcode
47+ requests
48+ ruamel_yaml
49+ ];
50+
51+ meta = with lib; {
52+ homepage = https://f-droid.org;
53+ description = "Server and tools for F-Droid, the Free Software repository system for Android";
54+ license = licenses.agpl3;
55+ maintainers = [ lib.maintainers.pmiddend ];
56+ };
57+
58+}
pkgs/top-level/all-packages.nix+2
@@ -1350,6 +1350,8 @@ in
13501350
13511351 fd = callPackage ../tools/misc/fd { };
13521352
1353+ fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
1354+
13531355 filebench = callPackage ../tools/misc/filebench { };
13541356
13551357 fileshelter = callPackage ../servers/web-apps/fileshelter { };
pkgs/top-level/python-packages.nix+6−2
@@ -158,6 +158,8 @@ in {
158158
159159 alerta-server = callPackage ../development/python-modules/alerta-server { };
160160
161+ androguard = callPackage ../development/python-modules/androguard { };
162+
161163 phonenumbers = callPackage ../development/python-modules/phonenumbers { };
162164
163165 agate-excel = callPackage ../development/python-modules/agate-excel { };
@@ -1642,6 +1644,8 @@ in {
16421644
16431645 docker = callPackage ../development/python-modules/docker {};
16441646
1647+ docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {});
1648+
16451649 dockerpty = callPackage ../development/python-modules/dockerpty {};
16461650
16471651 docker_pycreds = callPackage ../development/python-modules/docker-pycreds {};
@@ -2385,8 +2389,6 @@ in {
23852389
23862390 pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
23872391
2388− fdroidserver = callPackage ../development/python-modules/fdroidserver { };
2389−
23902392 filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
23912393
23922394 pycodestyle = callPackage ../development/python-modules/pycodestyle { };
@@ -4328,6 +4330,8 @@ in {
43284330
43294331 python-daemon = callPackage ../development/python-modules/python-daemon { };
43304332
4333+ python-vagrant = callPackage ../development/python-modules/python-vagrant { };
4334+
43314335 sympy = callPackage ../development/python-modules/sympy { };
43324336
43334337 pilkit = callPackage ../development/python-modules/pilkit { };