diff options
Diffstat (limited to 'pkgs/applications/audio')
39 files changed, 156 insertions, 96 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 57d8b554c4f2..35214502e09a 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc , qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that @@ -45,6 +45,15 @@ in stdenv.mkDerivation rec { sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; + patches = [ + # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions) + (fetchpatch { + url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch"; + sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj"; + name = "fix_qt_510.patch"; + }) + + ]; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 57107924b618..1420627c02a0 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.4.2"; + version = "0.6.0"; buildInputs = [ alsaLib @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc"; + sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr"; }; nativeBuildInputs = [ autoreconfHook ]; postConfigure = '' - substituteInPlace Makefile \ + substituteInPlace Makefile.am \ --replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" "" + substituteInPlace configure.ac \ + --replace "/usr/share/consolefonts" "$out/share/consolefonts" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 125df237dfe5..d16534b03d32 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/dfasma/; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a6a7ad22fa1a..5c9211e7f3bb 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 +{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2 , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2017-10-10"; + name = "distrho-ports-unstable-2018-01-01"; - src = fetchgit { - url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9"; - sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv"; + src = fetchFromGitHub { + owner = "DISTRHO"; + repo = "DISTRHO-Ports"; + rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; + sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; }; patchPhase = '' diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 901df19ebf59..460c9da7ac31 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,13 +16,14 @@ with stdenv.lib.strings; let - version = "2.1.0"; + version = "2.5.10"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; + sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z"; + fetchSubmodules = true; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 3867114562d5..7762ca393690 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,6 +2,7 @@ , gtk2 , jack2Full , opencv +, libsndfile }: faust.wrapWithBuildEnv { @@ -18,6 +19,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full opencv + libsndfile ]; } diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index c0911b315386..5a015e5ca31e 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -2,6 +2,7 @@ , jack2Full , opencv , qt4 +, libsndfile }: faust.wrapWithBuildEnv { @@ -17,6 +18,7 @@ faust.wrapWithBuildEnv { jack2Full opencv qt4 + libsndfile ]; } diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 425b2b866a5a..99aedae19124 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 66f82226b507..ba3f31d05014 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { homepage = http://gillesdegottex.github.io/fmit/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index fb1ed7280308..bdb32ab01e24 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3, python3Packages, intltool , glibcLocales, gnome3, gtk3, wrapGAppsHook -, ipodSupport ? false, libgpod +, ipodSupport ? false, libgpod, gobjectIntrospection }: python3Packages.buildPythonApplication rec { @@ -22,14 +22,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool - python3Packages.wrapPython wrapGAppsHook glibcLocales ]; - buildInputs = [ - python3 - ]; + buildInputs = [ python3 gobjectIntrospection ]; checkInputs = with python3Packages; [ coverage minimock diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 4b552301dd3d..8c2987352fbb 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -17,7 +17,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "7.0"; + version = "7.1"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9"; + sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 6653526c6e2f..d2720fcace67 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix new file mode 100644 index 000000000000..fd9dee624206 --- /dev/null +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: + +stdenv.mkDerivation rec { + name = "infamousPlugins-v${version}"; + version = "0.2.03"; + + src = fetchFromGitHub { + owner = "ssj71"; + repo = "infamousPlugins"; + rev = "v${version}"; + sha256 = "1pb7vmc703j25rnyx81cqlfzi66v7gm4a49s06dbgy8a66s1i2zl"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; + + meta = with stdenv.lib; { + homepage = https://ssj71.github.io/infamousPlugins; + description = "A collection of open-source LV2 plugins"; + longDescription = '' + These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. + This collection contains: + * Cellular Automaton Synth - additive synthesizer, where 16 harmonics are added according to rules of elementary cellular automata + * Envelope Follower - a fully featured envelope follower plugin + * Hip2B - a distortion/destroyer plugin + * cheap distortion - another distortion plugin, but this one I wanted to get it as light as possible + * stuck - a clone of the electro-harmonix freeze + * power cut - this effect is commonly called tape stop + * power up - the opposite of the power cut + * ewham - a whammy style pitchshifter + * lushlife - a simulated double tracking plugin capable of everything from a thin beatle effect to thick lush choruses to weird outlandish effects + ''; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 6a013e8c604f..344e6894baf5 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index f011e909052c..55039e8508bc 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { homepage = http://www.ibrahimshaath.co.uk/keyfinder/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 206754a51955..f355c540f301 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 467e11daaf65..90e4eabeef0b 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { faust2jaqt -time -vec -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" - for f in *.dsp; do faust2lv2 -time -vec -double -gui -t 99999 $f diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index b452d91426e0..73dd7b48e9c4 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index d1959ec3cebc..39065db6edeb 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -time -t 99999 LazyLimiter.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index 6216ba555938..362451988d38 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 MBdistortion.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 0bb2034fc46e..3f809aa78474 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -time -vec -t 99999 RhythmDelay.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index e526e40a1e36..fece392ab1cc 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { faust2jaqt -time -double -t 99999 $f done - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" - for f in *.dsp; do - echo "compiling plugin from" $f + echo "Compiling plugin from" $f faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index daa23baa966b..6237628e600c 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { do echo "Building jack standalone for $f" faust2jaqt -vec -time -t 99999 "$f" - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" echo "Building lv2 for $f" faust2lv2 -vec -time -gui -t 99999 "$f" done diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 422aabb28299..cb9247fd3d08 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildPhase = '' faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp - sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp ''; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index d1c6ed6379a8..55f3a667e06f 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 1f309c4503bf..219b04b4ec41 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.11.0"; + version = "3.12.4"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq"; + sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 1e0b46826cf0..1b30399ae0a5 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.7"; + name = "mpg123-1.25.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i"; + sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ca147ffc7352..93e909fc604b 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; + sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; }; buildInputs = [ glib ncurses mpd_clientlib ]; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 4452ab23cd5e..10c3bb2a195d 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A featureful ncurses based MPD client inspired by ncmpc"; homepage = https://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ]; + maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index ad4a06cff994..a727160ff299 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { name = "normalize-${version}"; version = "0.7.7"; src = fetchurl { - url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz"; + url = "mirror://savannah/normalize/${name}.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; + buildInputs = [ libmad ]; + meta = with stdenv.lib; { homepage = http://normalize.nongnu.org/; description = "Audio file normalizer"; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 8a7ab8889a66..d864d5972bce 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.8"; + name = "opusfile-0.10"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc"; + sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index e4ec281cacb8..ae43bad5b2c2 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchurl, puredata }: +{ stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { name = "cyclone-${version}"; - version = "0.1-alpha55"; + version = "0.3beta-2"; - src = fetchurl { - url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz"; - sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + src = fetchFromGitHub { + owner = "porres"; + repo = "pd-cyclone"; + rev = "cyclone${version}"; + sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q"; }; buildInputs = [ puredata ]; - hardeningDisable = [ "format" ]; + makeFlags = [ + "pdincludepath=${puredata}/include/pd" + "prefix=$(out)" + ]; - patchPhase = '' - for file in `grep -r -l g_canvas.h` - do - sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file - done - for file in `grep -r -l m_imp.h` - do - sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file - done - ''; - - installPhase = '' - mkdir -p $out/cyclone - cp -r bin/* $out/cyclone + postInstall = '' + mv "$out/lib/pd-externals/cyclone" "$out/" + rm -rf $out/lib ''; meta = { diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 3b836d9eb330..0eb75d77c68c 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -1,28 +1,26 @@ -{ stdenv, fetchurl, puredata }: +{ stdenv, fetchFromGitHub, puredata }: stdenv.mkDerivation rec { name = "maxlib-${version}"; - version = "1.5.5"; + version = "1.5.7"; - src = fetchurl { - url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz"; - sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + src = fetchFromGitHub { + owner = "electrickery"; + repo = "pd-maxlib"; + rev = "v${version}"; + sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn"; }; buildInputs = [ puredata ]; hardeningDisable = [ "format" ]; - patchPhase = '' - for i in ${puredata}/include/pd/*; do - ln -s $i . - done - sed -i "s@/usr@$out@g" Makefile - ''; + makeFlags = [ "prefix=$(out)" ]; postInstall = '' - mv $out/local/lib/pd-externals/maxlib/ $out + mv $out/lib/pd-externals/maxlib/ $out rm -rf $out/local/ + rm -rf $out/lib/ ''; meta = { diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index f8a25256bb07..f2e54b327fce 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchurl, unzip, puredata }: +{ stdenv, fetchurl, unzip, puredata, fftw }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.0"; name = "timbreid-${version}"; src = fetchurl { url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; - sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; }; - buildInputs = [ unzip puredata ]; + buildInputs = [ unzip puredata fftw ]; unpackPhase = '' + mkdir source + cd source unzip $src - mv timbreID-0.6.0-src/tID/* . - rm -rf timbreID-0.6.0-src/tID/ - rm -rf timbreID-0.6.0-src/INSTALL.txt ''; + buildPhase = '' + make tIDLib.o all + ''; + installPhase = '' mkdir -p $out/ cp -r *.pd $out/ cp -r *.pd_linux $out/ - cp -r *.wav $out/ + cp -r audio/ $out/ + cp -r data/ $out/ + cp -r doc/ $out/ ''; + postFixup = '' + mv $out/share/doc/ $out/ + rm -rf $out/share/ + ''; + meta = { description = "A collection of audio feature analysis externals for puredata"; homepage = http://williambrent.conflations.com/pages/research.html; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix new file mode 100644 index 000000000000..9f51d3008259 --- /dev/null +++ b/pkgs/applications/audio/pmidi/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib +, version ? "1.7.1" +, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" +}: +stdenv.mkDerivation { + name = "pmidi-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; + sha256 = sourceSha256; + }; + + buildInputs = [ alsaLib ]; + + meta = with stdenv.lib; { + homepage = http://www.parabola.me.uk/alsa/pmidi.html; + description = "A straightforward command line program to play midi files through the ALSA sequencer"; + maintainers = with maintainers; [ lheckemann ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 77c82f1737c6..6b816cdeec10 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.10"; + name = "qmmp-1.2.0"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy"; + sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840"; }; buildInputs = diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index ebeef301e103..11ee00adc887 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.filter24.org/seq24; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu nckx ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9ac0c49ebc31..35c5dff27106 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.69.336.g7edcc575-39"; + version = "1.0.70.399.g5ffabd56-26"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; + sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 9aa24738c379..d234f6b6b8cc 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.0.10"; + name = "xmp-4.1.0"; meta = with stdenv.lib; { description = "Extended module player"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; - sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"; + sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; nativeBuildInputs = [ pkgconfig ]; |