From bc6e5a4677c29b687632ac12cba9cff34de1a3a3 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 15 May 2025 17:35:35 +0200 Subject: [PATCH] {faust2,faustlive,faust2*}: move to pkgs/by-name --- .../fa/faust2/package.nix} | 6 ++--- .../fa/faust2alqt/package.nix} | 8 +++--- .../fa/faust2alsa/package.nix} | 0 .../fa/faust2csound/package.nix} | 0 .../fa/faust2firefox/package.nix} | 0 .../fa/faust2jack/package.nix} | 0 .../fa/faust2jackrust/package.nix} | 0 .../fa/faust2jaqt/package.nix} | 8 +++--- .../fa/faust2ladspa/package.nix} | 0 .../fa/faust2lv2/package.nix} | 6 ++--- .../fa/faust2sc/package.nix} | 0 .../fa/faustlive/package.nix} | 0 pkgs/top-level/all-packages.nix | 26 +------------------ 13 files changed, 14 insertions(+), 40 deletions(-) rename pkgs/{applications/audio/faust/faust2.nix => by-name/fa/faust2/package.nix} (98%) rename pkgs/{applications/audio/faust/faust2alqt.nix => by-name/fa/faust2alqt/package.nix} (82%) rename pkgs/{applications/audio/faust/faust2alsa.nix => by-name/fa/faust2alsa/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2csound.nix => by-name/fa/faust2csound/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2firefox.nix => by-name/fa/faust2firefox/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2jack.nix => by-name/fa/faust2jack/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2jackrust.nix => by-name/fa/faust2jackrust/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2jaqt.nix => by-name/fa/faust2jaqt/package.nix} (85%) rename pkgs/{applications/audio/faust/faust2ladspa.nix => by-name/fa/faust2ladspa/package.nix} (100%) rename pkgs/{applications/audio/faust/faust2lv2.nix => by-name/fa/faust2lv2/package.nix} (68%) rename pkgs/{applications/audio/faust/faust2sc.nix => by-name/fa/faust2sc/package.nix} (100%) rename pkgs/{applications/audio/faust/faustlive.nix => by-name/fa/faustlive/package.nix} (100%) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/by-name/fa/faust2/package.nix similarity index 98% rename from pkgs/applications/audio/faust/faust2.nix rename to pkgs/by-name/fa/faust2/package.nix index 9304f4536e19..d8b9aefceee0 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/by-name/fa/faust2/package.nix @@ -21,8 +21,6 @@ fetchpatch, }: -with lib.strings; - let version = "2.79.3"; @@ -170,7 +168,7 @@ let runHook preInstall mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do + for script in ${lib.concatStringsSep " " scripts}; do cp "${dir}/$script" "$out/bin/" done @@ -267,7 +265,7 @@ let let - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); + runtimePath = lib.concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); in stdenv.mkDerivation ( diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/by-name/fa/faust2alqt/package.nix similarity index 82% rename from pkgs/applications/audio/faust/faust2alqt.nix rename to pkgs/by-name/fa/faust2alqt/package.nix index 66d394e9d740..9f15d92840c5 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/pkgs/by-name/fa/faust2alqt/package.nix @@ -1,7 +1,7 @@ { faust, alsa-lib, - qtbase, + qt5, writeText, buildPackages, }: @@ -14,7 +14,7 @@ let cd -- "$(dirname "$p")" binary=$(basename --suffix=.dsp "$p") rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' cd $workpath done @@ -26,7 +26,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ alsa-lib - qtbase + qt5.qtbase ]; dontWrapQtApps = true; @@ -36,7 +36,7 @@ faust.wrapWithBuildEnv { # append the wrapping code to the compilation script cat ${wrapBinary} >> $script # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script done ''; } diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/by-name/fa/faust2alsa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2alsa.nix rename to pkgs/by-name/fa/faust2alsa/package.nix diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/pkgs/by-name/fa/faust2csound/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2csound.nix rename to pkgs/by-name/fa/faust2csound/package.nix diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/by-name/fa/faust2firefox/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2firefox.nix rename to pkgs/by-name/fa/faust2firefox/package.nix diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/by-name/fa/faust2jack/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jack.nix rename to pkgs/by-name/fa/faust2jack/package.nix diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/by-name/fa/faust2jackrust/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jackrust.nix rename to pkgs/by-name/fa/faust2jackrust/package.nix diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/by-name/fa/faust2jaqt/package.nix similarity index 85% rename from pkgs/applications/audio/faust/faust2jaqt.nix rename to pkgs/by-name/fa/faust2jaqt/package.nix index 5429d1bfb45a..cfdfe66cc2fa 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/by-name/fa/faust2jaqt/package.nix @@ -2,7 +2,7 @@ bash, faust, jack2, - qtbase, + qt5, libsndfile, alsa-lib, writeText, @@ -18,7 +18,7 @@ let cd -- "$(dirname "$p")" binary=$(basename --suffix=.dsp "$p") rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' cd $workpath done @@ -39,7 +39,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2 - qtbase + qt5.qtbase libsndfile alsa-lib which @@ -52,7 +52,7 @@ faust.wrapWithBuildEnv { # append the wrapping code to the compilation script cat ${wrapBinary} >> $script # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script done ''; } diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/by-name/fa/faust2ladspa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2ladspa.nix rename to pkgs/by-name/fa/faust2ladspa/package.nix diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/by-name/fa/faust2lv2/package.nix similarity index 68% rename from pkgs/applications/audio/faust/faust2lv2.nix rename to pkgs/by-name/fa/faust2lv2/package.nix index 4a310440ad8a..964412540822 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/by-name/fa/faust2lv2/package.nix @@ -3,7 +3,7 @@ boost, faust, lv2, - qtbase, + qt5, }: faust.wrapWithBuildEnv { @@ -17,12 +17,12 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ boost lv2 - qtbase + qt5.qtbase ]; dontWrapQtApps = true; preFixup = '' - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; ''; } diff --git a/pkgs/applications/audio/faust/faust2sc.nix b/pkgs/by-name/fa/faust2sc/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2sc.nix rename to pkgs/by-name/fa/faust2sc/package.nix diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/by-name/fa/faustlive/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faustlive.nix rename to pkgs/by-name/fa/faustlive/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3614d0bc6f72..9c07ff914deb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16204,31 +16204,7 @@ with pkgs; # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - faust = res.faust2; - - faust2 = callPackage ../applications/audio/faust/faust2.nix { }; - - faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { }; - - faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { }; - - faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { }; - - faust2sc = callPackage ../applications/audio/faust/faust2sc.nix { }; - - faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { }; - - faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; - - faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { }; - - faust2jaqt = libsForQt5.callPackage ../applications/audio/faust/faust2jaqt.nix { }; - - faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; - - faust2lv2 = libsForQt5.callPackage ../applications/audio/faust/faust2lv2.nix { }; - - faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; + faust = faust2; flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };