Don't check in stack.yaml

plclub · Apr 26, 2020 · acf82af · acf82af
1 parent b109e54
commit acf82af
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ tests/Main
 _cache
 _store
 
+stack.yaml
 stack*.yaml.lock
 
 .stack-work/

diff --git a/README.md b/README.md
@@ -12,7 +12,11 @@ This iteration began in November 2019. The previous site had been maintained for
 
 Because the site is deployed as static files, building is a 2-step process. First we build the executable (simply called `site`) and then we run `site` to build the website from the source files.
 
-The compiler _should_ be able to build with just
+First set up a `stack.yaml` file for `stack`. We have one that you can copy:
+
+	cp stack-default.yaml stack.yaml
+
+The compiler _should_ then be able to build with just
 
 	stack build
 

diff --git a/plclub.cabal b/plclub.cabal
@@ -11,14 +11,14 @@ library
     hs-source-dirs:     lib
     default-language: Haskell2010
     build-depends:      base == 4.*
-                    , hakyll == 4.12.*
+                    , hakyll >= 4.12 && < 4.14
                     --- Below is needed only for hackery
                     , temporary == 1.3.*
                     , directory == 1.3.*
                     , process == 1.6.*
                     , filepath == 1.4.*
                     , pandoc-types == 1.17.*
-                    , pandoc == 2.2.*
+                    , pandoc
                     , text == 1.2.*
 
 executable site

diff --git a/stack-default.yaml b/stack-default.yaml
@@ -0,0 +1,5 @@
+resolver: lts-14.27   # GHC 8.6.5
+packages:
+- .
+extra-deps:
+- hakyll-4.13.3.0
diff --git a/stack.yaml b/stack.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ tests/Main @@
     _cache
     _store
+    stack.yaml
     stack*.yaml.lock
     .stack-work/
@@ Expand Down @@