treewide: remove aliases in nixpkgs

This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup

59 files changed, 149 insertions, 148 deletions

diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index a16593d4d1b..8f3facec09b 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
-, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
+, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain
 , gtk3
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/flacon \
       --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-      --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
+      --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools
      mp3gain lame wavpack vorbisgain ]}"
   '';
 
diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix
index 6e1e576043d..1ad57efda7a 100644
--- a/pkgs/applications/audio/pulseaudio-ctl/default.nix
+++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, makeWrapper
-, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }:
+, bc, dbus, gawk, gnused, libnotify, pulseaudio }:
 
 let
-  path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ];
+  path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ];
   pname = "pulseaudio-ctl";
 
 in stdenv.mkDerivation rec {
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 9bed504103a..529b0dbd42b 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused, 
-  procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, 
-  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev, 
-  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, 
+{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
+  procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
+  fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
+  libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
   libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
   maxRam ? "1024m" }:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   rev = "1512021600670_4503";
   pname = "CrashPlanSmb";
   name = "${pname}_${version}_${rev}";
-  
+
   src = fetchurl {
     url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
     sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   vardir = "/var/lib/crashplan";
   manifestdir = "${vardir}/manifest";
-  
+
   postPatch = ''
     # patch scripts/CrashPlanEngine
     substituteInPlace scripts/CrashPlanEngine \
@@ -85,10 +85,10 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
-    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ 
-      stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype 
-      fontconfig dbus gconf nss nspr alsaLib cups expat libudev 
-      libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite 
+    wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
+      stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
+      fontconfig dbus gconf nss nspr alsaLib cups expat udev
+      libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
       libXext libXfixes libXrender libXtst libXScrnSaver]}"
   '';
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 6765c5f9dfd..6ba053499f9 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
+, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
 , qt4 ? null
 , withQt5 ? false, qtbase
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
-    qt4 libaudit
+    qt4 audit
   ] ++ optional withQt5 qtbase;
 
   configureFlags = [
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 5160e02963f..12e3dad9c79 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus_libs, makeWrapper }:
+, fontconfig, freetype, pam, dbus, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.6";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ cmake pkgconfig libjpeg libpng fontconfig freetype
-      pam dbus_libs
+      pam dbus
       xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
     ];
 
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index c24866671f9..6f5f416f4f5 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
   boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
   libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
-  coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
+  coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
 
 with stdenv.lib;
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
   buildInputs = [
-    dbus_libs
+    dbus
     openssl
     libxml2
     gnome3.gtksourceview
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 790c4ea45c0..7ba37bd14ff 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}:
+{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ qt5.qmake pkgconfig ];
-  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
+  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ];
 
   qmakeFlags = [ "NO_APPDATA=True" ];
 
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index d817424c452..30101bb9477 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
-  dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
+  dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
   xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
   libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
   libXrender, libXcomposite }:
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
   };
 
   libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
-    dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
+    dbus alsaLib cups.lib fontconfig glib icu libpng12
     xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
     libXcursor libXrandr libxcb libXi libSM libICE libXrender
     libXcomposite ];
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 34e7b1f2308..562fb8c11dc 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }:
 
 stdenv.mkDerivation {
   name ="openexr_viewers-2.2.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
+  buildInputs = [ openexr fltk libGLU_combined ctl ];
 
   meta = {
     description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 8817071e984..4b3a423a8ce 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }:
+{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }:
 
 # Warning: You will also need a working pdflatex installation containing
 # at least auctex and pgf.
@@ -64,8 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gettext qt5.full poppler_qt5 ];
+  buildInputs = [ gettext qt5.full poppler ];
 
   enableParallelBuilding = true;
 }
-
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index 5035685c64f..bb8a97e8341 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, copyPathsToStore, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
+  grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
+    grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
   ];
-  propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
+  propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
 }
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
index 3f6821e08ea..1628af7e220 100644
--- a/pkgs/applications/kde/kcalutils.nix
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
+  grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
   kidentitymanagement, kpimtextedit,
 }:
 
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
+    grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
     kidentitymanagement kpimtextedit
   ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
