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.

16 files changed, 173 insertions, 154 deletions

diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 589d20cb1260..5e8dfd93f30e 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libpng, python3, boost, mesa, qt5, ncurses }:
+{ stdenv, fetchgit, libpng, python3, boost, mesa, qtbase, ncurses }:
 
 let
   gitRev    = "745eca3a2d2657c495d5509e9083c884e021d09c";
@@ -19,7 +19,7 @@ in
 
     buildInputs = [
       libpng python3 (boost.override { python = python3; })
-      mesa qt5.base ncurses
+      mesa qtbase ncurses
     ];
 
     configurePhase = ''
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 10d4f703a825..072cc698e920 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }:
 
 let version = "7.1"; in
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "apitrace";
   };
 
-  buildInputs = [ libX11 procps python qt5.base ];
+  buildInputs = [ libX11 procps python qtbase ];
   nativeBuildInputs = [ cmake ];
 
   buildPhase = ''
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
new file mode 100644
index 000000000000..c71b1f9335b4
--- /dev/null
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchurl, qtbase, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "awesomebump-4.0";
+
+  src = fetchurl {
+    url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
+    sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+  };
+
+  setSourceRoot = "sourceRoot=$(echo */Sources)";
+
+  buildInputs = [ qtbase makeWrapper ];
+
+  preBuild = "qmake";
+
+  enableParallelBuilding = true;
+
+  installPhase =
+    ''
+      d=$out/libexec/AwesomeBump
+      mkdir -p $d $out/bin
+      cp AwesomeBump $d/
+      cp -prd ../Bin/Configs ../Bin/Core $d/
+
+      # AwesomeBump expects to find Core and Configs in its current
+      # directory.
+      makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+        --run "cd $d"
+    '';
+
+  meta = {
+    homepage = https://github.com/kmkolasinski/AwesomeBump;
+    description = "A program to generate normal, height, specular or ambient occlusion textures from a single image";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 7d5d4cc7acb9..1715e3785dac 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.8";
+  version = "1.6.9";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn";
+    sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 9f1f53abc5c4..c1c1861cd3d9 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX
+{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
 , libjpeg, qtbase
-, makeWrapper }:
-let ghostscript = ghostscriptX; in
+, makeQtWrapper
+}:
+
 stdenv.mkDerivation rec {
   name = "ipe-7.1.10";
 
@@ -21,16 +22,18 @@ stdenv.mkDerivation rec {
   '';
 
   IPEPREFIX="$$out";
-  URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+  URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
   LUA_PACKAGE = "lua";
 
   buildInputs = [
-    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper
+    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
   ];
 
-  postInstall = ''
+  nativeBuildInputs = [ makeQtWrapper ];
+
+  postFixup = ''
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
+      wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
     done
   '';
 
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index 5e7835b35499..98152694c6d9 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl
+{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, boost, exiv2, fftwFloat, gsl
 , ilmbase, lcms2, libraw, libtiff, openexr
+, qtbase, qtdeclarative, qttools, qtwebkit
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      qt5.base qt5.declarative qt5.tools qt5.webkit
+      qtbase qtdeclarative qttools qtwebkit
       boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
     ];
 
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 7ae6d6e050fa..c96b0c182a62 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }:
+{ stdenv, fetchurl, cmake, makeWrapper, exiv2, graphicsmagick
+, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
+}:
 
 let
   version = "1.3";
   qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
-    qt5.quickcontrols
-    qt5.declarative
-    qt5.multimedia
+    qtquickcontrols
+    qtdeclarative
+    qtmultimedia
   ];
 in
 stdenv.mkDerivation rec {
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
-  buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ];
+  buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ];
 
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index f1a46b63d588..6803b969b4b5 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5, exiv2 }:
+{ stdenv, fetchFromGitHub, qtbase, exiv2 }:
 
 stdenv.mkDerivation rec {
   name = "phototonic-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1agd3bsrpljd019qrjvlbim5l0bhpx53dhpc0gvyn0wmcdzn92gj";
   };
 
