From d13e9687f1cfa309ea081f89ea3905edc5cbe301 Mon Sep 17 00:00:00 2001
From: sheaf <sam.derbyshire@gmail.com>
Date: Thu, 25 Apr 2024 14:50:33 +0200
Subject: [PATCH] WIP: provision new process dep

---
 bootstrap/bootstrap.py            | 4 +++-
 cabal.project                     | 8 --------
 cabal.project.bootstrap           | 8 ++------
 project-cabal/pkgs/cabal.config   | 1 -
 project-cabal/pkgs/install.config | 7 +++++++
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
index ba8327433aa..f5f05f2e702 100755
--- a/bootstrap/bootstrap.py
+++ b/bootstrap/bootstrap.py
@@ -87,7 +87,9 @@ class PackageSource(Enum):
                                     , "Cabal-tests"
                                     , "Cabal-tree-diff"
                                     , "cabal-install-solver"
-                                    , "cabal-install" ]
+                                    , "cabal-install"
+                                    , "hooks-exe"
+                                    ]
 
 class Compiler:
     def __init__(self, ghc_path: Path):
diff --git a/cabal.project b/cabal.project
index bc003a3c352..e368c280c99 100644
--- a/cabal.project
+++ b/cabal.project
@@ -4,11 +4,3 @@ import: project-cabal/pkgs.config
 import: project-cabal/constraints.config
 
 tests: True
-
-packages: ../process
-
---source-repository-package
---  type: git
---  location: https://github.com/sheaf/process
---  tag: 161bd84f8cc9367011465eb0ec420e74e01e9d74
---  post-checkout-command: autoreconf -i
diff --git a/cabal.project.bootstrap b/cabal.project.bootstrap
index 845a3fca7fd..695d39b2eec 100644
--- a/cabal.project.bootstrap
+++ b/cabal.project.bootstrap
@@ -1,9 +1,5 @@
-packages:
-    Cabal
-  , Cabal-syntax
-  , Cabal-hooks
-  , cabal-install
-  , cabal-install-solver
+import: project-cabal/pkgs/cabal.config
+import: project-cabal/pkgs/install.config
 
 -- Don't include tests or benchmarks for bootstrapping
 tests: False
diff --git a/project-cabal/pkgs/cabal.config b/project-cabal/pkgs/cabal.config
index 39a19e5493e..3c1d897705d 100644
--- a/project-cabal/pkgs/cabal.config
+++ b/project-cabal/pkgs/cabal.config
@@ -3,4 +3,3 @@ packages:
   , Cabal-described
   , Cabal-syntax
   , Cabal-hooks
-  , hooks-exe
diff --git a/project-cabal/pkgs/install.config b/project-cabal/pkgs/install.config
index 9010d1f332b..b648d86afd3 100644
--- a/project-cabal/pkgs/install.config
+++ b/project-cabal/pkgs/install.config
@@ -1,3 +1,10 @@
 packages:
     cabal-install
   , cabal-install-solver
+  , hooks-exe
+
+source-repository-package
+  type: git
+  location: https://github.com/sheaf/process
+  tag: a6af24e973249f8992c274feae382a5d341ad02b
+  post-checkout-command: autoreconf -i