Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bef773ed53f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2ccabaeeacc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 29, 2019

  1. pythonPackages.spacy: fix import error

    Importing spacy fails with:
    
    ModuleNotFoundError: No module named 'pkg_resources
    
    spaCy probably worked before because a dependency had setuptools as a
    propagated dependency. This change adds setuptools to spacy's
    propogatedBuildInputs.
    
    Tested with the en_core_web_sm model.
    danieldk authored and FRidh committed Sep 29, 2019
    Copy the full SHA
    d2ccaba View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/python-modules/spacy/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/spacy/default.nix
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
, blis
, wasabi
, srsly
, setuptools
}:

buildPythonPackage rec {
@@ -55,6 +56,7 @@ buildPythonPackage rec {
blis
wasabi
srsly
setuptools
] ++ lib.optional (pythonOlder "3.4") pathlib;

checkInputs = [