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
base: 5b46f56d17d8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 158f41a1b77c
Choose a head ref
  • 4 commits
  • 8 files changed
  • 2 contributors

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.

(cherry picked from commit d2ccaba)
    @danieldk @FRidh
    danieldk authored and FRidh committed Sep 29, 2019
    Copy the full SHA
    1886d82 View commit details
    Browse the repository at this point in the history

  2. python: get rid of msgpack-python, fixes #48864 

    We already have msgpack, which is the same. Building a Python env with
`spacy` resulted in a collision between an `.so` provided through both
`msgpack` and `msgpack-python`.

I don't know why `transitional = True` was set. These kind of things
should be documented!

(cherry picked from commit 22aef72)
    @FRidh
    FRidh committed Sep 29, 2019
    Copy the full SHA
    f63cbc3 View commit details
    Browse the repository at this point in the history

  3. pybitmessage: fix build 

    - use setuptools
- use msgpack instead of msgpack-python

(cherry picked from commit 7408c39)
    @FRidh
    FRidh committed Sep 29, 2019
    Copy the full SHA
    88c45dc View commit details
    Browse the repository at this point in the history

  4. python: zerorpc: 0.6.1 -> 0.6.3 

    (cherry picked from commit 0d956a6)
    @FRidh
    FRidh committed Sep 29, 2019
    Copy the full SHA
    158f41a View commit details
    Browse the repository at this point in the history