From bc5000e9faa897fd630b3c3b85d6a0b2e4a8b8d7 Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Fri, 21 Jul 2017 18:11:04 +0100
Subject: [PATCH] updates

---
 .gitignore                    |  1 +
 stack.yaml                    | 75 +++++++++++++++++++++++++++++++++++
 x509-store/x509-store.cabal   |  2 +-
 x509-system/x509-system.cabal |  4 +-
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 stack.yaml

diff --git a/.gitignore b/.gitignore
index 196a265..f7cdfe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dist/
+.stack-work/
 *.hi
 *.o
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..dc402fc
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,75 @@
+# 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:
+# http://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# A warning or info to be displayed to the user on config load.
+# 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-8.23
+
+# 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:
+- x509/
+- x509-store/
+- x509-system/
+- x509-validation/
+- x509-util/
+# The following packages have been ignored due to incompatibility with the
+# resolver compiler, dependency conflicts with other packages
+# or unsatisfied dependencies.
+
+# 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.3"
+#
+# 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/x509-store/x509-store.cabal b/x509-store/x509-store.cabal
index b03f3e0..e218ef5 100644
--- a/x509-store/x509-store.cabal
+++ b/x509-store/x509-store.cabal
@@ -25,7 +25,7 @@ Library
                    , asn1-types >= 0.3 && < 0.4
                    , asn1-encoding >= 0.9 && < 0.10
                    , cryptonite
-                   , x509 >= 1.6 && < 1.7
+                   , x509 >= 1.6
   Exposed-modules:   Data.X509.CertificateStore
                      Data.X509.File
                      Data.X509.Memory
diff --git a/x509-system/x509-system.cabal b/x509-system/x509-system.cabal
index 2a0d132..df98d1a 100644
--- a/x509-system/x509-system.cabal
+++ b/x509-system/x509-system.cabal
@@ -23,8 +23,8 @@ Library
                    , filepath
                    , process
                    , pem >= 0.1 && < 0.3
-                   , x509 >= 1.6 && < 1.7
-                   , x509-store >= 1.6.2 && < 1.7
+                   , x509 >= 1.6
+                   , x509-store >= 1.6.2
   Exposed-modules:   System.X509
                      System.X509.Unix
                      System.X509.MacOS