Unverified Commit 77f2c068 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

python3Packages.clldutils: use unversioned bibtexparser (#455704)

parents 794ee3ad 070a6836

pkgs/by-name/al/alpaca/package.nix

+10 −3
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/ph/phonemizer/package.nix

0 → 100644
+13 −0
Original line number Diff line number Diff line 
{

  python3Packages,

}:



let

  pythonPackages = python3Packages.overrideScope (

    self: super: {

      bibtexparser = self.bibtexparser_2;

    }

  );

in

with pythonPackages;

toPythonApplication phonemizer

pkgs/development/python-modules/clldutils/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { })