Merge branch 'master' into hardened-stdenv

pkgs/tools/graphics/asymptote/default.nix

@@ -10,11 +10,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.35";
+    version="2.36";
     name="${baseName}-${version}";
-    hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
-    url="mirror://sourceforge/asymptote/2.35/asymptote-2.35.src.tgz";
-    sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
+    hash="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd";
+    url="mirror://sourceforge/project/asymptote/2.36/asymptote-2.36.src.tgz";
+    sha256="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd";
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 

pkgs/tools/graphics/scrot/default.nix

@@ -1,18 +1,33 @@
-{ stdenv, fetchurl, giblib, xlibsWrapper }:
+{ stdenv, fetchurl, fetchzip, giblib, xlibsWrapper }:
 
+let
+  debPatch = fetchzip {
+    url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz;
+    sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5";
+  };
+in
 stdenv.mkDerivation rec {
-  name = "scrot-0.8";
+  name = "scrot-0.8-17";
 
   src = fetchurl {
     url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
     sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
   };
 
+  inherit debPatch;
+
+  postPatch = ''
+    for patch in $(cat $debPatch/patches/series); do
+      patch -p1 < "$debPatch/patches/$patch"
+    done
+  '';
+
   buildInputs = [ giblib xlibsWrapper ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://linuxbrit.co.uk/scrot/;
     description = "A command-line screen capture utility";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ garbas ];
   };
 }