diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
commit | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (patch) | |
tree | 29bdc77cfbcf01a583c7600f9df3426abe5f1e6d /pkgs/applications/audio | |
parent | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (diff) | |
parent | 8b57a7573c04cc02b86228bc263afe16bc3fe748 (diff) | |
download | nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.gz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.bz2 nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.lz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.xz nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.tar.zst nixpkgs-6c8aed6391a5e9f69cb59792aed58c5f33650275.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/qsynth/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/quodlibet/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/audio/samplv1/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sonic-pi/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/audio/spotifyd/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/synthv1/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/vocal/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/x42-plugins/default.nix | 4 |
8 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 81b7e35b630..09ab372cf27 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }: +{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkgconfig +, mkDerivation, qtbase, qttools, qtx11extras +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qsynth"; version = "0.5.7"; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf pkgconfig ]; - buildInputs = [ alsaLib fluidsynth libjack2 qt5.qtbase qt5.qttools qt5.qtx11extras ]; + buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c874bdd40d2..573dca518e3 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -65,5 +65,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; + broken = true; }; } diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 5a62a8a4292..134757079f6 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samplv1"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "1y61wb0bzm1cz7y8xxv6hp8mrkfb9zm9irg6zs4g6aanw539r6l8"; + sha256 = "04p5jkighmc8rf7fzzy8ch6knqbxv03vhjzdfh9dva2mlzw9rvjj"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 2a39caa0865..055678b0e35 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -100,5 +100,6 @@ mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; platforms = lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index fab12a3e724..d420d1a6709 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "12826b0wf31m9vw1s7bcd1hb4ygb1xn4sdknn1y9kzc68brsq94v"; + sha256 = "063b28ysj224m6ngns9i574i7vnp1x4g07cqjw908ch04yngcg1c"; }; - cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm"; + cargoSha256 = "0pqxqd5dyw9mjclrqkxzfnzsz74xl4bg0b86v5q6kc0a91zd49b9"; cargoBuildFlags = [ "--no-default-features" @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; license = with licenses; [ gpl3 ]; - maintainers = [ maintainers.anderslundstedt ]; + maintainers = [ maintainers.anderslundstedt maintainers.marsam ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 1c373aefb4f..6d650abfb97 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "synthv1"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "0cvamqzg74qfr7kzk3skimskmv0j3d1rmmpbpsmfcrg8srvyx9r2"; + sha256 = "1ssdm7aiaz908ydqwdx9khxnnd0yfacjgvbxg5p9s9xhkbqqc2f2"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index c4333b09f18..c26d8b6d360 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , ninja +, vala , pkgconfig , pantheon , gtk3 @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { cmake libxml2 ninja - pantheon.vala + vala pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 22594d3ec85..df216fe571d 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 = "20190714"; + version = "20190820"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "1mifmdy9pi1lg0h4nsvyjjnnni41vhgg34lks94mrx46wq90bgx4"; + sha256 = "0dqsa5yxm3nx50j9k28iillj4sx2mjndzyspymxx0ghir1qmi4vh"; }; nativeBuildInputs = [ pkgconfig ]; |