Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Bump deps and update to changes in them #59

Merged
merged 9 commits into from
Oct 30, 2019
Merged

Bump deps and update to changes in them #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c604c50
ncoCheckPeerHost: drive by the "disable-peer-host-check" CLI option
deepfire Oct 25, 2019
d184f74
dependencies: bump
deepfire Oct 25, 2019
a40ac44
nix: drop excess canonical-json
deepfire Oct 30, 2019
b3b9890
iohk-nix: August -> October, for 'cardano-sl' 'mainnet-ci' env
deepfire Oct 30, 2019
91aaedf
nix: regenerate with new iohk-nix & added dependencies
deepfire Oct 30, 2019
44a5837
convertAvvmDistr: update to the ledger changes
deepfire Oct 30, 2019
e0e876c
Shelley.versions: update to 'ouroboros-network' changes
deepfire Oct 30, 2019
cab06f9
runShelleyClient: ipSubscriptionWorker now wants bundled local addre…
deepfire Oct 30, 2019
9650e34
withDB: don't trace ledger
deepfire Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,49 +74,49 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: io-sim

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: io-sim-classes

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: ouroboros-consensus

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: ouroboros-network

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: ouroboros-network-testing
Comment on lines 98 to 102
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR: do we actually need ouroboros-network-testing? It only exports Ouroboros.Network.Testing.QuickCheck and Ouroboros.Network.Testing.Serialsie.


source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: network-mux

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: typed-protocols

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: d3e71facd53da4a2c72e4947f551ddeac45fba41
tag: 2441f25ee5a2da0fbf008f3e9a1b1fd4e57f1de3
subdir: typed-protocols-cbor

--
Expand All @@ -126,55 +126,55 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 13e7ffbc142eb1b9d7266c8f5373d787acb65266
tag: 5c575d46afbfe333de0ccba70b084db8302abf42
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 13e7ffbc142eb1b9d7266c8f5373d787acb65266
tag: 5c575d46afbfe333de0ccba70b084db8302abf42
subdir: binary/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 13e7ffbc142eb1b9d7266c8f5373d787acb65266
tag: 5c575d46afbfe333de0ccba70b084db8302abf42
subdir: cardano-crypto-class

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: a1de5b52c32255464564a6c5a8a9e474086e3875
tag: 181f69af290412abecefc07e1b26e77a453755ff
subdir: cardano-ledger

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: a1de5b52c32255464564a6c5a8a9e474086e3875
tag: 181f69af290412abecefc07e1b26e77a453755ff
subdir: crypto

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: a1de5b52c32255464564a6c5a8a9e474086e3875
tag: 181f69af290412abecefc07e1b26e77a453755ff
subdir: cardano-ledger/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: a1de5b52c32255464564a6c5a8a9e474086e3875
tag: 181f69af290412abecefc07e1b26e77a453755ff
subdir: crypto/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: b9bf62f2bab90539809bee13620fe7d29b35928d
tag: ad19158c7599bc5d50fe7cb0111a1488a139a381
subdir: .

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: b9bf62f2bab90539809bee13620fe7d29b35928d
tag: ad19158c7599bc5d50fe7cb0111a1488a139a381
subdir: test

source-repository-package
Expand All @@ -186,7 +186,7 @@ source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-shell
subdir: cardano-shell
tag: 8b8437fa2c0cd7e0c1f0ee94ae1565dbcf5617d0
tag: 8abae427c44f0b447117f78e2c1f5006dac2edf8

source-repository-package
type: git
Expand All @@ -196,97 +196,97 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: lib

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: binary

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: binary/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: util

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: util/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: infra

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: infra/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: core

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: core/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: chain

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: chain/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: db

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: db/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: crypto

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: crypto/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl
tag: 95c03f565e6f1ab1b863bcfb13638333851e6c75
tag: 2a5b5769799fd220e2ff6a6b09a1832d8e6f06c0
subdir: networking

