diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
100 files changed, 1094 insertions, 460 deletions
diff --git a/nixpkgs/pkgs/applications/audio/aeolus/default.nix b/nixpkgs/pkgs/applications/audio/aeolus/default.nix index bfd75b4e75c..c4982025999 100644 --- a/nixpkgs/pkgs/applications/audio/aeolus/default.nix +++ b/nixpkgs/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; + sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/amarok/default.nix b/nixpkgs/pkgs/applications/audio/amarok/default.nix index 25fceb357cc..063cfcaa9fa 100644 --- a/nixpkgs/pkgs/applications/audio/amarok/default.nix +++ b/nixpkgs/pkgs/applications/audio/amarok/default.nix @@ -3,21 +3,21 @@ , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: mkDerivation rec { - pname = "amarok"; - version = "2.9.0-20190824"; + pname = "amarok-unstable"; + version = "2020-06-12"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out - url = "git://anongit.kde.org/amarok.git"; + url = "https://invent.kde.org/multimedia/amarok.git"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; - sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; + rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b"; + sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -26,7 +26,7 @@ mkDerivation rec { qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver - curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static pcre snappy taglib taglib_extras ]; diff --git a/nixpkgs/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix index c99545bb74f..0c38057d56f 100644 --- a/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -8,7 +8,7 @@ , curl , dbus , doxygen -, ffmpeg +, ffmpeg_3 , fftw , fftwSinglePrec , flac @@ -55,13 +55,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.0"; + version = "6.2"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "162jd96zahl05fdmjwvpdfjxbhd6ifbav6xqa0vv6rsdl4zk395q"; + sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y"; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cppunit curl dbus - ffmpeg + ffmpeg_3 fftw fftwSinglePrec flac @@ -149,8 +149,8 @@ stdenv.mkDerivation rec { sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \ + --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");' ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/nixpkgs/pkgs/applications/audio/artyFX/default.nix index 0265e0f75ec..8cf9bec2e3d 100644 --- a/nixpkgs/pkgs/applications/audio/artyFX/default.nix +++ b/nixpkgs/pkgs/applications/audio/artyFX/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "artyFX"; - version = "1.3"; + # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0 + version = "unstable-2020-04-28"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "release-${version}"; - sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; + rev = "492587461b50d140455aa3c98d915eb8673bebf0"; + sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/asunder/default.nix b/nixpkgs/pkgs/applications/audio/asunder/default.nix index 7d90ac36f36..998535a8eb0 100644 --- a/nixpkgs/pkgs/applications/audio/asunder/default.nix +++ b/nixpkgs/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.5"; + version = "2.9.6"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4"; + sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/audacious/default.nix b/nixpkgs/pkgs/applications/audio/audacious/default.nix index b06175f37f3..c441a2f9f3f 100644 --- a/nixpkgs/pkgs/applications/audio/audacious/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacious/default.nix @@ -1,39 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib -, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b -, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack -, neon, faad2, lame, libnotify, libsidplayfp +{ + mkDerivation, lib, fetchurl, fetchpatch, + gettext, pkgconfig, + qtbase, + alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, + libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, + libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, + libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, + wavpack, openmpt123 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "audacious"; - version = "3.9"; + version = "4.0.5"; src = fetchurl { - url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; + url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; + sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"; }; - pluginsSrc = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra"; + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; }; - nativeBuildInputs = [ - pkgconfig wrapGAppsHook - ]; + nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio - libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile - libmodplug libsamplerate soxr lirc curl wavpack neon faad2 - lame libnotify libsidplayfp - ]; + # Core dependencies + qtbase - configureFlags = [ "--enable-statusicon" ]; + # Plugin dependencies + alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb + libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli + libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile + libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack + openmpt123 + ]; # Here we build both audacious and audacious-plugins in one # derivations, since they really expect to be in the same prefix. @@ -44,10 +45,8 @@ stdenv.mkDerivation rec { source $stdenv/setup genericBuild ) - # Then build the plugins. ( - dontWrapGApps=true nativeBuildInputs="$out $nativeBuildInputs" # to find audacious source $stdenv/setup rm -rfv audacious-* @@ -56,12 +55,10 @@ stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { description = "Audio player"; homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ]; + maintainers = with maintainers; [ eelco ramkromberg ttuegel ]; platforms = with platforms; linux; license = with licenses; [ bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING diff --git a/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix b/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix deleted file mode 100644 index 45525571a64..00000000000 --- a/nixpkgs/pkgs/applications/audio/audacious/qt-5.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkgconfig, - qtbase, - alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, - libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, - libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, - libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack -}: - -let - version = "3.9"; - sources = { - "audacious-${version}" = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d"; - }; - - "audacious-plugins-${version}" = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb"; - }; - }; - - qt510_plugins_patch = fetchpatch { - url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch"; - sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17"; - }; -in - -mkDerivation { - inherit version; - name = "audacious-qt5-${version}"; - - sourceFiles = lib.attrValues sources; - sourceRoots = lib.attrNames sources; - - nativeBuildInputs = [ gettext pkgconfig ]; - - inherit qt510_plugins_patch; - - buildInputs = [ - # Core dependencies - qtbase - - # Plugin dependencies - alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb - libcdio libcue libjack2 libmad libmms libmodplug libmowgli - libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile - libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - ]; - - configureFlags = [ "--enable-qt" "--disable-gtk" ]; - - # Here we build both audacious and audacious-plugins in one - # derivations, since they really expect to be in the same prefix. - # This is slighly tricky. - builder = builtins.toFile "builder.sh" '' - sourceFiles=( $sourceFiles ) - sourceRoots=( $sourceRoots ) - for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do - - ( - # only patch the plugins - if [ "$i" -eq "1" ]; then - patches=( $qt510_plugins_patch ) - fi - src=''${sourceFiles[$i]} - sourceRoot=''${sourceRoots[$i]} - source $stdenv/setup - genericBuild - ) - - if [ $i == 0 ]; then - nativeBuildInputs="$out $nativeBuildInputs" - fi - - done - ''; - - meta = with lib; { - description = "Audio player"; - homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ ttuegel ]; - platforms = with platforms; linux; - license = with licenses; [ - bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING - gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 - ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index 542a1f85188..58f25d46e0b 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -1,28 +1,21 @@ -{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, +{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - autoconf, automake, libtool + expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ + pcre, vamp-plugin-sdk, portmidi, twolame, git, + cmake, libtool }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.4.2"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; + sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546"; }; - preConfigure = /* we prefer system-wide libs */ '' - autoreconf -vi # use system libraries - - # we will get a (possibly harmless) warning during configure without this - substituteInPlace configure \ - --replace /usr/bin/file ${file}/bin/file - ''; - configureFlags = [ "--with-libsamplerate" ]; @@ -43,11 +36,12 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig cmake libtool git ]; buildInputs = [ - file gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk - ffmpeg libmad lame libvorbis flac soundtouch + file gettext wxGTK31 expat alsaLib + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk + ffmpeg_3 libmad lame libvorbis flac soundtouch + pcre vamp-plugin-sdk portmidi twolame ]; #ToDo: detach sbsms enableParallelBuilding = true; @@ -59,6 +53,7 @@ stdenv.mkDerivation rec { description = "Sound editor with graphical UI"; homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM }; } diff --git a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix new file mode 100644 index 00000000000..c74c0ca4eff --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -0,0 +1,72 @@ +{ mkDerivation +, stdenv +, fetchFromGitHub +, fetchpatch +, installShellFiles +, qmake +, qtbase +, qtmultimedia +, qttools +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? stdenv.hostPlatform.isUnix +, libjack2 +}: +let + + inherit (stdenv.lib) optional optionals; + +in +mkDerivation rec { + pname = "bambootracker"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "rerrahkr"; + repo = "BambooTracker"; + rev = "v${version}"; + sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + }; + + # Fix macOS build until new release + patches = [ + (fetchpatch { + url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; + sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; + }) + ]; + + preConfigure = "cd BambooTracker"; + + nativeBuildInputs = [ qmake qttools installShellFiles ]; + + buildInputs = [ qtbase qtmultimedia ] + ++ optional alsaSupport alsaLib + ++ optional pulseSupport libpulseaudio + ++ optional jackSupport libjack2; + + qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] + ++ optional pulseSupport "CONFIG+=use_pulse" + ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; + + postInstall = '' + install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop + installManPage ../BambooTracker*.1 + + cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ + + for size in 16x16 256x256; do + install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png + done + ''; + + meta = with stdenv.lib; { + description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; + homepage = "https://github.com/rerrahkr/BambooTracker"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 910c1cfe51b..61d522f677f 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg +, libbsd, libjack2, libpng, ffmpeg_3 , libxkbcommon , makeWrapper, pixman, autoPatchelfHook , xdg_utils, zenity, zlib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils zenity ffmpeg + xdg_utils zenity ffmpeg_3 ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 59136596b0e..0ca556a16ef 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.1.3"; + version = "3.2.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "11z5flmp55ywgxyccj3pzhijhaggi42i2pvacg88kcpj0cin57vl"; + sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; diff --git a/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/nixpkgs/pkgs/applications/audio/bjumblr/default.nix index de0cae7a21a..458fe20937a 100644 --- a/nixpkgs/pkgs/applications/audio/bjumblr/default.nix +++ b/nixpkgs/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "0.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "v${version}"; - sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + rev = version; + sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix index 76a78935619..47de14ecb25 100644 --- a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix +++ b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg, sox }: +{ stdenv, fetchurl, ffmpeg_3, sox }: stdenv.mkDerivation rec { pname = "bs1770gain"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; - buildInputs = [ ffmpeg sox ]; + buildInputs = [ ffmpeg_3 sox ]; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix index bb45a846b1b..37dcada961d 100644 --- a/nixpkgs/pkgs/applications/audio/bsequencer/default.nix +++ b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.4.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "1fz0p0ba00b7k7a8q9mxwj01jwl8xwh9a2npn00pbbdrg9zv4fdr"; + sha256 = "0w21kzq695xy4i1r6xvvh7sad5m0rlmdgc7ykmrlzfsm1252dz80"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/cantata/default.nix b/nixpkgs/pkgs/applications/audio/cantata/default.nix index 799cefc7819..e5d62b15f45 100644 --- a/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -10,7 +10,7 @@ , withTaglib ? true, taglib, taglib_extras , withHttpStream ? true, qtmultimedia -, withReplaygain ? true, ffmpeg, speex, mpg123 +, withReplaygain ? true, ffmpeg_3, speex, mpg123 , withMtp ? true, libmtp , withOnlineServices ? true , withDevices ? true, udisks2 @@ -50,7 +50,7 @@ in mkDerivation { buildInputs = [ qtbase qtsvg ] ++ lib.optionals withTaglib [ taglib taglib_extras ] - ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optional withHttpStream qtmultimedia ++ lib.optional withCdda cdparanoia ++ lib.optional withCddb libcddb diff --git a/nixpkgs/pkgs/applications/audio/carla/default.nix b/nixpkgs/pkgs/applications/audio/carla/default.nix index bf297d8a83c..11050761661 100644 --- a/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, +{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "074y40yrgl3qrdr3a5vn0scsw0qv77r5p5m6gc89zhf20ic8ajzc"; + sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ optional withFrontend pyqt5; buildInputs = [ - file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile + file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile ] ++ pythonPath ++ optional withQt qtbase ++ optional withGtk2 gtk2 diff --git a/nixpkgs/pkgs/applications/audio/cava/default.nix b/nixpkgs/pkgs/applications/audio/cava/default.nix index 2bdca386bf4..26cc8cd78da 100644 --- a/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.6.1"; + version = "0.7.2"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"; + sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch deleted file mode 100644 index 226536a13ba..00000000000 --- a/nixpkgs/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 23070d9..83b6772 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" - optional_component(VISUALISATIONS ON "Visualisations") - - if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " -- "code must be compiled in") - elseif(CRYPTOPP_FOUND) - set(HAVE_CRYPTOPP ON) - set(HAVE_SPOTIFY_DOWNLOADER ON) -@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD) - endif(HAVE_BREAKPAD) - - if(HAVE_SPOTIFY_BLOB) -- add_subdirectory(ext/clementine-spotifyblob) - endif(HAVE_SPOTIFY_BLOB) - - if(HAVE_MOODBAR) diff --git a/nixpkgs/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix index 15d0f92b76a..0c1690f1462 100644 --- a/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +, qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: @@ -9,30 +10,17 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - version = "1.3.1"; + version = "1.4.0rc1"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; rev = version; - sha256 = "0i3jkfs8dbfkh47jq3cnx7pip47naqg7w66vmfszk4d8vj37j62j"; + sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2"; }; patches = [ ./clementine-spotify-blob.patch - # Required so as to avoid adding libspotify as a build dependency (as it is - # unfree and thus would prevent us from having a free package). - ./clementine-spotify-blob-remove-from-build.patch - (fetchpatch { - # Fix w/gcc7 - url = "https://github.com/clementine-player/Clementine/pull/5630.patch"; - sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4"; - }) - (fetchpatch { - # Fixes compilation with chromaprint >= 1.4 - url = "https://github.com/clementine-player/Clementine/commit/d3ea0c8482dfd3f6264a30cfceb456076d76e6cd.patch"; - sha256 = "1ifrs5aqdzw16jbnf0z1ilir20chdnr9k5n21r99miq9hzjpbh12"; - }) ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -54,6 +42,8 @@ let protobuf qca2 qjson + qtbase + qtx11extras sqlite taglib ] @@ -71,7 +61,7 @@ let -e 's,libprotobuf.a,protobuf,g' ''; - free = stdenv.mkDerivation { + free = mkDerivation { pname = "clementine-free"; inherit version; inherit src patches nativeBuildInputs postPatch; @@ -79,7 +69,14 @@ let # gst_plugins needed for setup-hooks buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; - cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; + preConfigure = '' + rm -rf ext/{,lib}clementine-spotifyblob + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_PROJECTM=ON" + "-DSPOTIFY_BLOB=OFF" + ]; enableParallelBuilding = true; @@ -100,15 +97,11 @@ let }; # Unfree Spotify blob for Clementine - unfree = stdenv.mkDerivation { + unfree = mkDerivation { pname = "clementine-blob"; inherit version; # Use the same patches and sources as Clementine - inherit src nativeBuildInputs postPatch; - - patches = [ - ./clementine-spotify-blob.patch - ]; + inherit src nativeBuildInputs patches postPatch; buildInputs = buildInputs ++ [ libspotify makeWrapper ]; # Only build and install the Spotify blob diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index 4c2323fbe8a..6b92d1263e3 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -17,7 +17,7 @@ , aacSupport ? true, faad2 ? null , opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg ? null +, ffmpegSupport ? false, ffmpeg_3 ? null , apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null @@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg != null; +assert ffmpegSupport -> ffmpeg_3 != null; assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; @@ -59,13 +59,13 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig"; + sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; buildInputs = with stdenv.lib; [ jansson ] @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional opusSupport opusfile ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg + ++ optional ffmpegSupport ffmpeg_3 ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 diff --git a/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix index fbf25384eef..272701b3680 100644 --- a/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/nixpkgs/pkgs/applications/audio/dr14_tmeter/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with pkgs; [ - python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame + python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame ]; # There are no tests diff --git a/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix index 99c07ba8f5f..b42929ff204 100644 --- a/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja"; + sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix index 454befd55f9..9e24c4a1c29 100644 --- a/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7"; }; + patches = [ + # Fix build for lv2 1.18.0 + (fetchpatch { + url = "http://cgit.drumgizmo.org/plugingizmo.git/patch/?id=be64ddf9da525cd5c6757464efc966052731ba71"; + sha256 = "17w8g78i5avssc7m8rpw64ka3rai8dff81wfzir9cpxp8s2h44qf"; + extraPrefix = "plugin/plugingizmo/"; + stripLen = 1; + }) + ]; + configureFlags = [ "--enable-lv2" ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index 04277badfbe..8c956c53fb3 100644 --- a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"; + sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/nixpkgs/pkgs/applications/audio/eq10q/default.nix b/nixpkgs/pkgs/applications/audio/eq10q/default.nix index cc3a3c9ac1f..c614b96f638 100644 --- a/nixpkgs/pkgs/applications/audio/eq10q/default.nix +++ b/nixpkgs/pkgs/applications/audio/eq10q/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fix build with lv2 1.18: https://sourceforge.net/p/eq10q/bugs/23/ + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + installFlags = [ "DESTDIR=$(out)" ]; fixupPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 33df1ce5d4e..e65414b2bca 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -20,19 +20,19 @@ with stdenv.lib.strings; let - version = "unstable-2020-03-20"; + version = "unstable-2020-06-08"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "2782088d4485f1c572755f41e7a072b41cb7148a"; - sha256 = "1l7bi2mq10s5wm8g4cdipg8gndd478x897qv0h7nqi1s2q9nq99p"; + rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28"; + sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4"; fetchSubmodules = true; }; meta = with stdenv.lib; { homepage = "http://faust.grame.fr/"; - downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; + downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix index 26478b2bb2e..370c25ecd74 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix @@ -12,7 +12,6 @@ faust.wrapWithBuildEnv { scripts = [ "faust2jack" - "faust2jackinternal" "faust2jackconsole" ]; diff --git a/nixpkgs/pkgs/applications/audio/flacon/default.nix b/nixpkgs/pkgs/applications/audio/flacon/default.nix index df563bc3840..aaa0712c42f 100644 --- a/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0p5z6rwckda0lkljrrvx6i90fazj53cxg9pasfmi8154j1z72dj2"; + sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix index 643b648fa88..4ec69c62b1a 100644 --- a/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix +++ b/nixpkgs/pkgs/applications/audio/foo-yc20/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; - meta = { + meta = with stdenv.lib; { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = "BSD"; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index c5661f3336f..60040119d64 100644 --- a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.24"; + version = "1.26"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k"; + sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/fverb/default.nix b/nixpkgs/pkgs/applications/audio/fverb/default.nix new file mode 100644 index 00000000000..28955379574 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/fverb/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "fverb"; + # no release yet: https://github.com/jpcima/fverb/issues/2 + version = "unstable-2020-06-09"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = pname; + rev = "462020e33e24c0204a375dc95e2c28654cc917b8"; + sha256 = "12nl7qn7mnykk7v8q0j2n8kfq0xc46n0i45z6qcywspadwnncmd4"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postPatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + meta = with stdenv.lib; { + description = "A stereo variant of the reverberator by Jon Dattorro, for lv2"; + homepage = "https://github.com/jpcima/fverb"; + license = licenses.bsd2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/giada/default.nix b/nixpkgs/pkgs/applications/audio/giada/default.nix index fcf4d0b8652..5934b0746d1 100644 --- a/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.2.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; + sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index d5bec0c09e5..c7df55118c7 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -20,7 +20,7 @@ }: rustPlatform.buildRustPackage rec { - version = "0.4.7"; + version = "0.4.8"; pname = "gnome-podcasts"; src = fetchFromGitLab { @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage rec { owner = "World"; repo = "podcasts"; rev = version; - sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; + sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; }; - cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; + cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q"; nativeBuildInputs = [ meson diff --git a/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 933c9ac0203..4a21868f097 100644 --- a/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.15"; + version = "3.10.16"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; + sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index f94d27565e9..d74f1c8728f 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,8 +1,38 @@ -{ stdenv, fetchurl, fetchpatch, faust, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib-networking -, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 -, ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom -, wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook +{ stdenv +, fetchurl +, avahi +, bluez +, boost +, curl +, eigen +, fftw +, gettext +, glib +, glib-networking +, glibmm +, gnome3 +, gsettings-desktop-schemas +, gtk3 +, gtkmm3 +, hicolor-icon-theme +, intltool +, ladspaH +, libav +, libjack2 +, libsndfile +, lilv +, lrdf +, lv2 +, pkgconfig +, python2 +, sassc +, serd +, sord +, sratom +, wafHook +, wrapGAppsHook +, zita-convolver +, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -12,43 +42,62 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.39.0"; + version = "0.41.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1nn80m1qagfhvv69za60f0w6ck87vmk77qmqarj7fbr8avwg63s9"; + sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0"; }; - patches = [ - (fetchpatch { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/guitarix-0.39.0-fix_faust_and_lv2_plugins.patch?id=8579b4dfe85e04303ad2d9771ed699f04ea7b7cf"; - stripLen = 1; - sha256 = "0pgkhi4v4vrzjnig0ggmz207q4x5iyk2n6rjj8s5lv15fia7qzp4"; - }) + nativeBuildInputs = [ + gettext + hicolor-icon-theme + intltool + pkgconfig + python2 + wafHook + wrapGAppsHook ]; - nativeBuildInputs = [ faust gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; - buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib-networking.out - gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav - libsndfile lilv lrdf lv2 serd sord sratom zita-convolver - zita-resampler curl + avahi + bluez + boost + curl + eigen + fftw + glib + glib-networking.out + glibmm + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gtk3 + gtkmm3 + ladspaH + libav + libjack2 + libsndfile + lilv + lrdf + lv2 + sassc + serd + sord + sratom + zita-convolver + zita-resampler ]; - postPatch = '' - # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 - find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ - -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; - ''; - + # this doesnt build, probably because we have the wrong faust version: + # "--faust" + # aproved versions are 2.20.2 and 2.15.11 wafConfigureFlags = [ + "--no-faust" + "--no-font-cache-update" "--shared-lib" "--no-desktop-update" "--enable-nls" "--install-roboto-font" - "--includeresampler" - "--convolver-ffmpeg" ] ++ optional optimizationSupport "--optimization"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix index 077bb407020..fa80611fc28 100644 --- a/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "0jqdqnkg7pg9plcbxy49p7gcs1aj6h0xf7y9gndmjmkw5yjn2940"; + sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/industrializer/default.nix b/nixpkgs/pkgs/applications/audio/industrializer/default.nix new file mode 100644 index 00000000000..593458506d8 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/industrializer/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, autoconf +, automake +, gnome2 +, gtk2 +, libjack2 +, libtool +, libxml2 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "industrializer"; + version = "0.2.6"; + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2"; + sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + alsaLib + audiofile + autoconf + automake + gnome2.gtkglext + gtk2 + libjack2 + libtool + libxml2 + ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "This program generates synthesized percussion sounds using physical modelling"; + longDescription = '' + The range of sounds possible include but is not limited to cymbal sounds, metallic noises, bubbly sounds, and chimes. + After a sound is rendered, it can be played and then saved to a .WAV file. + ''; + homepage = "https://sourceforge.net/projects/industrializer/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix index 2cfe77ec291..9ba835eb7ea 100644 --- a/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1r72agk5nxf5k0mghcc2j90z43j5d9i7rqjmf49jfyqnd443isip"; }; + patches = [ + (fetchpatch { + url = "https://github.com/ssj71/infamousPlugins/commit/06dd967b4736ea886dc1dc07f882cb1563961582.patch"; + sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; + }) + ]; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; diff --git a/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix index f9f58ab5ec1..aa5eeae0a46 100644 --- a/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/ir.lv2/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + + postBuild = "make convert4chan"; installPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/jackmix/default.nix b/nixpkgs/pkgs/applications/audio/jackmix/default.nix index c3a46439ba7..ad01a3ff76e 100644 --- a/nixpkgs/pkgs/applications/audio/jackmix/default.nix +++ b/nixpkgs/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: +{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2 }: stdenv.mkDerivation { name = "jackmix-0.5.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { patches = [ ./no_error.patch ]; - nativeBuildInputs = [ scons.py2 pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ]; buildInputs = [ qt4 lash diff --git a/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/nixpkgs/pkgs/applications/audio/jamulus/default.nix index 835e786353c..b8763f07b45 100644 --- a/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.5"; + version = "3.5.9"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "04h0nwlj71qbp7h4yn8djqchrf47jk8rab9zp9bh9pnkcyv60h27"; + sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix index e4df8593ced..589354cf234 100644 --- a/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg phonon automoc4 + [ pkgconfig cmake python ffmpeg_3 phonon automoc4 chromaprint docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac libogg libvorbis zlib readline qtbase qttools qtmultimedia qtquickcontrols ]; diff --git a/nixpkgs/pkgs/applications/audio/librespot/default.nix b/nixpkgs/pkgs/applications/audio/librespot/default.nix new file mode 100644 index 00000000000..468cf57cdcf --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +, withRodio ? true +, withALSA ? true, alsaLib ? null +, withPulseAudio ? false, libpulseaudio ? null +, withPortAudio ? false, portaudio ? null +}: + +rustPlatform.buildRustPackage rec { + pname = "librespot"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "librespot-org"; + repo = "librespot"; + rev = "v${version}"; + sha256 = "1sdbjv8w2mfpv82rx5iy4s532l1767vmlrg9d8khnvh8vrm2lshy"; + }; + + cargoSha256 = "0zi50imjvalwl6pxl35qrmbg74j5xdfaws8v69am4g9agbfjvlms"; + + cargoBuildFlags = with stdenv.lib; [ + "--no-default-features" + "--features" + (concatStringsSep "," (filter (x: x != "") [ + (optionalString withRodio "rodio-backend") + (optionalString withALSA "alsa-backend") + (optionalString withPulseAudio "pulseaudio-backend") + (optionalString withPortAudio "portaudio-backend") + + ])) + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional withALSA alsaLib + ++ stdenv.lib.optional withPulseAudio libpulseaudio + ++ stdenv.lib.optional withPortAudio portaudio; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Open Source Spotify client library and playback daemon"; + homepage = "https://github.com/librespot-org/librespot"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/lmms/default.nix b/nixpkgs/pkgs/applications/audio/lmms/default.nix index c243e9beb23..b01c4055e40 100644 --- a/nixpkgs/pkgs/applications/audio/lmms/default.nix +++ b/nixpkgs/pkgs/applications/audio/lmms/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "lmms"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26"; + sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index e4b8b906fa6..f325185920d 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,6 @@ { lib , fetchgit +, nix-update-script , meson , ninja , pkgconfig @@ -23,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.35"; + version = "1.3.2"; format = "other"; doCheck = false; @@ -32,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "19nw9qh17yyi9ih1nwngbbwjx1vr26haqhmzsdqf0yjgsgf9vldx"; + sha256 = "14854j1dhq67s1vzs0lqy345vbl6f5w8nb36n4i33fmpva2flsk3"; }; nativeBuildInputs = [ @@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index ae3deccf863..fadc7e8f184 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,29 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.19"; + version = "1.1.24"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; + sha256 = "0rzgzkg6wvhjcf664i16nz4v30drgv80s34bhdflcjzx2x7ix5zk"; }; - patches = [ - # Fix build - # https://github.com/sadko4u/lsp-plugins/issues/104 - (fetchpatch { - url = "https://github.com/sadko4u/lsp-plugins/commit/4d901135fb82fa95e668b4d55d05e405f5e620d2.patch"; - excludes = [ "TODO.txt" ]; - sha256 = "1s028gqvahvwm1px4xxxawrw2zrwyszb1aq93f0kspf3g7lq27f1"; - }) - ]; - nativeBuildInputs = [ pkgconfig php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; diff --git a/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix new file mode 100644 index 00000000000..c97c7cf1a23 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix @@ -0,0 +1,70 @@ +{ cmake +, fetchFromGitLab +, lib +, libnotify +, mkDerivation +, pkgconfig +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtquickcontrols2 +, qttools +, qtwebengine +}: + +mkDerivation rec { + pname = "MellowPlayer"; + version = "3.6.4"; + + src = fetchFromGitLab { + owner = "ColinDuquesnoy"; + repo = "MellowPlayer"; + rev = version; + sha256 = "1ss7s3kal4vzhz7ld0yy2kvp1rk2w3i6fya0z3xd7nff9p31gqvw"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + libnotify + qtbase + qtdeclarative + qtgraphicaleffects + qtquickcontrols2 + qttools + qtwebengine + ]; + + doCheck = true; + + cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + + preCheck = '' + # Running the tests requires a location at the home directory for logging. + export HOME="$NIX_BUILD_TOP/home" + mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs" + + # Without this, the tests fail because they cannot create the QT Window + export QT_QPA_PLATFORM=offscreen + '' + # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this? + + (builtins.concatStringsSep "\n" (lib.lists.flatten (builtins.map + (pkg: [ + (lib.optionalString (pkg ? qtPluginPrefix) '' + export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH + '') + + (lib.optionalString (pkg ? qtQmlPrefix) '' + export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH + '') + ]) buildInputs))); + + meta = with lib; { + inherit (qtbase.meta) platforms; + + description = "Cloud music integration for your desktop."; + homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer"; + license = licenses.gpl2; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix index f889d9e1e8d..576dd4d97b3 100644 --- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -3,7 +3,7 @@ , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile , pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg -, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk +, qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk }: let @@ -19,16 +19,16 @@ let in mkDerivation rec { pname = "mixxx"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; + sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; }; - nativeBuildInputs = [ scons.py2 ]; + nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg @@ -52,7 +52,7 @@ mkDerivation rec { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; + maintainers = [ maintainers.goibhniu maintainers.bfortz ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/moc/default.nix b/nixpkgs/pkgs/applications/audio/moc/default.nix index 18b5a980633..9f68f8bb8e8 100644 --- a/nixpkgs/pkgs/applications/audio/moc/default.nix +++ b/nixpkgs/pkgs/applications/audio/moc/default.nix @@ -14,7 +14,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_3 , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex - ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg + ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 ++ opt sndfileSupport libsndfile ++ opt wavpackSupport wavpack diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index 58bb4d3e327..adc8eb2087e 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Lossless audio codec"; platforms = platforms.linux; + license = licenses.lgpl2; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 5cc3a957d26..796812a9bd0 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.49.0"; + version = "3.50.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0zddm7286iwx437gjz47m4g28s8gdcxnm2hmly9w1dzi08aa4fas"; + sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index ac16c182a50..a115812b86a 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.0"; + version = "3.1"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YouTube"; - sha256 = "0x1q9rfnjx65n6hi8s5rw5ff4xv55h63zy52fwm8aksdnzppr7gd"; + sha256 = "1bn3nxianbal9f81z9wf2cxi893hndvrz2zdqvh1zpxrhs0cr038"; }; patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; diff --git a/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix index 2943a31454a..74814a1b7ce 100644 --- a/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix +++ b/nixpkgs/pkgs/applications/audio/mp3blaster/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: -stdenv.mkDerivation rec { - - version = "3.2.6"; +stdenv.mkDerivation rec { pname = "mp3blaster"; + version = "3.2.6"; src = fetchFromGitHub { owner = "stragulus"; - repo = "mp3blaster"; + repo = pname; rev = "v${version}"; sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; @@ -17,14 +16,17 @@ stdenv.mkDerivation rec { libvorbis ] ++ stdenv.lib.optional stdenv.isDarwin SDL; - buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-narrowing" + ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + "-Wno-reserved-user-defined-literal" + ]); meta = with stdenv.lib; { description = "An audio player for the text console"; homepage = "http://www.mp3blaster.org/"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; - platforms = platforms.all; + platforms = with platforms; linux ++ darwin; }; - } diff --git a/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 53e66e580da..30f40e226de 100644 --- a/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.13"; + name = "mpg123-1.26.1"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h"; + sha256 = "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/nixpkgs/pkgs/applications/audio/munt/default.nix b/nixpkgs/pkgs/applications/audio/munt/default.nix index c9a1e9bea80..bf9710fb17e 100644 --- a/nixpkgs/pkgs/applications/audio/munt/default.nix +++ b/nixpkgs/pkgs/applications/audio/munt/default.nix @@ -9,14 +9,14 @@ let categories = "Audio;AudioVideo;"; }; in mkDerivation rec { - version = "2.3.0"; + version = "2.4.0"; pname = "munt"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = with stdenv.lib.versions; "${pname}_${major version}_${minor version}_${patch version}"; - sha256 = "0fjhshs4w942rlfksalalqshflbq83pyz1z0hcq53falh9v54cyw"; + rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; + sha256 = "0521i7js5imlsxj6n7181w5szfjikam0k4vq1d2ilkqgcwrkg6ln"; }; postInstall = '' @@ -31,7 +31,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; - license = licenses.gpl2; + license = with licenses; [ lgpl21 gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; }; diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index 87f86306b48..6ba29226b58 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "muse-sequencer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; rev = "muse_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq"; + sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; }; sourceRoot = "source/muse3"; diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index 063a05a72f3..0561a0179a6 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns }: @@ -26,7 +27,8 @@ mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract - qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 + qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 52fc96bb681..0c4e2c71dd9 100644 --- a/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -4,7 +4,7 @@ , boost , curl , fetchFromGitHub -, ffmpeg +, ffmpeg_3 , lame , libev , libmicrohttpd @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { alsaLib boost curl - ffmpeg + ffmpeg_3 lame libev libmicrohttpd diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix index bee1065328a..f284dd3dac1 100644 --- a/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "144a7wn5l64fhvj8vgwl7z4bp8lbq0pb0dl38x9y4wkqmdh6wrli"; + sha256 = "0b2g5bd04zh1hcrhkgd2srx9gl94da4gpy9arjcvrldschjxjza1"; }; - cargoSha256 = "19gn0v7j1ly3ywgflfj27pnrwjiiy17m3g1z0kzagxpjy2xi2qxy"; + cargoSha256 = "1gbhvmg7jfmx0b694rdr3s2zs33d4s645gw1lrxvwffif4mg8fy9"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/config.patch b/nixpkgs/pkgs/applications/audio/noisetorch/config.patch new file mode 100644 index 00000000000..f6e258862db --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/noisetorch/config.patch @@ -0,0 +1,13 @@ +diff --git a/config.go b/config.go +index de16249..fb91ec0 100644 +--- a/config.go ++++ b/config.go +@@ -20,7 +20,7 @@ const configFile = "config.toml" + + func initializeConfigIfNot() { + log.Println("Checking if config needs to be initialized") +- conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: true} ++ conf := config{Threshold: 95, DisplayMonitorSources: false, EnableUpdates: false} + configdir := configDir() + ok, err := exists(configdir) + if err != nil { diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix new file mode 100644 index 00000000000..310c0f99b10 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix @@ -0,0 +1,42 @@ +{ stdenv, buildGoModule, fetchFromGitHub, rnnoise-plugin }: + +buildGoModule rec { + pname = "NoiseTorch"; + version = "0.5.2-beta"; + + src = fetchFromGitHub { + owner = "lawl"; + repo = "NoiseTorch"; + rev = version; + sha256 = "1q0gfpqczlpybxcjjkiybcy6yc0gnrq8x27r0mpg4pvgwy7mps47"; + }; + + patches = [ ./version.patch ./config.patch ./embedlibrnnoise.patch ]; + + vendorSha256 = null; + + subPackages = [ "." ]; + + buildInputs = [ rnnoise-plugin ]; + + preBuild = '' + export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; + go generate; + rm ./scripts/* + ''; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/256x256/apps/ + cp assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/ + mkdir -p $out/share/applications/ + cp assets/noisetorch.desktop $out/share/applications/ + ''; + + meta = with stdenv.lib; { + description = "Virtual microphone device with noise supression for PulseAudio"; + homepage = "https://github.com/lawl/NoiseTorch"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ panaeon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch b/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch new file mode 100644 index 00000000000..b1782efb8b3 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go +index 43daf80..0b3004b 100644 +--- a/scripts/embedlibrnnoise.go ++++ b/scripts/embedlibrnnoise.go +@@ -8,7 +8,7 @@ import ( + ) + + func main() { +- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so") ++ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN")) + if err != nil { + fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err) + os.Exit(1) diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/version.patch b/nixpkgs/pkgs/applications/audio/noisetorch/version.patch new file mode 100644 index 00000000000..20c51863744 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/noisetorch/version.patch @@ -0,0 +1,37 @@ +diff --git a/scripts/embedversion.go b/scripts/embedversion.go +index ce0a756..60e7a5e 100644 +--- a/scripts/embedversion.go ++++ b/scripts/embedversion.go +@@ -1,24 +1,18 @@ + package main + + import ( +- "os" +- "os/exec" +- "strings" ++ "os" ++ "strings" + ) + + func main() { +- cmd := exec.Command("git", "describe", "--tags") +- ret, err := cmd.Output() + +- if err != nil { +- panic("Couldn't read git tags to embed version number") +- } +- version := strings.TrimSpace(string(ret)) ++ version := strings.TrimSpace(string(os.Getenv("version"))) + +- out, _ := os.Create("version.go") +- defer out.Close() ++ out, _ := os.Create("version.go") ++ defer out.Close() + +- out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) +- out.Write([]byte(version)) +- out.Write([]byte("\"\n")) ++ out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) ++ out.Write([]byte(version)) ++ out.Write([]byte("\"\n")) + } diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index 6fec4df060d..15d38a1eea7 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.0"; + version = "0.5.1"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0zl3djy9z7cpqk8g8pxrzmmikxsskb0y5qdabg6c683j7x5abjs3"; + sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/audio/opusfile/default.nix b/nixpkgs/pkgs/applications/audio/opusfile/default.nix index c09b3f415d8..df3bf7c215b 100644 --- a/nixpkgs/pkgs/applications/audio/opusfile/default.nix +++ b/nixpkgs/pkgs/applications/audio/opusfile/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.11"; + name = "opusfile-0.12"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl"; + sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/osmid/default.nix b/nixpkgs/pkgs/applications/audio/osmid/default.nix index 7e49b872a6a..2e31efd8172 100644 --- a/nixpkgs/pkgs/applications/audio/osmid/default.nix +++ b/nixpkgs/pkgs/applications/audio/osmid/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "osmid"; - version = "0.6.8"; + version = "0.8.0"; src = fetchFromGitHub { owner = "llloret"; repo = "osmid"; rev = "v${version}"; - sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15"; + sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 19bd6ecc0c8..9d6b7dcf7f1 100644 --- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh"; + sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/nixpkgs/pkgs/applications/audio/pamixer/default.nix index 71d85248599..3e2192c0414 100644 --- a/nixpkgs/pkgs/applications/audio/pamixer/default.nix +++ b/nixpkgs/pkgs/applications/audio/pamixer/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Pulseaudio command line mixer"; longDescription = '' Features: - - Get the current volume of the default sink, the default source or a selected one by his id + - Get the current volume of the default sink, the default source or a selected one by its id - Set the volume for the default sink, the default source or any other device - List the sinks - List the sources diff --git a/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix b/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix new file mode 100644 index 00000000000..2c0d0a24c57 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, puredata +, libGL +, libGLU +, glew +, freeglut +, libv4l +, libX11 +, file + }: + +stdenv.mkDerivation rec { + pname = "gem-unstable"; + # The patch below applies to the latest release (v0.94), but then the build + # fails. I didn't track down what changed between that version and the + # current master that fixes the build on Nix + version = "2020-03-26"; + + src = fetchFromGitHub { + owner = "umlaeute"; + repo = "Gem"; + rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599"; + sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy"; + }; + + patches = [ + # Update autoconf OpenGL/GLU/GLUT detection scripts + # https://github.com/umlaeute/Gem/pull/251 + (fetchpatch { + url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff"; + sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + file + pkg-config + ]; + + buildInputs = [ + puredata + libGL + libGLU + glew + freeglut + libv4l + libX11 + ]; + + meta = { + description = "Graphics Environment for Multimedia"; + homepage = "http://puredata.info/downloads/gem"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.raboof ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pianobar/default.nix b/nixpkgs/pkgs/applications/audio/pianobar/default.nix index 28173d34b78..4cdf415d26b 100644 --- a/nixpkgs/pkgs/applications/audio/pianobar/default.nix +++ b/nixpkgs/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }: +{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { name = "pianobar-2020.04.05"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libao json_c libgcrypt ffmpeg curl + libao json_c libgcrypt ffmpeg_3 curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/nixpkgs/pkgs/applications/audio/plexamp/default.nix new file mode 100644 index 00000000000..caa703f59ce --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchurl, appimageTools, pkgs }: + +let + pname = "plexamp"; + version = "3.1.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; + sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop + install -m 444 -D ${appimageContents}/plexamp.png \ + $out/share/icons/hicolor/512x512/apps/plexamp.png + substituteInPlace $out/share/applications/plexamp.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + homepage = "https://plexamp.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ killercup ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/projectm/default.nix b/nixpkgs/pkgs/applications/audio/projectm/default.nix index 57d27ee272c..83952c271be 100644 --- a/nixpkgs/pkgs/applications/audio/projectm/default.nix +++ b/nixpkgs/pkgs/applications/audio/projectm/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "projectm"; - version = "3.1.3"; + version = "3.1.7"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectM"; rev = "v${version}"; - sha256 = "1mjnahr694phksmvc069y89rv85s4l2z9fixkc3l1f5qj2vgn4sy"; + sha256 = "1wm5fym6c1yb972pmil7j9axinqqwrj68cwd2sc7ky8c5z2fsdna"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index c5004634256..b76be35da29 100644 --- a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -1,24 +1,29 @@ { stdenv , fetchFromGitHub , cmake +, nixosTests , alsaLib , SDL2 }: stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.16"; + version = "1.22"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0rbjphhyca71j22lbyx53w3n2mkdw7xflks2knfaziwdkqcfcvp2"; + sha256 = "1w6lbq4366bawy975glvjizk57zhvl562xhxwzn7p5hpm2bvw09b"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + passthru.tests = { + pt2-clone-opens = nixosTests.pt2-clone; + }; + meta = with stdenv.lib; { description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga"; homepage = "https://16-bits.org/pt2.php"; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 2511cf0f20a..556dd5f1061 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pulseaudio , pkgconfig -, ffmpeg_4 +, ffmpeg , patchelf , fdk_aac , libtool @@ -24,18 +24,17 @@ let in stdenv.mkDerivation rec { pname = "pulseaudio-modules-bt"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; rev = "v${version}"; - sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn"; + sha256 = "0bzg6x405j39axnkvc6n6vkl1hv1frk94y1i9sl170081bk23asd"; }; patches = [ ./fix-install-path.patch - ./fix-aac-defaults.patch ]; nativeBuildInputs = [ @@ -46,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pulseaudio - ffmpeg_4 + ffmpeg fdk_aac libtool ldacbt @@ -63,13 +62,17 @@ in stdenv.mkDerivation rec { # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} + + # Fraunhofer recommends to enable afterburner but upstream has it set to false by default + substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ + --replace "info->aac_afterburner = false;" "info->aac_afterburner = true;" ''; postFixup = '' for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch deleted file mode 100644 index c94c5dd61f2..00000000000 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-aac-defaults.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/modules/bluetooth/a2dp/a2dp_aac.c b/src/modules/bluetooth/a2dp/a2dp_aac.c -index 394a7a0..cf5abaf 100644 ---- a/src/modules/bluetooth/a2dp/a2dp_aac.c -+++ b/src/modules/bluetooth/a2dp/a2dp_aac.c -@@ -90,8 +90,8 @@ pa_aac_encoder_init(pa_a2dp_source_read_cb_t read_cb, pa_a2dp_source_read_buf_fr - info->read_pcm = read_cb; - info->read_buf_free = free_cb; - info->aacenc_handle_opened = false; -- info->aac_enc_bitrate_mode = 5; -- info->aac_afterburner = false; -+ info->aac_enc_bitrate_mode = 0; -+ info->aac_afterburner = true; - info->force_pa_fmt = PA_SAMPLE_INVALID; - return true; - } diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index eaedcb426b8..12ab8ce2e06 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1yga25da5bpg12zkikp6dn4wqhn9f7r10awvjzfcz8s6w9xlz6rx"; + sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 509c95ad545..84ff9f787d5 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -4,7 +4,7 @@ , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi # output plugins , alsaLib, libpulseaudio # effect plugins @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.4.0"; + name = "qmmp-1.4.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "13rhnk55d44svksl13w23w2qkfpkq4mc0jy5mi89nzqkzshwvfd8"; + sha256 = "0p18r2ri75vbyjzfa7bcl1dm372m6jvn9zj2p5ia2rh1g77fbm9a"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -44,7 +44,7 @@ mkDerivation rec { curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi # output plugins alsaLib libpulseaudio # effect plugins diff --git a/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/nixpkgs/pkgs/applications/audio/r128gain/default.nix index fb2b3063276..17f6840d4e2 100644 --- a/nixpkgs/pkgs/applications/audio/r128gain/default.nix +++ b/nixpkgs/pkgs/applications/audio/r128gain/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , python3Packages , sox }: @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix new file mode 100644 index 00000000000..5193d2899d3 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, perlPackages, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "realTimeConfigQuickScan"; + version = "unstable-2020-07-23"; + + src = fetchFromGitHub { + owner = "raboof"; + repo = pname; + rev = "4697ba093d43d512b74a73b89531cb8c5adaa274"; + sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5"; + }; + + buildInputs = [ perlPackages.perl makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/$pname + mkdir -p $out/share/doc/$pname + # Install Script Files: + # *.pm files + for i in *.pm; do + install -Dm 755 "$i" "$out/share/$pname/$i" + done + # Install doc files: + install -D COPYING "$out/share/doc/$pname/COPYING" + install -D README.md "$out/share/doc/$pname/README.md" + # Install Executable scripts: + install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan" + install -Dm 755 QuickScan.pl "$out/bin/QuickScan" + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/realTimeConfigQuickScan \ + --set PERL5LIB "$out/share/$pname" + wrapProgram $out/bin/QuickScan \ + --set PERL5LIB "$out/share/$pname:${with perlPackages; makePerlPath [ Tk ]}" + ''; + + meta = with stdenv.lib; { + description = "Linux configuration checker for systems to be used for real-time audio"; + homepage = "https://github.com/raboof/realtimeconfigquickscan"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux ; + }; +} + diff --git a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix index 7a0a8a59a08..a29fcf383b8 100644 --- a/nixpkgs/pkgs/applications/audio/rhvoice/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhvoice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, fetchFromGitHub, scons +{ stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages , python, glibmm, libpulseaudio, libao }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - scons.py2 pkgconfig + sconsPackages.scons_3_1_2 pkgconfig ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix index 921c8fff67a..8bda179df14 100644 --- a/nixpkgs/pkgs/applications/audio/rosegarden/default.nix +++ b/nixpkgs/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }: stdenv.mkDerivation (rec { - version = "19.12"; + version = "20.06"; pname = "rosegarden"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1"; + sha256 = "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/rubyripper/default.nix b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix index 82aa86f795b..eb6de843180 100644 --- a/nixpkgs/pkgs/applications/audio/rubyripper/default.nix +++ b/nixpkgs/pkgs/applications/audio/rubyripper/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { --prefix PATH : "${cdparanoia}/bin" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "High quality CD audio ripper"; + platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/applications/audio/shortwave/default.nix b/nixpkgs/pkgs/applications/audio/shortwave/default.nix index d26d314cd3e..055694fb40f 100644 --- a/nixpkgs/pkgs/applications/audio/shortwave/default.nix +++ b/nixpkgs/pkgs/applications/audio/shortwave/default.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "shortwave"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "13lhlh75vw02vkcknl4nvy0yvpdf0qx811mmyja8bzs4rj1j9kr8"; + sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld"; }; - cargoSha256 = "0aph5z54a6i5p8ga5ghhx1c9hjc8zdw5pkv9inmanca0bq3hkdlh"; + cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk"; nativeBuildInputs = [ cargo diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index b0a50bbf128..2ebf56fee52 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -1,18 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, libsidplayfp }: +{ stdenv +, lib +, fetchurl +, pkgconfig +, libsidplayfp +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio +}: +assert alsaSupport -> alsaLib != null; +assert pulseSupport -> libpulseaudio != null; +let + inherit (lib) optional; + inherit (lib.versions) majorMinor; +in stdenv.mkDerivation rec { - version = "1.4.4"; pname = "sidplayfp"; + version = "2.0.2"; src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${pname}-${version}.tar.gz"; - sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m"; + url = "mirror://sourceforge/sidplay-residfp/sidplayfp/${majorMinor version}/${pname}-${version}.tar.gz"; + sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional alsaSupport alsaLib + ++ optional pulseSupport libpulseaudio; + buildInputs = [ libsidplayfp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A SID player using libsidplayfp"; homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; diff --git a/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 531a633f05d..5eff8f82e89 100644 --- a/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, asio, avahi, flac, libogg, libvorbis }: +, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr +, nixosTests }: let @@ -33,21 +34,21 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.15.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2"; + sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ alsaLib asio avahi flac libogg libvorbis - aixlog popl + aixlog popl soxr ]; # Upstream systemd unit files are pretty awful, so we provide our own in a @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { cp -r ../doc/* ../*.md $out/share/doc/snapcast ''; + passthru.tests.snapcast = nixosTests.snapcast; + meta = with lib; { description = "Synchronous multi-room audio player"; homepage = "https://github.com/badaix/snapcast"; diff --git a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 534ea135880..d80632a08f5 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fftwSinglePrec , ruby -, libffi , aubio , cmake , pkgconfig @@ -12,7 +11,6 @@ , bash , jack2Full , supercollider -, qscintilla , qwt , osmid }: @@ -24,14 +22,14 @@ let in mkDerivation rec { - version = "3.1.0"; + version = "3.2.2"; pname = "sonic-pi"; src = fetchFromGitHub { owner = "samaaron"; repo = "sonic-pi"; rev = "v${version}"; - sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9"; + sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm"; }; buildInputs = [ @@ -39,10 +37,8 @@ mkDerivation rec { cmake pkgconfig qtbase - qscintilla qwt ruby - libffi aubio supercollider_single_prec boost @@ -71,23 +67,34 @@ mkDerivation rec { popd pushd app/gui/qt - cp -f ruby_help.tmpl ruby_help.h - ../../server/ruby/bin/qt-doc.rb -o ruby_help.h + cp -f utils/ruby_help.tmpl utils/ruby_help.h + ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h - substituteInPlace SonicPi.pro \ - --replace "LIBS += -lrt -lqt5scintilla2" \ - "LIBS += -lrt -lqscintilla2 -lqwt" + lrelease lang/*.ts - lrelease SonicPi.pro - qmake SonicPi.pro - - make + mkdir build + pushd build + cmake -G "Unix Makefiles" .. + make + popd popd ''; installPhase = '' runHook preInstall - cp -r . $out + + mkdir $out + cp -r {bin,etc} $out/ + + # Copy server whole. + mkdir -p $out/app + cp -r app/server $out/app/ + + # Copy only necessary files for the gui app. + mkdir -p $out/app/gui/qt/build + cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/ + cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi + runHook postInstall ''; @@ -103,9 +110,7 @@ mkDerivation rec { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; + maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ]; platforms = lib.platforms.linux; - # sonic-pi depends on ruby 2.4 which we don't support anymore - broken = true; }; } diff --git a/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix index e7a43ad8a59..f1c76bf0d33 100644 --- a/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix +++ b/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "unstable-2019-09-30"; + version = "1.7.4"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "4d1da14176e16b0f56b727bb1e6c2e8957515625"; - sha256 = "1gsgqa7hdymzw2al1ymzv0f33y161dyhh3fmy88lpjwv3bfchamg"; + rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; }; autoreconfPhase = '' @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { fftw ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/audio/sorcer/default.nix b/nixpkgs/pkgs/applications/audio/sorcer/default.nix index 7601f942868..ad5f8fda1a9 100644 --- a/nixpkgs/pkgs/applications/audio/sorcer/default.nix +++ b/nixpkgs/pkgs/applications/audio/sorcer/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + installPhase = '' make install cp -a ../presets/* "$out/lib/lv2" diff --git a/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix index dcad0cec1e8..89653a59f43 100644 --- a/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix +++ b/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix @@ -5,7 +5,7 @@ let pname = "sound-juicer"; version = "3.24.0"; -in stdenv.mkDerivation rec{ +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/audio/soundtracker/default.nix b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix index ce73203c959..1fd341765b0 100644 --- a/nixpkgs/pkgs/applications/audio/soundtracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix @@ -6,18 +6,21 @@ , alsaLib , SDL , jack2 +, audiofile , goocanvas # graphical envelope editing }: stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.0.1"; + version = "1.0.1"; src = fetchurl { # Past releases get moved to the "old releases" directory. - # Only the latest release (currently a prerelease) is at the top level. - url = "mirror://sourceforge/soundtracker/old%20releases/soundtracker-${version}.tar.bz2"; - sha256 = "1ggliswz5ngmlnrnyhv3x1arh5w77an0ww9p53cddp9aas5q11jm"; + # Only the latest release is at the top level. + # Nonetheless, only the name of the file seems to affect which file is + # downloaded, so this path should be fine both for old and current releases. + url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2"; + sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks"; }; nativeBuildInputs = [ @@ -28,9 +31,12 @@ stdenv.mkDerivation rec { gtk2 SDL jack2 + audiofile goocanvas ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix index 706a6956c5d..9c18665d399 100644 --- a/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix +++ b/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; + mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + postPatch = '' substituteInPlace meson.build \ --replace "cc.find_library('rnnoise-nu',dirs: meson.current_source_dir() + '/rnnoise/.libs/',required : true)" "cc.find_library('rnnoise-nu', required : true)" diff --git a/nixpkgs/pkgs/applications/audio/spek/default.nix b/nixpkgs/pkgs/applications/audio/spek/default.nix index 88b22c59ae5..d6918b19231 100644 --- a/nixpkgs/pkgs/applications/audio/spek/default.nix +++ b/nixpkgs/pkgs/applications/audio/spek/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "0.8.3"; + version = "unstable-2018-12-29"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; - sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; + src = fetchFromGitHub { + owner = "alexkay"; + repo = "spek"; + rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; + sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; + # needed for autoreconfHook + AUTOPOINT="intltoolize --automake --copy"; - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + + buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; homepage = "http://spek.cc/"; license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index 693de28bf47..16c8623bd7b 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1gdsk620md5nv1r05jysmfhpbcidh15wzyiklkazsb6cppm6qsiy"; + sha256 = "0pvgq8r1bb7bdxm50hxl0n7ajplpzp1gnf6j55dn6xwck0syml9y"; }; - cargoSha256 = "0irfdmik6nrpfs9yzva5q351cfyf1cijxa2a08prwdccrivdk98a"; + cargoSha256 = "07v1qm5ky99j2lwbl00g80z0f8hfrpwgyqsm8fnda6y9s3vzzdgz"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] diff --git a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index de135706ad3..c6a78f09005 100644 --- a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -2,7 +2,7 @@ , alsaLib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_3 , opusSupport ? true, opusfile , resampleSupport ? true, soxr , sslSupport ? true, openssl @@ -35,7 +35,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 - ++ optional ffmpegSupport ffmpeg + ++ optional ffmpegSupport ffmpeg_3 ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl; diff --git a/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/nixpkgs/pkgs/applications/audio/strawberry/default.nix index dce73c38670..ba3c9c4de83 100644 --- a/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.10"; + version = "0.6.13"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; + sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix new file mode 100644 index 00000000000..515a653d6bc --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -0,0 +1,60 @@ +{ lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook + +, chromecastSupport ? false +, serverSupport ? false +, keyringSupport ? true +, notifySupport ? true, libnotify +, networkSupport ? true, networkmanager +}: + +python3Packages.buildPythonApplication rec { + pname = "sublime-music"; + version = "0.11.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1rnjc8pjfaq67mq10gy939g77azc80lxf77s9nsaxds4q5j1yrl2"; + }; + + nativeBuildInputs = [ + gobject-introspection + python3Packages.setuptools + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + pango + ] + ++ lib.optional notifySupport libnotify + ++ lib.optional networkSupport networkmanager + ; + + propagatedBuildInputs = with python3Packages; [ + dataclasses-json + deepdiff + fuzzywuzzy + mpv + peewee + pygobject3 + python-Levenshtein + python-dateutil + requests + semver + ] + ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional keyringSupport keyring + ++ lib.optional serverSupport bottle + ; + + # hook for gobject-introspection doesn't like strictDeps + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + meta = with lib; { + description = "GTK3 Subsonic/Airsonic client"; + homepage = "https://sublimemusic.app/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ albakham ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/tuijam/default.nix b/nixpkgs/pkgs/applications/audio/tuijam/default.nix new file mode 100644 index 00000000000..8a08b64508d --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/tuijam/default.nix @@ -0,0 +1,46 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, python3Packages +, youtube-dl +}: + +buildPythonApplication rec { + pname = "tuijam"; + version = "unstable-2020-06-05"; + + src = fetchFromGitHub { + owner = "cfangmeier"; + repo = pname; + rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b"; + sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5"; + }; + + buildInputs = [ python3Packages.Babel ]; + + # the package has no tests + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + gmusicapi + google_api_python_client + mpv + pydbus + pygobject3 + pyyaml + requests + rsa + urwid + ]; + + meta = with lib; { + description = "A fancy TUI client for Google Play Music"; + longDescription = '' + TUIJam seeks to make a simple, attractive, terminal-based interface to + listening to music for Google Play Music All-Access subscribers. + ''; + homepage = "https://github.com/cfangmeier/tuijam"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/vocal/default.nix b/nixpkgs/pkgs/applications/audio/vocal/default.nix index 6ef992ffff6..b519003a9ec 100644 --- a/nixpkgs/pkgs/applications/audio/vocal/default.nix +++ b/nixpkgs/pkgs/applications/audio/vocal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , cmake , ninja , vala @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; diff --git a/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index 20f87725f99..d3726eab7ff 100644 --- a/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20200411"; + version = "20200714"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "0y6778l2zc80kvp31mqw3vkcyi7g613jxn3g3lxqfa31i617gh6j"; + sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index f8ea58fef3c..2b0a89bbaf5 100644 --- a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +{ stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg }: @@ -6,13 +6,15 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { pname = "yoshimi"; - version = "1.7.0.1"; - - src = fetchurl { - url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; - sha256 = "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c"; + # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38 + version = "unstable-2020-05-10"; + + src = fetchFromGitHub { + owner = "Yoshimi"; + repo = pname; + rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38"; + sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; }; - buildInputs = [ alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL minixml zlib xorg.libpthreadstubs pcre |