From f38daf67730fe31b865528eb972c619857e62a5c Mon Sep 17 00:00:00 2001 From: alexwl Date: Mon, 8 Oct 2018 02:40:18 +0300 Subject: Update cabal-helper to version 0.8.1.2 that supports Cabal (>=1.14 && <1.26 || >=2.0 && <2.5) Building cabal-helper-0.8.1.2 with Stack failed with 'Dependency cycle detected' error. It seems to be https://github.com/commercialhaskell/stack/issues/4265 Stack bug. As a temporary solution I added source code of cabal-helper package to vendor directory and commented out 'build-tool-depends: cabal-helper:cabal-helper-wrapper' line in the cabal-helper.cabal file. --- vendor/cabal-helper-0.8.1.2/tests/exeintlib/Exe.hs | 5 ++++ .../cabal-helper-0.8.1.2/tests/exeintlib/Setup.hs | 2 ++ .../tests/exeintlib/exeintlib.cabal | 31 ++++++++++++++++++++++ .../tests/exeintlib/intlib/IntLib.hs | 7 +++++ .../tests/exeintlib/lib/Lib.hs | 8 ++++++ 5 files changed, 53 insertions(+) create mode 100644 vendor/cabal-helper-0.8.1.2/tests/exeintlib/Exe.hs create mode 100644 vendor/cabal-helper-0.8.1.2/tests/exeintlib/Setup.hs create mode 100644 vendor/cabal-helper-0.8.1.2/tests/exeintlib/exeintlib.cabal create mode 100644 vendor/cabal-helper-0.8.1.2/tests/exeintlib/intlib/IntLib.hs create mode 100644 vendor/cabal-helper-0.8.1.2/tests/exeintlib/lib/Lib.hs (limited to 'vendor/cabal-helper-0.8.1.2/tests/exeintlib') diff --git a/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Exe.hs b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Exe.hs new file mode 100644 index 0000000..200915f --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Exe.hs @@ -0,0 +1,5 @@ +module Main where + +import Lib + +main = print lib diff --git a/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Setup.hs b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/vendor/cabal-helper-0.8.1.2/tests/exeintlib/exeintlib.cabal b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/exeintlib.cabal new file mode 100644 index 0000000..7507152 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/exeintlib.cabal @@ -0,0 +1,31 @@ +name: exeintlib +version: 0 +build-type: Simple +cabal-version: >=2.0 + +library + exposed-modules: Lib + hs-source-dirs: lib + build-depends: base, filepath, intlib + default-language: Haskell2010 + +library intlib + exposed-modules: IntLib + hs-source-dirs: intlib + build-depends: base, directory + default-language: Haskell2010 + +executable exe + main-is: Exe.hs + build-depends: base, exeintlib + default-language: Haskell2010 + +test-suite exe-test + type: exitcode-stdio-1.0 + main-is: Exe.hs + build-depends: base, exeintlib + +benchmark exe-bench + type: exitcode-stdio-1.0 + main-is: Exe.hs + build-depends: base, exeintlib diff --git a/vendor/cabal-helper-0.8.1.2/tests/exeintlib/intlib/IntLib.hs b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/intlib/IntLib.hs new file mode 100644 index 0000000..6dde9d0 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/intlib/IntLib.hs @@ -0,0 +1,7 @@ +module IntLib where + +import System.Directory + +directory = doesFileExist "Exe.hs" + +intlib = 1 diff --git a/vendor/cabal-helper-0.8.1.2/tests/exeintlib/lib/Lib.hs b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/lib/Lib.hs new file mode 100644 index 0000000..fe44c70 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/exeintlib/lib/Lib.hs @@ -0,0 +1,8 @@ +module Lib where + +import System.FilePath +import IntLib + +filepath = "a" "b" + +lib = 1 + intlib -- cgit v1.2.3