summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-01-01 11:56:00 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-01-01 11:56:00 +0100
commitbdaded3804015bee367456ab3ba0b6d281756478 (patch)
treea1ec77154cd124746f9b751ded33db3f80b146fb
parentf15e854904c6c1f352b54140351bc677422e32a1 (diff)
downloadnixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar.gz
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar.bz2
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar.lz
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar.xz
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.tar.zst
nixlib-bdaded3804015bee367456ab3ba0b6d281756478.zip
python.pkgs.spacy: remove private regex derivation
Packages in `python-packages.nix` should not have other versions than
already defined in the package set because thay may cause collisions.
-rw-r--r--pkgs/development/python-modules/spacy/default.nix17
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 40df45616e93..6c7c3c8400c1 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -19,23 +19,12 @@
 , ftfy
 , thinc
 , pip
+, regex
 }:
-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 {
+buildPythonPackage rec {
   pname = "spacy";
   version = "1.8.2";
-  name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "explosion";
@@ -56,7 +45,7 @@ in buildPythonPackage rec {
    ujson
    dill
    requests
-   regexLocked
+   regex
    ftfy
    thinc
    pytest