index fd3fe2d6c09..5be3d881b0c 100644
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -4,7 +4,7 @@
   akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
   incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
   kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
-  libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison
+  libksieve, mailcommon, mailimporter, messagelib, poppler, prison
 }:
 
 mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
     akonadi-import-wizard akonadi-notes calendarsupport eventviews
     incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
     kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
-    libksieve mailcommon mailimporter messagelib poppler_qt5 prison
+    libksieve mailcommon mailimporter messagelib poppler prison
   ];
 }
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
index 17c960d1762..05d174b0554 100644
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
+  grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
   kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
 }:
 
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
+    grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
     sonnet syntax-highlighting qttools
   ];
   propagatedBuildInputs = [ ktextwidgets ];
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
index f12158a1f71..23920a081c0 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/pkgs/applications/kde/messagelib.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
+  akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
   grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
   kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
   kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
@@ -16,7 +16,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
+    akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
     kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
     kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
     syntax-highlighting
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 33b16e3242c..4d997519246 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , cmake
 , jsoncpp
-, libjson_rpc_cpp
+, libjson-rpc-cpp
 , curl
 , boost
 , leveldb
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cmake
     jsoncpp
-    libjson_rpc_cpp
+    libjson-rpc-cpp
     curl
     boost
     leveldb
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index 144e1fa566c..daea20835c8 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:
+{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ qmake qttools ];
-  buildInputs = [ qtbase poppler_qt5 ];
+  buildInputs = [ qtbase poppler ];
 
   preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
     lrelease diffpdf.pro
   '';
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 09b6db3abf9..3e6a6ab53f7 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -7,7 +7,7 @@
 , libevent
 , libtool
 , libqrencode
-, libudev
+, udev
 , libusb
 , makeWrapper
 , pkgconfig
@@ -67,12 +67,12 @@ in stdenv.mkDerivation rec {
     qttools
   ];
 
-  buildInputs = with stdenv.lib; [
+  buildInputs = [
     # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
     libcap
     libevent
     libtool
-    libudev
+    udev
     libusb
     libqrencode
 
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 65b85868bc5..a70506f7aaa 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 0a2a051223a..b16507c8b7b 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
-, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
+, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
 }:
 
 let version = "0.3.1"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     automake autoconf intltool pkgconfig
-    libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
+    libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs
   ];
 
   buildInputs = [ gtk3 vte ];
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 56cbb338a40..7d48b61793c 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, ag, tree, man, stdenv, 
+{ fetchFromGitHub, silver-searcher, tree, man, stdenv,
   pandocSupport ? true, pandoc ? null
   , ... }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
     substituteInPlace memo \
-      --replace "ack_cmd=ack"       "ack_cmd=${ag}/bin/ag" \
+      --replace "ack_cmd=ack"       "ack_cmd=${silver-searcher}/bin/ag" \
       --replace "tree_cmd=tree"     "tree_cmd=${tree}/bin/tree" \
       --replace "man_cmd=man"       "man_cmd=${man}/bin/man" \
       --replace "pandoc_cmd=pandoc" "${pandocReplacement}"
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 42f1b58061e..5aaaa7a0e37 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, perl
-, alsaLib, libevdev, libopus, libudev, SDL2
+, alsaLib, libevdev, libopus, udev, SDL2
 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
 , curl, expat, avahi, enet, libuuid
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [
-    alsaLib libevdev libopus libudev SDL2
+    alsaLib libevdev libopus udev SDL2
     ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
     xorg.libpthreadstubs curl expat avahi enet libuuid
   ];
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
index 4ac152c2669..12f8c12b586 100644
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ b/pkgs/applications/misc/nixnote2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}:
+{ stdenv, mkDerivation, fetchFromGitHub, boost
+, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
 
 mkDerivation rec {
   name = "nixnote2-${version}";
@@ -11,7 +12,7 @@ mkDerivation rec {
     sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
   };
 
-  buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ];
+  buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
 
   enableParallelBuilding = true;
 
@@ -28,7 +29,7 @@ mkDerivation rec {
 
     substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
   '';
-  
+
   postInstal = ''
     cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
   '';
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index de64705d832..78105ea535d 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -16,7 +16,7 @@
 , intltool
 , isocodes
 , libcanberra-gtk3
-, libudev
+, udev
 , libxkbcommon
 , pkgconfig
 , procps
@@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec {
     hunspell
     isocodes
     libcanberra-gtk3
-    libudev
+    udev
     libxkbcommon
     wrapGAppsHook
     xorg.libXtst
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix
index 58e80e7f726..e1cc70e4277 100644
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, x11 }:
+{ stdenv, fetchurl, xorg, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
   version = "1.2.sakura.5";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
     sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
   };
-  buildInputs = [ xorg.imake xorg.gccmakedep x11 ];
-  
+  buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
+
   configurePhase = "xmkmf";
 
   installPhase = ''
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
   };
 }
