diff options
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/MMA/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/aeolus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/deadbeef/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/deadbeef/fix-wildmidi.patch | 19 | ||||
-rw-r--r-- | pkgs/applications/audio/ft2-clone/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/lollypop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/lsp-plugins/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/audio/ncspot/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/audio/picard/default.nix | 33 | ||||
-rw-r--r-- | pkgs/applications/audio/pt2-clone/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/samplv1/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/spotify-tui/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/synthv1/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/traverso/default.nix | 4 |
14 files changed, 59 insertions, 53 deletions
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 4304fe59bdfe..8b7629bc908b 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -61,7 +61,7 @@ meta = { description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; - homepage = http://www.mellowood.ca/mma/index.html; + homepage = "https://www.mellowood.ca/mma/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index ee9932a7aa3b..bfd75b4e75cf 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k"; + sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; }; buildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Synthetized (not sampled) pipe organ emulator"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 2df6b9931cfc..4c2323fbe8a5 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -59,13 +59,13 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj"; + sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig"; }; buildInputs = with stdenv.lib; [ jansson ] @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ultimate Music Player for GNU/Linux"; - homepage = http://deadbeef.sourceforge.net/; + homepage = "http://deadbeef.sourceforge.net/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch b/pkgs/applications/audio/deadbeef/fix-wildmidi.patch deleted file mode 100644 index c37308459bb7..000000000000 --- a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/plugins/wildmidi/src/wildmidi_lib.c -+++ b/plugins/wildmidi/src/wildmidi_lib.c -@@ -394,11 +394,11 @@ free_gauss (void) { - } - } - --unsigned long int delay_size[4][2]; --signed long int a[5][2]; --signed long int b[5][2]; --signed long int gain_in[4]; --signed long int gain_out[4]; -+static unsigned long int delay_size[4][2]; -+static signed long int a[5][2]; -+static signed long int b[5][2]; -+static signed long int gain_in[4]; -+static signed long int gain_out[4]; - - void init_lowpass (void) { - float c = 0; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5bebf1c667c3..e80239553f1b 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.09"; + version = "1.15"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "18my7fywaf66rq8phsly8lglxzpglran8rj27fvwgpni8098ic7d"; + sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ddb4646ba54d..d0f88170980a 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.23"; + version = "1.2.32"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47"; + sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index b146fcecc8ec..8a2f64b4efd4 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.13"; + version = "1.1.15"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al"; + sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik"; }; nativeBuildInputs = [ pkgconfig php makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" + "ETC_PATH=$(out)/etc" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 0d8fd8e26378..4e7b1235b401 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -2,13 +2,15 @@ , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null +, withMPRIS ? false, dbus ? null }: let features = [ "cursive/pancurses-backend" ] ++ lib.optional withALSA "alsa_backend" ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend"; + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMPRIS "mpris"; in rustPlatform.buildRustPackage rec { pname = "ncspot"; @@ -30,7 +32,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio; + ++ lib.optional withPortAudio portaudio + ++ lib.optional withMPRIS dbus; doCheck = false; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b241f750d036..5830e1eefb88 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,15 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +, enablePlayback ? true +, gst_all_1 +}: let pythonPackages = python3Packages; + pyqt5 = if enablePlayback then + pythonPackages.pyqt5_with_qtmultimedia + else + pythonPackages.pyqt5 + ; in pythonPackages.buildPythonApplication rec { pname = "picard"; version = "2.3.1"; @@ -13,7 +21,16 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; }; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] + ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gstreamer + gst_all_1.gst-vaapi + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ] + ; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -27,10 +44,14 @@ in pythonPackages.buildPythonApplication rec { substituteInPlace setup.cfg --replace "‘" "'" ''; - installPhase = '' - python setup.py install --prefix="$out" - wrapQtApp $out/bin/picard - ''; + # In order to spare double wrapping, we use: + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + '' + + stdenv.lib.optionalString (pyqt5.multimediaEnabled) '' + makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + '' + ; meta = with stdenv.lib; { homepage = "https://picard.musicbrainz.org/"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index f659d20f463e..2f21e3ea56b6 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "00zifwiprd3i60z4pf4471jxbc33vh9p30ib0lnzwpgjz5pnxqnr"; + sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 8c8e5407f7ae..86f8f666d80d 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samplv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg"; + sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; - homepage = http://samplv1.sourceforge.net/; + homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 5837bd453101..65dfc50fe1b1 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1jx2qyshqg84l3fm682h8262da0hy68qjjg3dm2i53dxqxrm5ji9"; + sha256 = "1gsddjinxmglm05hhphclax08d9pig1f0wjjs3bbcq096fydxgfs"; }; - cargoSha256 = "12qwp59gshc9d6nz0s3w03zc8sxqri12vrav94vi54fqagiikinm"; + cargoSha256 = "1y398ypckk3gw1sfzf97xzwf5d5z3kxlcpn3bccmsfr59kvkf661"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index f58166a59846..6339dad7f378 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731"; + sha256 = "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; @@ -15,7 +15,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; - homepage = https://synthv1.sourceforge.io/; + homepage = "https://synthv1.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 9188003ce66d..504e6ae96447 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "0.49.6"; src = fetchurl { - url = "http://traverso-daw.org/traverso-0.49.6.tar.gz"; + url = "https://traverso-daw.org/traverso-0.49.6.tar.gz"; sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cross-platform multitrack audio recording and audio editing suite"; - homepage = http://traverso-daw.org/; + homepage = "https://traverso-daw.org/"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.all; maintainers = with maintainers; [ coconnor ]; |