Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow using newer versions of text and bytestring #120

Merged
merged 3 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/aeson/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [PVP](https://pvp.haskell.org/).

### Changed

* Add restriction to avoid base >= 4.19.0.0
* More strict parser for the json value:
- Disallow invalid keys with a clear error message
- Disallow using objects or arrays in the `_self` special key
Expand Down
14 changes: 7 additions & 7 deletions packages/aeson/conferer-aeson.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down Expand Up @@ -41,11 +41,11 @@ library
ghc-options: -Wall -Wredundant-constraints -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns
build-depends:
aeson >=0.10 && <2.3
, base >=4.3 && <5
, bytestring >=0.10 && <0.12
, base >=4.3 && <4.19.0.0
, bytestring >=0.10 && <0.13
, conferer >=1.1.0.0 && <2.0.0.0
, directory >=1.2 && <2.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
, unordered-containers
, vector
default-language: Haskell2010
Expand All @@ -72,13 +72,13 @@ test-suite specs
build-depends:
aeson >=0.10 && <2.3
, aeson-qq
, base >=4.3 && <5
, bytestring >=0.10 && <0.12
, base >=4.3 && <4.19.0.0
, bytestring >=0.10 && <0.13
, conferer
, conferer-aeson
, directory >=1.2 && <2.0
, hspec
, text >=1.1 && <2.1
, text >=1.1 && <2.2
, unordered-containers
, vector
default-language: Haskell2010
Expand Down
6 changes: 3 additions & 3 deletions packages/aeson/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ _common/lib: !include ../../utils/package.common.yaml
<<: *everything

dependencies:
- base >= 4.3 && < 5
- base >= 4.3 && < 4.19.0.0
- conferer >= 1.1.0.0 && < 2.0.0.0
- bytestring >= 0.10 && < 0.12
- text >= 1.1 && < 2.1
- bytestring >= 0.10 && < 0.13
- text >= 1.1 && < 2.2
- directory >= 1.2 && < 2.0

# json
Expand Down
10 changes: 5 additions & 5 deletions packages/conferer/conferer.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -59,11 +59,11 @@ library
ghc-options: -Wall -Wredundant-constraints -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns
build-depends:
base >=4.3 && <5
, bytestring >=0.10 && <0.12
, bytestring >=0.10 && <0.13
, containers >=0.5 && <0.7
, directory >=1.2 && <2.0
, filepath >=1.0 && <2.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
Expand Down Expand Up @@ -104,14 +104,14 @@ test-suite specs
build-depends:
QuickCheck
, base >=4.3 && <5
, bytestring >=0.10 && <0.12
, bytestring >=0.10 && <0.13
, conferer
, containers >=0.5 && <0.7
, deepseq
, directory >=1.2 && <2.0
, filepath >=1.0 && <2.0
, hspec
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
4 changes: 2 additions & 2 deletions packages/conferer/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ _common/lib: !include ../../utils/package.common.yaml
dependencies:
- base >= 4.3 && < 5
- containers >= 0.5 && < 0.7
- bytestring >= 0.10 && < 0.12
- text >= 1.1 && < 2.1
- bytestring >= 0.10 && < 0.13
- text >= 1.1 && < 2.2
- directory >= 1.2 && < 2.0
- filepath >= 1.0 && < 2.0

Expand Down
10 changes: 5 additions & 5 deletions packages/dhall/conferer-dhall.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -40,13 +40,13 @@ library
ghc-options: -Wall -Wredundant-constraints -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns
build-depends:
base >=4.3 && <5
, bytestring >=0.10 && <0.12
, bytestring >=0.10 && <0.13
, conferer >=1.1.0.0 && <2.0.0.0
, conferer-aeson >=1.1.0.0 && <2.0.0.0
, dhall >=1.8 && <2.0
, dhall-json >=1.0 && <2.0
, directory >=1.2 && <2.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
Expand All @@ -68,15 +68,15 @@ test-suite specs
ghc-options: -Wall -Wredundant-constraints -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -main-is ConfererDhallSpecMain
build-depends:
base >=4.3 && <5
, bytestring >=0.10 && <0.12
, bytestring >=0.10 && <0.13
, conferer >=1.1.0.0 && <2.0.0.0
, conferer-aeson >=1.1.0.0 && <2.0.0.0
, conferer-dhall
, dhall >=1.8 && <2.0
, dhall-json >=1.0 && <2.0
, directory >=1.2 && <2.0
, hspec
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
4 changes: 2 additions & 2 deletions packages/dhall/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dependencies:
- base >= 4.3 && < 5
- conferer >= 1.1.0.0 && < 2.0.0.0
- conferer-aeson >= 1.1.0.0 && < 2.0.0.0
- bytestring >= 0.10 && < 0.12
- text >= 1.1 && < 2.1
- bytestring >= 0.10 && < 0.13
- text >= 1.1 && < 2.2
- directory >= 1.2 && < 2.0
- dhall >= 1.8 && < 2.0
- dhall-json >= 1.0 && < 2.0
Expand Down
6 changes: 3 additions & 3 deletions packages/hedis/conferer-hedis.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -42,7 +42,7 @@ library
base >=4.3 && <5
, conferer >=1.1.0.0 && <2.0.0.0
, hedis >=0.7.0 && <1.0.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
Expand All @@ -69,7 +69,7 @@ test-suite specs
, conferer-hedis
, hedis >=0.7.0 && <1.0.0
, hspec
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
2 changes: 1 addition & 1 deletion packages/hedis/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _common/lib: !include ../../utils/package.common.yaml
dependencies:
- base >= 4.3 && < 5
- conferer >= 1.1.0.0 && < 2.0.0.0
- text >= 1.1 && < 2.1
- text >= 1.1 && < 2.2
- hedis >= 0.7.0 && < 1.0.0

tests:
Expand Down
6 changes: 3 additions & 3 deletions packages/hspec/conferer-hspec.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -42,7 +42,7 @@ library
base >=4.3 && <5
, conferer >=1.1.0.0 && <2.0.0.0
, hspec-core >=2.0.0 && <2.11.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
Expand All @@ -69,7 +69,7 @@ test-suite specs
, conferer-hspec
, hspec
, hspec-core >=2.0.0 && <2.11.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
2 changes: 1 addition & 1 deletion packages/hspec/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _common/lib: !include ../../utils/package.common.yaml
dependencies:
- base >= 4.3 && < 5
- conferer >= 1.1.0.0 && < 2.0.0.0
- text >= 1.1 && < 2.1
- text >= 1.1 && < 2.2
- hspec-core >= 2.0.0 && < 2.11.0

tests:
Expand Down
6 changes: 3 additions & 3 deletions packages/snap/conferer-snap.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -43,7 +43,7 @@ library
, conferer >=1.1.0.0 && <2.0.0.0
, snap-core >=1.0 && <2.0
, snap-server >=1.0 && <2.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
Expand Down Expand Up @@ -71,7 +71,7 @@ test-suite specs
, hspec
, snap-core >=1.0 && <2.0
, snap-server >=1.0 && <2.0
, text >=1.1 && <2.1
, text >=1.1 && <2.2
default-language: Haskell2010
if impl(ghc >= 8.4.1)
ghc-options: -Wpartial-fields
2 changes: 1 addition & 1 deletion packages/snap/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _common/lib: !include ../../utils/package.common.yaml
dependencies:
- base >= 4.3 && < 5
- conferer >= 1.1.0.0 && < 2.0.0.0
- text >= 1.1 && < 2.1
- text >= 1.1 && < 2.2
- snap-server >= 1.0 && < 2.0
- snap-core >= 1.0 && < 2.0

Expand Down
6 changes: 3 additions & 3 deletions packages/warp/conferer-warp.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.18

-- 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

Expand Down Expand Up @@ -42,7 +42,7 @@ library
base >=4.3 && <5
, conferer >=1.1.0.0 && <2.0.0.0
, http-types >=0.8.6 && <0.13
, text >=1.1 && <2.1
, text >=1.1 && <2.2
, wai >=3.0 && <4.0
, warp >=3.0 && <4.0
default-language: Haskell2010
Expand Down Expand Up @@ -71,7 +71,7 @@ test-suite specs
, conferer-warp
, hspec
, http-types >=0.8.6 && <0.13
, text >=1.1 && <2.1
, text >=1.1 && <2.2
, wai >=3.0 && <4.0
, warp >=3.0 && <4.0
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion packages/warp/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _common/lib: !include ../../utils/package.common.yaml
dependencies:
- base >= 4.3 && < 5
- conferer >= 1.1.0.0 && < 2.0.0.0
- text >= 1.1 && < 2.1
- text >= 1.1 && < 2.2
- warp >= 3.0 && < 4.0
- wai >= 3.0 && < 4.0
- http-types >= 0.8.6 && < 0.13
Expand Down
10 changes: 6 additions & 4 deletions stack-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ resolver: none

packages:
- ./packages/conferer/
- ./packages/aeson/
# - ./packages/aeson/
# - ./packages/dhall/
- ./packages/hedis/
- ./packages/hspec/
# - ./packages/hspec/
# - ./packages/snap/
- ./packages/warp/
- ./packages/yaml/
- ./example/
# - ./packages/yaml/
# - ./example/

extra-deps: []
# - dhall-json-1.7.12@sha256:11e3b8eff71da871d8e965a8c3a00ee2666b5d103295132824cff47232fdc365,4517
Loading