Merge pull request #72552 from danieldk/spacy-2.2.2
Update spacy to 2.2.2 + necessary dependency updates
This commit is contained in:
commit
5d5dfbfb8a
4 changed files with 8 additions and 19 deletions
|
@ -26,19 +26,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "spacy";
|
pname = "spacy";
|
||||||
version = "2.2.1";
|
version = "2.2.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1a833dx8i4s106fk42x4dnayaq5p3qxaxnc012xij991i09v2pxn";
|
sha256 = "193r7rrqxfj4jqzk4aqgbycficzmc606vkc4ffc46zs3myhlf6sa";
|
||||||
};
|
};
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
substituteInPlace setup.cfg \
|
|
||||||
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
|
|
||||||
--replace "thinc>=7.1.1,<7.2.0" "thinc~=7.0"
|
|
||||||
'';
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
numpy
|
numpy
|
||||||
murmurhash
|
murmurhash
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "srsly";
|
pname = "srsly";
|
||||||
version = "0.1.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1l9yjp1w2vrkrynxrlrc0v47i2iq9059k4ni44nz23573xbdrh2w";
|
sha256 = "0gha1xfh64mapvgn0sghnjsvmjdrh5rywhs3j3bhkvwk42kf40ma";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;
|
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;
|
||||||
|
|
|
@ -28,11 +28,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "thinc";
|
pname = "thinc";
|
||||||
version = "7.2.0";
|
version = "7.3.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "808caccafab95aa74c21695248b26279792cd7d07d94fd97f181020f318f024a";
|
sha256 = "1f9bg7iyhwnk8jfras8d4wzq0ypn5na0bdbwkl7y2mr06yrdd0ff";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
|
@ -65,11 +65,6 @@ buildPythonPackage rec {
|
||||||
pytest
|
pytest
|
||||||
];
|
];
|
||||||
|
|
||||||
prePatch = ''
|
|
||||||
substituteInPlace setup.py \
|
|
||||||
--replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Cannot find cython modules.
|
# Cannot find cython modules.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "wasabi";
|
pname = "wasabi";
|
||||||
version = "0.2.2";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r";
|
sha256 = "0f18x27qrr29rgxyiy1k9b469i37n80h0x9vd9i22pyg8wxx67q5";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
Loading…
Reference in a new issue