diff --git a/ChangeLog.md b/ChangeLog.md index fe5a762d..adb00b2d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,9 @@ +## 1.6.0.1 + +### Changed + +- Relaxed upper bounds for several packages ([PR #314](https://github.com/fjvallarino/monomer/pull/314)). + ## 1.6.0.0 ### Added diff --git a/generate-hackage-docs.sh b/generate-hackage-docs.sh index a949fd70..d30e5899 100755 --- a/generate-hackage-docs.sh +++ b/generate-hackage-docs.sh @@ -10,6 +10,7 @@ dir=hackage-docs # assumes cabal 2.4 or later stack exec --no-ghc-package-path -- cabal v2-haddock --builddir="$dir" --haddock-for-hackage --enable-doc +# this unpacks to .tar, which is the file format expected by Hackage cd $dir gunzip monomer*-docs.tar.gz cd .. diff --git a/monomer.cabal b/monomer.cabal index ed728b13..42e8047e 100644 --- a/monomer.cabal +++ b/monomer.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.1. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack name: monomer -version: 1.6.0.0 +version: 1.6.0.1 synopsis: A GUI library for writing native Haskell applications. description: Monomer is an easy to use, cross platform, GUI library for writing native Haskell applications. @@ -169,31 +169,31 @@ library c2hs build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 , lens >=4.16 && <6 , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 if os(windows) extra-libraries: @@ -214,17 +214,17 @@ executable books ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* + , OpenGLRaw >=3.3 && <3.5 , aeson >=1.4 && <2.3 - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -232,14 +232,14 @@ executable books , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 , wreq >=0.5.2 && <0.6 default-language: Haskell2010 if flag(examples) @@ -258,16 +258,16 @@ executable dev-test-app ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -275,15 +275,15 @@ executable dev-test-app , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 executable generative @@ -300,16 +300,16 @@ executable generative ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -317,16 +317,16 @@ executable generative , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* + , process >=1.6 && <1.8 , random >=1.1 && <1.3 - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 if flag(examples) buildable: True @@ -345,16 +345,16 @@ executable opengl ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -362,16 +362,16 @@ executable opengl , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* + , process >=1.6 && <1.8 , random >=1.1 && <1.3 - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 if flag(examples) buildable: True @@ -391,17 +391,17 @@ executable ticker ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* + , OpenGLRaw >=3.3 && <3.5 , aeson >=1.4 && <2.3 - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -409,16 +409,16 @@ executable ticker , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 , websockets ==0.12.* - , wreq >=0.5.2 && <0.6 + , wreq >=0.5.2 && <0.7 , wuss >=1.1 && <2.3 default-language: Haskell2010 if flag(examples) @@ -438,16 +438,16 @@ executable todo ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -455,15 +455,15 @@ executable todo , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 if flag(examples) buildable: True @@ -489,16 +489,16 @@ executable tutorial ghc-options: -threaded build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , http-client >=0.6 && <0.9 @@ -506,16 +506,16 @@ executable tutorial , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* + , process >=1.6 && <1.8 , random >=1.1 && <1.3 - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 if flag(examples) buildable: True @@ -587,16 +587,16 @@ test-suite monomer-test ghc-options: -fwarn-incomplete-patterns build-depends: JuicyPixels >=3.2.9 && <3.5 - , OpenGLRaw ==3.3.* - , async >=2.1 && <2.3 - , attoparsec >=0.12 && <0.15 + , OpenGLRaw >=3.3 && <3.5 + , async >=2.1 && <2.4 + , attoparsec >=0.12 && <0.16 , base >=4.11 && <5 - , bytestring >=0.10 && <0.12 + , bytestring >=0.10 && <0.20 , bytestring-to-vector ==0.3.* - , containers >=0.5.11 && <0.7 - , data-default >=0.5 && <0.8 - , exceptions ==0.10.* - , extra >=1.6 && <1.9 + , containers >=0.5.11 && <0.8 + , data-default >=0.5 && <0.9 + , exceptions >=0.10 && <0.13 + , extra >=1.6 && <1.10 , foreign-store >=0.2 && <1.0 , formatting >=6.0 && <8.0 , hspec >=2.4 && <3.0 @@ -605,13 +605,13 @@ test-suite monomer-test , monomer , mtl >=2.1 && <2.4 , nanovg >=0.8.1 && <1.0 - , process ==1.6.* - , sdl2 >=2.5.0 && <2.6 - , stm ==2.5.* - , text >=1.2 && <2.1 - , text-show >=3.7 && <3.12 - , time >=1.8 && <1.16 - , transformers >=0.5 && <0.7 - , vector >=0.12 && <0.14 - , wreq >=0.5.2 && <0.6 + , process >=1.6 && <1.8 + , sdl2 >=2.5.0 && <2.7 + , stm >=2.5 && <2.7 + , text >=1.2 && <3 + , text-show >=3.7 && <3.14 + , time >=1.8 && <1.20 + , transformers >=0.5 && <0.8 + , vector >=0.12 && <0.20 + , wreq >=0.5.2 && <0.7 default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index 3d1268cb..86af18e3 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: monomer -version: 1.6.0.0 +version: 1.6.0.1 github: fjvallarino/monomer license: BSD3 author: Francisco Vallarino @@ -26,15 +26,15 @@ default-extensions: - OverloadedStrings dependencies: - - async >= 2.1 && < 2.3 - - attoparsec >= 0.12 && < 0.15 + - async >= 2.1 && < 2.4 + - attoparsec >= 0.12 && < 0.16 - base >= 4.11 && < 5 - - bytestring >= 0.10 && < 0.12 + - bytestring >= 0.10 && < 0.20 - bytestring-to-vector >= 0.3 && < 0.4 - - containers >= 0.5.11 && < 0.7 - - data-default >= 0.5 && < 0.8 - - exceptions >= 0.10 && < 0.11 - - extra >= 1.6 && < 1.9 + - containers >= 0.5.11 && < 0.8 + - data-default >= 0.5 && < 0.9 + - exceptions >= 0.10 && < 0.13 + - extra >= 1.6 && < 1.10 - foreign-store >= 0.2 && < 1.0 - formatting >= 6.0 && < 8.0 - http-client >= 0.6 && < 0.9 @@ -42,16 +42,16 @@ dependencies: - lens >= 4.16 && < 6 - mtl >= 2.1 && < 2.4 - nanovg >= 0.8.1 && < 1.0 - - OpenGLRaw >= 3.3 && < 3.4 - - process >= 1.6 && < 1.7 - - sdl2 >= 2.5.0 && < 2.6 - - stm >= 2.5 && < 2.6 - - text >= 1.2 && < 2.1 - - text-show >= 3.7 && < 3.12 - - time >= 1.8 && < 1.16 - - transformers >= 0.5 && < 0.7 - - vector >= 0.12 && < 0.14 - - wreq >= 0.5.2 && < 0.6 + - OpenGLRaw >= 3.3 && < 3.5 + - process >= 1.6 && < 1.8 + - sdl2 >= 2.5.0 && < 2.7 + - stm >= 2.5 && < 2.7 + - text >= 1.2 && < 3 + - text-show >= 3.7 && < 3.14 + - time >= 1.8 && < 1.20 + - transformers >= 0.5 && < 0.8 + - vector >= 0.12 && < 0.20 + - wreq >= 0.5.2 && < 0.7 flags: examples: diff --git a/stack.yaml b/stack.yaml index f56ef3c2..3a92659d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -20,7 +20,7 @@ #resolver: lts-17.15 #resolver: lts-18.27 #resolver: lts-20.21 -resolver: nightly-2023-12-04 +resolver: lts-22.4 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock index 80d050b9..d2b32573 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -13,7 +13,7 @@ packages: hackage: nanovg-0.8.1.0@sha256:bfcbe0dc0020aaa80db895966c9cf1b8aa4f13ac5253e713d728165fea7e9fc1,4914 snapshots: - completed: - sha256: cf95a118f919213067008b202fe5bb9794aa187cc97ded5d5c00c64d3565f298 - size: 700702 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/12/4.yaml - original: nightly-2023-12-04 + sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca + size: 714097 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml + original: lts-22.4