reduce allow-newer entries for shake-bench (#2101)

* reduce allow-newer entries for shake-bench * fix comma (cherry picked from commit f3620d1) # Conflicts: # cabal.project
haskell · Aug 18, 2021 · 08c1114 · 08c1114
1 parent e93f0fd
commit 08c1114
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/cabal.project b/cabal.project
@@ -45,6 +45,36 @@ constraints:
 
 
 allow-newer:
+<<<<<<< HEAD
+=======
+ active:base,
+ assoc:base,
+ cryptohash-md5:base,
+ cryptohash-sha1:base,
+ constraints-extras:template-haskell,
+ data-tree-print:base,
+ deepseq:base,
+ dependent-sum:some,
+ dependent-sum:constraints,
+ dual-tree:base,
+ -- Does this make any sense?
+ entropy:Cabal,
+ force-layout:base,
+ force-layout:lens,
+ floskell:ghc-prim,
+ floskell:base,
+ hashable:base,
+ hslogger:base,
+ monoid-extras:base,
+ newtype-generics:base,
+ parallel:base,
+ regex-base:base,
+ regex-tdfa:base,
+ statestack:base,
+ these:base,
+ time-compat:base,
+
+>>>>>>> f3620d1e (reduce allow-newer entries for shake-bench (#2101))
  -- for shake-bench
  Chart-diagrams:diagrams-core,
  SVGFonts:diagrams-core
diff --git a/shake-bench/shake-bench.cabal b/shake-bench/shake-bench.cabal
@@ -20,7 +20,9 @@ library
  base == 4.*,
  Chart,
  Chart-diagrams,
- diagrams,
+ diagrams-contrib,
+ diagrams-core,
+ diagrams-lib,
  diagrams-svg,
  directory,
  extra >= 1.7.2,