diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 035d0f705494..275e924e4113 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -2,14 +2,12 @@ , buildPythonPackage , fetchPypi , pythonOlder -, html5lib , pytest , preshed , ftfy , numpy , murmurhash , plac -, six , ujson , dill , requests @@ -23,19 +21,17 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.0.16"; + version = "2.0.18"; src = fetchPypi { inherit pname version; - sha256 = "1ghgbv819ff4777904p1kzayq1dj34i7853anvg859sak59r7pj1"; + sha256 = "0mybdms7c40jvk8ak180n65anjiyg4c8gkaqwkzicrd1mxq3ngqj"; }; prePatch = '' substituteInPlace setup.py \ --replace "regex==" "regex>=" \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ - --replace "thinc>=6.12.0,<6.13.0" "thinc>=6.12.0" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" ''; propagatedBuildInputs = [ @@ -45,8 +41,6 @@ buildPythonPackage rec { preshed thinc plac - six - html5lib ujson dill requests diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index cdf2de9e7302..acbc2a608173 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -19,18 +19,17 @@ , plac , six , mock -, termcolor , wrapt , dill }: buildPythonPackage rec { pname = "thinc"; - version = "6.12.0"; + version = "6.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0lfdf08v7rrj9b29z2vf8isaqa0zh16acw9im8chkqsh8bay4ykm"; + sha256 = "1kkp8b3xcs3yn3ia5sxrh086c9xv27s2khdxd17abdypxxa99ich"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -45,20 +44,18 @@ buildPythonPackage rec { preshed numpy murmurhash - pytest - hypothesis tqdm cytoolz plac six - mock - termcolor wrapt dill ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ + hypothesis + mock pytest ]; @@ -66,7 +63,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0" + --replace "msgpack-numpy<0.4.4" "msgpack-numpy" ''; # Cannot find cython modules.