-
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index f836ce5b808..dfaa90d43ad 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups
+{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
 , file, ghostscript
 }:
 let
@@ -12,7 +12,7 @@ let
   };
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [
-    qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript
+    qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 1d0c7d28de6..3ef5a6c4e34 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext
+{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
 , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
 , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
 , pkgconfig, python, pythonPackages, vte
@@ -22,13 +22,13 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
-      makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib
+      makeWrapper python pythonPackages.lockfile dbus dbus-glib
       gdk_pixbuf gsettings-desktop-schemas gtk3
       hicolor-icon-theme vte ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
+                         "-I${dbus.dev}/include/dbus-1.0"
+                         "-I${dbus.lib}/lib/dbus-1.0/include" ];
 
   # Fix up python path so the lockfile library is on it.
   PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index d2a2936680f..6df81aa1172 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -2,13 +2,13 @@
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, makeWrapper, nodejs
-, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 9df2a2dde76..48e0d19e20b 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter:
    $ make NOGUI=1
 */
 
-{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper,
+{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
   wxGUI ? true
 }:
 
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse devicemapper wxGTK nasm ];
+  buildInputs = [ fuse lvm2 wxGTK nasm ];
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index 1c5c4d1dcaa..bc5b19e7737 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself,
+{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
   wxGUI ? true
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
 
   nativeBuildInputs = [ makeself yasm pkgconfig ];
-  buildInputs = [ fuse devicemapper ]
+  buildInputs = [ fuse lvm2 ]
     ++ optional wxGUI wxGTK30;
   makeFlags = optionalString (!wxGUI) "NOGUI=1";
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6a5c9d67470..570180d4c4d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -5,7 +5,7 @@
 , curl
 , cups
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gconf
@@ -93,7 +93,7 @@ stdenv.mkDerivation {
       curl
       cups
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gconf
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 62fd4f533ea..584dca63297 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,7 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
 , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
-, libudev
+, udev
 , kerberos
 }:
 
@@ -66,7 +66,7 @@ let
           ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
           ++ extraNativeMessagingHosts
         );
-      libs = [ libudev ]
+      libs =   lib.optional stdenv.isLinux udev
             ++ lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optionals (cfg.enableQuakeLive or false)
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index d2d26190ce0..2df2043517a 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
+, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
 , kerberos
 
 # command line arguments which are always set e.g "--disable-gpu"
@@ -52,7 +52,7 @@ let
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
     alsaLib libXdamage libXtst libXrandr expat cups
-    dbus_libs gdk_pixbuf gcc-unwrapped.lib
+    dbus gdk_pixbuf gcc-unwrapped.lib
     systemd
     libexif
     liberation_ttf curl utillinux xdg_utils wget
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 8eae85099fb..7aba25dc339 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
 , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
-, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
+, alsaLib, dbus, cups, libexif, ffmpeg, systemd
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
 , gstreamer, gst-plugins-base, libxml2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
     libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-    atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
   ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index f10a88ec961..bee4c3bea20 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
-, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
+, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "newsboat-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       --replace "ncurses5.4" "ncurses"
   '';
 
-  nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
+  nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
                       ++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
 
   buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 681a8119ac0..820a742245e 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
 # Optional, Jitsi still runs without, but you may pass null:
-, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
+, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
 }:
 
 stdenv.mkDerivation rec {
@@ -25,13 +25,11 @@ stdenv.mkDerivation rec {
 
   libPath = lib.makeLibraryPath ([
     stdenv.cc.cc  # For libstdc++.
-  ] ++ lib.filter (x: x != null) [
     alsaLib
-    dbus_libs
+    dbus
     gtk2
     libpulseaudio
     openssl
-  ] ++ lib.optionals (xorg != null) [
     xorg.libX11
     xorg.libXext
     xorg.libXScrnSaver
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
index e41aea497a8..af58aaa0a76 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "purple-discord-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pidgin json_glib ];
+  buildInputs = [ pidgin json-glib ];
 
   makeFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 1ff67d02ff6..525a8a313f4 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];
-  buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]
-    ++ stdenv.lib.optional doCheck dbus_daemon;
+  buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
+
+  checkInputs = [ dbus.daemon ];
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 3f22aa28f36..82ad57ae927 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
-, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:
+, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }:
 
 stdenv.mkDerivation rec {
   project = "telepathy-logger";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     dbus-glib libxml2 sqlite telepathy-glib
-    dbus_libs telepathy-glib.python
+    dbus telepathy-glib.python
   ];
 
   configureFlags = "--enable-call";
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 4bd0f2e73e6..0139a3f3a93 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
+{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }:
 
 stdenv.mkDerivation rec {
   name = "linssid-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
-  buildInputs = [ qtbase qtsvg boost qwt6 ];
+  buildInputs = [ qtbase qtsvg boost qwt ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index c0f015944b0..390f68bd105 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }:
+{ stdenv, fetchurl, binutils, patchelf, makeWrapper
+, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
+, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
       expat
       stdenv.cc.cc.lib
       libpulseaudio
-      libudev
+      udev
     ];
   in ''
     patchelf \
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
     patchelf \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
       $out/opt/Inboxer/libffmpeg.so
-   
+
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/opt/Inboxer:${lpath}" \
@@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
   '';
-  
+
   installPhase = ''
     mkdir -p $out/bin
     cp -R usr/share opt $out/
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bea713c9e6b..b9b553f9447 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -7,7 +7,7 @@
 , cups
 , curl
 , dbus-glib
-, dbus_libs
+, dbus
 , fontconfig
 , freetype
 , gdk_pixbuf
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
       cups
       curl
       dbus-glib
-      dbus_libs
+      dbus
       fontconfig
       freetype
       gdk_pixbuf
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index e4bdec668a0..74ffb14f4ad 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync,
-  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }:
+  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "lsyncd-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     rsync
     cmake lua pkgconfig
-    asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt
+    asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index eca3ddd32e8..e43fd59e043 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -2,7 +2,7 @@
 , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
 , doxygen, pcre, libpthreadstubs, libXdmcp
 
-, oceSupport ? true, opencascade_oce
+, oceSupport ? true, opencascade
 , ngspiceSupport ? true, libngspice
 , scriptingSupport ? true, swig, python, wxPython
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags =
-    optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
+    optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
     ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
     ++ optionals (scriptingSupport) [
       "-DKICAD_SCRIPTING=ON"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost
-  ] ++ optional (oceSupport) opencascade_oce
+  ] ++ optional (oceSupport) opencascade
     ++ optional (ngspiceSupport) libngspice
     ++ optionals (scriptingSupport) [ swig python wxPython ];
 
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index 1d933d56948..babd87eb2b1 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -5,7 +5,8 @@
   , pythonPackages, utillinux
 
   # these deps are hidden; cmake doesn't catch them
-  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
+  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4
+  , xlibsWrapper
   , withIgnitionTransport ? true
   , libav, withLibAvSupport ? true
   , openal, withAudioSupport ? false
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
     # TODO: add these hidden deps to cmake configuration & submit upstream
     curl
     tinyxml
-    x11
+    xlibsWrapper
     qt4
   ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
     ++ optional withDocs doxygen
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index ed207a1e7d9..1a5ce6e369e 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, makeWrapper, flex, bison,
- asciidoc, docbook_xml_dtd_45, docbook_xml_xslt,
+ asciidoc, docbook_xml_dtd_45, docbook_xsl,
  libxml2, libxslt,
  python27, rcs, cvs, git,
  coreutils, rsync}:
@@ -21,7 +21,7 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt
+    flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
     python27 rcs cvs git makeWrapper
   ];
 
@@ -29,7 +29,7 @@ mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray=(
-      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
       LIBS=""
       prefix="$out"
     )
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index a6efb8d339e..284a1cc649a 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
-, docbook_xml_xslt, pkgconfig, luajit
+, docbook_xsl, pkgconfig, luajit
 , gzip, bzip2, xz
 , python, wrapPython, pygments, markdown
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
   buildInputs = [
-    openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
+    openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
   ];
   pythonPath = [ pygments markdown ];
 
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 238d527ce38..84b6633b883 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, python27Packages, git
-, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto
+, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
 , bazaar ? null, cvs ? null, darcs ? null, fossil ? null
 , mercurial ? null, monotone ? null, rcs ? null, src ? null
 , subversion ? null, cvs_fast_export ? null }:
@@ -24,16 +24,16 @@ in mkDerivation rec {
   };
 
   # See https://gitlab.com/esr/reposurgeon/issues/17
-  patches = [ ./fix-preserve-type.patch ];  
+  patches = [ ./fix-preserve-type.patch ];
 
   buildInputs =
-    [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++
+    [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
     optional (cython != null) cython
   ;
 
   preBuild = ''
     makeFlagsArray=(
-      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
       prefix="$out"
       pyinclude="-I${python}/include/python2.7"
       pylib="-L${python}/lib -lpython2.7"
@@ -64,5 +64,5 @@ in mkDerivation rec {
           --prefix PYTHONPATH : "${pythonpath}"
       done
     ''
-  ;    
+  ;
 }
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index f89aa04e014..f73c5277d05 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -6,7 +6,7 @@
 , cdrtools, dvdauthor, dvdplusrwtools
 , dvdisasterSupport ? true, dvdisaster ? null
 , thumbnailSupport ? true, libgnomeui ? null
-, udevSupport ? true, libudev ? null
+, udevSupport ? true, udev ? null
 , dbusSupport ? true, dbus ? null
 , makeWrapper }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
   };
 
-  nativeBuildInputs = 
+  nativeBuildInputs =
   [ pkgconfig ];
 
   packagesToBinPath =
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     docbook5 zip makeWrapper ]
   ++ packagesToBinPath
   ++ optionals dvdisasterSupport [ dvdisaster ]
-  ++ optionals udevSupport [ libudev ]
+  ++ optionals udevSupport [ udev ]
   ++ optionals dbusSupport [ dbus ]
   ++ optionals thumbnailSupport [ libgnomeui ];
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 64119d2dfc5..776d2732327 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -19,7 +19,7 @@
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
 , libplist, p11-kit, zlib
-, dbusSupport ? true, dbus_libs ? null
+, dbusSupport ? true, dbus ? null
 , joystickSupport ? true, cwiid ? null
 , nfsSupport ? true, libnfs ? null
 , pulseSupport ? true, libpulseaudio ? null
@@ -30,7 +30,7 @@
 , vdpauSupport ? true, libvdpau ? null
 }:
 
-assert dbusSupport  -> dbus_libs != null;
+assert dbusSupport  -> dbus != null;
 assert nfsSupport   -> libnfs != null;
 assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
@@ -139,7 +139,7 @@ in stdenv.mkDerivation rec {
       ffmpeg
       # libdvdcss libdvdnav libdvdread
     ]
-    ++ lib.optional  dbusSupport     dbus_libs
+    ++ lib.optional  dbusSupport     dbus
     ++ lib.optionals joystickSupport [ cwiid ]
     ++ lib.optional  nfsSupport      libnfs
     ++ lib.optional  pulseSupport    libpulseaudio
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix
index 5638fad39e5..6042f490dfa 100644
--- a/pkgs/applications/video/screenkey/default.nix
+++ b/pkgs/applications/video/screenkey/default.nix
@@ -10,7 +10,7 @@
 , libXtst
 , wrapGAppsHook
 , defaultIconTheme
