Fix for Stack 2.1.1

.circleci/config.yml

@@ -39,8 +39,9 @@ aliases:
           package.yaml
         )
         cat "${FILES[@]}" > cache-key.txt
+        curl -sSL https://get.haskellstack.org/ | sed -n 's/^STACK_VERSION="\(.*\)"/\1/p' >> cache-key.txt
   - &cache-key
-    v1-{{ checksum "cache-key.txt" }}
+    v2-{{ checksum "cache-key.txt" }}
   - &install-stack-deps
     run:
       name: Build external dependencies
@@ -104,6 +105,7 @@ jobs:
           key: *cache-key
           paths:
             - ~/.stack
+            - ~/.local
       - *run-build
       - persist_to_workspace:
           root: .

.gitignore

@@ -1,3 +1,4 @@
 .stack-work
 .DS_Store
 *.cabal
+stack.yaml.lock

scripts/hlint.sh

@@ -6,4 +6,4 @@ set -eo pipefail
 
 builtin cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
-stack exec -- hlint .
+stack exec -- ~/.local/bin/hlint .

scripts/install-stack-deps.sh

@@ -5,4 +5,4 @@
 set -eo pipefail
 
 stack build --test --only-dependencies
-stack build hlint stylish-haskell
+stack install hlint stylish-haskell

scripts/stylish-haskell.sh

@@ -30,13 +30,19 @@ function check_file_empty() {
     fi
 }
 
+RUN_STYLISH=~/.local/bin/stylish-haskell
+if [[ ! -f "${RUN_STYLISH}" ]]; then
+    echo "stylish-haskell not found"
+    exit 1
+fi
+
 if [[ "$STYLISH_APPLY" == 1 ]]; then
     get_files | xargs stack exec -- stylish-haskell --inplace
 else
     trap 'rm -rf .tmp' 0
     get_files | while read FILE; do
         mkdir -p ".tmp/$(dirname "$FILE")"
-        stack exec -- stylish-haskell "$FILE" | diff_no_fail --unified "$FILE" - > .tmp/"$FILE"
+        stack exec -- "${RUN_STYLISH}" "$FILE" | diff_no_fail --unified "$FILE" - > .tmp/"$FILE"
     done
     find .tmp -type f | xargs cat | tee .tmp/diffs.txt
     check_file_empty .tmp/diffs.txt