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

Upgrade flake inputs #278

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Upgrade flake inputs #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
130 changes: 85 additions & 45 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
};

rel8 = pkgs.haskell-nix.project {
compiler-nix-name = "ghc945";
compiler-nix-name = "ghc962";

cabalProjectLocal = builtins.readFile ./cabal.project.haskell-nix;

Expand Down
5 changes: 3 additions & 2 deletions rel8.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ library
build-depends:
aeson
, attoparsec
, base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17
, attoparsec-aeson
, base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17 || ^>=4.18
, base16 >= 1.0
, base-compat ^>= 0.11 || ^>= 0.12 || ^>= 0.13
, bifunctors
Expand Down Expand Up @@ -240,7 +241,7 @@ test-suite tests
, data-dword
, hasql
, hasql-transaction
, hedgehog ^>= 1.0 || ^>= 1.1
, hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>= 1.3 || ^>= 1.4
, mmorph
, network-ip
, rel8
Expand Down
4 changes: 3 additions & 1 deletion src/Rel8/Type.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ where
-- aeson
import Data.Aeson ( Value )
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Parser as Aeson

-- attoparsec
import qualified Data.Attoparsec.ByteString.Char8 as A

-- attoparsec-aeson
import qualified Data.Aeson.Parser as Aeson

-- base
import Control.Applicative ((<|>))
import Data.Int ( Int16, Int32, Int64 )
Expand Down