From 4729d22c3669da9aa0fed87edfb721fc5ee6ff19 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Mon, 3 May 2021 10:24:26 +0200 Subject: [PATCH 1/3] Make stack.yaml an actual symlink to stack-ghc8.6.5.yaml. Add some commented flags in stack files. --- stack-ghc7.10.3.yaml | 7 ++++++- stack-ghc8.0.2.yaml | 6 ++++++ stack-ghc8.2.2.yaml | 6 ++++++ stack-ghc8.4.4.yaml | 6 ++++++ stack-ghc8.6.5.yaml | 6 ++++++ stack-ghc8.8.4.yaml | 5 +++++ stack.yaml | 10 +--------- 7 files changed, 36 insertions(+), 10 deletions(-) mode change 100644 => 120000 stack.yaml diff --git a/stack-ghc7.10.3.yaml b/stack-ghc7.10.3.yaml index 0761b54af..751e87fe6 100644 --- a/stack-ghc7.10.3.yaml +++ b/stack-ghc7.10.3.yaml @@ -9,4 +9,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..20bc53b55 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 deleted file mode 100644 index f5d21085c..000000000 --- a/stack.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# 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 - -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 diff --git a/stack.yaml b/stack.yaml new file mode 120000 index 000000000..84f47e45a --- /dev/null +++ b/stack.yaml @@ -0,0 +1 @@ +stack-ghc8.6.5.yaml \ No newline at end of file From 07fd41294a408591fbdd30ce8bbb063b68117d00 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Mon, 3 May 2021 10:33:36 +0200 Subject: [PATCH 2/3] Comment out c-runtime flag by default --- stack-ghc8.6.5.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stack-ghc8.6.5.yaml b/stack-ghc8.6.5.yaml index 20bc53b55..1895acca0 100644 --- a/stack-ghc8.6.5.yaml +++ b/stack-ghc8.6.5.yaml @@ -5,8 +5,8 @@ extra-deps: - httpd-shed-0.4.0.3 - cgi-3001.5.0.0 -flags: - gf: - c-runtime: true +# flags: +# gf: +# c-runtime: true # extra-lib-dirs: # - /usr/local/lib From 5564a2f2448f2f13050ae3ba11bed168411aa486 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Tue, 22 Jun 2021 13:35:46 +0200 Subject: [PATCH 3/3] Make stack.yaml a regular file again --- stack.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) mode change 120000 => 100644 stack.yaml diff --git a/stack.yaml b/stack.yaml deleted file mode 120000 index 84f47e45a..000000000 --- a/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -stack-ghc8.6.5.yaml \ No newline at end of file diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 000000000..69b8c8790 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,16 @@ +# This default stack file is a copy of stack-ghc8.6.5.yaml +# 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 + +# flags: +# gf: +# c-runtime: true +# extra-lib-dirs: +# - /usr/local/lib