Skip to content

Commit

Permalink
Merge pull request #16498 from vrthra/xonsh
Browse files Browse the repository at this point in the history
xonsh: 0.3.4 -> 0.4.1
  • Loading branch information
zimbatm committed Jun 26, 2016
2 parents cab2850 + ae3d492 commit c2dc16f
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions pkgs/shells/xonsh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,22 +23,25 @@ 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
rm tests/test_replay.py
'';

checkPhase = ''
HOME=$TMPDIR nosetests -x
HOME=$TMPDIR XONSH_INTERACTIVE=0 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;
};

Expand Down

0 comments on commit c2dc16f

Please sign in to comment.