diff --git a/install.hs b/install.hs index be440279e4..c836759786 100755 --- a/install.hs +++ b/install.hs @@ -1,7 +1,7 @@ #!/usr/bin/env stack {- stack runghc - --stack-yaml=install/shake.yaml + --stack-yaml=install/stack.yaml --package hls-install -} {- cabal: diff --git a/install/shake.yaml b/install/shake.yaml deleted file mode 100644 index af55d1d2ef..0000000000 --- a/install/shake.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Used to provide a different environment for the shake build script -resolver: lts-14.11 # GHC 8.6.5 -packages: -- . - -nix: - packages: [ zlib ] - -flags: - hls-install: - run-from-stack: true diff --git a/install/stack.yaml b/install/stack.yaml index ab3036601c..23026bccea 100644 --- a/install/stack.yaml +++ b/install/stack.yaml @@ -9,5 +9,9 @@ extra-deps: - binary-instances-1.0.0.1 - lukko-0.1.1.2 +flags: + hls-install: + run-from-stack: true + nix: packages: [ icu libcxx zlib ]