Merge branch 'master' into edmund/2.19.3-prep

cabal.project

@@ -98,12 +98,6 @@ source-repository-package
     tag: e0437bf82e9b4d3fec5ad42ef6e860f4bd04e1b4
     --sha256: 1az7jcggcj275djnfsvhdg3n7hjrj6vp8rj137fxrg4hazh0hyzv
 
-source-repository-package
-  type: git
-  location: https://github.com/chessai/dyna
-  tag: f596ea2cc23908fe364569499948c58061fbaa74
-  --sha256: 16p28bgcadnd9dimny1syias3bap0v6x8dz15bqrxg7ws63ay1rz
-
 -- Required for backward compatibility:
 
 -- ixset-typed FIX (no PR yet)
@@ -141,14 +135,14 @@ allow-newer: servant:*
 
 -- these are more liberal than necessary, but since everything works fine
 -- with this there's no reason to constrain it more than necessary.
--- These packages are tightly bound to the GHC version and these 
+-- These packages are tightly bound to the GHC version and these
 -- settings ensure that we use the versions that are shipped with the
 -- GHC version that we are using.
 allow-newer: *:base
 allow-newer: *:tempalte-haskell
 allow-newer: *:ghc-prim
 
--- Pact uses a vendored version of trifecta that has outdated 
+-- Pact uses a vendored version of trifecta that has outdated
 -- upper bounds
 allow-newer: trifecta:*