From 5a063def51c72611c98fa2aadaa4c938a12271fa Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 27 Dec 2022 14:32:52 +0100 Subject: chore(3p/sources): Bump channels & overlays The main change is that nixpkgs updated to GHC 9.2 and Stackage LTS-20, so we suffer from a bit of churn. * //3p/overlays/haskell: - use updated dhall-nix patch for hnix 0.16 - use superrecord fork with fixes for GHC 9.2 - use graphmod-1.4.5.1 which has support for GHC 9.2 * //users/Profpatsch: relax constraints on base in Haskell pkgs * //users/Profpatsch/cas-serve: inherit superrecord from 3p * //users/grfn/xanthous: - //3p/overlays/haskell for 8.10.7: * Provide missing dependency of binary-orphans. Fix already commited upstream as e238c3fdaab710a2ce0135e5a77cd7e6bb023a22, can be dropped when channel advances. * Downgrade to brick 0.71.1, the latest version xanthous supports. - Adjust to generic-arbitrary >= 1.0, providing Arg constraints where necessary. - Increase constraint-solver-iterations to 6 (default 4), so Xanthous.Command and Xanthous.Data can be typechecked. - Drop NFData instances for Key and Modifier which have been added to vty upstream. Change-Id: I2170438c2ce8130b65f1a9fe07c4fecab5683d66 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7654 Autosubmit: sterni Reviewed-by: tazjin Reviewed-by: grfn Reviewed-by: Profpatsch Tested-by: BuildkiteCI --- users/Profpatsch/arglib/arglib-netencode.cabal | 2 +- users/Profpatsch/cas-serve/cas-serve.cabal | 2 +- users/Profpatsch/cas-serve/default.nix | 11 +---------- users/Profpatsch/execline/exec-helpers.cabal | 2 +- users/Profpatsch/ical-smolify/ical-smolify.cabal | 2 +- users/Profpatsch/my-prelude/my-prelude.cabal | 2 +- users/Profpatsch/netencode/netencode.cabal | 2 +- users/grfn/xanthous/package.yaml | 1 + users/grfn/xanthous/src/Xanthous/Data.hs | 13 +++++++++---- users/grfn/xanthous/src/Xanthous/Orphans.hs | 5 ++--- users/grfn/xanthous/xanthous.cabal | 12 ++++++------ 11 files changed, 25 insertions(+), 29 deletions(-) (limited to 'users') diff --git a/users/Profpatsch/arglib/arglib-netencode.cabal b/users/Profpatsch/arglib/arglib-netencode.cabal index 461b42a93956..d9a049247395 100644 --- a/users/Profpatsch/arglib/arglib-netencode.cabal +++ b/users/Profpatsch/arglib/arglib-netencode.cabal @@ -8,7 +8,7 @@ library exposed-modules: ArglibNetencode build-depends: - base ^>=4.15.1.0, + base >=4.15 && <5, my-prelude, netencode, exec-helpers, diff --git a/users/Profpatsch/cas-serve/cas-serve.cabal b/users/Profpatsch/cas-serve/cas-serve.cabal index 8740e8737de8..98a5ba1064b1 100644 --- a/users/Profpatsch/cas-serve/cas-serve.cabal +++ b/users/Profpatsch/cas-serve/cas-serve.cabal @@ -8,7 +8,7 @@ executable cas-serve main-is: CasServe.hs build-depends: - base ^>=4.15.1.0, + base >=4.15 && <5, text, sqlite-simple, http-types, diff --git a/users/Profpatsch/cas-serve/default.nix b/users/Profpatsch/cas-serve/default.nix index 2236e92c8e13..b25a5ac04414 100644 --- a/users/Profpatsch/cas-serve/default.nix +++ b/users/Profpatsch/cas-serve/default.nix @@ -7,17 +7,8 @@ let pkgs.haskellPackages.wai pkgs.haskellPackages.warp pkgs.haskellPackages.sqlite-simple + pkgs.haskellPackages.superrecord depot.users.Profpatsch.my-prelude - (pkgs.haskell.lib.dontCheck - (pkgs.haskell.lib.overrideSrc pkgs.haskellPackages.superrecord { - src = pkgs.fetchFromGitHub { - owner = "Profpatsch"; - repo = "superrecord"; - rev = "c00e933f582e3fb8d209f6cece91d464faf09082"; - sha256 = "sha256-UQ2wCoBpUEPcRsI7wNOFGH+vceKF4dcbbGHFVVTkOWw="; - }; - })) - ]; ghcArgs = [ "-threaded" ]; diff --git a/users/Profpatsch/execline/exec-helpers.cabal b/users/Profpatsch/execline/exec-helpers.cabal index 5441dff1d0f0..1262a36ec23b 100644 --- a/users/Profpatsch/execline/exec-helpers.cabal +++ b/users/Profpatsch/execline/exec-helpers.cabal @@ -8,7 +8,7 @@ library exposed-modules: ExecHelpers build-depends: - base ^>=4.15.1.0, + base >=4.15 && <5, my-prelude default-language: Haskell2010 diff --git a/users/Profpatsch/ical-smolify/ical-smolify.cabal b/users/Profpatsch/ical-smolify/ical-smolify.cabal index 6a1bb6ea8795..571b8267c8c3 100644 --- a/users/Profpatsch/ical-smolify/ical-smolify.cabal +++ b/users/Profpatsch/ical-smolify/ical-smolify.cabal @@ -8,7 +8,7 @@ executable ical-smolify main-is: IcalSmolify.hs build-depends: - base ^>=4.15.1.0, + base >=4.15 && <5, my-prelude, exec-helpers data-default diff --git a/users/Profpatsch/my-prelude/my-prelude.cabal b/users/Profpatsch/my-prelude/my-prelude.cabal index 7de057e9e151..731a075b80b4 100644 --- a/users/Profpatsch/my-prelude/my-prelude.cabal +++ b/users/Profpatsch/my-prelude/my-prelude.cabal @@ -13,7 +13,7 @@ library -- LANGUAGE extensions used by modules in this package. -- other-extensions: build-depends: - base ^>=4.15.1.0 + base >=4.15 && <5 , PyF , validation-selective , these diff --git a/users/Profpatsch/netencode/netencode.cabal b/users/Profpatsch/netencode/netencode.cabal index 23c09c9065b1..1bd1d6052ab2 100644 --- a/users/Profpatsch/netencode/netencode.cabal +++ b/users/Profpatsch/netencode/netencode.cabal @@ -8,7 +8,7 @@ library exposed-modules: Netencode build-depends: - base ^>=4.15.1.0, + base >=4.15 && <5, hedgehog, nonempty-containers, deriving-compat, diff --git a/users/grfn/xanthous/package.yaml b/users/grfn/xanthous/package.yaml index 630dc69c11d3..15a36fe964be 100644 --- a/users/grfn/xanthous/package.yaml +++ b/users/grfn/xanthous/package.yaml @@ -111,6 +111,7 @@ default-extensions: ghc-options: - -Wall +- -fconstraint-solver-iterations=6 # Xanthous.Data, Xanthous.Command library: source-dirs: src diff --git a/users/grfn/xanthous/src/Xanthous/Data.hs b/users/grfn/xanthous/src/Xanthous/Data.hs index c11ceb55aa26..1acd14a0640b 100644 --- a/users/grfn/xanthous/src/Xanthous/Data.hs +++ b/users/grfn/xanthous/src/Xanthous/Data.hs @@ -191,7 +191,7 @@ y = lens (\(Position _ yy) -> yy) (\(Position xx _) yy -> Position xx yy) type Position = Position' Int -instance Arbitrary a => Arbitrary (Position' a) where +instance (Arg (Position' a) a, Arbitrary a) => Arbitrary (Position' a) where arbitrary = genericArbitrary shrink (Position px py) = Position <$> shrink px <*> shrink py @@ -313,7 +313,8 @@ data Direction where Here :: Direction deriving stock (Show, Eq, Ord, Generic) deriving anyclass (CoArbitrary, Function, NFData, ToJSON, FromJSON, Hashable) - deriving Arbitrary via GenericArbitrary Direction + +deriving via (GenericArbitrary Direction) instance Arbitrary Direction instance Opposite Direction where opposite Up = Down @@ -432,7 +433,8 @@ data Neighbors a = Neighbors } deriving stock (Show, Eq, Ord, Functor, Foldable, Traversable, Generic) deriving anyclass (NFData, CoArbitrary, Function, MonoFoldable) - deriving Arbitrary via GenericArbitrary (Neighbors a) + +deriving via (GenericArbitrary (Neighbors a)) instance (Arg (Neighbors a) a, Arbitrary a) => Arbitrary (Neighbors a) type instance Element (Neighbors a) = a @@ -768,9 +770,12 @@ data Box a = Box , _dimensions :: V2 a } deriving stock (Show, Eq, Ord, Functor, Generic) - deriving Arbitrary via GenericArbitrary (Box a) makeFieldsNoPrefix ''Box +-- It seems to be necessary to have an `Arg (V2 a) a` constraint, as a is passed +-- to V2 internally, in order to make GHC figure out this deriving via correctly. +deriving via (GenericArbitrary (Box a)) instance (Arg (V2 a) a, Arbitrary a) => Arbitrary (Box a) + bottomRightCorner :: Num a => Box a -> V2 a bottomRightCorner box = V2 (box ^. topLeftCorner . L._x + box ^. dimensions . L._x) diff --git a/users/grfn/xanthous/src/Xanthous/Orphans.hs b/users/grfn/xanthous/src/Xanthous/Orphans.hs index 385873e7b464..b00c803cfe7a 100644 --- a/users/grfn/xanthous/src/Xanthous/Orphans.hs +++ b/users/grfn/xanthous/src/Xanthous/Orphans.hs @@ -22,6 +22,7 @@ import Brick.Widgets.Core (getName) import System.Random.Internal (StdGen (..)) import System.Random.SplitMix (SMGen ()) import Test.QuickCheck +import Test.QuickCheck.Arbitrary.Generic (Arg ()) import "quickcheck-instances" Test.QuickCheck.Instances () import Text.Megaparsec (errorBundlePretty) import Text.Megaparsec.Pos @@ -307,9 +308,7 @@ deriving stock instance Ord a => Ord (MaybeDefault a) deriving stock instance Ord Attr deriving anyclass instance Hashable Graphics.Vty.Input.Events.Key -deriving anyclass instance NFData Graphics.Vty.Input.Events.Key deriving anyclass instance Hashable Graphics.Vty.Input.Events.Modifier -deriving anyclass instance NFData Graphics.Vty.Input.Events.Modifier -------------------------------------------------------------------------------- @@ -374,7 +373,7 @@ deriving newtype instance (Arbitrary s, CoArbitrary (m (a, s))) -------------------------------------------------------------------------------- -deriving via (GenericArbitrary (V2 a)) instance Arbitrary a => Arbitrary (V2 a) +deriving via (GenericArbitrary (V2 a)) instance (Arg (V2 a) a, Arbitrary a) => Arbitrary (V2 a) instance CoArbitrary a => CoArbitrary (V2 a) instance Function a => Function (V2 a) diff --git a/users/grfn/xanthous/xanthous.cabal b/users/grfn/xanthous/xanthous.cabal index 1555f728ace9..12222c26732f 100644 --- a/users/grfn/xanthous/xanthous.cabal +++ b/users/grfn/xanthous/xanthous.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack -- --- hash: 107b223a62633bc51425e8f9d5ab489a7a47464953a81ca693efb496c41f1aa3 +-- hash: b3bf8e65d621856081832c9d3c8e8ad38799e23a7f5084dc4f972daa654a0ff3 name: xanthous version: 0.1.0.0 @@ -119,7 +119,7 @@ library TypeFamilies TypeOperators ViewPatterns - ghc-options: -Wall + ghc-options: -Wall -fconstraint-solver-iterations=6 build-depends: JuicyPixels , MonadRandom @@ -220,7 +220,7 @@ executable xanthous TypeFamilies TypeOperators ViewPatterns - ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O2 + ghc-options: -Wall -fconstraint-solver-iterations=6 -threaded -rtsopts -with-rtsopts=-N -O2 build-depends: JuicyPixels , MonadRandom @@ -349,7 +349,7 @@ test-suite test TypeFamilies TypeOperators ViewPatterns - ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -O0 + ghc-options: -Wall -fconstraint-solver-iterations=6 -threaded -rtsopts -with-rtsopts=-N -O0 build-depends: JuicyPixels , MonadRandom @@ -460,7 +460,7 @@ benchmark benchmark TypeFamilies TypeOperators ViewPatterns - ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N + ghc-options: -Wall -fconstraint-solver-iterations=6 -threaded -rtsopts -with-rtsopts=-N build-depends: JuicyPixels , MonadRandom -- cgit 1.4.1