xonsh: 0.2.7 -> 0.3.2
* pythonPackages.prompt_toolkit make it build for py35
This commit is contained in:
parent
f878018ece
commit
66c73b3f36
|
@ -1,31 +1,44 @@
|
||||||
{stdenv, fetchurl, python3Packages}:
|
{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils }:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
name = "xonsh-${version}";
|
name = "xonsh-${version}";
|
||||||
version = "0.2.7";
|
version = "0.3.2";
|
||||||
|
|
||||||
# The logo xonsh prints during build contains unicode characters, and this
|
src = fetchFromGitHub {
|
||||||
# fails because locales have not been set up in the build environment.
|
owner = "scopatz";
|
||||||
# We can fix this on Linux by setting:
|
repo = "xonsh";
|
||||||
# export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
|
rev = version;
|
||||||
# but this would not be a cross platform solution, so it's simpler to just
|
sha256= "0cqfrpvkgzk0q3dykavqxwfqrx61y8rbzixmwcv8pfa9r2sya24q";
|
||||||
# patch the setup.py script to not print the logo during build.
|
};
|
||||||
prePatch = ''
|
|
||||||
substituteInPlace setup.py --replace "print(logo)" ""
|
## The logo xonsh prints during build contains unicode characters, and this
|
||||||
|
## fails because locales have not been set up in the build environment.
|
||||||
|
## We can fix this on Linux by setting:
|
||||||
|
## export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
|
||||||
|
## but this would not be a cross platform solution, so it's simpler to just
|
||||||
|
## patch the setup.py script to not print the logo during build.
|
||||||
|
#prePatch = ''
|
||||||
|
# substituteInPlace setup.py --replace "print(logo)" ""
|
||||||
|
#'';
|
||||||
|
patchPhase = ''
|
||||||
|
rm xonsh/winutils.py
|
||||||
|
sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
|
||||||
|
rm tests/test_main.py
|
||||||
|
rm tests/test_man.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ python3Packages.ply ];
|
checkPhase = ''
|
||||||
|
HOME=$TMPDIR nosetests -x
|
||||||
|
'';
|
||||||
|
|
||||||
src = fetchurl {
|
buildInputs = with python3Packages; [ glibcLocales nose pygments ];
|
||||||
url = "mirror://pypi/x/xonsh/${name}.tar.gz";
|
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ];
|
||||||
sha256= "10pglgmzj6l0l8mb3r2rxnbigqigcqn9njcgdcrg7s1b409cq4md";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A Python-ish, BASHwards-compatible shell";
|
description = "A Python-ish, BASHwards-compatible shell";
|
||||||
homepage = "http://xonsh.org";
|
homepage = "http://xonsh.org";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = [ maintainers.spwhitt ];
|
maintainers = with maintainers; [ spwhitt garbas ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16773,8 +16773,9 @@ in modules // {
|
||||||
sha256 = "192fyzs0hyq0k7wxxl00jwl334l5hwwmdflhvjqqrlj0dsgfs22i";
|
sha256 = "192fyzs0hyq0k7wxxl00jwl334l5hwwmdflhvjqqrlj0dsgfs22i";
|
||||||
url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
|
url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
|
||||||
};
|
};
|
||||||
|
checkPhase = ''
|
||||||
disabled = isPy35;
|
rm prompt_toolkit/win32_types.py
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs = with self; [ jedi ipython pygments ];
|
buildInputs = with self; [ jedi ipython pygments ];
|
||||||
propagatedBuildInputs = with self; [ docopt six wcwidth ];
|
propagatedBuildInputs = with self; [ docopt six wcwidth ];
|
||||||
|
|
Loading…
Reference in a new issue