diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index e964f2abaaa..b140f8110a6 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -5,6 +5,7 @@ , cpyparsing , ipykernel , mypy +, pexpect , pygments , pytestCheckHook , prompt-toolkit @@ -14,34 +15,24 @@ buildPythonApplication rec { pname = "coconut"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "v${version}"; - sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3"; + sha256 = "1gc0fwqwzn1j6mcg1f6fw832w66pbaaq9mmi0r4kw3xn5f877icz"; }; - propagatedBuildInputs = [ cpyparsing pygments prompt-toolkit ipykernel mypy watchdog ]; + propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; - patches = [ - (fetchpatch { - name = "fix-setuptools-version-check.patch"; - url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch"; - sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q"; - }) - (fetchpatch { - name = "support-python-3.9.patch"; - url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch"; - sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71"; - }) - ]; + postPatch = '' + substituteInPlace coconut/kernel_installer.py \ + --replace "fixpath(os.path.join(sys.exec_prefix, icoconut_custom_kernel_install_loc))" \ + "fixpath(icoconut_custom_kernel_install_loc)" + ''; - checkInputs = [ - pytestCheckHook - tkinter - ]; + checkInputs = [ pexpect pytestCheckHook tkinter ]; # Currently most tests do not work on Hydra due to external fetches. pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index 66f173106e4..2cba79b4886 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -1,18 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython, python }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, pexpect, python }: buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.5.0.1.1"; + version = "2.4.5.0.1.2"; src = fetchFromGitHub { owner = "evhub"; repo = pname; - rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo - sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw"; + rev = "38f2b323b99cee9a080106ae9951ffc5752599f0"; # No tags on repo + sha256 = "0wrm6vzwp968z7s0qhr23v39ivyxzvav3mv9i2n0iv9zl041kypv"; }; nativeBuildInputs = [ cython ]; + checkInputs = [ pexpect ]; + checkPhase = "${python.interpreter} tests/cPyparsing_test.py"; meta = with lib; {