From b6be67c1c801bda7574a0cd1bb7ca9630deb637f Mon Sep 17 00:00:00 2001
From: Andrey Mokhov <andrey.mokhov@gmail.com>
Date: Wed, 2 Aug 2017 00:11:18 +0100
Subject: [PATCH] Bump to lts-9.0
See #292, #336
---
hadrian.cabal | 4 ++--
stack.yaml | 36 +++++++++---------------------------
2 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/hadrian.cabal b/hadrian.cabal
index af5fd6c45284..da905ffbd73a 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -122,10 +122,10 @@ executable hadrian
, ansi-terminal == 0.6.*
, Cabal == 2.0.0.2
, containers == 0.5.*
- , directory == 1.2.*
+ , directory >= 1.2 && < 1.4
, extra >= 1.4.7
, mtl == 2.2.*
- , QuickCheck >= 2.6 && < 2.9
+ , QuickCheck >= 2.6 && < 2.10
, shake >= 0.15.6
, transformers >= 0.4 && < 0.6
, unordered-containers == 0.2.*
diff --git a/stack.yaml b/stack.yaml
index 5fa9f94d2e16..a05f2cdad6f0 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,36 +1,18 @@
# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-6.12
+resolver: lts-9.0
# Local packages, usually specified by relative directory name
packages:
- '.'
- '../libraries/Cabal/Cabal'
-# 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: false
-
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: >= 1.0.0
-
-# 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
+nix:
+ packages:
+ - autoconf
+ - automake
+ - gcc
+ - git
+ - ncurses
+ - perl
--
GitLab