From cdc652ad45bc9d80b303f30ebd480e1a661183d5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 2 Mar 2019 13:47:06 -0800
Subject: [PATCH] haskell: fix removed aliases; fix OfBorg eval

---
 .../haskell-modules/hackage-packages.nix      | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 62c7ed366210..8b0f62c60f9e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -86618,7 +86618,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
@@ -86639,7 +86639,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
@@ -86680,7 +86680,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
@@ -86739,7 +86739,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
@@ -86923,7 +86923,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
@@ -87021,7 +87021,7 @@ self: {
        doHaddock = false;
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+     }) {gtksourceview3 = pkgs.gtksourceview3;};
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -87042,7 +87042,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
@@ -87214,7 +87214,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
@@ -87260,7 +87260,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
@@ -94627,7 +94627,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 }:
@@ -94966,7 +94966,7 @@ self: {
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
+     }) {gtksourceview3 = pkgs.gtksourceview3;};
 
   "guarded-allocation" = callPackage
     ({ mkDerivation, base }:
@@ -100631,8 +100631,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 }:
@@ -135510,7 +135509,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
@@ -141132,7 +141131,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 }:
@@ -209925,7 +209924,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 }:
@@ -212794,7 +212793,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
@@ -215769,7 +215768,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
@@ -231336,7 +231335,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