Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.

1 files changed, 17 insertions, 17 deletions

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 5bd2087b3458..1cb2baeeee6a 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,29 +1,15 @@
-{ stdenv, fetchurl, ffmpeg, makeDesktopItem, qt4 }:
+{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4 }:
 
-let version = "3.5.4"; in
+let version = "3.5.6"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "1zvicmxnkldqnfri8y0q0vx6f5whsc7jc9jcsfzhpw47w92qvx5r";
+    sha256 = "0wm6hqaq6ydbvvd0fqkfydxd5h7gf4di7lvq63xgxl4z40jqc25n";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "http://download.clipgrab.de/${name}.tar.gz";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Video downloader for YouTube and other sites";
-    longDescription = ''
-      ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
-      Dailymotion and many other online video sites. It converts downloaded
-      videos to MPEG4, MP3 or other formats in just one easy step.
-    '';
-    homepage = http://clipgrab.org/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ ffmpeg qt4 ];
 
   postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
@@ -53,4 +39,18 @@ stdenv.mkDerivation rec {
     install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
     cp -r ${desktopItem}/share/applications $out/share
   '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Video downloader for YouTube and other sites";
+    longDescription = ''
+      ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
+      Dailymotion and many other online video sites. It converts downloaded
+      videos to MPEG4, MP3 or other formats in just one easy step.
+    '';
+    homepage = http://clipgrab.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }