Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

4 files changed, 53 insertions, 9 deletions

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index c28349a31ccf..db7fad78a49c 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/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 
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
new file mode 100644
index 000000000000..ea73a0e95b9d
--- /dev/null
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dpic-${version}";
+  version = "2016.01.12";
+
+  src = fetchurl {
+    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+    sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  makeFlags = "CC=${stdenv.cc.outPath}/bin/cc";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -fv dpic $out/bin
+  '';
+
+  meta = {
+    homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/";
+    description = "An implementation of the pic little language for creating drawings";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ stdenv.lib.maintainers.aespinosa ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index d1badc735095..777139d47fee 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A tool for easy screencapping and uploading to imgur.";
+    description = "A tool for easy screencapping and uploading to imgur";
     homepage = "https://https://github.com/jomo/imgur-screenshot/";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index aa8958bb63df..5e4fd3ff0624 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/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 ];
   };
 }