Fuck stack

4 files changed, 9 insertions, 69 deletions

diff --git a/.gitignore b/.gitignore
index 6a123fa..3f940c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .stack-work/
+dist-newstyle/
 .cabal-sandbox
 cabal.sandbox.config
 .DS_Store
diff --git a/lisphs.cabal b/lisphs.cabal
index ec986fc..98d74c8 100644
--- a/lisphs.cabal
+++ b/lisphs.cabal
@@ -12,5 +12,10 @@ executable            lisp
     default-language: Haskell2010
     ghc-options:      -Wall -O2
     build-depends:    base >= 4 && < 5,
-                      array, containers, filepath, mtl, parsec, text
+                      array >= 0.5.4.0,
+                      containers >= 0.6.2.1,
+                      filepath >= 1.4.2.1,
+                      mtl >= 2.2.2,
+                      parsec >= 3.1.14.0,
+                      text >= 1.2.4.0
     other-modules:    AST, Compiler, CompilerMacros, DString, Intermediate, Liveness, Optimiser, Parser, Stackify, Util, VM
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
index 95f0e91..0000000
--- a/stack.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file was automatically generated by 'stack init'
-#
-# Some commonly used options have been documented as comments in this file.
-# For advanced use and comprehensive documentation of the format, please see:
-# https://docs.haskellstack.org/en/stable/yaml_configuration/
-
-# Resolver to choose a 'specific' stackage snapshot or a compiler version.
-# A snapshot resolver dictates the compiler version and the set of packages
-# to be used for project dependencies. For example:
-#
-# resolver: lts-3.5
-# resolver: nightly-2015-09-21
-# resolver: ghc-7.10.2
-# resolver: ghcjs-0.1.0_ghc-7.10.2
-# resolver:
-#  name: custom-snapshot
-#  location: "./custom-snapshot.yaml"
-resolver: lts-13.8
-
-# User packages to be built.
-# Various formats can be used as shown in the example below.
-#
-# packages:
-# - some-directory
-# - https://example.com/foo/bar/baz-0.0.2.tar.gz
-# - location:
-#    git: https://github.com/commercialhaskell/stack.git
-#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#   extra-dep: true
-#  subdirs:
-#  - auto-update
-#  - wai
-#
-# A package marked 'extra-dep: true' will only be built if demanded by a
-# non-dependency (i.e. a user package), and its test suites and benchmarks
-# will not be run. This is useful for tweaking upstream packages.
-packages:
-- .
-# Dependency packages to be pulled from upstream that are not in the resolver
-# (e.g., acme-missiles-0.3)
-# extra-deps: []
-
-# Override default flag values for local packages and extra-deps
-# flags: {}
-
-# Extra package databases containing global packages
-# extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-#
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=1.6"
-#
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-#
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-#
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
diff --git a/test.sh b/test.sh
index 21ce262..cd8d80d 100755
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
-stack build
-prog="$(stack path --local-install-root)/bin/lisp"
+cabal build
+prog="$(cabal exec -- sh -c 'echo "$PATH" | cut -d: -f1')/lisp"
 ok=1
 for f in tests/*.lisp; do
 	outf="$(sed 's/\.lisp$/.out/' <<<"$f")"