diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | cooking.cabal | 4 | ||||
| -rw-r--r-- | package-lock.json | 41 | ||||
| -rw-r--r-- | shell.nix | 2 |
5 files changed, 41 insertions, 23 deletions
@@ -1,5 +1,5 @@ .psc-package/ -.stack-work/ +dist-newstyle/ _cache/ node_modules/ output/ @@ -12,22 +12,21 @@ test: clean: @rm -rf node_modules @rm -rf .psc-package - @stack exec cooking clean > /dev/null 2>&1 || true - @stack clean > /dev/null + @cabal new-exec cooking clean > /dev/null 2>&1 || true + @cabal new-clean > /dev/null install: @npm install @psc-package install - @stack setup .PHONY: build build: - @stack build - @stack exec cooking build + @cabal new-build + @cabal new-exec cooking build deploy: - @make build - @stack exec cooking deploy + @make clean build + @cabal new-exec cooking deploy watch: @nodemon --watch src -e hs --exec 'make watch-command --silent' @@ -36,4 +35,4 @@ watch-js: @pulp --psc-package --watch build --src-path js watch-command: - @(killall cooking || :) && sleep 1 && stack build && stack exec cooking watch + @(killall cooking || :) && sleep 1 && cabal new-build && cabal new-exec cooking watch diff --git a/cooking.cabal b/cooking.cabal index dc5d360..dade873 100644 --- a/cooking.cabal +++ b/cooking.cabal @@ -8,7 +8,7 @@ executable cooking hs-source-dirs: src ghc-options: -threaded default-language: Haskell2010 - build-depends: base - , hakyll + build-depends: base >= 4.12 + , hakyll == 4.* , clay , process diff --git a/package-lock.json b/package-lock.json index dc3db58..bae50cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1137,7 +1137,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1158,12 +1159,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1178,17 +1181,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1305,7 +1311,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1317,6 +1324,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1331,6 +1339,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1338,12 +1347,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1362,6 +1373,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1442,7 +1454,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1454,6 +1467,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1539,7 +1553,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1575,6 +1590,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1594,6 +1610,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1637,12 +1654,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -11,7 +11,7 @@ haskell.lib.buildStackProject { nodePackages.nodemon tmux tmuxinator - nodejs-8_x + nodejs ]; shellHook = '' |