From 78b94d335d33d8e4d093a5cad661d2865706c0fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Mar 2019 22:00:48 +0100 Subject: [PATCH] haskell-packages: re-write references to webkit to webkitgtk --- .../haskell-modules/hackage-packages.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 61bb8b1e3b9..7f8ac77e0ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -87256,7 +87256,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkit + , text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; @@ -87267,12 +87267,12 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -87473,7 +87473,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkit + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -87485,18 +87485,18 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-gobject, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers - , webkitgtk-web-extension + , webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -87508,12 +87508,12 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk-web-extension ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkitgtk-web-extension = null;}; + }) {inherit (pkgs) webkitgtk;}; "gi-wnck" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -170597,7 +170597,7 @@ self: { description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; + }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; inherit (pkgs) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage @@ -216448,7 +216448,8 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkit, xdg-basedir, xmonad, xmonad-contrib + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad + , xmonad-contrib }: mkDerivation { pname = "tianbar"; @@ -216466,7 +216467,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkit ]; + executablePkgconfigDepends = [ gtk3 webkitgtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -216477,7 +216478,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkit;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec @@ -232016,7 +232017,7 @@ self: { description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkit-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: @@ -232030,21 +232031,21 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.3.0"; sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib