Skip to content

Commit

Permalink
Don't check in stack.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
Lysxia committed Apr 26, 2020
1 parent b109e54 commit f68b58c
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 70 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tests/Main
_cache
_store

stack.yaml
stack*.yaml.lock

.stack-work/
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion lib/PLClub/HakyllExtra.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Hakyll
import System.FilePath.Posix
import Data.List (reverse)
import Control.Monad (liftM)
import Control.Monad.Fail (MonadFail)
import Data.Ord (comparing)
import Data.List (sortBy)

Expand Down Expand Up @@ -104,7 +105,7 @@ siteContext =
-- Look up the "year" field of an identifier's metadata
-- Will throw a runtime error if the field does not exist
-- or cannot be coerced to an integer
getYear :: (MonadMetadata m)
getYear :: (MonadMetadata m, MonadFail m)
=> Item a
-> m Int
getYear item =
Expand Down
4 changes: 2 additions & 2 deletions plclub.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions stack-default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
resolver: lts-14.27 # GHC 8.6.5
packages:
- .
extra-deps:
- hakyll-4.13.3.0
66 changes: 0 additions & 66 deletions stack.yaml

This file was deleted.

0 comments on commit f68b58c

Please sign in to comment.