git.iko.soy/typeable/nixpkgs
on master help sign in
gnome2: remove aliases
commit57c745f530c9332c8cbd306caa4c5d8733f37c51 authorJan Tojnar <jtojnar@gmail.com> dateSun 3 Mar 2019, 22:30 (8 years ago) parentbbe29c0
22 files changed+72−83
pkgs/applications/misc/gtk2fontsel/default.nix+2−2 pkgs/applications/networking/instant-messengers/ekiga/default.nix+2−2 pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix+2−2 pkgs/desktops/gnome-2/bindings/gnome-python/default.nix+2−2 pkgs/desktops/gnome-2/bindings/libglademm/default.nix+4−4 pkgs/desktops/gnome-2/default.nix+12−17 pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix+2−2 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix+2−2 pkgs/desktops/gnome-2/desktop/vte/default.nix+2−2 pkgs/desktops/gnome-2/platform/gtkglext/default.nix+2−2 pkgs/desktops/gnome-2/platform/gtkhtml/default.nix+2−2 pkgs/desktops/gnome-2/platform/libbonoboui/default.nix+2−2 pkgs/desktops/gnome-2/platform/libglade/default.nix+2−2 pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix+2−2 pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix+2−2 pkgs/desktops/gnome-2/platform/libgnomecups/default.nix+2−2 pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix+3−3 pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix+2−2 pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix+2−2 pkgs/desktops/xfce/default.nix+1−1 pkgs/development/haskell-modules/hackage-packages.nix+16−16 pkgs/top-level/all-packages.nix+4−10
pkgs/applications/misc/gtk2fontsel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, gtk }:
1+{stdenv, fetchurl, pkgconfig, gtk2 }:
22
33stdenv.mkDerivation rec {
44 version = "0.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ stdenv gtk ];
13+ buildInputs = [ stdenv gtk2 ];
1414
1515 preferLocalBuild = true;
1616
pkgs/applications/networking/instant-messengers/ekiga/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
22, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
3−, libsigcxx, gtk, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
3+, libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
44, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib
55, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
66
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
1616 evolution-data-server gnome-doc-utils avahi
17− libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
17+ libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite
1818 gnome3.libsoup glib gnome3.adwaita-icon-theme boost
1919 autoreconfHook pkgconfig libxml2 unixODBC db nspr
2020 nss zlib libsecret libXrandr which libxslt libtasn1
pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk }:
1+{ stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkgconfig, python2, gtk2 }:
22
33let
44 inherit (python2.pkgs) python pygtk;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ gtk librsvg libwnck libgtop python ];
17+ buildInputs = [ gtk2 librsvg libwnck libgtop python ];
1818 propagatedBuildInputs = [ gnome_python pygtk ];
1919
2020 # gnome-python-desktop expects that .pth file is already installed by PyGTK
pkgs/desktops/gnome-2/bindings/gnome-python/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk, gnome_vfs }:
1+{ stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
22
33with stdenv.lib;
44
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ python glib gtk GConf libgnome gnome_vfs ];
17+ buildInputs = [ python glib gtk2 GConf libgnome gnome_vfs ];
1818 propagatedBuildInputs = [ pygobject2 pygtk dbus-python ];
1919
2020 # gnome-python expects that .pth file is already installed by PyGTK in the
pkgs/desktops/gnome-2/bindings/libglademm/default.nix+4−4
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }:
1+{ stdenv, fetchurl, pkgconfig, intltool, gtkmm2, libglade }:
22
33stdenv.mkDerivation rec {
44 name = "libglademm-2.6.7";
5−
5+
66 src = fetchurl {
77 url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
88 sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig ];
1414 buildInputs = [ intltool ];
15−
16− propagatedBuildInputs = [ gtkmm libglade ];
15+
16+ propagatedBuildInputs = [ gtkmm2 libglade ];
1717}
pkgs/desktops/gnome-2/default.nix+12−17
@@ -1,14 +1,6 @@
1−{ stdenv, pkgs, lib }:
1+{ config, stdenv, pkgs, lib }:
22
33lib.makeScope pkgs.newScope (self: with self; {
4− # Backward compatibility.
5− gtkdoc = self.gtk-doc;
6− startup_notification = pkgs.libstartup_notification;
7− startupnotification = pkgs.libstartup_notification;
8− gnomedocutils = self.gnome-doc-utils;
9− gnomeicontheme = self.gnome_icon_theme;
10− gnome_common = gnome-common;
11− inherit (pkgs) rarian;
124
135#### PLATFORM
146
@@ -22,9 +14,7 @@ lib.makeScope pkgs.newScope (self: with self; {
2214
2315 libglade = callPackage ./platform/libglade { };
2416
25− libgnomeprint = callPackage ./platform/libgnomeprint {
26− bison = pkgs.bison2;
27− };
17+ libgnomeprint = callPackage ./platform/libgnomeprint { };
2818
2919 libgnomeprintui = callPackage ./platform/libgnomeprintui { };
3020
@@ -46,7 +36,6 @@ lib.makeScope pkgs.newScope (self: with self; {
4636 gnome_python = callPackage ./bindings/gnome-python { };
4737
4838 gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
49− python_rsvg = self.gnome_python_desktop;
5039
5140 gnome_vfs = callPackage ./platform/gnome-vfs { };
5241
@@ -62,9 +51,6 @@ lib.makeScope pkgs.newScope (self: with self; {
6251
6352 gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
6453
65− # Required for nautilus
66− inherit (pkgs) libunique;
67−
6854 gtkglext = callPackage ./platform/gtkglext { };
6955
7056#### DESKTOP
@@ -84,13 +70,22 @@ lib.makeScope pkgs.newScope (self: with self; {
8470
8571 libglademm = callPackage ./bindings/libglademm { };
8672
73+} // lib.optionalAttrs (config.allowAliases or true) {
8774 inherit (pkgs)
8875 # GTK Libs
8976 glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
9077
9178 # Included for backwards compatibility
92− libsoup libwnck gtk-doc gnome-doc-utils;
79+ libsoup libwnck gtk-doc gnome-doc-utils rarian;
9380
9481 gtk = pkgs.gtk2;
9582 gtkmm = pkgs.gtkmm2;
83+ python_rsvg = self.gnome_python_desktop;
84+
85+ gtkdoc = pkgs.gtk-doc;
86+ startup_notification = pkgs.libstartup_notification;
87+ startupnotification = pkgs.libstartup_notification;
88+ gnomedocutils = pkgs.gnome-doc-utils;
89+ gnomeicontheme = self.gnome_icon_theme;
90+ gnome_common = gnome-common;
9691})
pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
1+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "gnome-icon-theme-2.91.93";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
12+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
1313
1414 # remove a tree of dirs with no files within
1515 postInstall = '' rm -r "$out/share/locale" '';
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix+2−2
@@ -1,5 +1,5 @@
11{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
2−, gnome-common, gtk, pango
2+, gnome-common, gtk2, pango
33, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
44
55with stdenv.lib;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 nativeBuildInputs = [ pkgconfig ];
3030 buildInputs = [
31− atk cairo glib gtk
31+ atk cairo glib gtk2
3232 pango libxml2Python perl intltool
3333 gettext
3434 ] ++ optionals stdenv.isDarwin [
pkgs/desktops/gnome-2/desktop/vte/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses
1+{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
22, pythonSupport ? false, python27Packages}:
33
44let
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
2929 ];
3030
3131 nativeBuildInputs = [ pkgconfig ];
32− buildInputs = [ intltool glib gtk ncurses ] ++
32+ buildInputs = [ intltool glib gtk2 ncurses ] ++
3333 stdenv.lib.optionals pythonSupport [python pygtk];
3434
3535 configureFlags = [
pkgs/desktops/gnome-2/platform/gtkglext/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }:
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }:
22
33stdenv.mkDerivation rec {
44 name = "gtkglext-1.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 };
1010
1111 buildInputs = with xorg;
12− [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ];
12+ [ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ];
1313 propagatedBuildInputs = [ pangox_compat ];
1414
1515 patches = [
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk, intltool,
1+{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
22GConf, enchant, isocodes, gnome_icon_theme }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 patches = [ ./01_remove-disable-deprecated.patch ];
1515
1616 nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
17+ buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ];
1818
1919 NIX_LDFLAGS = [ "-lgthread-2.0" ];
2020}
pkgs/desktops/gnome-2/platform/libbonoboui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool
1+{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk2, libtool
22, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
33
44stdenv.mkDerivation rec {
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
1313 outputs = [ "out" "dev" ];
1414
1515 nativeBuildInputs = [ pkgconfig intltool ];
16− buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ];
16+ buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
1717 propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
1818}
pkgs/desktops/gnome-2/platform/libglade/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}:
1+{stdenv, fetchurl, pkgconfig, gtk2, libxml2, python, gettext}:
22
33stdenv.mkDerivation {
44 name = "libglade-2.6.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 outputs = [ "out" "dev" ];
1212
1313 nativeBuildInputs = [ pkgconfig ];
14− buildInputs = [ gtk python gettext ];
14+ buildInputs = [ gtk2 python gettext ];
1515
1616 NIX_LDFLAGS = "-lgmodule-2.0";
1717
pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
1+{ stdenv, fetchurl, pkgconfig, gtk2, intltool, libart_lgpl, libglade }:
22
33stdenv.mkDerivation rec {
44 name = "libgnomecanvas-${minVer}.3";
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ libglade ];
1515 nativeBuildInputs = [ pkgconfig intltool ];
16− propagatedBuildInputs = [ libart_lgpl gtk ];
16+ propagatedBuildInputs = [ libart_lgpl gtk2 ];
1717}
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm }:
1+{ stdenv, fetchurl, pkgconfig, libgnomecanvas, gtkmm2 }:
22
33stdenv.mkDerivation {
44 name = "libgnomecanvasmm-2.26.0";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ libgnomecanvas gtkmm ];
12+ buildInputs = [ libgnomecanvas gtkmm2 ];
1313}
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:
1+{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl }:
22
33stdenv.mkDerivation rec {
44 name = "libgnomecups-0.2.3";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 patches = [ ./glib.patch ./cups_1.6.patch ];
1414
1515 nativeBuildInputs = [ pkgconfig ];
16− buildInputs = [ gtk gettext intltool libart_lgpl ];
16+ buildInputs = [ gtk2 gettext intltool libart_lgpl ];
1717
1818 propagatedBuildInputs = [ libxml2 ];
1919}
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix+3−3
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl
2−, libgnomecups, bison, flex }:
1+{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl
2+, libgnomecups, bison2, flex }:
33
44stdenv.mkDerivation rec {
55 name = "libgnomeprint-2.18.8";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 patches = [ ./bug653388.patch ];
1313
1414 nativeBuildInputs = [ pkgconfig ];
15− buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ];
15+ buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ];
1616
1717 propagatedBuildInputs = [ libxml2 ];
1818
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
1+{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}:
22
33stdenv.mkDerivation {
44 name = "libgnomeprintui-2.18.6";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
12+ buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
1313}
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }:
1+{stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2 }:
22
33stdenv.mkDerivation {
44 name = "libgtkhtml-2.11.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ gtk gettext ];
12+ buildInputs = [ gtk2 gettext ];
1313 propagatedBuildInputs = [ libxml2 ];
1414
1515 hardeningDisable = [ "format" ];
pkgs/desktops/xfce/default.nix+1−1
@@ -3,7 +3,7 @@
33lib.makeScope pkgs.newScope (self: with self; {
44 #### NixOS support
55
6− inherit (pkgs.gnome2) libglade libwnck vte gtksourceview;
6+ inherit (pkgs.gnome2) libglade vte gtksourceview;
77 inherit (pkgs.gnome3) dconf;
88 inherit (pkgs.perlPackages) URI;
99
pkgs/development/haskell-modules/hackage-packages.nix+16−16
@@ -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
pkgs/top-level/all-packages.nix+4−10
@@ -3175,9 +3175,7 @@ in
31753175
31763176 gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
31773177
3178− gssdp = callPackage ../development/libraries/gssdp {
3179− inherit (gnome2) libsoup;
3180− };
3178+ gssdp = callPackage ../development/libraries/gssdp { };
31813179
31823180 gt5 = callPackage ../tools/system/gt5 { };
31833181
@@ -3204,9 +3202,7 @@ in
32043202
32053203 gup = callPackage ../development/tools/build-managers/gup {};
32063204
3207− gupnp = callPackage ../development/libraries/gupnp {
3208− inherit (gnome2) libsoup;
3209− };
3205+ gupnp = callPackage ../development/libraries/gupnp { };
32103206
32113207 gupnp-av = callPackage ../development/libraries/gupnp-av {};
32123208
@@ -17585,9 +17581,7 @@ in
1758517581
1758617582 gspell = callPackage ../development/libraries/gspell { };
1758717583
17588− gtk2fontsel = callPackage ../applications/misc/gtk2fontsel {
17589− inherit (gnome2) gtk;
17590− };
17584+ gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
1759117585
1759217586 guake = callPackage ../applications/misc/guake { };
1759317587
@@ -22348,7 +22342,7 @@ in
2234822342
2234922343 dpkg = callPackage ../tools/package-management/dpkg { };
2235022344
22351− ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { };
22345+ ekiga = callPackage ../applications/networking/instant-messengers/ekiga { };
2235222346
2235322347 emulationstation = callPackage ../misc/emulators/emulationstation {
2235422348 stdenv = overrideCC stdenv gcc5;