From ead6df9fe53c8eff7cf8d9e0fd8b2adc69ee9312 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Wed, 7 May 2025 12:05:26 +0200 Subject: [PATCH 1/2] python3Packages.thinc: 9.1.1 -> 8.3.6 Package python3Packages.spacy depends on `thinc<8.4.0`, but python3Packages.thinc refers to version 9.1.1 and this breaks the `spacy` package. Some dependency issues were fixed since the last 8.x.x release of thinc in nixpkgs, making this a simple version switch. The package python3Packages.spacy appears to be the only dependent on python3Packages.thinc: ```shell grep -rl 'thinc' pkgs/ pkgs/applications/editors/vim/plugins/generated.nix pkgs/applications/editors/vim/plugins/vim-plugin-names pkgs/development/python-modules/spacy/default.nix pkgs/development/python-modules/thinc/default.nix pkgs/top-level/python-packages.nix ``` Related to: https://github.com/NixOS/nixpkgs/issues/402089 --- pkgs/development/python-modules/thinc/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 4816698ed0bb..b577d4cbf2b2 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -6,7 +6,7 @@ catalogue, confection, cymem, - cython_0, + cython, fetchPypi, hypothesis, mock, @@ -22,23 +22,18 @@ buildPythonPackage rec { pname = "thinc"; - version = "9.1.1"; + version = "8.3.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-IfrimG13d6bwULkEbcnqsRhS8cmpl9zJAy8+zCJ4Sko="; + hash = "sha256-SZg/m33cQ0OpUyaUqRGN0hbXpgBSCiGEmkO2wmjsbK0="; }; - postPatch = '' - substituteInPlace pyproject.toml setup.cfg \ - --replace-fail "blis>=1.0.0,<1.1.0" blis - ''; - build-system = [ blis cymem - cython_0 + cython murmurhash numpy preshed From 292285990678a04b96a7d8707234fb40a3d430fa Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Wed, 7 May 2025 12:53:01 +0200 Subject: [PATCH 2/2] python3Packages.spacy: unmark as broken Since the breakage is fixed by reverting python3Packages.thinc: 9.1.1 -> 8.3.6 --- pkgs/development/python-modules/spacy/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index b961fe45942e..8389430e1e24 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -144,7 +144,5 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; mainProgram = "spacy"; - # Cython.Compiler.Errors.CompileError: spacy/ml/parser_model.pyx - broken = true; }; }