Upgrade to latest http-api-data

flake.nix

@@ -0,0 +1,47 @@
+{
+ description = "WebGear Project";
+
+ inputs = {
+ # nixos-22.05 on 2022-06-25
+ nixpkgs.url = "github:NixOS/nixpkgs/ccf8bdf72624521358be6bb7d9b524c4cbcf7aff";
+ # master on 2022-06-25
+ flake-utils.url = "github:numtide/flake-utils/bee6a7250dd1b01844a2de7e02e4df7d8a0a206c";
+ };
+
+ outputs = { self, nixpkgs, flake-utils }:
+ flake-utils.lib.eachDefaultSystem (system:
+ let
+ pkgs = nixpkgs.legacyPackages.${system};
+
+ haskellPackages = pkgs.haskell.packages.ghc922.override {
+ overrides = final: prev: {
+ bytestring-conversion = final.callPackage ./nix/haskell-modules/bytestring-conversion-0.3.2.nix {};
+ };
+ };
+ in {
+ packages = rec {
+ webgear-core = haskellPackages.callCabal2nix "webgear-core" ./webgear-core {};
+
+ webgear-server = haskellPackages.callCabal2nix "webgear-server" ./webgear-server {
+ inherit webgear-core;
+ };
+
+ webgear-openapi = haskellPackages.callCabal2nix "webgear-openapi" ./webgear-openapi {
+ inherit webgear-core;
+ };
+ };
+
+ devShell = pkgs.mkShell {
+ buildInputs = with pkgs; [
+ cabal2nix
+ cabal-install
+ ghcid
+ haskellPackages.haskell-language-server
+ # haskellPackages.packdeps
+ stack
+ ];
+
+ inputsFrom = builtins.attrValues self.packages.${system};
+ };
+ });
+}

nix/haskell-modules/bytestring-conversion-0.3.2.nix

@@ -0,0 +1,20 @@
+{ mkDerivation, attoparsec, base, bytestring, case-insensitive
+, criterion, double-conversion, lib, QuickCheck, tasty, tasty-quickcheck
+, text, transformers
+}:
+mkDerivation {
+ pname = "bytestring-conversion";
+ version = "0.3.2";
+ sha256 = "0ls1jqf4r2hk0mcxmlviw6vgs0cn1db99w2fggsg6x39pi31rk8c";
+ libraryHaskellDepends = [
+ attoparsec base bytestring case-insensitive double-conversion text
+ ];
+ testHaskellDepends = [
+ base bytestring QuickCheck tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion text transformers
+ ];
+ description = "Type-classes to convert values to and from ByteString";
+ license = lib.licenses.mpl20;
+}

stack-9.0.2.yaml

@@ -1,4 +1,4 @@
-resolver: lts-19.11
+resolver: lts-19.13
 
 packages:
  - ./webgear-core

webgear-core/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [1.0.3] - 2022-06-26
+
+### Changed
+- Upgrade to latest http-api-data (#10)
+- Nix flake based development environment
+
 ## [1.0.2] - 2022-06-11
 
 ### Changed
@@ -18,7 +24,8 @@
 - Extracted webgear-core from webgear-server
 - New arrow based API
 
-[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.3
 [1.0.2]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.2
 [1.0.1]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.1
 [1.0.0]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.0

webgear-core/webgear-core.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name: webgear-core
-version: 1.0.2
+version: 1.0.3
 synopsis: Composable, type-safe library to build HTTP APIs
 description:
  WebGear is a library to for building composable, type-safe HTTP APIs.
@@ -57,7 +57,7 @@ common webgear-common
  , bytestring >=0.10.10.1 && <0.12
  , case-insensitive ==1.2.*
  , filepath ==1.4.*
- , http-api-data ==0.4.*
+ , http-api-data >=0.4.2 && <0.6
  , http-media ==0.8.*
  , http-types ==0.12.*
  , network ==3.1.*

webgear-openapi/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [1.0.3] - 2022-06-26
+
+### Changed
+- Nix flake based development environment
+
 ## [1.0.2] - 2022-06-11
 
 ### Changed
@@ -17,7 +22,8 @@
 ### Added
 - First version of webgear-openapi
 
-[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.3
 [1.0.2]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.2
 [1.0.1]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.1
 [1.0.0]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.0

webgear-openapi/webgear-openapi.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name: webgear-openapi
-version: 1.0.2
+version: 1.0.3
 synopsis: Composable, type-safe library to build HTTP API servers
 description:
  WebGear is a library to for building composable, type-safe HTTP API servers.
@@ -74,7 +74,7 @@ library
  , lens >=4.18.1 && <5.2
  , openapi3 >=3.1.0 && <3.3
  , text >=1.2.0.0 && <2.1
- , webgear-core ==1.0.2
+ , webgear-core ==1.0.3
  ghc-options: -Wall
  -Wno-unticked-promoted-constructors
  -Wcompat

webgear-server/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [1.0.3] - 2022-06-26
+
+### Changed
+- Upgrade to latest http-api-data (#10)
+- Nix flake based development environment
+
 ## [1.0.2] - 2022-06-11
 
 ### Changed
@@ -41,7 +47,8 @@
 - Automated tests
 - Documentation
 
-[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/haskell-webgear/webgear/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.3
 [1.0.2]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.2
 [1.0.1]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.1
 [1.0.0]: https://github.com/haskell-webgear/webgear/releases/tag/v1.0.0

webgear-server/webgear-server.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.4
 name: webgear-server
-version: 1.0.2
+version: 1.0.3
 synopsis: Composable, type-safe library to build HTTP API servers
 description:
  WebGear is a library to for building composable, type-safe HTTP API servers.
@@ -59,7 +59,7 @@ common webgear-common
  , http-types ==0.12.*
  , text >=1.2.0.0 && <2.1
  , wai ==3.2.*
- , webgear-core ==1.0.2
+ , webgear-core ==1.0.3
  ghc-options: -Wall
  -Wno-unticked-promoted-constructors
  -Wcompat
@@ -92,10 +92,10 @@ library
  other-modules: Paths_webgear_server
  autogen-modules: Paths_webgear_server
  hs-source-dirs: src
- build-depends: aeson >=1.4 && <2.1
+ build-depends: aeson >=1.4 && <1.6 || >=2.0 && <2.1
  , arrows ==0.4.*
  , bytestring-conversion ==0.3.*
- , http-api-data ==0.4.*
+ , http-api-data >=0.4.2 && <0.6
  , http-media ==0.8.*
  , jose >=0.8.3.1 && <0.10
  , monad-time ==0.3.*