From 6f94a131e8a781fc3aa681b2953a7a44a5faf535 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:30:42 +0000 Subject: [PATCH 1/9] pythonPackages.binaryornot: init at 0.4.0 --- 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 b9e1112e762..91a617e5bd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,6 +1923,27 @@ in modules // { }; + binaryornot = buildPythonPackage rec { + name = "binaryornot-${version}"; + version = "0.4.0"; + + src = pkgs.fetchurl { + url ="https://pypi.python.org/packages/source/b/binaryornot/${name}.tar.gz"; + sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb"; + }; + + buildInputs = with self; [ hypothesis sqlite3 ]; + + propagatedBuildInputs = with self; [ chardet ]; + + meta = { + homepage = https://github.com/audreyr/binaryornot; + description = "Ultra-lightweight pure Python package to check if a file is binary or text"; + license = licenses.bsd3; + }; + }; + + bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; From 84c8763a1763b5aef93f73aef67e59f6189f1436 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:30:52 +0000 Subject: [PATCH 2/9] pythonPackages.whichcraft: init at 0.1.1 --- 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 91a617e5bd2..bd8d9b55486 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21716,6 +21716,24 @@ in modules // { }; }; + + whichcraft = buildPythonPackage rec { + name = "whichcraft-${version}"; + version = "0.1.1"; + + src = pkgs.fetchurl { + url = "https://github.com/pydanny/whichcraft/archive/${version}.tar.gz"; + sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; + }; + + meta = { + homepage = https://github.com/pydanny/whichcraft; + description = "Cross-platform cross-python shutil.which functionality"; + license = licenses.bsd3; + }; + }; + + whisper = buildPythonPackage rec { name = "whisper-${version}"; version = "0.9.12"; From d0db3c2d52e754205008c9b19d9a0e66e5a24b7b Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:30:57 +0000 Subject: [PATCH 3/9] pythonPackages.future: 0.14.3 -> 0.15.2 --- 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 bd8d9b55486..7168f3c3294 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8549,12 +8549,12 @@ in modules // { }; future = buildPythonPackage rec { - version = "0.14.3"; + version = "0.15.2"; name = "future-${version}"; src = pkgs.fetchurl { url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz"; - sha256 = "0hgp9kq7h4ipw8ax5xvvkyh3bkqw361d3rndvb9xix01h9j9mi3p"; + sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3"; }; propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ]; From a5846c6c51d43b2e956dcf9f77451aaf590f3def Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:05 +0000 Subject: [PATCH 4/9] pythonPackages.ruamel_yaml: init at 0.10.13 --- 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 7168f3c3294..50c1dd190f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17544,6 +17544,24 @@ in modules // { }; }; + ruamel_yaml = buildPythonPackage rec { + name = "ruamel.yaml-${version}"; + version = "0.10.13"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.yaml/${name}.tar.gz"; + sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn"; + }; + + propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ]; + + meta = { + description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; + homepage = https://bitbucket.org/ruamel/yaml; + license = licenses.mit; + }; + }; + runsnakerun = buildPythonPackage rec { name = "runsnakerun-2.0.4"; From 96bb93a5a1218e5a267110ebbe13760b423a6b31 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:10 +0000 Subject: [PATCH 5/9] pythonPackages.ruamel_ordereddict: init at 0.4.9 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50c1dd190f3..81fe952a92c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17544,6 +17544,23 @@ in modules // { }; }; + ruamel_ordereddict = buildPythonPackage rec { + name = "ruamel.ordereddict-${version}"; + version = "0.4.9"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.ordereddict/${name}.tar.gz"; + sha256 = "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"; + }; + + meta = { + description = "a version of dict that keeps keys in insertion resp. sorted order"; + homepage = https://bitbucket.org/ruamel/ordereddict; + license = licenses.mit; + }; + }; + ruamel_yaml = buildPythonPackage rec { name = "ruamel.yaml-${version}"; version = "0.10.13"; From ff5c859460ed5d81885aa42a69136e34e879fc45 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:17 +0000 Subject: [PATCH 6/9] pythonPackages.ruamel_base: init at 1.0.0 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81fe952a92c..a0d07451299 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17544,6 +17544,22 @@ in modules // { }; }; + ruamel_base = buildPythonPackage rec { + name = "ruamel.base-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/r/ruamel.base/${name}.tar.gz"; + sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0"; + }; + + meta = { + description = "common routines for ruamel packages"; + homepage = https://bitbucket.org/ruamel/base; + license = licenses.mit; + }; + }; + ruamel_ordereddict = buildPythonPackage rec { name = "ruamel.ordereddict-${version}"; version = "0.4.9"; From 9fa25759cc5b3d2eeaed7c24d2ce60e619ddba00 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:22 +0000 Subject: [PATCH 7/9] pythonPackages.chardet: 2.1.1 -> 2.3.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 a0d07451299..7b92c9146fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7244,11 +7244,11 @@ in modules // { }; chardet = buildPythonPackage rec { - name = "chardet-2.1.1"; + name = "chardet-2.3.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; - md5 = "295367fd210d20f3febda615a88e1ef0"; + md5 = "25274d664ccb5130adae08047416e1a8"; }; meta = { From b0ca115059e971d56187a9975ddf09fe54ad1300 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:28 +0000 Subject: [PATCH 8/9] pythonPackages.chardet: update homepage --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b92c9146fa..7d32e2701cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7252,7 +7252,7 @@ in modules // { }; meta = { - homepage = https://github.com/erikrose/chardet; + homepage = https://github.com/chardet/chardet; description = "Universal encoding detector"; license = licenses.lgpl2; maintainers = with maintainers; [ iElectric ]; From fb9052c098ffe8d6cab71e441ee8601540e826e7 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 17 Jan 2016 16:31:36 +0000 Subject: [PATCH 9/9] cookiecutter: init at 1.3.0 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ceeea9ac64..8f5d0016ce7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5619,6 +5619,8 @@ let complexity = callPackage ../development/tools/misc/complexity { }; + cookiecutter = pythonPackages.cookiecutter; + ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d32e2701cc..c7ec3ac2cb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3151,6 +3151,30 @@ in modules // { }; }; + cookiecutter = buildPythonPackage rec { + version = "1.3.0"; + name = "cookiecutter-${version}"; + + # dependency problems, next release of cookiecutter should unblock these + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; + sha256 = "1vchjvh7591nczz2zz55aghk9mhpm6kqgm62d05d4mjrx9xjkdcg"; + }; + + buildInputs = with self; [ itsdangerous ]; + propagatedBuildInputs = with self; [ + jinja2 future binaryornot click whichcraft ruamel_yaml ]; + + meta = { + homepage = https://github.com/audreyr/cookiecutter; + description = "A command-line utility that creates projects from project templates"; + license = licenses.bsd3; + maintainers = with maintainers; [ kragniz ]; + }; + }; + cookies = buildPythonPackage rec { name = "cookies-2.2.1";