aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--project/01-shared-cost.md4
-rw-r--r--shell.nix (renamed from default.nix)2
-rw-r--r--stack.yaml.lock26
4 files changed, 36 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index f244010..7ccb5de 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,22 @@ stop:
@tmux kill-session -t personalPage
clean:
- @stack exec personalPage clean > /dev/null 2>&1 || true
- @stack clean > /dev/null
+ @unset STACK_IN_NIX_SHELL && stack exec personalPage clean > /dev/null 2>&1 || true
+ @unset STACK_IN_NIX_SHELL && stack clean > /dev/null
install:
- @stack setup
+ @unset STACK_IN_NIX_SHELL && stack setup
build:
- @stack build
- @stack exec personalPage build
+ @unset STACK_IN_NIX_SHELL && stack build
+ @unset STACK_IN_NIX_SHELL && stack exec personalPage build
deploy:
@make build
- @stack exec personalPage deploy
+ @unset STACK_IN_NIX_SHELL && stack exec personalPage deploy
watch:
@nodemon --watch src -e hs --exec 'make watch-command --silent'
watch-command:
- @(killall personalPage || :) && sleep 1 && stack build && stack exec personalPage clean && stack exec personalPage watch
+ @unset STACK_IN_NIX_SHELL && (killall personalPage || :) && sleep 1 && stack build && stack exec personalPage clean && stack exec personalPage watch
diff --git a/project/01-shared-cost.md b/project/01-shared-cost.md
index 041f825..e6bba7e 100644
--- a/project/01-shared-cost.md
+++ b/project/01-shared-cost.md
@@ -4,9 +4,9 @@ gitlab: guyonvarch/sharedCost
skills:
- Haskell
- Scotty
- - Elm
- Clay
- - Persistent
+ - GHCJS
+ - reflex-frp
---
Share costs with a group of people with a Rich Internet Application
diff --git a/default.nix b/shell.nix
index cde6a42..aaa4ebd 100644
--- a/default.nix
+++ b/shell.nix
@@ -9,7 +9,7 @@ haskell.lib.buildStackProject {
nodePackages.nodemon
tmux
tmuxinator
- nodejs-8_x
+ nodejs
];
shellHook = ''
diff --git a/stack.yaml.lock b/stack.yaml.lock
new file mode 100644
index 0000000..6d1882e
--- /dev/null
+++ b/stack.yaml.lock
@@ -0,0 +1,26 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+# https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+ hackage: hakyll-4.12.5.1@sha256:d1948b265e6628bcb6875571212f9acefe23179c73ca4f87f417b290ff381ca6,8677
+ pantry-tree:
+ size: 7631
+ sha256: ac35d6b2a3b6d87517ff5184430a283c378330ec5da6f7dce26416568bf134ee
+ original:
+ hackage: hakyll-4.12.5.1@sha256:d1948b265e6628bcb6875571212f9acefe23179c73ca4f87f417b290ff381ca6
+- completed:
+ hackage: lrucache-1.2.0.1@sha256:18fc3d7052012c7ab3cd395160f34b53c5e1ec5379cc45185baf35b90ffadc2e,1254
+ pantry-tree:
+ size: 619
+ sha256: 61b2a39a11873f2d8a577e1f6b5e848d2f465ea7f6837ce15436796d3a20eda0
+ original:
+ hackage: lrucache-1.2.0.1@sha256:18fc3d7052012c7ab3cd395160f34b53c5e1ec5379cc45185baf35b90ffadc2e
+snapshots:
+- completed:
+ size: 498365
+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/18.yaml
+ sha256: c813b03544da8a9053b722f00f3f9a0aade23443130ac7160fefa89e01f5fb17
+ original: lts-13.18