Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-08-17 17:51:54 +02:00
499 changed files with 2713 additions and 6206 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
, pygments, isPy3k }:
{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
, pygments, importlib-metadata, isPy3k }:
buildPythonPackage rec {
pname = "ptpython";
@@ -11,7 +11,8 @@ buildPythonPackage rec {
sha256 = "5094e7e4daa77453d3c33eb7b7ebbf1060be4446521865a94e698bc85ff15930";
};
propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ];
propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# no tests to run
doCheck = false;