diff --git a/ReleaseNotes.md b/ReleaseNotes.md index a1fa4e12f1..fffd17f98b 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,6 @@ # Release notes of Ampersand -## current development +## unreleased changes * Work on meatgrinder (still experimental!) * Bug fix: Issue with SQL query [Issue #152](https://github.com/AmpersandTarski/Ampersand/issues/152) * Bug fix: minor issue with SQL query [Issue #436](https://github.com/AmpersandTarski/Ampersand/issues/436) diff --git a/ampersand.cabal b/ampersand.cabal index 25683bdcce..6607589959 100644 --- a/ampersand.cabal +++ b/ampersand.cabal @@ -29,7 +29,7 @@ executable ampersand hs-source-dirs: src default-language: Haskell2010 ghc-options: -rtsopts -Wall - build-depends: aeson == 0.9.*, + build-depends: aeson == 0.11.*, aeson-pretty == 0.7.*, base == 4.8.*, bytestring == 0.10.*, @@ -46,7 +46,7 @@ executable ampersand HStringTemplate == 0.8.*, lens == 4.13.*, mtl == 2.2.*, - pandoc == 1.16.*, + pandoc == 1.17.*, pandoc-types == 1.16.*, parsec == 3.1.*, process == 1.2.*, @@ -250,7 +250,7 @@ Test-Suite ampersand-test lens == 4.13.*, MissingH == 1.3.*, mtl == 2.2.*, - pandoc == 1.16.*, + pandoc == 1.17.*, pandoc-types == 1.16.*, parsec == 3.1.*, QuickCheck == 2.8.*, diff --git a/stack.yaml b/stack.yaml index e9e8bc65eb..0856f734ee 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) # resolver: lts-3.18 # resolver: nightly-2015-09-21 -resolver: lts-5.15 +resolver: lts-6.2 # Local packages, usually specified by relative directory name packages: