From edf30a24e8f5b28006e8ec7d504e2b8688b60c93 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 9 Nov 2018 08:06:41 -0500
Subject: xonsh: 0.6.8 -> 0.8.3

---
 pkgs/shells/xonsh/default.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'pkgs/shells/xonsh')

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";
-- 
cgit 1.4.1