diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7cf74b4a634..40fb0abd214 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -32077,7 +32077,7 @@ self: {
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;};
+     }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;};
 
   "bitstream" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@@ -41002,7 +41002,7 @@ self: {
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;};
 
   "cmaes" = callPackage
     ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -66770,7 +66770,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome) GConf;};
+     }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
     ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd
@@ -69715,7 +69715,7 @@ self: {
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, containers, haskell-gi
@@ -69802,7 +69802,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome) pango;};
+         inherit (pkgs.gnome2) pango;};
 
   "gi-pango_1_0_6" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -69826,7 +69826,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome) pango;};
+         inherit (pkgs.gnome2) pango;};
 
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -69848,7 +69848,7 @@ self: {
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome2) pango;};
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -69890,7 +69890,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome) libsoup;};
+     }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-soup_2_4_6" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -69912,7 +69912,7 @@ self: {
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) libsoup;};
+     }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-vte" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -69934,7 +69934,7 @@ self: {
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome2) vte;};
 
   "gi-webkit" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
@@ -71331,7 +71331,7 @@ self: {
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) libglade;};
+     }) {inherit (pkgs.gnome2) libglade;};
 
   "gladexml-accessor" = callPackage
     ({ mkDerivation, base, glade, HaXml, template-haskell }:
@@ -72037,7 +72037,7 @@ self: {
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gnome_keyring;};
+     }) {inherit (pkgs.gnome2) gnome_keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome_vfs
@@ -72057,7 +72057,7 @@ self: {
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;};
+     }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
     ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring
@@ -75737,7 +75737,7 @@ self: {
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtkglext;};
+     }) {inherit (pkgs.gnome2) gtkglext;};
 
   "gtkimageview" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
@@ -75794,7 +75794,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gtksourceview3_0_13_2_1" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools
@@ -75813,7 +75813,7 @@ self: {
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gtksourceview3" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, glib
@@ -75831,7 +75831,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "guarded-rewriting" = callPackage
     ({ mkDerivation, base, instant-generics }:
@@ -129311,7 +129311,7 @@ self: {
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome2) pango;};
 
   "pango" = callPackage
     ({ mkDerivation, array, base, Cabal, cairo, containers, directory
@@ -135322,7 +135322,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; 
-         inherit (pkgs.gnome) pango; inherit (pkgs) poppler;};
+         inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -158346,7 +158346,7 @@ self: {
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) libsoup;};
+     }) {inherit (pkgs.gnome2) libsoup;};
 
   "spine" = callPackage
     ({ mkDerivation, base }:
@@ -178020,7 +178020,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome2) vte;};
 
   "vtegtk3" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango
@@ -178037,7 +178037,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome2) vte;};
 
   "vty_5_5_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers