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: 7d416ce364b8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c5f4b8a3b19
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 28, 2020

  1. python27Packages.thinc: 7.4.0 -> 7.4.1

    @r-ryantm
    r-ryantm authored and Jon committed May 28, 2020
    Copy the full SHA
    abe0e56 View commit details

  2. python3Packages.spacy: relax thinc version constraint

    @danieldk
    danieldk authored and Jon committed May 28, 2020
    Copy the full SHA
    8c5f4b8 View commit details
Showing with 6 additions and 2 deletions.
  1. +4 −0 pkgs/development/python-modules/spacy/default.nix
  2. +2 −2 pkgs/development/python-modules/thinc/default.nix
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/spacy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,10 @@ buildPythonPackage rec {
# ${python.interpreter} -m pytest spacy/tests --vectors --models --slow
# '';

postPatch = ''
substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8"
'';

meta = with lib; {
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
homepage = "https://github.com/explosion/spaCy";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/thinc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@

buildPythonPackage rec {
pname = "thinc";
version = "7.4.0";
version = "7.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "1f2qpjb8nfdklqp3vf6m36bklydlnr8y8v207p8d2gmapzhrngjj";
sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81";
};

buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [