diff options
Diffstat (limited to 'pkgs/development/python-modules/bpython')
| -rw-r--r-- | pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch | 27 | ||||
| -rw-r--r-- | pkgs/development/python-modules/bpython/default.nix | 22 |
2 files changed, 14 insertions, 35 deletions
diff --git a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch deleted file mode 100644 index 685d34228a1b..000000000000 --- a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Wed, 3 Jun 2020 22:05:34 +0200 -Subject: [PATCH] clipboard: make which substitutable - -This is used to detect the presence of xclip and other clipboard -handling tools. ---- - bpython/clipboard.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bpython/clipboard.py b/bpython/clipboard.py -index aee429b..f346429 100644 ---- a/bpython/clipboard.py -+++ b/bpython/clipboard.py -@@ -58,7 +58,7 @@ class OSXClipboard(object): - - def command_exists(command): - process = subprocess.Popen( -- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE -+ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE - ) - process.communicate() - --- -2.26.2 - diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 0cedc7655ac0..3285f3dee973 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , curtsies +, cwcwidth , greenlet , jedi , pygments +, pytestCheckHook +, pyperclip , pyxdg , requests , substituteAll +, typing-extensions , urwid , watchdog -, which }: buildPythonPackage rec { @@ -22,18 +25,18 @@ buildPythonPackage rec { sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; }; - patches = [ (substituteAll { - src = ./clipboard-make-which-substitutable.patch; - which = "${which}/bin/which"; - })]; - propagatedBuildInputs = [ curtsies + cwcwidth greenlet + jedi pygments + pyperclip pyxdg requests + typing-extensions urwid + watchdog ]; postInstall = '' @@ -41,13 +44,16 @@ buildPythonPackage rec { --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ jedi watchdog ]; + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "bpython" ]; meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; homepage = "https://bpython-interpreter.org/"; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dotlambda ]; }; } |