public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xonsh: 0.9.13 -> 0.9.14 

Closes #81951

The PR unnecessarily removes the `patchShebangs .`-call, also the
non-deterministically failing testcase `test_pyghooks` isn't excluded
there.

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
This commit is contained in:
Maximilian Bosch 2020-03-14 05:32:20 +01:00
parent 406f983101
commit 6b6abb453c
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/shells/xonsh/default.nix
View File

@ -5,28 +5,21 @@
, glibcLocales , glibcLocales
, coreutils , coreutils
, git , git
, python3
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "xonsh"; pname = "xonsh";
version = "0.9.13"; version = "0.9.14";
# fetch from github because the pypi package ships incomplete tests # fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xonsh"; owner = "xonsh";
repo = "xonsh"; repo = "xonsh";
rev = "refs/tags/${version}"; rev = version;
sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv"; sha256 = "03g8ilg4dxin3v3rzccdxx9zf8rvyqpxakn1dlpqbgsnwdwa19p4";
}; };
patches = [
(fetchpatch {
name = "fix-ptk-tests.patch";
url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch";
sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw";
})
];
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
postPatch = '' postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
@ -34,6 +27,7 @@ python3Packages.buildPythonApplication rec {
sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py
sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh
find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \;
find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|'
patchShebangs . patchShebangs .
''; '';
@ -41,7 +35,7 @@ python3Packages.buildPythonApplication rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
checkPhase = '' checkPhase = ''
HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight' HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks'
HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5
HOME=$TMPDIR pytest -k 'test_ptk_highlight' HOME=$TMPDIR pytest -k 'test_ptk_highlight'
''; '';