From acf82afd07aba4e5b21bd50915cb96ebaad9f0d5 Mon Sep 17 00:00:00 2001 From: Lysxia <lysxia@gmail.com> Date: Sat, 25 Apr 2020 12:41:41 -0400 Subject: [PATCH] Don't check in stack.yaml --- .gitignore | 1 + README.md | 6 ++++- plclub.cabal | 4 +-- stack-default.yaml | 5 ++++ stack.yaml | 66 ---------------------------------------------- 5 files changed, 13 insertions(+), 69 deletions(-) create mode 100644 stack-default.yaml delete mode 100644 stack.yaml diff --git a/.gitignore b/.gitignore index 6b9858c..97f6917 100644 --- 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 index 9e6026b..fd331cc 100644 --- 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 index f69e793..47daaba 100644 --- 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 new file mode 100644 index 0000000..8808514 --- /dev/null +++ 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 deleted file mode 100644 index 0094ee9..0000000 --- a/stack.yaml +++ /dev/null @@ -1,66 +0,0 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# https://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# -# The location of a snapshot can be provided as a file or url. Stack assumes -# a snapshot provided as a file might change, whereas a url resource does not. -# -# resolver: ./custom-snapshot.yaml -# resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-12.26 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# subdirs: -# - auto-update -# - wai -packages: -- . -# Dependency packages to be pulled from upstream that are not in the resolver. -# These entries can reference officially published versions as well as -# forks / in-progress versions pinned to a git hash. For example: -# -# extra-deps: -# - acme-missiles-0.3 -# - git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# -# extra-deps: [] - -# Override default flag values for local packages and extra-deps -# flags: {} - -# Extra package databases containing global packages -# extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=2.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor