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.

Sign up for GitHub

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

Jump to bottom

Upgrade aeson to 2.0.* #2292

Merged
merged 15 commits into from
Jun 14, 2022
Merged

Upgrade aeson to 2.0.* #2292

merged 15 commits into from
Jun 14, 2022

Commits on Jun 13, 2022

  1. src: consistently import HashMap as HM, Map as M 

    With both HashMap and Map imported as M in different modules,
linter rules prevented ever importing both modules in one place.
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    5e6987b View commit details
    Browse the repository at this point in the history

  2. cabal: update aeson to 2.0.3

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    48a3d1d View commit details
    Browse the repository at this point in the history

  3. src: update for changed map type in aeson-2 

    This means that we're now using Data.Map.Strict instead of
Data.HashMap.Strict for JSON objects in general, and specifically
for claims maps and CSV rows.

This addresses certain hash flooding vulnerabilities, but may
have performance downsides.

Compare e.g. https://frasertweedale.github.io/blog-fp/posts/2021-10-12-aeson-hash-flooding-protection.html
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    2b8ffc8 View commit details
    Browse the repository at this point in the history

  4. cabal: allow swagger 2.8

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    e42bf30 View commit details
    Browse the repository at this point in the history

  5. cabal: require jose >= 0.8.5.1 (aeson-2 compat) 

    jose version before 0.8.5.1 lacked an upper bound on
aeson-2, causing build failures with aeson-2 present.
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    bb62e55 View commit details
    Browse the repository at this point in the history

  6. cabal: allow hasql-1.5, hasql-dynamic-statements-0.3.*

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    7531c54 View commit details
    Browse the repository at this point in the history

  7. cabal, tests: require wai-logger 2.4.0, adapt tests 

    wai-logger version 2.4.0 fixes log output to not say 'unknownSocket'
for unix sockets.
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    f5afa41 View commit details
    Browse the repository at this point in the history

  8. stack: update stack.yaml

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    b056735 View commit details
    Browse the repository at this point in the history

  9. nix: nix version bump

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    12967f8 View commit details
    Browse the repository at this point in the history

  10. nix: port openssl patch to updated nixpkgs

    @wolfgangwalther @robx
    wolfgangwalther authored and robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    ff56c3a View commit details
    Browse the repository at this point in the history

  11. nix: fetch PostgreSQL 9.6 via postgresql legacy overlay

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    14c882a View commit details
    Browse the repository at this point in the history

  12. nix: bashCompletion -> bash-completion

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    34d0f34 View commit details
    Browse the repository at this point in the history

  13. nix: haskell overlay update

    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    d7f54e7 View commit details
    Browse the repository at this point in the history

  14. nix: hack static-haskell-nix for updated nixpkgs 

    This patches static-haskell-nix to work for building postgrest
with updated nixpkgs (from ~202203):

- The ncurses 'enableStatic' argument doesn't exist anymore.
  We use the vanilla package instead, which seems to work fine.
- The 'isExecutable' check fails with a strange error related
  to trying to override 'mkDerivation'.
  We patch 'isExecutable' to check explicitly whether we're building
  postgrest. ('isExecutable' is used to determine whether to build
  a package statically.)
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    63ebf6e View commit details
    Browse the repository at this point in the history

  15. nix: keep old hlint 

    This keeps the pre-nixpkgs update hlint version, so we can defer
addressing the warnings to a follow-up PR.
    @robx
    robx committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    8d8074d View commit details
    Browse the repository at this point in the history