From cdfebd03a72839f982867f2f9005d4eee775f208 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:19:30 +0000
Subject: [PATCH 1/6] Set index-state for hackage only

---
 cabal.project | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cabal.project b/cabal.project
index 75dbc2656b..a15a6477f2 100644
--- a/cabal.project
+++ b/cabal.project
@@ -34,7 +34,12 @@ packages:
          ./plugins/hls-refactor-plugin
          ./plugins/hls-overloaded-record-dot-plugin
 
-index-state: 2023-10-06T06:12:29Z
+-- head.hackage does not support index-state
+-- (https://gitlab.haskell.org/ghc/head.hackage/-/issues/53)
+-- Setting the index-state for head.hackage can result in
+-- issues, e.g. https://github.com/haskell/haskell-language-server/issues/3861
+-- so we only set it for hackage.
+index-state: hackage.haskell.org 2023-10-06T06:12:29Z
 
 tests: True
 test-show-details: direct

From 25b46f920b24a21c8572210d10e703005291bc03 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:20:01 +0000
Subject: [PATCH 2/6] Bump index-state

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

diff --git a/cabal.project b/cabal.project
index a15a6477f2..ffc419e28c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -39,7 +39,7 @@ packages:
 -- Setting the index-state for head.hackage can result in
 -- issues, e.g. https://github.com/haskell/haskell-language-server/issues/3861
 -- so we only set it for hackage.
-index-state: hackage.haskell.org 2023-10-06T06:12:29Z
+index-state: hackage.haskell.org 2023-11-13T00:00:00Z
 
 tests: True
 test-show-details: direct

From 170ea0eb1c1690c4eaf025fb4f2ea76074f3d685 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:20:51 +0000
Subject: [PATCH 3/6] Bump lower-bound on focus

---
 ghcide/ghcide.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
index c4faae618a..123515787a 100644
--- a/ghcide/ghcide.cabal
+++ b/ghcide/ghcide.cabal
@@ -63,7 +63,7 @@ library
         enummapset,
         filepath,
         fingertree,
-        focus,
+        focus >= 1.0.3.2,
         ghc-trace-events,
         Glob,
         haddock-library >= 1.8 && < 1.12,

From 869b2d038f2b9b929d700b85c8426af2b78d2bfe Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:28:03 +0000
Subject: [PATCH 4/6] Adjust workflow for extracting index-state field

---
 .github/actions/setup-build/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index f126941a90..74491f8ee5 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.github/actions/setup-build/action.yml
@@ -66,10 +66,10 @@ runs:
 
     - name: Retrieving `cabal.project` Hackage timestamp
       run: |
-        # Form: index-state: 2021-11-29T08:11:08Z
+        # Form: index-state: repository 2021-11-29T08:11:08Z
         INDEX_STATE_ENTRY=$(grep index-state cabal.project)
         # Form: 2021-11-29T08-11-08Z
-        INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f2 | tr ':' '-')
+        INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f3 | tr ':' '-')
         echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV
       shell: bash
 

From 53ca960ff9f0a3c0e0f150dfb27d1fda4c531118 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:31:39 +0000
Subject: [PATCH 5/6] Try again

---
 .github/actions/setup-build/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index 74491f8ee5..fad1436de9 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.github/actions/setup-build/action.yml
@@ -67,7 +67,7 @@ runs:
     - name: Retrieving `cabal.project` Hackage timestamp
       run: |
         # Form: index-state: repository 2021-11-29T08:11:08Z
-        INDEX_STATE_ENTRY=$(grep index-state cabal.project)
+        INDEX_STATE_ENTRY=$(grep "index-state:" cabal.project)
         # Form: 2021-11-29T08-11-08Z
         INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f3 | tr ':' '-')
         echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV

From a7dbe0ec957bda69758a86828d9bc0985768c63e Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 13 Nov 2023 10:54:53 +0000
Subject: [PATCH 6/6] Bump index-state further

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

diff --git a/cabal.project b/cabal.project
index ffc419e28c..3252fba8e0 100644
--- a/cabal.project
+++ b/cabal.project
@@ -39,7 +39,7 @@ packages:
 -- Setting the index-state for head.hackage can result in
 -- issues, e.g. https://github.com/haskell/haskell-language-server/issues/3861
 -- so we only set it for hackage.
-index-state: hackage.haskell.org 2023-11-13T00:00:00Z
+index-state: hackage.haskell.org 2023-11-14T00:00:00Z
 
 tests: True
 test-show-details: direct