Move from cabal sandbox to nix environment

4 files changed, 15 insertions, 14 deletions

diff --git a/default.html.do b/default.html.do
index da9d0b2..e900e4a 100644
--- a/default.html.do
+++ b/default.html.do
@@ -1,12 +1,8 @@
 redo-ifchange $2.md build/tex-filter.hs build/template.html5
 
-texfilter() {
-                runhaskell -package-conf=$(find .cabal-sandbox -maxdepth 1 -iname '*.conf.d' | head -n 1)  build/tex-filter.hs $@ 2>/dev/null
-}
-
 CSS=/style.css
 
-pandoc -t json $2.md | texfilter "$(pwd)" \
+pandoc -t json $2.md | build/tex-filter.hs "$(pwd)" \
     | while read -r x; do
                       [[ -z "${x}" ]] && continue
           echo $x/image.svg
@@ -15,5 +11,5 @@ pandoc -t json $2.md | texfilter "$(pwd)" \
     | xargs -d '\n' redo-ifchange
 
 pandoc -S -f markdown -t json $2.md \
-        | texfilter "$(pwd)" \
+        | build/tex-filter.hs "$(pwd)" \
         | pandoc --template=build/template.html5 --base-header-level=3 --standalone --email-obfuscation=none -f json -t html5 -c $CSS >$3 2>/dev/null
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..4b377cb
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,12 @@
+let
+  pkgs = import <nixpkgs> {};
+        stdenv = pkgs.stdenv;
+        hs = pkgs.haskellPackages;
+in rec {
+  blogEnv = stdenv.mkDerivation rec {
+    name = "blog-env";
+                version = "1";
+                src = ./.;
+                buildInputs = [ hs.pandoc hs.pandocTypes hs.cryptohash hs.strict ];
+        };
+}
diff --git a/do' b/do'
deleted file mode 100755
index 1c3cc95..0000000
--- a/do'
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/zsh
-
-exec env PATH="$PATH:$(pwd)/.cabal-sandbox/bin" ./do $@
diff --git a/lists/default.md.do b/lists/default.md.do
index 121955e..55abe6f 100644
--- a/lists/default.md.do
+++ b/lists/default.md.do
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 redo-ifchange "$2/title"
 
-extracttitle() {
-                runhaskell -package-conf=$(find ../.cabal-sandbox -maxdepth 1 -iname '*.conf.d' | head -n 1) ../build/extract-title.hs $@ 2>&1 | grep 'title: ' | cut -d ' ' -f '2-'
-}
-
 POSTS=()
 while read -r -d $'\0'; do
     post=$(realpath --relative-to=. "$REPLY")
@@ -24,7 +20,7 @@ EOF
 
 POST_TITLES=()
 for x in "${POSTS[@]}"; do
-    title=$(pandoc -t json "$x" | extracttitle)
+    title=$(pandoc -t json "$x" | ../build/extract-title.hs)
     POST_TITLES+=("$title")
 done