Merge #2504

2504: cabal.project: use multiple subdirs r=mrBliss a=mrBliss #2461 was closed when the `consensus-improvements-after-hardwork` branch was merged. Co-authored-by: Nicholas Clarke <nick@topos.org.uk> Co-authored-by: Thomas Winant <thomas@well-typed.com>
IntersectMBO · Aug 13, 2020 · d6a279f · d6a279f
2 parents 7454eac + b056a98
commit d6a279f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 104 deletions.
diff --git a/cabal.project b/cabal.project
@@ -120,7 +120,7 @@ source-repository-package
   location: https://github.com/input-output-hk/iohk-monitoring-framework
   tag: d8f35c3c725be67148681227f9d64876f5909120
   --sha256: 09v1m9km3arzxaqlyaw576w69fwfi02q7nm5ias162sfzzg8za4x
-  subdir:   contra-tracer
+  subdir: contra-tracer
 
 source-repository-package
   type: git
@@ -140,112 +140,30 @@ source-repository-package
   location: https://github.com/input-output-hk/cardano-base
   tag: df8687488449f71dce3d881800c21e41fe1b7fc1
   --sha256: 1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m
-  subdir: binary
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: df8687488449f71dce3d881800c21e41fe1b7fc1
-  --sha256: 1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m
-  subdir: binary/test
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: df8687488449f71dce3d881800c21e41fe1b7fc1
-  --sha256: 1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m
-  subdir: cardano-crypto-class
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: df8687488449f71dce3d881800c21e41fe1b7fc1
-  --sha256: 1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m
-  subdir: cardano-crypto-praos
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: df8687488449f71dce3d881800c21e41fe1b7fc1
-  --sha256: 1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m
-  subdir: slotting
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: semantics/executable-spec
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: semantics/small-steps-test
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/ledger/executable-spec
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/ledger/impl
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/ledger/impl/test
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/crypto
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/crypto/test
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: byron/chain/executable-spec
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: shelley/chain-and-ledger/dependencies/non-integer
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
-  --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: shelley/chain-and-ledger/executable-spec
+  subdir:
+    binary
+    binary/test
+    cardano-crypto-class
+    cardano-crypto-praos
+    slotting
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
   tag: 87a8fc7a79927a118a0e444f96372e2efe2a16ab
   --sha256: 1i0v405vy4d0ajkfcjc8vnq3hvpb1wac4g7qwnn4b62p9r1ma54j
-  subdir: shelley/chain-and-ledger/shelley-spec-ledger-test
+  subdir:
+    byron/chain/executable-spec
+    byron/crypto
+    byron/crypto/test
+    byron/ledger/executable-spec
+    byron/ledger/impl
+    byron/ledger/impl/test
+    semantics/executable-spec
+    semantics/small-steps-test
+    shelley/chain-and-ledger/dependencies/non-integer
+    shelley/chain-and-ledger/executable-spec
+    shelley/chain-and-ledger/shelley-spec-ledger-test
 
 source-repository-package
   type: git

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": "821180e130c2b5ee53a6e8a497b59a786349cedf",
+        "sha256": "1g9b2vmgvwxw1sl7agk6vswm92q2fpn1185nbang14flma529ik5",
         "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/821180e130c2b5ee53a6e8a497b59a786349cedf.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {