diff --git a/README.md b/README.md index 0de280b5f86..20a36f7ed0f 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ See **Installation Instructions** for each available [release](https://github.co > > | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions) > | --- | --- | --- -> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.19.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.19.0) +> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.19.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.19.1) > | [v2020-08-03](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-08-03) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.18.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.18.0) > | [v2020-07-28](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-07-28) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.18.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.18.0) > | [v2020-07-06](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-07-06) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.14.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.14.2) diff --git a/cardano-1.19.dev1.yaml b/cardano-1.19.dev1.yaml deleted file mode 100644 index 386a7575fb8..00000000000 --- a/cardano-1.19.dev1.yaml +++ /dev/null @@ -1,145 +0,0 @@ -name: cardano-1.19.dev1 - -resolver: lts-14.25 - -packages: -- base16-0.1.2.1 -- base58-bytestring-0.1.0 -- base64-0.4.2 -- bech32-1.1.0 -- bech32-th-1.0.2 -- brick-0.47 -- binary-0.8.7.0 -- bimap-0.4.0 -- canonical-json-0.6.0.0 -- cborg-0.2.4.0 -- clock-0.8 -- config-ini-0.2.4.0 -- connection-0.3.1 -- containers-0.5.11.0 -- data-clist-0.1.2.2 -- dns-3.0.4 -- generic-monoid-0.1.0.0 -- generics-sop-0.5.1.0 -- ghc-byteorder-4.11.0.0.10 -- gray-code-0.3.1 -- hedgehog-1.0.2 -- hedgehog-corpus-0.2.0 -- hedgehog-quickcheck-0.1.1 -- hspec-2.7.0 -- hspec-core-2.7.0 -- hspec-discover-2.7.0 -- io-streams-1.5.1.0 -- io-streams-haproxy-1.0.1.0 -- katip-0.8.4.0 -- libsystemd-journal-1.4.4 -- micro-recursion-schemes-5.0.2.2 -- moo-1.2 -- network-3.1.1.1 -- primitive-0.7.1.0 -- prometheus-2.1.2 -- quickcheck-instances-0.3.19 -- QuickCheck-2.12.6.1 -- quiet-0.2 -- snap-core-1.0.4.1 -- snap-server-1.1.1.1 -- sop-core-0.5.0.1 -- statistics-linreg-0.3 -- streaming-binary-0.3.0.1 -- systemd-2.3.0 -- tasty-hedgehog-1.0.0.2 -- text-1.2.4.0 -- text-ansi-0.1.0 -- text-zipper-0.10.1 -- th-lift-instances-0.1.14 -- time-units-1.0.0 -- transformers-except-0.1.1 -- Unique-0.4.7.6 -- word-wrap-0.4.1 -- websockets-0.12.6.1 -- Win32-2.6.2.0 - -- git: https://github.com/input-output-hk/cardano-base - commit: 3e2d92b25c675fd923a07237eb1d0859b29a79d3 - subdirs: - - binary - - binary/test - - cardano-crypto-class - - slotting - - cardano-crypto-praos - -- git: https://github.com/input-output-hk/cardano-crypto - commit: 2547ad1e80aeabca2899951601079408becbc92c - -- git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 0715d2047b3d23e8b75b8430bddf391799c4669d - subdirs: - - byron/ledger/impl - - byron/crypto - - byron/ledger/impl/test - - byron/crypto/test - - byron/chain/executable-spec - - byron/ledger/executable-spec - - 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 - -- git: https://github.com/input-output-hk/cardano-node - commit: 4814003f14340d5a1fc02f3ac15437387a7ada9f - subdirs: - - cardano-api - - cardano-cli - - cardano-config - - cardano-node - -- git: https://github.com/input-output-hk/cardano-prelude - commit: 71ea865408f2e03e6d6832359423546699730849 - subdirs: - - . - - test - -- git: https://github.com/input-output-hk/cardano-sl-x509 - commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 - -- git: https://github.com/input-output-hk/goblins - commit: 312198a1523736181ef7ddab15958bb32a9d9052 - -- git: https://github.com/input-output-hk/iohk-monitoring-framework - commit: 8190b00d6930927a812baff97d02566176b6bd3b - subdirs: - - contra-tracer - - iohk-monitoring - - plugins/backend-aggregation - - plugins/backend-ekg - - plugins/backend-monitoring - - plugins/scribe-systemd - - tracer-transformers - - plugins/backend-trace-forwarder - -- git: https://github.com/input-output-hk/ouroboros-network - commit: aecfe77de784e6c75108172802ee59d2d7087eaf - subdirs: - - io-sim - - io-sim-classes - - network-mux - - ntp-client - - Win32-network - - ouroboros-consensus - - ouroboros-consensus-byron - - ouroboros-consensus-byronspec - - ouroboros-consensus-cardano - - ouroboros-consensus-shelley - - ouroboros-consensus/ouroboros-consensus-mock - - ouroboros-consensus/ouroboros-consensus-test-infra - - ouroboros-network - - ouroboros-network-framework - - ouroboros-network-testing - - typed-protocols - - typed-protocols-examples - -- git: https://github.com/snoyberg/http-client.git - commit: 1a75bdfca014723dd5d40760fad854b3f0f37156 - subdirs: - - http-client diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs index 3f3e8b3fa2f..0d6f03d02c4 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs @@ -88,6 +88,8 @@ module Cardano.Wallet.Shelley.Compatibility -- * Utilities , invertUnitInterval + , interval0 + , interval1 ) where import Prelude @@ -159,6 +161,8 @@ import Data.Proxy ( Proxy ) import Data.Quantity ( Percentage, Quantity (..), mkPercentage ) +import Data.Ratio + ( (%) ) import Data.Text ( Text ) import Data.Text.Class @@ -206,7 +210,7 @@ import Ouroboros.Network.NodeToClient import Ouroboros.Network.Point ( WithOrigin (..) ) import Shelley.Spec.Ledger.BaseTypes - ( strictMaybeToMaybe, urlToText ) + ( interval0, strictMaybeToMaybe, urlToText ) import Type.Reflection ( Typeable, typeRep ) @@ -1093,3 +1097,6 @@ instance Buildable LocalAddress where -- invertUnitInterval :: SL.UnitInterval -> SL.UnitInterval invertUnitInterval = SL.truncateUnitInterval . (1 - ) . SL.intervalValue + +interval1 :: SL.UnitInterval +interval1 = SL.truncateUnitInterval (1 % 1) diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs index 8bebcb5a0eb..d547568f8af 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs @@ -1139,7 +1139,7 @@ moveInstantaneousRewardsTo tr dir targets = do stakeCert <- issueStakeCert tr dir pub stakeVK void $ cli tr [ "shelley", "governance", "create-mir-certificate" - , "--treasury" + , "--reserves" , "--reward", show reward , "--stake-verification-key-file", stakeVK , "--out-file", mirCert diff --git a/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs b/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs index 636658fbd57..a8d62a4d5d0 100644 --- a/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs +++ b/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs @@ -54,6 +54,8 @@ import Cardano.Wallet.Shelley.Compatibility , TPraosStandardCrypto , decentralizationLevelFromPParams , fromTip + , interval0 + , interval1 , invertUnitInterval , toCardanoHash , toPoint @@ -198,10 +200,10 @@ spec = do checkCoverage $ property $ \i -> let half = SL.truncateUnitInterval (1 % 2) in cover 10 (i == half) "i = 0.5" $ - cover 10 (i == SL.interval0) "i = 0" $ - cover 10 (i == SL.interval1) "i = 1" $ - cover 10 (i > SL.interval0 && i < half) "0 < i < 0.5" $ - cover 10 (half < i && i < SL.interval1) "0.5 < i < 1" + cover 10 (i == interval0) "i = 0" $ + cover 10 (i == interval1) "i = 1" $ + cover 10 (i > interval0 && i < half) "0 < i < 0.5" $ + cover 10 (half < i && i < interval1) "0.5 < i < 1" True it "invertUnitInterval . invertUnitInterval == id" $ @@ -214,10 +216,10 @@ spec = do `shouldBe` 1 it "invertUnitInterval interval0 == interval1" $ - invertUnitInterval SL.interval0 `shouldBe` SL.interval1 + invertUnitInterval interval0 `shouldBe` interval1 it "invertUnitInterval interval1 == interval0" $ - invertUnitInterval SL.interval1 `shouldBe` SL.interval0 + invertUnitInterval interval1 `shouldBe` interval0 it "invertUnitInterval half == half" $ let half = SL.truncateUnitInterval (1 % 2) in @@ -251,8 +253,8 @@ epochLength = EpochLength 10 instance Arbitrary SL.UnitInterval where arbitrary = oneof - [ pure SL.interval0 - , pure SL.interval1 + [ pure interval0 + , pure interval1 , pure $ SL.truncateUnitInterval (1 % 2) , SL.truncateUnitInterval . (% 1000) <$> choose (0, 1000) ] diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix index 1e10a552e0b..042ea8c08f9 100644 --- a/nix/.stack.nix/Win32-network.nix +++ b/nix/.stack.nix/Win32-network.nix @@ -74,8 +74,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/Win32-network; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-chain.nix b/nix/.stack.nix/byron-spec-chain.nix index f79189951b7..8f01e8808ce 100644 --- a/nix/.stack.nix/byron-spec-chain.nix +++ b/nix/.stack.nix/byron-spec-chain.nix @@ -64,8 +64,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/chain/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-ledger.nix b/nix/.stack.nix/byron-spec-ledger.nix index 384db323f85..b8cbc464de5 100644 --- a/nix/.stack.nix/byron-spec-ledger.nix +++ b/nix/.stack.nix/byron-spec-ledger.nix @@ -87,8 +87,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-api.nix b/nix/.stack.nix/cardano-api.nix index cf9eb302e32..e23ece3aae0 100644 --- a/nix/.stack.nix/cardano-api.nix +++ b/nix/.stack.nix/cardano-api.nix @@ -11,7 +11,7 @@ flags = {}; package = { specVersion = "2.4"; - identifier = { name = "cardano-api"; version = "1.19.0"; }; + identifier = { name = "cardano-api"; version = "1.19.1"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -110,8 +110,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; - sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; + rev = "497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54"; + sha256 = "1w5pgsal897g5n5vpfvrvkkgv2bmqzdbs3jzw9xbphf9jhk3jsai"; }); postUnpack = "sourceRoot+=/cardano-api; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-binary-test.nix b/nix/.stack.nix/cardano-binary-test.nix index 62f71ae0c16..559c08b95bd 100644 --- a/nix/.stack.nix/cardano-binary-test.nix +++ b/nix/.stack.nix/cardano-binary-test.nix @@ -48,8 +48,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "3e2d92b25c675fd923a07237eb1d0859b29a79d3"; - sha256 = "0ld4wwc64jags7yavhi3n7cpzs765qd9rv8jd0z0nygca5x4wp5l"; + rev = "13f44ad35d2762dbf98b3d3be56b7ba2adf515f4"; + sha256 = "0sl7adyrjf3w6025gvljxyr222s53avin0sv0gzhdypmj9wg5ml6"; }); postUnpack = "sourceRoot+=/binary/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-binary.nix b/nix/.stack.nix/cardano-binary.nix index 1f940a07ba8..e871562b738 100644 --- a/nix/.stack.nix/cardano-binary.nix +++ b/nix/.stack.nix/cardano-binary.nix @@ -71,8 +71,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "3e2d92b25c675fd923a07237eb1d0859b29a79d3"; - sha256 = "0ld4wwc64jags7yavhi3n7cpzs765qd9rv8jd0z0nygca5x4wp5l"; + rev = "13f44ad35d2762dbf98b3d3be56b7ba2adf515f4"; + sha256 = "0sl7adyrjf3w6025gvljxyr222s53avin0sv0gzhdypmj9wg5ml6"; }); postUnpack = "sourceRoot+=/binary; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-cli.nix b/nix/.stack.nix/cardano-cli.nix index 8b93bddf8c7..f1a24bb6260 100644 --- a/nix/.stack.nix/cardano-cli.nix +++ b/nix/.stack.nix/cardano-cli.nix @@ -11,7 +11,7 @@ flags = { unexpected_thunks = false; }; package = { specVersion = "2.4"; - identifier = { name = "cardano-cli"; version = "1.19.0"; }; + identifier = { name = "cardano-cli"; version = "1.19.1"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -157,8 +157,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; - sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; + rev = "497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54"; + sha256 = "1w5pgsal897g5n5vpfvrvkkgv2bmqzdbs3jzw9xbphf9jhk3jsai"; }); postUnpack = "sourceRoot+=/cardano-cli; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-config.nix b/nix/.stack.nix/cardano-config.nix index 1ed9296354e..4abaa010af0 100644 --- a/nix/.stack.nix/cardano-config.nix +++ b/nix/.stack.nix/cardano-config.nix @@ -39,8 +39,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; - sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; + rev = "497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54"; + sha256 = "1w5pgsal897g5n5vpfvrvkkgv2bmqzdbs3jzw9xbphf9jhk3jsai"; }); postUnpack = "sourceRoot+=/cardano-config; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-class.nix b/nix/.stack.nix/cardano-crypto-class.nix index 9ede4bcace2..4332ad90e3f 100644 --- a/nix/.stack.nix/cardano-crypto-class.nix +++ b/nix/.stack.nix/cardano-crypto-class.nix @@ -58,8 +58,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "3e2d92b25c675fd923a07237eb1d0859b29a79d3"; - sha256 = "0ld4wwc64jags7yavhi3n7cpzs765qd9rv8jd0z0nygca5x4wp5l"; + rev = "13f44ad35d2762dbf98b3d3be56b7ba2adf515f4"; + sha256 = "0sl7adyrjf3w6025gvljxyr222s53avin0sv0gzhdypmj9wg5ml6"; }); postUnpack = "sourceRoot+=/cardano-crypto-class; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-praos.nix b/nix/.stack.nix/cardano-crypto-praos.nix index c3bc2b29efc..fcdafcf1209 100644 --- a/nix/.stack.nix/cardano-crypto-praos.nix +++ b/nix/.stack.nix/cardano-crypto-praos.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "3e2d92b25c675fd923a07237eb1d0859b29a79d3"; - sha256 = "0ld4wwc64jags7yavhi3n7cpzs765qd9rv8jd0z0nygca5x4wp5l"; + rev = "13f44ad35d2762dbf98b3d3be56b7ba2adf515f4"; + sha256 = "0sl7adyrjf3w6025gvljxyr222s53avin0sv0gzhdypmj9wg5ml6"; }); postUnpack = "sourceRoot+=/cardano-crypto-praos; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-test.nix b/nix/.stack.nix/cardano-crypto-test.nix index 7bfcf7acae3..9b32c31aecc 100644 --- a/nix/.stack.nix/cardano-crypto-test.nix +++ b/nix/.stack.nix/cardano-crypto-test.nix @@ -44,8 +44,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/crypto/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-wrapper.nix b/nix/.stack.nix/cardano-crypto-wrapper.nix index f08b956fd70..8966f4080d2 100644 --- a/nix/.stack.nix/cardano-crypto-wrapper.nix +++ b/nix/.stack.nix/cardano-crypto-wrapper.nix @@ -69,8 +69,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/crypto; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger-test.nix b/nix/.stack.nix/cardano-ledger-test.nix index 027b7d9f5fd..89050eba3b1 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -39,7 +39,6 @@ (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."byron-spec-chain" or (errorHandler.buildDepError "byron-spec-chain")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -48,8 +47,6 @@ (hsPkgs."generic-monoid" or (errorHandler.buildDepError "generic-monoid")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) @@ -66,8 +63,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/ledger/impl/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger.nix b/nix/.stack.nix/cardano-ledger.nix index 7dbf2853814..e441020d442 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -29,7 +29,6 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base58-bytestring" or (errorHandler.buildDepError "base58-bytestring")) - (hsPkgs."base64-bytestring-type" or (errorHandler.buildDepError "base64-bytestring-type")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) @@ -41,7 +40,6 @@ (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."concurrency" or (errorHandler.buildDepError "concurrency")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) @@ -49,8 +47,6 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) - (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) @@ -134,8 +130,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-node.nix b/nix/.stack.nix/cardano-node.nix index 0b12786288d..8c779512087 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -11,7 +11,7 @@ flags = { unexpected_thunks = false; systemd = true; }; package = { specVersion = "2.4"; - identifier = { name = "cardano-node"; version = "1.19.0"; }; + identifier = { name = "cardano-node"; version = "1.19.1"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -204,8 +204,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; - sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; + rev = "497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54"; + sha256 = "1w5pgsal897g5n5vpfvrvkkgv2bmqzdbs3jzw9xbphf9jhk3jsai"; }); postUnpack = "sourceRoot+=/cardano-node; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-prelude-test.nix b/nix/.stack.nix/cardano-prelude-test.nix index f70acff7d57..f949fcd15bd 100644 --- a/nix/.stack.nix/cardano-prelude-test.nix +++ b/nix/.stack.nix/cardano-prelude-test.nix @@ -52,8 +52,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-prelude"; - rev = "71ea865408f2e03e6d6832359423546699730849"; - sha256 = "02v9bd95vjal7yp96b59dgap2k53c2lrg9vxw6d62cxzw8n635y6"; + rev = "0c5b0a6619fadf22f4d62a12154e181a6d035c1c"; + sha256 = "0qjn7xsw5py05zmq9935z91719v5i4apsizwhkwppi8dahbanrs4"; }); postUnpack = "sourceRoot+=/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-prelude.nix b/nix/.stack.nix/cardano-prelude.nix index f10e54c5500..9120e7a42de 100644 --- a/nix/.stack.nix/cardano-prelude.nix +++ b/nix/.stack.nix/cardano-prelude.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-prelude"; version = "0.1.0.0"; }; license = "MIT"; - copyright = "2018 IOHK"; + copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -73,8 +73,8 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) ]; buildable = true; @@ -84,7 +84,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-prelude"; - rev = "71ea865408f2e03e6d6832359423546699730849"; - sha256 = "02v9bd95vjal7yp96b59dgap2k53c2lrg9vxw6d62cxzw8n635y6"; + rev = "0c5b0a6619fadf22f4d62a12154e181a6d035c1c"; + sha256 = "0qjn7xsw5py05zmq9935z91719v5i4apsizwhkwppi8dahbanrs4"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-slotting.nix b/nix/.stack.nix/cardano-slotting.nix index 6b5712e4821..623cf09dab3 100644 --- a/nix/.stack.nix/cardano-slotting.nix +++ b/nix/.stack.nix/cardano-slotting.nix @@ -44,8 +44,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "3e2d92b25c675fd923a07237eb1d0859b29a79d3"; - sha256 = "0ld4wwc64jags7yavhi3n7cpzs765qd9rv8jd0z0nygca5x4wp5l"; + rev = "13f44ad35d2762dbf98b3d3be56b7ba2adf515f4"; + sha256 = "0sl7adyrjf3w6025gvljxyr222s53avin0sv0gzhdypmj9wg5ml6"; }); postUnpack = "sourceRoot+=/slotting; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/contra-tracer.nix b/nix/.stack.nix/contra-tracer.nix index f86be74cbf8..b98b9ed1c79 100644 --- a/nix/.stack.nix/contra-tracer.nix +++ b/nix/.stack.nix/contra-tracer.nix @@ -34,8 +34,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/contra-tracer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/default.nix b/nix/.stack.nix/default.nix index 09dd1816796..8cb427e1a44 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -50,6 +50,7 @@ "network" = (((hackage.network)."3.1.1.1").revisions).default; "primitive" = (((hackage.primitive)."0.7.1.0").revisions).default; "prometheus" = (((hackage.prometheus)."2.1.2").revisions).default; + "protolude" = (((hackage.protolude)."0.3.0").revisions).default; "quickcheck-instances" = (((hackage.quickcheck-instances)."0.3.19").revisions).default; "QuickCheck" = (((hackage.QuickCheck)."2.12.6.1").revisions).default; "quiet" = (((hackage.quiet)."0.2").revisions).default; @@ -90,14 +91,14 @@ cardano-slotting = ./cardano-slotting.nix; cardano-crypto-praos = ./cardano-crypto-praos.nix; cardano-crypto = ./cardano-crypto.nix; + small-steps = ./small-steps.nix; + small-steps-test = ./small-steps-test.nix; + byron-spec-ledger = ./byron-spec-ledger.nix; cardano-ledger = ./cardano-ledger.nix; cardano-crypto-wrapper = ./cardano-crypto-wrapper.nix; cardano-ledger-test = ./cardano-ledger-test.nix; cardano-crypto-test = ./cardano-crypto-test.nix; byron-spec-chain = ./byron-spec-chain.nix; - byron-spec-ledger = ./byron-spec-ledger.nix; - small-steps = ./small-steps.nix; - small-steps-test = ./small-steps-test.nix; shelley-spec-non-integral = ./shelley-spec-non-integral.nix; shelley-spec-ledger = ./shelley-spec-ledger.nix; shelley-spec-ledger-test = ./shelley-spec-ledger-test.nix; @@ -121,19 +122,15 @@ io-sim-classes = ./io-sim-classes.nix; network-mux = ./network-mux.nix; ntp-client = ./ntp-client.nix; - Win32-network = ./Win32-network.nix; + ouroboros-network = ./ouroboros-network.nix; ouroboros-consensus = ./ouroboros-consensus.nix; ouroboros-consensus-byron = ./ouroboros-consensus-byron.nix; - ouroboros-consensus-byronspec = ./ouroboros-consensus-byronspec.nix; ouroboros-consensus-cardano = ./ouroboros-consensus-cardano.nix; ouroboros-consensus-shelley = ./ouroboros-consensus-shelley.nix; - ouroboros-consensus-mock = ./ouroboros-consensus-mock.nix; - ouroboros-consensus-test-infra = ./ouroboros-consensus-test-infra.nix; - ouroboros-network = ./ouroboros-network.nix; - ouroboros-network-framework = ./ouroboros-network-framework.nix; - ouroboros-network-testing = ./ouroboros-network-testing.nix; typed-protocols = ./typed-protocols.nix; typed-protocols-examples = ./typed-protocols-examples.nix; + ouroboros-network-framework = ./ouroboros-network-framework.nix; + Win32-network = ./Win32-network.nix; http-client = ./http-client.nix; }; }; diff --git a/nix/.stack.nix/goblins.nix b/nix/.stack.nix/goblins.nix index 42ae530aafd..e34b0441d1f 100644 --- a/nix/.stack.nix/goblins.nix +++ b/nix/.stack.nix/goblins.nix @@ -11,7 +11,7 @@ flags = { development = false; }; package = { specVersion = "1.10"; - identifier = { name = "goblins"; version = "0.1.0.0"; }; + identifier = { name = "goblins"; version = "0.2.0.0"; }; license = "BSD-3-Clause"; copyright = ""; maintainer = "nick@topos.org.uk"; @@ -63,7 +63,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/goblins"; - rev = "312198a1523736181ef7ddab15958bb32a9d9052"; - sha256 = "1w1b3g1s64rv4glrj416v1jmwnqhlz1zcqmz2y813jgs4d32m27k"; + rev = "cde90a2b27f79187ca8310b6549331e59595e7ba"; + sha256 = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim-classes.nix b/nix/.stack.nix/io-sim-classes.nix index 6a0fd093608..9818d74f529 100644 --- a/nix/.stack.nix/io-sim-classes.nix +++ b/nix/.stack.nix/io-sim-classes.nix @@ -51,8 +51,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/io-sim-classes; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim.nix b/nix/.stack.nix/io-sim.nix index 50b54537265..411fad96a6b 100644 --- a/nix/.stack.nix/io-sim.nix +++ b/nix/.stack.nix/io-sim.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/io-sim; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/iohk-monitoring.nix b/nix/.stack.nix/iohk-monitoring.nix index 133983948e9..821d6da77b2 100644 --- a/nix/.stack.nix/iohk-monitoring.nix +++ b/nix/.stack.nix/iohk-monitoring.nix @@ -107,8 +107,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/iohk-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-aggregation.nix b/nix/.stack.nix/lobemo-backend-aggregation.nix index 617e32b8b4f..a0d50e85748 100644 --- a/nix/.stack.nix/lobemo-backend-aggregation.nix +++ b/nix/.stack.nix/lobemo-backend-aggregation.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-ekg.nix b/nix/.stack.nix/lobemo-backend-ekg.nix index b5e6bec5ba9..18500c42ffc 100644 --- a/nix/.stack.nix/lobemo-backend-ekg.nix +++ b/nix/.stack.nix/lobemo-backend-ekg.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/plugins/backend-ekg; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-monitoring.nix b/nix/.stack.nix/lobemo-backend-monitoring.nix index 9e5efb977da..413252e5706 100644 --- a/nix/.stack.nix/lobemo-backend-monitoring.nix +++ b/nix/.stack.nix/lobemo-backend-monitoring.nix @@ -83,8 +83,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix index c49b1a2efc4..a747130f1f1 100644 --- a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix +++ b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-scribe-systemd.nix b/nix/.stack.nix/lobemo-scribe-systemd.nix index 3343712d189..fbedfa71f3d 100644 --- a/nix/.stack.nix/lobemo-scribe-systemd.nix +++ b/nix/.stack.nix/lobemo-scribe-systemd.nix @@ -48,8 +48,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/network-mux.nix b/nix/.stack.nix/network-mux.nix index 63286f02f72..3cdb9a86923 100644 --- a/nix/.stack.nix/network-mux.nix +++ b/nix/.stack.nix/network-mux.nix @@ -104,8 +104,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/network-mux; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ntp-client.nix b/nix/.stack.nix/ntp-client.nix index e57bcea1214..709c9ec3204 100644 --- a/nix/.stack.nix/ntp-client.nix +++ b/nix/.stack.nix/ntp-client.nix @@ -10,7 +10,7 @@ { flags = { demo = true; }; package = { - specVersion = "1.20"; + specVersion = "1.10"; identifier = { name = "ntp-client"; version = "0.0.1"; }; license = "Apache-2.0"; copyright = ""; @@ -67,8 +67,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ntp-client; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-byron.nix b/nix/.stack.nix/ouroboros-consensus-byron.nix index 1a8458ad196..ae40e8e16c0 100644 --- a/nix/.stack.nix/ouroboros-consensus-byron.nix +++ b/nix/.stack.nix/ouroboros-consensus-byron.nix @@ -27,7 +27,6 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) @@ -40,7 +39,6 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -78,8 +76,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byron; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-cardano.nix b/nix/.stack.nix/ouroboros-consensus-cardano.nix index a98189d4077..75406943eb9 100644 --- a/nix/.stack.nix/ouroboros-consensus-cardano.nix +++ b/nix/.stack.nix/ouroboros-consensus-cardano.nix @@ -30,7 +30,6 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -63,36 +62,13 @@ (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) - (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) - (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) - (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - ]; - buildable = true; - }; - "db-validator" = { - depends = [ - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) - (hsPkgs."optparse-generic" or (errorHandler.buildDepError "optparse-generic")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) @@ -102,46 +78,12 @@ buildable = true; }; }; - tests = { - "test" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) - (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."sop-core" or (errorHandler.buildDepError "sop-core")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) - (hsPkgs."ouroboros-consensus-test-infra" or (errorHandler.buildDepError "ouroboros-consensus-test-infra")) - (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) - (hsPkgs."ouroboros-consensus-byron-test" or (errorHandler.buildDepError "ouroboros-consensus-byron-test")) - (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) - (hsPkgs."ouroboros-consensus-shelley-test" or (errorHandler.buildDepError "ouroboros-consensus-shelley-test")) - (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) - ]; - buildable = true; - }; - }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-cardano; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-shelley.nix b/nix/.stack.nix/ouroboros-consensus-shelley.nix index db9a4a221ce..5332f4f7582 100644 --- a/nix/.stack.nix/ouroboros-consensus-shelley.nix +++ b/nix/.stack.nix/ouroboros-consensus-shelley.nix @@ -30,7 +30,6 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) @@ -55,8 +54,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-shelley; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus.nix b/nix/.stack.nix/ouroboros-consensus.nix index 74e77b2f934..c555d922c5b 100644 --- a/nix/.stack.nix/ouroboros-consensus.nix +++ b/nix/.stack.nix/ouroboros-consensus.nix @@ -44,11 +44,8 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filelock" or (errorHandler.buildDepError "filelock")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) @@ -73,98 +70,12 @@ ]); buildable = true; }; - tests = { - "test-consensus" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."fgl" or (errorHandler.buildDepError "fgl")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."generics-sop" or (errorHandler.buildDepError "generics-sop")) - (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."quickcheck-state-machine" or (errorHandler.buildDepError "quickcheck-state-machine")) - (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) - (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) - (hsPkgs."sop-core" or (errorHandler.buildDepError "sop-core")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."tree-diff" or (errorHandler.buildDepError "tree-diff")) - (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) - (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) - (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - ]; - buildable = true; - }; - "test-storage" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."bifunctors" or (errorHandler.buildDepError "bifunctors")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."generics-sop" or (errorHandler.buildDepError "generics-sop")) - (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."pretty-show" or (errorHandler.buildDepError "pretty-show")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."quickcheck-state-machine" or (errorHandler.buildDepError "quickcheck-state-machine")) - (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."tree-diff" or (errorHandler.buildDepError "tree-diff")) - (hsPkgs."vector" or (errorHandler.buildDepError "vector")) - (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) - (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) - (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) - ]; - buildable = true; - }; - }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-consensus; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-framework.nix b/nix/.stack.nix/ouroboros-network-framework.nix index 60b94d51af5..04261fdc78c 100644 --- a/nix/.stack.nix/ouroboros-network-framework.nix +++ b/nix/.stack.nix/ouroboros-network-framework.nix @@ -114,8 +114,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-network-framework; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-testing.nix b/nix/.stack.nix/ouroboros-network-testing.nix index b4c4436d0a7..0bf8e47dd5d 100644 --- a/nix/.stack.nix/ouroboros-network-testing.nix +++ b/nix/.stack.nix/ouroboros-network-testing.nix @@ -38,8 +38,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-network-testing; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network.nix b/nix/.stack.nix/ouroboros-network.nix index a665c4df945..af54eb22491 100644 --- a/nix/.stack.nix/ouroboros-network.nix +++ b/nix/.stack.nix/ouroboros-network.nix @@ -29,7 +29,6 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -189,8 +188,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/ouroboros-network; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-ledger-test.nix b/nix/.stack.nix/shelley-spec-ledger-test.nix index 120ecbba54d..14f24d7a001 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -165,8 +165,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/shelley-spec-ledger-test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-ledger.nix b/nix/.stack.nix/shelley-spec-ledger.nix index f83dfdd612e..d1cf4220046 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -41,8 +41,6 @@ (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."cborg-json" or (errorHandler.buildDepError "cborg-json")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."network" or (errorHandler.buildDepError "network")) @@ -55,9 +53,6 @@ (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) - (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) ]; buildable = true; }; @@ -65,8 +60,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-non-integral.nix b/nix/.stack.nix/shelley-spec-non-integral.nix index 98eea25fc96..03ab714414d 100644 --- a/nix/.stack.nix/shelley-spec-non-integral.nix +++ b/nix/.stack.nix/shelley-spec-non-integral.nix @@ -42,8 +42,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/dependencies/non-integer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/small-steps-test.nix b/nix/.stack.nix/small-steps-test.nix index 957cd4d8681..b566f12691b 100644 --- a/nix/.stack.nix/small-steps-test.nix +++ b/nix/.stack.nix/small-steps-test.nix @@ -92,8 +92,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/semantics/small-steps-test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/small-steps.nix b/nix/.stack.nix/small-steps.nix index ee671aacd06..e535247f1cf 100644 --- a/nix/.stack.nix/small-steps.nix +++ b/nix/.stack.nix/small-steps.nix @@ -67,8 +67,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "0715d2047b3d23e8b75b8430bddf391799c4669d"; - sha256 = "0l2xlgqix9r376z11rsiws0990b64iw9hvmx94c5p7x9jsyz858q"; + rev = "74188f62ff743c690bdf287f7fa18eaa2ee354d4"; + sha256 = "1asc4pgkspqlrg67jykz7h1i9wqf4ms1q1gxllcr3dpa566zdc5q"; }); postUnpack = "sourceRoot+=/semantics/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/tracer-transformers.nix b/nix/.stack.nix/tracer-transformers.nix index d2fd743a13e..ce8f67199b0 100644 --- a/nix/.stack.nix/tracer-transformers.nix +++ b/nix/.stack.nix/tracer-transformers.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "8190b00d6930927a812baff97d02566176b6bd3b"; - sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; + rev = "8f2086aff6b315b41a39b727f860c3477205ed8a"; + sha256 = "0ajiqa92zdydvxy9d1n640i7k5v5z6pf6v8q31yx2rrnm3hdg9lh"; }); postUnpack = "sourceRoot+=/tracer-transformers; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols-examples.nix b/nix/.stack.nix/typed-protocols-examples.nix index 890c83895ec..9e40ee99fe4 100644 --- a/nix/.stack.nix/typed-protocols-examples.nix +++ b/nix/.stack.nix/typed-protocols-examples.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/typed-protocols-examples; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols.nix b/nix/.stack.nix/typed-protocols.nix index b21ac449ecf..f60777b832f 100644 --- a/nix/.stack.nix/typed-protocols.nix +++ b/nix/.stack.nix/typed-protocols.nix @@ -35,8 +35,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; - sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; + rev = "f0eb6e439e7c0121476ded5e88d2f638e8aa36ac"; + sha256 = "0pii9myzb5ckf2vagd9b7fsmk78w72z8lw3zyyfzw58dyapy5c70"; }); postUnpack = "sourceRoot+=/typed-protocols; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/sources.json b/nix/sources.json index 777de7c0e11..95555512919 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "refs/tags/1.19.0", + "branch": "1.19.1", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "4814003f14340d5a1fc02f3ac15437387a7ada9f", - "sha256": "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira", + "rev": "497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54", + "sha256": "1w5pgsal897g5n5vpfvrvkkgv2bmqzdbs3jzw9xbphf9jhk3jsai", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/4814003f14340d5a1fc02f3ac15437387a7ada9f.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/497afd7dedc5d5b9bdcdb0e3cac6a50bd9f7dd54.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": { diff --git a/stack.yaml b/stack.yaml index 60b740d6c91..e27c464349a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: cardano-1.19.dev1.yaml +resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/da70d67ff662b85e72e1f203defbf5e3028d03cd/snapshots/cardano-1.19.1.yaml packages: - lib/core