Deps and build cleanup

This commit is contained in:
Greg Hale 2016-06-12 09:56:17 -04:00
parent 2d490df43a
commit 1d2a901ecf
3 changed files with 15 additions and 15 deletions

View File

@ -1,3 +1,3 @@
#!/bin/sh
deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs ; cabal build"
deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build"

View File

@ -5,6 +5,6 @@ let
in reflex-platform.ghcjs.override {
overrides = self: super: {
reflex-dom-contrib = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom-contrib {});
servant = self.callPackage (reflex-platform.cabal2nixResult deps/servant/servant) {};
servant = pkgs.haskell.lib.dontCheck (self.callPackage (reflex-platform.cabal2nixResult deps/servant/servant) {});
};
}

View File

@ -9,7 +9,7 @@ Maintainer: mightybyte@gmail.com
Stability: Experimental
Category: Web
Build-type: Simple
Cabal-version: >=1.8
Cabal-version: >=1.10
library
exposed-modules:
@ -21,32 +21,32 @@ library
hs-source-dirs: src
build-depends:
base,
base >= 4.8 && < 4.9,
bytestring >= 0.10 && < 0.11,
case-insensitive,
containers,
case-insensitive >= 1.2.0.4 && < 1.3,
containers >= 0.5.6.3 && < 0.6,
data-default >= 0.5 && < 0.6,
exceptions >= 0.8 && < 0.9,
ghcjs-base,
ghcjs-dom >= 0.2 && < 0.3,
http-api-data >= 0.2 && < 0.3,
http-media >= 0.6 && < 0.7,
-- http-types >= 0.8 && < 0.9,
mtl,
mtl >= 2.2.1 && < 2.3,
network-uri >= 2.6 && < 2.7,
reflex,
reflex-dom,
safe,
reflex == 0.4.*,
reflex-dom == 0.3.*,
safe >= 0.3.9 && < 0.4,
servant >= 0.5 && < 0.8,
string-conversions,
text,
string-conversions >= 0.4 && < 0.5,
text >= 1.2 && < 1.3,
transformers >= 0.4 && < 0.5
if impl(ghcjs)
build-depends: ghcjs-base
build-depends: ghcjs-base >= 0.2 && < 0.3
ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
default-language: Haskell2010
executable example
build-depends: reflex, servant-reflex, base, scientific, servant, reflex-dom
default-language: Haskell2010