diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d9c6ce3da33..61bb8b1e3b9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -34508,7 +34508,7 @@ self: {
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) libgit2-glib;};
+     }) {inherit (pkgs) libgit2-glib;};
 
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
@@ -86930,7 +86930,7 @@ self: {
        doHaddock = false;
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) libgit2-glib;};
+     }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -87256,7 +87256,7 @@ self: {
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers, webkitgtk
+     , text, transformers, webkit
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -87267,12 +87267,12 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkit ];
        doHaddock = false;
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkit;};
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -87403,7 +87403,7 @@ self: {
        doHaddock = false;
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) libsecret;};
+     }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -87473,7 +87473,7 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
      , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers, webkitgtk
+     , haskell-gi-overloading, text, transformers, webkit
      }:
      mkDerivation {
        pname = "gi-webkit2";
@@ -87485,12 +87485,12 @@ self: {
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkit ];
        doHaddock = false;
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkit;};
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -89779,7 +89779,7 @@ self: {
 
   "gnome-keyring" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, gnome-keyring
-     , libgnome_keyring, text, time
+     , libgnome-keyring, text, time
      }:
      mkDerivation {
        pname = "gnome-keyring";
@@ -89787,12 +89787,12 @@ self: {
        sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
        libraryHaskellDepends = [ base bytestring text time ];
        librarySystemDepends = [ gnome-keyring ];
-       libraryPkgconfigDepends = [ libgnome_keyring ];
+       libraryPkgconfigDepends = [ libgnome-keyring ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs.gnome3) gnome-keyring; 
-         inherit (pkgs) libgnome_keyring;};
+         inherit (pkgs) libgnome-keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome-vfs
@@ -95219,7 +95219,7 @@ self: {
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) gtksourceview;};
+     }) {inherit (pkgs) gtksourceview;};
 
   "gtksourceview3" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, glib
@@ -100947,8 +100947,7 @@ self: {
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs) gobject-introspection;};
+     }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -176788,8 +176787,8 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptonite, directory
-     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
-     , microlens, process, split, vector
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, microlens
+     , process, qrencode, split, vector
      }:
      mkDerivation {
        pname = "qr-imager";
@@ -176799,12 +176798,12 @@ self: {
          base binary bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens process split vector
        ];
-       libraryPkgconfigDepends = [ libqrencode ];
+       libraryPkgconfigDepends = [ qrencode ];
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libqrencode;};
+     }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
@@ -208770,7 +208769,7 @@ self: {
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) librsvg;};
+     }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
     ({ mkDerivation, base, filepath, xml }:
@@ -216449,8 +216448,7 @@ self: {
      , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
      , mime-types, mtl, network, process, random, scientific, split
      , tasty, tasty-quickcheck, text, transformers, unordered-containers
-     , utf8-string, vector, webkitgtk, xdg-basedir, xmonad
-     , xmonad-contrib
+     , utf8-string, vector, webkit, xdg-basedir, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "tianbar";
@@ -216468,7 +216466,7 @@ self: {
          mime-types mtl network process random scientific split text
          transformers unordered-containers utf8-string vector xdg-basedir
        ];
-       executablePkgconfigDepends = [ gtk3 webkitgtk ];
+       executablePkgconfigDepends = [ gtk3 webkit ];
        testHaskellDepends = [
          aeson base bytestring containers dbus directory filepath gi-gdk
          gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@@ -216479,7 +216477,7 @@ self: {
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) gtk3; inherit (pkgs) webkit;};
 
   "tibetan-utils" = callPackage
     ({ mkDerivation, base, composition-prelude, either, hspec
@@ -228821,7 +228819,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) vte;};
+     }) {inherit (pkgs) vte;};
 
   "vtegtk3" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango
@@ -228839,7 +228837,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) vte;};
+     }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
@@ -232018,7 +232016,7 @@ self: {
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
+     }) {inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
     ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
@@ -232032,21 +232030,21 @@ self: {
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
+     }) {inherit (pkgs) webkit;};
 
   "webkit2gtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit2gtk3-javascriptcore";
        version = "0.14.3.0";
        sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkit;};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib