From ae7f17f5f35f96ad86162c9c9d2fc44f9c7cd39a Mon Sep 17 00:00:00 2001 From: Radu Ometita Date: Mon, 7 Jun 2021 12:20:16 +0300 Subject: [PATCH] Bring cardano-api into the PAB. --- cabal.project | 47 ++- nix/pkgs/haskell/haskell.nix | 15 +- .../.plan.nix/Win32-network.nix | 84 ++--- .../.plan.nix/byron-spec-chain.nix | 4 +- .../.plan.nix/byron-spec-ledger.nix | 14 +- .../.plan.nix/cardano-api.nix | 198 ++++++++++++ .../.plan.nix/cardano-binary-test.nix | 6 +- .../.plan.nix/cardano-binary.nix | 9 +- .../.plan.nix/cardano-crypto-class.nix | 6 +- .../.plan.nix/cardano-crypto-praos.nix | 5 +- .../.plan.nix/cardano-crypto-test.nix | 4 +- .../.plan.nix/cardano-crypto-tests.nix | 94 ++++++ .../.plan.nix/cardano-crypto-wrapper.nix | 4 +- .../.plan.nix/cardano-crypto.nix | 2 +- .../.plan.nix/cardano-ledger-alonzo.nix | 85 +++++ ...test.nix => cardano-ledger-byron-test.nix} | 9 +- ...no-ledger.nix => cardano-ledger-byron.nix} | 15 +- .../.plan.nix/cardano-ledger-core.nix | 82 +++++ .../.plan.nix/cardano-ledger-shelley-ma.nix | 7 +- .../.plan.nix/cardano-prelude-test.nix | 4 +- .../.plan.nix/cardano-prelude.nix | 9 +- .../.plan.nix/cardano-slotting.nix | 9 +- .../.plan.nix/contra-tracer.nix | 2 +- .../materialized-unix/.plan.nix/goblins.nix | 2 +- .../.plan.nix/hedgehog-extras.nix | 86 +++++ .../.plan.nix/io-sim-classes.nix | 2 +- .../materialized-unix/.plan.nix/io-sim.nix | 2 +- .../.plan.nix/iohk-monitoring.nix | 4 +- .../.plan.nix/lobemo-backend-ekg.nix | 2 +- .../.plan.nix/network-mux.nix | 9 +- .../.plan.nix/ouroboros-consensus-byron.nix | 107 +++++++ .../.plan.nix/ouroboros-consensus-cardano.nix | 116 +++++++ .../.plan.nix/ouroboros-consensus-shelley.nix | 90 ++++++ .../.plan.nix/ouroboros-consensus.nix | 294 ++++++++++++++++++ .../.plan.nix/ouroboros-network-framework.nix | 3 +- .../.plan.nix/ouroboros-network-testing.nix | 5 +- .../.plan.nix/ouroboros-network.nix | 40 ++- .../.plan.nix/plutus-pab.nix | 1 + .../.plan.nix/shelley-spec-ledger-test.nix | 246 +++++++++++++++ .../.plan.nix/shelley-spec-ledger.nix | 27 +- .../.plan.nix/shelley-spec-non-integral.nix | 7 +- .../.plan.nix/small-steps-test.nix | 20 +- .../.plan.nix/small-steps.nix | 23 +- .../.plan.nix/strict-containers.nix | 57 ++++ .../.plan.nix/tracer-transformers.nix | 2 +- .../.plan.nix/typed-protocols-examples.nix | 2 +- .../.plan.nix/typed-protocols.nix | 2 +- .../haskell/materialized-unix/default.nix | 68 +++- plutus-pab/plutus-pab.cabal | 1 + .../src/Cardano/Protocol/Socket/Client.hs | 2 + .../src/Cardano/Protocol/Socket/Server.hs | 1 + stack.yaml | 42 ++- 52 files changed, 1753 insertions(+), 224 deletions(-) create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-api.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-tests.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-alonzo.nix rename nix/pkgs/haskell/materialized-unix/.plan.nix/{cardano-ledger-test.nix => cardano-ledger-byron-test.nix} (95%) rename nix/pkgs/haskell/materialized-unix/.plan.nix/{cardano-ledger.nix => cardano-ledger-byron.nix} (96%) create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-core.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/hedgehog-extras.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-byron.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-cardano.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-shelley.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger-test.nix create mode 100644 nix/pkgs/haskell/materialized-unix/.plan.nix/strict-containers.nix diff --git a/cabal.project b/cabal.project index 67a91f0ab82..98aae5726a3 100644 --- a/cabal.project +++ b/cabal.project @@ -34,6 +34,9 @@ write-ghc-environment-files: never tests: true benchmarks: true +package cardano-api + tests: false + -- This is also needed so evenful-sql-common will build with a -- newer version of persistent. See stack.yaml for the mirrored -- configuration. @@ -49,6 +52,7 @@ allow-newer: -- The following two dependencies are needed by plutus. , eventful-sql-common:persistent , eventful-sql-common:persistent-template + , formatting constraints: -- aws-lambda-haskell-runtime-wai doesn't compile with newer versions @@ -57,6 +61,8 @@ constraints: , singletons < 3.0 -- breaks eventful even more than it already was , persistent-template < 2.12 + -- needed by playground-common + , recursion-schemes < 5.2 -- See the note on nix/pkgs/default.nix:agdaPackages for why this is here. -- (NOTE this will change to ieee754 in newer versions of nixpkgs). @@ -82,23 +88,25 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-crypto.git - tag: f73079303f663e028288f9f4a9e08bcca39a923e + tag: ce8f1934e4b6252084710975bd9bbc0a4648ece4 source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: 4251c0bb6e4f443f00231d28f5f70d42876da055 + tag: a715c7f420770b70bbe95ca51d3dec83866cb1bd subdir: binary binary/test slotting cardano-crypto-class cardano-crypto-praos + cardano-crypto-tests + strict-containers source-repository-package type: git location: https://github.com/input-output-hk/cardano-prelude - tag: ee4e7b547a991876e6b05ba542f4e62909f4a571 + tag: fd773f7a58412131512b9f694ab95653ac430852 subdir: cardano-prelude cardano-prelude-test @@ -106,22 +114,25 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: 6cb9052bde39472a0555d19ade8a42da63d3e904 + tag: e50613562d6d4a0f933741fcf590b0f69a1eda67 subdir: typed-protocols typed-protocols-examples ouroboros-network ouroboros-network-testing ouroboros-network-framework + ouroboros-consensus + ouroboros-consensus-byron + ouroboros-consensus-cardano + ouroboros-consensus-shelley io-sim io-sim-classes network-mux - Win32-network source-repository-package type: git location: https://github.com/input-output-hk/iohk-monitoring-framework - tag: 34abfb7f4f5610cabb45396e0496472446a0b2ca + tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c subdir: iohk-monitoring tracer-transformers @@ -131,7 +142,7 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: 097890495cbb0e8b62106bcd090a5721c3f4b36f + tag: a3ef848542961079b7cd53d599e5385198a3035c subdir: byron/chain/executable-spec byron/crypto @@ -143,9 +154,29 @@ source-repository-package 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 shelley-ma/impl + cardano-ledger-core + alonzo/impl + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-node.git + tag: b3cabae6b3bf30a0b1b4e78bc4b67282dabad0a6 + subdir: + cardano-api + +source-repository-package + type: git + location: https://github.com/input-output-hk/Win32-network + tag: 94153b676617f8f33abe8d8182c37377d2784bd1 + +source-repository-package + type: git + location: https://github.com/input-output-hk/hedgehog-extras + tag: 8bcd3c9dc22cc44f9fcfe161f4638a384fc7a187 --- The following two dependencies are not mirrored in the +-- The following dependencies are not mirrored in the -- stack.yaml file, but they are needed regardless by cabal. source-repository-package type: git diff --git a/nix/pkgs/haskell/haskell.nix b/nix/pkgs/haskell/haskell.nix index 83629d258d6..fb8a9304511 100644 --- a/nix/pkgs/haskell/haskell.nix +++ b/nix/pkgs/haskell/haskell.nix @@ -44,13 +44,16 @@ let "https://github.com/Quid2/flat.git"."95e5d7488451e43062ca84d5376b3adcc465f1cd" = "06l31x3y93rjpryvlxnpsyq2zyxvb0z6lik6yq2fvh36i5zwvwa3"; "https://github.com/shmish111/purescript-bridge.git"."6a92d7853ea514be8b70bab5e72077bf5a510596" = "13j64vv116in3c204qsl1v0ajphac9fqvsjp7x3zzfr7n7g61drb"; "https://github.com/shmish111/servant-purescript.git"."a76104490499aa72d40c2790d10e9383e0dbde63" = "11nxxmi5bw66va7psvrgrw7b7n85fvqgfp58yva99w3v9q3a50v9"; - "https://github.com/input-output-hk/cardano-base"."4251c0bb6e4f443f00231d28f5f70d42876da055" = "02a61ymvx054pcdcgvg5qj9kpybiajg993nr22iqiya196jmgciv"; - "https://github.com/input-output-hk/cardano-crypto.git"."f73079303f663e028288f9f4a9e08bcca39a923e" = "1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q"; - "https://github.com/input-output-hk/cardano-ledger-specs"."097890495cbb0e8b62106bcd090a5721c3f4b36f" = "0i3y9n0rsyarvhfqzzzjccqnjgwb9fbmbs6b7vj40afjhimf5hcj"; - "https://github.com/input-output-hk/cardano-prelude"."ee4e7b547a991876e6b05ba542f4e62909f4a571" = "0dg6ihgrn5mgqp95c4f11l6kh9k3y75lwfqf47hdp554w7wyvaw6"; + "https://github.com/input-output-hk/cardano-base"."a715c7f420770b70bbe95ca51d3dec83866cb1bd" = "06l06mmb8cd4q37bnvfpgx1c5zgsl4xaf106dqva98738i8asj7j"; + "https://github.com/input-output-hk/cardano-crypto.git"."ce8f1934e4b6252084710975bd9bbc0a4648ece4" = "1v2laq04piyj511b2m77hxjh9l1yd6k9kc7g6bjala4w3zdwa4ni"; + "https://github.com/input-output-hk/cardano-ledger-specs"."a3ef848542961079b7cd53d599e5385198a3035c" = "02iwn2lcfcfvrnvcqnx586ncdnma23vdqvicxgr4f39vcacalzpd"; + "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6"; "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg"; - "https://github.com/input-output-hk/iohk-monitoring-framework"."34abfb7f4f5610cabb45396e0496472446a0b2ca" = "1fdc0a02ipa385dnwa6r6jyc8jlg537i12hflfglkhjs2b7i92gs"; - "https://github.com/input-output-hk/ouroboros-network"."6cb9052bde39472a0555d19ade8a42da63d3e904" = "0rz4acz15wda6yfc7nls6g94gcwg2an5zibv0irkxk297n76gkmg"; + "https://github.com/input-output-hk/iohk-monitoring-framework"."808724ff8a19a33d0ed06f9ef59fbd900b08553c" = "0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz"; + "https://github.com/input-output-hk/ouroboros-network"."e50613562d6d4a0f933741fcf590b0f69a1eda67" = "0i192ksa69lpzjhzmhd2h1mramkvvikw04pqws18h5dly55f4z3k"; + "https://github.com/input-output-hk/cardano-node.git"."b3cabae6b3bf30a0b1b4e78bc4b67282dabad0a6" = "1csmji1bgi45wgrw7kqy19s4bbbpa78kjg3bz7mbiwb8vjgg9kvq"; + "https://github.com/input-output-hk/Win32-network"."94153b676617f8f33abe8d8182c37377d2784bd1" = "0pb7bg0936fldaa5r08nqbxvi2g8pcy4w3c7kdcg7pdgmimr30ss"; + "https://github.com/input-output-hk/hedgehog-extras"."8bcd3c9dc22cc44f9fcfe161f4638a384fc7a187" = "12viwpahjdfvlqpnzdgjp40nw31rvyznnab1hml9afpaxd6ixh70"; }; modules = [ { diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/Win32-network.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/Win32-network.nix index cec6a8dc4b4..84e3e84b4a6 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/Win32-network.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/Win32-network.nix @@ -10,7 +10,7 @@ { flags = { demo = false; }; package = { - specVersion = "1.10"; + specVersion = "2.4"; identifier = { name = "Win32-network"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = "2019 Input Output (Hong Kong) Ltd."; @@ -32,71 +32,51 @@ }; components = { "library" = { - depends = if system.isWindows - then [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) - ] - else [ (hsPkgs."base" or (errorHandler.buildDepError "base")) ]; + depends = (([ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."network" or (errorHandler.buildDepError "network"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); libs = (pkgs.lib).optional (system.isWindows) (pkgs."ws2_32" or (errorHandler.sysDepError "ws2_32")); buildable = true; - modules = if system.isWindows - then [ - "System/Win32/Async/IOData" - "System/Win32/Async/IOManager" - "System/Win32/Async/Overlapped" - "System/Win32/Async/Socket/Syscalls" - "System/Win32/Async/WSABuf" - "System/IOManager" - "System/Win32/NamedPipes" - "System/Win32/Async" - "System/Win32/Async/File" - "System/Win32/Async/ErrCode" - "System/Win32/Async/Socket" - "System/Win32/Async/Socket/ByteString" - "System/Win32/Async/Socket/ByteString/Lazy" - "System/Win32/Async/Internal" - ] - else [ "System/IOManager" ]; + modules = [ + "System/IOManager" + ] ++ (pkgs.lib).optionals (system.isWindows) [ + "System/Win32/Async/IOData" + "System/Win32/Async/IOManager" + "System/Win32/Async/Overlapped" + "System/Win32/Async/Socket/Syscalls" + "System/Win32/Async/WSABuf" + "System/Win32/NamedPipes" + "System/Win32/Async" + "System/Win32/Async/File" + "System/Win32/Async/ErrCode" + "System/Win32/Async/Socket" + "System/Win32/Async/Socket/ByteString" + "System/Win32/Async/Socket/ByteString/Lazy" + "System/Win32/Async/Internal" + ]; hsSourceDirs = [ "src" ]; includeDirs = (pkgs.lib).optional (system.isWindows) "include"; }; exes = { "named-pipe-demo" = { - depends = if system.isWindows - then [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) - (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) - ] - else [ (hsPkgs."base" or (errorHandler.buildDepError "base")) ]; + depends = (([ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."binary" or (errorHandler.buildDepError "binary"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); buildable = true; hsSourceDirs = [ "demo" ]; - mainPath = [ "named-pipe-demo.hs" ] ++ [ "" ]; + mainPath = (([ + "named-pipe-demo.hs" + ] ++ (pkgs.lib).optional (system.isWindows) "") ++ (pkgs.lib).optional (system.isWindows) "") ++ (pkgs.lib).optional (system.isWindows) ""; }; }; tests = { "test" = { - depends = (pkgs.lib).optionals (system.isWindows) [ - (hsPkgs."async" or (errorHandler.buildDepError "async")) + depends = (((((((((([ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) - (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) - ]; - buildable = if system.isWindows then true else false; + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."async" or (errorHandler.buildDepError "async"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."binary" or (errorHandler.buildDepError "binary"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."network" or (errorHandler.buildDepError "network"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."stm" or (errorHandler.buildDepError "stm"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances"))) ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); + buildable = true; modules = (pkgs.lib).optionals (system.isWindows) [ "Test/Generators" "Test/Async/PingPong" @@ -108,4 +88,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/19; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/44; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-chain.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-chain.nix index 5bb683e2ceb..93a8a07e850 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-chain.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-chain.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "byron-spec-chain"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -84,4 +84,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/24; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/29; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-ledger.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-ledger.nix index 1ac316d7bb0..cbfa772d6ab 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-ledger.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/byron-spec-ledger.nix @@ -71,18 +71,6 @@ hsSourceDirs = [ "src" ]; }; tests = { - "doctests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."doctest" or (errorHandler.buildDepError "doctest")) - ]; - build-tools = [ - (hsPkgs.buildPackages.doctest-discover.components.exes.doctest-discover or (pkgs.buildPackages.doctest-discover or (errorHandler.buildToolDepError "doctest-discover:doctest-discover"))) - ]; - buildable = true; - hsSourceDirs = [ "test" ]; - mainPath = [ "DoctestDiscover.hs" ]; - }; "byron-spec-ledger-test" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) @@ -115,4 +103,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/27; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/32; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-api.nix new file mode 100644 index 00000000000..7e87d00281a --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-api.nix @@ -0,0 +1,198 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.4"; + identifier = { name = "cardano-api"; version = "1.27.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "operations@iohk.io"; + author = "IOHK"; + homepage = ""; + url = ""; + synopsis = ""; + description = "The cardano api"; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "README.md" "ChangeLog.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."aeson-pretty" or (errorHandler.buildDepError "aeson-pretty")) + (hsPkgs."attoparsec" or (errorHandler.buildDepError "attoparsec")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."base58-bytestring" or (errorHandler.buildDepError "base58-bytestring")) + (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) + (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-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."memory" or (errorHandler.buildDepError "memory")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (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")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) + (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."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (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")) + (hsPkgs."vector" or (errorHandler.buildDepError "vector")) + (hsPkgs."yaml" or (errorHandler.buildDepError "yaml")) + ]; + buildable = true; + modules = [ + "Cardano/Api/Address" + "Cardano/Api/Block" + "Cardano/Api/Certificate" + "Cardano/Api/Eras" + "Cardano/Api/Error" + "Cardano/Api/Fees" + "Cardano/Api/GenesisParameters" + "Cardano/Api/Hash" + "Cardano/Api/HasTypeProxy" + "Cardano/Api/IPC" + "Cardano/Api/Key" + "Cardano/Api/KeysByron" + "Cardano/Api/KeysPraos" + "Cardano/Api/KeysShelley" + "Cardano/Api/LedgerState" + "Cardano/Api/Modes" + "Cardano/Api/NetworkId" + "Cardano/Api/OperationalCertificate" + "Cardano/Api/ProtocolParameters" + "Cardano/Api/Query" + "Cardano/Api/Script" + "Cardano/Api/ScriptData" + "Cardano/Api/SerialiseBech32" + "Cardano/Api/SerialiseCBOR" + "Cardano/Api/SerialiseJSON" + "Cardano/Api/SerialiseRaw" + "Cardano/Api/SerialiseTextEnvelope" + "Cardano/Api/Shelley/Genesis" + "Cardano/Api/SpecialByron" + "Cardano/Api/StakePoolMetadata" + "Cardano/Api/Tx" + "Cardano/Api/TxBody" + "Cardano/Api/TxInMode" + "Cardano/Api/TxMetadata" + "Cardano/Api/TxSubmit/ErrorRender" + "Cardano/Api/TxSubmit/Types" + "Cardano/Api/Utils" + "Cardano/Api/Value" + "Cardano/Api" + "Cardano/Api/Byron" + "Cardano/Api/Crypto/Ed25519Bip32" + "Cardano/Api/Shelley" + "Cardano/Api/ChainSync/Client" + "Cardano/Api/ChainSync/ClientPipelined" + "Cardano/Api/Orphans" + "Cardano/Api/Protocol/Byron" + "Cardano/Api/Protocol/Cardano" + "Cardano/Api/Protocol/Shelley" + "Cardano/Api/Protocol/Types" + ]; + hsSourceDirs = [ "src" ]; + }; + tests = { + "cardano-api-test" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) + (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-tests" or (errorHandler.buildDepError "cardano-crypto-tests")) + (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) + (hsPkgs."cardano-ledger-byron-test" or (errorHandler.buildDepError "cardano-ledger-byron-test")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."hedgehog-extras" or (errorHandler.buildDepError "hedgehog-extras")) + (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + ]; + buildable = true; + modules = [ + "Test/Cardano/Api/Crypto" + "Test/Cardano/Api/Gen" + "Test/Cardano/Api/Genesis" + "Test/Cardano/Api/Json" + "Test/Cardano/Api/Ledger" + "Test/Cardano/Api/Metadata" + "Test/Cardano/Api/Typed/Bech32" + "Test/Cardano/Api/Typed/CBOR" + "Test/Cardano/Api/Typed/Envelope" + "Test/Cardano/Api/Typed/Gen" + "Test/Cardano/Api/Typed/JSON" + "Test/Cardano/Api/Typed/Ord" + "Test/Cardano/Api/Typed/Orphans" + "Test/Cardano/Api/Typed/RawBytes" + "Test/Cardano/Api/Typed/Script" + "Test/Cardano/Api/Typed/Value" + "Test/Tasty/Hedgehog/Group" + ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "cardano-api-test.hs" ]; + }; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/43; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary-test.nix index c2a04118b3d..c960b7d06ef 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary-test.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary-test.nix @@ -10,10 +10,10 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-binary-test"; version = "1.3.0"; }; license = "MIT"; - copyright = "2019 IOHK"; + copyright = "2019-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -33,6 +33,7 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -47,6 +48,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) ]; buildable = true; diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary.nix index c9305a6f45f..79495bd77c3 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-binary.nix @@ -10,10 +10,10 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-binary"; version = "1.5.0"; }; license = "Apache-2.0"; - copyright = "2019 IOHK"; + copyright = "2019-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -33,13 +33,14 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."digest" or (errorHandler.buildDepError "digest")) + (hsPkgs."data-fix" or (errorHandler.buildDepError "data-fix")) (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) @@ -66,6 +67,7 @@ tests = { "test" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -81,6 +83,7 @@ (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) (hsPkgs."tagged" or (errorHandler.buildDepError "tagged")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) ]; buildable = true; diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-class.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-class.nix index 3554d6cda69..d96ae1d6c72 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-class.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-class.nix @@ -10,10 +10,10 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-crypto-class"; version = "2.0.0"; }; license = "Apache-2.0"; - copyright = "2019 IOHK"; + copyright = "2019-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -33,6 +33,7 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) @@ -102,6 +103,7 @@ tests = { "test-memory-example" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-praos.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-praos.nix index 085941b4cfa..4ae66532118 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-praos.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-praos.nix @@ -10,10 +10,10 @@ { flags = { development = false; external-libsodium-vrf = true; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-crypto-praos"; version = "2.0.0"; }; license = "Apache-2.0"; - copyright = "2019 IOHK"; + copyright = "2019-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -51,6 +51,7 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-test.nix index 0a5c280bffb..5a08ad3a08c 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-test.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-test.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-crypto-test"; version = "1.3.0"; }; license = "Apache-2.0"; copyright = "2018 IOHK"; @@ -56,4 +56,4 @@ ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/26; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/31; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-tests.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-tests.nix new file mode 100644 index 00000000000..d45fd1cb99e --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-tests.nix @@ -0,0 +1,94 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { development = false; }; + package = { + specVersion = "2.2"; + identifier = { name = "cardano-crypto-tests"; version = "2.0.0"; }; + license = "Apache-2.0"; + copyright = "2020-2021 IOHK"; + maintainer = "operations@iohk.io"; + author = "IOHK"; + homepage = ""; + url = ""; + synopsis = "Tests for cardano-crypto-class and -praos"; + description = "Tests for cardano-crypto-class and -praos"; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "README.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (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-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + ]; + buildable = true; + modules = [ + "Test/Crypto/DSIGN" + "Test/Crypto/Hash" + "Test/Crypto/KES" + "Test/Crypto/Util" + "Test/Crypto/VRF" + "Test/Crypto/Instances" + "Bench/Crypto/VRF" + "Bench/Crypto/KES" + ]; + hsSourceDirs = [ "src" ]; + }; + tests = { + "test-crypto" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-tests" or (errorHandler.buildDepError "cardano-crypto-tests")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + ]; + buildable = true; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; + benchmarks = { + "bench-crypto" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-tests" or (errorHandler.buildDepError "cardano-crypto-tests")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + ]; + buildable = true; + hsSourceDirs = [ "bench" ]; + }; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/9; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-wrapper.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-wrapper.nix index 0b4ab71a6ef..8fc6dbfae30 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-wrapper.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto-wrapper.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-crypto-wrapper"; version = "1.3.0"; }; license = "Apache-2.0"; copyright = "2019 IOHK"; @@ -117,4 +117,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/25; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/30; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto.nix index 88d135c6d3b..97eac1635b8 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-crypto.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-crypto"; version = "1.1.0"; }; license = "MIT"; - copyright = "2016-2017 IOHK"; + copyright = "2016-2021 IOHK"; maintainer = "contact@typed.io"; author = "Vincent Hanquez"; homepage = "https://github.com/input-output-hk/cardano-crypto#readme"; diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-alonzo.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-alonzo.nix new file mode 100644 index 00000000000..4543e3f3cf2 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-alonzo.nix @@ -0,0 +1,85 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "3.0"; + identifier = { name = "cardano-ledger-alonzo"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2020 Input Output (Hong Kong) Ltd."; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = ""; + url = ""; + synopsis = "Cardano ledger introducing Plutus Core"; + description = "This package builds upon the Mary ledger with support for extended UTxO\nvia Plutus Core."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (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-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."data-default" or (errorHandler.buildDepError "data-default")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) + (hsPkgs."plutus-tx" or (errorHandler.buildDepError "plutus-tx")) + (hsPkgs."plutus-core" or (errorHandler.buildDepError "plutus-core")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + modules = [ + "Cardano/Ledger/Alonzo" + "Cardano/Ledger/Alonzo/Data" + "Cardano/Ledger/Alonzo/Genesis" + "Cardano/Ledger/Alonzo/Language" + "Cardano/Ledger/Alonzo/PlutusScriptApi" + "Cardano/Ledger/Alonzo/PParams" + "Cardano/Ledger/Alonzo/Rules/Bbody" + "Cardano/Ledger/Alonzo/Rules/Ledger" + "Cardano/Ledger/Alonzo/Rules/Utxo" + "Cardano/Ledger/Alonzo/Rules/Utxos" + "Cardano/Ledger/Alonzo/Rules/Utxow" + "Cardano/Ledger/Alonzo/Scripts" + "Cardano/Ledger/Alonzo/Translation" + "Cardano/Ledger/Alonzo/Tx" + "Cardano/Ledger/Alonzo/TxBody" + "Cardano/Ledger/Alonzo/TxInfo" + "Cardano/Ledger/Alonzo/TxSeq" + "Cardano/Ledger/Alonzo/TxWitness" + "Cardano/Ledger/DescribeEras" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/42; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron-test.nix similarity index 95% rename from nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-test.nix rename to nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron-test.nix index ad7b1d27150..6f7fdd94dd3 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-test.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron-test.nix @@ -10,8 +10,8 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; - identifier = { name = "cardano-ledger-test"; version = "1.3.0"; }; + specVersion = "2.2"; + identifier = { name = "cardano-ledger-byron-test"; version = "1.3.0"; }; license = "Apache-2.0"; copyright = "2018 IOHK"; maintainer = "operations@iohk.io"; @@ -39,7 +39,7 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-binary-test" or (errorHandler.buildDepError "cardano-binary-test")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) @@ -92,6 +92,7 @@ "Test/Cardano/Chain/Elaboration/Update" "Test/Cardano/Chain/Elaboration/UTxO" "Test/Cardano/Chain/Epoch/File" + "Test/Cardano/Chain/Genesis/CBOR" "Test/Cardano/Chain/Genesis/Dummy" "Test/Cardano/Chain/Genesis/Example" "Test/Cardano/Chain/Genesis/Gen" @@ -119,4 +120,4 @@ ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/29; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/34; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron.nix similarity index 96% rename from nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger.nix rename to nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron.nix index 5f583259e11..33800542e56 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-byron.nix @@ -10,16 +10,16 @@ { flags = { development = false; test-normal-form = false; }; package = { - specVersion = "1.10"; - identifier = { name = "cardano-ledger"; version = "0.1.0.0"; }; + specVersion = "2.2"; + identifier = { name = "cardano-ledger-byron"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = "2018 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; url = ""; - synopsis = "The blockchain layer of Cardano"; - description = "The blockchain layer of Cardano"; + synopsis = "The blockchain layer of Cardano during the Byron era"; + description = "The blockchain layer of Cardano during the Byron era"; buildType = "Simple"; isLocal = true; detailLevel = "FullDetails"; @@ -162,7 +162,7 @@ hsSourceDirs = [ "src" ]; }; tests = { - "cardano-ledger-test" = { + "cardano-ledger-byron-test" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) @@ -170,7 +170,7 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-binary-test" or (errorHandler.buildDepError "cardano-binary-test")) - (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) @@ -225,6 +225,7 @@ "Test/Cardano/Chain/Elaboration/Update" "Test/Cardano/Chain/Elaboration/UTxO" "Test/Cardano/Chain/Epoch/File" + "Test/Cardano/Chain/Genesis/CBOR" "Test/Cardano/Chain/Genesis/Dummy" "Test/Cardano/Chain/Genesis/Example" "Test/Cardano/Chain/Genesis/Gen" @@ -283,4 +284,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/28; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/33; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-core.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-core.nix new file mode 100644 index 00000000000..463e0777805 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-core.nix @@ -0,0 +1,82 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.4"; + identifier = { name = "cardano-ledger-core"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2021 Input Output (Hong Kong) Ltd."; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = ""; + url = ""; + synopsis = "Core components of Cardano ledgers from the Shelley release on."; + description = "Cardano ledgers from the Shelley release onwards share a core basis rooted in\nthe Shelley ledger specification. This package abstracts a number of components\nwhich we expect to be shared amongst all future ledgers implemented around this base."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (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-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."groups" or (errorHandler.buildDepError "groups")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."partial-order" or (errorHandler.buildDepError "partial-order")) + (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) + (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + modules = [ + "Cardano/Ledger/AuxiliaryData" + "Cardano/Ledger/BaseTypes" + "Cardano/Ledger/Coin" + "Cardano/Ledger/Compactible" + "Cardano/Ledger/Core" + "Cardano/Ledger/Crypto" + "Cardano/Ledger/Era" + "Cardano/Ledger/Keys" + "Cardano/Ledger/Hashes" + "Cardano/Ledger/Rules/ValidationMode" + "Cardano/Ledger/SafeHash" + "Cardano/Ledger/Serialization" + "Cardano/Ledger/Tx" + "Cardano/Ledger/Val" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/41; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-shelley-ma.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-shelley-ma.nix index 8906854abea..f70f36d663d 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-shelley-ma.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-ledger-shelley-ma.nix @@ -33,15 +33,17 @@ components = { "library" = { depends = [ - (hsPkgs."array" or (errorHandler.buildDepError "array")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (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."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) @@ -50,6 +52,7 @@ (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; @@ -71,4 +74,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/34; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/40; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude-test.nix index 2da0d274e0a..e977a2250ec 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude-test.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude-test.nix @@ -13,7 +13,7 @@ specVersion = "2.2"; identifier = { name = "cardano-prelude-test"; version = "0.1.0.0"; }; license = "MIT"; - copyright = "2018 IOHK"; + copyright = "2018-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -90,4 +90,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/10; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/12; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude.nix index 8b0854dce64..cff6da5dc57 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-prelude.nix @@ -13,7 +13,7 @@ specVersion = "2.2"; identifier = { name = "cardano-prelude"; version = "0.1.0.0"; }; license = "MIT"; - copyright = "2018-2020 IOHK"; + copyright = "2018-2021 IOHK"; maintainer = "operations@iohk.io"; author = "IOHK"; homepage = ""; @@ -46,15 +46,12 @@ (hsPkgs."canonical-json" or (errorHandler.buildDepError "canonical-json")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) (hsPkgs."ghc-heap" or (errorHandler.buildDepError "ghc-heap")) (hsPkgs."ghc-prim" or (errorHandler.buildDepError "ghc-prim")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."protolude" or (errorHandler.buildDepError "protolude")) - (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."tagged" or (errorHandler.buildDepError "tagged")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) @@ -75,8 +72,6 @@ "Cardano/Prelude/Orphans" "Cardano/Prelude/Strict" "Cardano/Prelude" - "Data/FingerTree/Strict" - "Data/Sequence/Strict" "Data/Semigroup/Action" ]; cSources = [ @@ -87,4 +82,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/9; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/11; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-slotting.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-slotting.nix index 20a6e5a9772..57a3664f56d 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-slotting.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/cardano-slotting.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "cardano-slotting"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = "IOHK"; @@ -33,6 +33,7 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -40,16 +41,18 @@ (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) - (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) ]; buildable = true; modules = [ "Cardano/Slotting/Block" - "Cardano/Slotting/Slot" "Cardano/Slotting/EpochInfo" "Cardano/Slotting/EpochInfo/API" "Cardano/Slotting/EpochInfo/Impl" + "Cardano/Slotting/Slot" + "Cardano/Slotting/Time" ]; hsSourceDirs = [ "src" ]; }; diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/contra-tracer.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/contra-tracer.nix index 5903eec35e6..fcde9025da6 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/contra-tracer.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/contra-tracer.nix @@ -40,4 +40,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/22; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/27; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/goblins.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/goblins.nix index 806f0fb7e24..73d89b6a23d 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/goblins.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/goblins.nix @@ -80,4 +80,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/35; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/46; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/hedgehog-extras.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/hedgehog-extras.nix new file mode 100644 index 00000000000..c94db5ec3d5 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/hedgehog-extras.nix @@ -0,0 +1,86 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.4"; + identifier = { name = "hedgehog-extras"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "operations@iohk.io"; + author = "IOHK"; + homepage = ""; + url = ""; + synopsis = "Supplemental library for hedgehog"; + description = "Supplemental library for hedgehog."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."aeson-pretty" or (errorHandler.buildDepError "aeson-pretty")) + (hsPkgs."async" or (errorHandler.buildDepError "async")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."exceptions" or (errorHandler.buildDepError "exceptions")) + (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."process" or (errorHandler.buildDepError "process")) + (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (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."unliftio" or (errorHandler.buildDepError "unliftio")) + (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")); + buildable = true; + modules = [ + "Hedgehog/Extras/Aeson" + "Hedgehog/Extras/Internal/Cli" + "Hedgehog/Extras/Internal/Plan" + "Hedgehog/Extras/Internal/Test/Integration" + "Hedgehog/Extras/Stock/Aeson" + "Hedgehog/Extras/Stock/CallStack" + "Hedgehog/Extras/Stock/IO/File" + "Hedgehog/Extras/Stock/IO/Network/NamedPipe" + "Hedgehog/Extras/Stock/IO/Network/Socket" + "Hedgehog/Extras/Stock/IO/Network/Sprocket" + "Hedgehog/Extras/Stock/IO/Process" + "Hedgehog/Extras/Stock/Monad" + "Hedgehog/Extras/Stock/OS" + "Hedgehog/Extras/Stock/String" + "Hedgehog/Extras/Stock/Time" + "Hedgehog/Extras/Test/Base" + "Hedgehog/Extras/Test/Concurrent" + "Hedgehog/Extras/Test/File" + "Hedgehog/Extras/Test/MonadAssertion" + "Hedgehog/Extras/Test/Network" + "Hedgehog/Extras/Test/Process" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/45; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim-classes.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim-classes.nix index 59fe80a7426..702634315b8 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim-classes.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim-classes.nix @@ -71,4 +71,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/17; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/23; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim.nix index 778210a453f..903e4020204 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/io-sim.nix @@ -65,4 +65,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/16; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/22; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/iohk-monitoring.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/iohk-monitoring.nix index c7e3b019221..6baff4f9ee7 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/iohk-monitoring.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/iohk-monitoring.nix @@ -11,7 +11,7 @@ flags = { disable-observables = false; performance-test-queue = false; }; package = { specVersion = "1.10"; - identifier = { name = "iohk-monitoring"; version = "0.2.0.0"; }; + identifier = { name = "iohk-monitoring"; version = "0.1.10.1"; }; license = "Apache-2.0"; copyright = "2018 IOHK"; maintainer = "operations@iohk.io"; @@ -178,4 +178,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/20; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/25; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/lobemo-backend-ekg.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/lobemo-backend-ekg.nix index b097c224c6b..bef4c7a721b 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/lobemo-backend-ekg.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/lobemo-backend-ekg.nix @@ -56,4 +56,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/23; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/28; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/network-mux.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/network-mux.nix index c08254c2b14..8e9ccc5c13b 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/network-mux.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/network-mux.nix @@ -62,6 +62,7 @@ "Network/Mux/Timeout" "Network/Mux/Types" "Network/Mux/Trace" + "Network/Mux/Bearer/AttenuatedChannel" "Network/Mux/Bearer/Pipe" "Network/Mux/Bearer/Queues" "Network/Mux/Bearer/Socket" @@ -125,6 +126,7 @@ (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) (hsPkgs."array" or (errorHandler.buildDepError "array")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) @@ -141,10 +143,7 @@ (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."time" or (errorHandler.buildDepError "time")) - ] ++ (pkgs.lib).optionals (system.isWindows) [ - (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) - (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) - ]; + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); buildable = true; modules = [ "Test/Mux" "Test/Mux/ReqResp" "Test/Mux/Timeout" ]; hsSourceDirs = [ "test" ]; @@ -152,4 +151,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/18; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/24; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-byron.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-byron.nix new file mode 100644 index 00000000000..f7e8f1a7d13 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-byron.nix @@ -0,0 +1,107 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "ouroboros-consensus-byron"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2019 Input Output (Hong Kong) Ltd."; + maintainer = "operations@iohk.io"; + author = "IOHK Engineering Team"; + homepage = ""; + url = ""; + synopsis = "Byron ledger integration in the Ouroboros consensus layer"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (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-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (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."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Byron/Crypto/DSIGN" + "Ouroboros/Consensus/Byron/EBBs" + "Ouroboros/Consensus/Byron/Ledger" + "Ouroboros/Consensus/Byron/Ledger/Block" + "Ouroboros/Consensus/Byron/Ledger/Config" + "Ouroboros/Consensus/Byron/Ledger/Conversions" + "Ouroboros/Consensus/Byron/Ledger/Forge" + "Ouroboros/Consensus/Byron/Ledger/HeaderValidation" + "Ouroboros/Consensus/Byron/Ledger/Inspect" + "Ouroboros/Consensus/Byron/Ledger/Integrity" + "Ouroboros/Consensus/Byron/Ledger/Ledger" + "Ouroboros/Consensus/Byron/Ledger/Mempool" + "Ouroboros/Consensus/Byron/Ledger/NetworkProtocolVersion" + "Ouroboros/Consensus/Byron/Ledger/Orphans" + "Ouroboros/Consensus/Byron/Ledger/PBFT" + "Ouroboros/Consensus/Byron/Ledger/Serialisation" + "Ouroboros/Consensus/Byron/Node" + "Ouroboros/Consensus/Byron/Node/Serialisation" + "Ouroboros/Consensus/Byron/Protocol" + ]; + hsSourceDirs = [ "src" ]; + }; + exes = { + "db-converter" = { + depends = [ + (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-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (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."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")) + ]; + buildable = true; + hsSourceDirs = [ "tools/db-converter" ]; + mainPath = [ "Main.hs" ]; + }; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/19; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-cardano.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-cardano.nix new file mode 100644 index 00000000000..cc44a7b6c1d --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-cardano.nix @@ -0,0 +1,116 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { + name = "ouroboros-consensus-cardano"; + version = "0.1.0.0"; + }; + license = "Apache-2.0"; + copyright = "2019 Input Output (Hong Kong) Ltd."; + maintainer = "operations@iohk.io"; + author = "IOHK Engineering Team"; + homepage = ""; + url = ""; + synopsis = "The instantation of the Ouroboros consensus layer used by Cardano"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."these" or (errorHandler.buildDepError "these")) + (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-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) + (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-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Cardano" + "Ouroboros/Consensus/Cardano/Block" + "Ouroboros/Consensus/Cardano/ByronHFC" + "Ouroboros/Consensus/Cardano/Condense" + "Ouroboros/Consensus/Cardano/CanHardFork" + "Ouroboros/Consensus/Cardano/Node" + "Ouroboros/Consensus/Cardano/ShelleyBased" + ]; + hsSourceDirs = [ "src" ]; + }; + exes = { + "db-analyser" = { + 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-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (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."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (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; + modules = [ + "Analysis" + "Block/Byron" + "Block/Cardano" + "Block/Shelley" + "HasAnalysis" + ]; + hsSourceDirs = [ "tools/db-analyser" ]; + mainPath = [ "Main.hs" ]; + }; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/20; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-shelley.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-shelley.nix new file mode 100644 index 00000000000..1e746d6347f --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus-shelley.nix @@ -0,0 +1,90 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { + name = "ouroboros-consensus-shelley"; + version = "0.1.0.0"; + }; + license = "Apache-2.0"; + copyright = "2019 Input Output (Hong Kong) Ltd."; + maintainer = "operations@iohk.io"; + author = "IOHK Engineering Team"; + homepage = ""; + url = ""; + synopsis = "Shelley ledger integration in the Ouroboros consensus layer"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (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-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (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."data-default-class" or (errorHandler.buildDepError "data-default-class")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) + (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Shelley/Eras" + "Ouroboros/Consensus/Shelley/Ledger" + "Ouroboros/Consensus/Shelley/Ledger/Block" + "Ouroboros/Consensus/Shelley/Ledger/Config" + "Ouroboros/Consensus/Shelley/Ledger/Forge" + "Ouroboros/Consensus/Shelley/Ledger/Inspect" + "Ouroboros/Consensus/Shelley/Ledger/Integrity" + "Ouroboros/Consensus/Shelley/Ledger/Ledger" + "Ouroboros/Consensus/Shelley/Ledger/Mempool" + "Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion" + "Ouroboros/Consensus/Shelley/Ledger/Query" + "Ouroboros/Consensus/Shelley/Ledger/PeerSelection" + "Ouroboros/Consensus/Shelley/Ledger/TPraos" + "Ouroboros/Consensus/Shelley/Node" + "Ouroboros/Consensus/Shelley/Node/Serialisation" + "Ouroboros/Consensus/Shelley/Protocol" + "Ouroboros/Consensus/Shelley/Protocol/HotKey" + "Ouroboros/Consensus/Shelley/Protocol/Util" + "Ouroboros/Consensus/Shelley/ShelleyBased" + "Ouroboros/Consensus/Shelley/ShelleyHFC" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/21; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus.nix new file mode 100644 index 00000000000..f5c0cabda2b --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-consensus.nix @@ -0,0 +1,294 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "ouroboros-consensus"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2019 Input Output (Hong Kong) Ltd."; + maintainer = "operations@iohk.io"; + author = "IOHK Engineering Team"; + homepage = ""; + url = ""; + synopsis = "Consensus layer for the Ouroboros blockchain protocol"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (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."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-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."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."digest" or (errorHandler.buildDepError "digest")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."filelock" or (errorHandler.buildDepError "filelock")) + (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) + (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."sop-core" or (errorHandler.buildDepError "sop-core")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."streaming" or (errorHandler.buildDepError "streaming")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."these" or (errorHandler.buildDepError "these")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."vector" or (errorHandler.buildDepError "vector")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + ] ++ (if system.isWindows + then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] + else [ + (hsPkgs."unix" or (errorHandler.buildDepError "unix")) + (hsPkgs."unix-bytestring" or (errorHandler.buildDepError "unix-bytestring")) + ]); + buildable = true; + modules = [ + "Ouroboros/Consensus/Block" + "Ouroboros/Consensus/Block/Abstract" + "Ouroboros/Consensus/Block/EBB" + "Ouroboros/Consensus/Block/Forging" + "Ouroboros/Consensus/Block/NestedContent" + "Ouroboros/Consensus/Block/RealPoint" + "Ouroboros/Consensus/Block/SupportsMetrics" + "Ouroboros/Consensus/Block/SupportsProtocol" + "Ouroboros/Consensus/BlockchainTime" + "Ouroboros/Consensus/BlockchainTime/API" + "Ouroboros/Consensus/BlockchainTime/WallClock/Default" + "Ouroboros/Consensus/BlockchainTime/WallClock/HardFork" + "Ouroboros/Consensus/BlockchainTime/WallClock/Simple" + "Ouroboros/Consensus/BlockchainTime/WallClock/Types" + "Ouroboros/Consensus/BlockchainTime/WallClock/Util" + "Ouroboros/Consensus/Config" + "Ouroboros/Consensus/Config/SecurityParam" + "Ouroboros/Consensus/Config/SupportsNode" + "Ouroboros/Consensus/Forecast" + "Ouroboros/Consensus/Fragment/Diff" + "Ouroboros/Consensus/Fragment/InFuture" + "Ouroboros/Consensus/Fragment/Validated" + "Ouroboros/Consensus/Fragment/ValidatedDiff" + "Ouroboros/Consensus/HardFork/Abstract" + "Ouroboros/Consensus/HardFork/Combinator" + "Ouroboros/Consensus/HardFork/Combinator/Abstract" + "Ouroboros/Consensus/HardFork/Combinator/Abstract/CanHardFork" + "Ouroboros/Consensus/HardFork/Combinator/Abstract/NoHardForks" + "Ouroboros/Consensus/HardFork/Combinator/Abstract/SingleEraBlock" + "Ouroboros/Consensus/HardFork/Combinator/AcrossEras" + "Ouroboros/Consensus/HardFork/Combinator/Basics" + "Ouroboros/Consensus/HardFork/Combinator/Block" + "Ouroboros/Consensus/HardFork/Combinator/Compat" + "Ouroboros/Consensus/HardFork/Combinator/Condense" + "Ouroboros/Consensus/HardFork/Combinator/Degenerate" + "Ouroboros/Consensus/HardFork/Combinator/Embed/Binary" + "Ouroboros/Consensus/HardFork/Combinator/Embed/Nary" + "Ouroboros/Consensus/HardFork/Combinator/Embed/Unary" + "Ouroboros/Consensus/HardFork/Combinator/Forging" + "Ouroboros/Consensus/HardFork/Combinator/Info" + "Ouroboros/Consensus/HardFork/Combinator/InjectTxs" + "Ouroboros/Consensus/HardFork/Combinator/Ledger" + "Ouroboros/Consensus/HardFork/Combinator/Ledger/CommonProtocolParams" + "Ouroboros/Consensus/HardFork/Combinator/Ledger/PeerSelection" + "Ouroboros/Consensus/HardFork/Combinator/Ledger/Query" + "Ouroboros/Consensus/HardFork/Combinator/Mempool" + "Ouroboros/Consensus/HardFork/Combinator/Node" + "Ouroboros/Consensus/HardFork/Combinator/Node/InitStorage" + "Ouroboros/Consensus/HardFork/Combinator/Node/Metrics" + "Ouroboros/Consensus/HardFork/Combinator/PartialConfig" + "Ouroboros/Consensus/HardFork/Combinator/Protocol" + "Ouroboros/Consensus/HardFork/Combinator/Protocol/ChainSel" + "Ouroboros/Consensus/HardFork/Combinator/Protocol/LedgerView" + "Ouroboros/Consensus/HardFork/Combinator/Serialisation" + "Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common" + "Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseDisk" + "Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient" + "Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode" + "Ouroboros/Consensus/HardFork/Combinator/State" + "Ouroboros/Consensus/HardFork/Combinator/State/Infra" + "Ouroboros/Consensus/HardFork/Combinator/State/Instances" + "Ouroboros/Consensus/HardFork/Combinator/State/Lift" + "Ouroboros/Consensus/HardFork/Combinator/State/Types" + "Ouroboros/Consensus/HardFork/Combinator/Translation" + "Ouroboros/Consensus/HardFork/Combinator/Util/DerivingVia" + "Ouroboros/Consensus/HardFork/Combinator/Util/Functors" + "Ouroboros/Consensus/HardFork/Combinator/Util/InPairs" + "Ouroboros/Consensus/HardFork/Combinator/Util/Match" + "Ouroboros/Consensus/HardFork/Combinator/Util/Tails" + "Ouroboros/Consensus/HardFork/Combinator/Util/Telescope" + "Ouroboros/Consensus/HardFork/History" + "Ouroboros/Consensus/HardFork/History/Caching" + "Ouroboros/Consensus/HardFork/History/EpochInfo" + "Ouroboros/Consensus/HardFork/History/EraParams" + "Ouroboros/Consensus/HardFork/History/Qry" + "Ouroboros/Consensus/HardFork/History/Summary" + "Ouroboros/Consensus/HardFork/History/Util" + "Ouroboros/Consensus/HardFork/Simple" + "Ouroboros/Consensus/HeaderStateHistory" + "Ouroboros/Consensus/HeaderValidation" + "Ouroboros/Consensus/Ledger/Abstract" + "Ouroboros/Consensus/Ledger/Basics" + "Ouroboros/Consensus/Ledger/CommonProtocolParams" + "Ouroboros/Consensus/Ledger/Dual" + "Ouroboros/Consensus/Ledger/Extended" + "Ouroboros/Consensus/Ledger/Inspect" + "Ouroboros/Consensus/Ledger/Query" + "Ouroboros/Consensus/Ledger/SupportsMempool" + "Ouroboros/Consensus/Ledger/SupportsPeerSelection" + "Ouroboros/Consensus/Ledger/SupportsProtocol" + "Ouroboros/Consensus/Mempool" + "Ouroboros/Consensus/Mempool/API" + "Ouroboros/Consensus/Mempool/Impl" + "Ouroboros/Consensus/Mempool/Impl/Pure" + "Ouroboros/Consensus/Mempool/Impl/Types" + "Ouroboros/Consensus/Mempool/TxSeq" + "Ouroboros/Consensus/MiniProtocol/BlockFetch/Server" + "Ouroboros/Consensus/MiniProtocol/ChainSync/Client" + "Ouroboros/Consensus/MiniProtocol/ChainSync/Server" + "Ouroboros/Consensus/MiniProtocol/LocalStateQuery/Server" + "Ouroboros/Consensus/MiniProtocol/LocalTxSubmission/Server" + "Ouroboros/Consensus/Network/NodeToClient" + "Ouroboros/Consensus/Network/NodeToNode" + "Ouroboros/Consensus/Node" + "Ouroboros/Consensus/Node/DbLock" + "Ouroboros/Consensus/Node/DbMarker" + "Ouroboros/Consensus/Node/ErrorPolicy" + "Ouroboros/Consensus/Node/Exit" + "Ouroboros/Consensus/NodeId" + "Ouroboros/Consensus/NodeKernel" + "Ouroboros/Consensus/Node/InitStorage" + "Ouroboros/Consensus/Node/NetworkProtocolVersion" + "Ouroboros/Consensus/Node/ProtocolInfo" + "Ouroboros/Consensus/Node/Recovery" + "Ouroboros/Consensus/Node/Run" + "Ouroboros/Consensus/Node/Serialisation" + "Ouroboros/Consensus/Node/Tracers" + "Ouroboros/Consensus/Protocol/Abstract" + "Ouroboros/Consensus/Protocol/BFT" + "Ouroboros/Consensus/Protocol/LeaderSchedule" + "Ouroboros/Consensus/Protocol/MockChainSel" + "Ouroboros/Consensus/Protocol/ModChainSel" + "Ouroboros/Consensus/Protocol/PBFT" + "Ouroboros/Consensus/Protocol/PBFT/Crypto" + "Ouroboros/Consensus/Protocol/PBFT/State" + "Ouroboros/Consensus/Protocol/Signed" + "Ouroboros/Consensus/Ticked" + "Ouroboros/Consensus/TypeFamilyWrappers" + "Ouroboros/Consensus/Util" + "Ouroboros/Consensus/Util/AnchoredFragment" + "Ouroboros/Consensus/Util/Args" + "Ouroboros/Consensus/Util/Assert" + "Ouroboros/Consensus/Util/CallStack" + "Ouroboros/Consensus/Util/CBOR" + "Ouroboros/Consensus/Util/Condense" + "Ouroboros/Consensus/Util/Counting" + "Ouroboros/Consensus/Util/DepPair" + "Ouroboros/Consensus/Util/EarlyExit" + "Ouroboros/Consensus/Util/FileLock" + "Ouroboros/Consensus/Util/HList" + "Ouroboros/Consensus/Util/IOLike" + "Ouroboros/Consensus/Util/MonadSTM/NormalForm" + "Ouroboros/Consensus/Util/MonadSTM/RAWLock" + "Ouroboros/Consensus/Util/MonadSTM/StrictMVar" + "Ouroboros/Consensus/Util/OptNP" + "Ouroboros/Consensus/Util/Orphans" + "Ouroboros/Consensus/Util/RedundantConstraints" + "Ouroboros/Consensus/Util/ResourceRegistry" + "Ouroboros/Consensus/Util/Singletons" + "Ouroboros/Consensus/Util/SOP" + "Ouroboros/Consensus/Util/STM" + "Ouroboros/Consensus/Util/Time" + "Ouroboros/Consensus/Util/TraceSize" + "Ouroboros/Consensus/Util/Versioned" + "Ouroboros/Consensus/Storage/ChainDB" + "Ouroboros/Consensus/Storage/ChainDB/API" + "Ouroboros/Consensus/Storage/ChainDB/Impl" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Args" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Background" + "Ouroboros/Consensus/Storage/ChainDB/Impl/BlockCache" + "Ouroboros/Consensus/Storage/ChainDB/Impl/ChainSel" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Follower" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Iterator" + "Ouroboros/Consensus/Storage/ChainDB/Impl/LgrDB" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Paths" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Query" + "Ouroboros/Consensus/Storage/ChainDB/Impl/Types" + "Ouroboros/Consensus/Storage/ChainDB/Init" + "Ouroboros/Consensus/Storage/Common" + "Ouroboros/Consensus/Storage/FS/API" + "Ouroboros/Consensus/Storage/FS/API/Types" + "Ouroboros/Consensus/Storage/FS/CRC" + "Ouroboros/Consensus/Storage/FS/Handle" + "Ouroboros/Consensus/Storage/FS/IO" + "Ouroboros/Consensus/Storage/IO" + "Ouroboros/Consensus/Storage/ImmutableDB" + "Ouroboros/Consensus/Storage/ImmutableDB/API" + "Ouroboros/Consensus/Storage/ImmutableDB/Chunks" + "Ouroboros/Consensus/Storage/ImmutableDB/Chunks/Internal" + "Ouroboros/Consensus/Storage/ImmutableDB/Chunks/Layout" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Index" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Index/Cache" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Index/Primary" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Index/Secondary" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Iterator" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Parser" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/State" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Types" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Util" + "Ouroboros/Consensus/Storage/ImmutableDB/Impl/Validation" + "Ouroboros/Consensus/Storage/LedgerDB/DiskPolicy" + "Ouroboros/Consensus/Storage/LedgerDB/InMemory" + "Ouroboros/Consensus/Storage/LedgerDB/OnDisk" + "Ouroboros/Consensus/Storage/Serialisation" + "Ouroboros/Consensus/Storage/VolatileDB" + "Ouroboros/Consensus/Storage/VolatileDB/API" + "Ouroboros/Consensus/Storage/VolatileDB/Impl" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/FileInfo" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/Index" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/Parser" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/State" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/Types" + "Ouroboros/Consensus/Storage/VolatileDB/Impl/Util" + "Data/SOP/Strict" + ]; + hsSourceDirs = [ "src" ] ++ (if system.isWindows + then [ "src-win32" ] + else [ "src-unix" ]); + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/18; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-framework.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-framework.nix index fcb034b016f..521481b9c48 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-framework.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-framework.nix @@ -62,6 +62,7 @@ ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); buildable = true; modules = [ + "Ouroboros/Network/Linger" "Ouroboros/Network/Codec" "Ouroboros/Network/CodecCBORTerm" "Ouroboros/Network/Channel" @@ -172,4 +173,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/15; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/17; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-testing.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-testing.nix index d296b782612..3da77be6e45 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-testing.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network-testing.nix @@ -34,7 +34,9 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -43,8 +45,9 @@ modules = [ "Ouroboros/Network/Testing/Serialise" "Ouroboros/Network/Testing/QuickCheck" + "Ouroboros/Network/Testing/Utils" ]; hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/14; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/16; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network.nix index addd86d0d62..1b2f0f48961 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/ouroboros-network.nix @@ -25,8 +25,18 @@ detailLevel = "FullDetails"; licenseFiles = [ "LICENSE" "NOTICE" ]; dataDir = "."; - dataFiles = []; - extraSrcFiles = [ "ChangeLog.md" "test/messages.cddl" ]; + dataFiles = [ + "test-cddl/specs/handshake-node-to-node.cddl" + "test-cddl/specs/handshake-node-to-client.cddl" + "test-cddl/specs/chain-sync.cddl" + "test-cddl/specs/block-fetch.cddl" + "test-cddl/specs/tx-submission.cddl" + "test-cddl/specs/tx-submission2.cddl" + "test-cddl/specs/keep-alive.cddl" + "test-cddl/specs/local-tx-submission.cddl" + "test-cddl/specs/local-state-query.cddl" + ]; + extraSrcFiles = [ "ChangeLog.md" ]; extraTmpFiles = []; extraDocFiles = []; }; @@ -50,6 +60,7 @@ (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) @@ -60,6 +71,7 @@ (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) ]; buildable = true; modules = [ @@ -79,6 +91,7 @@ "Ouroboros/Network/BlockFetch/Decision" "Ouroboros/Network/BlockFetch/DeltaQ" "Ouroboros/Network/BlockFetch/State" + "Ouroboros/Network/Counter" "Ouroboros/Network/DeltaQ" "Ouroboros/Network/Diffusion" "Ouroboros/Network/KeepAlive" @@ -90,8 +103,10 @@ "Ouroboros/Network/Tracers" "Ouroboros/Network/Point" "Ouroboros/Network/PeerSelection/Types" + "Ouroboros/Network/PeerSelection/EstablishedPeers" "Ouroboros/Network/PeerSelection/KnownPeers" "Ouroboros/Network/PeerSelection/LedgerPeers" + "Ouroboros/Network/PeerSelection/LocalRootPeers" "Ouroboros/Network/PeerSelection/RootPeersDNS" "Ouroboros/Network/PeerSelection/Governor" "Ouroboros/Network/Protocol/ChainSync/Client" @@ -151,6 +166,7 @@ (hsPkgs."pipes" or (errorHandler.buildDepError "pipes")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -161,6 +177,7 @@ (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ]; buildable = true; @@ -245,6 +262,7 @@ (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) @@ -270,17 +288,21 @@ modules = [ "Ouroboros/Network/BlockFetch/Examples" "Ouroboros/Network/MockNode" - "Ouroboros/Network/PeerSelection/Test" - "Ouroboros/Network/NodeToNode/Version/Test" - "Ouroboros/Network/NodeToClient/Version/Test" "Test/AnchoredFragment" "Test/Chain" "Test/LedgerPeers" - "Test/Ouroboros/Network/Utils" "Test/Ouroboros/Network/BlockFetch" "Test/Ouroboros/Network/KeepAlive" "Test/Ouroboros/Network/MockNode" "Test/Ouroboros/Network/TxSubmission" + "Test/Ouroboros/Network/PeerSelection" + "Test/Ouroboros/Network/PeerSelection/Instances" + "Test/Ouroboros/Network/PeerSelection/LocalRootPeers" + "Test/Ouroboros/Network/PeerSelection/MockEnvironment" + "Test/Ouroboros/Network/PeerSelection/PeerGraph" + "Test/Ouroboros/Network/PeerSelection/Script" + "Test/Ouroboros/Network/NodeToNode/Version" + "Test/Ouroboros/Network/NodeToClient/Version" "Test/Mux" "Test/Pipe" "Test/Socket" @@ -300,12 +322,16 @@ (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."pipes" or (errorHandler.buildDepError "pipes")) (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."quickcheck-instances" or (errorHandler.buildDepError "quickcheck-instances")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) @@ -324,4 +350,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/13; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/15; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix index 318a8b25ba7..395e13b909b 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/plutus-pab.nix @@ -45,6 +45,7 @@ (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger-test.nix new file mode 100644 index 00000000000..bf905e5ad86 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger-test.nix @@ -0,0 +1,246 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { development = false; }; + package = { + specVersion = "2.2"; + identifier = { name = "shelley-spec-ledger-test"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = ""; + url = ""; + synopsis = ""; + description = "Test helpers from shelley-spec-ledger exposed to other packages"; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ + "cddl-files/shelley.cddl" + "cddl-files/real/crypto.cddl" + "cddl-files/mock/extras.cddl" + ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (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-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-byron-test" or (errorHandler.buildDepError "cardano-ledger-byron-test")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (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."data-default-class" or (errorHandler.buildDepError "data-default-class")) + (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."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (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."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (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; + modules = [ + "Test/Shelley/Spec/Ledger/Address/Bootstrap" + "Test/Shelley/Spec/Ledger/Address/CompactAddr" + "Test/Shelley/Spec/Ledger/ByronTranslation" + "Test/Shelley/Spec/Ledger/Examples/Federation" + "Test/Shelley/Spec/Ledger/Rules/ClassifyTraces" + "Test/Shelley/Spec/Ledger/Rules/TestDeleg" + "Test/Shelley/Spec/Ledger/Rules/TestPool" + "Test/Shelley/Spec/Ledger/Rules/TestPoolreap" + "Test/Shelley/Spec/Ledger/ShelleyTranslation" + "Test/Cardano/Crypto/VRF/Fake" + "Test/Shelley/Spec/Ledger/BenchmarkFunctions" + "Test/Shelley/Spec/Ledger/ConcreteCryptoTypes" + "Test/Shelley/Spec/Ledger/Examples/Cast" + "Test/Shelley/Spec/Ledger/Examples/Consensus" + "Test/Shelley/Spec/Ledger/Generator/Block" + "Test/Shelley/Spec/Ledger/Generator/Constants" + "Test/Shelley/Spec/Ledger/Generator/Core" + "Test/Shelley/Spec/Ledger/Generator/Delegation" + "Test/Shelley/Spec/Ledger/Generator/Metadata" + "Test/Shelley/Spec/Ledger/Generator/Presets" + "Test/Shelley/Spec/Ledger/Generator/Trace/Chain" + "Test/Shelley/Spec/Ledger/Generator/Trace/DCert" + "Test/Shelley/Spec/Ledger/Generator/Trace/Ledger" + "Test/Shelley/Spec/Ledger/Generator/Update" + "Test/Shelley/Spec/Ledger/Generator/Utxo" + "Test/Shelley/Spec/Ledger/Generator/EraGen" + "Test/Shelley/Spec/Ledger/Generator/ScriptClass" + "Test/Shelley/Spec/Ledger/Generator/ShelleyEraGen" + "Test/Shelley/Spec/Ledger/Orphans" + "Test/Shelley/Spec/Ledger/Serialisation/CDDLUtils" + "Test/Shelley/Spec/Ledger/Serialisation/Generators" + "Test/Shelley/Spec/Ledger/Serialisation/EraIndepGenerators" + "Test/Shelley/Spec/Ledger/Serialisation/Generators/Bootstrap" + "Test/Shelley/Spec/Ledger/Serialisation/Generators/Genesis" + "Test/Shelley/Spec/Ledger/Serialisation/GoldenUtils" + "Test/Shelley/Spec/Ledger/Shrinkers" + "Test/Shelley/Spec/Ledger/Utils" + "Test/Shelley/Spec/Ledger/PropertyTests" + "Test/Shelley/Spec/Ledger/Rules/TestChain" + "Test/TestScenario" + ]; + hsSourceDirs = [ "src" "test" ]; + }; + tests = { + "shelley-spec-ledger-test" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) + (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-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-byron-test" or (errorHandler.buildDepError "cardano-ledger-byron-test")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (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."data-default-class" or (errorHandler.buildDepError "data-default-class")) + (hsPkgs."groups" or (errorHandler.buildDepError "groups")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (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."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (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."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + modules = [ + "Test/Control/Iterate/SetAlgebra" + "Test/Shelley/Spec/Ledger/Address/Bootstrap" + "Test/Shelley/Spec/Ledger/Address/CompactAddr" + "Test/Shelley/Spec/Ledger/ByronTranslation" + "Test/Shelley/Spec/Ledger/Examples" + "Test/Shelley/Spec/Ledger/Examples/Cast" + "Test/Shelley/Spec/Ledger/Examples/Combinators" + "Test/Shelley/Spec/Ledger/Examples/EmptyBlock" + "Test/Shelley/Spec/Ledger/Examples/Federation" + "Test/Shelley/Spec/Ledger/Examples/Init" + "Test/Shelley/Spec/Ledger/Examples/GenesisDelegation" + "Test/Shelley/Spec/Ledger/Examples/NetworkID" + "Test/Shelley/Spec/Ledger/Examples/Mir" + "Test/Shelley/Spec/Ledger/Examples/MirTransfer" + "Test/Shelley/Spec/Ledger/Examples/PoolLifetime" + "Test/Shelley/Spec/Ledger/Examples/PoolReReg" + "Test/Shelley/Spec/Ledger/Examples/TwoPools" + "Test/Shelley/Spec/Ledger/Examples/Updates" + "Test/Shelley/Spec/Ledger/Fees" + "Test/Shelley/Spec/Ledger/MultiSigExamples" + "Test/Shelley/Spec/Ledger/Pretty" + "Test/Shelley/Spec/Ledger/PropertyTests" + "Test/Shelley/Spec/Ledger/Rewards" + "Test/Shelley/Spec/Ledger/Rules/ClassifyTraces" + "Test/Shelley/Spec/Ledger/Rules/TestChain" + "Test/Shelley/Spec/Ledger/Rules/TestDeleg" + "Test/Shelley/Spec/Ledger/Rules/TestPool" + "Test/Shelley/Spec/Ledger/Rules/TestPoolreap" + "Test/Shelley/Spec/Ledger/SafeHash" + "Test/Shelley/Spec/Ledger/Serialisation" + "Test/Shelley/Spec/Ledger/Serialisation/CDDL" + "Test/Shelley/Spec/Ledger/Serialisation/Golden/Address" + "Test/Shelley/Spec/Ledger/Serialisation/Golden/Encoding" + "Test/Shelley/Spec/Ledger/Serialisation/Golden/Genesis" + "Test/Shelley/Spec/Ledger/Serialisation/Tripping/CBOR" + "Test/Shelley/Spec/Ledger/Serialisation/Tripping/JSON" + "Test/Shelley/Spec/Ledger/ShelleyTranslation" + "Test/Shelley/Spec/Ledger/STSTests" + "Test/Shelley/Spec/Ledger/UnitTests" + "Test/TestScenario" + ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Tests.hs" ]; + }; + }; + benchmarks = { + "mainbench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (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."data-default-class" or (errorHandler.buildDepError "data-default-class")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (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" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + modules = [ + "Bench/Control/Iterate/SetAlgebra/Bimap" + "BenchUTxOAggregate" + "BenchValidation" + "Shelley/Spec/Ledger/Bench/Gen" + "Shelley/Spec/Ledger/Bench/Rewards" + "Test/Shelley/Spec/Ledger/Examples/Cast" + ]; + hsSourceDirs = [ "bench" "test" ]; + }; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/39; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger.nix index 0a50cd95c52..b627e0735b2 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-ledger.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.8"; + specVersion = "2.2"; identifier = { name = "shelley-spec-ledger"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -33,8 +33,8 @@ components = { "library" = { depends = [ - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) @@ -43,11 +43,11 @@ (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-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."cborg-json" or (errorHandler.buildDepError "cborg-json")) (hsPkgs."constraints" or (errorHandler.buildDepError "constraints")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) @@ -55,43 +55,35 @@ (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) - (hsPkgs."partial-order" or (errorHandler.buildDepError "partial-order")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (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")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; modules = [ - "Shelley/Spec/Ledger/API/Mempool" "Shelley/Spec/Ledger/API/Types" - "Cardano/Ledger/AuxiliaryData" - "Cardano/Ledger/Compactible" - "Cardano/Ledger/Core" - "Cardano/Ledger/Crypto" - "Cardano/Ledger/Era" "Cardano/Ledger/Pretty" "Cardano/Ledger/Shelley" "Cardano/Ledger/Shelley/Constraints" - "Cardano/Ledger/Torsor" - "Cardano/Ledger/Val" "Shelley/Spec/Ledger/Address" "Shelley/Spec/Ledger/Address/Bootstrap" "Shelley/Spec/Ledger/API" "Shelley/Spec/Ledger/API/ByronTranslation" + "Shelley/Spec/Ledger/API/Genesis" "Shelley/Spec/Ledger/API/Protocol" "Shelley/Spec/Ledger/API/Validation" "Shelley/Spec/Ledger/API/Wallet" + "Shelley/Spec/Ledger/API/Mempool" "Shelley/Spec/Ledger/BaseTypes" "Shelley/Spec/Ledger/BlockChain" - "Shelley/Spec/Ledger/Coin" "Shelley/Spec/Ledger/CompactAddr" "Shelley/Spec/Ledger/Credential" "Shelley/Spec/Ledger/Delegation/Certificates" @@ -99,7 +91,6 @@ "Shelley/Spec/Ledger/EpochBoundary" "Shelley/Spec/Ledger/Genesis" "Shelley/Spec/Ledger/HardForks" - "Shelley/Spec/Ledger/Hashing" "Shelley/Spec/Ledger/Keys" "Shelley/Spec/Ledger/LedgerState" "Shelley/Spec/Ledger/Metadata" @@ -109,8 +100,8 @@ "Shelley/Spec/Ledger/PParams" "Shelley/Spec/Ledger/Rewards" "Shelley/Spec/Ledger/RewardProvenance" + "Shelley/Spec/Ledger/RewardUpdate" "Shelley/Spec/Ledger/Scripts" - "Shelley/Spec/Ledger/Serialization" "Shelley/Spec/Ledger/Slot" "Shelley/Spec/Ledger/SoftForks" "Shelley/Spec/Ledger/StabilityWindow" @@ -147,4 +138,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/33; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/38; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-non-integral.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-non-integral.nix index 218dc0521cc..3b0a74570fa 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-non-integral.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/shelley-spec-non-integral.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.8"; + specVersion = "2.2"; identifier = { name = "shelley-spec-non-integral"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -39,8 +39,9 @@ }; tests = { "shelley-spec-non-integral-test" = { - depends = (pkgs.lib).optionals (!flags.development) [ + depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + ] ++ (pkgs.lib).optionals (!flags.development) [ (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) ]; @@ -51,4 +52,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/32; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/37; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps-test.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps-test.nix index 12b5d010c14..6b47633e2bb 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps-test.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps-test.nix @@ -10,7 +10,7 @@ { flags = { development = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "small-steps-test"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -41,11 +41,10 @@ (hsPkgs."microlens-th" or (errorHandler.buildDepError "microlens-th")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) - (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) ]; buildable = true; modules = [ @@ -58,19 +57,6 @@ hsSourceDirs = [ "src" ]; }; tests = { - "doctests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."doctest" or (errorHandler.buildDepError "doctest")) - (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) - ]; - build-tools = [ - (hsPkgs.buildPackages.doctest-discover.components.exes.doctest-discover or (pkgs.buildPackages.doctest-discover or (errorHandler.buildToolDepError "doctest-discover:doctest-discover"))) - ]; - buildable = true; - hsSourceDirs = [ "test" ]; - mainPath = [ "DoctestDiscover.hs" ]; - }; "examples" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) @@ -100,4 +86,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/31; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/36; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps.nix index cad94c15fa2..4ce10d64cf1 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/small-steps.nix @@ -10,7 +10,7 @@ { flags = { development = false; sts_assert = false; }; package = { - specVersion = "1.10"; + specVersion = "2.2"; identifier = { name = "small-steps"; version = "0.1.0.0"; }; license = "Apache-2.0"; copyright = ""; @@ -33,19 +33,21 @@ components = { "library" = { depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."ansi-wl-pprint" or (errorHandler.buildDepError "ansi-wl-pprint")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) (hsPkgs."free" or (errorHandler.buildDepError "free")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) @@ -61,6 +63,7 @@ "Data/CanonicalMaps" "Data/MemoBytes" "Data/Coders" + "Data/Pulse" "Control/Provenance" "Control/Iterate/SetAlgebra" "Control/Iterate/Collect" @@ -68,19 +71,5 @@ ]; hsSourceDirs = [ "src" ]; }; - tests = { - "doctests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."doctest" or (errorHandler.buildDepError "doctest")) - ]; - build-tools = [ - (hsPkgs.buildPackages.doctest-discover.components.exes.doctest-discover or (pkgs.buildPackages.doctest-discover or (errorHandler.buildToolDepError "doctest-discover:doctest-discover"))) - ]; - buildable = true; - hsSourceDirs = [ "test" ]; - mainPath = [ "DoctestDiscover.hs" ]; - }; - }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/30; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/35; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/strict-containers.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/strict-containers.nix new file mode 100644 index 00000000000..0931884b8f3 --- /dev/null +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/strict-containers.nix @@ -0,0 +1,57 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { development = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "strict-containers"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "IOHK"; + maintainer = "operations@iohk.io"; + author = "IOHK"; + homepage = ""; + url = ""; + synopsis = "Various strict container types"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + ]; + buildable = true; + modules = [ + "Data/FingerTree/Strict" + "Data/Maybe/Strict" + "Data/Sequence/Strict" + "Data/Unit/Strict" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/10; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/tracer-transformers.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/tracer-transformers.nix index e67bcba082f..097e3095eb1 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/tracer-transformers.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/tracer-transformers.nix @@ -71,4 +71,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/21; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/26; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols-examples.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols-examples.nix index 4373fb0a601..edfedb7dd64 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols-examples.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols-examples.nix @@ -83,4 +83,4 @@ }; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/12; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/14; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols.nix b/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols.nix index 44e6bb46768..975f5d54d8b 100644 --- a/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols.nix +++ b/nix/pkgs/haskell/materialized-unix/.plan.nix/typed-protocols.nix @@ -47,4 +47,4 @@ hsSourceDirs = [ "src" ]; }; }; - } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/11; } \ No newline at end of file + } // rec { src = (pkgs.lib).mkDefault .././.source-repository-packages/13; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-unix/default.nix b/nix/pkgs/haskell/materialized-unix/default.nix index 108c26d0c3a..b2b2eae217f 100644 --- a/nix/pkgs/haskell/materialized-unix/default.nix +++ b/nix/pkgs/haskell/materialized-unix/default.nix @@ -61,6 +61,7 @@ "attoparsec-iso8601".revision = (((hackage."attoparsec-iso8601")."1.0.2.0").revisions).default; "attoparsec-iso8601".flags.fast = false; "attoparsec-iso8601".flags.developer = false; + "generic-random".revision = (((hackage."generic-random")."1.3.0.1").revisions).default; "formatting".revision = (((hackage."formatting")."7.1.2").revisions).default; "pipes".revision = (((hackage."pipes")."4.3.15").revisions).default; "deriving-aeson".revision = (((hackage."deriving-aeson")."0.2.6.1").revisions).default; @@ -72,8 +73,10 @@ "bifunctors".flags.semigroups = true; "bifunctors".flags.tagged = true; "pure-zlib".revision = (((hackage."pure-zlib")."0.6.7").revisions).default; + "optparse-generic".revision = (((hackage."optparse-generic")."1.4.4").revisions).default; "monoidal-containers".revision = (((hackage."monoidal-containers")."0.6.0.1").revisions).default; "monoidal-containers".flags.split-these = true; + "transformers-except".revision = (((hackage."transformers-except")."0.1.1").revisions).default; "extra".revision = (((hackage."extra")."1.7.9").revisions).default; "logict".revision = (((hackage."logict")."0.7.0.3").revisions).default; "srcloc".revision = (((hackage."srcloc")."0.5.1.2").revisions).default; @@ -138,6 +141,7 @@ "cmdargs".flags.testprog = false; "cmdargs".flags.quotation = true; "easy-file".revision = (((hackage."easy-file")."0.2.2").revisions).default; + "filelock".revision = (((hackage."filelock")."0.1.1.5").revisions).default; "ghci".revision = (((hackage."ghci")."8.10.4.20210212").revisions).default; "dictionary-sharing".revision = (((hackage."dictionary-sharing")."0.1.0.0").revisions).default; "natural-transformation".revision = (((hackage."natural-transformation")."0.4").revisions).default; @@ -145,7 +149,7 @@ "th-expand-syns".revision = (((hackage."th-expand-syns")."0.4.7.0").revisions).default; "regex-posix".revision = (((hackage."regex-posix")."0.96.0.0").revisions).default; "regex-posix".flags._regex-posix-clib = false; - "cryptonite".revision = (((hackage."cryptonite")."0.28").revisions).default; + "cryptonite".revision = (((hackage."cryptonite")."0.27").revisions).default; "cryptonite".flags.support_sse = false; "cryptonite".flags.use_target_attributes = true; "cryptonite".flags.integer-gmp = true; @@ -172,6 +176,7 @@ "pem".revision = (((hackage."pem")."0.2.4").revisions).default; "http-api-data".revision = (((hackage."http-api-data")."0.4.2").revisions).default; "http-api-data".flags.use-text-show = false; + "unix-bytestring".revision = (((hackage."unix-bytestring")."0.3.7.3").revisions).default; "partial-order".revision = (((hackage."partial-order")."0.2.0.0").revisions).default; "partial-order".flags.extra-instances = true; "generic-deriving".revision = (((hackage."generic-deriving")."1.13.1").revisions).default; @@ -268,7 +273,6 @@ "semigroups".flags.template-haskell = true; "data-default".revision = (((hackage."data-default")."0.7.1.1").revisions).default; "HUnit".revision = (((hackage."HUnit")."1.6.2.0").revisions).default; - "cborg-json".revision = (((hackage."cborg-json")."0.2.2.0").revisions).default; "lifted-base".revision = (((hackage."lifted-base")."0.2.3.12").revisions).default; "data-default-instances-old-locale".revision = (((hackage."data-default-instances-old-locale")."0.0.1").revisions).default; "servant-subscriber".revision = (((hackage."servant-subscriber")."0.7.0.0").revisions).default; @@ -491,6 +495,7 @@ "abstract-deque".flags.usecas = false; "tasty-hedgehog".revision = (((hackage."tasty-hedgehog")."1.1.0.0").revisions).default; "time-units".revision = (((hackage."time-units")."1.0.0").revisions).default; + "hedgehog-quickcheck".revision = (((hackage."hedgehog-quickcheck")."0.1.1").revisions).default; "comonad".revision = (((hackage."comonad")."5.0.8").revisions).default; "comonad".flags.indexed-traversable = true; "comonad".flags.distributive = true; @@ -513,7 +518,6 @@ "vector-algorithms".flags.boundschecks = true; "vector-algorithms".flags.bench = true; "vector-algorithms".flags.properties = true; - "doctest-discover".revision = (((hackage."doctest-discover")."0.2.0.0").revisions).default; "prettyprinter".revision = (((hackage."prettyprinter")."1.7.0").revisions).default; "prettyprinter".flags.buildreadme = false; "iproute".revision = (((hackage."iproute")."1.7.11").revisions).default; @@ -706,23 +710,28 @@ plutus-contract = ./.plan.nix/plutus-contract.nix; iohk-monitoring = ./.plan.nix/iohk-monitoring.nix; cardano-crypto-wrapper = ./.plan.nix/cardano-crypto-wrapper.nix; - cardano-ledger-test = ./.plan.nix/cardano-ledger-test.nix; + hedgehog-extras = ./.plan.nix/hedgehog-extras.nix; plutus-use-cases = ./.plan.nix/plutus-use-cases.nix; flat = ./.plan.nix/flat.nix; plutus-playground-server = ./.plan.nix/plutus-playground-server.nix; shelley-spec-ledger = ./.plan.nix/shelley-spec-ledger.nix; typed-protocols-examples = ./.plan.nix/typed-protocols-examples.nix; cardano-ledger-shelley-ma = ./.plan.nix/cardano-ledger-shelley-ma.nix; + cardano-ledger-core = ./.plan.nix/cardano-ledger-core.nix; + strict-containers = ./.plan.nix/strict-containers.nix; goblins = ./.plan.nix/goblins.nix; marlowe-actus = ./.plan.nix/marlowe-actus.nix; Win32-network = ./.plan.nix/Win32-network.nix; freer-extras = ./.plan.nix/freer-extras.nix; + cardano-crypto-tests = ./.plan.nix/cardano-crypto-tests.nix; plutus-errors = ./.plan.nix/plutus-errors.nix; cardano-binary-test = ./.plan.nix/cardano-binary-test.nix; plutus-core = ./.plan.nix/plutus-core.nix; + cardano-ledger-alonzo = ./.plan.nix/cardano-ledger-alonzo.nix; byron-spec-chain = ./.plan.nix/byron-spec-chain.nix; cardano-crypto-praos = ./.plan.nix/cardano-crypto-praos.nix; plutus-ledger = ./.plan.nix/plutus-ledger.nix; + ouroboros-consensus-byron = ./.plan.nix/ouroboros-consensus-byron.nix; quickcheck-dynamic = ./.plan.nix/quickcheck-dynamic.nix; contra-tracer = ./.plan.nix/contra-tracer.nix; shelley-spec-non-integral = ./.plan.nix/shelley-spec-non-integral.nix; @@ -731,6 +740,7 @@ plutus-doc = ./.plan.nix/plutus-doc.nix; plutus-metatheory = ./.plan.nix/plutus-metatheory.nix; cardano-binary = ./.plan.nix/cardano-binary.nix; + cardano-api = ./.plan.nix/cardano-api.nix; cardano-slotting = ./.plan.nix/cardano-slotting.nix; plutus-benchmark = ./.plan.nix/plutus-benchmark.nix; cardano-crypto-class = ./.plan.nix/cardano-crypto-class.nix; @@ -740,14 +750,15 @@ ouroboros-network-testing = ./.plan.nix/ouroboros-network-testing.nix; typed-protocols = ./.plan.nix/typed-protocols.nix; io-sim = ./.plan.nix/io-sim.nix; - cardano-ledger = ./.plan.nix/cardano-ledger.nix; purescript-bridge = ./.plan.nix/purescript-bridge.nix; marlowe = ./.plan.nix/marlowe.nix; + ouroboros-consensus-cardano = ./.plan.nix/ouroboros-consensus-cardano.nix; ouroboros-network = ./.plan.nix/ouroboros-network.nix; cardano-crypto = ./.plan.nix/cardano-crypto.nix; plutus-tx = ./.plan.nix/plutus-tx.nix; prettyprinter-configurable = ./.plan.nix/prettyprinter-configurable.nix; word-array = ./.plan.nix/word-array.nix; + cardano-ledger-byron-test = ./.plan.nix/cardano-ledger-byron-test.nix; plutus-pab = ./.plan.nix/plutus-pab.nix; cardano-prelude-test = ./.plan.nix/cardano-prelude-test.nix; plutus-chain-index = ./.plan.nix/plutus-chain-index.nix; @@ -762,8 +773,12 @@ marlowe-symbolic = ./.plan.nix/marlowe-symbolic.nix; plutus-ledger-api = ./.plan.nix/plutus-ledger-api.nix; marlowe-dashboard-server = ./.plan.nix/marlowe-dashboard-server.nix; + ouroboros-consensus = ./.plan.nix/ouroboros-consensus.nix; playground-common = ./.plan.nix/playground-common.nix; io-sim-classes = ./.plan.nix/io-sim-classes.nix; + shelley-spec-ledger-test = ./.plan.nix/shelley-spec-ledger-test.nix; + cardano-ledger-byron = ./.plan.nix/cardano-ledger-byron.nix; + ouroboros-consensus-shelley = ./.plan.nix/ouroboros-consensus-shelley.nix; }; }; modules = [ @@ -780,9 +795,7 @@ "cardano-crypto-wrapper" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "cardano-ledger-test" = { - flags = { "development" = lib.mkOverride 900 false; }; - }; + "hedgehog-extras" = { flags = {}; }; "plutus-use-cases" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; @@ -795,6 +808,10 @@ }; "typed-protocols-examples" = { flags = {}; }; "cardano-ledger-shelley-ma" = { flags = {}; }; + "cardano-ledger-core" = { flags = {}; }; + "strict-containers" = { + flags = { "development" = lib.mkOverride 900 false; }; + }; "goblins" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -803,11 +820,15 @@ }; "Win32-network" = { flags = { "demo" = lib.mkOverride 900 false; }; }; "freer-extras" = { flags = {}; }; + "cardano-crypto-tests" = { + flags = { "development" = lib.mkOverride 900 false; }; + }; "plutus-errors" = { flags = {}; }; "cardano-binary-test" = { flags = { "development" = lib.mkOverride 900 false; }; }; "plutus-core" = { flags = {}; }; + "cardano-ledger-alonzo" = { flags = {}; }; "byron-spec-chain" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -820,6 +841,9 @@ "plutus-ledger" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; + "ouroboros-consensus-byron" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "quickcheck-dynamic" = { flags = {}; }; "contra-tracer" = { flags = {}; }; "shelley-spec-non-integral" = { @@ -834,6 +858,7 @@ "cardano-binary" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "cardano-api" = { flags = {}; }; "cardano-slotting" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -851,16 +876,13 @@ "ouroboros-network-testing" = { flags = {}; }; "typed-protocols" = { flags = {}; }; "io-sim" = { flags = { "asserts" = lib.mkOverride 900 false; }; }; - "cardano-ledger" = { - flags = { - "development" = lib.mkOverride 900 false; - "test-normal-form" = lib.mkOverride 900 false; - }; - }; "purescript-bridge" = { flags = {}; }; "marlowe" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; + "ouroboros-consensus-cardano" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "ouroboros-network" = { flags = { "cddl" = lib.mkOverride 900 true; @@ -877,6 +899,9 @@ "plutus-tx" = { flags = {}; }; "prettyprinter-configurable" = { flags = {}; }; "word-array" = { flags = {}; }; + "cardano-ledger-byron-test" = { + flags = { "development" = lib.mkOverride 900 false; }; + }; "plutus-pab" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; @@ -911,6 +936,9 @@ "marlowe-symbolic" = { flags = {}; }; "plutus-ledger-api" = { flags = {}; }; "marlowe-dashboard-server" = { flags = {}; }; + "ouroboros-consensus" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "playground-common" = { flags = {}; }; "io-sim-classes" = { flags = { @@ -918,6 +946,18 @@ "checktvarinvariant" = lib.mkOverride 900 false; }; }; + "shelley-spec-ledger-test" = { + flags = { "development" = lib.mkOverride 900 false; }; + }; + "cardano-ledger-byron" = { + flags = { + "development" = lib.mkOverride 900 false; + "test-normal-form" = lib.mkOverride 900 false; + }; + }; + "ouroboros-consensus-shelley" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; }; }) ]; diff --git a/plutus-pab/plutus-pab.cabal b/plutus-pab/plutus-pab.cabal index c922be22a3c..8096e69f801 100644 --- a/plutus-pab/plutus-pab.cabal +++ b/plutus-pab/plutus-pab.cabal @@ -125,6 +125,7 @@ library async -any, base >=4.7 && <5, bytestring -any, + cardano-api -any, cardano-crypto -any, cardano-prelude -any, cardano-slotting -any, diff --git a/plutus-pab/src/Cardano/Protocol/Socket/Client.hs b/plutus-pab/src/Cardano/Protocol/Socket/Client.hs index e9a3febc609..791d91ecd17 100644 --- a/plutus-pab/src/Cardano/Protocol/Socket/Client.hs +++ b/plutus-pab/src/Cardano/Protocol/Socket/Client.hs @@ -78,6 +78,7 @@ runChainSync socketPath slotConfig onNewBlock = do (connectToNode (localSnocket iocp socketPath) unversionedHandshakeCodec + noTimeLimitsHandshake (cborTermVersionDataCodec unversionedProtocolDataCodec) nullNetworkConnectTracers acceptableVersion @@ -148,6 +149,7 @@ runTxSender socketPath = do (connectToNode (localSnocket iocp socketPath) unversionedHandshakeCodec + noTimeLimitsHandshake (cborTermVersionDataCodec unversionedProtocolDataCodec) nullNetworkConnectTracers acceptableVersion diff --git a/plutus-pab/src/Cardano/Protocol/Socket/Server.hs b/plutus-pab/src/Cardano/Protocol/Socket/Server.hs index 5e727dfc2cb..b81121e622f 100644 --- a/plutus-pab/src/Cardano/Protocol/Socket/Server.hs +++ b/plutus-pab/src/Cardano/Protocol/Socket/Server.hs @@ -395,6 +395,7 @@ protocolLoop socketPath internalState = liftIO $ withIOManager $ \iocp -> do (AcceptedConnectionsLimit maxBound maxBound 0) (localAddressFromPath socketPath) unversionedHandshakeCodec + noTimeLimitsHandshake (cborTermVersionDataCodec unversionedProtocolDataCodec) acceptableVersion (unversionedProtocol (SomeResponderApplication (application internalState))) diff --git a/stack.yaml b/stack.yaml index 57c6161e24e..4518fd114e6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-17.2 +resolver: lts-17.14 packages: - doc @@ -68,6 +68,9 @@ extra-deps: - witherable-0.4.1 - canonical-json-0.6.0.0@sha256:9021f435ccb884a3b4c55bcc6b50eb19d5fc3cc3f29d5fcbdef016f5bbae23a2,3488 - statistics-linreg-0.3@sha256:95c6efe6c7f6b26bc6e9ada90ab2d18216371cf59a6ef2b517b4a6fd35d9a76f,2544 +- partial-order-0.2.0.0@sha256:a0d6ddc9ebcfa965a5cbcff1d06d46a79d44ea5a0335c583c2a51bcb41334487,2275 +- streaming-binary-0.2.2.0@sha256:09b9a9b0291199c5808e88dcf9c93e7b336e740c71efeafd7c835b59794a8c90,1034 +- transformers-except-0.1.1@sha256:6c12ef8e632a10440968cd541e75074bd6ef4b5ff4012677f8f8189d7b2d0df6,1387 # cabal.project is the source of truth for these pins, they are explained there # and need to be kept in sync. @@ -75,36 +78,42 @@ extra-deps: commit: 95e5d7488451e43062ca84d5376b3adcc465f1cd - git: https://github.com/shmish111/purescript-bridge.git commit: 6a92d7853ea514be8b70bab5e72077bf5a510596 -- git: https://github.com/eskimor/servant-purescript.git - commit: 6454d5bcb9aa2a5d6e3a3dc935423b67b6f3993c +- git: https://github.com/shmish111/servant-purescript.git + commit: a76104490499aa72d40c2790d10e9383e0dbde63 - git: https://github.com/input-output-hk/cardano-crypto.git - commit: f73079303f663e028288f9f4a9e08bcca39a923e + commit: ce8f1934e4b6252084710975bd9bbc0a4648ece4 - git: https://github.com/input-output-hk/ouroboros-network - commit: 6cb9052bde39472a0555d19ade8a42da63d3e904 + commit: e50613562d6d4a0f933741fcf590b0f69a1eda67 subdirs: - typed-protocols - typed-protocols-examples - ouroboros-network + - ouroboros-network-testing - ouroboros-network-framework + - ouroboros-consensus + - ouroboros-consensus-byron + - ouroboros-consensus-cardano + - ouroboros-consensus-shelley - io-sim - io-sim-classes - network-mux - - Win32-network - git: https://github.com/input-output-hk/cardano-prelude - commit: ee4e7b547a991876e6b05ba542f4e62909f4a571 + commit: fd773f7a58412131512b9f694ab95653ac430852 subdirs: - cardano-prelude - cardano-prelude-test - git: https://github.com/input-output-hk/cardano-base - commit: 4251c0bb6e4f443f00231d28f5f70d42876da055 + commit: a715c7f420770b70bbe95ca51d3dec83866cb1bd subdirs: - binary + - binary/test + - slotting - cardano-crypto-class - cardano-crypto-tests - cardano-crypto-praos - - slotting + - strict-containers - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 097890495cbb0e8b62106bcd090a5721c3f4b36f + commit: a3ef848542961079b7cd53d599e5385198a3035c subdirs: - byron/chain/executable-spec - byron/crypto @@ -116,14 +125,25 @@ extra-deps: - 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 - shelley-ma/impl + - cardano-ledger-core + - alonzo/impl - git: https://github.com/input-output-hk/iohk-monitoring-framework - commit: a89c38ed5825ba17ca79fddb85651007753d699d + commit: 808724ff8a19a33d0ed06f9ef59fbd900b08553c subdirs: - contra-tracer - iohk-monitoring - tracer-transformers - plugins/backend-ekg +- git: https://github.com/input-output-hk/cardano-node.git + commit: b3cabae6b3bf30a0b1b4e78bc4b67282dabad0a6 + subdirs: + - cardano-api +- git: https://github.com/input-output-hk/Win32-network + commit: 94153b676617f8f33abe8d8182c37377d2784bd1 +- git: https://github.com/input-output-hk/hedgehog-extras + commit: 8bcd3c9dc22cc44f9fcfe161f4638a384fc7a187 allow-newer: true