From 94698a56240fa906ba3e14938df89e572f462f14 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Fri, 7 May 2021 22:04:10 +0100 Subject: [PATCH] python3Packages.spacy: add spacy_legacy dependency --- .../python-modules/pathy/default.nix | 3 ++- .../python-modules/spacy/default.nix | 2 ++ .../python-modules/spacy/legacy.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/spacy/legacy.nix diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index c6574165491..714e6945df5 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -22,7 +22,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ smart_open typer google-cloud-storage ]; postPatch = '' - substituteInPlace requirements.txt --replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0" + substituteInPlace requirements.txt \ + --replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0" ''; checkInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 077ac0e6a3b..96f7f78f928 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -16,6 +16,7 @@ , requests , setuptools , srsly +, spacy-legacy , thinc , wasabi }: @@ -41,6 +42,7 @@ buildPythonPackage rec { requests setuptools srsly + spacy-legacy thinc wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix new file mode 100644 index 00000000000..f8b011d83cc --- /dev/null +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "spacy-legacy"; + version = "3.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA="; + }; + + # checkInputs = [ pytestCheckHook spacy ]; + doCheck = false; + pythonImportsCheck = [ "spacy_legacy" ]; + + meta = with lib; { + description = "A Path interface for local and cloud bucket storage"; + homepage = "https://github.com/justindujardin/pathy"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ad9280adb1..b9cda5ce3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7613,6 +7613,8 @@ in { spacy = callPackage ../development/python-modules/spacy { }; + spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; spake2 = callPackage ../development/python-modules/spake2 { };