From 08c11147397dd9cf1f18ff102eca003d00256826 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Tue, 17 Aug 2021 15:28:28 +0200
Subject: [PATCH 1/4] reduce allow-newer entries for shake-bench (#2101)

* reduce allow-newer entries for shake-bench

* fix comma

(cherry picked from commit f3620d1ee4153f32ce423d110ee14673a92ceab2)

# Conflicts:
#	cabal.project
---
 cabal.project                 | 30 ++++++++++++++++++++++++++++++
 shake-bench/shake-bench.cabal |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/cabal.project b/cabal.project
index 12055ec9da..33877bdd04 100644
--- 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
index b966907cce..6dea31665f 100644
--- 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,

From b0e0504a3b65ca00d255728b3bc49f58cd9a705d Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 18 Aug 2021 11:50:56 +0200
Subject: [PATCH 2/4] Resolve conflicts

---
 cabal.project | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cabal.project b/cabal.project
index 33877bdd04..3bbf59343e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -45,8 +45,6 @@ constraints:
 
 
 allow-newer:
-<<<<<<< HEAD
-=======
     active:base,
     assoc:base,
     cryptohash-md5:base,
@@ -74,7 +72,6 @@ allow-newer:
     these:base,
     time-compat:base,
 
->>>>>>> f3620d1e (reduce allow-newer entries for shake-bench (#2101))
     -- for shake-bench
     Chart-diagrams:diagrams-core,
     SVGFonts:diagrams-core

From 88684d1cbe47282c03a12a1461928c96fbc25349 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 18 Aug 2021 11:57:20 +0200
Subject: [PATCH 3/4] Remove allow-newer again :facepalm:

---
 cabal.project | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/cabal.project b/cabal.project
index 3bbf59343e..12055ec9da 100644
--- a/cabal.project
+++ b/cabal.project
@@ -45,33 +45,6 @@ constraints:
 
 
 allow-newer:
-    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,
-
     -- for shake-bench
     Chart-diagrams:diagrams-core,
     SVGFonts:diagrams-core

From 84589b87d74f6a4caa0824ce765fa8f6ba31e393 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Wed, 18 Aug 2021 12:14:10 +0200
Subject: [PATCH 4/4] Update index state for ghc-9.0.1

---
 cabal-ghc901.project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cabal-ghc901.project b/cabal-ghc901.project
index 02f1519de0..5c233d5c8d 100644
--- a/cabal-ghc901.project
+++ b/cabal-ghc901.project
@@ -75,7 +75,7 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-01T00:00:00Z
+index-state: 2021-08-12T12:00:38Z
 
 constraints:
     -- These plugins doesn't work on GHC9 yet