From 4ca6fa7dc8fddef215461d1f6b85f1a5be996ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 20:00:14 -0700 Subject: [PATCH 1/3] python3Packages.clldutils: use unversioned bibtexparser Python packages' dependencies may only contain unversioned attributes. --- pkgs/development/python-modules/clldutils/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 1dc7cc8de508..93e318059b08 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, colorlog, fetchFromGitHub, - bibtexparser_2, + bibtexparser, git, lxml, markdown, @@ -36,7 +36,7 @@ buildPythonPackage rec { dependencies = [ attrs - bibtexparser_2 + bibtexparser colorlog lxml markdown @@ -55,6 +55,7 @@ buildPythonPackage rec { ]; meta = { + broken = lib.versionOlder bibtexparser.version "2"; changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md"; description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; From ed3e0dc19073f8813006f6ff5d0a3c682730515f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 20:26:20 -0700 Subject: [PATCH 2/3] alpaca: use bibtexparser_2 It's required by clldutils, which kokoro transitively depends on. --- pkgs/by-name/al/alpaca/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index d7817a81488c..3351add4c03b 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -22,7 +22,14 @@ pipewire, }: -python3Packages.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + bibtexparser = self.bibtexparser_2; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "alpaca"; version = "8.1.1"; pyproject = false; # Built with meson @@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; dependencies = - with python3Packages; + with pythonPackages; [ pygobject3 requests @@ -74,7 +81,7 @@ python3Packages.buildPythonApplication rec { ] ++ lib.flatten (builtins.attrValues optional-dependencies); - optional-dependencies = with python3Packages; { + optional-dependencies = with pythonPackages; { speech-to-text = [ openai-whisper pyaudio From 070a683623d936a067eb9e3e62a9c1144c624316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 20:28:51 -0700 Subject: [PATCH 3/3] phonemizer: use bibtexparser_2 It's required by clldutils, which segments depends on. --- pkgs/by-name/ph/phonemizer/package.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ph/phonemizer/package.nix diff --git a/pkgs/by-name/ph/phonemizer/package.nix b/pkgs/by-name/ph/phonemizer/package.nix new file mode 100644 index 000000000000..1a49b263f00c --- /dev/null +++ b/pkgs/by-name/ph/phonemizer/package.nix @@ -0,0 +1,13 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + bibtexparser = self.bibtexparser_2; + } + ); +in +with pythonPackages; +toPythonApplication phonemizer diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7f19fb3a1df..911fdc7cdb23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13038,8 +13038,6 @@ with pkgs; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; - phonemizer = with python3Packages; toPythonApplication phonemizer; - ### GAMES inherit (callPackages ../games/fteqw { })