diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
commit | ea8ae88f0447b0cf7aa8a07844cac78e001f5622 (patch) | |
tree | 3c9e5c92d6f3fd72d2a622ee39ddd52306010f28 /pkgs/applications/audio | |
parent | 1bb18d9e8dbe537225c8d6ae8476aae3c40df368 (diff) | |
parent | 5ff1a53a32b332e3b1a1e295e12e184c65833d13 (diff) |
Merge branch 'staging' into glibc230
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/gnaural/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/audio/gpodder/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/muse/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/audio/ncmpc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/x42-plugins/default.nix | 4 |
5 files changed, 13 insertions, 42 deletions
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix deleted file mode 100644 index f5887e870db6e..0000000000000 --- a/pkgs/applications/audio/gnaural/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libsndfile, portaudio }: - -stdenv.mkDerivation rec { - name = "gnaural-1.0.20110606"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 libsndfile portaudio ]; - src = fetchurl { - url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; - sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; - }; - meta = with stdenv.lib; - { description = "Auditory binaural-beat generator"; - homepage = http://gnaural.sourceforge.net/; - license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index b972aae7de807..1d6bc33cc5544 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.11"; + version = "3.10.12"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "15f5z3cnch9lpzbz73l4wjykv9n74y8djz5db53la2ql4ihaxfz9"; + sha256 = "0q95am079gg01dkivr972mm2k87y8z296a9yf7amzsf9hxfycdra"; }; patches = [ diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 372c8faf773d5..f1fad05beced4 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub , libjack2 -, qt5 +, wrapQtAppsHook +, qtsvg +, qttools , cmake , libsndfile , libsamplerate @@ -13,7 +15,6 @@ , dssi , liblo , pkgconfig -, gitAndTools }: stdenv.mkDerivation { @@ -45,14 +46,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig - gitAndTools.gitFull + wrapQtAppsHook + qttools + cmake ]; buildInputs = [ libjack2 - qt5.qtsvg - qt5.qttools - cmake + qtsvg libsndfile libsamplerate ladspaH @@ -65,15 +66,4 @@ stdenv.mkDerivation { ]; sourceRoot = "source/muse3"; - - buildPhase = '' - cd .. - bash compile_muse.sh - ''; - - installPhase = '' - mkdir $out - cd build - make install - ''; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 58eb5462ef84b..c95177cd3821e 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.36"; + version = "0.37"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1ssmk1p43gjhcqi86sh6b7csqpwwpf3hs32cmnylv6pmbcwbs69h"; + sha256 = "1b0vd0h49kjg4nxjfjrcg8gzplz93ryr6xyfha2pvhlrzdd2d1lj"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index bae9cef715015..f4087506daa32 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20191215"; + version = "20200114"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c"; + sha256 = "02f8wnsl9wg7pgf4sshr0hdjfjkwln870ffgjmb01nqk37v7hiyn"; }; nativeBuildInputs = [ pkgconfig ]; |