From b3747c9180eb1eb50a930bccea400038b2e8a1b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Jan 2015 06:31:51 +0100 Subject: [PATCH 1/5] Python: add prompt_toolkit 0.26: powerful command lines --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9079257c7f5..707240179f81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7276,6 +7276,32 @@ let }; + prompt_toolkit = buildPythonPackage rec { + name = "prompt_toolkit-${version}"; + version = "0.26"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; + sha256 = "1rd9gy3bcwp08agw5hiqckhaxbsz1i1kgkhjqw6vwhjdfgdjiq9l"; + }; + + buildInputs = with self; [ jedi ipython pygments ]; + propagatedBuildInputs = with self; [ docopt six wcwidth ]; + + meta = with stdenv.lib; { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ nckx ]; + }; + }; + protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; From 6b744546347cfb86937bedac6998762bfd9fbf09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Jan 2015 06:31:51 +0100 Subject: [PATCH 2/5] Python: add wcwidth 0.1.4: measure wide-character columns --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 707240179f81..2f8212c3d139 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10952,6 +10952,32 @@ let }; + wcwidth = buildPythonPackage rec { + name = "wcwidth-${version}"; + version = "0.1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/wcwidth/${name}.tar.gz"; + sha256 = "0awx28xi938nv55qlmai3b5ddqd1w5c294gy95xh4xsx0hik2vch"; + }; + + # Checks fail due to missing tox.ini file: + doCheck = false; + + meta = with stdenv.lib; { + description = "Measures number of Terminal column cells of wide-character codes"; + longDescription = '' + This API is mainly for Terminal Emulator implementors -- any Python + program that attempts to determine the printable width of a string on + a Terminal. It is implemented in python (no C library calls) and has + no 3rd-party dependencies. + ''; + homepage = https://github.com/jquast/wcwidth; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ nckx ]; + }; + }; + webob = buildPythonPackage rec { version = "1.4"; name = "webob-${version}"; From 75573d02f2b064995dd752c6b16f683483a9ec61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Jan 2015 06:31:51 +0100 Subject: [PATCH 3/5] Python: add sqlparse 0.1.14: SQL parser --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f8212c3d139..deed4b93d930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10079,6 +10079,26 @@ let }; + sqlparse = buildPythonPackage rec { + name = "sqlparse-${version}"; + version = "0.1.14"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz"; + sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; + }; + + meta = with stdenv.lib; { + description = "Non-validating SQL parser for Python"; + longDescription = '' + Provides support for parsing, splitting and formatting SQL statements. + ''; + homepage = https://github.com/andialbrecht/sqlparse; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ nckx ]; + }; + }; + python_statsd = buildPythonPackage rec { name = "python-statsd-${version}"; version = "1.6.0"; From 6a2175e4f2448ee036eb30048329ea06d91229e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Jan 2015 06:31:51 +0100 Subject: [PATCH 4/5] Python: psycopg2 2.5.3 -> 2.5.4 --- 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 deed4b93d930..cc807daa2576 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7336,7 +7336,7 @@ let psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.5.3"; + name = "psycopg2-2.5.4"; disabled = isPyPy; # error: invalid command 'test' @@ -7344,7 +7344,7 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz"; - sha256 = "02h33barxigsczpympnwa0yvw9hgdv8d63bxm5x251ri26xz6b9s"; + sha256 = "07ivzl7bq8bjcq5n90w4bsl29gjfm5l8yamw0paxh25si8r3zfi4"; }; propagatedBuildInputs = with self; [ pkgs.postgresql ]; From 4a3c873e171846d015f315920fb762528548c7a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Jan 2015 04:53:41 +0100 Subject: [PATCH 5/5] Python: add pgcli 0.13.0: command line interface for Postgres --- 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 cc807daa2576..7194083e45d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7078,6 +7078,29 @@ let }; }; + pgcli = buildPythonPackage rec { + name = "pgcli-${version}"; + version = "0.13.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz"; + sha256 = "15qw4as8ryl4qv3p3diq31xwa7kygrnsx4ixlfijgvfwr2pcmgxm"; + }; + + propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; + + meta = with stdenv.lib; { + description = "Command-line interface for PostgreSQL"; + longDescription = '' + Rich command-line interface for PostgreSQL with auto-completion and + syntax highlighting. + ''; + homepage = http://pgcli.com/about; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ nckx ]; + }; + }; + pip = buildPythonPackage rec { version = "1.5.6"; name = "pip-${version}";