diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index ef4a7fc6a974..b216bf9000b6 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-09-23"; + version = "unstable-2021-09-28"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/749491a0911601d18fb00e27d15005406d295729.tar.gz"; - sha256 = "0a4kd9n7qfbccjwd1f6hmz3wqqidcc6a76j7a1c5qkqpvjxr3mfm"; + url = "https://github.com/NixOS/cabal2nix/archive/b4d893ed1a7a66b0046dd8a48f62b81de670ab02.tar.gz"; + sha256 = "0xl5a0gfxrqz8pkx43zrj84xvcg15723lgvirxdcvc4zqa732zjg"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ed117722d818..fbfd3730fdd2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -105870,7 +105870,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 - , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit"; @@ -105882,12 +105882,12 @@ self: { gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -286247,7 +286247,7 @@ self: { "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk24x-gtk3 + , webkitgtk }: mkDerivation { pname = "webkitgtk3"; @@ -286258,27 +286258,26 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 - }: + ({ 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 = [ webkitgtk24x-gtk3 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x-gtk3;}; + }) {inherit (pkgs) webkitgtk;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either