Merge pull request #1747 from input-output-hk/nc/cabal-multiple-subdir

Use cabal mulitple subdirs
IntersectMBO · Aug 3, 2020 · 25f504b · 25f504b
2 parents 19edce3 + 1d7e622
commit 25f504b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git 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/nix/haskell.nix b/nix/haskell.nix
@@ -44,7 +44,6 @@ let
         packages.cardano-ledger = {
           configureFlags = [ "--ghc-option=-Werror" ];
           components = {
-            all.postInstall = pkgs.lib.mkForce "";
             tests.cardano-ledger-test = {
               preCheck = ''
                 export CARDANO_MAINNET_MIRROR="${cardano-mainnet-mirror}/epochs"

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "35b1ec8cd577bfc5abf7d0325f38aab01de5ed00",
-        "sha256": "0mg18i6g7nxd7qk0kaca6k8dsc3kam21772zlr19k03ff67ws55j",
+        "rev": "f4136211c933b444ab2e0f358abd223929970220",
+        "sha256": "1b9nxzkg29hwczr6pb6a7arxka8z0swzq7b2bqyxqzr4qvpcjlc1",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/35b1ec8cd577bfc5abf7d0325f38aab01de5ed00.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/f4136211c933b444ab2e0f358abd223929970220.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {

diff --git a/shell.nix b/shell.nix
@@ -20,14 +20,17 @@ let
 
     # These programs will be available inside the nix-shell.
     buildInputs = with haskellPackages; [
-      cabal-install
       niv
       pkg-config
       hlint
       weeder
       ormolu.ormolu
     ];
 
+    tools = {
+      cabal = "3.2.0.0";
+    };
+
     # Prevents cabal from choosing alternate plans, so that
     # *all* dependencies are provided by Nix.
     exactDeps = false;