diff options
| author | Joris | 2020-01-20 23:34:14 +0100 |
|---|---|---|
| committer | Joris | 2020-01-20 23:35:24 +0100 |
| commit | d80802ac6c0d671840b58fbf93a22d7323a8f355 (patch) | |
| tree | cd37de7cf9c6488180f1708673c63e566a8f773a | |
| parent | 6612972e0f8164bd5d062792ba175e1876e4084f (diff) | |
Use cabal instead of stack
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .tmuxinator.yml | 2 | ||||
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | personalPage.cabal | 4 | ||||
| -rw-r--r-- | project/01-shared-cost.md | 2 | ||||
| -rw-r--r-- | stack.yaml | 5 |
6 files changed, 11 insertions, 20 deletions
@@ -1,4 +1,4 @@ -.stack-work/ +dist-newstyle/ _cache/ output/ public/ diff --git a/.tmuxinator.yml b/.tmuxinator.yml index 90c4684..3e73e65 100644 --- a/.tmuxinator.yml +++ b/.tmuxinator.yml @@ -5,4 +5,4 @@ windows: - console: - clear - main: - - make install watch + - make watch @@ -7,22 +7,18 @@ stop: @tmux kill-session -t personalPage clean: - @unset STACK_IN_NIX_SHELL && stack exec personalPage clean > /dev/null 2>&1 || true - @unset STACK_IN_NIX_SHELL && stack clean > /dev/null - -install: - @unset STACK_IN_NIX_SHELL && stack setup + @cabal new-clean build: - @unset STACK_IN_NIX_SHELL && stack build - @unset STACK_IN_NIX_SHELL && stack exec personalPage build + @cabal new-build + @cabal new-exec personalPage build deploy: - @make build - @unset STACK_IN_NIX_SHELL && stack exec personalPage deploy + @make clean build + @cabal new-exec personalPage deploy watch: @nodemon --watch src -e hs --exec 'make watch-command --silent' watch-command: - @unset STACK_IN_NIX_SHELL && (killall personalPage || :) && sleep 1 && stack build && stack exec personalPage clean && stack exec personalPage watch + @(killall personalPage || :) && sleep 1 && cabal new-build && cabal new-exec personalPage clean && cabal new-exec personalPage watch diff --git a/personalPage.cabal b/personalPage.cabal index f1d5bae..54b497b 100644 --- a/personalPage.cabal +++ b/personalPage.cabal @@ -9,8 +9,8 @@ executable personalPage hs-source-dirs: src default-language: Haskell2010 ghc-options: -threaded - build-depends: base - , hakyll + build-depends: base >= 4.12 && < 4.13 + , hakyll >= 4.13 && < 4.14 , clay , process , filepath diff --git a/project/01-shared-cost.md b/project/01-shared-cost.md index e6bba7e..218ed88 100644 --- a/project/01-shared-cost.md +++ b/project/01-shared-cost.md @@ -1,6 +1,6 @@ --- name: Shared Cost -gitlab: guyonvarch/sharedCost +gitlab: guyonvarch/shared-cost skills: - Haskell - Scotty diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index edf25f8..0000000 --- a/stack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resolver: lts-13.18 - -extra-deps: - - hakyll-4.12.5.1@sha256:d1948b265e6628bcb6875571212f9acefe23179c73ca4f87f417b290ff381ca6 - - lrucache-1.2.0.1@sha256:18fc3d7052012c7ab3cd395160f34b53c5e1ec5379cc45185baf35b90ffadc2e |