{faust2,faustlive,faust2*}: move to pkgs/by-name

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 (

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
   '';
 }

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
   '';
 }

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;
   '';
 }

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 { };