git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge remote-tracking branch 'upstream/master' into various-cleanup
378ff6dfaineance
.travis.yml+1−1
@@ -36,7 +36,7 @@ install:
36 - mkdir -p .cabal-sandbox
36 - mkdir -p .cabal-sandbox
37 - cabal sandbox init --sandbox .cabal-sandbox
37 - cabal sandbox init --sandbox .cabal-sandbox
38 # Download stackage cabal.config, not sure whether filtering is necessary
38 # Download stackage cabal.config, not sure whether filtering is necessary
39− - if [ -n "$STACKAGE" ]; then curl https://www.stackage.org/$STACKAGE/cabal.config | egrep -v 'purescript|sourcemap' > cabal.config; fi
39+ - if [ -n "$STACKAGE" ]; then curl https://www.stackage.org/$STACKAGE/cabal.config | egrep -v 'purescript|sourcemap|bower-json' > cabal.config; fi
40 - cabal install --only-dependencies --enable-tests
40 - cabal install --only-dependencies --enable-tests
41 - cabal install hpc-coveralls
41 - cabal install hpc-coveralls
42 # Snapshot state of the sandbox now, so we don't need to make new one for test install
42 # Snapshot state of the sandbox now, so we don't need to make new one for test install
purescript.cabal+1−1
@@ -68,7 +68,7 @@ library
68 boxes >= 0.1.4 && < 0.2.0,
68 boxes >= 0.1.4 && < 0.2.0,
69 aeson >= 0.8 && < 0.12,
69 aeson >= 0.8 && < 0.12,
70 vector -any,
70 vector -any,
71− bower-json >= 0.7,
71+ bower-json >= 0.8,
72 aeson-better-errors >= 0.8,
72 aeson-better-errors >= 0.8,
73 bytestring -any,
73 bytestring -any,
74 text -any,
74 text -any,
stack-lts-5.yaml+2−1
@@ -1,5 +1,6 @@
1resolver: lts-5.4
1resolver: lts-5.4
2packages:
2packages:
3- '.'
3- '.'
4−extra-deps: []
4+extra-deps:
5+- bower-json-0.8.0
5flags: {}
6flags: {}
stack-nightly.yaml+1−1
@@ -2,4 +2,4 @@ flags: {}
2packages:
2packages:
3- '.'
3- '.'
4extra-deps: []
4extra-deps: []
5−resolver: nightly-2016-02-25
5+resolver: nightly-2016-03-17