diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-27 07:01:38 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-27 07:01:38 +0200 |
commit | 883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c (patch) | |
tree | 1f6366122193b376ae045a520f4e05610ac0a7b1 /pkgs/applications/audio | |
parent | 1aff8dc4074013e0018bb749fd82b771c41ea839 (diff) | |
parent | 3f46165af3f74df4eed27418377733cf237a33a0 (diff) | |
download | nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.gz nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.bz2 nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.lz nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.xz nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.tar.zst nixpkgs-883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/lollypop/default.nix | 40 | ||||
-rw-r--r-- | pkgs/applications/audio/padthv1/default.nix | 4 |
2 files changed, 31 insertions, 13 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 565c0b31522..2a790514447 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,27 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig -, python3, gtk3, gst_all_1, libsecret, libsoup -, appstream-glib, desktop-file-utils, totem-pl-parser -, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchgit +, meson +, ninja +, pkgconfig +, python3 +, gtk3 +, gst_all_1 +, libsecret +, libsoup +, appstream-glib +, desktop-file-utils +, totem-pl-parser +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, lastFMSupport ? true +, wikipediaSupport ? true +, youtubeSupport ? true, youtube-dl +}: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.5"; + version = "1.0.7"; format = "other"; doCheck = false; @@ -14,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry"; + sha256 = "0gdds4qssn32axsa5janqny5i4426azj5wyj6bzn026zs3z38svn"; }; nativeBuildInputs = [ @@ -37,10 +53,9 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 hicolor-icon-theme - libsecret libsoup totem-pl-parser - ]; + ] ++ lib.optional lastFMSupport libsecret; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 @@ -49,8 +64,11 @@ python3.pkgs.buildPythonApplication rec { pycairo pydbus pygobject3 - pylast - ]; + ] + ++ lib.optional lastFMSupport pylast + ++ lib.optional wikipediaSupport wikipedia + ++ lib.optional youtubeSupport youtube-dl + ; postPatch = '' chmod +x meson_post_install.py @@ -62,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/lollypop-sp" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern music player for GNOME"; homepage = https://wiki.gnome.org/Apps/Lollypop; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5957a740f35..b2e5fb11ac3 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh"; + sha256 = "0ddvlpjlg6zr9ckanqhisw0sgm8rxibvj1aj5dxzs9xb2wlwd8rr"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; |