diff --git a/flake.nix b/flake.nix index c36ef0c..320a584 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { # Packages nixpkgs.url = "nixpkgs/nixos-24.11"; - onixpkgs.url = "nixpkgs/64b80bfb316b57cdb8919a9110ef63393d74382a"; unixpkgs.url = "nixpkgs/master"; labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies # OS diff --git a/hm/extra/default.nix b/hm/extra/default.nix index e14e3b7..f2077b4 100644 --- a/hm/extra/default.nix +++ b/hm/extra/default.nix @@ -2,12 +2,8 @@ pkgs, lib, config, - onixpkgs, ... }: -let - opkgs = import onixpkgs { inherit (pkgs) system; }; -in { config = lib.mkIf config.frogeye.extra { programs = { @@ -33,7 +29,7 @@ in # Communication signal-desktop - (opkgs.callPackage ./whisperx.nix { }) # Transcribe voice messages + (pkgs.callPackage ./whisperx.nix { }) # Transcribe voice messages # downloading # transmission TODO Collision if both transmissions are active? diff --git a/hm/extra/whisperx.nix b/hm/extra/whisperx.nix index fb9a9de..1de0333 100644 --- a/hm/extra/whisperx.nix +++ b/hm/extra/whisperx.nix @@ -1,15 +1,15 @@ { pkgs ? import { }, }: -pkgs.python3Packages.buildPythonPackage { +pkgs.python3Packages.buildPythonPackage rec { pname = "whisperx"; - version = "2024-08-19"; + version = "3.2.0"; # pypi doesn't have the requirements.txt file, and it's required src = pkgs.fetchFromGitHub { owner = "m-bain"; repo = "whisperX"; - rev = "9e3a9e0e38fcec1304e1784381059a0e2c670be5"; # git doesn't have tags - hash = "sha256-IVtn9fe/yi4+fbH57s9LoiREnMZ2nhEObp1a4R/7gHg="; + rev = "v${version}"; # git doesn't have tags + hash = "sha256-JQvyR9JW8OiSRI0eywTyWB4VMXmu6cTpBekBWonoJa4="; }; pyproject = true; dependencies = [ @@ -29,6 +29,12 @@ pkgs.python3Packages.buildPythonPackage { pkgs.python3Packages.pandas pkgs.python3Packages.nltk ]; + pythonRelaxDeps = true; + # torchaudio: 2.5.1a0 is >=2, despite dependency check saying otherwise + # ctranslate2: was pinned to 4.4.0 to fix some nvidia pinning issue or whatnot + # pyannote-audio: not sure what pins this to 3.1.1, but 3.3.1 works fine + # For some reason pyannote-audio doesn't get relaxed when listed in a pythonRelaxDeps array, + # hence why using true build-system = [ pkgs.python3Packages.setuptools ];