-  buildInputs = [ qt5.base exiv2 ];
+  buildInputs = [ qtbase exiv2 ];
 
   configurePhase = ''
     sed -i 's;/usr;;' phototonic.pro
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 13636e1f1fe5..3cc5fe6fdd28 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "potrace-${version}";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchurl {
     url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
-    sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh";
+    sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2";
   };
 
   configureFlags = [ "--with-libpotrace" ];
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 701ad47985bc..cb92947b766d 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchgit, qt5, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline }: 
+{ stdenv, fetchgit, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
+, qtbase
+}:
 
 stdenv.mkDerivation rec {
   version = "0.9.5";
@@ -9,8 +11,8 @@ stdenv.mkDerivation rec {
     rev = "refs/tags/v${version}";
     sha256 = "15c18jvgbwyrfhv7r35ih0gzx35vjlsbi984h1sckgh2z17hjq8l";
   };
-  
-  buildInputs = [qt5.base cgal boost gmp mpfr flex bison dxflib readline ];
+
+  buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline ];
 
   configurePhase = ''
     qmake;
diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
deleted file mode 100644
index 3de7057916aa..000000000000
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null
-, gt68xxFirmware ? null, snapscanFirmware ? null
-}:
-let
-  firmware = gt68xxFirmware { inherit fetchurl; };
-in
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
-
-stdenv.mkDerivation {
-  name = "sane-backends-1.0.25.177-g753d123";
-
-  src = fetchgit {
-    url = "git://alioth.debian.org/git/sane/sane-backends.git";
-    rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25";
-    sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f";
-  };
-
-  udevSupport = hotplugSupport;
-
-  buildInputs = if libusb != null then [libusb] else [];
-
-  postInstall = ''
-    if test "$udevSupport" = "1"; then
-      mkdir -p $out/etc/udev/rules.d/
-      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
-      cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
-    fi
-  '';
-
-  preInstall =
-    if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
-      " \${out}/share/sane/gt68xx/" + firmware.name
-    else if snapscanFirmware != null then
-      "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
-      " \${out}/share/sane/snapscan/your-firmwarefile.bin ;" +
-      "mkdir -p \${out}/etc/sane.d ; " +
-      "echo epson2 > \${out}/etc/sane.d/dll.conf"
-    else "";
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.sane-project.org/";
-    description = "SANE (Scanner Access Now Easy) backends";
-    longDescription = ''
-      Collection of open-source SANE backends (device drivers).
-      SANE is a universal scanner interface providing standardized access to
-      any raster image scanner hardware: flatbed scanners, hand-held scanners,
-      video- and still-cameras, frame-grabbers, etc. For a list of supported
-      scanners, see http://www.sane-project.org/sane-backends.html.
-    '';
-    license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ nckx simons ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
deleted file mode 100644
index fb943ac23b5d..000000000000
--- a/pkgs/applications/graphics/sane/backends.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
-, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null
-}:
-
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
-
-let
-  firmware = gt68xxFirmware { inherit fetchurl; };
-in
-stdenv.mkDerivation rec {
-  version = "1.0.25";
-  name = "sane-backends-${version}";
-
-  src = fetchurl {
-    urls = [
-      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz"
-      "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz"
-    ];
-    curlOpts = "--insecure";
-    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
-  };
-
-  outputs = [ "out" "doc" "man" ];
-
-  udevSupport = hotplugSupport;
-
-  configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
-
-  buildInputs = []
-    ++ stdenv.lib.optional (libusb != null) libusb
-    ++ stdenv.lib.optional (libv4l != null) libv4l
-    ++ stdenv.lib.optional (pkgconfig != null) pkgconfig
-    ;
-
-  postInstall = ''
-    if test "$udevSupport" = "1"; then
-      mkdir -p $out/etc/udev/rules.d/
-      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
-      cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
-    fi
-  '';
-
-  preInstall =
-    if gt68xxFirmware != null then
-      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
-      " \${out}/share/sane/gt68xx/" + firmware.name
-    else if snapscanFirmware != null then
-      "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware +
-      " \${out}/share/sane/snapscan/your-firmwarefile.bin"
-    else "";
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.sane-project.org/";
-    description = "SANE (Scanner Access Now Easy) backends";
-    longDescription = ''
-      Collection of open-source SANE backends (device drivers).
-      SANE is a universal scanner interface providing standardized access to
-      any raster image scanner hardware: flatbed scanners, hand-held scanners,
-      video- and still-cameras, frame-grabbers, etc. For a list of supported
-      scanners, see http://www.sane-project.org/sane-backends.html.
-    '';
-    license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ nckx simons ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
new file mode 100644
index 000000000000..a3ca7fdd55df
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0.25";
+  src = fetchurl {
+    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz"
+    ];
+    curlOpts = "--insecure";
+  };
+})
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
new file mode 100644
index 000000000000..e98774a43681
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl
+, avahi, libusb1, libv4l, net_snmp
+, gettext, pkgconfig
+
+# List of { src name backend } attibute sets - see installFirmware below:
+, extraFirmware ? []
+
+# For backwards compatibility with older setups; use extraFirmware instead:
+, gt68xxFirmware ? null, snapscanFirmware ? null
+
+# Passed from versioned package (e.g. default.nix, git.nix):
+, version, src, ...
+}:
+
+stdenv.mkDerivation {
+  inherit src;
+
+  name = "sane-backends-${version}";
+
+  outputs = [ "out" "doc" "man" ];
+
+  configureFlags = []
+    ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
+    ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
+    ;
+
+  buildInputs = [ avahi libusb1 libv4l net_snmp ];
+  nativeBuildInputs = [ gettext pkgconfig ];
+
+  postInstall = let
+
+    compatFirmware = extraFirmware
+      ++ stdenv.lib.optional (gt68xxFirmware != null) {
+        src = gt68xxFirmware.fw;
+        inherit (gt68xxFirmware) name;
+        backend = "gt68xx";
+      }
+      ++ stdenv.lib.optional (snapscanFirmware != null) {
+        src = snapscanFirmware;
+        name = "your-firmwarefile.bin";
+        backend = "snapscan";
+      };
+
+    installFirmware = f: ''
+      mkdir -p $out/share/sane/${f.backend}
+      ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
+    '';
+
+  in ''
+    mkdir -p $out/etc/udev/rules.d/
+    ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
+    cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+  '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
+
+  meta = with stdenv.lib; {
+    inherit version;
+
+    description = "SANE (Scanner Access Now Easy) backends";
+    longDescription = ''
+      Collection of open-source SANE backends (device drivers).
+      SANE is a universal scanner interface providing standardized access to
+      any raster image scanner hardware: flatbed scanners, hand-held scanners,
+      video- and still-cameras, frame-grabbers, etc. For a list of supported
+      scanners, see http://www.sane-project.org/sane-backends.html.
+    '';
+    homepage = "http://www.sane-project.org/";
+    license = licenses.gpl2Plus;
+
+    maintainers = with maintainers; [ nckx simons ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
new file mode 100644
index 000000000000..6c6838daef17
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "2015-12-27";
+  src = fetchgit {
+    sha256 = "4bf6e8815d2edbbc75255928d0fb030639a9fea9a5aa953dcf1f00e167eff527";
+    rev = "cadb4b0fff00540159625320416e5601c4704627";
+    url = "git://alioth.debian.org/git/sane/sane-backends.git";
+  };
+})
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 4dd30697f0bc..c169d262fb63 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
-, libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }:
+, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }:
 
-let version = "3.19.2"; in
+let version = "3.19.3"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "08454ky855iaiq5wn9rdbfal3i4fjss5fn5mg6cmags50wy9spsg";
+    sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
-  buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
+  buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends
     vala ];
   nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];