Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'

15 files changed, 63 insertions, 58 deletions

diff --git a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
index 08f8e03885ee..b94d514e8ece 100644
--- a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
+++ b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abcm2ps";
-  version = "8.14.11";
+  version = "8.14.12";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw";
+    sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk=";
   };
 
   configureFlags = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "http://moinejf.free.fr/";
-    license = licenses.gpl3;
+    license = licenses.lgpl3Plus;
     description = "A command line program which converts ABC to music sheet in PostScript or SVG format";
     platforms = platforms.unix;
     maintainers = [ maintainers.dotlambda ];
diff --git a/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
index e120f6fcbf0e..ab56a9890b0c 100644
--- a/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
+++ b/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "audiowaveform";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "bbc";
     repo = "audiowaveform";
     rev = version;
-    sha256 = "0k2s2f2hgq4pnjzfkgvjwgsflihmzdq7shicfjn0z2mzw4d1bvp2";
+    sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU=";
   };
 
   nativeBuildInputs = [ cmake gtest ];
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ boost gd libsndfile libmad libid3tag ];
 
   preConfigure = ''
-    ln -s ${gtest.src}/googletest googletest
-    ln -s ${gtest.src}/googlemock googlemock
+    ln -s ${gtest.src} googletest
   '';
 
   # One test is failing, see PR #101947
