From 98ff153a958b025eae53d01b4107b8b7dbbb7ace Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 28 Jan 2019 15:03:42 +0100 Subject: [PATCH 1/4] python3Packages.docker-py: init at 1.10.6 --- .../python-modules/docker-py/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/docker-py/default.nix diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix new file mode 100644 index 00000000000..84dba75e404 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05618cc5fb7..c786b390f96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1642,6 +1642,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 {}; From 48377df0639038dd6b58f7d2bc3a01490e096a7d Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 28 Jan 2019 15:25:18 +0100 Subject: [PATCH 2/4] pythonPackages.python-vagrant: init at 0.5.15 --- .../python-modules/python-vagrant/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/python-vagrant/default.nix diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix new file mode 100644 index 00000000000..88982f15293 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c786b390f96..9e36b23a769 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4330,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 { }; From cdc3ee316fad4387e801c5d55dd3667fa74b95bf Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 28 Jan 2019 15:37:01 +0100 Subject: [PATCH 3/4] pythonPackages.androguard: init at 3.3.3 --- .../python-modules/androguard/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/androguard/default.nix diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix new file mode 100644 index 00000000000..686d6a2a75e --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e36b23a769..7f0045eca1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/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 { }; From 72857e28506ffc2c0082f6aea2ab550551a118b4 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 28 Jan 2019 15:51:17 +0100 Subject: [PATCH 4/4] fdroidserver: 2016-05-31 -> 1.1, and move out of pythonPackages --- .../python-modules/fdroidserver/default.nix | 35 ----------- .../tools/fdroidserver/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 60 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/python-modules/fdroidserver/default.nix create mode 100644 pkgs/development/tools/fdroidserver/default.nix diff --git a/pkgs/development/python-modules/fdroidserver/default.nix b/pkgs/development/python-modules/fdroidserver/default.nix deleted file mode 100644 index b9b936ae83e..00000000000 --- a/pkgs/development/python-modules/fdroidserver/default.nix +++ /dev/null @@ -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; - }; - -} diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix new file mode 100644 index 00000000000..2bdb455f8e8 --- /dev/null +++ b/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 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b138d0b8573..066bdacda05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f0045eca1e..e4085b64edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };