Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 40 insertions, 31 deletions

diff --git a/nixpkgs/pkgs/applications/misc/variety/default.nix b/nixpkgs/pkgs/applications/misc/variety/default.nix
index 4241f9153293..2366d04b9ca1 100644
--- a/nixpkgs/pkgs/applications/misc/variety/default.nix
+++ b/nixpkgs/pkgs/applications/misc/variety/default.nix
@@ -1,31 +1,28 @@
-{
-  fehSupport ? false, feh
-, imagemagickSupport ? true, imagemagick
-, stdenv
-, lib
+{ stdenv, lib, fetchFromGitHub
 , python37Packages
-, fetchFromGitHub
+, fehSupport ? false, feh
+, imagemagickSupport ? true, imagemagick
 , intltool
 , gtk3
 , gexiv2
 , libnotify
-, wrapGAppsHook
 , gobject-introspection
 , hicolor-icon-theme
 , librsvg
+, wrapGAppsHook
 }:
 
 with python37Packages;
 
 buildPythonApplication rec {
   pname = "variety";
-  version = "0.7.2-96-g3afe3ab";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "varietywalls";
     repo = "variety";
-    rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1";
-    sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5";
+    rev = version;
+    sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M=";
   };
 
   nativeBuildInputs = [ intltool wrapGAppsHook ];
@@ -43,31 +40,43 @@ buildPythonApplication rec {
       --replace /bin/bash ${stdenv.shell}
   '';
 
-  propagatedBuildInputs =
-       [ gtk3
-         gexiv2
-         libnotify
-         beautifulsoup4
-         lxml
-         pycairo
-         pygobject3
-         configobj
-         pillow
-         setuptools
-         requests
-         httplib2
-         dbus-python
-         gobject-introspection
-         hicolor-icon-theme
-         librsvg
-       ]
-    ++ lib.optional fehSupport feh
+  propagatedBuildInputs = [
+    beautifulsoup4
+    configobj
+    dbus-python
+    gexiv2
+    gobject-introspection
+    gtk3
+    hicolor-icon-theme
+    httplib2
+    libnotify
+    librsvg
+    lxml
+    pillow
+    pycairo
+    pygobject3
+    requests
+    setuptools
+  ] ++ lib.optional fehSupport feh
     ++ lib.optional imagemagickSupport imagemagick;
 
   meta = with lib; {
-    description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more";
     homepage = "https://github.com/varietywalls/variety";
+    description = "A wallpaper manager for Linux systems";
+    longDescription = ''
+      Variety is a wallpaper manager for Linux systems. It supports numerous
+      desktops and wallpaper sources, including local files and online services:
+      Flickr, Wallhaven, Unsplash, and more.
+
+      Where supported, Variety sits as a tray icon to allow easy pausing and
+      resuming. Otherwise, its desktop entry menu provides a similar set of
+      options.
+
+      Variety also includes a range of image effects, such as oil painting and
+      blur, as well as options to layer quotes and a clock onto the background.
+    '';
     license = licenses.gpl3;
-    maintainers = [ maintainers.zfnmxt ];
+    maintainers = with maintainers; [ AndersonTorres zfnmxt ];
+    platforms = with platforms; linux;
   };
 }