diff --git a/cardano-1.18.x.yaml b/cardano-1.19.x.yaml similarity index 83% rename from cardano-1.18.x.yaml rename to cardano-1.19.x.yaml index 969fb3bb00e..e958df15ca2 100644 --- a/cardano-1.18.x.yaml +++ b/cardano-1.19.x.yaml @@ -1,17 +1,18 @@ -name: cardano-1.17.x +name: cardano-1.19.x resolver: lts-14.25 packages: - base16-0.1.2.1 - base58-bytestring-0.1.0 -- base64-0.4.1 +- base64-0.4.2 - bech32-1.1.0 - bech32-th-1.0.2 -- bimap-0.4.0 -- binary-0.8.7.0 - 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 @@ -20,8 +21,11 @@ packages: - 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 @@ -32,6 +36,7 @@ packages: - 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 @@ -44,17 +49,18 @@ packages: - 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 -- word-wrap-0.4.1 - git: https://github.com/input-output-hk/cardano-base - commit: 7d795c3040ea7785812efa1c97864bbb41b15d3e + commit: df8687488449f71dce3d881800c21e41fe1b7fc1 subdirs: - binary - binary/test @@ -66,7 +72,7 @@ packages: commit: 2547ad1e80aeabca2899951601079408becbc92c - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 183a70c001587d9b1977541deae28c3e44713907 + commit: 460ee17d22cacb3ac4d90536ebe90500a356a1c9 subdirs: - byron/ledger/impl - byron/crypto @@ -78,10 +84,10 @@ packages: - semantics/small-steps-test - shelley/chain-and-ledger/dependencies/non-integer - shelley/chain-and-ledger/executable-spec - - shelley/chain-and-ledger/executable-spec/test + - shelley/chain-and-ledger/shelley-spec-ledger-test - git: https://github.com/input-output-hk/cardano-node - commit: ba0f96b1a9fc9232ed211e57835fd5018093069d + commit: 4814003f14340d5a1fc02f3ac15437387a7ada9f subdirs: - cardano-api - cardano-cli @@ -89,7 +95,7 @@ packages: - cardano-node - git: https://github.com/input-output-hk/cardano-prelude - commit: 316c854d1d3089f480708ad5cd5ecf8a74423ddd + commit: 71ea865408f2e03e6d6832359423546699730849 subdirs: - . - test @@ -98,10 +104,10 @@ packages: commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 - git: https://github.com/input-output-hk/goblins - commit: 26d35ad52fe9ade3391532dbfeb2f416f07650bc + commit: 312198a1523736181ef7ddab15958bb32a9d9052 - git: https://github.com/input-output-hk/iohk-monitoring-framework - commit: efa4b5ecd7f0a13124616b12679cd42517cd905a + commit: 8190b00d6930927a812baff97d02566176b6bd3b subdirs: - contra-tracer - iohk-monitoring @@ -113,7 +119,7 @@ packages: - plugins/backend-trace-forwarder - git: https://github.com/input-output-hk/ouroboros-network - commit: ec74d1c463b6d18bdca2b714abe730c1d237cc32 + commit: aecfe77de784e6c75108172802ee59d2d7087eaf subdirs: - io-sim - io-sim-classes @@ -133,11 +139,6 @@ packages: - typed-protocols - typed-protocols-examples -- git: https://github.com/well-typed/cborg - commit: 42a83192749774268337258f4f94c97584b80ca6 - subdirs: - - cborg - - git: https://github.com/snoyberg/http-client.git commit: 1a75bdfca014723dd5d40760fad854b3f0f37156 subdirs: diff --git a/lib/core/src/Cardano/Wallet/Orphans.hs b/lib/core/src/Cardano/Wallet/Orphans.hs index 100360a70f4..add1d921215 100644 --- a/lib/core/src/Cardano/Wallet/Orphans.hs +++ b/lib/core/src/Cardano/Wallet/Orphans.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE LambdaCase #-} {-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -7,6 +6,7 @@ -- License: Apache-2.0 -- -- Module for orphans which would be too inconvenient to avoid. + module Cardano.Wallet.Orphans where import Prelude @@ -14,28 +14,7 @@ import Prelude import Cardano.Slotting.Slot ( SlotNo (..) ) import Fmt - ( Buildable (..), (+|), (+||), (|+), (||+) ) - -import qualified Ouroboros.Consensus.HardFork.History.Qry as HF + ( Buildable (..) ) instance Buildable SlotNo where build (SlotNo n) = build (show n) - -instance Buildable (HF.Qry a) where - build = \case - HF.QPure _ -> "QPure" - HF.QBind q _ -> "QBind "+|q|+"" - HF.QAbsToRelTime t -> "QAbsToRelTime "+||t||+"" - HF.QAbsToRelSlot sl -> "QAbsToRelSlot "+||sl||+"" - HF.QAbsToRelEpoch ep -> "QAbsToRelEpoch "+||ep||+"" - HF.QSlotLength sl -> "QSlotLength "+||sl||+"" - HF.QEpochSize ep -> "QEpochSize "+||ep||+"" - -- Necessary constructors or show instances are not exported -- we can't - -- show these values. - HF.QRelToAbsTime _t -> "QRelToAbsTime ?" - HF.QRelToAbsSlot _slt -> "QRelToAbsSlot ?" - HF.QRelToAbsEpoch _epe -> "QRelToAbsEpoch ?" - HF.QRelTimeToSlot _t -> "QRelTimeToSlot ?" - HF.QRelSlotToTime _sl -> "QRelSlotToTime ?" - HF.QRelSlotToEpoch _sl -> "QRelSlotToEpoch ?" - HF.QRelEpochToSlot _ep -> "QRelEpochToSlot ?" diff --git a/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs b/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs index 119f01314f1..a2e65e859b2 100644 --- a/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs +++ b/lib/core/src/Cardano/Wallet/Primitive/Slotting.hs @@ -93,8 +93,6 @@ import Data.Time.Clock ( NominalDiffTime, UTCTime, addUTCTime, diffUTCTime, getCurrentTime ) import Data.Word ( Word32, Word64 ) -import Fmt - ( Buildable (..), (+||), (||+) ) import GHC.Generics ( Generic ) import GHC.Stack @@ -111,7 +109,6 @@ import Ouroboros.Consensus.HardFork.History.Summary import qualified Cardano.Slotting.Slot as Cardano import qualified Ouroboros.Consensus.BlockchainTime.WallClock.Types as Cardano import qualified Ouroboros.Consensus.HardFork.History.Qry as HF -import qualified Ouroboros.Consensus.HardFork.History.Summary as HF -- ----------------------------------------------------------------------------- -- New Api using ouroboros-consensus. With the right interpreter, the @@ -155,8 +152,8 @@ endTimeOfEpoch :: EpochNo -> Qry UTCTime endTimeOfEpoch epoch = do ref <- firstSlotInEpoch epoch refTime <- startTime ref - el <- HardForkQry $ HF.QEpochSize $ toCardanoEpochNo epoch - sl <- HardForkQry $ HF.QSlotLength ref + el <- HardForkQry $ HF.qryFromExpr $ HF.EEpochSize $ HF.ELit $ toCardanoEpochNo epoch + sl <- HardForkQry $ HF.qryFromExpr $ HF.ESlotLength $ HF.ELit ref let convert = fromRational . toRational let el' = convert $ Cardano.unEpochSize el @@ -314,14 +311,6 @@ instance Monad Qry where return = pure (>>=) = QBind -instance Buildable (Qry a) where - build = \case - HardForkQry qry -> build qry - RelToUTCTime t -> "RelToUTCTime "+||t||+"" - UTCTimeToRel t -> "UTCTimeToRel "+||t||+"" - QPure _ -> "qPure" - QBind q _ -> "qBind " <> build q - runQuery :: HasCallStack => SystemStart diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs index 4c63836616b..25bb00502d6 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs @@ -626,7 +626,7 @@ fromPoolDistr :: SL.PoolDistr crypto -> Map W.PoolId Percentage fromPoolDistr = - Map.map (unsafeMkPercentage . fst) + Map.map (unsafeMkPercentage . SL.individualPoolStake) . Map.mapKeys fromPoolId . SL.unPoolDistr diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs index b8b681ad29b..e070cb0fb3d 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs @@ -147,7 +147,7 @@ import Data.Word import Fmt ( Buildable (..), listF', mapF, pretty ) import GHC.Stack - ( HasCallStack, prettyCallStack ) + ( HasCallStack ) import Network.Mux ( MuxError (..), MuxErrorType (..), WithMuxBearer (..) ) import Ouroboros.Consensus.Cardano @@ -165,9 +165,9 @@ import Ouroboros.Consensus.HardFork.Combinator import Ouroboros.Consensus.HardFork.Combinator.AcrossEras ( MismatchEraInfo ) import Ouroboros.Consensus.HardFork.History.Qry - ( Interpreter ) + ( Interpreter, PastHorizonException (..) ) import Ouroboros.Consensus.HardFork.History.Summary - ( Bound (..), PastHorizonException (..) ) + ( Bound (..) ) import Ouroboros.Consensus.Network.NodeToClient ( ClientCodecs, Codecs' (..), DefaultCodecs, clientCodecs, defaultCodecs ) import Ouroboros.Consensus.Node.NetworkProtocolVersion @@ -490,7 +490,7 @@ withNetworkLayer tr np addrInfo versionData action = do case mkTimeInterpreter getGenesisBlockDate interpreter query of Right r -> pure r Left e -> do - liftIO $ traceWith tr $ MsgInterpreterPastHorizon (pretty query) e + liftIO $ traceWith tr $ MsgInterpreterPastHorizon e throwIO e type instance GetStakeDistribution (IO Shelley) m = @@ -953,7 +953,7 @@ data NetworkLayerLog sc where MsgWatcherUpdate :: W.BlockHeader -> BracketLog -> NetworkLayerLog sc MsgChainSyncCmd :: (ChainSyncLog Text Text) -> NetworkLayerLog sc MsgInterpreter :: CardanoInterpreter sc -> NetworkLayerLog sc - MsgInterpreterPastHorizon :: Text -> PastHorizonException -> NetworkLayerLog sc + MsgInterpreterPastHorizon :: PastHorizonException -> NetworkLayerLog sc MsgQueryTime :: String -> NominalDiffTime -> NetworkLayerLog sc data QueryClientName @@ -1048,12 +1048,8 @@ instance TPraosCrypto sc => ToText (NetworkLayerLog sc) where MsgChainSyncCmd a -> toText a MsgInterpreter interpreter -> "Updated the history interpreter: " <> T.pack (show interpreter) - MsgInterpreterPastHorizon query (PastHorizon callstack eras) -> - "Time interpreter queried past the horizon. " <> - "Query is:\n" <> query <> "\n" <> - "Eras are:\n" <> - T.unlines (map (T.pack . show) eras) <> "\n" <> - T.pack (prettyCallStack callstack) + MsgInterpreterPastHorizon e -> + "Time interpreter queried past the horizon: " <> T.pack (show e) instance HasPrivacyAnnotation (NetworkLayerLog b) instance HasSeverityAnnotation (NetworkLayerLog b) where diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix index 67f1798b11e..1e10a552e0b 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 4603557c62d..2449521156f 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 7e382eb348b..e537a5066f2 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 d4c92e0fff9..cf9eb302e32 100644 --- a/nix/.stack.nix/cardano-api.nix +++ b/nix/.stack.nix/cardano-api.nix @@ -10,8 +10,8 @@ { flags = {}; package = { - specVersion = "1.10"; - identifier = { name = "cardano-api"; version = "1.18.0"; }; + specVersion = "2.4"; + identifier = { name = "cardano-api"; version = "1.19.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -58,7 +58,6 @@ (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-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) @@ -100,7 +99,9 @@ (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) ]; buildable = true; }; @@ -109,8 +110,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "ba0f96b1a9fc9232ed211e57835fd5018093069d"; - sha256 = "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk"; + rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; + sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; }); 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 53de64e2b0d..c77e42620b8 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 = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; - sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; + rev = "df8687488449f71dce3d881800c21e41fe1b7fc1"; + sha256 = "1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m"; }); 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 29bffc23530..57723ac1c4d 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 = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; - sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; + rev = "df8687488449f71dce3d881800c21e41fe1b7fc1"; + sha256 = "1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m"; }); 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 b75d1bf559c..8b93bddf8c7 100644 --- a/nix/.stack.nix/cardano-cli.nix +++ b/nix/.stack.nix/cardano-cli.nix @@ -10,8 +10,8 @@ { flags = { unexpected_thunks = false; }; package = { - specVersion = "1.10"; - identifier = { name = "cardano-cli"; version = "1.18.0"; }; + specVersion = "2.4"; + identifier = { name = "cardano-cli"; version = "1.19.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -42,6 +42,7 @@ (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-node" or (errorHandler.buildDepError "cardano-node")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) @@ -63,6 +64,7 @@ (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")) + (hsPkgs."process" or (errorHandler.buildDepError "process")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) @@ -97,18 +99,32 @@ "cardano-cli-test" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-cli" or (errorHandler.buildDepError "cardano-cli")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."lifted-base" or (errorHandler.buildDepError "lifted-base")) + (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."process" or (errorHandler.buildDepError "process")) + (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."text-ansi" or (errorHandler.buildDepError "text-ansi")) - (hsPkgs."unix" or (errorHandler.buildDepError "unix")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers-except" or (errorHandler.buildDepError "transformers-except")) + (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) + ]; + build-tools = [ + (hsPkgs.buildPackages.cardano-cli or (pkgs.buildPackages.cardano-cli or (errorHandler.buildToolDepError "cardano-cli"))) ]; - buildable = if system.isWindows then false else true; + buildable = true; }; - "cardano-cli-pioneers" = { + "cardano-cli-golden" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) @@ -131,6 +147,9 @@ (hsPkgs."transformers-except" or (errorHandler.buildDepError "transformers-except")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) ]; + build-tools = [ + (hsPkgs.buildPackages.cardano-cli or (pkgs.buildPackages.cardano-cli or (errorHandler.buildToolDepError "cardano-cli"))) + ]; buildable = true; }; }; @@ -138,8 +157,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "ba0f96b1a9fc9232ed211e57835fd5018093069d"; - sha256 = "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk"; + rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; + sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; }); 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 1a0f4e1616b..1ed9296354e 100644 --- a/nix/.stack.nix/cardano-config.nix +++ b/nix/.stack.nix/cardano-config.nix @@ -10,7 +10,7 @@ { flags = { systemd = true; }; package = { - specVersion = "1.10"; + specVersion = "2.4"; identifier = { name = "cardano-config"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -27,52 +27,11 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."attoparsec" or (errorHandler.buildDepError "attoparsec")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."canonical-json" or (errorHandler.buildDepError "canonical-json")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (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."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."file-embed" or (errorHandler.buildDepError "file-embed")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."lobemo-backend-aggregation" or (errorHandler.buildDepError "lobemo-backend-aggregation")) - (hsPkgs."lobemo-backend-ekg" or (errorHandler.buildDepError "lobemo-backend-ekg")) - (hsPkgs."lobemo-backend-monitoring" or (errorHandler.buildDepError "lobemo-backend-monitoring")) - (hsPkgs."lobemo-backend-trace-forwarder" or (errorHandler.buildDepError "lobemo-backend-trace-forwarder")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) - (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) - (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-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) - (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."string-conv" or (errorHandler.buildDepError "string-conv")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."transformers-except" or (errorHandler.buildDepError "transformers-except")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) ] ++ (pkgs.lib).optional (system.isLinux && flags.systemd) (hsPkgs."lobemo-scribe-systemd" or (errorHandler.buildDepError "lobemo-scribe-systemd")); buildable = true; }; @@ -80,8 +39,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "ba0f96b1a9fc9232ed211e57835fd5018093069d"; - sha256 = "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk"; + rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; + sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; }); 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 f03c9610b31..84466f9a455 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 = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; - sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; + rev = "df8687488449f71dce3d881800c21e41fe1b7fc1"; + sha256 = "1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m"; }); 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 58f8935854d..19f9be9862a 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 = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; - sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; + rev = "df8687488449f71dce3d881800c21e41fe1b7fc1"; + sha256 = "1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m"; }); 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 ec9d16f8212..789b761bc73 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 8bbf402c10f..99f8c0f32af 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 b7a0e58c612..f7eb223d0a3 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -66,8 +66,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 1dad12431c3..5f6e31b65a9 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -134,8 +134,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 743966e8b3d..0b12786288d 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -10,8 +10,8 @@ { flags = { unexpected_thunks = false; systemd = true; }; package = { - specVersion = "1.10"; - identifier = { name = "cardano-node"; version = "1.18.0"; }; + specVersion = "2.4"; + identifier = { name = "cardano-node"; version = "1.19.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -29,6 +29,8 @@ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) @@ -58,12 +60,12 @@ (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-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."process" or (errorHandler.buildDepError "process")) (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."strict-concurrency" or (errorHandler.buildDepError "strict-concurrency")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -90,16 +92,27 @@ depends = [ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-config" or (errorHandler.buildDepError "cardano-config")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) + (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) + (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."yaml" or (errorHandler.buildDepError "yaml")) ]; @@ -154,26 +167,35 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-node" or (errorHandler.buildDepError "cardano-node")) (hsPkgs."cardano-config" or (errorHandler.buildDepError "cardano-config")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-node" or (errorHandler.buildDepError "cardano-node")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."hedgehog-corpus" or (errorHandler.buildDepError "hedgehog-corpus")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."process" or (errorHandler.buildDepError "process")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) + (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."hedgehog-corpus" or (errorHandler.buildDepError "hedgehog-corpus")) + (hsPkgs."unliftio" or (errorHandler.buildDepError "unliftio")) ]; buildable = true; }; @@ -182,8 +204,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "ba0f96b1a9fc9232ed211e57835fd5018093069d"; - sha256 = "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk"; + rev = "4814003f14340d5a1fc02f3ac15437387a7ada9f"; + sha256 = "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira"; }); 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 6ad67ea7275..f70acff7d57 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 = "316c854d1d3089f480708ad5cd5ecf8a74423ddd"; - sha256 = "1srbl3jrkmpwypdz0yrx4nmah3qcsr93dp48zx2bamg51c4hcsyj"; + rev = "71ea865408f2e03e6d6832359423546699730849"; + sha256 = "02v9bd95vjal7yp96b59dgap2k53c2lrg9vxw6d62cxzw8n635y6"; }); 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 554578248e5..f10e54c5500 100644 --- a/nix/.stack.nix/cardano-prelude.nix +++ b/nix/.stack.nix/cardano-prelude.nix @@ -84,7 +84,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-prelude"; - rev = "316c854d1d3089f480708ad5cd5ecf8a74423ddd"; - sha256 = "1srbl3jrkmpwypdz0yrx4nmah3qcsr93dp48zx2bamg51c4hcsyj"; + rev = "71ea865408f2e03e6d6832359423546699730849"; + sha256 = "02v9bd95vjal7yp96b59dgap2k53c2lrg9vxw6d62cxzw8n635y6"; }); } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-slotting.nix b/nix/.stack.nix/cardano-slotting.nix index 6864059971d..8329c7266a5 100644 --- a/nix/.stack.nix/cardano-slotting.nix +++ b/nix/.stack.nix/cardano-slotting.nix @@ -36,6 +36,7 @@ (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) ]; buildable = true; }; @@ -43,8 +44,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; - sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; + rev = "df8687488449f71dce3d881800c21e41fe1b7fc1"; + sha256 = "1chlqsp0g8lspnw2ia7v28pblr8iqqdiba51miznnclnj2vq9s2m"; }); 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 b95e787766a..f86be74cbf8 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 857c09bb06c..059583e1a7b 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -14,13 +14,14 @@ "tls" = (((hackage.tls)."1.5.4").revisions).default; "base16" = (((hackage.base16)."0.1.2.1").revisions).default; "base58-bytestring" = (((hackage.base58-bytestring)."0.1.0").revisions).default; - "base64" = (((hackage.base64)."0.4.1").revisions).default; + "base64" = (((hackage.base64)."0.4.2").revisions).default; "bech32" = (((hackage.bech32)."1.1.0").revisions).default; "bech32-th" = (((hackage.bech32-th)."1.0.2").revisions).default; - "bimap" = (((hackage.bimap)."0.4.0").revisions).default; - "binary" = (((hackage.binary)."0.8.7.0").revisions).default; "brick" = (((hackage.brick)."0.47").revisions).default; + "binary" = (((hackage.binary)."0.8.7.0").revisions).default; + "bimap" = (((hackage.bimap)."0.4.0").revisions).default; "canonical-json" = (((hackage.canonical-json)."0.6.0.0").revisions).default; + "cborg" = (((hackage.cborg)."0.2.4.0").revisions).default; "clock" = (((hackage.clock)."0.8").revisions).default; "config-ini" = (((hackage.config-ini)."0.2.4.0").revisions).default; "connection" = (((hackage.connection)."0.3.1").revisions).default; @@ -29,8 +30,11 @@ "dns" = (((hackage.dns)."3.0.4").revisions).default; "generic-monoid" = (((hackage.generic-monoid)."0.1.0.0").revisions).default; "generics-sop" = (((hackage.generics-sop)."0.5.1.0").revisions).default; + "ghc-byteorder" = (((hackage.ghc-byteorder)."4.11.0.0.10").revisions).default; "gray-code" = (((hackage.gray-code)."0.3.1").revisions).default; "hedgehog" = (((hackage.hedgehog)."1.0.2").revisions).default; + "hedgehog-corpus" = (((hackage.hedgehog-corpus)."0.2.0").revisions).default; + "hedgehog-quickcheck" = (((hackage.hedgehog-quickcheck)."0.1.1").revisions).default; "hspec" = (((hackage.hspec)."2.7.0").revisions).default; "hspec-core" = (((hackage.hspec-core)."2.7.0").revisions).default; "hspec-discover" = (((hackage.hspec-discover)."2.7.0").revisions).default; @@ -41,6 +45,7 @@ "micro-recursion-schemes" = (((hackage.micro-recursion-schemes)."5.0.2.2").revisions).default; "moo" = (((hackage.moo)."1.2").revisions).default; "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; "quickcheck-instances" = (((hackage.quickcheck-instances)."0.3.19").revisions).default; "QuickCheck" = (((hackage.QuickCheck)."2.12.6.1").revisions).default; @@ -53,14 +58,15 @@ "systemd" = (((hackage.systemd)."2.3.0").revisions).default; "tasty-hedgehog" = (((hackage.tasty-hedgehog)."1.0.0.2").revisions).default; "text" = (((hackage.text)."1.2.4.0").revisions).default; + "text-ansi" = (((hackage.text-ansi)."0.1.0").revisions).default; "text-zipper" = (((hackage.text-zipper)."0.10.1").revisions).default; "th-lift-instances" = (((hackage.th-lift-instances)."0.1.14").revisions).default; "time-units" = (((hackage.time-units)."1.0.0").revisions).default; "transformers-except" = (((hackage.transformers-except)."0.1.1").revisions).default; "Unique" = (((hackage.Unique)."0.4.7.6").revisions).default; + "word-wrap" = (((hackage.word-wrap)."0.4.1").revisions).default; "websockets" = (((hackage.websockets)."0.12.6.1").revisions).default; "Win32" = (((hackage.Win32)."2.6.2.0").revisions).default; - "word-wrap" = (((hackage.word-wrap)."0.4.1").revisions).default; cardano-wallet-core = ./cardano-wallet-core.nix; cardano-wallet-core-integration = ./cardano-wallet-core-integration.nix; cardano-wallet-cli = ./cardano-wallet-cli.nix; @@ -124,7 +130,6 @@ ouroboros-network-testing = ./ouroboros-network-testing.nix; typed-protocols = ./typed-protocols.nix; typed-protocols-examples = ./typed-protocols-examples.nix; - cborg = ./cborg.nix; http-client = ./http-client.nix; }; }; diff --git a/nix/.stack.nix/goblins.nix b/nix/.stack.nix/goblins.nix index cc6618a27c0..42ae530aafd 100644 --- a/nix/.stack.nix/goblins.nix +++ b/nix/.stack.nix/goblins.nix @@ -33,7 +33,9 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."extra" or (errorHandler.buildDepError "extra")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."lens" or (errorHandler.buildDepError "lens")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) + (hsPkgs."microlens-mtl" or (errorHandler.buildDepError "microlens-mtl")) + (hsPkgs."microlens-th" or (errorHandler.buildDepError "microlens-th")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."monad-control" or (errorHandler.buildDepError "monad-control")) (hsPkgs."moo" or (errorHandler.buildDepError "moo")) @@ -61,7 +63,7 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/goblins"; - rev = "26d35ad52fe9ade3391532dbfeb2f416f07650bc"; - sha256 = "17p5x0hj6c67jkdqx0cysqlwq2zs2l87azihn1alzajy9ak6ii0b"; + rev = "312198a1523736181ef7ddab15958bb32a9d9052"; + sha256 = "1w1b3g1s64rv4glrj416v1jmwnqhlz1zcqmz2y813jgs4d32m27k"; }); } \ 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 ed8bff94c46..6a0fd093608 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 0bbeec8a483..50b54537265 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 c083e842f11..133983948e9 100644 --- a/nix/.stack.nix/iohk-monitoring.nix +++ b/nix/.stack.nix/iohk-monitoring.nix @@ -42,7 +42,6 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."katip" or (errorHandler.buildDepError "katip")) - (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."safe" or (errorHandler.buildDepError "safe")) @@ -108,8 +107,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 bbe10f2a7d9..617e32b8b4f 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 96208851416..b5e6bec5ba9 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 02a98c8246d..9e5efb977da 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 0040cfd62f3..c49b1a2efc4 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 9739379c90b..3343712d189 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 29f7f4051b4..63286f02f72 100644 --- a/nix/.stack.nix/network-mux.nix +++ b/nix/.stack.nix/network-mux.nix @@ -52,7 +52,6 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) @@ -105,8 +104,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 479db403f03..e57bcea1214 100644 --- a/nix/.stack.nix/ntp-client.nix +++ b/nix/.stack.nix/ntp-client.nix @@ -67,8 +67,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 068f6a10dba..1a8458ad196 100644 --- a/nix/.stack.nix/ouroboros-consensus-byron.nix +++ b/nix/.stack.nix/ouroboros-consensus-byron.nix @@ -67,6 +67,7 @@ (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."streaming" or (errorHandler.buildDepError "streaming")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) ]; @@ -77,8 +78,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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-byronspec.nix b/nix/.stack.nix/ouroboros-consensus-byronspec.nix index b3dcefdb583..612aa48ca99 100644 --- a/nix/.stack.nix/ouroboros-consensus-byronspec.nix +++ b/nix/.stack.nix/ouroboros-consensus-byronspec.nix @@ -52,8 +52,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byronspec; 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 27d825ead86..a98189d4077 100644 --- a/nix/.stack.nix/ouroboros-consensus-cardano.nix +++ b/nix/.stack.nix/ouroboros-consensus-cardano.nix @@ -48,7 +48,6 @@ (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) - (hsPkgs."ouroboros-consensus-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) ]; buildable = true; @@ -98,6 +97,7 @@ (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; }; @@ -110,7 +110,6 @@ (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-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (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")) @@ -141,8 +140,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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-mock.nix b/nix/.stack.nix/ouroboros-consensus-mock.nix index e042b194d9b..1a6ed0e4fef 100644 --- a/nix/.stack.nix/ouroboros-consensus-mock.nix +++ b/nix/.stack.nix/ouroboros-consensus-mock.nix @@ -32,7 +32,6 @@ (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-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -73,8 +72,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-mock; 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 a3c13e263cb..db9a4a221ce 100644 --- a/nix/.stack.nix/ouroboros-consensus-shelley.nix +++ b/nix/.stack.nix/ouroboros-consensus-shelley.nix @@ -35,7 +35,6 @@ (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -56,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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-test-infra.nix b/nix/.stack.nix/ouroboros-consensus-test-infra.nix index 6bd1ee68370..87fa3eeafa0 100644 --- a/nix/.stack.nix/ouroboros-consensus-test-infra.nix +++ b/nix/.stack.nix/ouroboros-consensus-test-infra.nix @@ -88,8 +88,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-test-infra; 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 55c0e052560..74e77b2f934 100644 --- a/nix/.stack.nix/ouroboros-consensus.nix +++ b/nix/.stack.nix/ouroboros-consensus.nix @@ -34,7 +34,6 @@ (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-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -80,7 +79,6 @@ (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-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -126,7 +124,6 @@ (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -166,8 +163,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 5e697290a88..60b94d51af5 100644 --- a/nix/.stack.nix/ouroboros-network-framework.nix +++ b/nix/.stack.nix/ouroboros-network-framework.nix @@ -36,6 +36,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."dns" or (errorHandler.buildDepError "dns")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -113,8 +114,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 e17b986b74e..b4c4436d0a7 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 a701815c253..a665c4df945 100644 --- a/nix/.stack.nix/ouroboros-network.nix +++ b/nix/.stack.nix/ouroboros-network.nix @@ -41,6 +41,7 @@ (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -125,6 +126,7 @@ (hsPkgs."pipes" or (errorHandler.buildDepError "pipes")) (hsPkgs."process" or (errorHandler.buildDepError "process")) (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) @@ -187,8 +189,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 03406374be2..f64f8f91437 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -29,51 +29,144 @@ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) + (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."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."generic-random" or (errorHandler.buildDepError "generic-random")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."multiset" or (errorHandler.buildDepError "multiset")) (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; }; + tests = { + "shelley-spec-ledger-test" = { + depends = [ + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) + (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) + (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-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) + (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."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."generic-random" or (errorHandler.buildDepError "generic-random")) + (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."HUnit" or (errorHandler.buildDepError "HUnit")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."multiset" or (errorHandler.buildDepError "multiset")) + (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) + (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + }; + }; + benchmarks = { + "mainbench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) + (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-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."generic-random" or (errorHandler.buildDepError "generic-random")) + (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."MonadRandom" or (errorHandler.buildDepError "MonadRandom")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) + (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + }; + }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); - postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec/test; echo source root reset to \$sourceRoot"; + 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 02a1c71aad4..440ec7fc125 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -46,6 +46,7 @@ (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) @@ -60,93 +61,12 @@ ]; buildable = true; }; - tests = { - "shelley-spec-ledger-test" = { - depends = [ - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) - (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."generic-random" or (errorHandler.buildDepError "generic-random")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) - (hsPkgs."HUnit" or (errorHandler.buildDepError "HUnit")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."multiset" or (errorHandler.buildDepError "multiset")) - (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) - (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) - (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - ]; - buildable = true; - }; - }; - benchmarks = { - "mainbench" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) - (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) - (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."MonadRandom" or (errorHandler.buildDepError "MonadRandom")) - (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) - (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - ]; - buildable = true; - }; - }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 4cee2635e21..50ebd914072 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 fe9a2551f86..d1ec3bea977 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 fea77fa4990..ce3644985d5 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 = "183a70c001587d9b1977541deae28c3e44713907"; - sha256 = "15vhqa5vxn7xr1a93qf6wqi5h6c17h29mmd8is7z14ma08bl1baf"; + rev = "460ee17d22cacb3ac4d90536ebe90500a356a1c9"; + sha256 = "0d2lhdffvwgwyhzm12hih2b1m784sgc45vadhwvaan95ipvcciil"; }); 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 9d8d3e87002..d2fd743a13e 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 = "efa4b5ecd7f0a13124616b12679cd42517cd905a"; - sha256 = "0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf"; + rev = "8190b00d6930927a812baff97d02566176b6bd3b"; + sha256 = "1pq69jd1dmnqvh7zxf25dnkn1zhyf4yixb8dc1cfyrmgf5hnh5ag"; }); 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 903dcd211ca..890c83895ec 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); 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 58773faddab..b21ac449ecf 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 = "ec74d1c463b6d18bdca2b714abe730c1d237cc32"; - sha256 = "0y0kpad63fppynhvyqva2mh44nbd4rbkrrvdc82zg6qcw8b5rm6p"; + rev = "aecfe77de784e6c75108172802ee59d2d7087eaf"; + sha256 = "1pdanljh5v1w038fc0s945h1gnrkipnfbj2cqqzwgpnv7zm14swh"; }); postUnpack = "sourceRoot+=/typed-protocols; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/haskell.nix b/nix/haskell.nix index 254c09beecb..8d5975c831b 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -130,10 +130,6 @@ let # Make sure that libsodium DLLs and shell completions are available . packages.cardano-wallet.components.exes.cardano-wallet.postInstall = optparseCompletionPostInstall + libSodiumPostInstall; packages.cardano-wallet-jormungandr.components.exes.cardano-wallet-jormungandr.postInstall = optparseCompletionPostInstall; - - # Workaround for Haskell.nix issue - packages.cardano-wallet-jormungandr.components.all.postInstall = lib.mkForce ""; - packages.cardano-wallet.components.all.postInstall = lib.mkForce ""; } { @@ -143,11 +139,6 @@ let packages.cardano-addresses.components.exes.cardano-address.postInstall = optparseCompletionPostInstall; packages.cardano-transactions.components.exes.cardano-tx.postInstall = optparseCompletionPostInstall; packages.bech32.components.exes.bech32.postInstall = optparseCompletionPostInstall; - # Workaround for Haskell.nix issue - packages.cardano-node.components.all.postInstall = lib.mkForce ""; - packages.cardano-addresses.components.all.postInstall = lib.mkForce ""; - packages.cardano-transactions.components.all.postInstall = lib.mkForce ""; - packages.bech32.components.all.postInstall = lib.mkForce ""; } # Provide the swagger file in an environment variable for @@ -160,9 +151,6 @@ let in { packages.cardano-wallet-core.components.tests.unit.preBuild = swaggerYamlPreBuild; packages.cardano-wallet-jormungandr.components.tests.unit.preBuild = swaggerYamlPreBuild; - # Workaround for Haskell.nix issue - packages.cardano-wallet-core.components.all.preBuild = lib.mkForce ""; - packages.cardano-wallet-jormungandr.components.all.preBuild = lib.mkForce ""; }) # Build fixes for library dependencies @@ -241,14 +229,6 @@ let ]; } ]; - pkg-def-extras = [ - # Workaround for https://github.com/input-output-hk/haskell.nix/issues/214 - (hackage: { - packages = { - "hsc2hs" = (((hackage.hsc2hs)."0.68.4").revisions).default; - }; - }) - ]; }; # Hydra will pass the GitHub PR number as a string argument to release.nix. diff --git a/nix/pkgs.nix b/nix/pkgs.nix index f80ca94786c..d9d344e246e 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -16,7 +16,12 @@ in pkgs: super: with pkgs; { deployments = let environments = { inherit (pkgs.commonLib.cardanoLib.environments) - mainnet mainnet_candidate shelley_qa shelley_testnet testnet; + mainnet + mainnet_candidate_4 + staging + testnet + shelley_qa + ; }; updateConfig = env: env.nodeConfig // { minSeverity = "Notice"; diff --git a/nix/sources.json b/nix/sources.json index 92745e7aac7..777de7c0e11 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "refs/tags/1.18.0", + "branch": "refs/tags/1.19.0", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "ba0f96b1a9fc9232ed211e57835fd5018093069d", - "sha256": "1rj7rpr3qqqwdx00zsfg283jflndnr9q5arxf5fiqrrqms40p7sk", + "rev": "4814003f14340d5a1fc02f3ac15437387a7ada9f", + "sha256": "1d19dhah6llczwycb2wh517qzc9bmv41fjj59l5m3jmz652c2ira", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/ba0f96b1a9fc9232ed211e57835fd5018093069d.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/4814003f14340d5a1fc02f3ac15437387a7ada9f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": { @@ -17,10 +17,10 @@ "homepage": "https://input-output-hk.github.io/haskell.nix", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "aa33b830162a5025fea684ab8659778ea871ba67", - "sha256": "0krx5hnmrxhka7bfmp6iaw9rm3shwg4bsh0kxhmv6jkw9sm7cxzm", + "rev": "e4dab4d33ce8fb2b8f375ca7e064731733e44cbd", + "sha256": "19r7283878x62l5bn3j4xq001wlmprmw0pxg9ghv21lgjy54cvz1", "type": "tarball", - "url": "https://github.com/input-output-hk/haskell.nix/archive/aa33b830162a5025fea684ab8659778ea871ba67.tar.gz", + "url": "https://github.com/input-output-hk/haskell.nix/archive/e4dab4d33ce8fb2b8f375ca7e064731733e44cbd.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "iohk-nix": { @@ -29,10 +29,10 @@ "homepage": null, "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "f345d26508966e434d8db57d6c3b4ce4202c9fb5", - "sha256": "1xcar2r6jm68dp5s8kc2rii0rcg47w41qc1akazbngkj1x6hf1r2", + "rev": "b22d8da9dd38c971ad40d9ad2d1a60cce53995fb", + "sha256": "0r6x6gnbb63c70h14l8fmv34cql2kzvsdabgm8bixvinlghpm1w1", "type": "tarball", - "url": "https://github.com/input-output-hk/iohk-nix/archive/f345d26508966e434d8db57d6c3b4ce4202c9fb5.tar.gz", + "url": "https://github.com/input-output-hk/iohk-nix/archive/b22d8da9dd38c971ad40d9ad2d1a60cce53995fb.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { diff --git a/stack.yaml b/stack.yaml index 8482b6c6530..712a5f89cc6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: cardano-1.18.x.yaml +resolver: cardano-1.19.x.yaml packages: - lib/core