Skip to content

Commit

Permalink
Stack LTS upgrade (#77)
Browse files Browse the repository at this point in the history
* Upgrade to lts-18

* Move Text in with 'aeson < 2.0' section as it's only needed there

* Switch to the aviaviavi cachix cache
  • Loading branch information
dysinger authored Feb 15, 2022
1 parent d060deb commit 9a9b280
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
- uses: cachix/cachix-action@v10
with:
name: scarf
name: aviaviavi
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
extraPullNames: cachix,iohk,nix-community
- run: nix build
Expand Down
7 changes: 2 additions & 5 deletions src/Testing/CurlRunnings/Internal/Aeson.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ module Testing.CurlRunnings.Internal.Aeson
, toText
) where

#if __GLASGOW_HASKELL__ < 810
import Data.Text (Text)
#endif

#if MIN_VERSION_aeson(2,0,0)

import Data.Aeson.KeyMap as Map
Expand All @@ -24,7 +20,8 @@ type KeyType = Key

#else

import Data.HashMap.Strict as Map
import Data.Text (Text)
import Data.HashMap.Strict as Map hiding (findWithDefault)

type MapType v = Map.HashMap Text v
type KeyType = Text
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
resolver: lts-16.16
resolver: lts-18.23

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down

0 comments on commit 9a9b280

Please sign in to comment.