-, hicolor_icon_theme
+, hicolor-icon-theme
 }:
 buildPythonApplication rec {
   pname = "screenkey";
@@ -40,7 +40,7 @@ buildPythonApplication rec {
 
   buildInputs = [
     defaultIconTheme
-    hicolor_icon_theme
+    hicolor-icon-theme
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index d9bc2ed18b1..6fedc227e44 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -6,7 +6,7 @@
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus
+, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
 , onlyLibVLC ? false
 , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
     libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
-    libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full
+    libkate libtiger libv4l samba liboggz libass libdvbpsi libva
     xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
     libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
     fluidsynth wayland wayland-protocols
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 1a2c850f156..7e9a89d4888 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
-, sqlite, iproute, bridge-utils, devicemapper, systemd
+, sqlite, iproute, bridge-utils, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps, libseccomp
 }:
@@ -66,7 +66,7 @@ rec {
     DOCKER_BUILDTAGS = []
       ++ optional (systemd != null) [ "journald" ]
       ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
-      ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"
+      ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper"
       ++ optional (libseccomp != null) "seccomp";
 
    }) // rec {
@@ -88,7 +88,7 @@ rec {
     buildInputs = [
       makeWrapper removeReferencesTo go-md2man go libtool
     ] ++ optionals (stdenv.isLinux) [
-      sqlite devicemapper btrfs-progs systemd libseccomp
+      sqlite lvm2 btrfs-progs systemd libseccomp
     ];
 
     dontStrip = true;
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index bb6209ce47f..64704f73e7b 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage, fetchurl, fetchpatch, fetchgit
-, ocamlPackages_4_02
+, ocaml-ng
 , withInternalQemu ? true
 , withInternalTraditionalQemu ? true
 , withInternalSeabios ? true
@@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec {
       else throw "this xen has no qemu builtin";
   };
 
-})) ({ ocamlPackages = ocamlPackages_4_02; } // args)
+})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args)
diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix
index 20deb2c2404..a48d031ad33 100644
--- a/pkgs/applications/window-managers/afterstep/default.nix
+++ b/pkgs/applications/window-managers/afterstep/default.nix
@@ -2,7 +2,7 @@
 , libjpeg, libtiff, libpng, freetype
 , fltk, gtk
 , libX11, libXext, libICE
-, dbus, dbus_libs
+, dbus
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus_libs ];
+  buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ];
 
   # A strange type of bug: dbus is not immediately found by pkgconfig
   preConfigure = ''
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index dd2559d2b15..90ae043fba3 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
-  docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
+  docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
   pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
   libXrandr, libXrender, xwininfo }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     asciidoc
     docbook_xml_dtd_45
-    docbook_xml_xslt
+    docbook_xsl
     pkgconfig
   ];
 
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
index 337ecdd651f..f72ef13173c 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms
-, xlibs , i3ipc-glib , glib
+, xorg , i3ipc-glib , glib
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ];
+  buildInputs = [ libxcb xcbutilkeysyms xproto xorg.libX11.dev i3ipc-glib glib.dev ];
 
   # Makefile has no rule for 'install'
   installPhase = ''
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 46130680af4..6bf6f44d423 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, cmake, pkgconfig, makeWrapper, callPackage
-, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
+, wlc, dbus, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng
 , libdrm, libX11
 , westonLite
 }:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
   buildInputs = [
-    wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11
+    wlc dbus wayland libxkbcommon pixman libinput udev zlib libpng libX11
     libdrm
   ];
 
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 89e7b9dd088..50614534f8e 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
-, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs
+, wayland, wlc, libxkbcommon, pcre, json_c, dbus
 , pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
 , libXdmcp
 , buildDocs ? true
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cmake pkgconfig
   ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
   buildInputs = [
-    wayland wlc libxkbcommon pcre json_c dbus_libs
+    wayland wlc libxkbcommon pcre json_c dbus
     pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
     libXdmcp
   ];