From 1d7e6226b51a804da37f2334b735837ffb0a626c Mon Sep 17 00:00:00 2001
From: Nicholas Clarke <nicholas.clarke@iohk.io>
Date: Mon, 3 Aug 2020 10:28:21 +0200
Subject: [PATCH] Use multiple subdirs in cabal.project.

Alas, it seems like you can't use '.' as a subdir for some reason, so
there are still two entries for `cardano-prelude`.
---
 cabal.project | 30 +++++++-----------------------
 shell.nix     |  5 ++++-
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/cabal.project b/cabal.project
index 94cdf3736f2..4083004be0e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -25,28 +25,11 @@ source-repository-package
   location: https://github.com/input-output-hk/cardano-base
   tag: 7d795c3040ea7785812efa1c97864bbb41b15d3e
   --sha256: 130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz
-  subdir: binary
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: 7d795c3040ea7785812efa1c97864bbb41b15d3e
-  --sha256: 130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz
-  subdir: binary/test
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: 7d795c3040ea7785812efa1c97864bbb41b15d3e
-  --sha256: 130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz
-  subdir: cardano-crypto-class
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: 7d795c3040ea7785812efa1c97864bbb41b15d3e
-  --sha256: 130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz
-  subdir: slotting
+  subdir:
+    binary
+    binary/test
+    cardano-crypto-class
+    slotting
 
 source-repository-package
   type: git
@@ -65,7 +48,8 @@ source-repository-package
   location: https://github.com/input-output-hk/cardano-prelude
   tag: 316c854d1d3089f480708ad5cd5ecf8a74423ddd
   --sha256: 1srbl3jrkmpwypdz0yrx4nmah3qcsr93dp48zx2bamg51c4hcsyj
-  subdir: test
+  subdir:
+    test
 
 source-repository-package
   type: git
diff --git a/shell.nix b/shell.nix
index 37abdf5e9e2..5c1bc873977 100644
--- a/shell.nix
+++ b/shell.nix
@@ -20,7 +20,6 @@ let
 
     # These programs will be available inside the nix-shell.
     buildInputs = with haskellPackages; [
-      cabal-install
       niv
       pkg-config
       hlint
@@ -28,6 +27,10 @@ let
       ormolu.ormolu
     ];
 
+    tools = {
+      cabal = "3.2.0.0";
+    };
+
     # Prevents cabal from choosing alternate plans, so that
     # *all* dependencies are provided by Nix.
     exactDeps = false;