Merge staging-next into master

1 files changed, 22 insertions, 23 deletions

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f2e842bfdaa..1f948e19221 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -34385,7 +34385,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
@@ -86444,7 +86444,7 @@ self: {
        doHaddock = false;
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;};
+     }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -86465,7 +86465,7 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "gi-gdkpixbuf" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
@@ -86506,7 +86506,7 @@ self: {
        doHaddock = false;
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "gi-ggit" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -86526,7 +86526,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
@@ -86565,7 +86565,7 @@ self: {
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) gobject-introspection;};
+     }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -86749,7 +86749,7 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "gi-gtk-declarative" = callPackage
     ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
@@ -86847,7 +86847,7 @@ self: {
        doHaddock = false;
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+     }) {gtksourceview3 = pkgs.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -86868,7 +86868,7 @@ self: {
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -86999,7 +86999,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
@@ -87040,7 +87040,7 @@ self: {
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {vte_291 = pkgs.gnome3.vte;};
+     }) {vte_291 = pkgs.vte;};
 
   "gi-webkit" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -87086,7 +87086,7 @@ self: {
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -94453,7 +94453,7 @@ self: {
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "gtk-strut" = callPackage
     ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
@@ -94792,7 +94792,7 @@ self: {
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+     }) {gtksourceview3 = pkgs.gtksourceview;};
 
   "guarded-allocation" = callPackage
     ({ mkDerivation, base }:
@@ -100459,8 +100459,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.gnome3) gobject-introspection;};
+     }) {inherit (pkgs) glib gobject-introspection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -135268,7 +135267,7 @@ self: {
        description = "Haskell IDE written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "leksah-server" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, binary
@@ -140884,7 +140883,7 @@ self: {
        description = "Leksah tool kit";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "ltl" = callPackage
     ({ mkDerivation, base, vcd }:
@@ -207548,7 +207547,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 }:
@@ -209363,7 +209362,7 @@ self: {
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
+     }) {gtk3 = pkgs.gtk3;};
 
   "tag-bits" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -212214,7 +212213,7 @@ self: {
        description = "Terminal emulator configurable in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;};
+     }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;};
 
   "termplot" = callPackage
     ({ mkDerivation, base, brick, data-default, optparse-applicative
@@ -215189,7 +215188,7 @@ self: {
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;};
+     }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;};
 
   "tibetan-utils" = callPackage
     ({ mkDerivation, base, composition-prelude, either, hspec
@@ -230756,7 +230755,7 @@ self: {
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib