378ff6d · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge remote-tracking branch 'upstream/master' into various-cleanup

commit378ff6d2bc8613878aa7ba236cc522604ca1df3d authorfaineance <faineance@users.noreply.github.com> dateWed 23 Mar 2016, 22:28 (11 years ago) parent0fc343d d3341f4

4 files changed+5−4

compare with golang

unifiedsplit

.travis.yml+1−1 purescript.cabal+1−1 stack-lts-5.yaml+2−1 stack-nightly.yaml+1−1

.travis.yml+1−1

@@ -36,7 +36,7 @@ install:

3636 - mkdir -p .cabal-sandbox

3737 - cabal sandbox init --sandbox .cabal-sandbox

3838 # 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

4040 - cabal install --only-dependencies --enable-tests

4141 - cabal install hpc-coveralls

4242 # 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

6868 boxes >= 0.1.4 && < 0.2.0,

6969 aeson >= 0.8 && < 0.12,

7070 vector -any,

71− bower-json >= 0.7,

71+ bower-json >= 0.8,

7272 aeson-better-errors >= 0.8,

7373 bytestring -any,

7474 text -any,

stack-lts-5.yaml+2−1

@@ -1,5 +1,6 @@

11resolver: lts-5.4

22packages:

33- '.'

4−extra-deps: []

4+extra-deps:

5+- bower-json-0.8.0

56flags: {}

stack-nightly.yaml+1−1

@@ -2,4 +2,4 @@ flags: {}

22packages:

33- '.'

44extra-deps: []

5−resolver: nightly-2016-02-25

5+resolver: nightly-2016-03-17