various: migrate applications/audio to by-name/ part 2

pkgs/applications/audio/carla/default.nix → pkgs/by-name/ca/carla/package.nix

@@ -11,17 +11,16 @@
   libsndfile,
   pkg-config,
   python3Packages,
+  libsForQt5,
   which,
   gtk3 ? null,
-  qtbase ? null,
   withFrontend ? true,
   withGtk3 ? true,
   withQt ? true,
-  wrapQtAppsHook ? null,
 }:
 
-assert withQt -> qtbase != null;
-assert withQt -> wrapQtAppsHook != null;
+assert withQt -> libsForQt5.qtbase != null;
+assert withQt -> libsForQt5.wrapQtAppsHook != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "carla";
@@ -30,15 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "falkTX";
     repo = "carla";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-21QaFCIjGjRTcJtf2nwC5RcVJF8JgcFPIbS8apvf9tw=";
   };
 
   nativeBuildInputs = [
     python3Packages.wrapPython
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   pythonPath =
@@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libsndfile
   ]
-  ++ lib.optional withQt qtbase
+  ++ lib.optional withQt libsForQt5.qtbase
   ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
@@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kx.studio/Applications:Carla";
     description = "Audio plugin host";
     longDescription = ''
@@ -108,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
       It uses JACK as the default and preferred audio driver but also
       supports native drivers like ALSA, DirectSound or CoreAudio.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.minijackson ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ minijackson ];
+    platforms = lib.platforms.linux;
   };
 })

pkgs/applications/audio/deadbeef/default.nix → pkgs/by-name/de/deadbeef/package.nix

@@ -62,18 +62,16 @@
 
 let
   inherit (lib) optionals;
-
-  version = "1.10.0";
 in
-clangStdenv.mkDerivation {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "deadbeef";
-  inherit version;
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
@@ -155,16 +153,16 @@ clangStdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ultimate Music Player for GNU/Linux";
     mainProgram = "deadbeef";
     homepage = "http://deadbeef.sourceforge.net/";
     downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
     maintainers = [ ];
   };
-}
+})

pkgs/applications/audio/dfasma/default.nix → pkgs/by-name/df/dfasma/package.nix

@@ -1,12 +1,10 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fftw,
   libsndfile,
-  qtbase,
-  qtmultimedia,
-  qmake,
+  libsForQt5,
 }:
 
 let
@@ -36,33 +34,36 @@ let
   };
 
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
 
   buildInputs = [
     fftw
     libsndfile
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postPatch = ''
     cp -Rv "${reaperFork.src}"/* external/REAPER
     cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
     substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Analyse and compare audio files in time and frequency";
     mainProgram = "dfasma";
     longDescription = ''
@@ -75,9 +76,9 @@ mkDerivation rec {
     '';
     homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
     license = [
-      licenses.gpl3Plus
+      lib.licenses.gpl3Plus
       reaperFork.meta.license
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/audio/greg/default.nix → pkgs/by-name/gr/greg/package.nix

@@ -1,34 +1,33 @@
 {
   lib,
   fetchFromGitHub,
-  pythonPackages,
+  python3Packages,
 }:
 
-with pythonPackages;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "greg";
   version = "0.4.8";
   format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = !python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "manolomartinez";
     repo = "greg";
     tag = "v${version}";
-    sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
+    hash = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
   };
 
   propagatedBuildInputs = [
-    setuptools
-    feedparser
+    python3Packages.setuptools
+    python3Packages.feedparser
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/manolomartinez/greg";
     description = "Command-line podcast aggregator";
     mainProgram = "greg";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
   };
 }

pkgs/applications/audio/hqplayer-desktop/default.nix → pkgs/by-name/hq/hqplayer-desktop/package.nix

@@ -12,13 +12,8 @@
   libusb-compat-0_1,
   llvmPackages,
   mpfr,
-  qtcharts,
-  qtdeclarative,
-  qtwayland,
-  qtwebengine,
-  qtwebview,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 let
@@ -44,7 +39,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     dpkg
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -56,11 +51,11 @@ stdenv.mkDerivation {
     libusb-compat-0_1
     llvmPackages.openmp
     mpfr
-    qtcharts
-    qtdeclarative
-    qtwayland
-    qtwebengine
-    qtwebview
+    kdePackages.qtcharts
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
+    kdePackages.qtwebview
     wavpack
   ];
 
@@ -111,12 +106,12 @@ stdenv.mkDerivation {
     patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.signalyst.com";
     description = "High-end upsampling multichannel software HD-audio player";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ lovesegfault ];
+    maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }

pkgs/applications/audio/iannix/default.nix → pkgs/by-name/ia/iannix/package.nix

@@ -1,15 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   alsa-lib,
   pkg-config,
-  qtbase,
-  qtscript,
-  qmake,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "iannix";
   version = "unstable-2020-12-09";
 
@@ -22,24 +20,25 @@ mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical open-source sequencer";
     mainProgram = "iannix";
     homepage = "https://www.iannix.org/";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }

pkgs/applications/audio/jack-autoconnect/default.nix → pkgs/by-name/ja/jack-autoconnect/package.nix

@@ -1,13 +1,12 @@
 {
+  stdenv,
   lib,
-  mkDerivation,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qtbase,
   libjack2,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation {
   pname = "jack_autoconnect";
 
   # It does not have any versions (yet?)
@@ -17,29 +16,31 @@ mkDerivation {
     owner = "kripton";
     repo = "jack_autoconnect";
     rev = "fe0c8f69149e30979e067646f80b9d326341c02b";
-    sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
+    hash = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
   };
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libjack2
   ];
+
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   installPhase = ''
     mkdir -p -- "$out/bin"
     cp -- jack_autoconnect "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kripton/jack_autoconnect";
     description = "Tiny application that reacts on port registrations by clients and connects them";
     mainProgram = "jack_autoconnect";
-    maintainers = with maintainers; [ unclechu ];
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ unclechu ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
   };
 }