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/fliblib/FLib.hs | 5 +++++ vendor/cabal-helper-0.8.1.2/tests/fliblib/Setup.hs | 2 ++ .../cabal-helper-0.8.1.2/tests/fliblib/fliblib.cabal | 19 +++++++++++++++++++ vendor/cabal-helper-0.8.1.2/tests/fliblib/lib/Lib.hs | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 vendor/cabal-helper-0.8.1.2/tests/fliblib/FLib.hs create mode 100644 vendor/cabal-helper-0.8.1.2/tests/fliblib/Setup.hs create mode 100644 vendor/cabal-helper-0.8.1.2/tests/fliblib/fliblib.cabal create mode 100644 vendor/cabal-helper-0.8.1.2/tests/fliblib/lib/Lib.hs (limited to 'vendor/cabal-helper-0.8.1.2/tests/fliblib') diff --git a/vendor/cabal-helper-0.8.1.2/tests/fliblib/FLib.hs b/vendor/cabal-helper-0.8.1.2/tests/fliblib/FLib.hs new file mode 100644 index 0000000..e6a9818 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/fliblib/FLib.hs @@ -0,0 +1,5 @@ +module FLib where + +import Lib + +flib = print foo diff --git a/vendor/cabal-helper-0.8.1.2/tests/fliblib/Setup.hs b/vendor/cabal-helper-0.8.1.2/tests/fliblib/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/fliblib/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/vendor/cabal-helper-0.8.1.2/tests/fliblib/fliblib.cabal b/vendor/cabal-helper-0.8.1.2/tests/fliblib/fliblib.cabal new file mode 100644 index 0000000..4610605 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/fliblib/fliblib.cabal @@ -0,0 +1,19 @@ +name: fliblib +version: 0 +build-type: Simple +cabal-version: >=1.10 + +library + exposed-modules: Lib + hs-source-dirs: lib + build-depends: base, filepath, directory + default-language: Haskell2010 + +foreign-library flib + other-modules: FLib + build-depends: base, fliblib + hs-source-dirs: . + type: native-shared + if os(Windows) + options: standalone + default-language: Haskell2010 \ No newline at end of file diff --git a/vendor/cabal-helper-0.8.1.2/tests/fliblib/lib/Lib.hs b/vendor/cabal-helper-0.8.1.2/tests/fliblib/lib/Lib.hs new file mode 100644 index 0000000..417a0ad --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/tests/fliblib/lib/Lib.hs @@ -0,0 +1,8 @@ +module Lib where + +import System.Directory +import System.FilePath + +filepath = "a" "b" +directory = doesFileExist "Exe.hs" +foo = 1 -- cgit v1.2.3