Merge #551

551: Update cabal.project r=erikd a=erikd Co-authored-by: Erik de Castro Lopo <erikd@mega-nerd.com>
IntersectMBO · Jun 12, 2019 · 7662fc9 · 7662fc9
2 parents 808f8df + 515c7e8
commit 7662fc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,6 +1,6 @@
 packages:
+  cardano-ledger     cardano-ledger/test
   crypto crypto/test
-  ./     ./test
   validate-mainnet
 
 package cardano-ledger
@@ -29,13 +29,13 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: b676160954cea07d4378ccca870a61242bc188a2
+  tag: 2d0e0747f1c17bedfc251406ca9b1a59501071b1
   subdir: binary
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: b676160954cea07d4378ccca870a61242bc188a2
+  tag: 2d0e0747f1c17bedfc251406ca9b1a59501071b1
   subdir: binary/test
 
 source-repository-package
@@ -46,19 +46,19 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
+  tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
   subdir: byron/semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
+  tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 07e1933f84e9fabd95ccfcbd77b1f0434d7a0731
+  tag: ad86dcb64e8a5f3bd7670655ab92b50921946479
   subdir: byron/chain/executable-spec
 
 source-repository-package
@@ -76,7 +76,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-shell
-  tag: 44fa2129e07668ebc620708c3a83913cff6fff7c
+  tag: f6fcda280ddd1d4ef87e5203d65d132f924a6e39
 
 source-repository-package
   type: git
@@ -85,8 +85,8 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: http://github.com/nc6/canonical-json
-  tag: a9dc9b893649bc2e2a770ab22d278a780f7e3a3c
+  location: http://github.com/well-typed/canonical-json
+  tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f
 
 source-repository-package
   type: git

diff --git a/stack.yaml b/stack.yaml
@@ -36,7 +36,7 @@ extra-deps:
 
   # Following deps are for cardano-shell
   - git: https://github.com/input-output-hk/cardano-shell
-    commit: de45bf135fc0c575753613ee157378a28f9261e2
+    commit: f6fcda280ddd1d4ef87e5203d65d132f924a6e39
 
   - time-units-1.0.0