From 2dc3bf1d1b031f534754243aa5a998d5fce7f813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 29 Aug 2019 20:15:11 +0200 Subject: [PATCH 1/3] pythonPackages.blis: 0.2.4 -> 0.4.0 Major changes: - Update vendored blis to 0.5.1 - Change license to BSD - Support for read-only numpy arrays --- pkgs/development/python-modules/blis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index e038e07507a0..6afbe0e2f5d2 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.2.4"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0c5hd0bim9134sk8wb31cqzvi9c380rbl5zwjiwrq8nnix8a2k1d"; + sha256 = "1khh02z6wryrnrxlx2wrxzhaqsg5hlgypy0643rvi4zcqanvdpym"; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BLAS-like linear algebra library"; homepage = https://github.com/explosion/cython-blis; - license = licenses.mit; + license = licenses.bsd3; maintainers = with maintainers; [ danieldk ]; - }; + }; } From 8cf73ee2bf536c1940ad2d957c1ce191fbd4bd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 29 Aug 2019 20:26:36 +0200 Subject: [PATCH 2/3] pythonPackages.thinc: 7.0.8 -> 7.1.0 Major change: support read-only numpy arrays --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ac8ab3fd8648..44e70cceb0ec 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.0.8"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "191admjvhqsbxpqn73q42i0i8kvlblj0k6p0z9p7n3pcxzl75nsw"; + sha256 = "0j2nfzz154j9331gzwa5rmc2f5ljjan728rhgsx6c7jwg323mmsa"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 0cca8578aecd2010a675c6078ddadbddbfdb4c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 29 Aug 2019 20:27:43 +0200 Subject: [PATCH 3/3] python3Packages.spacy: remove blis/thinc upper bounds --- pkgs/development/python-modules/spacy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index cdef1b2a9bd0..408063b9c4fc 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -34,7 +34,9 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ - --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" + --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \ + --replace "thinc>=7.0.8,<7.1.0" "thinc>=7.0.8" \ + --replace "blis>=0.2.2,<0.3.0" "blis>=0.2.2" ''; propagatedBuildInputs = [