From f3fc9f1eb01872b98f0a4f86c8f4d9447d085011 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 25 Jun 2016 09:27:11 -0700
Subject: [PATCH 1/2] xonsh: 0.3.4 -> 0.4.1

* Disable windows tests that get erroneously executed
---
 pkgs/shells/xonsh/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 92f7f20993f..2f8c8026478 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.3.4";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "13inkj0vs8nqdghp3j19dardawfsdmcsfzsp77hlwavmw7sqjxzi";
+    sha256= "1d5w307vgpqjimhfipkwsnh3lvvajva9fjl58sg9hh322qicm01g";
   };
 
   ## The logo xonsh prints during build contains unicode characters, and this
@@ -23,6 +23,8 @@ python3Packages.buildPythonApplication rec {
   patchPhase = ''
     rm xonsh/winutils.py
     sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
+    sed -ie 's|test_win_ipconfig|_test_win_ipconfig|g' tests/test_execer.py
+    sed -ie 's|test_ipconfig|_test_ipconfig|g' tests/test_execer.py
     rm tests/test_main.py
     rm tests/test_man.py
   '';
@@ -31,14 +33,14 @@ python3Packages.buildPythonApplication rec {
     HOME=$TMPDIR nosetests -x
   '';
 
-  buildInputs = with python3Packages; [ glibcLocales nose ];
+  buildInputs = with python3Packages; [ glibcLocales nose pytest ];
   propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ];
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
     homepage = "http://xonsh.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ spwhitt garbas ];
+    maintainers = with maintainers; [ spwhitt garbas vrthra ];
     platforms = platforms.all;
   };
 

From ae3d4929248c0dc6857350330ae2585ed977a1c6 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 25 Jun 2016 16:07:38 -0700
Subject: [PATCH 2/2] xonsh: Add XONSH_INTERACTIVE and remove replay test

---
 pkgs/shells/xonsh/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 2f8c8026478..608fa02a126 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -27,10 +27,11 @@ python3Packages.buildPythonApplication rec {
     sed -ie 's|test_ipconfig|_test_ipconfig|g' tests/test_execer.py
     rm tests/test_main.py
     rm tests/test_man.py
+    rm tests/test_replay.py
   '';
 
   checkPhase = ''
-    HOME=$TMPDIR nosetests -x
+    HOME=$TMPDIR XONSH_INTERACTIVE=0 nosetests -x
   '';
 
   buildInputs = with python3Packages; [ glibcLocales nose pytest ];