diff --git a/nixpkgs/pkgs/tools/audio/beets/default.nix b/nixpkgs/pkgs/tools/audio/beets/default.nix
index 059174ae0a27..7114d6801b47 100644
--- a/nixpkgs/pkgs/tools/audio/beets/default.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/default.nix
@@ -100,18 +100,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   pname = "beets";
-  # While there is a stable version, 1.4.9, it is more than 1000 commits behind
-  # master and lacks many bug fixes and improvements[1]. Also important,
-  # unstable does not require bs1770gain[2].
-  # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
-  # [2]: https://github.com/NixOS/nixpkgs/pull/90504
-  version = "unstable-2021-05-13";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
-    rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34";
-    sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU=";
+    rev = "v${version}";
+    sha256 = "sha256-yQMCJUwpjDDhPffBS6LUq6z4iT1VyFQE0R27XEbYXbY=";
   };
 
   propagatedBuildInputs = [
@@ -266,12 +261,11 @@ in pythonPackages.buildPythonApplication rec {
   passthru = {
     # FIXME: remove in favor of pkgs.beetsExternalPlugins
     externalPlugins = beetsExternalPlugins;
-    updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
   };
 
   meta = with lib; {
     description = "Music tagger and library organizer";
-    homepage = "http://beets.io";
+    homepage = "https://beets.io";
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/audio/darkice/default.nix b/nixpkgs/pkgs/tools/audio/darkice/default.nix
index 1ff66e83e5a4..bc3bcbe4eff2 100644
--- a/nixpkgs/pkgs/tools/audio/darkice/default.nix
+++ b/nixpkgs/pkgs/tools/audio/darkice/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "darkice";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
-    sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
+    url = "https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz";
+    sha256 = "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
index 9ef8eb43772a..852f538d6e31 100644
--- a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
+++ b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix
@@ -1,7 +1,9 @@
 { lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
-  name = "gvolicon-2014-04-28";
+  pname = "gvolicon";
+  version = "unstable-2014-04-28";
+
   src = fetchgit {
     url = "https://github.com/Unia/gvolicon";
     rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";
diff --git a/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/nixpkgs/pkgs/tools/audio/midicsv/default.nix
index cf55e0dd81d5..698205a2b076 100644
--- a/nixpkgs/pkgs/tools/audio/midicsv/default.nix
+++ b/nixpkgs/pkgs/tools/audio/midicsv/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "midicsv-1.1";
+  pname = "midicsv";
+  version = "1.1";
 
   src = fetchurl {
-    url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz";
+    url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz";
     sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw";
   };
 
diff --git a/nixpkgs/pkgs/tools/audio/mididings/default.nix b/nixpkgs/pkgs/tools/audio/mididings/default.nix
index f220fed208f1..9913ea911ebb 100644
--- a/nixpkgs/pkgs/tools/audio/mididings/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mididings/default.nix
@@ -1,6 +1,6 @@
-{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2  }:
+{ lib, python2Packages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2  }:
 
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
   version = "2015-11-17";
   pname = "mididings";
 
@@ -12,8 +12,8 @@ pythonPackages.buildPythonApplication {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ];
-  propagatedBuildInputs = with pythonPackages; [ decorator ]
+  buildInputs = [ glib alsa-lib libjack2 python2Packages.boost ];
+  propagatedBuildInputs = with python2Packages; [ decorator ]
     # for livedings
     ++ [ tkinter pyliblo ]
     # for mididings.extra
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication {
 
   preBuild = with lib.versions; ''
     substituteInPlace setup.py \
-      --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}"
+      --replace boost_python "boost_python${major python2Packages.python.version}${minor python2Packages.python.version}"
   '';
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/tools/audio/mpdsync/default.nix b/nixpkgs/pkgs/tools/audio/mpdsync/default.nix
index 51f5ba656168..c89404fbba1c 100644
--- a/nixpkgs/pkgs/tools/audio/mpdsync/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdsync/default.nix
@@ -1,7 +1,8 @@
 { stdenv, python2, fetchFromGitHub }:
 with python2.pkgs;
 stdenv.mkDerivation {
-  name = "mpdsync-2017-06-15";
+  pname = "mpdsync";
+  version = "unstable-2017-06-15";
 
   src = fetchFromGitHub {
     owner = "alphapapa";
diff --git a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
index 358e662ca1e0..6adc24e5300d 100644
--- a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
 stdenv.mkDerivation {
-  name = "pa-applet-2012-04-11";
+  pname = "pa-applet";
+  version = "unstable-2012-04-11";
 
   src = fetchgit {
     url = "git://github.com/fernandotcl/pa-applet.git";
diff --git a/nixpkgs/pkgs/tools/audio/picotts/default.nix b/nixpkgs/pkgs/tools/audio/picotts/default.nix
index 03f446dc215b..5c995f407a7b 100644
--- a/nixpkgs/pkgs/tools/audio/picotts/default.nix
+++ b/nixpkgs/pkgs/tools/audio/picotts/default.nix
@@ -1,7 +1,9 @@
 { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
 
 stdenv.mkDerivation {
-  name = "picotts-unstable-2018-10-19";
+  pname = "picotts";
+  version = "unstable-2018-10-19";
+
   src = fetchFromGitHub {
     repo = "picotts";
     owner = "naggety";
diff --git a/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/nixpkgs/pkgs/tools/audio/spotdl/default.nix
index 71e8615a114f..2ecfba8772f6 100644
--- a/nixpkgs/pkgs/tools/audio/spotdl/default.nix
+++ b/nixpkgs/pkgs/tools/audio/spotdl/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "spotdl";
-  version = "3.6.3";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     rev = "v${version}";
-    sha256 = "sha256-Ok8DOw+Joy35IqN7sNOQcUWYJS8tqBeQ5/I8fUSly7Q=";
+    sha256 = "sha256-ftSnlruSv+RtvjTpZPYg9Z2EK4th8NbDhVlG2eIc87s=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
     beautifulsoup4
     requests
     unidecode
+    youtube-dl
   ];
 
   checkInputs = with python3.pkgs; [
diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix
index 7906c92ba881..eb1ea2aa5923 100644
--- a/nixpkgs/pkgs/tools/audio/tts/default.nix
+++ b/nixpkgs/pkgs/tools/audio/tts/default.nix
@@ -1,5 +1,5 @@
 { lib
-, python38
+, python3
 , fetchFromGitHub
 , fetchpatch
 }:
@@ -10,33 +10,28 @@
 # $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan
 #
 # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts
-# Also note that your tts version might not support all available models so check:
-#   https://github.com/coqui-ai/TTS/releases/tag/v0.1.2
 #
 # For now, for deployment check the systemd unit in the pull request:
 #   https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
 
-let
-  python3 = python38;
-in python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "tts";
-  version = "0.1.2";
-
-  # https://github.com/coqui-ai/TTS/issues/570
-  disabled = python3.pythonAtLeast "3.9";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "coqui-ai";
     repo = "TTS";
     rev = "v${version}";
-    sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4";
+    sha256 = "sha256-7YMNxZ15qQowEE0tE6x/LbtirNGp7h9OLyS1JSl9x2A=";
   };
 
   postPatch = ''
-    sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt
-    sed -i -e 's!numba==[^"]*!numba!' requirements.txt
-    sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt
-    sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt
+    sed -i requirements.txt \
+      -e 's!librosa==[^"]*!librosa!' \
+      -e 's!mecab-python3==[^"]*!mecab-python3!' \
+      -e 's!numba==[^"]*!numba!' \
+      -e 's!numpy==[^"]*!numpy!' \
+      -e 's!umap-learn==[^"]*!umap-learn!'
   '';
 
   nativeBuildInputs = with python3.pkgs; [
@@ -47,6 +42,7 @@ in python3.pkgs.buildPythonApplication rec {
     anyascii
     coqpit
     flask
+    fsspec
     gruut
     gdown
     inflect
@@ -111,6 +107,7 @@ in python3.pkgs.buildPythonApplication rec {
     "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py"
     "tests/tts_tests/test_tacotron2_tf_model.py"
     # RuntimeError: fft: ATen not compiled with MKL support
+    "tests/tts_tests/test_vits_train.py"
     "tests/vocoder_tests/test_fullband_melgan_train.py"
     "tests/vocoder_tests/test_hifigan_train.py"
     "tests/vocoder_tests/test_melgan_train.py"
diff --git a/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/nixpkgs/pkgs/tools/audio/yabridge/default.nix
index cbe35765cb4f..ac5767b24219 100644
--- a/nixpkgs/pkgs/tools/audio/yabridge/default.nix
+++ b/nixpkgs/pkgs/tools/audio/yabridge/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, multiStdenv
 , fetchFromGitHub
 , substituteAll
 , meson
@@ -8,6 +8,7 @@
 , wine
 , boost
 , libxcb
+, pkgsi686Linux
 }:
 
 let
@@ -55,16 +56,16 @@ let
       sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w=";
     };
   };
-in stdenv.mkDerivation rec {
+in multiStdenv.mkDerivation rec {
   pname = "yabridge";
-  version = "3.3.1";
+  version = "3.5.2";
 
   # NOTE: Also update yabridgectl's cargoHash when this is updated
   src = fetchFromGitHub {
     owner = "robbert-vdh";
     repo = pname;
     rev = version;
-    hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8=";
+    hash = "sha256-SLiksc8lQo2A5sefKbcaJyhi8vPdp2p2Jbc7bvM0sDw=";
   };
 
   # Unpack subproject sources
@@ -109,6 +110,7 @@ in stdenv.mkDerivation rec {
 
   mesonFlags = [
     "--cross-file" "cross-wine.conf"
+    "-Dwith-bitbridge=true"
 
     # Requires CMake and is unnecessary
     "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled"
@@ -118,11 +120,16 @@ in stdenv.mkDerivation rec {
     "-Dtomlplusplus:BUILD_TESTS=disabled"
   ];
 
+  preConfigure = ''
+    sed -i "214s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build
+    sed -i "192 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build
+  '';
+
   installPhase = ''
     runHook preInstall
     mkdir -p "$out/bin" "$out/lib"
-    cp yabridge-group.exe{,.so} "$out/bin"
-    cp yabridge-host.exe{,.so} "$out/bin"
+    cp yabridge-group*.exe{,.so} "$out/bin"
+    cp yabridge-host*.exe{,.so} "$out/bin"
     cp libyabridge-vst2.so "$out/lib"
     cp libyabridge-vst3.so "$out/lib"
     runHook postInstall
diff --git a/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch b/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch
index 2b6ce1f448fa..d58aedeb27ff 100644
--- a/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch
+++ b/nixpkgs/pkgs/tools/audio/yabridge/hardcode-wine.patch
@@ -1,13 +1,13 @@
 diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
-index 1ff05bc..0723456 100644
+index 7fb7d1b3..eb227101 100644
 --- a/src/plugin/utils.cpp
 +++ b/src/plugin/utils.cpp
-@@ -351,7 +351,7 @@ std::string get_wine_version() {
+@@ -105,5 +105,5 @@ std::string PluginInfo::wine_version() const {
          access(wineloader_path.c_str(), X_OK) == 0) {
          wine_path = wineloader_path;
      } else {
 -        wine_path = bp::search_path("wine").string();
 +        wine_path = "@wine@/bin/wine";
      }
- 
+
      bp::ipstream output;
diff --git a/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix
index bf0913372beb..35c8b0c5aeff 100644
--- a/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix
+++ b/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
 
   src = yabridge.src;
   sourceRoot = "source/tools/yabridgectl";
-  cargoHash = "sha256-f5k5OF+bEzH0b6M14Mdp8t4Qd5dP5Qj2fDsdiG1MkYk=";
+  cargoHash = "sha256-2x3qB0LbCBUZ4zqKIXPtYdWis+4QANTaJdFvoFbccGE=";
 
   patches = [
     # By default, yabridgectl locates libyabridge.so by using