diff --git a/qr-imager.cabal b/qr-imager.cabal --- a/qr-imager.cabal +++ b/qr-imager.cabal @@ -1,5 +1,5 @@ name: qr-imager -version: 1.0.0.2 +version: 1.0.0.3 cabal-version: >=1.10 build-type: Simple license: BSD3 @@ -16,8 +16,6 @@ extra-source-files: README.md stack.yaml - stack-8.yaml - stack-7.yaml source-repository head type: git @@ -32,7 +30,7 @@ build-depends: base >=4.7 && <5, aeson >=1.0.2.1 && <1.1, - JuicyPixels >=3.2.8 && <3.3, + JuicyPixels >=3.2.8.1 && <3.3, vector >=0.11.0.0 && <0.12, bytestring >=0.10.8.1 && <0.11, lens >=4.15.1 && <4.16, @@ -42,7 +40,7 @@ haskell-qrencode >=1.0.4 && <1.1, process >=1.4.3.0 && <1.5, MissingH >=1.4.0.1 && <1.5, - optparse-applicative >=0.13.1.0 && <0.14 + optparse-applicative >=0.13.2.0 && <0.14 pkgconfig-depends: libqrencode -any default-language: Haskell2010 hs-source-dirs: src @@ -54,8 +52,8 @@ main-is: Spec.hs build-depends: base >=4.9.1.0 && <4.10, - qr-imager >=1.0.0.2 && <1.1, - hspec >=2.4.1 && <2.5 + qr-imager >=1.0.0.3 && <1.1, + hspec >=2.4.2 && <2.5 default-language: Haskell2010 hs-source-dirs: test ghc-options: -threaded -rtsopts -with-rtsopts=-N diff --git a/stack-7.yaml b/stack-7.yaml deleted file mode 100644 --- a/stack-7.yaml +++ /dev/null @@ -1,75 +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: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ - -# A warning or info to be displayed to the user on config load. -user-message: ! 'Warning (added by new or init): Specified resolver could not satisfy - all dependencies. Some external packages have been added as dependencies. - - You can suppress this message by removing it from stack.yaml - -' - -# 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-6.30 - -# 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: -- haskell-qrencode-1.0.4 - -# 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.4" -# -# 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/stack-8.yaml b/stack-8.yaml deleted file mode 100644 --- a/stack-8.yaml +++ /dev/null @@ -1,75 +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: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ - -# A warning or info to be displayed to the user on config load. -user-message: ! 'Warning (added by new or init): Specified resolver could not satisfy - all dependencies. Some external packages have been added as dependencies. - - You can suppress this message by removing it from stack.yaml - -' - -# 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.2 - -# 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: -- haskell-qrencode-1.0.4 - -# 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.4" -# -# 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/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -23,7 +23,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-8.2 +resolver: lts-8.5 # User packages to be built. # Various formats can be used as shown in the example below.