diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 99d6bc173a32..4f5d28a0bc4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1290,30 +1290,9 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; - # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. - # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25. - haskell-gi = self.haskell-gi_0_25_0; - haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ]; - gi-glib = self.gi-glib_2_0_25; - gi-cairo = self.gi-cairo_1_0_25; - gi-gobject = self.gi-gobject_2_0_26; - gi-atk = self.gi-atk_2_0_23; - gi-gio = self.gi-gio_2_0_28; - gi-harfbuzz = self.gi-harfbuzz_0_0_4; - gi-javascriptcore = self.gi-javascriptcore_4_0_23; - gi-pango = self.gi-pango_1_0_24; - gi-soup = self.gi-soup_2_4_24; - gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26; - gi-gdk = self.gi-gdk_3_0_24; - gi-gtk = self.gi-gtk_3_0_37; - gi-webkit2 = self.gi-webkit2_4_0_27; + # Too strict version bounds on haskell-gi gi-cairo-render = doJailbreak super.gi-cairo-render; gi-cairo-connector = doJailbreak super.gi-cairo-connector; - gi-gtk-hs = self.gi-gtk-hs_0_3_10; - gi-dbusmenu = self.gi-dbusmenu_0_4_9; - gi-xlib = self.gi-xlib_2_0_10; - gi-gdkx11 = self.gi-gdkx11_3_0_11; - gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56bd4ac4ab8e..963cbcce3a80 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -73,10 +73,6 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # Needs Cabal 3.4 for Setup.hs - - gi-javascriptcore < 4.0.23 # - - gi-soup < 2.4.24 # - - gi-webkit2 < 4.0.27 # # 2021-05-11: not all diagrams libraries have adjusted to # monoid-extras 0.6 yet, keep them pinned to lower versions # until we can do a full migration, see diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a826fb1f550c..8ad068d9e9bd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103575,25 +103575,6 @@ self: { }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "4.0.22"; - sha256 = "191ipwjxn94dxz6saapidvjr8bbnl0y3p4f10s6mj6h6pkb5axjb"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) webkitgtk;}; - - "gi-javascriptcore_4_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers, webkitgtk @@ -103610,7 +103591,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage @@ -103752,27 +103732,6 @@ self: { }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.23"; - sha256 = "109n57ff69xmwhm3lvf0ajid3zl0l9sr1qdnvis06bhcddw9i1ap"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libsoup ]; - description = "Libsoup bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsoup;}; - - "gi-soup_2_4_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers @@ -103791,7 +103750,6 @@ self: { libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsoup;}; "gi-vips" = callPackage @@ -103866,30 +103824,6 @@ self: { }) {inherit (pkgs) webkitgtk24x-gtk3;}; "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 - }: - mkDerivation { - pname = "gi-webkit2"; - version = "4.0.26"; - sha256 = "0vbsc5zd1m1k47zpq620kzsiyg2g25ag6fvkwj0hdlq24xhyiavr"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk - gi-javascriptcore gi-soup haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring 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 - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "WebKit2 bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) webkitgtk;}; - - "gi-webkit2_4_0_27" = 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 @@ -103911,7 +103845,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage