about summary refs log tree commit diff
path: root/pkgs/shells/xonsh
diff options
context:
space:
mode:
authorKovacsics Robert <rmk35@cam.ac.uk>2020-02-18 13:16:37 +0000
committerMaximilian Bosch <maximilian@mbosch.me>2020-02-18 19:14:25 +0100
commit2c7ba2060d11445974a8fbcbe4043b66bcb7310e (patch)
tree06b3d51630f25ff7c2ba64c28006567a3465d7ac /pkgs/shells/xonsh
parentb3a47c62fb5b8bf71613bbbfe4c73f959c264ef5 (diff)
xonsh: Fix broken tests
Pulls in a patch committed a couple of days after the 0.9.13 release
(the one here), to fix the tests.

(cherry picked from commit bf822c4caa96666d5ee1c20870229b9f6484e5cd)
Diffstat (limited to 'pkgs/shells/xonsh')
-rw-r--r--pkgs/shells/xonsh/default.nix17
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 0e2490ff4341e..2bc65164d5820 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, python3Packages
+, glibcLocales
+, coreutils
+, git
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
@@ -12,6 +19,14 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-ptk-tests.patch";
+      url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch";
+      sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw";
+    })
+  ];
+
   LC_ALL = "en_US.UTF-8";
   postPatch = ''
     sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py