diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51bdc54df2be..677731468399 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124209,7 +124209,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk_4_0 + , text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; @@ -124220,11 +124220,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -124565,7 +124565,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, webkitgtk_4_0 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit"; @@ -124580,17 +124580,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkit2" = callPackage ({ 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, webkitgtk_4_0 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -124605,17 +124605,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk_4_0 + , transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124630,13 +124630,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -309861,7 +309861,7 @@ 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, webkitgtk_4_0, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309880,7 +309880,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; + 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 @@ -309893,7 +309893,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; + }) {inherit (pkgs) gtk3; webkitgtk = null;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -332440,30 +332440,30 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk_4_0 + , webkitgtk }: mkDerivation { pname = "webkitgtk3"; @@ -332474,27 +332474,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either