diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
93 files changed, 1418 insertions, 345 deletions
diff --git a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix index 64468bddc85..f4a9383c29c 100644 --- a/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix +++ b/nixpkgs/pkgs/applications/audio/a2jmidid/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { version = "8"; src = fetchurl { - url = "https://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; + url = "https://github.com/linuxaudio/a2jmidid/archive/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; @@ -18,13 +18,17 @@ in stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2"; + url = "https://github.com/linuxaudio/a2jmidid/commit/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2.diff"; sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc"; }) (fetchpatch { - url = "https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269"; + url = "https://github.com/linuxaudio/a2jmidid/commit/7f82da7eb2f540a94db23331be98d42a58ddc269.diff"; sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv"; }) + (fetchpatch { + url = "https://github.com/linuxaudio/a2jmidid/commit/c07775d021a71cb91bf64ce1391cf525415cb060.diff"; + sha256 = "172v9hri03qdqi8a3zsg227k5qxldd8v5bj4jk7fyk5jf50fcxga"; + }) ]; postInstall = '' @@ -35,6 +39,6 @@ in stdenv.mkDerivation { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/adlplug/default.nix b/nixpkgs/pkgs/applications/audio/adlplug/default.nix index bc626cbad11..7dcc13eb96d 100644 --- a/nixpkgs/pkgs/applications/audio/adlplug/default.nix +++ b/nixpkgs/pkgs/applications/audio/adlplug/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, fetchpatch +, fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: stdenv.mkDerivation rec { inherit pname; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c"; + sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; fetchSubmodules = true; }; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = [ adlplugChip ]; + cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig fmt ]; meta = with stdenv.lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; diff --git a/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/nixpkgs/pkgs/applications/audio/ashuffle/default.nix new file mode 100644 index 00000000000..6bb21b5edaa --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "ashuffle"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "joshkunz"; + repo = "ashuffle"; + rev = "v${version}"; + sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake pkg-config meson ninja ]; + buildInputs = [ mpd_clientlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joshkunz/ashuffle"; + description = "Automatic library-wide shuffle for mpd"; + maintainers = [ maintainers.tcbravo ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index 58f25d46e0b..20526c8c6c5 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchzip, wxGTK31, pkgconfig, file, gettext, +{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - pcre, vamp-plugin-sdk, portmidi, twolame, git, - cmake, libtool + autoconf, automake, libtool }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.1"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546"; + sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; }; + 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" ]; @@ -36,12 +43,11 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig cmake libtool git ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; buildInputs = [ - file gettext wxGTK31 expat alsaLib - libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK31.gtk + file gettext wxGTK30 expat alsaLib + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk ffmpeg_3 libmad lame libvorbis flac soundtouch - pcre vamp-plugin-sdk portmidi twolame ]; #ToDo: detach sbsms enableParallelBuilding = true; @@ -51,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = "http://audacityteam.org/"; + homepage = "https://www.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/axoloti/libusb1.nix b/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix index 49b788f6653..255cf3f5e3b 100644 --- a/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix +++ b/nixpkgs/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index c74c0ca4eff..a26431a82ed 100644 --- a/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,8 +1,6 @@ { mkDerivation , stdenv , fetchFromGitHub -, fetchpatch -, installShellFiles , qmake , qtbase , qtmultimedia @@ -21,26 +19,18 @@ let in mkDerivation rec { pname = "bambootracker"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rerrahkr"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc"; }; - # Fix macOS build until new release - patches = [ - (fetchpatch { - url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; - sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; - }) - ]; + sourceRoot = "source/BambooTracker"; - preConfigure = "cd BambooTracker"; - - nativeBuildInputs = [ qmake qttools installShellFiles ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase qtmultimedia ] ++ optional alsaSupport alsaLib @@ -51,17 +41,6 @@ mkDerivation rec { ++ 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"; diff --git a/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix new file mode 100644 index 00000000000..7d4d53408d2 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: + +stdenv.mkDerivation rec { + pname = "bchoppr"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "${version}"; + sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo libX11 lv2 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sjaehn/BChoppr; + description = "An audio stream chopping LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 0ca556a16ef..7e5099f3c31 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.2.2"; + version = "3.2.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784"; + sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; diff --git a/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/nixpkgs/pkgs/applications/audio/bjumblr/default.nix index 458fe20937a..e1a5bee64b3 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 = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; + sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix index 47de14ecb25..76a78935619 100644 --- a/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix +++ b/nixpkgs/pkgs/applications/audio/bs1770gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg_3, sox }: +{ stdenv, fetchurl, ffmpeg, sox }: stdenv.mkDerivation rec { pname = "bs1770gain"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; - buildInputs = [ ffmpeg_3 sox ]; + buildInputs = [ ffmpeg sox ]; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/nixpkgs/pkgs/applications/audio/bschaffl/default.nix b/nixpkgs/pkgs/applications/audio/bschaffl/default.nix new file mode 100644 index 00000000000..c0d11e1fe5a --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/bschaffl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: + +stdenv.mkDerivation rec { + pname = "bschaffl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = version; + sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo libX11 lv2 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BSchaffl"; + description = "Pattern-controlled MIDI amp & time stretch LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/bslizr/default.nix b/nixpkgs/pkgs/applications/audio/bslizr/default.nix index bae2407ec7b..5a2675187c0 100644 --- a/nixpkgs/pkgs/applications/audio/bslizr/default.nix +++ b/nixpkgs/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "1l0znwvvqd2s24c652q54pkizlh86mvmr8h0qqp9xma0i575fcrh"; + sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/cantata/default.nix b/nixpkgs/pkgs/applications/audio/cantata/default.nix index e5d62b15f45..95b7dd18425 100644 --- a/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtsvg, qttools +, qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -38,6 +38,8 @@ let withUdisks = (withTaglib && withDevices); + perl' = perl.withPackages (ppkgs: [ ppkgs.URI ]); + in mkDerivation { name = "${pname}-${version}"; @@ -48,7 +50,18 @@ in mkDerivation { sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; - buildInputs = [ qtbase qtsvg ] + patches = [ + # Cantata wants to check if perl is in the PATH at runtime, but we + # patchShebangs the playlists scripts, making that unnecessary (perl will + # always be available because it's a dependency) + ./dont-check-for-perl-in-PATH.diff + ]; + + postPatch = '' + patchShebangs playlists + ''; + + buildInputs = [ qtbase qtsvg perl' ] ++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optional withHttpStream qtmultimedia diff --git a/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff b/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff new file mode 100644 index 00000000000..effb0f3b502 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff @@ -0,0 +1,17 @@ +diff --git a/playlists/dynamicplaylists.cpp b/playlists/dynamicplaylists.cpp +index 07b6dce3..6a3f97c9 100644 +--- a/playlists/dynamicplaylists.cpp ++++ b/playlists/dynamicplaylists.cpp +@@ -211,11 +211,6 @@ void DynamicPlaylists::start(const QString &name) + return; + } + +- if (Utils::findExe("perl").isEmpty()) { +- emit error(tr("You need to install \"perl\" on your system in order for Cantata's dynamic mode to function.")); +- return; +- } +- + QString fName(Utils::dataDir(rulesDir, false)+name+constExtension); + + if (!QFile::exists(fName)) { + diff --git a/nixpkgs/pkgs/applications/audio/csound/default.nix b/nixpkgs/pkgs/applications/audio/csound/default.nix index 4b426609fea..d91e550334b 100644 --- a/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.13.0"; + version = "6.15.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; + sha256 = "1vld6v55jxvv3ddr21kh41s4cdkhnm5wpffvd097zqrqh1aq08r0"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix index b42929ff204..e5cbcd4a2e2 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.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; + sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index e65414b2bca..515f8a6f9af 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with stdenv.lib.strings; let - version = "unstable-2020-06-08"; + version = "unstable-2020-08-27"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28"; - sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4"; + rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e"; + sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix index 370c25ecd74..0f703704961 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix @@ -4,6 +4,7 @@ , alsaLib , opencv2 , libsndfile +, which }: faust.wrapWithBuildEnv { @@ -21,6 +22,7 @@ faust.wrapWithBuildEnv { alsaLib opencv2 libsndfile + which ]; } diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix index a2f1c2139a1..753208c54c2 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2jaqt.nix @@ -3,6 +3,7 @@ , opencv2 , qt4 , libsndfile +, alsaLib , which }: @@ -20,6 +21,7 @@ faust.wrapWithBuildEnv { opencv2 qt4 libsndfile + alsaLib which ]; diff --git a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix index 90bd8bc60ad..03ca4ce8eb0 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faustlive.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faustlive.nix @@ -1,26 +1,34 @@ { stdenv, fetchFromGitHub , llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl -, bc, coreutils, which +, bc, coreutils, which, libsndfile, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "faustlive"; - version = "2017-12-05"; + version = "2.5.4"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; - sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + rev = version; + sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n"; + fetchSubmodules = true; }; buildInputs = [ llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl - bc coreutils which + bc coreutils which libsndfile pkg-config ]; makeFlags = [ "PREFIX=$(out)" ]; - preBuild = "patchShebangs Build/Linux/buildversion"; + postPatch = "cd Build"; + + installPhase = '' + install -d "$out/bin" + install -d "$out/share/applications" + install FaustLive/FaustLive "$out/bin" + install rsrc/FaustLive.desktop "$out/share/applications" + ''; meta = with stdenv.lib; { description = "A standalone just-in-time Faust compiler"; diff --git a/nixpkgs/pkgs/applications/audio/fmit/default.nix b/nixpkgs/pkgs/applications/audio/fmit/default.nix index 114cf5e192f..f173d2fe02b 100644 --- a/nixpkgs/pkgs/applications/audio/fmit/default.nix +++ b/nixpkgs/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; + sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/freqtweak/default.nix b/nixpkgs/pkgs/applications/audio/freqtweak/default.nix new file mode 100644 index 00000000000..046c8c8aac8 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/freqtweak/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }: + +stdenv.mkDerivation rec { + pname = "freqtweak"; + version = "unstable-2019-08-03"; + + src = fetchFromGitHub { + owner = "essej"; + repo = pname; + rev = "d4205337558d36657a4ee6b3afb29358aa18c0fd"; + sha256 = "10cq27mdgrrc54a40al9ahi0wqd0p2c1wxbdg518q8pzfxaxs5fi"; + }; + + nativeBuildInputs = [ autoconf automake pkg-config ]; + buildInputs = [ fftwFloat libjack2 libsigcxx libxml2 wxGTK ]; + + preConfigure = '' + sh autogen.sh + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://essej.net/freqtweak/; + description = "Realtime audio frequency spectral manipulation"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/friture/default.nix b/nixpkgs/pkgs/applications/audio/friture/default.nix index eae4b651685..b93ad14f55e 100644 --- a/nixpkgs/pkgs/applications/audio/friture/default.nix +++ b/nixpkgs/pkgs/applications/audio/friture/default.nix @@ -4,30 +4,32 @@ let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "0.37"; + version = "unstable-2020-02-16"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; - rev = "v${version}"; - sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y"; + rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa"; + sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym"; }; - # module imports scipy.misc.factorial, but it has been removed since scipy - # 1.3.0; use scipy.special.factorial instead - patches = [ ./factorial.patch ]; - nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; propagatedBuildInputs = with py; [ sounddevice pyopengl + pyopengl-accelerate docutils numpy pyqt5 appdirs pyrr + rtmixer + ]; + + patches = [ + ./unlock_constraints.patch ]; postFixup = '' diff --git a/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch b/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch new file mode 100644 index 00000000000..ab53f948a48 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/friture/unlock_constraints.patch @@ -0,0 +1,34 @@ +diff --git a/setup.py b/setup.py +index f31eeec..ac0927b 100644 +--- a/setup.py ++++ b/setup.py +@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", + # these will be installed when calling 'pip install friture' + # they are also retrieved by 'requirements.txt' + install_requires = [ +- "sounddevice==0.3.14", +- "rtmixer==0.1.0", +- "PyOpenGL==3.1.4", +- "PyOpenGL-accelerate==3.1.4", +- "docutils==0.15.2", +- "numpy==1.17.4", +- "PyQt5==5.13.2", +- "appdirs==1.4.3", +- "pyrr==0.10.3", ++ "sounddevice>=0.3.14", ++ "rtmixer>=0.1.0", ++ "PyOpenGL>=3.1.4", ++ "PyOpenGL-accelerate>=3.1.4", ++ "docutils>=0.15.2", ++ "numpy>=1.17.4", ++ "PyQt5>=5.13.2", ++ "appdirs>=1.4.3", ++ "pyrr>=0.10.3", + ] + + # Cython and numpy are needed when running setup.py, to build extensions +-setup_requires=["numpy==1.17.4", "Cython==0.29.14"] ++setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"] + + with open(join(dirname(__file__), 'README.rst')) as f: + long_description = f.read() diff --git a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 60040119d64..aa4f1226891 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.26"; + version = "1.31"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; + sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/nixpkgs/pkgs/applications/audio/geonkick/default.nix new file mode 100644 index 00000000000..dcfb5426034 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/geonkick/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }: + +stdenv.mkDerivation rec { + pname = "geonkick"; + version = "2.3.7"; + + src = fetchFromGitLab { + owner = "iurie-sw"; + repo = pname; + rev = "v${version}"; + sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; + + # https://github.com/iurie-sw/geonkick/issues/120 + cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + meta = { + homepage = "https://gitlab.com/iurie-sw/geonkick"; + description = "A free software percussion synthesizer"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/giada/default.nix b/nixpkgs/pkgs/applications/audio/giada/default.nix index 5934b0746d1..ce3f3df84a4 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.3"; + version = "0.16.3.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; + sha256 = "0z1jrkggdn630i3j59j30apaa9s242y1wiawqp4g1n9dkg3r9a1j"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/applications/audio/gspeech/default.nix b/nixpkgs/pkgs/applications/audio/gspeech/default.nix index f51eb338d28..920c06038fe 100644 --- a/nixpkgs/pkgs/applications/audio/gspeech/default.nix +++ b/nixpkgs/pkgs/applications/audio/gspeech/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gSpeech"; - version = "0.9.2"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3"; + sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc"; }; nativeBuildInputs = [ @@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec { ]; postFixup = '' - wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]} - wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]} + wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]} + wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]} ''; strictDeps = false; diff --git a/nixpkgs/pkgs/applications/audio/gwc/default.nix b/nixpkgs/pkgs/applications/audio/gwc/default.nix new file mode 100644 index 00000000000..d9631ac45e6 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/gwc/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, alsaLib +, libpulseaudio +, gtk2 +, hicolor-icon-theme +, libsndfile +, fftw +}: + +stdenv.mkDerivation rec { + pname = "gwc"; + version = "0.22-04"; + + src = fetchFromGitHub { + owner = "AlisterH"; + repo = pname; + rev = version; + sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + alsaLib + libpulseaudio + gtk2 + hicolor-icon-theme + libsndfile + fftw + ]; + + enableParallelBuilding = false; # Fails to generate machine.h in time. + + meta = with stdenv.lib; { + description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; + homepage = "https://github.com/AlisterH/gwc/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/helm/default.nix b/nixpkgs/pkgs/applications/audio/helm/default.nix index 8459967a363..145ba68b08b 100644 --- a/nixpkgs/pkgs/applications/audio/helm/default.nix +++ b/nixpkgs/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 -, lv2, pkgconfig, libGLU, libGL }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, xorg +, freetype +, alsaLib +, curl +, libjack2 +, lv2 +, pkgconfig +, libGLU +, libGL +}: stdenv.mkDerivation { version = "0.9.0"; @@ -20,7 +31,15 @@ CXXFLAGS = "-DHAVE_LROUND"; - patchPhase = '' + patches = [ + # gcc9 compatibility https://github.com/mtytel/helm/pull/233 + (fetchpatch { + url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; + sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + }) + ]; + + prePatch = '' sed -i 's|usr/||g' Makefile ''; diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/0.nix b/nixpkgs/pkgs/applications/audio/hydrogen/0.nix new file mode 100644 index 00000000000..b3aff4e4c50 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/hydrogen/0.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, cmake +, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +}: + +stdenv.mkDerivation rec { + version = "0.9.7"; + pname = "hydrogen"; + + src = fetchurl { + url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; + sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + ]; + + meta = with stdenv.lib; { + description = "Advanced drum machine"; + homepage = "http://www.hydrogen-music.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix index b3aff4e4c50..c6d307e2c16 100644 --- a/nixpkgs/pkgs/applications/audio/hydrogen/default.nix +++ b/nixpkgs/pkgs/applications/audio/hydrogen/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, cmake -, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4 +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, qtbase, qttools, qtxmlpatterns }: stdenv.mkDerivation rec { - version = "0.9.7"; pname = "hydrogen"; + version = "1.0.1"; - src = fetchurl { - url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; - sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy"; + src = fetchFromGitHub { + owner = "hydrogen-music"; + repo = pname; + rev = version; + sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ - alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4 + alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + qtbase qttools qtxmlpatterns + ]; + + cmakeFlags = [ + "-DWANT_DEBUG=OFF" ]; meta = with stdenv.lib; { @@ -21,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu orivej ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix b/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix deleted file mode 100644 index 2f220f8d31a..00000000000 --- a/nixpkgs/pkgs/applications/audio/hydrogen/unstable.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook -, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf -, qtbase, qttools, qtxmlpatterns -}: - -stdenv.mkDerivation rec { - pname = "hydrogen"; - version = "1.0.0-beta2"; - - src = fetchFromGitHub { - owner = "hydrogen-music"; - repo = pname; - rev = version; - sha256 = "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a"; - }; - - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ - alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf - qtbase qttools qtxmlpatterns - ]; - - cmakeFlags = [ - "-DWANT_DEBUG=OFF" - ]; - - meta = with stdenv.lib; { - description = "Advanced drum machine"; - homepage = "http://www.hydrogen-music.org"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu orivej ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/jackmix/default.nix b/nixpkgs/pkgs/applications/audio/jackmix/default.nix index ad01a3ff76e..405217675a3 100644 --- a/nixpkgs/pkgs/applications/audio/jackmix/default.nix +++ b/nixpkgs/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2 }: +{ stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2, alsaLib }: stdenv.mkDerivation { name = "jackmix-0.5.2"; @@ -14,6 +14,7 @@ stdenv.mkDerivation { qt4 lash jack + alsaLib ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/jalv/default.nix b/nixpkgs/pkgs/applications/audio/jalv/default.nix index bbf66a74bc5..39f1467138d 100644 --- a/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ b/nixpkgs/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk3, libjack2, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ - gtk3 libjack2 lilv lv2 python serd sord sratom suil + gtk2 libjack2 lilv lv2 python serd sord sratom suil ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix new file mode 100644 index 00000000000..53b55332f5d --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config +, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, zita-convolver, zita-resampler + }: + +stdenv.mkDerivation rec { + pname = "kapitonov-plugins-pack"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "olegkapitonov"; + repo = pname; + rev = version; + sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4"; + }; + + nativeBuildInputs = [ + faust + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost + cairo + fftw + ladspa-sdk + libxcb + lv2 + xcbutilwm + zita-convolver + zita-resampler + ]; + + meta = with stdenv.lib; { + description = "Set of LADSPA and LV2 plugins for guitar sound processing"; + homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/kmetronome/default.nix b/nixpkgs/pkgs/applications/audio/kmetronome/default.nix new file mode 100644 index 00000000000..30a4d5f3684 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/kmetronome/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qttools, alsaLib, drumstick, qtbase, qtsvg }: + +stdenv.mkDerivation rec { + pname = "kmetronome"; + version = "1.0.1"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; + sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; + }; + + nativeBuildInputs = [ cmake pkgconfig qttools ]; + + buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + + meta = with stdenv.lib; { + homepage = "https://kmetronome.sourceforge.io/"; + description = "ALSA MIDI metronome with Qt interface"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch b/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch new file mode 100644 index 00000000000..129ba96987a --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch @@ -0,0 +1,137 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 533b47d..9c9c2f6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -932,7 +932,7 @@ dependencies = [ + + [[package]] + name = "librespot" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -940,12 +940,12 @@ dependencies = [ + "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-audio 0.1.2", +- "librespot-connect 0.1.2", +- "librespot-core 0.1.2", +- "librespot-metadata 0.1.2", +- "librespot-playback 0.1.2", +- "librespot-protocol 0.1.2", ++ "librespot-audio 0.1.3", ++ "librespot-connect 0.1.3", ++ "librespot-core 0.1.3", ++ "librespot-metadata 0.1.3", ++ "librespot-playback 0.1.3", ++ "librespot-protocol 0.1.3", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -961,7 +961,7 @@ dependencies = [ + + [[package]] + name = "librespot-audio" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -969,7 +969,7 @@ dependencies = [ + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-core 0.1.2", ++ "librespot-core 0.1.3", + "librespot-tremor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -980,7 +980,7 @@ dependencies = [ + + [[package]] + name = "librespot-connect" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -990,9 +990,9 @@ dependencies = [ + "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", + "libmdns 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-core 0.1.2", +- "librespot-playback 0.1.2", +- "librespot-protocol 0.1.2", ++ "librespot-core 0.1.3", ++ "librespot-playback 0.1.3", ++ "librespot-protocol 0.1.3", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1007,7 +1007,7 @@ dependencies = [ + + [[package]] + name = "librespot-core" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1020,7 +1020,7 @@ dependencies = [ + "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-protocol 0.1.2", ++ "librespot-protocol 0.1.3", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1043,12 +1043,12 @@ dependencies = [ + + [[package]] + name = "librespot-metadata" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-core 0.1.2", +- "librespot-protocol 0.1.2", ++ "librespot-core 0.1.3", ++ "librespot-protocol 0.1.3", + "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1056,7 +1056,7 @@ dependencies = [ + + [[package]] + name = "librespot-playback" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1068,9 +1068,9 @@ dependencies = [ + "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "librespot-audio 0.1.2", +- "librespot-core 0.1.2", +- "librespot-metadata 0.1.2", ++ "librespot-audio 0.1.3", ++ "librespot-core 0.1.3", ++ "librespot-metadata 0.1.3", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1081,7 +1081,7 @@ dependencies = [ + + [[package]] + name = "librespot-protocol" +-version = "0.1.2" ++version = "0.1.3" + dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/applications/audio/librespot/default.nix b/nixpkgs/pkgs/applications/audio/librespot/default.nix index 468cf57cdcf..6061edac025 100644 --- a/nixpkgs/pkgs/applications/audio/librespot/default.nix +++ b/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl -, withRodio ? true -, withALSA ? true, alsaLib ? null -, withPulseAudio ? false, libpulseaudio ? null -, withPortAudio ? false, portaudio ? null -}: +{ 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"; + version = "0.1.3"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "1sdbjv8w2mfpv82rx5iy4s532l1767vmlrg9d8khnvh8vrm2lshy"; + sha256 = "1ixh47yvaamrpzagqsiimc3y6bi4nbym95843d23am55zkrgnmy5"; }; - cargoSha256 = "0zi50imjvalwl6pxl35qrmbg74j5xdfaws8v69am4g9agbfjvlms"; + cargoSha256 = "1csls8kzzx28ng6w9vdwhnnav5sqp2m5fj430db5z306xh5acg3d"; + + cargoPatches = [ ./cargo-lock.patch ]; cargoBuildFlags = with stdenv.lib; [ "--no-default-features" @@ -32,8 +31,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optional withALSA alsaLib + buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib ++ stdenv.lib.optional withPulseAudio libpulseaudio ++ stdenv.lib.optional withPortAudio portaudio; diff --git a/nixpkgs/pkgs/applications/audio/lingot/default.nix b/nixpkgs/pkgs/applications/audio/lingot/default.nix index 256f5766c41..f229e15871e 100644 --- a/nixpkgs/pkgs/applications/audio/lingot/default.nix +++ b/nixpkgs/pkgs/applications/audio/lingot/default.nix @@ -5,8 +5,10 @@ , gtk3 , wrapGAppsHook , alsaLib +, libjack2 , libpulseaudio , fftw +, jackSupport ? true }: stdenv.mkDerivation rec { @@ -29,11 +31,9 @@ stdenv.mkDerivation rec { alsaLib libpulseaudio fftw - ]; + ] ++ stdenv.lib.optional jackSupport libjack2; - configureFlags = [ - "--disable-jack" - ]; + configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack"; meta = { description = "Not a Guitar-Only tuner"; diff --git a/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix b/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix new file mode 100644 index 00000000000..d98135fb014 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: + +stdenv.mkDerivation rec { + pname = "lv2-cpp-tools"; + version = "1.0.5"; + + src = fetchzip { + url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2"; + sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi"; + }; + + preConfigure = '' + sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure + sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template + ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 gtkmm2 boost ]; + + meta = with stdenv.lib; { + homepage = "http://ll-plugins.nongnu.org/hacking.html"; + description = "Tools and libraries that may come in handy when writing LV2 plugins in C++"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mamba/default.nix b/nixpkgs/pkgs/applications/audio/mamba/default.nix new file mode 100644 index 00000000000..ad0a41bc005 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, cairo +, fluidsynth +, libX11 +, libjack2 +, liblo +, libsigcxx +, libsmf +}: + +stdenv.mkDerivation rec { + pname = "mamba"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "brummer10"; + repo = "Mamba"; + rev = "v${version}"; + sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/brummer10/Mamba"; + description = "Virtual MIDI keyboard for Jack Audio Connection Kit"; + license = licenses.bsd0; + maintainers = with maintainers; [ magnetophon orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix b/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix index c97c7cf1a23..93c0b36bbb0 100644 --- a/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix +++ b/nixpkgs/pkgs/applications/audio/mellowplayer/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "MellowPlayer"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitLab { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "1ss7s3kal4vzhz7ld0yy2kvp1rk2w3i6fya0z3xd7nff9p31gqvw"; + sha256 = "1fnfqyy52hnh9vwq4rcndcqwh0zsm1sd3vi4h5gzaj4zbniq5v2f"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix b/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix new file mode 100644 index 00000000000..c66771be1c9 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, + libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: + +stdenv.mkDerivation rec { + pname = "MIDIVisualizer"; + version = "5.1"; + + src = fetchFromGitHub { + owner = "kosua20"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq"; + }; + + nativeBuildInputs = [ cmake pkg-config makeWrapper]; + + buildInputs = [ + libX11 + glfw + libXrandr + libXinerama + libXcursor + gtk3 + ffmpeg-full + ]; + + installPhase = '' + mkdir -p $out/bin + cp MIDIVisualizer $out/bin + + wrapProgram $out/bin/MIDIVisualizer \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + meta = with stdenv.lib; { + description = "A small MIDI visualizer tool, using OpenGL"; + homepage = "https://github.com/kosua20/MIDIVisualizer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.ericdallo ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/molot-lite/default.nix b/nixpkgs/pkgs/applications/audio/molot-lite/default.nix new file mode 100644 index 00000000000..5c5aa505537 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/molot-lite/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +stdenv.mkDerivation { + pname = "molot-lite"; + version = "unstable-2014-04-23"; + + src = fetchurl { + # fetchzip does not accept urls that do not end with .zip. + url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw"; + sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ lv2 ]; + + unpackPhase = '' + unzip $src + ''; + + buildPhase = '' + make -C Molot_Mono_Lite + make -C Molot_Stereo_Lite + ''; + + installPhase = '' + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite + ''; + + meta = with stdenv.lib; { + description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; + homepage = "https://sourceforge.net/projects/molot/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mooSpace/default.nix b/nixpkgs/pkgs/applications/audio/mooSpace/default.nix new file mode 100644 index 00000000000..f6958c5e974 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mooSpace/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + pname = "mooSpace"; + version = "unstable-2020-06-10"; + + src = fetchFromGitHub { + owner = "modularev"; + repo = pname; + rev = "e5440407ea6ef9f7fcca838383b2b9a388c22874"; + sha256 = "10vsbddf6d7i06040850v8xkmqh3bqawczs29kfgakair809wqxl"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp"; + + buildPhase = '' + faust2jaqt -time -vec -t 0 ${pname}.dsp + faust2lv2 -time -vec -t 0 -gui ${pname}.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${pname} $out/bin/ + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2 $out/lib/lv2 + ''; + + meta = { + description = "Variable reverb audio effect, jack and lv2"; + homepage = "https://github.com/modularev/mooSpace"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/nixpkgs/pkgs/applications/audio/mopidy/default.nix index 6c2a7d9fe33..23322ca5663 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -40,6 +40,8 @@ let mopidy-iris = callPackage ./iris.nix { }; + mopidy-tunein = callPackage ./tunein.nix { }; + }; in self diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 796812a9bd0..467ba6fe3f7 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ configobj requests - tornado_4 + tornado ]); # no tests implemented diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index ae65d9b2f6e..28216020b78 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools + gst-python pygobject3 pykka tornado requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests diff --git a/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix b/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix new file mode 100644 index 00000000000..569d08fb4a0 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix @@ -0,0 +1,28 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-tunein"; + version = "1.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-TuneIn"; + sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + # tests fail with "ValueError: Namespace Gst not available" in mopidy itself + doCheck = false; + + pythonImportsCheck = [ "mopidy_tunein.tunein" ]; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from tunein."; + homepage = "https://github.com/kingosticks/mopidy-tunein"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 30f40e226de..21dffa8d509 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.26.1"; + name = "mpg123-1.26.3"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl"; + sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index 0561a0179a6..71c639ca406 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "musescore"; - version = "3.4.2"; + version = "3.5.0"; src = fetchzip { - url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip"; - sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp"; + url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip"; + sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9"; stripRoot = false; }; @@ -20,7 +20,14 @@ mkDerivation rec { ]; cmakeFlags = [ - ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; + "-DUSE_SYSTEM_FREETYPE=ON" + ]; + + qtWrapperArgs = [ + # Work around crash on update from 3.4.2 to 3.5.0 + # https://bugreports.qt.io/browse/QTBUG-85967 + "--set QML_DISABLE_DISK_CACHE 1" + ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 0c4e2c71dd9..8fc0616ff73 100644 --- a/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.92.1"; + version = "0.93.1"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr"; + sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/musly/default.nix b/nixpkgs/pkgs/applications/audio/musly/default.nix index b1e8822cdcf..7ef2b400b76 100644 --- a/nixpkgs/pkgs/applications/audio/musly/default.nix +++ b/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +{ stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index aea50d71d75..ca61aa0cd6f 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; + sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix index f284dd3dac1..2fcbf82107d 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.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0b2g5bd04zh1hcrhkgd2srx9gl94da4gpy9arjcvrldschjxjza1"; + sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2"; }; - cargoSha256 = "1gbhvmg7jfmx0b694rdr3s2zs33d4s645gw1lrxvwffif4mg8fy9"; + cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix b/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix deleted file mode 100644 index c4cc291d026..00000000000 --- a/nixpkgs/pkgs/applications/audio/netease-cloud-music/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fontconfig, zlib, libGL, glib, pango -, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg -, sqlite, taglib, nss, nspr, cups, dbus, alsaLib -, libpulseaudio, deepin, qt5, harfbuzz, p11-kit -, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }: -let - rpath = lib.makeLibraryPath [ - fontconfig.lib - zlib - stdenv.cc.cc.lib - libGL - glib - pango - gdk-pixbuf - freetype - atk - cairo - libsForQt5.vlc - sqlite - taglib - nss - nspr - cups.lib - dbus.lib - alsaLib - libpulseaudio - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXdamage - xorg.libXScrnSaver - xorg.libxcb - xorg.libXi - deepin.qcef - qt5.qtwebchannel - qt5.qtbase - qt5.qtx11extras - qt5.qtdeclarative - harfbuzz - p11-kit - libgpgerror - ]; - - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; - -in stdenv.mkDerivation rec { - pname = "netease-cloud-music"; - version = "1.2.0"; - src = fetchurl { - url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb"; - sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1"; - curlOpts = "-A 'Mozilla/5.0'"; - }; - unpackCmd = "${dpkg}/bin/dpkg -x $src ."; - sourceRoot = "."; - - nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ]; - - installPhase = '' - mkdir -p $out - cp -r usr/* $out - ''; - - preFixup = '' - local exefile="$out/bin/netease-cloud-music" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile" - patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile" - - wrapProgram $out/bin/netease-cloud-music \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" - ''; - - meta = { - description = "Client for Netease Cloud Music service"; - homepage = "https://music.163.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.mlatus ]; - license = stdenv.lib.licenses.unfreeRedistributable; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix index 310c0f99b10..1739d27870a 100644 --- a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix +++ b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix @@ -15,6 +15,8 @@ buildGoModule rec { vendorSha256 = null; + doCheck = false; + subPackages = [ "." ]; buildInputs = [ rnnoise-plugin ]; diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 9d6b7dcf7f1..c5d20d965b9 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.15"; + version = "0.9.16"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1"; + sha256 = "1f2v60dpja0rnml60g463fjiz0f84v32yjwpvr56z79h1i6fssmv"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix index e4728b9b9c4..b9babddb800 100644 --- a/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx"; + sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/picard/default.nix b/nixpkgs/pkgs/applications/audio/picard/default.nix index c080d0a95f3..2aeae1f1890 100644 --- a/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.3.2"; + version = "2.4.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1785wnxhasp4j8w2a8bgbfp3gyhc7zac18r5fqw5qcndz2hfk5mc"; + sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] @@ -37,6 +37,7 @@ in pythonPackages.buildPythonApplication rec { mutagen chromaprint discid + dateutil ]; prePatch = '' diff --git a/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/nixpkgs/pkgs/applications/audio/picoloop/default.nix new file mode 100644 index 00000000000..1dc9c70af87 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/picoloop/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: + +stdenv.mkDerivation rec { + pname = "picoloop"; + version = "0.77e"; + + src = fetchFromGitHub { + repo = pname; + owner = "yoyz"; + rev = "${pname}-${version}"; + sha256 = "0i8j8rgyha3ara6d4iis3wcimszf2csxdwrm5yq0wyhg74g7cvjd"; + }; + + buildInputs = [ + libpulseaudio + SDL2 + SDL2.dev + SDL2_image + SDL2_ttf + alsaLib + libjack2 + ]; + + sourceRoot = "source/picoloop"; + + makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; + + NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ]; + + hardeningDisable = [ "format" ]; + + patchPhase = '' + substituteInPlace SDL_GUI.cpp \ + --replace "\"font.ttf\"" "\"$out/share/font.ttf\"" \ + --replace "\"font.bmp\"" "\"$out/share/font.bmp\"" + ''; + + installPhase = '' + mkdir -p $out/{bin,share} + cp PatternPlayer_debian_RtAudio_sdl20 $out/bin/picoloop + cp {font.*,LICENSE} $out/share + ''; + + meta = with stdenv.lib; { + description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)."; + homepage = "https://github.com/yoyz/picoloop"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/nixpkgs/pkgs/applications/audio/puddletag/default.nix index a0813fa0c80..47ea078c4b2 100644 --- a/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "1.2.0"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "keithgg"; - repo = "puddletag"; - rev = "v${version}"; - sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; + owner = "keithgg"; + repo = "puddletag"; + rev = version; + sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; }; - setSourceRoot = '' - sourceRoot=$(echo */source) - ''; + sourceRoot = "source/source"; - disabled = python2Packages.isPy3k; # work to support python 3 has not begun - - propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing - pyqt4 + pyqt5 ]); doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; + homepage = "https://docs.puddletag.net"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix index 75990d593df..c0986880c09 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null; assert faacSupport -> faac != null; assert flacSupport -> flac != null; assert soxSupport -> sox != null; -assert vorbisSupport -> vorbisTools != null; +assert vorbisSupport -> vorbis-tools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; @@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional flacSupport flac ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbisTools; + ++ stdenv.lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index 12ab8ce2e06..a3ee0e23ec6 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -30,14 +30,12 @@ , zita-convolver , zam-plugins , rubberband -, mda_lv2 , lsp-plugins }: let lv2Plugins = [ calf # limiter, compressor exciter, bass enhancer and others - mda_lv2 # loudness lsp-plugins # delay ]; ladspaPlugins = [ @@ -46,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.3"; + version = "4.8.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f"; + sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index 87666940c15..8cb28dcfd5a 100644 --- a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "1rjhdyp0wzhlqr4cn80rh1qhby998cpqv81j1bbb9hfsiq77viqy"; + sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 5da8f4cd462..af59bb56eb9 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; + sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index f2ee5eac70f..2975e6464e1 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk"; + sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 9de70d83ee5..e15addd78b1 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.10"; + version = "6.12c"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; + sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/audio/renoise/default.nix b/nixpkgs/pkgs/applications/audio/renoise/default.nix index 1cbd5b3afa2..0ae65cb8c37 100644 --- a/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.1"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; } else releasePath diff --git a/nixpkgs/pkgs/applications/audio/seq66/default.nix b/nixpkgs/pkgs/applications/audio/seq66/default.nix new file mode 100644 index 00000000000..6b3a3939b43 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/seq66/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which +, alsaLib, libjack2, liblo, qtbase +}: + +stdenv.mkDerivation rec { + pname = "seq66"; + version = "0.90.5"; + + src = fetchFromGitHub { + owner = "ahlstromcj"; + repo = pname; + rev = version; + sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; + + buildInputs = [ alsaLib libjack2 liblo qtbase ]; + + postPatch = '' + for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do + substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/ahlstromcj/seq66"; + description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/nixpkgs/pkgs/applications/audio/sfizz/default.nix index acec8c54e53..b4ff5fc56d5 100644 --- a/nixpkgs/pkgs/applications/audio/sfizz/default.nix +++ b/nixpkgs/pkgs/applications/audio/sfizz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sfizz"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; rev = version; - sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd"; + sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index 9bc8fcb6694..76ea4efeace 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.2"; + name = "snd-20.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r"; + sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix index 68eefadf411..cf3f173a096 100644 --- a/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: +{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -16,26 +16,38 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + buildInputs = [ - intltool wrapGAppsHook + glib gnome3.adwaita-icon-theme gsettings-desktop-schemas + gtk3 + gdk-pixbuf + ]; + + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ + dbus-python + mpd2 + pygobject3 + setuptools ]; + # Otherwise the setup hook for gobject-introspection is not run: + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py ''; - propagatedBuildInputs = [ - gobject-introspection gtk3 pygobject3 setuptools - ]; - - # The optional tagpy dependency (for editing metadata) is not yet - # included because it's difficult to build. - pythonPath = [ dbus-python pygobject3 mpd2 ]; - meta = { description = "An elegant client for the Music Player Daemon"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix index e8b6a4d4313..2593bf38d19 100644 --- a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,8 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook @@ -10,13 +10,14 @@ stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "4.0.1"; + version = "4.2"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; - sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz"; + sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q"; }; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { # portaudio libpulseaudio libmad - libogg # ? libfishsound liblo libX11 @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { opusfile ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - - enableParallelBuilding = true; - # comment out the tests preConfigure = '' sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; diff --git a/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix b/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix index df5806b50b9..3e133a0caa1 100644 --- a/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix +++ b/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix @@ -1,6 +1,6 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { - mkDerivation, fetchFromGitHub, lib, makeWrapper, + mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, cmake, extra-cmake-modules, pkgconfig, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, @@ -53,6 +53,15 @@ mkDerivation rec { rev = "v" + version; sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; }; + patches = [ + # already merged into master, so it can go during the next release + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; + sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; + name = "soundkonverter_taglib.patch"; + stripLen = 1; + }) + ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; diff --git a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index 16c8623bd7b..dd063b2d039 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; - platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/nixpkgs/pkgs/applications/audio/strawberry/default.nix index ba3c9c4de83..f278b68b922 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.13"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1"; + sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 515a653d6bc..7e3c1b9164f 100644 --- a/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.0"; + version = "0.11.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rnjc8pjfaq67mq10gy939g77azc80lxf77s9nsaxds4q5j1yrl2"; + sha256 = "1x6b02gw46gp6qcgv67j7k3gr1dpfczbyma6dxanag8pnpqrj8qi"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/surge/default.nix b/nixpkgs/pkgs/applications/audio/surge/default.nix new file mode 100644 index 00000000000..1614bbfae66 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/surge/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 +, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity +}: + +stdenv.mkDerivation rec { + pname = "surge"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "release_${version}"; + sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s"; + leaveDotGit = true; # for SURGE_VERSION + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake git pkg-config python3 ]; + buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ]; + + postPatch = '' + substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" + substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge + cp -r surge_products/Surge.lv2 $out/lib/lv2/ + cp -r surge_products/Surge.vst3 $out/lib/vst3/ + cp -r ../resources/data/* $out/share/surge/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + cd .. + build/surge-headless + ''; + + meta = with stdenv.lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index c7e936d28e5..74f68283fd6 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; + sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/talentedhack/default.nix b/nixpkgs/pkgs/applications/audio/talentedhack/default.nix new file mode 100644 index 00000000000..b30cf59f7b3 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/talentedhack/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "talentedhack"; + version = "1.86"; + + src = fetchFromGitHub { + owner = "jeremysalwen"; + repo = "talentedhack"; + rev = "v${version}"; + sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftwFloat ]; + + # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`: + preConfigure = '' + sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile + ''; + + installPhase = '' + d=$out/lib/lv2/talentedhack.lv2 + mkdir -p $d + cp *.so *.ttl $d + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeremysalwen/TalentedHack"; + description = "LV2 port of Autotalent pitch correction plugin"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/tamgamp.lv2/default.nix b/nixpkgs/pkgs/applications/audio/tamgamp.lv2/default.nix new file mode 100644 index 00000000000..9f51f9d022d --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/tamgamp.lv2/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }: + +stdenv.mkDerivation rec { + pname = "tamgamp.lv2"; + version = "unstable-2020-06-14"; + + src = fetchFromGitHub { + owner = "sadko4u"; + repo = pname; + rev = "426da74142fcb6b7687a35b2b1dda3392e171b92"; + sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ lv2 zita-resampler ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/sadko4u/tamgamp.lv2"; + description = "Guitar amplifier simulator"; + longDescription = '' + Tamgamp (Pronouncement: "Damage Amp") is an LV2 guitar amp simulator that provides two plugins: + + - Tamgamp - a plugin based on Guitarix DK Builder simulated chains. + - TamgampGX - a plugin based on tuned Guitarix internal amplifiers implementation. + + The reference to the original Guitarix project: https://guitarix.org/ + + It simulates the set of the following guitar amplifiers: + + - Fender Princeton Reverb-amp AA1164 (without reverb module) + - Fender Twin Reverb-Amp AA769 (Normal channel, bright off) + - Fender Twin Reverb-Amp AA769 (Vibrato channel, bright on) + - Marshall JCM-800 High-gain input + - Marshall JCM-800 Low-gain input + - Mesa/Boogie DC3 preamplifier (lead channel) + - Mesa/Boogie DC3 preamplifier (rhythm channel) + - Mesa Dual Rectifier preamplifier (orange channel, less gain) + - Mesa Dual Rectifier preamplifier (red channel, more gain) + - Peavey 5150II crunch channel + - Peavey 5150II lead channel + - VOX AC-30 Brilliant channel + - VOX AC-30 normal channel + ''; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/tunefish/default.nix b/nixpkgs/pkgs/applications/audio/tunefish/default.nix new file mode 100644 index 00000000000..72802c4f878 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/tunefish/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkg-config, python3 +, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +}: + +stdenv.mkDerivation { + pname = "tunefish"; + version = "unstable-2020-08-13"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "tunefish"; + rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; + fetchSubmodules = true; + sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + + makeFlags = [ + "-C" "src/tunefish4/Builds/LinuxMakefile" + "CONFIG=Release" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://tunefish-synth.com/"; + description = "Virtual analog synthesizer LV2 plugin"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/uhhyou.lv2/default.nix b/nixpkgs/pkgs/applications/audio/uhhyou.lv2/default.nix new file mode 100644 index 00000000000..732e9d8433f --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/uhhyou.lv2/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, python3 +, fftw +, libGL +, libX11 +, libjack2 +, liblo +, lv2 +}: + +stdenv.mkDerivation rec { + # this is what upstream calls the package, see: + # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2 + pname = "uhhyou.lv2"; + version = "unstable-2020-07-31"; + + src = fetchFromGitHub { + owner = "ryukau"; + repo = "LV2Plugins"; + rev = "6189be67acaeb95452f8adab73a731d94a7b6f47"; + fetchSubmodules = true; + sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ fftw libGL libX11 libjack2 liblo lv2 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + prePatch = '' + patchShebangs generate-ttl.sh + cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio plugins for Linux"; + longDescription = '' + Plugin List: + - CubicPadSynth + - EnvelopedSine + - EsPhaser + - FDNCymbal + - FoldShaper + - IterativeSinCluster + - L3Reverb + - L4Reverb + - LatticeReverb + - LightPadSynth + - ModuloShaper + - OddPowShaper + - SevenDelay + - SoftClipper + - SyncSawSynth + - TrapezoidSynth + - WaveCymbal + ''; + homepage = "https://github.com/ryukau/LV2Plugins/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix new file mode 100644 index 00000000000..24e112aff2b --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchzip +, libX11 +, libXi +, libGL +, alsaLib +, SDL2 +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "virtual-ans"; + version = "3.0.2c"; + + src = fetchzip { + url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; + sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + libX11 + libXi + libGL + alsaLib + SDL2 + ]; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + + # Remove all executables except for current architecture + ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf + ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf + + # Start script performs relative search for resources, so it cannot be moved + # to bin directory + ln -s $out/${startScript} $out/bin/virtual-ans + ''; + + startScript = if stdenv.isx86_32 then "START_LINUX_X86" + else if stdenv.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + else abort "Unsupported platform: ${stdenv.platform.kernelArch}."; + + linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" + else if stdenv.isx86_64 then "pixilang_linux_x86_64" + else ""; + + meta = with stdenv.lib; { + description = "Photoelectronic microtonal/spectral musical instrument"; + longDescription = '' + Virtual ANS is a software simulator of the unique Russian synthesizer ANS + - photoelectronic musical instrument created by Evgeny Murzin from 1938 to + 1958. The ANS made it possible to draw music in the form of a spectrogram + (sonogram), without live instruments and performers. It was used by + Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet + composers in their experimental works. You can also hear the sound of the + ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker. + + The simulator extends the capabilities of the original instrument. Now + it's a full-featured graphics editor where you can convert sound into an + image, load and play pictures, draw microtonal/spectral music and create + some unusual deep atmospheric sounds. This app is for everyone who loves + experiments and is looking for something new. + + Key features: + + + unlimited number of pure tone generators; + + powerful sonogram editor - you can draw the spectrum and play it at the same time; + + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa; + + support for MIDI devices; + + polyphonic synth mode with MIDI mapping; + + supported file formats: WAV, AIFF, PNG, JPEG, GIF; + + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. + ''; + homepage = "https://warmplace.ru/soft/ans/"; + license = licenses.free; + # I cannot test the Darwin version, so I'll leave it disabled + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ jacg ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/audio/vmpk/default.nix b/nixpkgs/pkgs/applications/audio/vmpk/default.nix index 2bc40a78af4..62ae1d2c049 100644 --- a/nixpkgs/pkgs/applications/audio/vmpk/default.nix +++ b/nixpkgs/pkgs/applications/audio/vmpk/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, cmake, pkgconfig -, qt4, libjack2 -}: +{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }: -let - version = "0.5.1"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "vmpk"; - inherit version; - - meta = with stdenv.lib; { - description = "Virtual MIDI Piano Keyboard"; - homepage = "http://vmpk.sourceforge.net/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; + version = "0.5.1"; src = fetchurl { - url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt4 libjack2 ]; + buildInputs = [ alsaLib libjack2 qt4 ]; + + meta = with stdenv.lib; { + description = "Virtual MIDI Piano Keyboard"; + homepage = "http://vmpk.sourceforge.net/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; } diff --git a/nixpkgs/pkgs/applications/audio/vocproc/default.nix b/nixpkgs/pkgs/applications/audio/vocproc/default.nix new file mode 100644 index 00000000000..ddaa5b790e2 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/vocproc/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: + +stdenv.mkDerivation rec { + pname = "vocproc"; + version = "0.2.1"; + + src = fetchzip { + url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz"; + sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; + + makeFlags = [ + "INSTALL_DIR=$(out)/lib/lv2" + ]; + + meta = with stdenv.lib; { + homepage = "https://hyperglitch.com/dev/VocProc"; + description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)"; + license = licenses.gpl2; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch index f575af5ecd3..f575af5ecd3 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations +++ b/nixpkgs/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch diff --git a/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen b/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen.patch index 386c6cbf22b..386c6cbf22b 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen +++ b/nixpkgs/pkgs/applications/audio/yasr/20_maxpathlen.patch diff --git a/nixpkgs/pkgs/applications/audio/yasr/30_conf b/nixpkgs/pkgs/applications/audio/yasr/30_conf.patch index 98e959f55f3..98e959f55f3 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/30_conf +++ b/nixpkgs/pkgs/applications/audio/yasr/30_conf.patch diff --git a/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch index cc1f0af8606..cc1f0af8606 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars +++ b/nixpkgs/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch diff --git a/nixpkgs/pkgs/applications/audio/yasr/default.nix b/nixpkgs/pkgs/applications/audio/yasr/default.nix index 68423197f3c..fed2ee0d8f7 100644 --- a/nixpkgs/pkgs/applications/audio/yasr/default.nix +++ b/nixpkgs/pkgs/applications/audio/yasr/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { }; patches = [ - ./10_fix_openpty_forkpty_declarations - ./20_maxpathlen - ./30_conf - ./40_dectalk_extended_chars + ./10_fix_openpty_forkpty_declarations.patch + ./20_maxpathlen.patch + ./30_conf.patch + ./40_dectalk_extended_chars.patch ]; # taken from the debian yasr package meta = { |