diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index b140f8110a6d..b7301cf1e73a 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, fetchpatch , cpyparsing , ipykernel , mypy @@ -15,30 +14,22 @@ buildPythonApplication rec { pname = "coconut"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "v${version}"; - sha256 = "1gc0fwqwzn1j6mcg1f6fw832w66pbaaq9mmi0r4kw3xn5f877icz"; + sha256 = "/397YGV6QWWmKfqr5hSvqRoPOu7Hx1Pak6rVPR3etzw="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; - 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 = [ pexpect pytestCheckHook tkinter ]; - # Currently most tests do not work on Hydra due to external fetches. + # Currently most tests have performance issues pytestFlagsArray = [ "tests/constants_test.py" - "tests/main_test.py::TestShell::test_compile_to_file" - "tests/main_test.py::TestShell::test_convenience" ]; pythonImportsCheck = [ "coconut" ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index 2cba79b4886e..638824a87ee9 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.5.0.1.2"; + version = "2.4.7.1.0.0"; src = fetchFromGitHub { owner = "evhub"; repo = pname; - rev = "38f2b323b99cee9a080106ae9951ffc5752599f0"; # No tags on repo - sha256 = "0wrm6vzwp968z7s0qhr23v39ivyxzvav3mv9i2n0iv9zl041kypv"; + rev = "09073751d92cb40fb71c927c006baddc082df1db"; # No tags on repo + sha256 = "O9IdHipAxxbFcDFYNvmczue/wT4AF9Xb5uc3ZTAlTlo="; }; nativeBuildInputs = [ cython ];