From 0cf852b78b65e61887278cd78d5c4c58cdd9e51a Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Thu, 13 Aug 2015 03:11:50 +0000 Subject: [PATCH 1/2] mycli: init at 1.3.0 mycli is a clone of the nearly identical pgcli package already included in nixpkgs. --- pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c355900025..b19fdd4417e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9439,6 +9439,33 @@ let }; }; + mycli = buildPythonPackage rec { + name = "mycli-${version}"; + version = "1.3.0"; + + src = pkgs.fetchFromGitHub { + sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh"; + rev = "v${version}"; + repo = "mycli"; + owner = "dbcli"; + }; + + propagatedBuildInputs = with self; [ + pymysql configobj sqlparse prompt_toolkit pygments click + ]; + + meta = { + inherit version; + description = "Command-line interface for MySQL"; + longDescription = '' + Rich command-line interface for MySQL with auto-completion and + syntax highlighting. + ''; + homepage = http://mycli.net; + license = licenses.bsd3; + }; + }; + pip = buildPythonPackage rec { version = "1.5.6"; name = "pip-${version}"; From a3e688030e82417251f91921e40a1cd3d1cd47a7 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sun, 23 Aug 2015 06:23:40 +0000 Subject: [PATCH 2/2] fix: mycli requires prompt_toolkit to be pegged at 0.45 --- pkgs/top-level/python-packages.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b19fdd4417e..3d89c0a2404 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9451,7 +9451,7 @@ let }; propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit pygments click + pymysql configobj sqlparse prompt_toolkit0_45 pygments click ]; meta = { @@ -9807,6 +9807,32 @@ let }; }; + prompt_toolkit0_45 = buildPythonPackage rec { + name = "prompt_toolkit-${version}"; + version = "0.45"; + + src = pkgs.fetchurl { + sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; + }; + + buildInputs = with self; [ jedi ipython pygments ]; + propagatedBuildInputs = with self; [ docopt six wcwidth ]; + + meta = { + 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 = licenses.bsd3; + maintainers = with maintainers; [ nckx ]; + }; + }; + protobuf = self.protobuf2_6; protobuf2_6 = self.protobufBuild pkgs.protobuf2_6; protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;