@@ -37818,7 +37818,7 @@ self: {
3781837818 description = "Proof-of-concept tool for writing using binary choices";
3781937819 license = "GPL";
3782037820 hydraPlatforms = stdenv.lib.platforms.none;
37821− }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) pango;};
37821+ }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
3782237822
3782337823 "bitstream" = callPackage
3782437824 ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@@ -49324,7 +49324,7 @@ self: {
4932449324 description = "Bindings to the Clutter animation library";
4932549325 license = "LGPL";
4932649326 hydraPlatforms = stdenv.lib.platforms.none;
49327− }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;};
49327+ }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
4932849328
4932949329 "cmaes" = callPackage
4933049330 ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -86876,7 +86876,7 @@ self: {
8687686876 doHaddock = false;
8687786877 description = "GIRepository (gobject-introspection) bindings";
8687886878 license = stdenv.lib.licenses.lgpl21;
86879− }) {inherit (pkgs.gnome3) gobject-introspection;};
86879+ }) {inherit (pkgs) gobject-introspection;};
8688086880
8688186881 "gi-glib" = callPackage
8688286882 ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -87179,7 +87179,7 @@ self: {
8717987179 description = "JavaScriptCore bindings";
8718087180 license = stdenv.lib.licenses.lgpl21;
8718187181 hydraPlatforms = stdenv.lib.platforms.none;
87182− }) {inherit (pkgs.gnome3) webkitgtk;};
87182+ }) {inherit (pkgs) webkitgtk;};
8718387183
8718487184 "gi-notify" = callPackage
8718587185 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -87244,7 +87244,7 @@ self: {
8724487244 '';
8724587245 description = "Pango bindings";
8724687246 license = stdenv.lib.licenses.lgpl21;
87247− }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
87247+ }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
8724887248
8724987249 "gi-pangocairo" = callPackage
8725087250 ({ mkDerivation, base, bytestring, Cabal, cairo, containers
@@ -87269,7 +87269,7 @@ self: {
8726987269 '';
8727087270 description = "PangoCairo bindings";
8727187271 license = stdenv.lib.licenses.lgpl21;
87272− }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
87272+ }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
8727387273
8727487274 "gi-poppler" = callPackage
8727587275 ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -87330,7 +87330,7 @@ self: {
8733087330 doHaddock = false;
8733187331 description = "Libsoup bindings";
8733287332 license = stdenv.lib.licenses.lgpl21;
87333− }) {inherit (pkgs.gnome2) libsoup;};
87333+ }) {inherit (pkgs) libsoup;};
8733487334
8733587335 "gi-vte" = callPackage
8733687336 ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -87397,7 +87397,7 @@ self: {
8739787397 description = "WebKit2 bindings";
8739887398 license = stdenv.lib.licenses.lgpl21;
8739987399 hydraPlatforms = stdenv.lib.platforms.none;
87400− }) {inherit (pkgs.gnome3) webkitgtk;};
87400+ }) {inherit (pkgs) webkitgtk;};
8740187401
8740287402 "gi-webkit2webextension" = callPackage
8740387403 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -87443,7 +87443,7 @@ self: {
8744387443 description = "Wnck bindings";
8744487444 license = stdenv.lib.licenses.lgpl21;
8744587445 hydraPlatforms = stdenv.lib.platforms.none;
87446− }) {inherit (pkgs.gnome2) libwnck;};
87446+ }) {inherit (pkgs) libwnck;};
8744787447
8744887448 "gi-xlib" = callPackage
8744987449 ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -100853,7 +100853,7 @@ self: {
100853100853 description = "Generate Haskell bindings for GObject Introspection capable libraries";
100854100854 license = stdenv.lib.licenses.lgpl21;
100855100855 }) {inherit (pkgs) glib;
100856− inherit (pkgs.gnome3) gobject-introspection;};
100856+ inherit (pkgs) gobject-introspection;};
100857100857
100858100858 "haskell-gi-base" = callPackage
100859100859 ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -162583,7 +162583,7 @@ self: {
162583162583 description = "Binding to the Pango text rendering engine";
162584162584 license = stdenv.lib.licenses.lgpl21;
162585162585 hydraPlatforms = stdenv.lib.platforms.none;
162586− }) {inherit (pkgs.gnome2) pango;};
162586+ }) {inherit (pkgs) pango;};
162587162587
162588162588 "pangraph" = callPackage
162589162589 ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
@@ -170483,8 +170483,8 @@ self: {
170483170483 description = "Binding to the Poppler";
170484170484 license = stdenv.lib.licenses.gpl2;
170485170485 hydraPlatforms = stdenv.lib.platforms.none;
170486− }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2;
170487− inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;};
170486+ }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2;
170487+ inherit (pkgs) pango; inherit (pkgs) poppler;};
170488170488
170489170489 "populate-setup-exe-cache" = callPackage
170490170490 ({ mkDerivation, base }:
@@ -202162,7 +202162,7 @@ self: {
202162202162 description = "Experimental web browser";
202163202163 license = stdenv.lib.licenses.bsd3;
202164202164 hydraPlatforms = stdenv.lib.platforms.none;
202165− }) {inherit (pkgs.gnome2) libsoup;};
202165+ }) {inherit (pkgs) libsoup;};
202166202166
202167202167 "spine" = callPackage
202168202168 ({ mkDerivation, base }:
@@ -216310,7 +216310,7 @@ self: {
216310216310 description = "A desktop bar based on WebKit";
216311216311 license = stdenv.lib.licenses.mit;
216312216312 hydraPlatforms = stdenv.lib.platforms.none;
216313− }) {inherit (pkgs) gtk3; inherit (pkgs.gnome3) webkitgtk;};
216313+ }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
216314216314
216315216315 "tibetan-utils" = callPackage
216316216316 ({ mkDerivation, base, composition-prelude, either, hspec
@@ -231877,7 +231877,7 @@ self: {
231877231877 description = "JavaScriptCore FFI from webkitgtk";
231878231878 license = stdenv.lib.licenses.bsd3;
231879231879 hydraPlatforms = stdenv.lib.platforms.none;
231880− }) {inherit (pkgs.gnome3) webkitgtk;};
231880+ }) {inherit (pkgs) webkitgtk;};
231881231881
231882231882 "webkitgtk3" = callPackage
231883231883 ({ mkDerivation, base, bytestring, Cabal, cairo, glib