aboutsummaryrefslogtreecommitdiff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-09-04 22:02:30 -0500
committerGitHub <noreply@github.com>2020-09-04 22:02:30 -0500
commitf87374dc693e0a13cf71c98d635bc14f3ecda601 (patch)
tree39fa16edc0deabe2e1cff149a6f42970f1cedcfa /pkgs/shells
parent32a898bb15408a944d0fd7d0071f3a52f54864d9 (diff)
parentb03a6187b1bced15aa4211a254c56eed00949eec (diff)
Merge pull request #96988 from marsam/update-xonsh
xonsh: 0.9.20 -> 0.9.21
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/xonsh/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index f73ec422e06b..751dd00efc7a 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -4,31 +4,22 @@
, glibcLocales
, coreutils
, git
-, fetchpatch
}:
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.20";
+ version = "0.9.21";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
- sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p";
+ sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0";
};
LC_ALL = "en_US.UTF-8";
- patches = [
- # Fix vox tests. Remove with the next release
- (fetchpatch {
- url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch";
- sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h";
- })
- ];
-
postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py