From e3a93b6e9a83dac8047ea9368a94ef4e16cd55fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2015 02:49:14 +0200 Subject: [PATCH] python-packages: mycli 1.3.0 -> 1.4.0 Remove now unused prompt_toolkit0_45, and pull the unversioned attribute back to release 0.46 until dependents catch up. --- pkgs/top-level/python-packages.nix | 40 ++++-------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a83a7f09c3c..ec3d1ae7df5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9556,10 +9556,6 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9575,17 +9571,17 @@ let mycli = buildPythonPackage rec { name = "mycli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = pkgs.fetchFromGitHub { - sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh"; + sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l"; rev = "v${version}"; repo = "mycli"; owner = "dbcli"; }; propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit0_45 pygments click + pymysql configobj sqlparse prompt_toolkit pygments click ]; meta = { @@ -9917,36 +9913,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.47"; + version = "0.46"; src = pkgs.fetchurl { - sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla"; - 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 ]; - }; - }; - - prompt_toolkit0_45 = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "0.45"; - - src = pkgs.fetchurl { - sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; };