From 7b652ce07f4badc1883056f2aa9056b4bee65aab Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Sun, 14 May 2017 21:52:41 +0000 Subject: [PATCH 1/8] lib/maintainers.nix: added sdll --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e31a193a77b8f..102c3746ea604 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -478,6 +478,7 @@ schneefux = "schneefux "; schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; + sdll = "Sasha Illarionov "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; From 2ec3f6fd80c3040b8fa9b8028efcb03511b99fa7 Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Sun, 14 May 2017 22:25:14 +0000 Subject: [PATCH 2/8] cymem: init at 1.31.2 --- .../python-modules/cymem/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/cymem/default.nix diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix new file mode 100644 index 0000000000000..f2c6c649a837d --- /dev/null +++ b/pkgs/development/python-modules/cymem/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: +buildPythonPackage rec { + name = "cymem-${version}"; + version = "1.31.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "cymem"; + rev = "1.31.2"; + sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k"; + }; + + propagatedBuildInputs = [ + cython + ]; + + checkPhase = '' + cd cymem/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython memory pool for RAII-style memory management"; + homepage = https://github.com/explosion/cymem; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db52731f0b236..d1cfaaf365ebc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31346,6 +31346,8 @@ EOF distro = callPackage ../development/python-modules/distro { }; + cymem = callPackage ../development/python-modules/cymem { }; + }); in fix' (extends overrides packages) From 2133d8ffe5c5dc51432395f1c61cf2d9a5530222 Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Sun, 14 May 2017 22:26:02 +0000 Subject: [PATCH 3/8] ftfy: init at 4.4.3 --- .../python-modules/ftfy/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/ftfy/default.nix diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix new file mode 100644 index 0000000000000..c0aea98778120 --- /dev/null +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, html5lib +, wcwidth +, nose +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ftfy"; + version = "4.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + }; + + propagatedBuildInputs = [ html5lib wcwidth]; + + buildInputs = [ + nose + ]; + + checkPhase = '' + nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Given Unicode text, make its representation consistent and possibly less broken."; + homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1cfaaf365ebc..571dbd9688b82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31348,6 +31348,8 @@ EOF cymem = callPackage ../development/python-modules/cymem { }; + ftfy = callPackage ../development/python-modules/ftfy { }; + }); in fix' (extends overrides packages) From 8a921adcdc5a339b3362660c1edab1db47f9b7ff Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Sun, 14 May 2017 22:26:25 +0000 Subject: [PATCH 4/8] murmurhash: init at 0.26.4 --- .../python-modules/murmurhash/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/murmurhash/default.nix diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix new file mode 100644 index 0000000000000..aa5e3358866d7 --- /dev/null +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: + +buildPythonPackage rec { + name = "murmurhash-${version}"; + version = "0.26.4"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "murmurhash"; + rev = "0.26.4"; + sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv"; + }; + + buildInputs = [ + cython + ]; + + checkPhase = '' + cd murmurhash/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython bindings for MurmurHash2"; + homepage = https://github.com/explosion/murmurhash; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 571dbd9688b82..9643390f805e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31350,6 +31350,8 @@ EOF ftfy = callPackage ../development/python-modules/ftfy { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; + }); in fix' (extends overrides packages) From a478a56c2b8ea0231d35325de96d4a01974b7221 Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Sun, 14 May 2017 22:27:01 +0000 Subject: [PATCH 5/8] plac: init at 0.9.6 --- .../python-modules/plac/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/plac/default.nix diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix new file mode 100644 index 0000000000000..4ca6d0e08d106 --- /dev/null +++ b/pkgs/development/python-modules/plac/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "plac"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs"; + }; + + checkPhase = '' + cd doc + ${python.interpreter} -m unittest discover -p "*test_plac*" + ''; + + meta = with stdenv.lib; { + description = "Parsing the Command Line the Easy Way"; + homepage = https://github.com/micheles/plac; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9643390f805e6..6bf828903cdee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31352,6 +31352,8 @@ EOF murmurhash = callPackage ../development/python-modules/murmurhash { }; + plac = callPackage ../development/python-modules/plac { }; + }); in fix' (extends overrides packages) From bd0f1a9a1a49697fee939378dd945d0beab09a38 Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Mon, 15 May 2017 10:06:47 +0000 Subject: [PATCH 6/8] preshed: init at 1.0.0 --- .../python-modules/preshed/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/preshed/default.nix diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix new file mode 100644 index 0000000000000..d82408e620ea2 --- /dev/null +++ b/pkgs/development/python-modules/preshed/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, cython +, cymem +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "preshed"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6"; + }; + + propagatedBuildInputs = [ + cython + cymem + ]; + buildInputs = [ + pytest + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "Cython hash tables that assume keys are pre-hashed"; + homepage = https://github.com/explosion/preshed; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bf828903cdee..aaae695ee606b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31352,8 +31352,12 @@ EOF murmurhash = callPackage ../development/python-modules/murmurhash { }; + plac = callPackage ../development/python-modules/plac { }; + + preshed = callPackage ../development/python-modules/preshed { }; + }); in fix' (extends overrides packages) From 60acf08aa9e0af3c7f1ea0c68b891a1046fe0e0b Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Mon, 15 May 2017 10:08:30 +0000 Subject: [PATCH 7/8] thinc: init at 1.0.1 --- .../python-modules/thinc/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +- 2 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/thinc/default.nix diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix new file mode 100644 index 0000000000000..817ea6388f953 --- /dev/null +++ b/pkgs/development/python-modules/thinc/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, pkgs +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, numpy +, python +, murmurhash +, hypothesis +, tqdm +, cytoolz +, plac +, six +, mock +, termcolor +, wrapt +, dill +}: + +let + enableDebugging = true; + + pathlibLocked = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pathlib"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; + }; + + doCheck = false; # fails to import support from test + }; +in buildPythonPackage rec { + name = "thinc-${version}"; + version = "6.5.1"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "thinc"; + rev = "v${version}"; + sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws"; + }; + + propagatedBuildInputs = [ + cython + cymem + preshed + numpy + murmurhash + pytest + hypothesis + tqdm + cytoolz + plac + six + mock + termcolor + wrapt + dill + pathlibLocked + ]; + + doCheck = false; + + # fails to import some modules + # checkPhase = '' + # ${python.interpreter} -m pytest thinc/tests + # # cd thinc/tests + # # ${python.interpreter} -m unittest discover -p "*test*" + # ''; + + meta = with stdenv.lib; { + description = "Practical Machine Learning for NLP in Python"; + homepage = https://github.com/explosion/thinc; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aaae695ee606b..6a54f44b1304a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31352,12 +31352,12 @@ EOF murmurhash = callPackage ../development/python-modules/murmurhash { }; - plac = callPackage ../development/python-modules/plac { }; - - + preshed = callPackage ../development/python-modules/preshed { }; + thinc = callPackage ../development/python-modules/thinc { }; + }); in fix' (extends overrides packages) From de5ecb2d8bfdfd7948c1d63d4983cbaf6c6338f6 Mon Sep 17 00:00:00 2001 From: Sasha Delly Date: Mon, 15 May 2017 10:09:39 +0000 Subject: [PATCH 8/8] spacy: init at 1.8.2 --- .../python-modules/spacy/default.nix | 76 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/spacy/default.nix diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix new file mode 100644 index 0000000000000..452f3f1d92344 --- /dev/null +++ b/pkgs/development/python-modules/spacy/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, pkgs +, buildPythonPackage +, python +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, pathlib2 +, numpy +, murmurhash +, plac +, six +, ujson +, dill +, requests +, ftfy +, thinc +, pip +}: +let + enableDebugging = true; + regexLocked = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "regex"; + version = "2017.04.05"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; + }; + }; +in buildPythonPackage rec { + name = "spacy-${version}"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "spaCy"; + rev = "v${version}"; + sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648"; + }; + + propagatedBuildInputs = [ + cython + cymem + pathlib2 + preshed + numpy + murmurhash + plac + six + ujson + dill + requests + regexLocked + ftfy + thinc + pytest + pip + ]; + + doCheck = false; + # checkPhase = '' + # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # ''; + + meta = with stdenv.lib; { + description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; + homepage = https://github.com/explosion/spaCy; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a54f44b1304a..11ae66fb6261c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31358,6 +31358,7 @@ EOF thinc = callPackage ../development/python-modules/thinc { }; + spacy = callPackage ../development/python-modules/spacy { }; }); in fix' (extends overrides packages)