04702d0 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Fixes for ghc 8.8.1

commit04702d0d287fbe126265ad69d64fda75a68311f0 authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateMon 23 Dec 2019, 00:32 (7 years ago) parentc2b9e3e

6 files changed+41−5

compare with master

unifiedsplit

default.nix+29 jsaddle-clib/jsaddle-clib.cabal+1 jsaddle-clib/src-ghc/Language/Javascript/JSaddle/CLib.hs+3−1 jsaddle-warp/jsaddle-warp.cabal+1−1 jsaddle/jsaddle.cabal+4−3 shell.nix+3

default.nixnew file+29

@@ -0,0 +1,29 @@

1+{ pkgs ? import nixpkgs (haskellNixpkgsArgs // (if system == null then {} else { inherit system; }) //

2+ { overlays = haskellNixpkgsArgs.overlays ++ [(self: super: {

3+ inherit (self.haskell-nix.haskellPackages) alex happy;

4+ })];})

5+, nixpkgs ? haskellNixSrc + "/nixpkgs"

6+, haskellNixpkgsArgs ? import haskellNixSrc

7+, haskellNixSrc ? builtins.fetchTarball {

8+ url = "https://github.com/input-output-hk/haskell.nix/archive/1dd6951d6a56115fd368c5b37b8dab47a90ec45c.tar.gz";

9+ sha256 = "02nhjy90xwg9wrp81cnlczndxags966c71wlbz6n91423a13mc99";

10+ }

11+, haskellCompiler ? "ghc881"

12+, system ? null

13+}:

14+let

15+ frameworks = pkgs.lib.optionals pkgs.stdenv.isDarwin (

16+ with pkgs.darwin.apple_sdk.frameworks; [ Cocoa Carbon CoreGraphics ]);

17+ project = pkgs.haskell-nix.cabalProject' {

18+ src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; };

19+ ghc = pkgs.buildPackages.pkgs.haskell-nix.compiler.${haskellCompiler};

20+ modules = [

21+ { reinstallableLibGhc = true; }

22+ ({ config, ...}: {

23+ packages.gi-gtk.components.setup.frameworks = frameworks;

24+ packages.vault.components.library.doHaddock = false;

25+ })

26+ ];

27+ };

28+in

29+ project

jsaddle-clib/jsaddle-clib.cabal+1

@@ -23,6 +23,7 @@ library

2323 build-depends:

2424 aeson >=0.8.0.2 && <1.5,

2525 base <5,

26+ base-compat >=0.9.0 && <0.12,

2627 bytestring >=0.10.6.0 && <0.11,

2728 jsaddle >= 0.9.0.0 && <0.10,

2829 data-default,

jsaddle-clib/src-ghc/Language/Javascript/JSaddle/CLib.hs+3−1

@@ -8,6 +8,9 @@ module Language.Javascript.JSaddle.CLib

88 , appConfigToAppCallbacks

99 ) where

1010

11+import Prelude ()

12+import Prelude.Compat

13+

1114import Control.Monad (void)

1215import Control.Concurrent (forkIO)

1316

@@ -16,7 +19,6 @@ import Data.ByteString (useAsCString, packCString)

1619import Data.ByteString.Char8 (unpack)

1720import Data.ByteString.Lazy (ByteString, toStrict, fromStrict)

1821import Data.Default (def, Default)

19−import Data.Monoid ((<>))

2022import Data.Text (Text)

2123import qualified Data.Text.Encoding as T

2224

jsaddle-warp/jsaddle-warp.cabal+1−1

@@ -35,7 +35,7 @@ library

3535 jsaddle >=0.9.4.0 && <0.10,

3636 stm >=2.4.4 && <2.6,

3737 text >=1.2.1.3 && <1.3,

38− time >=1.5.0.1 && <1.9,

38+ time >=1.5.0.1 && <1.10,

3939 transformers >=0.4.2.0 && <0.6,

4040 wai >=3.0.3.0 && <3.3,

4141 wai-websockets >=3.0.0.6 && <3.1,

jsaddle/jsaddle.cabal+4−3

@@ -46,7 +46,7 @@ library

4646 ref-tf >=0.4.0.1 && <0.5,

4747 scientific >=0.3 && <0.4,

4848 stm >=2.4.4 && <2.6,

49− time >=1.5.0.1 && <1.9,

49+ time >=1.5.0.1 && <1.10,

5050 unordered-containers >=0.2 && <0.3,

5151 vector >=0.10 && <0.13,

5252 unliftio-core >=0.1 && < 0.2

@@ -109,11 +109,12 @@ library

109109 build-depends:

110110 aeson >=0.8.0.2 && <1.5,

111111 base >=4.9 && <5,

112+ base-compat >=0.9.0 && <0.12,

112113 base64-bytestring >=1.0.0.1 && <1.1,

113114 bytestring >=0.10.6.0 && <0.11,

114115 exceptions >=0.8 && <0.11,

115− lens >=3.8.5 && <4.18,

116− primitive >=0.6.1.0 && <0.7,

116+ lens >=3.8.5 && <4.19,

117+ primitive >=0.6.1.0 && <0.8,

117118 text >=1.2.1.3 && <1.3,

118119 transformers >=0.4.2.0 && <0.6

119120 default-language: Haskell2010

shell.nixnew file+3

@@ -0,0 +1,3 @@

1+{ haskellCompiler ? "ghc881" }:

2+(import ./. { inherit haskellCompiler; }).hsPkgs.shellFor {}