diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 6a7a10e0102..98dcc20feb0 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.13.2.1"; - sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; + version = "0.90"; + sha256 = "01rr8n99mas5x0vfxh8wf01vbh29vil860waxnsn6xdqc9fm5jj2"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 1d3a331e35e..b96ecfb4d9d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -6,6 +6,11 @@ cabal.mkDerivation (self: { sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; + noHaddock = true; + postInstall = '' + cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so + ''; + meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index ab90f6a1ebe..4627e7fcf1d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,11 +1,12 @@ -{ cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect, wxGTK +{ cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect +, wxGTK }: cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.13.2.1"; - sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; - buildDepends = [ filepath parsec stm time wxdirect ]; + version = "0.90"; + sha256 = "1vrv683576cdvxfiriw2aw5kw1gzrddd27pxa06rrg5nny0jni46"; + buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index f6f487633a1..c37e04282db 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.13.1.2"; - sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; + version = "0.90"; + sha256 = "0vlqvj9sys5d2x9ccpq0yxqbsq060g4jb6xrckjspxb605c98r3r"; isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f55a5f0714e..57ac9d8f0a6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1467,13 +1467,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; - wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {}; - - wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { - wxGTK = pkgs.wxGTK28; + wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix { + wxGTK = pkgs.wxGTK29; }; - wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; + wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { + wxGTK = pkgs.wxGTK29; + }; + + wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix { + time = self.time_1_2_0_5; + }; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {};