Skip to content

Commit

Permalink
move stack config to root
Browse files Browse the repository at this point in the history
this makes it easier for installation and continuous integration
  • Loading branch information
olivierverdier committed Jan 12, 2016
1 parent cfd34ce commit 3ae03e9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ before_install:
# This line does all of the work: installs GHC if necessary, build the library,
# executables, and test suites, and runs the test suites. --no-terminal works
# around some quirks in Travis's terminal implementation.
script: cd src && stack $ARGS --no-terminal --install-ghc test --haddock
script: stack $ARGS --no-terminal --install-ghc test --haddock

# Caching so the next build will be fast too.
cache:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ There is now a Haskell implementation as well, which can be four to six times fa

1. Make sure [Haskell's stack](http://docs.haskellstack.org/en/stable/README.html#how-to-install) is installed on your system
2. `cd` to this folder
2. `cd src`
2. Run `stack setup` to install the Haskell compiler, if it is not already there
3. Run `stack build && stack install` (don't worry, the executable is only “installed” in this folder, not on your system)
4. Define the variable `GIT_PROMPT_EXECUTABLE="haskell"` somewhere in
Expand Down
4 changes: 2 additions & 2 deletions src/stack.yaml → stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver: lts-3.21

# Local packages, usually specified by relative directory name
packages:
- '.'
- 'src'

# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
extra-deps: []
Expand All @@ -31,4 +31,4 @@ extra-package-dbs: []
# extra-include-dirs: [/path/to/dir]
# extra-lib-dirs: [/path/to/dir]

local-bin-path: './.bin'
local-bin-path: './src/.bin'

0 comments on commit 3ae03e9

Please sign in to comment.