Skip to content

Commit

Permalink
Merge pull request #200 from RyanGlScott/remove-redundant-hack
Browse files Browse the repository at this point in the history
Remove workaround for haskell/cabal#5516
  • Loading branch information
phadej committed Feb 5, 2019
2 parents 1ec96d2 + 13a206f commit 7de790d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ install:
- "sed -i.bak 's/^-- jobs:.*/jobs: 2/' ${HOME}/.cabal/config"
- "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)
- if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.16.*'; fi
- if [ $HCNUMVER -eq 80403 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
- "printf 'packages: \".\"\\n' > cabal.project"
Expand Down
6 changes: 0 additions & 6 deletions src/MakeTravisYml.hs
Original file line number Diff line number Diff line change
Expand Up @@ -808,12 +808,6 @@ genTravisFromConfigs (argv,opts) xpkgs isCabalProject config prj@Project { prjPa
[ sh "grep -Ev -- '^\\s*--' ${HOME}/.cabal/config | grep -Ev '^\\s*$'"
]

-- Initialise store
-- https://github.com/haskell/cabal/issues/5516
when (cfgDoctest config || cfgHLint config) $ tellStrLns
[ sh "(cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)"
]

-- Install doctest
let doctestVersionConstraint
| isAnyVersion (cfgDoctestVersion config) = ""
Expand Down

0 comments on commit 7de790d

Please sign in to comment.