From 41ae95116d71d9654e96d26c70e27e30d8f5d672 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Fri, 28 Feb 2014 19:44:09 +0100 Subject: [PATCH 1/2] Reformat ShellCheck.cabal for readability Uses one line per `build-depends' or `exposed-modules'. Also got them sorted by name. Folded `base' dependencies into a single one. --- ShellCheck.cabal | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ShellCheck.cabal b/ShellCheck.cabal index ba622df..4ceff51 100644 --- a/ShellCheck.cabal +++ b/ShellCheck.cabal @@ -28,8 +28,20 @@ source-repository head location: git://github.com/koalaman/shellcheck.git library - build-depends: base >= 4, base < 5, parsec, containers, regex-compat, mtl, directory, json - exposed-modules: ShellCheck.AST, ShellCheck.Data, ShellCheck.Parser, ShellCheck.Analytics, ShellCheck.Simple + build-depends: + base >= 4 && < 5, + containers, + directory, + json, + mtl, + parsec, + regex-compat + exposed-modules: + ShellCheck.Analytics + ShellCheck.AST + ShellCheck.Data + ShellCheck.Parser + ShellCheck.Simple executable shellcheck main-is: shellcheck.hs From 948b75075478f3a3618c7df76c9d58c1b66fc2e0 Mon Sep 17 00:00:00 2001 From: Dridi Boukelmoune Date: Fri, 28 Feb 2014 19:55:04 +0100 Subject: [PATCH 2/2] Make the executable depend on the library It needed a bump to 1.8 for the minimum `Cabal-Version'. One downside is that the executable also build-depends on the same libraries. Alphabetical order is kept, except for the dependency to the ShellCheck library itself. --- ShellCheck.cabal | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ShellCheck.cabal b/ShellCheck.cabal index 4ceff51..b4465a6 100644 --- a/ShellCheck.cabal +++ b/ShellCheck.cabal @@ -9,7 +9,7 @@ Author: Vidar Holen Maintainer: vidar@vidarholen.net Homepage: http://www.shellcheck.net/ Build-Type: Simple -Cabal-Version: >= 1.6 +Cabal-Version: >= 1.8 Bug-reports: https://github.com/koalaman/shellcheck/issues Description: The goals of ShellCheck are: @@ -44,4 +44,13 @@ library ShellCheck.Simple executable shellcheck + build-depends: + ShellCheck, + base >= 4 && < 5, + containers, + directory, + json, + mtl, + parsec, + regex-compat main-is: shellcheck.hs