From a57e6da65a95b099a05d174c3acd6f4b3f8e2b00 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:39:10 +0200 Subject: [PATCH 01/14] python-plumbum: update 1.4.2 -> 1.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec3d1ae7df5..777b4838176 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9771,13 +9771,13 @@ let }; plumbum = buildPythonPackage rec { - name = "plumbum-1.4.2"; + name = "plumbum-1.5.0"; buildInputs = with self; [ self.six ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz"; - md5 = "38b526af9012a5282ae91dfe372cefd3"; + sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756"; }; }; From ba3e4f6c10d2796fc6570f7ac5aa218f68be7523 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:41:10 +0200 Subject: [PATCH 02/14] python-pymongo: update 2.8 -> 3.0.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 777b4838176..661ef88bb00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11487,11 +11487,11 @@ let }; pymongo = buildPythonPackage rec { - name = "pymongo-2.8"; + name = "pymongo-3.0.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz"; - sha256 = "0d9rlxghqg9dqmcmrlf1lw9ap2g6npv6q4slp5agnm7vci9zchq5"; + sha256 = "3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf"; }; doCheck = false; From 579424f94ae030978c9db2705c60b3d84bd9c34a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:42:39 +0200 Subject: [PATCH 03/14] python-PyYAML: update 3.10 -> 3.11 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 661ef88bb00..0b41b585ea1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11748,11 +11748,11 @@ let pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.10"; + name = "PyYAML-3.11"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; + sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; }; buildInputs = with self; [ pkgs.pyrex ]; From 73c61b6286f4c69e131a0a86283f279f8fd5e310 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 17:43:27 +0200 Subject: [PATCH 04/14] python-sh: update 1.08 -> 1.11 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b41b585ea1..9e31283c16f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13068,11 +13068,11 @@ let sh = buildPythonPackage rec { - name = "sh-1.08"; + name = "sh-1.11"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; - md5 = "4028bcba85daa0aef579ed24261e88a3"; + md5 = "7af8df6c92d29ff927b6db0146bddec3"; }; doCheck = false; From 96a153925623144e69d436b9c95177bc39e9ef8a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 10 Aug 2015 20:45:45 +0200 Subject: [PATCH 05/14] python-cgroup-utils: init at 0.6 --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccce0d2e60d..b43b8385f55 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -143,6 +143,7 @@ kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; lassulus = "Lassulus "; + layus = "Guillaume Maudoux "; lebastr = "Alexander Lebedev "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e31283c16f..7f4d4655967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1104,6 +1104,29 @@ let propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; + cgroup-utils = buildPythonPackage rec { + version = "0.6"; + name = "cgroup-utils-${version}"; + + propagatedBuildInputs = with self; [ argparse ]; + buildInputs = with self; [ pep8 nose ]; + # Pep8 tests fail... + doCheck = false; + + src = pkgs.fetchFromGitHub { + owner = "peo3"; + repo = "cgroup-utils"; + rev = "v${version}"; + sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + }; + + meta = { + description = "Utility tools for control groups of Linux"; + maintainers = with maintainers; [ layus ]; + license = licenses.gpl2; + }; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; From 0db8e6c792948afc247d10e1f97f1c32a7d128c3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 11 Aug 2015 23:59:44 +0200 Subject: [PATCH 06/14] python-PyLTI: init at 0.4.0 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f4d4655967..9aa31d5a99c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4010,6 +4010,29 @@ let }; }; + lti = buildPythonPackage rec { + version = "0.4.0"; + name = "PyLTI-${version}"; + + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; + buildInputs = with self; [ + flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + pytestflakes pytestpep8 sphinx mock + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyLTI/${name}.tar.gz"; + sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh"; + }; + + meta = { + description = "Implementation of IMS LTI interface that works with edX"; + homepage = "https://github.com/mitodl/pylti"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; From 00abee22bee06fdb57ee67cc514ab387deb186c9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:00:59 +0200 Subject: [PATCH 07/14] python-multiprocessing: init at 2.6.2.1 --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9aa31d5a99c..76dfd30a42a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8112,6 +8112,15 @@ let }; }; + multiprocessing = buildPythonPackage rec { + name = "multiprocessing-2.6.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/multiprocessing/${name}.tar.gz"; + md5 = "5cc484396c040102116ccc2355379c72"; + }; + }; + munkres = buildPythonPackage rec { name = "munkres-1.0.6"; From 637097a14295f063fe41ae930b7f005ae88c6eb6 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:01:35 +0200 Subject: [PATCH 08/14] python-simpleldap: init at 0.8 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76dfd30a42a..cbe2fa76400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12785,6 +12785,30 @@ let }; }); + simpleldap = buildPythonPackage rec { + version = "0.8"; + name = "simpleldap-${version}"; + + propagatedBuildInputs = with self; [ ldap ]; + buildInputs = with self; [ pep8 pytest tox ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz"; + md5 = "f8a95b24895596338032ca4b4450f1de"; + }; + + meta = { + description = "A module that makes simple LDAP usage simple"; + longDescription = '' + A small wrapper around the python-ldap library that provides a more + Pythonic interface for LDAP server connections, LDAP objects, and the + common get and search operations. + ''; + license = licenses.mit; + maintainers = with maintainers; [ layus ]; + }; + }; + simpleparse = buildPythonPackage rec { version = "2.1.1"; name = "simpleparse-${version}"; From c070bd7e0a917017d6627dcd03368d1054f2497b Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:03:03 +0200 Subject: [PATCH 09/14] python-tidylib: init at 0.2.4 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cbe2fa76400..228232dd383 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12959,6 +12959,27 @@ let }; }; + tidylib = buildPythonPackage rec { + version = "0.2.4"; + name = "pytidylib-${version}"; + + propagatedBuildInputs = [ pkgs.html-tidy ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz"; + md5 = "2a28267370c9409b592cdb786649cb25"; + }; + + patchPhase = '' + sed -i 's#load_library(name)#load_library("${pkgs.html-tidy}/lib/libtidy.so")#' tidylib/__init__.py + ''; + + meta = { + homepage = " http://countergram.com/open-source/pytidylib/"; + maintainers = with maintainers; [ layus ]; + }; + }; + timelib = buildPythonPackage rec { name = "timelib-0.2.4"; From dee6dc162f3afdedc2626baeeabc0d8ac829f2f6 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:03:54 +0200 Subject: [PATCH 10/14] python-semantic_version: init at 2.4.2 --- pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228232dd383..0d58f9753f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13151,6 +13151,20 @@ let }; }; + semantic-version = buildPythonPackage rec { + name = "semantic_version-2.4.2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz"; + md5 = "fd7d5ade76e78d8540b9a4044496a57c"; + }; + + meta = { + description = "A library implementing the 'SemVer' scheme"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; src = pkgs.fetchurl { From 2dedf83d376117a624f9ced471c4e5092969e201 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:06:48 +0200 Subject: [PATCH 11/14] python-web.py: init at 0.37 --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d58f9753f7..3587ed26606 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14746,6 +14746,27 @@ let }; }; + web = buildPythonPackage rec { + version = "0.37"; + name = "web.py-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz"; + md5 = "93375e3f03e74d6bf5c5096a4962a8db"; + }; + + meta = { + description = "Makes web apps"; + longDescription = '' + Think about the ideal way to write a web app. + Write the code to make it happen. + ''; + homepage = "http://webpy.org/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ layus ]; + }; + }; + webob = buildPythonPackage rec { version = "1.4"; name = "webob-${version}"; From 72890773c4b26d3e92aab2093e81a537134cc77b Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:27:53 +0200 Subject: [PATCH 12/14] python-EasyProcess: init at 0.1.9 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3587ed26606..91ccc3db2f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3278,6 +3278,21 @@ let }; }; + easy-process = buildPythonPackage rec { + name = "EasyProcess-0.1.9"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz"; + md5 = "3da72e2fe16781fe5c7b3b0c6c40ee7b"; + }; + + meta = { + description = "Easy to use python subprocess interface"; + homepage = "https://github.com/ponty/EasyProcess"; + licenses = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; elasticsearch = buildPythonPackage (rec { name = "elasticsearch-1.6.0"; From 7d4b026a81b58f25cc6d0e8a0337152bf2828bd9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:28:29 +0200 Subject: [PATCH 13/14] python-PyVirtualDisplay: init at 0.1.5 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91ccc3db2f2..39dbfd0f967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14544,6 +14544,24 @@ let }; }; + virtual-display = buildPythonPackage rec { + name = "PyVirtualDisplay-0.1.5"; + + propagatedBuildInputs = with self; [ easy-process ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz"; + md5 = "90b65fe15b81788c2e208d124e3a3c14"; + }; + + meta = { + description = "python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + virtualenv = buildPythonPackage rec { name = "virtualenv-1.11.6"; src = pkgs.fetchurl { From c601814cd3b13a9bc9de71cdf29bc4c5564c9bb3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 12 Aug 2015 00:48:21 +0200 Subject: [PATCH 14/14] python-inginious: init at 0.3.dev1 --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39dbfd0f967..0e1a5258541 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6989,6 +6989,43 @@ let }; }; + inginious = buildPythonPackage rec { + version = "0.3.dev1"; + name = "inginious-${version}"; + + disabled = isPy3k; + + # patched version of docker bindings. + docker-custom = self.docker.override { + name = "docker-1.3.0-dirty"; + src = pkgs.fetchFromGitHub { + owner = "GuillaumeDerval"; + repo = "docker-py"; + rev = "1.3.0-dev"; + sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf"; + }; + }; + + propagatedBuildInputs = with self; [ + requests2 # Needs to be first; + cgroup-utils docker-custom docutils lti multiprocessing pygments pymongo + pyyaml rpyc selenium sh simpleldap tidylib virtual-display web + websocket_client + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz"; + md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; + }; + + meta = { + description = "An intelligent grader that allows secured and automated testing of code made by students."; + homepage = "https://github.com/UCL-INGI/INGInious"; + license = licenses.agpl3; + maintainers = with maintainers; [ layus ]; + }; + }; + iptools = buildPythonPackage rec { version = "0.6.1"; name = "iptools-${version}";