From c9bbf071bdb79270b0028885dcea3783d99b611b Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 6 Feb 2018 11:30:26 +0100 Subject: [PATCH 1/5] pythonPackages.ipy: 0.74 -> 0.83 --- .../python-modules/IPy/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/IPy/default.nix diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix new file mode 100644 index 000000000000..eacfe8dda5bc --- /dev/null +++ b/pkgs/development/python-modules/IPy/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "IPy"; + version = "0.83"; + + src = fetchPypi { + inherit pname version; + sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e fuzz + ''; + + meta = with stdenv.lib; { + description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; + homepage = "https://github.com/autocracy/python-ipy"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eea50ebd3eb9..657d399696bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8637,24 +8637,7 @@ in { }; }; - - ipy = buildPythonPackage rec { - version = "0.74"; - name = "ipy-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/I/IPy/IPy-${version}.tar.gz"; - sha256 = "5d6abb870c25f946c45c35cf50e66155598660f2765b35cb12e36ed5223c2b89"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; - homepage = https://pypi.python.org/pypi/IPy; - }; - }; + ipy = callPackage ../development/python-modules/IPy { }; ipykernel = callPackage ../development/python-modules/ipykernel { }; From a15544d5f5103c5a6e8bb0fabbe35669b2ede75f Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 6 Feb 2018 11:32:44 +0100 Subject: [PATCH 2/5] pythonPackages.ajpy: init at 0.0.2 --- .../python-modules/ajpy/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/ajpy/default.nix diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix new file mode 100644 index 000000000000..9d1905fe914b --- /dev/null +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ajpy"; + version = "0.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "740e7daf728ba58dabaf4af2c4305262eb207a6e41791424a146a21396ceb9ad"; + }; + + # ajpy doesn't have tests + doCheck = false; + + meta = with stdenv.lib; { + description = "AJP package crafting library"; + homepage = "https://github.com/hypn0s/AJPy/"; + license = licenses.lgpl2; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 657d399696bc..24aff6da851c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -452,6 +452,8 @@ in { aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + ajpy = callPackage ../development/python-modules/ajpy { }; + alabaster = callPackage ../development/python-modules/alabaster {}; alembic = callPackage ../development/python-modules/alembic {}; From c9366518fa710258e8f4c3810761b08fabe47caf Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 6 Feb 2018 11:33:55 +0100 Subject: [PATCH 3/5] pythonPackages.cx_oracle: init at 6.1 --- .../python-modules/cx_oracle/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/cx_oracle/default.nix diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix new file mode 100644 index 000000000000..e63c4107e091 --- /dev/null +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }: + +buildPythonPackage rec { + pname = "cx_Oracle"; + version = "6.1"; + + buildInputs = [ + oracle-instantclient + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "80545fc7acbdda917dd2b1604c938141256bdfed3ad464a44586c9c2f09c3004"; + }; + + # Check need an Oracle database to run + doCheck = false; + + meta = with stdenv.lib; { + description = "Python interface to Oracle"; + homepage = "https://oracle.github.io/python-cx_Oracle"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24aff6da851c..06adc7018f03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1435,6 +1435,8 @@ in { cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; + cx_oracle = callPackage ../development/python-modules/cx_oracle {}; + cvxopt = buildPythonPackage rec { name = "${pname}-${version}"; pname = "cvxopt"; From 38719d170d13926bfe36f22ab0e8ae12f2d20105 Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 6 Feb 2018 11:34:54 +0100 Subject: [PATCH 4/5] pythonPackages.mysqlclient: init at 1.3.12 --- .../python-modules/mysqlclient/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/mysqlclient/default.nix diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix new file mode 100644 index 000000000000..0be0f892d731 --- /dev/null +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, libmysql }: + +buildPythonPackage rec { + pname = "mysqlclient"; + version = "1.3.12"; + + buildInputs = [ + libmysql + ]; + + # Tests need a MySQL database + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5"; + }; + + meta = with stdenv.lib; { + description = "Python interface to MySQL"; + homepage = "https://github.com/PyMySQL/mysqlclient-python"; + license = licenses.gpl1; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06adc7018f03..86b08455cd7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10123,6 +10123,8 @@ in { mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mwclient = buildPythonPackage rec { version = "0.8.3"; pname = "mwclient"; From 0725d666d6eee92f2cc810ff61cb4b86669c1aa7 Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 6 Feb 2018 11:37:11 +0100 Subject: [PATCH 5/5] pythonPackages.patator: init at 0.7 --- .../python-modules/patator/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/patator/default.nix diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix new file mode 100644 index 000000000000..46601c167553 --- /dev/null +++ b/pkgs/development/python-modules/patator/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, + paramiko, pycurl, ajpy, pyopenssl, cx_oracle, mysqlclient, + psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1 }: + + +buildPythonPackage rec { + pname = "patator"; + version = "0.7"; + disabled = !(isPy3k); + + src = fetchPypi { + inherit pname version; + sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1"; + }; + + propagatedBuildInputs = [ + paramiko + pycurl + ajpy + pyopenssl + cx_oracle + mysqlclient + psycopg2 + pycrypto + dnspython + ipy + pysnmp + pyasn1 + ]; + + # No tests provided by patator + doCheck = false; + + meta = with stdenv.lib; { + description = "multi-purpose brute-forcer"; + homepage = "https://github.com/lanjelot/patator"; + license = licenses.gpl2; + maintainers = with maintainers; [ y0no ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86b08455cd7b..b8f8167902cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11792,6 +11792,8 @@ in { }; }; + patator = callPackage ../development/python-modules/patator { }; + pathlib = buildPythonPackage rec { name = "pathlib-${version}"; version = "1.0.1";