python3Packages.bpython: update dependencies

This commit is contained in:
Robert Schütz 2021-12-20 20:40:40 +00:00 committed by Robert Schütz
parent c1d88dd0e6
commit 2bcedb75d1
2 changed files with 14 additions and 35 deletions

View file

@ -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

View file

@ -2,15 +2,18 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, curtsies , curtsies
, cwcwidth
, greenlet , greenlet
, jedi , jedi
, pygments , pygments
, pytestCheckHook
, pyperclip
, pyxdg , pyxdg
, requests , requests
, substituteAll , substituteAll
, typing-extensions
, urwid , urwid
, watchdog , watchdog
, which
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -22,18 +25,18 @@ buildPythonPackage rec {
sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200";
}; };
patches = [ (substituteAll {
src = ./clipboard-make-which-substitutable.patch;
which = "${which}/bin/which";
})];
propagatedBuildInputs = [ propagatedBuildInputs = [
curtsies curtsies
cwcwidth
greenlet greenlet
jedi
pygments pygments
pyperclip
pyxdg pyxdg
requests requests
typing-extensions
urwid urwid
watchdog
]; ];
postInstall = '' postInstall = ''
@ -41,13 +44,16 @@ buildPythonPackage rec {
--replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"
''; '';
checkInputs = [ jedi watchdog ]; checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "bpython" ]; pythonImportsCheck = [ "bpython" ];
meta = with lib; { meta = with lib; {
description = "A fancy curses interface to the Python interactive interpreter"; description = "A fancy curses interface to the Python interactive interpreter";
homepage = "https://bpython-interpreter.org/"; homepage = "https://bpython-interpreter.org/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ flokli ]; maintainers = with maintainers; [ flokli dotlambda ];
}; };
} }