diff options
| author | John J. Camilleri <john@johnjcamilleri.com> | 2021-06-22 13:37:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 13:37:13 +0200 |
| commit | 82061433281c60c669c6fccd38c7b9c23a6e6088 (patch) | |
| tree | 983100db1036ea94a6b3a372b0393bb5be82e9b2 | |
| parent | 5a53a3824730d42d148fa840f6c821786dfa7c53 (diff) | |
| parent | 5564a2f2448f2f13050ae3ba11bed168411aa486 (diff) | |
Merge pull request #106 from GrammaticalFramework/stack-yaml-symlink
In the end, just some minor additions to Stack files. See discussion for more.
| -rw-r--r-- | stack-ghc7.10.3.yaml | 7 | ||||
| -rw-r--r-- | stack-ghc8.0.2.yaml | 6 | ||||
| -rw-r--r-- | stack-ghc8.2.2.yaml | 6 | ||||
| -rw-r--r-- | stack-ghc8.4.4.yaml | 6 | ||||
| -rw-r--r-- | stack-ghc8.6.5.yaml | 6 | ||||
| -rw-r--r-- | stack-ghc8.8.4.yaml | 5 | ||||
| -rw-r--r-- | stack.yaml | 11 |
7 files changed, 44 insertions, 3 deletions
diff --git a/stack-ghc7.10.3.yaml b/stack-ghc7.10.3.yaml index 6869d6572..08ed036f5 100644 --- a/stack-ghc7.10.3.yaml +++ b/stack-ghc7.10.3.yaml @@ -11,4 +11,9 @@ allow-newer: true flags: transformers-compat: - four: true
\ No newline at end of file + four: true +# gf: +# c-runtime: true +# +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack-ghc8.0.2.yaml b/stack-ghc8.0.2.yaml index af08206d9..f98141b0b 100644 --- a/stack-ghc8.0.2.yaml +++ b/stack-ghc8.0.2.yaml @@ -1 +1,7 @@ resolver: lts-9.21 # ghc 8.0.2 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack-ghc8.2.2.yaml b/stack-ghc8.2.2.yaml index c33c53b33..4fd9ce775 100644 --- a/stack-ghc8.2.2.yaml +++ b/stack-ghc8.2.2.yaml @@ -4,3 +4,9 @@ extra-deps: - cgi-3001.3.0.3 - httpd-shed-0.4.0.3 - exceptions-0.10.2 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack-ghc8.4.4.yaml b/stack-ghc8.4.4.yaml index c1a68e2d5..c1f059090 100644 --- a/stack-ghc8.4.4.yaml +++ b/stack-ghc8.4.4.yaml @@ -2,3 +2,9 @@ resolver: lts-12.26 # ghc 8.4.4 extra-deps: - cgi-3001.3.0.3 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack-ghc8.6.5.yaml b/stack-ghc8.6.5.yaml index 2e66c7bf6..1895acca0 100644 --- a/stack-ghc8.6.5.yaml +++ b/stack-ghc8.6.5.yaml @@ -4,3 +4,9 @@ extra-deps: - network-2.6.3.6 - httpd-shed-0.4.0.3 - cgi-3001.5.0.0 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack-ghc8.8.4.yaml b/stack-ghc8.8.4.yaml index a62db170b..95c807937 100644 --- a/stack-ghc8.8.4.yaml +++ b/stack-ghc8.8.4.yaml @@ -7,3 +7,8 @@ extra-deps: - json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210 - multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084 +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib diff --git a/stack.yaml b/stack.yaml index f5d21085c..69b8c8790 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,16 @@ # This default stack file is a copy of stack-ghc8.6.5.yaml -# But committing a symlink is probably a bad idea, so it's a real copy +# But committing a symlink can be problematic on Windows, so it's a real copy. +# See: https://github.com/GrammaticalFramework/gf-core/pull/106 resolver: lts-14.27 # ghc 8.6.5 extra-deps: - network-2.6.3.6 - httpd-shed-0.4.0.3 -- cgi-3001.5.0.0
\ No newline at end of file +- cgi-3001.5.0.0 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib |