Merge pull request #2293 from balacij/2292_stack_packages

Cabal build files -> hpack/stack built build files & update GHC version to Stack GHC 8.8.4: Resolve #2292 stack packages

code/Makefile

@@ -105,7 +105,7 @@ override GHCTHREADS = 2
 endif
 
 override GHCFLAGS += -Wall -j$(GHCTHREADS)
-override stackArgs += -j3 --ghc-options="$(GHCFLAGS)" --dump-logs --interleaved-output
+override stackArgs += --ghc-options="$(GHCFLAGS)" --dump-logs --interleaved-output
 
 # Output amount control
 NOISY=no

code/drasil-build/drasil-build.cabal

@@ -1,29 +1,40 @@
-Name: drasil-build
-Version: 0.1.1
-Cabal-Version: >= 1.18
-Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.33.0.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 7dfef9af64d6bf0ed24a5a0b033f90a0b6dab4fca27c61e41911a4dabf965c04
+
+name: drasil-build
+version: 0.1.1.0
+synopsis: A framework for code and document generation for scientific software - Build System SubPackage
+description: Please see the README on GitHub at <https://github.com/JacquesCarette/Drasil#readme>
+homepage: https://jacquescarette.github.io/Drasil/
+bug-reports: https://github.com/JacquesCarette/Drasil/issues
+author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith
+maintainer: Jacques Carette
 build-type: Simple
-Synopsis: A framework for code and document generation for scientific software - Build System SubPackage
+
+source-repository head
+ type: git
+ location: https://github.com/JacquesCarette/Drasil
 
 library
  exposed-modules:
- Build.Drasil
+  Build.Drasil
  other-modules:
- Build.Drasil.Make.AST,
- Build.Drasil.Make.Helpers,
- Build.Drasil.Make.Import,
- Build.Drasil.Make.MakeString,
- Build.Drasil.Make.Print
-
- Build-Depends:
- base >= 4.7,
- pretty >= 1.1.1.1,
- drasil-lang >= 0.1.52
+ Build.Drasil.Make.AST
+ Build.Drasil.Make.Helpers
+ Build.Drasil.Make.Import
+ Build.Drasil.Make.MakeString
+ Build.Drasil.Make.Print
+ Paths_drasil_build
+ hs-source-dirs:
+ ./
+ ghc-options: -Wall -Wredundant-constraints
+ build-depends:
+ base >=4.7 && <5
+ , drasil-lang
+ , pretty >=1.1.1.1
  default-language: Haskell2010
- ghc-options: -Wall -Wredundant-constraints
-
-
-source-repository head
- type: git
- location: git://github.com/JacquesCarette/Drasil.git
- subdir: build

code/drasil-build/package.yaml

@@ -0,0 +1,24 @@
+name: drasil-build
+version: 0.1.1.0
+author: "Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith"
+maintainer: "Jacques Carette"
+synopsis: A framework for code and document generation for scientific software - Build System SubPackage
+github: JacquesCarette/Drasil
+homepage: https://jacquescarette.github.io/Drasil/
+description: Please see the README on GitHub at <https://github.com/JacquesCarette/Drasil#readme>
+
+extra-source-files: []
+
+dependencies:
+- base >= 4.7 && < 5
+- pretty >= 1.1.1.1
+- drasil-lang
+
+ghc-options:
+- -Wall
+- -Wredundant-constraints
+
+library:
+ source-dirs: ./
+ exposed-modules:
+ - Build.Drasil

code/drasil-build/stack.yaml

@@ -11,36 +11,40 @@
 # resolver: lts-3.5
 # resolver: nightly-2015-09-21
 # resolver: ghc-7.10.2
-# resolver: ghcjs-0.1.0_ghc-7.10.2
-# resolver:
-# name: custom-snapshot
-# location: "./custom-snapshot.yaml"
-resolver: lts-11.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver:
+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
 #
 # packages:
 # - some-directory
 # - https://example.com/foo/bar/baz-0.0.2.tar.gz
-# - location:
-# git: https://github.com/commercialhaskell/stack.git
-# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-# extra-dep: true
-# subdirs:
-# - auto-update
-# - wai
-#
-# A package marked 'extra-dep: true' will only be built if demanded by a
-# non-dependency (i.e. a user package), and its test suites and benchmarks
-# will not be run. This is useful for tweaking upstream packages.
+# subdirs:
+# - auto-update
+# - wai
 packages:
 - .
 - ../drasil-lang
-# Dependency packages to be pulled from upstream that are not in the resolver
-# (e.g., acme-missiles-0.3)
-# extra-deps: []
+
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+# extra-deps:
+# - acme-missiles-0.3
+# - git: https://github.com/commercialhaskell/stack.git
+# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#
+extra-deps: 
+- unicode-names-3.2.0.0@sha256:fef7241d93170e26265e84553090253a5e8ee207645d47cf271816f5834d07d2,470
+- unicode-properties-3.2.0.0@sha256:239766a6ac4322329353f6b9cd546024fd8c5f0235c8e32b3cba2d6bd245a699,1000
 
 # Override default flag values for local packages and extra-deps
 # flags: {}
@@ -53,7 +57,7 @@ packages:
 #
 # Require a specific version of stack, using version ranges
 # require-stack-version: -any # Default
-# require-stack-version: ">=1.6"
+# require-stack-version: ">=2.5"
 #
 # Override the architecture used by stack, especially useful on Windows
 # arch: i386