From 5db1051311c34c7709b3a11803e54ce4c911f272 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Tue, 6 Nov 2018 14:42:23 +0100 Subject: [PATCH] Update stack/cabal config to sync with new structure (#671) Also, add build instructions for cabal and stack in alphabetical order --- README.md | 35 ++++++++++++++++++++++ cabal.project | 1 + dhall-json/cabal.project | 1 - dhall-json/stack.yaml | 6 ---- dhall-text/stack.yaml | 4 --- dhall/stack-lts-11.yaml | 11 ------- dhall/stack.yaml | 14 --------- stack-lts-11.yaml | 17 +++++++++++ dhall/stack-lts-6.yaml => stack-lts-6.yaml | 17 +++++++++-- stack.yaml | 15 ++++++++++ 10 files changed, 82 insertions(+), 39 deletions(-) create mode 100644 cabal.project delete mode 100644 dhall-json/cabal.project delete mode 100644 dhall-json/stack.yaml delete mode 100644 dhall-text/stack.yaml delete mode 100644 dhall/stack-lts-11.yaml delete mode 100644 dhall/stack.yaml create mode 100644 stack-lts-11.yaml rename dhall/stack-lts-6.yaml => stack-lts-6.yaml (67%) create mode 100644 stack.yaml diff --git a/README.md b/README.md index cf6b3a9..b7b27bc 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,50 @@ Navigate to each package's directory for their respective `README`s # Quick start +## Building from source + +### [cabal](https://www.haskell.org/cabal) + You can build all of the packages by running: +```console +$ cabal new-build all ``` + +And each of them with `cabal new-build `, for example: + +```console +$ cabal new-build dhall +``` + +... or you can run `cabal new-build` within each package directory. + +### [nix](https://nixos.org/nix/) + +You can build all of the packages by running: + +```console $ nix-build ``` ... or you can run `nix-build` within each package's respective directory to build just that one package. +### [stack](https://docs.haskellstack.org) + +You can build all of the packages with + +```console +$ stack build +``` + +And each of them with `stack build `, for example: + +```console +$ stack build dhall-json +``` + + ## Development status [![Build Status](https://travis-ci.org/dhall-lang/dhall-haskell.png)](https://travis-ci.org/dhall-lang/dhall-haskell) diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..381ba50 --- /dev/null +++ b/cabal.project @@ -0,0 +1 @@ +packages: ./dhall ./dhall-bash ./dhall-json ./dhall-text diff --git a/dhall-json/cabal.project b/dhall-json/cabal.project deleted file mode 100644 index e6fdbad..0000000 --- a/dhall-json/cabal.project +++ /dev/null @@ -1 +0,0 @@ -packages: . diff --git a/dhall-json/stack.yaml b/dhall-json/stack.yaml deleted file mode 100644 index c5ce254..0000000 --- a/dhall-json/stack.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-12.13 -extra-deps: - - dhall-1.18.0 - - megaparsec-7.0.1 - - repline-0.2.0.0 - - serialise-0.2.1.0 diff --git a/dhall-text/stack.yaml b/dhall-text/stack.yaml deleted file mode 100644 index bcf1ee4..0000000 --- a/dhall-text/stack.yaml +++ /dev/null @@ -1,4 +0,0 @@ -resolver: lts-11.9 - -extra-deps: - - dhall-1.14.0 diff --git a/dhall/stack-lts-11.yaml b/dhall/stack-lts-11.yaml deleted file mode 100644 index d3bb34c..0000000 --- a/dhall/stack-lts-11.yaml +++ /dev/null @@ -1,11 +0,0 @@ -resolver: lts-11.22 -extra-deps: - - cborg-0.2.0.0 - - serialise-0.2.0.0 - - megaparsec-7.0.0 - - parser-combinators-1.0.0 - - repline-0.2.0.0 -nix: - packages: - - ncurses - - zlib diff --git a/dhall/stack.yaml b/dhall/stack.yaml deleted file mode 100644 index 24b0d63..0000000 --- a/dhall/stack.yaml +++ /dev/null @@ -1,14 +0,0 @@ -resolver: lts-12.4 -extra-deps: - - megaparsec-7.0.0@rev:0 - - repline-0.2.0.0@rev:0 - # Version 0.2.0.0 of cborg, the latest on Hackage, is broken on i386. - - github: well-typed/cborg - commit: master - subdirs: - - cborg - - serialise -nix: - packages: - - ncurses - - zlib diff --git a/stack-lts-11.yaml b/stack-lts-11.yaml new file mode 100644 index 0000000..6043487 --- /dev/null +++ b/stack-lts-11.yaml @@ -0,0 +1,17 @@ +resolver: lts-11.22 +packages: + - dhall + - dhall-bash + - dhall-json + - dhall-text +extra-deps: + - cborg-0.2.1.0 + - serialise-0.2.1.0 + - megaparsec-7.0.3 + - parser-combinators-1.0.0 + - repline-0.2.0.0 + - shell-escape-0.2.0 +nix: + packages: + - ncurses + - zlib diff --git a/dhall/stack-lts-6.yaml b/stack-lts-6.yaml similarity index 67% rename from dhall/stack-lts-6.yaml rename to stack-lts-6.yaml index 9b6f145..99f406e 100644 --- a/dhall/stack-lts-6.yaml +++ b/stack-lts-6.yaml @@ -1,10 +1,16 @@ resolver: lts-6.27 +packages: + - dhall + - dhall-bash +# dhall-json uses ApplicativeDo +# - dhall-json + - dhall-text extra-deps: - ansi-terminal-0.7.1.1 - ansi-wl-pprint-0.6.8.2 - cryptonite-0.24 - formatting-6.3.2 -- megaparsec-7.0.0 +- megaparsec-7.0.3 - parser-combinators-1.0.0 - optparse-generic-1.3.0 - optparse-applicative-0.14.0.0 @@ -20,5 +26,10 @@ extra-deps: - haskeline-0.7.4.2 - aeson-1.2.3.0 - th-abstraction-0.2.6.0 -- cborg-0.2.0.0 -- serialise-0.2.0.0 +- cborg-0.2.1.0 +- serialise-0.2.1.0 +- shell-escape-0.2.0 +nix: + packages: + - ncurses + - zlib diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..9da74c8 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,15 @@ +resolver: lts-12.16 +packages: + - dhall + - dhall-bash + - dhall-json + - dhall-text +extra-deps: + - megaparsec-7.0.3 + - repline-0.2.0.0 + - serialise-0.2.1.0 + - neat-interpolation-0.3.2.4 +nix: + packages: + - ncurses + - zlib