rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2

This commit is contained in:
Volth
2017-05-26 13:43:25 +00:00
parent 690a83091b
commit b7ccf27229
14 changed files with 48 additions and 48 deletions
@@ -73910,7 +73910,7 @@ self: {
"gi-javascriptcore" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
, haskell-gi-base, text, transformers, webkitgtk24x
, haskell-gi-base, text, transformers, webkitgtk24x-gtk3
}:
mkDerivation {
pname = "gi-javascriptcore";
@@ -73921,13 +73921,13 @@ self: {
base bytestring containers haskell-gi haskell-gi-base text
transformers
];
libraryPkgconfigDepends = [ webkitgtk24x ];
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "JavaScriptCore bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x;};
}) {inherit (pkgs) webkitgtk24x-gtk3;};
"gi-javascriptcore_4_0_12" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -74136,7 +74136,7 @@ self: {
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
, text, transformers, webkitgtk24x
, text, transformers, webkitgtk24x-gtk3
}:
mkDerivation {
pname = "gi-webkit";
@@ -74148,13 +74148,13 @@ self: {
gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
haskell-gi haskell-gi-base text transformers
];
libraryPkgconfigDepends = [ webkitgtk24x ];
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "WebKit bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x;};
}) {inherit (pkgs) webkitgtk24x-gtk3;};
"gi-webkit2" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -197854,7 +197854,7 @@ self: {
"webkitgtk3" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, glib
, gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
, webkitgtk24x
, webkitgtk24x-gtk3
}:
mkDerivation {
pname = "webkitgtk3";
@@ -197864,26 +197864,26 @@ self: {
libraryHaskellDepends = [
base bytestring cairo glib gtk3 mtl pango text transformers
];
libraryPkgconfigDepends = [ webkitgtk24x ];
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Webkit library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x;};
}) {inherit (pkgs) webkitgtk24x-gtk3;};
"webkitgtk3-javascriptcore" = callPackage
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }:
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 }:
mkDerivation {
pname = "webkitgtk3-javascriptcore";
version = "0.14.2.1";
sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkitgtk24x ];
libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
description = "JavaScriptCore FFI from webkitgtk";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) webkitgtk24x;};
}) {inherit (pkgs) webkitgtk24x-gtk3;};
"webpage" = callPackage
({ mkDerivation, base, blaze-html, data-default, lucid, text }: