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. --- .../src/CabalHelper/Compiletime/Types.hs | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 vendor/cabal-helper-0.8.1.2/src/CabalHelper/Compiletime/Types.hs (limited to 'vendor/cabal-helper-0.8.1.2/src/CabalHelper/Compiletime/Types.hs') diff --git a/vendor/cabal-helper-0.8.1.2/src/CabalHelper/Compiletime/Types.hs b/vendor/cabal-helper-0.8.1.2/src/CabalHelper/Compiletime/Types.hs new file mode 100644 index 0000000..77c3255 --- /dev/null +++ b/vendor/cabal-helper-0.8.1.2/src/CabalHelper/Compiletime/Types.hs @@ -0,0 +1,42 @@ +-- cabal-helper: Simple interface to Cabal's configuration state +-- Copyright (C) 2015-2018 Daniel Gröber +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +{-# LANGUAGE DeriveGeneric, DeriveDataTypeable, DefaultSignatures #-} + +{-| +Module : CabalHelper.Compiletime.Types +Description : Types used throughout +License : GPL-3 +-} + +module CabalHelper.Compiletime.Types where + +import Data.Version + +data Options = Options { + oHelp :: Bool + , oVerbose :: Bool + , oGhcProgram :: FilePath + , oGhcPkgProgram :: FilePath + , oCabalProgram :: FilePath + , oCabalVersion :: Maybe Version + , oCabalPkgDb :: Maybe PackageDbDir +} + +newtype PackageDbDir = PackageDbDir { unPackageDbDir :: FilePath } + +defaultOptions :: Options +defaultOptions = Options False False "ghc" "ghc-pkg" "cabal" Nothing Nothing -- cgit v1.2.3