Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

4 files changed, 38 insertions, 48 deletions

diff --git a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
index 648bcd67660e..cd845c87b590 100644
--- a/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
+++ b/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, appstream-glib
 , desktop-file-utils
 , fetchFromGitHub
 , calf
@@ -10,9 +11,11 @@
 , gsl
 , gtk4
 , itstool
+, ladspaH
 , libadwaita
 , libbs2b
 , libebur128
+, libportal-gtk4
 , libsamplerate
 , libsigcxx30
 , libsndfile
@@ -37,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "7.1.0";
+  version = "7.1.3";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     rev = "v${version}";
-    hash = "sha256-TuVW2KBJciuFVdduzfFepGOa+UY9+sXRN1gWhfDvXgw=";
+    hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE=";
   };
 
   nativeBuildInputs = [
@@ -56,15 +59,18 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    appstream-glib
     fftw
     fftwFloat
     fmt_9
     glib
     gsl
     gtk4
+    ladspaH
     libadwaita
     libbs2b
     libebur128
+    libportal-gtk4
     libsamplerate
     libsigcxx30
     libsndfile
@@ -102,6 +108,7 @@ stdenv.mkDerivation rec {
   separateDebugInfo = true;
 
   meta = with lib; {
+    changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md";
     description = "Audio effects for PipeWire applications.";
     homepage = "https://github.com/wwmm/easyeffects";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
index e4a10d82c139..0432224fa3c3 100644
--- a/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
@@ -9,13 +9,13 @@
 
 buildGo121Module rec {
   pname = "go-musicfox";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "go-musicfox";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38=";
+    hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI=";
   };
 
   deleteVendor = true;
diff --git a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 2135af507b6a..f85df83401e0 100644
--- a/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/nixpkgs/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,13 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
+{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins, jack-example-tools }:
 stdenv.mkDerivation rec {
   pname = "VoiceOfFaust";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "VoiceOfFaust";
-    rev = "V${version}";
-    sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw";
+    rev = version;
+    sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU=";
   };
 
   plugins = [ helmholtz mrpeach ];
@@ -16,35 +16,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ faust2jack faust2lv2 ];
 
-  runtimeInputs = [ pitchTracker ];
+  enableParallelBuilding = true;
 
   dontWrapQtApps = true;
 
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
   patchPhase = ''
     sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper
-    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker
-  '';
-
-  buildPhase = ''
-    sh install.sh
-    # so it doesn;t end up in /bin/ :
-    rm -f install.sh
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    for f in $(find . -executable -type f); do
-      cp $f $out/bin/
-    done
-
-    cp launchers/* $out/bin/
-    mkdir $out/PureData/
-    # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd
-    cp PureData/* $out/PureData/
-
-    mkdir -p $out/lib/lv2
-    cp -r *.lv2/ $out/lib/lv2
+    sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper
+    sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker
   '';
 
   meta = {
diff --git a/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix b/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix
index 10bd25e11676..e07904b32485 100644
--- a/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix
@@ -1,13 +1,13 @@
 { lib
-, stdenv
+, buildNpmPackage
 , fetchFromGitHub
-, electron
-, copyDesktopItems
 , makeDesktopItem
+, copyDesktopItems
 , makeWrapper
+, electron
 }:
 
-stdenv.mkDerivation rec {
+buildNpmPackage rec {
   pname = "pocket-casts";
   version = "0.7.0";
 
@@ -15,9 +15,15 @@ stdenv.mkDerivation rec {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
     rev = "v${version}";
-    sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4=";
+    hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4=";
   };
 
+  npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc=";
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  dontNpmBuild = true;
+
   desktopItems = [
     (makeDesktopItem {
       name = pname;
@@ -34,19 +40,12 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps
-
-    cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts
-    install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png
-    install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png
+  postInstall = ''
+    install -Dm644 $out/lib/node_modules/pocket-casts/icon.png $out/share/pixmaps/pocket-casts.png
+    install -Dm644 $out/lib/node_modules/pocket-casts/icon-x360.png $out/share/pixmaps/pocket-casts-x360.png
 
     makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \
-      --add-flags $out/opt/pocket-casts/main.js
-
-    runHook postInstall
+      --add-flags $out/lib/node_modules/pocket-casts/main.js
   '';
 
   meta = with lib; {
@@ -54,6 +53,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/felicianotech/pocket-casts-desktop-app";
     license = licenses.mit;
     maintainers = with maintainers; [ wolfangaukang ];
+    mainProgram = "pocket-casts";
     platforms = platforms.linux;
   };
 }