git.iko.soy/typeable/servant
on master help sign in
Prepare merge
ed502f5Julian K. Arni
.gitignoredeleted−17
compare with master
unifiedsplit
@@ -1,17 +0,0 @@
1−dist
2−cabal-dev
3−*.o
4−*.hi
5−*.chi
6−*.chs.h
7−*.dyn_o
8−*.dyn_hi
9−.virtualenv
10−.hpc
11−.hsenv
12−.cabal-sandbox/
13−cabal.sandbox.config
14−cabal.config
15−*.prof
16−*.aux
17−*.hp
.travis.ymldeleted−50
@@ -1,50 +0,0 @@
1−language: haskell
2−
3−env:
4−- GHCVER=7.8.3
5−
6−before_install:
7− - |
8− if [ $GHCVER = `ghc --numeric-version` ]; then
9− travis/cabal-apt-install --enable-tests $MODE
10− export CABAL=cabal
11− else
12− travis_retry sudo add-apt-repository -y ppa:hvr/ghc
13− travis_retry sudo apt-get update
14− travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER happy
15− export CABAL=cabal-1.18
16− export PATH=/opt/ghc/$GHCVER/bin:$PATH
17− fi
18− - $CABAL update
19− - |
20− if [ $GHCVER = "head" ] || [ $GHCVER = "7.8.3" ]; then
21− $CABAL install happy alex
22− export PATH=$HOME/.cabal/bin:$PATH
23− fi
24− - git clone https://github.com/haskell-servant/servant.git
25− - cabal sandbox init
26− - cabal sandbox add-source servant
27−
28−install:
29− - cabal install --only-dependencies --enable-tests
30−
31−script:
32− - cabal configure --enable-tests --enable-library-coverage
33− - cabal build && cabal test
34− - cabal sdist
35−
36−after_script:
37− - cabal install hpc-coveralls
38− - export PATH=.cabal-sandbox/bin:$PATH
39− - hpc-coveralls --exclude-dir=test spec
40−
41−notifications:
42− irc:
43− channels:
44− - "irc.freenode.org#servant"
45− template:
46− - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"
47− - "Build details: %{build_url} - Change view: %{compare_url}"
48− skip_join: true
49− on_success: change
50− on_failure: always
CHANGELOG.md → servant-server/CHANGELOG.mdrenamed

The content is the same.

LICENSE → servant-server/LICENSErenamed

The content is the same.

README.md → servant-server/README.mdrenamed

The content is the same.

Setup.hs → servant-server/Setup.hsrenamed

The content is the same.

default.nix → servant-server/default.nixrenamed

The content is the same.

example/README.md → servant-server/example/README.mdrenamed

The content is the same.

example/greet.hs → servant-server/example/greet.hsrenamed

The content is the same.

example/greet.md → servant-server/example/greet.mdrenamed

The content is the same.

servant-server.cabal → servant-server/servant-server.cabalrenamed

The content is the same.

src/Servant.hs → servant-server/src/Servant.hsrenamed

The content is the same.

src/Servant/Server.hs → servant-server/src/Servant/Server.hsrenamed

The content is the same.

src/Servant/Server/Internal.hs → servant-server/src/Servant/Server/Internal.hsrenamed

The content is the same.

src/Servant/Utils/StaticFiles.hs → servant-server/src/Servant/Utils/StaticFiles.hsrenamed

The content is the same.

test/Servant/ServerSpec.hs → servant-server/test/Servant/ServerSpec.hsrenamed

The content is the same.

test/Servant/Utils/StaticFilesSpec.hs → servant-server/test/Servant/Utils/StaticFilesSpec.hsrenamed

The content is the same.

test/Spec.hs → servant-server/test/Spec.hsrenamed

The content is the same.