diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix
new file mode 100644
index 00000000000..e9d44c83f1d
--- /dev/null
+++ b/pkgs/development/python-modules/prompt_toolkit/1.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, docopt
+, six
+, wcwidth
+, pygments
+}:
+
+buildPythonPackage rec {
+  pname = "prompt_toolkit";
+  version = "1.0.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917";
+  };
+  checkPhase = ''
+    rm prompt_toolkit/win32_types.py
+    py.test -k 'not test_pathcompleter_can_expanduser'
+  '';
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ docopt six wcwidth pygments ];
+
+  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 = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix
index 69a2f47d05f..cd0df6c52be 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -2,27 +2,24 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, docopt
 , six
 , wcwidth
-, pygments
 }:
 
 buildPythonPackage rec {
   pname = "prompt_toolkit";
-  version = "1.0.15";
+  version = "2.0.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917";
+    sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx";
   };
   checkPhase = ''
-    rm prompt_toolkit/win32_types.py
     py.test -k 'not test_pathcompleter_can_expanduser'
   '';
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ docopt six wcwidth pygments ];
+  propagatedBuildInputs = [ six wcwidth ];
 
   meta = {
     description = "Python library for building powerful interactive command lines";
@@ -35,4 +32,4 @@ buildPythonPackage rec {
     homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index b553d50d130..d48e42ef264 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, wcwidth, six, prompt_toolkit, docopt
-, jedi, pygments }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
 
 buildPythonPackage rec {
   pname = "ptpython";
-  version = "0.41";
-  name  = "${pname}-${version}";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hcaaadkp5n37hxggraynifa33wx1akklzvf6y4rvgjxbjl2g2x7";
+    sha256 = "1m34jbwj3j3762mg1vynpgciqw4kqdzdqjvd62mwhbjkly7ddsgb";
   };
 
-  propagatedBuildInputs = [ wcwidth six prompt_toolkit docopt jedi pygments ];
+  propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ];
 
   # no tests to run
   doCheck = false;
diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index bc1c2515bfa..73e34383338 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -1,27 +1,25 @@
 { lib, pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "pgcli-${version}";
-  version = "1.11.0";
+  pname = "pgcli";
+  version = "2.0.0";
 
-  src = fetchFromGitHub {
-    owner = "dbcli";
-    repo = "pgcli";
-    rev = "v${version}";
-    sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi";
   };
 
-  buildInputs = with pythonPackages; [ pytest mock ];
-  checkPhase = ''
-    mkdir /tmp/homeless-shelter
-    HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri'
-  '';
-
   propagatedBuildInputs = with pythonPackages; [
-    cli-helpers click configobj humanize prompt_toolkit psycopg2
+    cli-helpers click configobj humanize prompt_toolkit_2 psycopg2
     pygments sqlparse pgspecial setproctitle keyring
   ];
 
+  checkInputs = with pythonPackages; [ pytest mock ];
+
+  checkPhase = ''
+    py.test
+  '';
+
   meta = with lib; {
     description = "Command-line interface for PostgreSQL";
     longDescription = ''
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 6522985ab86..32dfd56796d 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils }:
+{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }:
 
 python3Packages.buildPythonApplication rec {
-  name = "xonsh-${version}";
-  version = "0.6.8";
+  pname = "xonsh";
+  version = "0.8.3";
 
+  # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
-    owner = "scopatz";
-    repo = "xonsh";
-    rev = version;
-    sha256= "1a74xpww7k432b2z44388rl31nqvckn2q3fswci04f48698hzs5l";
+    owner  = "scopatz";
+    repo   = "xonsh";
+    rev    = "refs/tags/${version}";
+    sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2";
   };
 
   LC_ALL = "en_US.UTF-8";
   postPatch = ''
-    rm xonsh/winutils.py
-
     sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
     sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh
 
@@ -22,15 +21,14 @@ python3Packages.buildPythonApplication rec {
   '';
 
   checkPhase = ''
-    HOME=$TMPDIR XONSH_INTERACTIVE=0 \
+    HOME=$TMPDIR \
       pytest \
-        -k 'not test_man_completion and not test_printfile and not test_sourcefile and not test_printname ' \
-        tests
+        -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile'
   '';
 
-  checkInputs = with python3Packages; [ pytest glibcLocales ];
+  checkInputs = [ python3Packages.pytest glibcLocales git ];
 
-  propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ];
+  propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ];
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 905e6ccec2d..bf1f9ebdff5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3755,8 +3755,11 @@ in {
     };
   };
 
+  prompt_toolkit = self.prompt_toolkit_1;
 
-  prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { };
+  prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { };
+
+  prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { };
 
   protobuf = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
@@ -3776,7 +3779,9 @@ in {
 
   psycopg2 = callPackage ../development/python-modules/psycopg2 {};
 
-  ptpython = callPackage ../development/python-modules/ptpython {};
+  ptpython = callPackage ../development/python-modules/ptpython {
+    prompt_toolkit = self.prompt_toolkit_2;
+  };
 
   publicsuffix = callPackage ../development/python-modules/publicsuffix {};