source-repository-package
Expand Down
77 changes: 59 additions & 18 deletions nix/.stack.nix/cardano-binary-test.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,43 @@
{ system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
let
buildDepError = pkg:
builtins.throw ''
The Haskell package set does not contain the package: ${pkg} (build dependency).

If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
sysDepError = pkg:
builtins.throw ''
The Nixpkgs package set does not contain the package: ${pkg} (system dependency).

You may need to augment the system package mapping in haskell.nix so that it can be found.
'';
pkgConfDepError = pkg:
builtins.throw ''
The pkg-conf packages does not contain the package: ${pkg} (pkg-conf dependency).

You may need to augment the pkg-conf package mapping in haskell.nix so that it can be found.
'';
exeDepError = pkg:
builtins.throw ''
The local executable components do not include the component: ${pkg} (executable dependency).
'';
legacyExeDepError = pkg:
builtins.throw ''
The Haskell package set does not contain the package: ${pkg} (executable dependency).

If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
buildToolDepError = pkg:
builtins.throw ''
Neither the Haskell package set or the Nixpkgs package set contain the package: ${pkg} (build tool dependency).

If this is a system dependency:
You may need to augment the system package mapping in haskell.nix so that it can be found.

If this is a Haskell dependency:
If you are using Stackage, make sure that you are using a snapshot that contains the package. Otherwise you may need to update the Hackage snapshot you are using, usually by updating haskell.nix.
'';
in { system, compiler, flags, pkgs, hsPkgs, pkgconfPkgs, ... }:
{
flags = { development = false; };
package = {
Expand All @@ -13,33 +52,35 @@
synopsis = "Test helpers from cardano-binary exposed to other packages";
description = "Test helpers from cardano-binary exposed to other packages";
buildType = "Simple";
isLocal = true;
};
components = {
"library" = {
depends = [
(hsPkgs.base)
(hsPkgs.bytestring)
(hsPkgs.cardano-binary)
(hsPkgs.cardano-prelude)
(hsPkgs.cardano-prelude-test)
(hsPkgs.cborg)
(hsPkgs.containers)
(hsPkgs.formatting)
(hsPkgs.hedgehog)
(hsPkgs.hspec)
(hsPkgs.pretty-show)
(hsPkgs.QuickCheck)
(hsPkgs.quickcheck-instances)
(hsPkgs.text)
(hsPkgs.vector)
(hsPkgs."base" or (buildDepError "base"))
(hsPkgs."bytestring" or (buildDepError "bytestring"))
(hsPkgs."cardano-binary" or (buildDepError "cardano-binary"))
(hsPkgs."cardano-prelude" or (buildDepError "cardano-prelude"))
(hsPkgs."cardano-prelude-test" or (buildDepError "cardano-prelude-test"))
(hsPkgs."cborg" or (buildDepError "cborg"))
(hsPkgs."containers" or (buildDepError "containers"))
(hsPkgs."formatting" or (buildDepError "formatting"))
(hsPkgs."hedgehog" or (buildDepError "hedgehog"))
(hsPkgs."hspec" or (buildDepError "hspec"))
(hsPkgs."pretty-show" or (buildDepError "pretty-show"))
(hsPkgs."QuickCheck" or (buildDepError "QuickCheck"))
(hsPkgs."quickcheck-instances" or (buildDepError "quickcheck-instances"))
(hsPkgs."text" or (buildDepError "text"))
(hsPkgs."vector" or (buildDepError "vector"))
];
buildable = true;
};
};
} // {
src = (pkgs.lib).mkDefault (pkgs.fetchgit {
url = "https://github.com/input-output-hk/cardano-base";
rev = "13e7ffbc142eb1b9d7266c8f5373d787acb65266";
sha256 = "1dkral9wxd84zwcxrvids94zb2hp4g9wykxhwfj2pjih0qm8h9ng";
rev = "5c575d46afbfe333de0ccba70b084db8302abf42";
sha256 = "1v1q20fjb6klcdhl9mhpvd10j6vc7biwk91dgyfp6ld7xvj2703x";
});
postUnpack = "sourceRoot+=/binary/test; echo source root reset to \$sourceRoot";
}
Loading