git.iko.soy/project-m36
on master help sign in
add stack config for GHC 8.4

add travis config for GHC 8.4

commitf63d63529fc5d4c5569d19e05af566841683802e authorAgentM <agentm@themactionfaction.com> dateMon 1 Oct 2018, 22:52 (8 years ago) parent7335dac
5 files changed+68−6
compare with master
unifiedsplit
.travis.yml+3 project-m36.cabal+8−1 src/lib/ProjectM36/Sessions.hs+1−3 stack.ghc8.2.yaml+3−2 stack.ghc8.4.yaml+53
.travis.yml+3
@@ -24,6 +24,9 @@ matrix:
2424 os_image: xcode7.3
2525 compiler: ": #stack 8.2.2"
2626
27+ - env: CACHE_NAME=8.4.3 STACK_YAML=stack.ghc8.4.yaml
28+ compiler: ": #stack 8.4.3"
29+
2730before_script:
2831 - unset CC
2932 - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
project-m36.cabal+8−1
@@ -22,9 +22,14 @@ Flag profiler
2222 Default: False
2323 Manual: True
2424
25+--flag to allow stack to use its older, pinned packages
26+Flag stack
27+ Description: build with stack and stackage
28+ Manual: True
29+ Default: False
2530
2631Library
27− Build-Depends: base>=4.8 && < 4.12, ghc >= 7.8 && < 8.5, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, binary, filepath, zlib, directory, vector-binary-instances, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, network-transport, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, distributed-process-client-server >= 0.2.3, distributed-process >= 0.7.2, distributed-process-extras >= 0.3.2, distributed-process-async >= 0.2.4.1, network-transport-tcp >= 0.6.0, network-transport, list-t, stm-containers >= 0.2.15, foldl, deferred-folds, optparse-applicative, Glob, cryptohash-sha256
32+ Build-Depends: base>=4.8 && < 4.12, ghc >= 7.8 && < 8.5, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, binary, filepath, zlib, directory, vector-binary-instances, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, network-transport, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, distributed-process-client-server >= 0.2.3, distributed-process >= 0.7.2, distributed-process-extras >= 0.3.2, distributed-process-async >= 0.2.4.1, network-transport-tcp >= 0.6.0, network-transport, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256
2833 Exposed-Modules: ProjectM36.Error,
2934 ProjectM36.Transaction,
3035 ProjectM36.TransactionGraph,
@@ -110,6 +115,8 @@ Library
110115 if impl(ghc>= 8)
111116 build-depends:
112117 ghc-boot, ghci
118+ if !flag(stack)
119+ Build-Depends: deferred-folds
113120
114121Executable tutd
115122 Build-Depends: base >=4.8 && <5.0,
src/lib/ProjectM36/Sessions.hs+1−3
@@ -16,10 +16,8 @@ import ProjectM36.Relation
1616import ProjectM36.Error
1717import qualified Data.UUID as U
1818import qualified Control.Foldl as Foldl
19−#if MIN_VERSION_deferred_folds(0,7,0)
19+#if MIN_VERSION_stm_containers(1,0,0)
2020import qualified DeferredFolds.UnfoldlM as UF
21−#else
22−import qualified DeferredFolds.UnfoldM as UF
2321#endif
2422
2523type Sessions = StmMap.Map SessionId Session
stack.ghc8.2.yaml+3−2
@@ -19,11 +19,12 @@ extra-deps:
1919- distributed-process-async-0.2.4.1
2020- distributed-process-client-server-0.2.3
2121- distributed-process-extras-0.3.2
22−- deferred-folds-0.9.7.1
2322- rset-1.0.0
2423
2524# Override default flag values for local packages and extra-deps
26−flags: {}
25+flags:
26+ project-m36:
27+ stack: true
2728
2829# Extra package databases containing global packages
2930extra-package-dbs: []
stack.ghc8.4.yamlnew file+53
@@ -0,0 +1,53 @@
1+# This file was automatically generated by stack init
2+# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3+
4+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
5+resolver: lts-12.11
6+
7+# Local packages, usually specified by relative directory name
8+packages:
9+- '.'
10+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11+extra-deps:
12+- data-accessor-transformers-0.2.1.7
13+- data-interval-1.2.0
14+- extended-reals-0.2.1.0
15+- gnuplot-0.5.5.3
16+- aeson-1.2.1.00
17+- distributed-process-0.7.3
18+- distributed-process-async-0.2.4.1
19+- distributed-process-client-server-0.2.3
20+- distributed-process-extras-0.3.2
21+#- deferred-folds-0.9.7.1
22+- rset-1.0.0
23+- hashable-time-0.2.0.2
24+- network-transport-tcp-0.6.0
25+
26+# Override default flag values for local packages and extra-deps
27+flags:
28+ project-m36:
29+ stack: true
30+
31+# Extra package databases containing global packages
32+extra-package-dbs: []
33+
34+# Control whether we use the GHC we find on the path
35+# system-ghc: true
36+
37+# Require a specific version of stack, using version ranges
38+# require-stack-version: -any # Default
39+# require-stack-version: >= 1.0.0
40+
41+# Override the architecture used by stack, especially useful on Windows
42+# arch: i386
43+# arch: x86_64
44+
45+# Extra directories used by stack for building
46+# extra-include-dirs: [/path/to/dir]
47+# extra-lib-dirs: [/path/to/dir]
48+
49+# Allow a newer minor version of GHC than the snapshot specifies
50+# compiler-check: newer-minor
51+
52+allow-newer: true
53+