From dd8260ecb7902fe0c13dc50c0daa66c399b5ba0a Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:04:49 -0400 Subject: [PATCH 1/8] easyeffects: override speexdsp in expression --- pkgs/applications/audio/easyeffects/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 4730df0464d6..53f7d231b850 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -38,6 +38,10 @@ , zam-plugins , zita-convolver }: +let + # Fix crashes with speexdsp effects + speexdsp' = speexdsp.override { withFftw3 = false; }; +in stdenv.mkDerivation rec { pname = "easyeffects"; @@ -83,7 +87,7 @@ stdenv.mkDerivation rec { rnnoise rubberband soundtouch - speexdsp + speexdsp' tbb zita-convolver ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b24e0955a7c5..23e17b54d7c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25969,10 +25969,7 @@ with pkgs; libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - easyeffects = callPackage ../applications/audio/easyeffects { - # Fix crashes with speexdsp effects - speexdsp = speexdsp.override { withFftw3 = false; }; - }; + easyeffects = callPackage ../applications/audio/easyeffects { }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; From 3cab8d91e2b0abe48ca7513c7026f67c77be1294 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:05:51 -0400 Subject: [PATCH 2/8] easyeffects: migrate to by-name --- .../default.nix => by-name/ea/easyeffects/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/easyeffects/default.nix => by-name/ea/easyeffects/package.nix} (100%) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/by-name/ea/easyeffects/package.nix similarity index 100% rename from pkgs/applications/audio/easyeffects/default.nix rename to pkgs/by-name/ea/easyeffects/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23e17b54d7c4..610c5381a404 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25969,8 +25969,6 @@ with pkgs; libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - easyeffects = callPackage ../applications/audio/easyeffects { }; - pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; From d0167dee2b648820fd8e262e96d8545ab9de70a8 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:06:18 -0400 Subject: [PATCH 3/8] easyeffects: format with nixfmt --- pkgs/by-name/ea/easyeffects/package.nix | 79 +++++++++++++------------ 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 53f7d231b850..84420ff058ab 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -1,42 +1,43 @@ -{ lib -, stdenv -, appstream-glib -, desktop-file-utils -, deepfilternet -, fetchFromGitHub -, calf -, fftw -, fftwFloat -, fmt_9 -, glib -, gsl -, gtk4 -, itstool -, ladspaH -, libadwaita -, libbs2b -, libebur128 -, libportal-gtk4 -, libsamplerate -, libsigcxx30 -, libsndfile -, lilv -, lsp-plugins -, lv2 -, mda_lv2 -, meson -, ninja -, nlohmann_json -, pipewire -, pkg-config -, rnnoise -, rubberband -, speexdsp -, soundtouch -, tbb -, wrapGAppsHook4 -, zam-plugins -, zita-convolver +{ + lib, + stdenv, + appstream-glib, + desktop-file-utils, + deepfilternet, + fetchFromGitHub, + calf, + fftw, + fftwFloat, + fmt_9, + glib, + gsl, + gtk4, + itstool, + ladspaH, + libadwaita, + libbs2b, + libebur128, + libportal-gtk4, + libsamplerate, + libsigcxx30, + libsndfile, + lilv, + lsp-plugins, + lv2, + mda_lv2, + meson, + ninja, + nlohmann_json, + pipewire, + pkg-config, + rnnoise, + rubberband, + speexdsp, + soundtouch, + tbb, + wrapGAppsHook4, + zam-plugins, + zita-convolver, }: let # Fix crashes with speexdsp effects From f54b19ef88bf50bd26aa5dabc431db9331b2aa56 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:07:03 -0400 Subject: [PATCH 4/8] easyeffects: adopt --- pkgs/by-name/ea/easyeffects/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 84420ff058ab..7f97c4a6a63d 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { description = "Audio effects for PipeWire applications"; homepage = "https://github.com/wwmm/easyeffects"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.linux; mainProgram = "easyeffects"; }; From ddf6257258d9cff29348871c2a5b336055d1ce30 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:07:27 -0400 Subject: [PATCH 5/8] easyeffects: don't overuse `with lib;` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/ea/easyeffects/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 7f97c4a6a63d..2fd73221b6bb 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -115,13 +115,13 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - meta = with lib; { - changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; + meta = { description = "Audio effects for PipeWire applications"; homepage = "https://github.com/wwmm/easyeffects"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "easyeffects"; + platforms = lib.platforms.linux; }; } From bb22412297f35e5b19d8bbc70a0819f406fe8ca2 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:10:44 -0400 Subject: [PATCH 6/8] easyeffects: reorganize arguments --- pkgs/by-name/ea/easyeffects/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 2fd73221b6bb..b8103a6ec45b 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -1,11 +1,11 @@ { lib, stdenv, - appstream-glib, - desktop-file-utils, - deepfilternet, fetchFromGitHub, + appstream-glib, calf, + deepfilternet, + desktop-file-utils, fftw, fftwFloat, fmt_9, From ee0d61e58f618f0c934b044e4e586abbab75e9e1 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:11:36 -0400 Subject: [PATCH 7/8] easyeffects: add updateScript --- pkgs/by-name/ea/easyeffects/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index b8103a6ec45b..d82b2404f286 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -27,6 +27,7 @@ mda_lv2, meson, ninja, + nix-update-script, nlohmann_json, pipewire, pkg-config, @@ -115,6 +116,10 @@ stdenv.mkDerivation rec { separateDebugInfo = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Audio effects for PipeWire applications"; homepage = "https://github.com/wwmm/easyeffects"; From 008ab4c6f54d39a84b7e8fa9a871f34c4c39c2ee Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 21:14:24 -0400 Subject: [PATCH 8/8] easyeffects: 7.1.6 -> 7.1.7 Changelog: https://github.com/wwmm/easyeffects/blob/v7.1.7/CHANGELOG.md --- pkgs/by-name/ea/easyeffects/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index d82b2404f286..71f0882371af 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.6"; + version = "7.1.7"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-NViRZHNgsweoD1YbyWYrRTZPKTCkKk3fGDLLYDD7JfA="; + hash = "sha256-y7we7/MQWweAoZkM8SuHiOTVyWFj9/foufLYBum/KKc="; }; nativeBuildInputs = [