84845f0 · rel8 · git.iko.soy

git.iko.soy/rel8

GHC 9 support

commit84845f04843658d32e3d6d20e593cfaf37bd2ab2 authorShane O'Brien <shane.obrien@circuithub.com> dateWed 7 Apr 2021, 14:57 (6 years ago) parent444bf05

3 files changed+3−9

compare with master

unifiedsplit

default.nix+1−1 shell.nix+1−1 src/Rel8/Schema/Nullability/Internal.hs+1−7

default.nix+1−1

@@ -5,7 +5,7 @@ let

66 nixpkgsArgs = haskellNix.nixpkgsArgs;

8− compiler-nix-name = "ghc8104";

8+ compiler-nix-name = "ghc901";

1010 pkgs = import nixpkgsSrc nixpkgsArgs;

1111

shell.nix+1−1

@@ -4,7 +4,7 @@ let

44 hsPkgs = import ./default.nix;

55in

66 hsPkgs.shellFor {

7− withHoogle = true;

7+ withHoogle = false;

88 tools = { cabal = "latest"; };

99 exactDeps = false;

1010 buildInputs = [ pkgs.postgresql pkgs.pythonPackages.sphinx ];

src/Rel8/Schema/Nullability/Internal.hs+1−7

@@ -6,7 +6,6 @@

66{-# language GADTs #-}

77{-# language MultiParamTypeClasses #-}

88{-# language RankNTypes #-}

9−{-# language QuantifiedConstraints #-}

109{-# language StandaloneKindSignatures #-}

1110{-# language TypeFamilies #-}

1211{-# language UndecidableInstances #-}

@@ -115,12 +114,7 @@ nullabilization = nullabilization'

115114-- supports equality, and @a@ can either be exactly an @a@, or it could also be

116115-- @Maybe a@.

117116type Sql :: (Type -> Constraint) -> Type -> Constraint

118−class

119− ( (forall c. (forall x. (constraint x => c x)) => Sql c a)

120− , HasNullability a

121− , constraint (Unnullify a)

122− )

123− => Sql constraint a

117+class (constraint (Unnullify a), HasNullability a) => Sql constraint a

124118instance (constraint (Unnullify a), HasNullability a) => Sql constraint a

125119

126120