From be7d80d82799ba97f76c332471c9028b7ce7cc69 Mon Sep 17 00:00:00 2001 From: Hai Nguyen Quang Date: Thu, 23 Dec 2021 02:26:15 +0700 Subject: [PATCH 1/3] re-organize dependencies --- cabal.project | 276 +++++++++++++++++------------------ flake.lock | 4 +- nix/pkgs/haskell/haskell.nix | 26 ++-- shell.nix | 4 +- 4 files changed, 149 insertions(+), 161 deletions(-) diff --git a/cabal.project b/cabal.project index 6b95cba480..93a28bbc17 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ --- Bump this if you need newer packages +-- Bump this if you need newer packages. index-state: 2021-10-20T00:00:00Z packages: doc @@ -23,29 +23,16 @@ write-ghc-environment-files: never tests: true benchmarks: true --- The only sensible test display option +-- The only sensible test display option. test-show-details: streaming allow-newer: - -- Copied from plutus-core - size-based:template-haskell - , ouroboros-consensus-byron:formatting - , beam-core:aeson - , beam-sqlite:aeson - , beam-sqlite:dlist - , beam-migrate:aeson - --- Copied from plutus-core + size-based:template-haskell + constraints: - -- big breaking change here, inline-r doens't have an upper bound - singletons < 3.0 - -- bizarre issue: in earlier versions they define their own 'GEq', in newer - -- ones they reuse the one from 'some', but there isn't e.g. a proper version - -- constraint from dependent-sum-template (which is the library we actually use). - , dependent-sum > 0.6.2.0 -- Newer Hashable have instances for Set, which breaks beam-migrate -- which declares its own instances of Hashable Set - , hashable < 1.3.4.0 + hashable < 1.3.4.0 -- These packages appear in our dependency tree and are very slow to build. -- Empirically, turning off optimization shaves off ~50% build time. @@ -70,184 +57,187 @@ package cardano-wallet-launcher package cardano-wallet-core-integration optimization: False --- Copied from plutus-core +-- Direct dependency. +-- Are you thinking of updating this tag to some other commit? +-- Please ensure that the commit you are about to use is the latest one from +-- the *develop* branch of this repo: +-- * +-- (not master!) +-- +-- In particular we rely on the code from this PR: +-- * +-- being merged. source-repository-package type: git - location: https://github.com/Quid2/flat.git - tag: ee59880f47ab835dbd73bea0847dab7869fc20d8 + location: https://github.com/input-output-hk/iohk-monitoring-framework + tag: 46f994e216a1f8b36fe4669b47b2a7011b0e153c + subdir: + contra-tracer + iohk-monitoring + tracer-transformers + plugins/backend-ekg --- TODO replace with something more sustainable (and maintained) +-- Direct dependency. source-repository-package type: git - location: https://github.com/input-output-hk/purescript-bridge.git - tag: 366fc70b341e2633f3ad0158a577d52e1cd2b138 - + location: https://github.com/input-output-hk/plutus + tag: cc72a56eafb02333c96f662581b57504f8f8992f + subdir: + plutus-core + plutus-ledger-api + plutus-tx + plutus-tx-plugin + prettyprinter-configurable + stubs/plutus-ghc-stub + word-array + +-- Should follow plutus. source-repository-package type: git - location: https://github.com/input-output-hk/servant-purescript.git - tag: ebea59c7bdfc0338d83fca772b9a57e28560bcde + location: https://github.com/Quid2/flat + tag: ee59880f47ab835dbd73bea0847dab7869fc20d8 --- Copied from plutus-core +-- Direct dependency. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-crypto.git - tag: f73079303f663e028288f9f4a9e08bcca39a923e - --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q + location: https://github.com/input-output-hk/servant-purescript + tag: ebea59c7bdfc0338d83fca772b9a57e28560bcde --- Copied from plutus-core +-- Direct dependency. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-base - tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0 - --sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4 - subdir: - base-deriving-via - binary - binary/test - cardano-crypto-class - cardano-crypto-praos - cardano-crypto-tests - measures - orphans-deriving-via - slotting - strict-containers + location: https://github.com/input-output-hk/purescript-bridge + tag: 366fc70b341e2633f3ad0158a577d52e1cd2b138 --- Copied from plutus-core +-- Direct dependency. +-- Compared to others, cardano-wallet doesn't bump dependencies very often. +-- Making it a good place to start when bumping dependencies. +-- As, for example, bumping the node first highly risks breaking API with the wallet. +-- Unless early bug fixes are required, this is fine as the wallet tracks stable releases of the node. +-- And it is indeed nice for plutus-apps to track stable releases of the node too. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-prelude - tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555 - --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj + location: https://github.com/input-output-hk/cardano-wallet + tag: a5085acbd2670c24251cf8d76a4e83c77a2679ba subdir: - cardano-prelude - cardano-prelude-test + lib/cli + lib/core + lib/core-integration + lib/dbvar + lib/launcher + lib/numeric + lib/shelley + lib/strict-non-empty-containers + lib/test-utils + lib/text-class +-- Should follow cardano-wallet. +-- Currently tracking v1.33.0. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-addresses - tag: d2f86caa085402a953920c6714a0de6a50b655ec + location: https://github.com/input-output-hk/cardano-node + tag: 814df2c146f5d56f8c35a681fe75e85b905aed5d subdir: - core - command-line + cardano-api +-- Should follow cardano-wallet. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-wallet - tag: 760140e238a5fbca61d1b286d7a80ece058dc729 - --sha256: 014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6 + location: https://github.com/input-output-hk/cardano-ledger + tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5 subdir: - lib/dbvar - lib/text-class - lib/strict-non-empty-containers - lib/core - lib/test-utils - lib/numeric - lib/launcher - lib/core-integration - lib/cli - lib/shelley + eras/alonzo/impl + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/crypto/test + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/byron/ledger/impl/test + eras/shelley/impl + eras/shelley/test-suite + eras/shelley-ma/impl + libs/cardano-data + libs/cardano-ledger-core + libs/cardano-ledger-pretty + libs/cardano-protocol-tpraos + libs/compact-map + libs/non-integral + libs/set-algebra + libs/small-steps + libs/small-steps-test +-- Should follow cardano-wallet. source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: d613de3d872ec8b4a5da0c98afb443f322dc4dab - --sha256: 0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl + tag: d2d219a86cda42787325bb8c20539a75c2667132 subdir: + io-classes + io-sim monoidal-synchronisation - typed-protocols - typed-protocols-cborg - typed-protocols-examples - ouroboros-network - ouroboros-network-testing - ouroboros-network-framework + network-mux + ntp-client ouroboros-consensus ouroboros-consensus-byron ouroboros-consensus-cardano + ouroboros-consensus-protocol ouroboros-consensus-shelley - io-sim - io-classes - network-mux - ntp-client + ouroboros-network + ouroboros-network-framework + ouroboros-network-testing + strict-stm + typed-protocols + typed-protocols-cborg + typed-protocols-examples +-- Should follow cardano-wallet. source-repository-package type: git - location: https://github.com/input-output-hk/iohk-monitoring-framework - -- Important Note: Read below, before changing this! - tag: 46f994e216a1f8b36fe4669b47b2a7011b0e153c - -- Are you thinking of updating this tag to some other commit? Please - -- ensure that the commit you are about to use is the latest one from - -- the *develop* branch of this repo: - -- * - -- (not master!) - -- - -- In particular we rely on the code from this PR: - -- * - -- being merged. + location: https://github.com/input-output-hk/cardano-base + tag: 41545ba3ac6b3095966316a99883d678b5ab8da8 subdir: - iohk-monitoring - tracer-transformers - contra-tracer - plugins/backend-aggregation - plugins/backend-ekg - plugins/backend-monitoring - plugins/backend-trace-forwarder - plugins/scribe-systemd + base-deriving-via + binary + binary/test + cardano-crypto-class + cardano-crypto-praos + measures + orphans-deriving-via + slotting + strict-containers +-- Should follow cardano-wallet. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-ledger - tag: bf008ce028751cae9fb0b53c3bef20f07c06e333 - --sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx + location: https://github.com/input-output-hk/cardano-prelude + tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555 subdir: - byron/ledger/impl - cardano-ledger-core - cardano-protocol-tpraos - eras/alonzo/impl - eras/byron/chain/executable-spec - eras/byron/crypto - eras/byron/crypto/test - eras/byron/ledger/executable-spec - eras/byron/ledger/impl/test - eras/shelley/impl - eras/shelley-ma/impl - eras/shelley/chain-and-ledger/executable-spec - eras/shelley/test-suite - shelley/chain-and-ledger/shelley-spec-ledger-test - libs/non-integral - libs/small-steps - libs/cardano-ledger-pretty - semantics/small-steps-test + cardano-prelude + cardano-prelude-test +-- Should follow cardano-wallet. source-repository-package type: git - location: https://github.com/input-output-hk/cardano-node.git - tag: 4f65fb9a27aa7e3a1873ab4211e412af780a3648 - --sha256: 00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx - subdir: - cardano-api + location: https://github.com/input-output-hk/cardano-crypto + tag: f73079303f663e028288f9f4a9e08bcca39a923e +-- Should follow cardano-wallet. source-repository-package type: git - location: https://github.com/input-output-hk/Win32-network - tag: 3825d3abf75f83f406c1f7161883c438dac7277d + location: https://github.com/input-output-hk/cardano-addresses + tag: 71006f9eb956b0004022e80aadd4ad50d837b621 + subdir: + command-line + core +-- Should follow cardano-wallet. source-repository-package type: git location: https://github.com/input-output-hk/goblins tag: cde90a2b27f79187ca8310b6549331e59595e7ba --- A lot of plutus-apps dependencies have to be syncronized with the dependencies of --- plutus. If you update plutus, please make sure that all dependencies of plutus --- are also updated +-- Should follow cardano-wallet. source-repository-package - type: git - location: https://github.com/input-output-hk/plutus - tag: 65bad0fd53e432974c3c203b1b1999161b6c2dce - subdir: - plutus-ledger-api - word-array - prettyprinter-configurable - stubs/plutus-ghc-stub - plutus-core - plutus-tx - plutus-tx-plugin + type: git + location: https://github.com/input-output-hk/Win32-network + tag: 3825d3abf75f83f406c1f7161883c438dac7277d diff --git a/flake.lock b/flake.lock index 22f9ba309e..7b72279a53 100644 --- a/flake.lock +++ b/flake.lock @@ -165,10 +165,10 @@ "flake": false, "locked": { "lastModified": 1640168705, - "narHash": "sha256-0l8kWR9R0XkkJInbKP/1l8e5jCVhZQ7fVo7IRaXepQ8=", + "narHash": "sha256-Pl3M9rMEoiEKRsTdDr4JwNnRo5Xs4uN66uVpOfaMCfE=", "owner": "input-output-hk", "repo": "plutus", - "rev": "65bad0fd53e432974c3c203b1b1999161b6c2dce", + "rev": "cc72a56eafb02333c96f662581b57504f8f8992f", "type": "github" }, "original": { diff --git a/nix/pkgs/haskell/haskell.nix b/nix/pkgs/haskell/haskell.nix index acbf11eb05..6c4a1a5aa3 100644 --- a/nix/pkgs/haskell/haskell.nix +++ b/nix/pkgs/haskell/haskell.nix @@ -38,23 +38,21 @@ let # If true, we check that the generated files are correct. Set in the CI so we don't make mistakes. inherit checkMaterialization; sha256map = { - "https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm"; - "https://github.com/input-output-hk/purescript-bridge.git"."366fc70b341e2633f3ad0158a577d52e1cd2b138" = "18j0rysfccbmfpbw2d1rsjkpd5h84alpsn6b5rwzdxw9h5vqi9m5"; - "https://github.com/input-output-hk/servant-purescript.git"."ebea59c7bdfc0338d83fca772b9a57e28560bcde" = "0gjcq4y61kwb4w70pnswn5dp23wd13dac8d9hz84j374cm1kshsn"; - "https://github.com/input-output-hk/cardano-base"."654f5b7c76f7cc57900b4ddc664a82fc3b925fb0" = "0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4"; - "https://github.com/input-output-hk/cardano-crypto.git"."f73079303f663e028288f9f4a9e08bcca39a923e" = "1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q"; - "https://github.com/input-output-hk/cardano-ledger-specs"."bf008ce028751cae9fb0b53c3bef20f07c06e333" = "0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx"; + "https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0"; + "https://github.com/input-output-hk/plutus"."cc72a56eafb02333c96f662581b57504f8f8992f" = "1w89ikv3jsg5x9xf7qpcjnix3nf016z0xpf48q5238h4ngvcqp9y"; + "https://github.com/Quid2/flat"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm"; + "https://github.com/input-output-hk/servant-purescript"."ebea59c7bdfc0338d83fca772b9a57e28560bcde" = "0gjcq4y61kwb4w70pnswn5dp23wd13dac8d9hz84j374cm1kshsn"; + "https://github.com/input-output-hk/purescript-bridge"."366fc70b341e2633f3ad0158a577d52e1cd2b138" = "18j0rysfccbmfpbw2d1rsjkpd5h84alpsn6b5rwzdxw9h5vqi9m5"; + "https://github.com/input-output-hk/cardano-wallet"."a5085acbd2670c24251cf8d76a4e83c77a2679ba" = "1apzfy7qdgf6l0lb3icqz3rvaq2w3a53xq6wvhqnbfi8i7cacy03"; + "https://github.com/input-output-hk/cardano-node"."814df2c146f5d56f8c35a681fe75e85b905aed5d" = "1hr00wqzmcyc3x0kp2hyw78rfmimf6z4zd4vv85b9zv3nqbjgrik"; + "https://github.com/input-output-hk/cardano-ledger"."1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5" = "0avzyiqq0m8njd41ck9kpn992yq676b1az9xs77977h7cf85y4wm"; + "https://github.com/input-output-hk/ouroboros-network"."d2d219a86cda42787325bb8c20539a75c2667132" = "18xk7r0h2pxrbx76d6flsxifh0a9rz1cj1rjqs1pbs5kdmy8b7kx"; + "https://github.com/input-output-hk/cardano-base"."41545ba3ac6b3095966316a99883d678b5ab8da8" = "0icq9y3nnl42fz536da84414av36g37894qnyw4rk3qkalksqwir"; "https://github.com/input-output-hk/cardano-prelude"."bb4ed71ba8e587f672d06edf9d2e376f4b055555" = "00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj"; + "https://github.com/input-output-hk/cardano-crypto"."f73079303f663e028288f9f4a9e08bcca39a923e" = "1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q"; + "https://github.com/input-output-hk/cardano-addresses"."71006f9eb956b0004022e80aadd4ad50d837b621" = "11dl3fmq7ry5wdmz8kw07ji8yvrxnrsf7pgilw5q9mi4aqyvnaqk"; "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg"; - "https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0"; - "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r"; - "https://github.com/input-output-hk/ouroboros-network"."d613de3d872ec8b4a5da0c98afb443f322dc4dab" = "0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl"; - "https://github.com/input-output-hk/cardano-node.git"."4f65fb9a27aa7e3a1873ab4211e412af780a3648" = "00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx"; "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx"; - "https://github.com/input-output-hk/hedgehog-extras"."edf6945007177a638fbeb8802397f3a6f4e47c14" = "0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9"; - "https://github.com/input-output-hk/cardano-wallet"."760140e238a5fbca61d1b286d7a80ece058dc729" = "014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6"; - "https://github.com/input-output-hk/cardano-addresses"."d2f86caa085402a953920c6714a0de6a50b655ec" = "0p6jbnd7ky2yf7bwb1350k8880py8dgqg39k49q02a6ij4ld01ay"; - "https://github.com/input-output-hk/plutus"."65bad0fd53e432974c3c203b1b1999161b6c2dce" = "03x5vsjlbj4favghwrb14n6bkiwpypzjinw94hj7klai3xcj8pyj"; }; # Configuration settings needed for cabal configure to work when cross compiling # for windows. We can't use `modules` for these as `modules` are only applied diff --git a/shell.nix b/shell.nix index 85b9ca1ed7..3fe996b491 100644 --- a/shell.nix +++ b/shell.nix @@ -14,8 +14,8 @@ let cardano-wallet = import (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-wallet"; - rev = "2fdc9a5aa44d8bc8bed0da74151ea1016fc30508"; - sha256 = "09zz1488as64l8w6kk1ijhs4y4rsi47ashsb3gbikq3fn22mc8xb"; + rev = "a5085acbd2670c24251cf8d76a4e83c77a2679ba"; + sha256 = "1apzfy7qdgf6l0lb3icqz3rvaq2w3a53xq6wvhqnbfi8i7cacy03"; }) { }; cardano-node = import From 9ba26df1fced18913c1af50f6d009091d6010c2c Mon Sep 17 00:00:00 2001 From: Hai Nguyen Quang Date: Tue, 18 Jan 2022 19:17:46 +0700 Subject: [PATCH 2/3] fix minor API breaking changes --- plutus-chain-index-core/src/Cardano/Protocol/Socket/Type.hs | 2 +- plutus-ledger/src/Ledger/Tx/CardanoAPITemp.hs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plutus-chain-index-core/src/Cardano/Protocol/Socket/Type.hs b/plutus-chain-index-core/src/Cardano/Protocol/Socket/Type.hs index 9952ba1d68..9580e38734 100644 --- a/plutus-chain-index-core/src/Cardano/Protocol/Socket/Type.hs +++ b/plutus-chain-index-core/src/Cardano/Protocol/Socket/Type.hs @@ -37,8 +37,8 @@ import Ouroboros.Consensus.Byron.Ledger qualified as Byron import Ouroboros.Consensus.Cardano.Block (CardanoBlock, CodecConfig (..)) import Ouroboros.Consensus.Network.NodeToClient (ClientCodecs, clientCodecs) import Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToClientVersion, supportedNodeToClientVersions) +import Ouroboros.Consensus.Shelley.Eras (StandardCrypto) import Ouroboros.Consensus.Shelley.Ledger qualified as Shelley -import Ouroboros.Consensus.Shelley.Protocol (StandardCrypto) import Ouroboros.Network.Block (HeaderHash, Point, StandardHash) import Ouroboros.Network.Magic (NetworkMagic (..)) import Ouroboros.Network.Mux diff --git a/plutus-ledger/src/Ledger/Tx/CardanoAPITemp.hs b/plutus-ledger/src/Ledger/Tx/CardanoAPITemp.hs index f4f0e222aa..3af52af547 100644 --- a/plutus-ledger/src/Ledger/Tx/CardanoAPITemp.hs +++ b/plutus-ledger/src/Ledger/Tx/CardanoAPITemp.hs @@ -20,7 +20,6 @@ import Cardano.Ledger.Crypto (StandardCrypto) import Ouroboros.Consensus.Shelley.Eras (StandardAlonzo) import Cardano.Ledger.Core qualified as Ledger -import Cardano.Ledger.Shelley.Constraints qualified as Ledger import Cardano.Ledger.Alonzo.Data qualified as Alonzo import Cardano.Ledger.Alonzo.Tx qualified as Alonzo @@ -133,8 +132,7 @@ toShelleyWithdrawal withdrawals = | (stakeAddr, value, _) <- withdrawals ] toShelleyTxOut :: forall era ledgerera. - (ShelleyLedgerEra era ~ ledgerera, - IsShelleyBasedEra era, Ledger.ShelleyBased ledgerera) + (ShelleyLedgerEra era ~ ledgerera, IsShelleyBasedEra era) => TxOut CtxTx era -> Ledger.TxOut ledgerera toShelleyTxOut (TxOut _ (TxOutAdaOnly AdaOnlyInByronEra _) _) = case shelleyBasedEra :: ShelleyBasedEra era of {} From ede50f5eea67585be962d6c40b7fc6e664a5db6e Mon Sep 17 00:00:00 2001 From: Hai Nguyen Quang Date: Tue, 18 Jan 2022 19:17:52 +0700 Subject: [PATCH 3/3] updateMaterialized --- .../.plan.nix/Win32-network.nix | 4 +- .../.plan.nix/base-deriving-via.nix | 4 +- .../.plan.nix/byron-spec-chain.nix | 6 +- .../.plan.nix/byron-spec-ledger.nix | 6 +- .../.plan.nix/cardano-addresses-cli.nix | 6 +- .../.plan.nix/cardano-addresses.nix | 6 +- .../.plan.nix/cardano-api.nix | 11 +- .../.plan.nix/cardano-binary-test.nix | 4 +- .../.plan.nix/cardano-binary.nix | 4 +- .../.plan.nix/cardano-crypto-class.nix | 4 +- .../.plan.nix/cardano-crypto-praos.nix | 4 +- .../.plan.nix/cardano-crypto-test.nix | 4 +- .../.plan.nix/cardano-crypto-tests.nix | 105 ---------------- .../.plan.nix/cardano-crypto-wrapper.nix | 4 +- .../.plan.nix/cardano-crypto.nix | 4 +- .../.plan.nix/cardano-data.nix | 80 ++++++++++++ .../.plan.nix/cardano-ledger-alonzo.nix | 7 +- .../.plan.nix/cardano-ledger-byron-test.nix | 4 +- .../.plan.nix/cardano-ledger-byron.nix | 7 +- .../.plan.nix/cardano-ledger-core.nix | 9 +- .../.plan.nix/cardano-ledger-pretty.nix | 7 +- .../.plan.nix/cardano-ledger-shelley-ma.nix | 6 +- .../.plan.nix/cardano-ledger-shelley-test.nix | 13 +- .../.plan.nix/cardano-ledger-shelley.nix | 20 +-- .../.plan.nix/cardano-numeric.nix | 4 +- .../.plan.nix/cardano-prelude-test.nix | 4 +- .../.plan.nix/cardano-prelude.nix | 4 +- .../.plan.nix/cardano-protocol-tpraos.nix | 8 +- .../.plan.nix/cardano-slotting.nix | 4 +- .../.plan.nix/cardano-wallet-cli.nix | 6 +- .../cardano-wallet-core-integration.nix | 6 +- .../.plan.nix/cardano-wallet-core.nix | 15 +-- .../.plan.nix/cardano-wallet-launcher.nix | 9 +- .../.plan.nix/cardano-wallet-test-utils.nix | 6 +- .../.plan.nix/cardano-wallet.nix | 12 +- .../.plan.nix/compact-map.nix | 110 ++++++++++++++++ .../.plan.nix/contra-tracer.nix | 4 +- .../materialized-darwin/.plan.nix/dbvar.nix | 5 +- .../materialized-darwin/.plan.nix/flat.nix | 4 +- .../.plan.nix/io-classes.nix | 1 - .../materialized-darwin/.plan.nix/io-sim.nix | 1 + .../.plan.nix/iohk-monitoring.nix | 4 +- .../.plan.nix/lobemo-backend-aggregation.nix | 67 ---------- .../.plan.nix/lobemo-backend-ekg.nix | 4 +- .../.plan.nix/lobemo-backend-monitoring.nix | 106 ---------------- .../lobemo-backend-trace-forwarder.nix | 67 ---------- .../.plan.nix/lobemo-scribe-systemd.nix | 68 ---------- .../.plan.nix/measures.nix | 4 +- .../.plan.nix/network-mux.nix | 3 + .../.plan.nix/non-integral.nix | 4 +- .../.plan.nix/orphans-deriving-via.nix | 4 +- .../.plan.nix/ouroboros-consensus-cardano.nix | 2 + .../ouroboros-consensus-protocol.nix | 74 +++++++++++ .../.plan.nix/ouroboros-consensus-shelley.nix | 4 +- .../.plan.nix/ouroboros-consensus.nix | 2 + .../.plan.nix/ouroboros-network-framework.nix | 5 + .../.plan.nix/ouroboros-network-testing.nix | 22 ++++ .../.plan.nix/ouroboros-network.nix | 9 +- .../.plan.nix/plutus-core.nix | 4 +- .../.plan.nix/plutus-ghc-stub.nix | 4 +- .../.plan.nix/plutus-ledger-api.nix | 4 +- .../.plan.nix/plutus-tx-plugin.nix | 4 +- .../.plan.nix/plutus-tx.nix | 4 +- .../.plan.nix/prettyprinter-configurable.nix | 4 +- .../.plan.nix/purescript-bridge.nix | 4 +- .../.plan.nix/servant-purescript.nix | 4 +- .../.plan.nix/set-algebra.nix | 66 ++++++++++ .../.plan.nix/shelley-spec-ledger-test.nix | 86 ------------- .../.plan.nix/shelley-spec-ledger.nix | 119 ------------------ .../.plan.nix/small-steps-test.nix | 6 +- .../.plan.nix/small-steps.nix | 21 +--- .../.plan.nix/strict-containers.nix | 4 +- .../.plan.nix/strict-non-empty-containers.nix | 4 +- .../.plan.nix/strict-stm.nix | 56 +++++++++ .../.plan.nix/text-class.nix | 6 +- .../.plan.nix/tracer-transformers.nix | 4 +- .../.plan.nix/word-array.nix | 4 +- .../haskell/materialized-darwin/default.nix | 67 +++++----- .../.plan.nix/Win32-network.nix | 4 +- .../.plan.nix/base-deriving-via.nix | 4 +- .../.plan.nix/byron-spec-chain.nix | 6 +- .../.plan.nix/byron-spec-ledger.nix | 6 +- .../.plan.nix/cardano-addresses-cli.nix | 6 +- .../.plan.nix/cardano-addresses.nix | 6 +- .../.plan.nix/cardano-api.nix | 11 +- .../.plan.nix/cardano-binary-test.nix | 4 +- .../.plan.nix/cardano-binary.nix | 4 +- .../.plan.nix/cardano-crypto-class.nix | 4 +- .../.plan.nix/cardano-crypto-praos.nix | 4 +- .../.plan.nix/cardano-crypto-test.nix | 4 +- .../.plan.nix/cardano-crypto-tests.nix | 105 ---------------- .../.plan.nix/cardano-crypto-wrapper.nix | 4 +- .../.plan.nix/cardano-crypto.nix | 4 +- .../.plan.nix/cardano-data.nix | 80 ++++++++++++ .../.plan.nix/cardano-ledger-alonzo.nix | 7 +- .../.plan.nix/cardano-ledger-byron-test.nix | 4 +- .../.plan.nix/cardano-ledger-byron.nix | 7 +- .../.plan.nix/cardano-ledger-core.nix | 9 +- .../.plan.nix/cardano-ledger-pretty.nix | 7 +- .../.plan.nix/cardano-ledger-shelley-ma.nix | 6 +- .../.plan.nix/cardano-ledger-shelley-test.nix | 13 +- .../.plan.nix/cardano-ledger-shelley.nix | 20 +-- .../.plan.nix/cardano-numeric.nix | 4 +- .../.plan.nix/cardano-prelude-test.nix | 4 +- .../.plan.nix/cardano-prelude.nix | 4 +- .../.plan.nix/cardano-protocol-tpraos.nix | 8 +- .../.plan.nix/cardano-slotting.nix | 4 +- .../.plan.nix/cardano-wallet-cli.nix | 6 +- .../cardano-wallet-core-integration.nix | 6 +- .../.plan.nix/cardano-wallet-core.nix | 15 +-- .../.plan.nix/cardano-wallet-launcher.nix | 9 +- .../.plan.nix/cardano-wallet-test-utils.nix | 6 +- .../.plan.nix/cardano-wallet.nix | 12 +- .../.plan.nix/compact-map.nix | 110 ++++++++++++++++ .../.plan.nix/contra-tracer.nix | 4 +- .../materialized-linux/.plan.nix/dbvar.nix | 5 +- .../materialized-linux/.plan.nix/flat.nix | 4 +- .../.plan.nix/io-classes.nix | 1 - .../materialized-linux/.plan.nix/io-sim.nix | 1 + .../.plan.nix/iohk-monitoring.nix | 4 +- .../.plan.nix/lobemo-backend-aggregation.nix | 67 ---------- .../.plan.nix/lobemo-backend-ekg.nix | 4 +- .../.plan.nix/lobemo-backend-monitoring.nix | 106 ---------------- .../lobemo-backend-trace-forwarder.nix | 67 ---------- .../.plan.nix/lobemo-scribe-systemd.nix | 68 ---------- .../materialized-linux/.plan.nix/measures.nix | 4 +- .../.plan.nix/network-mux.nix | 3 + .../.plan.nix/non-integral.nix | 4 +- .../.plan.nix/orphans-deriving-via.nix | 4 +- .../.plan.nix/ouroboros-consensus-cardano.nix | 2 + .../ouroboros-consensus-protocol.nix | 74 +++++++++++ .../.plan.nix/ouroboros-consensus-shelley.nix | 4 +- .../.plan.nix/ouroboros-consensus.nix | 2 + .../.plan.nix/ouroboros-network-framework.nix | 5 + .../.plan.nix/ouroboros-network-testing.nix | 22 ++++ .../.plan.nix/ouroboros-network.nix | 9 +- .../.plan.nix/plutus-core.nix | 4 +- .../.plan.nix/plutus-ghc-stub.nix | 4 +- .../.plan.nix/plutus-ledger-api.nix | 4 +- .../.plan.nix/plutus-tx-plugin.nix | 4 +- .../.plan.nix/plutus-tx.nix | 4 +- .../.plan.nix/prettyprinter-configurable.nix | 4 +- .../.plan.nix/purescript-bridge.nix | 4 +- .../.plan.nix/servant-purescript.nix | 4 +- .../.plan.nix/set-algebra.nix | 66 ++++++++++ .../.plan.nix/shelley-spec-ledger-test.nix | 86 ------------- .../.plan.nix/shelley-spec-ledger.nix | 119 ------------------ .../.plan.nix/small-steps-test.nix | 6 +- .../.plan.nix/small-steps.nix | 21 +--- .../.plan.nix/strict-containers.nix | 4 +- .../.plan.nix/strict-non-empty-containers.nix | 4 +- .../.plan.nix/strict-stm.nix | 56 +++++++++ .../.plan.nix/text-class.nix | 6 +- .../.plan.nix/tracer-transformers.nix | 4 +- .../.plan.nix/word-array.nix | 4 +- .../haskell/materialized-linux/default.nix | 76 +++++------ .../.plan.nix/Win32-network.nix | 4 +- .../.plan.nix/base-deriving-via.nix | 4 +- .../.plan.nix/byron-spec-chain.nix | 6 +- .../.plan.nix/byron-spec-ledger.nix | 6 +- .../.plan.nix/cardano-addresses-cli.nix | 6 +- .../.plan.nix/cardano-addresses.nix | 6 +- .../.plan.nix/cardano-api.nix | 11 +- .../.plan.nix/cardano-binary-test.nix | 4 +- .../.plan.nix/cardano-binary.nix | 4 +- .../.plan.nix/cardano-crypto-class.nix | 4 +- .../.plan.nix/cardano-crypto-praos.nix | 4 +- .../.plan.nix/cardano-crypto-test.nix | 4 +- .../.plan.nix/cardano-crypto-tests.nix | 105 ---------------- .../.plan.nix/cardano-crypto-wrapper.nix | 4 +- .../.plan.nix/cardano-crypto.nix | 4 +- .../.plan.nix/cardano-data.nix | 80 ++++++++++++ .../.plan.nix/cardano-ledger-alonzo.nix | 7 +- .../.plan.nix/cardano-ledger-byron-test.nix | 4 +- .../.plan.nix/cardano-ledger-byron.nix | 7 +- .../.plan.nix/cardano-ledger-core.nix | 9 +- .../.plan.nix/cardano-ledger-pretty.nix | 7 +- .../.plan.nix/cardano-ledger-shelley-ma.nix | 6 +- .../.plan.nix/cardano-ledger-shelley-test.nix | 13 +- .../.plan.nix/cardano-ledger-shelley.nix | 20 +-- .../.plan.nix/cardano-numeric.nix | 4 +- .../.plan.nix/cardano-prelude-test.nix | 4 +- .../.plan.nix/cardano-prelude.nix | 4 +- .../.plan.nix/cardano-protocol-tpraos.nix | 8 +- .../.plan.nix/cardano-slotting.nix | 4 +- .../.plan.nix/cardano-wallet-cli.nix | 6 +- .../cardano-wallet-core-integration.nix | 6 +- .../.plan.nix/cardano-wallet-core.nix | 15 +-- .../.plan.nix/cardano-wallet-launcher.nix | 9 +- .../.plan.nix/cardano-wallet-test-utils.nix | 6 +- .../.plan.nix/cardano-wallet.nix | 12 +- .../.plan.nix/compact-map.nix | 110 ++++++++++++++++ .../.plan.nix/contra-tracer.nix | 4 +- .../materialized-windows/.plan.nix/dbvar.nix | 5 +- .../materialized-windows/.plan.nix/flat.nix | 4 +- .../.plan.nix/io-classes.nix | 1 - .../materialized-windows/.plan.nix/io-sim.nix | 1 + .../.plan.nix/iohk-monitoring.nix | 4 +- .../.plan.nix/lobemo-backend-aggregation.nix | 67 ---------- .../.plan.nix/lobemo-backend-ekg.nix | 4 +- .../.plan.nix/lobemo-backend-monitoring.nix | 106 ---------------- .../lobemo-backend-trace-forwarder.nix | 67 ---------- .../.plan.nix/lobemo-scribe-systemd.nix | 68 ---------- .../.plan.nix/measures.nix | 4 +- .../.plan.nix/network-mux.nix | 3 + .../.plan.nix/non-integral.nix | 4 +- .../.plan.nix/orphans-deriving-via.nix | 4 +- .../.plan.nix/ouroboros-consensus-cardano.nix | 2 + .../ouroboros-consensus-protocol.nix | 74 +++++++++++ .../.plan.nix/ouroboros-consensus-shelley.nix | 4 +- .../.plan.nix/ouroboros-consensus.nix | 2 + .../.plan.nix/ouroboros-network-framework.nix | 5 + .../.plan.nix/ouroboros-network-testing.nix | 22 ++++ .../.plan.nix/ouroboros-network.nix | 9 +- .../.plan.nix/plutus-core.nix | 4 +- .../.plan.nix/plutus-ghc-stub.nix | 4 +- .../.plan.nix/plutus-ledger-api.nix | 4 +- .../.plan.nix/plutus-tx-plugin.nix | 4 +- .../.plan.nix/plutus-tx.nix | 4 +- .../.plan.nix/prettyprinter-configurable.nix | 4 +- .../.plan.nix/purescript-bridge.nix | 4 +- .../.plan.nix/servant-purescript.nix | 4 +- .../.plan.nix/set-algebra.nix | 66 ++++++++++ .../.plan.nix/shelley-spec-ledger-test.nix | 86 ------------- .../.plan.nix/shelley-spec-ledger.nix | 119 ------------------ .../.plan.nix/small-steps-test.nix | 6 +- .../.plan.nix/small-steps.nix | 21 +--- .../.plan.nix/strict-containers.nix | 4 +- .../.plan.nix/strict-non-empty-containers.nix | 4 +- .../.plan.nix/strict-stm.nix | 56 +++++++++ .../.plan.nix/text-class.nix | 6 +- .../.plan.nix/tracer-transformers.nix | 4 +- .../.plan.nix/word-array.nix | 4 +- .../haskell/materialized-windows/default.nix | 67 +++++----- 234 files changed, 1869 insertions(+), 2508 deletions(-) delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-tests.nix create mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-data.nix create mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/compact-map.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-aggregation.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-monitoring.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-trace-forwarder.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-scribe-systemd.nix create mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-protocol.nix create mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/set-algebra.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger-test.nix delete mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger.nix create mode 100644 nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-stm.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-tests.nix create mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-data.nix create mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/compact-map.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-aggregation.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-monitoring.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-trace-forwarder.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-scribe-systemd.nix create mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-protocol.nix create mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/set-algebra.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger-test.nix delete mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger.nix create mode 100644 nix/pkgs/haskell/materialized-linux/.plan.nix/strict-stm.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-tests.nix create mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-data.nix create mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/compact-map.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-aggregation.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-monitoring.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-trace-forwarder.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-scribe-systemd.nix create mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-protocol.nix create mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/set-algebra.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger-test.nix delete mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger.nix create mode 100644 nix/pkgs/haskell/materialized-windows/.plan.nix/strict-stm.nix diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/Win32-network.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/Win32-network.nix index 6e544d7038..332eecf10a 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/Win32-network.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/Win32-network.nix @@ -110,11 +110,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }) // { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/base-deriving-via.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/base-deriving-via.nix index c316b3c2c2..3498dd2300 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/base-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/base-deriving-via.nix @@ -44,11 +44,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-chain.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-chain.nix index 5280c281d8..f65b601581 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-chain.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-chain.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -63,6 +64,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."data-ordlist" or (errorHandler.buildDepError "data-ordlist")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -86,11 +88,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-ledger.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-ledger.nix index d70f5873bc..d2994b4e16 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-ledger.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-ledger.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -75,6 +76,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -105,11 +107,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses-cli.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses-cli.nix index 75fedd0ce6..f47dcfdc8c 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses-cli.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses-cli"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses-cli"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -158,11 +158,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses.nix index 8dd6c5c6d7..f1eeb03c9c 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -124,11 +124,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix index e8ec8b1c76..219892a95c 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix @@ -11,7 +11,7 @@ flags = {}; package = { specVersion = "3.0"; - identifier = { name = "cardano-api"; version = "1.32.1"; }; + identifier = { name = "cardano-api"; version = "1.33.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -46,6 +46,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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")) @@ -54,6 +55,7 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) @@ -68,6 +70,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (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")) @@ -75,8 +78,8 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -236,11 +239,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }) // { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary-test.nix index fad23992f7..eaf3a09ec0 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary-test.nix @@ -63,11 +63,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary.nix index 1198947dee..9220444ed5 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary.nix @@ -103,11 +103,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-class.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-class.nix index a104df059e..e5ef46c2a9 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-class.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-class.nix @@ -117,11 +117,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-praos.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-praos.nix index 108dee4ab2..14808d689d 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-praos.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-praos.nix @@ -78,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-test.nix index fc4f407b02..72846d7cb0 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-test.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-tests.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-tests.nix deleted file mode 100644 index 8d9a92e93b..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-tests.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ 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" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "4"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/cardano-crypto-tests; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-wrapper.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-wrapper.nix index a66c7eb51e..63a580ccc6 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-wrapper.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-wrapper.nix @@ -119,11 +119,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto.nix index dae8fb29bc..cf7784670b 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto.nix @@ -141,11 +141,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }) // { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-data.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-data.nix new file mode 100644 index 0000000000..4c4fa88364 --- /dev/null +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-data.nix @@ -0,0 +1,80 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "cardano-data"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Specialized data for Cardano project"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.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."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (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")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + ]; + buildable = true; + modules = [ + "Data/AbstractSize" + "Data/Relation" + "Data/CanonicalMaps" + "Data/MemoBytes" + "Data/Coders" + "Data/Pulse" + "Data/Sharing" + "Data/BiMap" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/cardano-data; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-alonzo.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-alonzo.nix index ea744a03ef..32981e8b96 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-alonzo.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-alonzo.nix @@ -39,11 +39,11 @@ (hsPkgs."base64-bytestring" or (errorHandler.buildDepError "base64-bytestring")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default" or (errorHandler.buildDepError "data-default")) @@ -56,6 +56,7 @@ (hsPkgs."plutus-core" or (errorHandler.buildDepError "plutus-core")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -92,11 +93,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron-test.nix index c782568df7..7e0c205a50 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron-test.nix @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron.nix index 5e4cf422f4..7a3547c08a 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron.nix @@ -208,6 +208,7 @@ "Test/Cardano/Chain/Byron/API" "Test/Cardano/Chain/Buildable" "Test/Cardano/Chain/Common/Address" + "Test/Cardano/Chain/Common/Attributes" "Test/Cardano/Chain/Common/CBOR" "Test/Cardano/Chain/Common/Compact" "Test/Cardano/Chain/Common/Example" @@ -286,13 +287,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/eras/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-core.nix index 5cff5b972b..630bf54eb5 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-core.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-core.nix @@ -42,9 +42,11 @@ (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) @@ -57,6 +59,7 @@ (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -91,13 +94,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-ledger-core; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-ledger-core; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-pretty.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-pretty.nix index a3303d5079..f3dcbfc270 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-pretty.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-pretty.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) @@ -44,10 +45,12 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -64,11 +67,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-ma.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-ma.nix index d0f9bedf8b..ea895fb7f4 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-ma.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-ma.nix @@ -38,6 +38,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -52,6 +53,7 @@ (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -76,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-test.nix index fc8a7a7a9f..255b8bf7a7 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-test.nix @@ -58,6 +58,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -73,6 +74,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -88,6 +90,7 @@ buildable = true; modules = [ "Test/Cardano/Crypto/VRF/Fake" + "Test/Cardano/Ledger/TerseTools" "Test/Cardano/Ledger/Shelley/Address/Bootstrap" "Test/Cardano/Ledger/Shelley/Address/CompactAddr" "Test/Cardano/Ledger/Shelley/BenchmarkFunctions" @@ -141,6 +144,7 @@ (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) @@ -152,6 +156,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) @@ -161,6 +166,7 @@ (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -174,6 +180,7 @@ buildable = true; modules = [ "Test/Control/Iterate/SetAlgebra" + "Test/Control/Iterate/SplitMapRules" "Test/Cardano/Ledger/Shelley/Examples" "Test/Cardano/Ledger/Shelley/Examples/Combinators" "Test/Cardano/Ledger/Shelley/Examples/EmptyBlock" @@ -211,6 +218,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -223,6 +231,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -242,11 +251,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley.nix index 5c5b4f4cdc..4c6eb72636 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley.nix @@ -41,12 +41,14 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."constraints" or (errorHandler.buildDepError "constraints")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) @@ -54,9 +56,11 @@ (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -69,7 +73,6 @@ "Cardano/Ledger/Chain" "Cardano/Ledger/Shelley" "Cardano/Ledger/Shelley/Constraints" - "Cardano/Ledger/Shelley/Address" "Cardano/Ledger/Shelley/Address/Bootstrap" "Cardano/Ledger/Shelley/API" "Cardano/Ledger/Shelley/API/ByronTranslation" @@ -78,31 +81,24 @@ "Cardano/Ledger/Shelley/API/Validation" "Cardano/Ledger/Shelley/API/Wallet" "Cardano/Ledger/Shelley/API/Mempool" - "Cardano/Ledger/Shelley/BaseTypes" "Cardano/Ledger/Shelley/BlockChain" "Cardano/Ledger/Shelley/CompactAddr" - "Cardano/Ledger/Shelley/Credential" "Cardano/Ledger/Shelley/Delegation/Certificates" "Cardano/Ledger/Shelley/Delegation/PoolParams" "Cardano/Ledger/Shelley/EpochBoundary" "Cardano/Ledger/Shelley/Genesis" "Cardano/Ledger/Shelley/HardForks" - "Cardano/Ledger/Shelley/Keys" "Cardano/Ledger/Shelley/LedgerState" "Cardano/Ledger/Shelley/Metadata" - "Cardano/Ledger/Shelley/OCert" "Cardano/Ledger/Shelley/Orphans" - "Cardano/Ledger/Shelley/OverlaySchedule" "Cardano/Ledger/Shelley/PParams" "Cardano/Ledger/Shelley/Rewards" "Cardano/Ledger/Shelley/RewardProvenance" "Cardano/Ledger/Shelley/RewardUpdate" "Cardano/Ledger/Shelley/Scripts" - "Cardano/Ledger/Shelley/Slot" "Cardano/Ledger/Shelley/SoftForks" "Cardano/Ledger/Shelley/StabilityWindow" "Cardano/Ledger/Shelley/Rules/Bbody" - "Cardano/Ledger/Shelley/Rules/Chain" "Cardano/Ledger/Shelley/Rules/Deleg" "Cardano/Ledger/Shelley/Rules/Delegs" "Cardano/Ledger/Shelley/Rules/Delpl" @@ -113,16 +109,12 @@ "Cardano/Ledger/Shelley/Rules/Mir" "Cardano/Ledger/Shelley/Rules/NewEpoch" "Cardano/Ledger/Shelley/Rules/Newpp" - "Cardano/Ledger/Shelley/Rules/Ocert" - "Cardano/Ledger/Shelley/Rules/Overlay" "Cardano/Ledger/Shelley/Rules/Pool" "Cardano/Ledger/Shelley/Rules/PoolReap" "Cardano/Ledger/Shelley/Rules/Ppup" - "Cardano/Ledger/Shelley/Rules/Prtcl" "Cardano/Ledger/Shelley/Rules/Rupd" "Cardano/Ledger/Shelley/Rules/Snap" "Cardano/Ledger/Shelley/Rules/Tick" - "Cardano/Ledger/Shelley/Rules/Tickn" "Cardano/Ledger/Shelley/Rules/Updn" "Cardano/Ledger/Shelley/Rules/Upec" "Cardano/Ledger/Shelley/Rules/Utxo" @@ -136,11 +128,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-numeric.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-numeric.nix index c44b5eb551..0263cb43d1 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-numeric.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-numeric.nix @@ -61,11 +61,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude-test.nix index 10b98291af..5e2ac56fce 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude-test.nix @@ -92,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude.nix index 8f75670bc3..229b2f48b7 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude.nix @@ -84,11 +84,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-protocol-tpraos.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-protocol-tpraos.nix index f437562ec9..9b16292698 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-protocol-tpraos.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-protocol-tpraos.nix @@ -45,12 +45,12 @@ (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; modules = [ - "Cardano/Protocol/TPraos" "Cardano/Protocol/TPraos/BHeader" "Cardano/Protocol/TPraos/OCert" "Cardano/Protocol/TPraos/Rules/OCert" @@ -64,13 +64,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-slotting.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-slotting.nix index 26cab8f9ff..5f76a0c5cb 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-slotting.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-slotting.nix @@ -59,11 +59,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-cli.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-cli.nix index 41f76a72e2..43ca25c69e 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-cli.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-cli"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-cli"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core-integration.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core-integration.nix index b74535f36f..18e9566dc6 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core-integration.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core-integration.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-core-integration"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -142,11 +142,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core.nix index 00e5957e5a..18b046f305 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-core"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-core"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -118,14 +118,14 @@ (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-client" or (errorHandler.buildDepError "servant-client")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."split" or (errorHandler.buildDepError "split")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."statistics" or (errorHandler.buildDepError "statistics")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streaming-commons" or (errorHandler.buildDepError "streaming-commons")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."string-interpolate" or (errorHandler.buildDepError "string-interpolate")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -164,6 +164,7 @@ "Cardano/Pool/DB/Sqlite/TH" "Cardano/Pool/Metadata" "Cardano/Wallet" + "Cardano/Wallet/Address/Pool" "Cardano/Wallet/Api" "Cardano/Wallet/Api/Client" "Cardano/Wallet/Api/Link" @@ -176,6 +177,7 @@ "Cardano/Wallet/DB/MVar" "Cardano/Wallet/DB/Model" "Cardano/Wallet/DB/Sqlite" + "Cardano/Wallet/DB/Sqlite/AddressBook" "Cardano/Wallet/DB/Sqlite/CheckpointsOld" "Cardano/Wallet/DB/Sqlite/Migration" "Cardano/Wallet/DB/Sqlite/TH" @@ -327,7 +329,6 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."pretty-simple" or (errorHandler.buildDepError "pretty-simple")) (hsPkgs."regex-pcre-builtin" or (errorHandler.buildDepError "regex-pcre-builtin")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."OddWord" or (errorHandler.buildDepError "OddWord")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -340,7 +341,6 @@ (hsPkgs."scrypt" or (errorHandler.buildDepError "scrypt")) (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."should-not-typecheck" or (errorHandler.buildDepError "should-not-typecheck")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) @@ -376,6 +376,7 @@ "Cardano/Pool/DB/MVarSpec" "Cardano/Pool/DB/Properties" "Cardano/Pool/DB/SqliteSpec" + "Cardano/Wallet/Address/PoolSpec" "Cardano/Wallet/Api/Malformed" "Cardano/Wallet/Api/Server/TlsSpec" "Cardano/Wallet/Api/ServerSpec" @@ -477,11 +478,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-launcher.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-launcher.nix index 579decfe38..d13b5ffa73 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-launcher.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-launcher.nix @@ -11,10 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { - name = "cardano-wallet-launcher"; - version = "2021.12.15"; - }; + identifier = { name = "cardano-wallet-launcher"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -95,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-test-utils.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-test-utils.nix index 6ba57158f9..fcce82b313 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-test-utils.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-test-utils.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-test-utils"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet.nix index 9aee178ec7..8e5e9eddb6 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2020 IOHK"; maintainer = "operations@iohk.io"; @@ -84,7 +84,6 @@ (hsPkgs."retry" or (errorHandler.buildDepError "retry")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) @@ -188,8 +187,11 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-addresses" or (errorHandler.buildDepError "cardano-addresses")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) + (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-wallet" or (errorHandler.buildDepError "cardano-wallet")) (hsPkgs."cardano-wallet-core" or (errorHandler.buildDepError "cardano-wallet-core")) @@ -204,6 +206,7 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."fmt" or (errorHandler.buildDepError "fmt")) + (hsPkgs."generic-arbitrary" or (errorHandler.buildDepError "generic-arbitrary")) (hsPkgs."generic-lens" or (errorHandler.buildDepError "generic-lens")) (hsPkgs."hspec-core" or (errorHandler.buildDepError "hspec-core")) (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) @@ -215,7 +218,6 @@ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."text-class" or (errorHandler.buildDepError "text-class")) @@ -323,11 +325,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/compact-map.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/compact-map.nix new file mode 100644 index 0000000000..b7c0e80e91 --- /dev/null +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/compact-map.nix @@ -0,0 +1,110 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "compact-map"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "A KeyMap that is based on collisionless HashMap implementation"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."vector" or (errorHandler.buildDepError "vector")) + (hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms")) + ]; + buildable = true; + modules = [ + "Data/Compact/KVVector" + "Data/Compact/KeyMap" + "Data/Compact/HashMap" + "Data/Compact/VMap" + "Data/Compact/SmallArray" + "Data/Compact/SplitMap" + ]; + hsSourceDirs = [ "src" ]; + }; + tests = { + "tests" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."quickcheck-classes-base" or (errorHandler.buildDepError "quickcheck-classes-base")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + modules = [ + "Test/Compact/SplitMap" + "Test/Compact/KeyMap" + "Test/Compact/VMap" + ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; + benchmarks = { + "bench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + hsSourceDirs = [ "bench" ]; + }; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/compact-map; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/contra-tracer.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/contra-tracer.nix index d9968adc85..7a24d0f661 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/contra-tracer.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/contra-tracer.nix @@ -42,11 +42,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/dbvar.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/dbvar.nix index e84f481172..86c53051f9 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/dbvar.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/dbvar.nix @@ -45,6 +45,7 @@ (hsPkgs."safe" or (errorHandler.buildDepError "safe")) (hsPkgs."say" or (errorHandler.buildDepError "say")) (hsPkgs."semigroupoids" or (errorHandler.buildDepError "semigroupoids")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; @@ -81,11 +82,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/flat.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/flat.nix index 06c4c66217..83ae97a9a5 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/flat.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/flat.nix @@ -224,11 +224,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }) // { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-classes.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-classes.nix index b68712e663..e1dde418dd 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-classes.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-classes.nix @@ -48,7 +48,6 @@ "Control/Monad/Class/MonadSay" "Control/Monad/Class/MonadST" "Control/Monad/Class/MonadSTM" - "Control/Monad/Class/MonadSTM/Strict" "Control/Monad/Class/MonadThrow" "Control/Monad/Class/MonadTime" "Control/Monad/Class/MonadTimer" diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-sim.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-sim.nix index 2ba20839d1..22a10c86d1 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-sim.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/io-sim.nix @@ -58,6 +58,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."time" or (errorHandler.buildDepError "time")) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/iohk-monitoring.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/iohk-monitoring.nix index 3d657f5bb7..ee9ed01c0a 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/iohk-monitoring.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/iohk-monitoring.nix @@ -180,11 +180,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-aggregation.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-aggregation.nix deleted file mode 100644 index 85602eda5e..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-aggregation.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-aggregation"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation to aggregate traced values"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Aggregation" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-ekg.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-ekg.nix index ac6ec28b62..0097328bd0 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-ekg.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-ekg.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-monitoring.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-monitoring.nix deleted file mode 100644 index 04c8dc69c1..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-monitoring.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-backend-monitoring"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation for monitoring"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Monitoring" ]; - hsSourceDirs = [ "src" ]; - }; - tests = { - "tests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."lobemo-backend-monitoring" or (errorHandler.buildDepError "lobemo-backend-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."clock" or (errorHandler.buildDepError "clock")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."semigroups" or (errorHandler.buildDepError "semigroups")) - (hsPkgs."split" or (errorHandler.buildDepError "split")) - (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."temporary" or (errorHandler.buildDepError "temporary")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."time-units" or (errorHandler.buildDepError "time-units")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - (hsPkgs."vector" or (errorHandler.buildDepError "vector")) - (hsPkgs."void" or (errorHandler.buildDepError "void")) - (hsPkgs."yaml" or (errorHandler.buildDepError "yaml")) - (hsPkgs."libyaml" or (errorHandler.buildDepError "libyaml")) - ]; - buildable = true; - modules = [ "Cardano/BM/Test/Monitoring" ]; - hsSourceDirs = [ "test" ]; - mainPath = [ "Test.lhs" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-trace-forwarder.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-trace-forwarder.nix deleted file mode 100644 index 38c57593bb..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-trace-forwarder.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-trace-forwarder"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2020 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "this backend forwards log items to a trace acceptor"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unix-compat" or (errorHandler.buildDepError "unix-compat")) - ]; - buildable = true; - modules = [ "Cardano/BM/Backend/TraceForwarder" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-scribe-systemd.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-scribe-systemd.nix deleted file mode 100644 index f68109f212..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-scribe-systemd.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-scribe-systemd"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend for logging to systemd/journal"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."katip" or (errorHandler.buildDepError "katip")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ - (hsPkgs."unix" or (errorHandler.buildDepError "unix")) - ])) ++ (pkgs.lib).optionals (system.isLinux) [ - (hsPkgs."hsyslog" or (errorHandler.buildDepError "hsyslog")) - (hsPkgs."libsystemd-journal" or (errorHandler.buildDepError "libsystemd-journal")) - ]; - buildable = true; - modules = [ "Cardano/BM/Scribe/Systemd" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/measures.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/measures.nix index 4de6596185..f38b7ca289 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/measures.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/measures.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/network-mux.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/network-mux.nix index 4185c94cf8..771ff1ce01 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/network-mux.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/network-mux.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."array" or (errorHandler.buildDepError "array")) @@ -106,6 +107,7 @@ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -124,6 +126,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/non-integral.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/non-integral.nix index 2ba9fc0cad..c8fbe9288f 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/non-integral.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/non-integral.nix @@ -53,11 +53,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/orphans-deriving-via.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/orphans-deriving-via.nix index 6aad6f59fd..a8d90bea4d 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/orphans-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/orphans-deriving-via.nix @@ -45,11 +45,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-cardano.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-cardano.nix index dbe4146d50..04575fe3e6 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-cardano.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-cardano.nix @@ -55,6 +55,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) ]; buildable = true; @@ -85,6 +86,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-protocol.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-protocol.nix new file mode 100644 index 0000000000..d9566217e2 --- /dev/null +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-protocol.nix @@ -0,0 +1,74 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "3.0"; + identifier = { + name = "ouroboros-consensus-protocol"; + version = "0.1.0.0"; + }; + license = "NONE"; + copyright = ""; + maintainer = "nick@topos.org.uk"; + author = "IOHK Formal methods team"; + homepage = ""; + url = ""; + synopsis = "Cardano consensus protocols."; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (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."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Protocol/Ledger/HotKey" + "Ouroboros/Consensus/Protocol/Ledger/Util" + "Ouroboros/Consensus/Protocol/TPraos" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/ouroboros-consensus-protocol; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-shelley.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-shelley.nix index 17d6492285..ae8318eace 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-shelley.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus-shelley.nix @@ -63,6 +63,7 @@ (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) ]; buildable = true; modules = [ @@ -81,9 +82,6 @@ "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" ]; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus.nix index 443e7bf3b0..734ade4895 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-consensus.nix @@ -74,6 +74,7 @@ (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")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) ] ++ (if system.isWindows then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] else [ @@ -279,6 +280,7 @@ "Ouroboros/Consensus/Storage/LedgerDB/DiskPolicy" "Ouroboros/Consensus/Storage/LedgerDB/InMemory" "Ouroboros/Consensus/Storage/LedgerDB/OnDisk" + "Ouroboros/Consensus/Storage/LedgerDB/Types" "Ouroboros/Consensus/Storage/Serialisation" "Ouroboros/Consensus/Storage/VolatileDB" "Ouroboros/Consensus/Storage/VolatileDB/API" diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-framework.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-framework.nix index da9da490d6..c600570161 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-framework.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-framework.nix @@ -57,6 +57,8 @@ (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) @@ -147,6 +149,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ]; @@ -179,7 +182,9 @@ (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (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")) diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-testing.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-testing.nix index d269316f85..1b7d3d4d4a 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-testing.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network-testing.nix @@ -34,11 +34,15 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."deque" or (errorHandler.buildDepError "deque")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) ]; buildable = true; @@ -46,9 +50,27 @@ "Ouroboros/Network/Testing/Serialise" "Ouroboros/Network/Testing/QuickCheck" "Ouroboros/Network/Testing/Utils" + "Ouroboros/Network/Testing/Data/Signal" + "Ouroboros/Network/Testing/Data/Script" + "Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; hsSourceDirs = [ "src" ]; }; + tests = { + "test" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + ]; + buildable = true; + modules = [ "Test/Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network.nix index a2f8ac0775..300b74affb 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/ouroboros-network.nix @@ -69,6 +69,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) @@ -94,7 +95,6 @@ "Ouroboros/Network/BlockFetch/Decision" "Ouroboros/Network/BlockFetch/DeltaQ" "Ouroboros/Network/BlockFetch/State" - "Ouroboros/Network/Counter" "Ouroboros/Network/DeltaQ" "Ouroboros/Network/Diffusion" "Ouroboros/Network/Diffusion/P2P" @@ -191,6 +191,8 @@ (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (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."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ]; buildable = true; @@ -286,6 +288,7 @@ (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."ouroboros-network".components.sublibs.ouroboros-protocol-tests or (errorHandler.buildDepError "ouroboros-network:ouroboros-protocol-tests")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ] ++ (pkgs.lib).optionals (system.isWindows) [ @@ -296,7 +299,6 @@ modules = [ "Ouroboros/Network/BlockFetch/Examples" "Ouroboros/Network/MockNode" - "Data/Signal" "Test/AnchoredFragment" "Test/Chain" "Test/LedgerPeers" @@ -315,7 +317,6 @@ "Test/Ouroboros/Network/PeerSelection/Json" "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" @@ -323,8 +324,6 @@ "Test/Socket" "Test/PeerState" "Test/Version" - "Test/QuickCheck/Signal" - "Test/QuickCheck/Utils" ]; hsSourceDirs = [ "test" ]; mainPath = [ "Main.hs" ]; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix index b93438e05e..0a2473e208 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix @@ -638,11 +638,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ghc-stub.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ghc-stub.nix index 702acdd4f1..6051c84a48 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ghc-stub.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ghc-stub.nix @@ -64,11 +64,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ledger-api.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ledger-api.nix index cc612ad49b..46aed214ab 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ledger-api.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ledger-api.nix @@ -108,11 +108,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix index bfacb35c20..dc5e615c63 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix index 0707993c94..639b72d41c 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/prettyprinter-configurable.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/prettyprinter-configurable.nix index b3d636d53f..0dd1d52f67 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/prettyprinter-configurable.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/prettyprinter-configurable.nix @@ -94,11 +94,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/purescript-bridge.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/purescript-bridge.nix index 779c4855dc..1bae22a95f 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/purescript-bridge.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/purescript-bridge.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }) // { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/servant-purescript.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/servant-purescript.nix index c928f543d0..1b46f1751e 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/servant-purescript.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/servant-purescript.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }) // { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/set-algebra.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/set-algebra.nix new file mode 100644 index 0000000000..08f4b27402 --- /dev/null +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/set-algebra.nix @@ -0,0 +1,66 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "set-algebra"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Set Algebra"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."ansi-wl-pprint" or (errorHandler.buildDepError "ansi-wl-pprint")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + ]; + buildable = true; + modules = [ + "Control/Iterate/BaseTypes" + "Control/Iterate/Collect" + "Control/Iterate/Exp" + "Control/Iterate/SetAlgebra" + "Control/SetAlgebra" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/set-algebra; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger-test.nix deleted file mode 100644 index 369c882128..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger-test.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - 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 = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) - ]; - buildable = true; - modules = [ - "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/Rules/ClassifyTraces" - "Test/Shelley/Spec/Ledger/Rules/TestChain" - "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" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/shelley/chain-and-ledger/shelley-spec-ledger-test; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger.nix deleted file mode 100644 index bfb7c934d0..0000000000 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.2"; - identifier = { name = "shelley-spec-ledger"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = ""; - maintainer = "formal.methods@iohk.io"; - author = "IOHK Formal Methods Team"; - homepage = ""; - url = ""; - synopsis = ""; - description = "Shelley Ledger Executable Model"; - buildType = "Simple"; - isLocal = true; - detailLevel = "FullDetails"; - licenseFiles = []; - dataDir = "."; - dataFiles = []; - extraSrcFiles = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) - (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) - ]; - buildable = true; - modules = [ - "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/CompactAddr" - "Shelley/Spec/Ledger/Credential" - "Shelley/Spec/Ledger/Delegation/Certificates" - "Shelley/Spec/Ledger/Delegation/PoolParams" - "Shelley/Spec/Ledger/EpochBoundary" - "Shelley/Spec/Ledger/Genesis" - "Shelley/Spec/Ledger/HardForks" - "Shelley/Spec/Ledger/Keys" - "Shelley/Spec/Ledger/LedgerState" - "Shelley/Spec/Ledger/Metadata" - "Shelley/Spec/Ledger/OCert" - "Shelley/Spec/Ledger/Orphans" - "Shelley/Spec/Ledger/OverlaySchedule" - "Shelley/Spec/Ledger/PParams" - "Shelley/Spec/Ledger/Rewards" - "Shelley/Spec/Ledger/RewardProvenance" - "Shelley/Spec/Ledger/RewardUpdate" - "Shelley/Spec/Ledger/Scripts" - "Shelley/Spec/Ledger/Slot" - "Shelley/Spec/Ledger/SoftForks" - "Shelley/Spec/Ledger/StabilityWindow" - "Shelley/Spec/Ledger/STS/Bbody" - "Shelley/Spec/Ledger/STS/Chain" - "Shelley/Spec/Ledger/STS/Deleg" - "Shelley/Spec/Ledger/STS/Delegs" - "Shelley/Spec/Ledger/STS/Delpl" - "Shelley/Spec/Ledger/STS/Epoch" - "Shelley/Spec/Ledger/STS/EraMapping" - "Shelley/Spec/Ledger/STS/Ledger" - "Shelley/Spec/Ledger/STS/Ledgers" - "Shelley/Spec/Ledger/STS/Mir" - "Shelley/Spec/Ledger/STS/NewEpoch" - "Shelley/Spec/Ledger/STS/Newpp" - "Shelley/Spec/Ledger/STS/Ocert" - "Shelley/Spec/Ledger/STS/Overlay" - "Shelley/Spec/Ledger/STS/Pool" - "Shelley/Spec/Ledger/STS/PoolReap" - "Shelley/Spec/Ledger/STS/Ppup" - "Shelley/Spec/Ledger/STS/Prtcl" - "Shelley/Spec/Ledger/STS/Rupd" - "Shelley/Spec/Ledger/STS/Snap" - "Shelley/Spec/Ledger/STS/Tick" - "Shelley/Spec/Ledger/STS/Tickn" - "Shelley/Spec/Ledger/STS/Updn" - "Shelley/Spec/Ledger/STS/Upec" - "Shelley/Spec/Ledger/STS/Utxo" - "Shelley/Spec/Ledger/STS/Utxow" - "Shelley/Spec/Ledger/Tx" - "Shelley/Spec/Ledger/TxBody" - "Shelley/Spec/Ledger/UTxO" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/eras/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps-test.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps-test.nix index 1c78a14fe9..00193028c1 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps-test.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps-test.nix @@ -88,13 +88,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/semantics/small-steps-test; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/small-steps-test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps.nix index a0e3c65d5d..68a1bfdd52 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps.nix @@ -35,50 +35,33 @@ 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."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")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) ]; buildable = true; modules = [ "Control/State/Transition" "Control/State/Transition/Extended" "Control/State/Transition/Simple" - "Data/AbstractSize" - "Data/Relation" - "Data/CanonicalMaps" - "Data/MemoBytes" - "Data/Coders" - "Data/Pulse" "Control/Provenance" - "Control/Iterate/SetAlgebra" - "Control/Iterate/Collect" - "Control/SetAlgebra" ]; hsSourceDirs = [ "src" ]; }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-containers.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-containers.nix index 1df2c2154c..7f92971ef5 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-containers.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-containers.nix @@ -56,11 +56,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-non-empty-containers.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-non-empty-containers.nix index e96d53df7e..88e516b8db 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-non-empty-containers.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-non-empty-containers.nix @@ -77,11 +77,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-stm.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-stm.nix new file mode 100644 index 0000000000..8712deb215 --- /dev/null +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-stm.nix @@ -0,0 +1,56 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { checktvarinvariant = false; asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "strict-stm"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2019-2021 Input Output (Hong Kong) Ltd."; + maintainer = ""; + author = "Alexander Vieth, Marcin Szamotulski, Duncan Coutts"; + homepage = ""; + url = ""; + synopsis = "Strict STM interface polymorphic over stm implementation."; + description = "The `strict-stm` package gives a strict interface to stm,\ncurrently either one provided by `stm` package for the\n`IO` monad or `io-sim` package for the `IOSim` monad."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + ]; + buildable = true; + modules = [ "Control/Monad/Class/MonadSTM/Strict" ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/strict-stm; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/text-class.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/text-class.nix index 1acb002a25..71b11b0583 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/text-class.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/text-class.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "text-class"; version = "2021.12.15"; }; + identifier = { name = "text-class"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -69,11 +69,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/tracer-transformers.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/tracer-transformers.nix index 23287c1238..73d479a479 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/tracer-transformers.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/tracer-transformers.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/word-array.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/word-array.nix index fa9ae74de5..780a80b0e6 100644 --- a/nix/pkgs/haskell/materialized-darwin/.plan.nix/word-array.nix +++ b/nix/pkgs/haskell/materialized-darwin/.plan.nix/word-array.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-darwin/default.nix b/nix/pkgs/haskell/materialized-darwin/default.nix index 118e7514a7..b2be02c3fb 100644 --- a/nix/pkgs/haskell/materialized-darwin/default.nix +++ b/nix/pkgs/haskell/materialized-darwin/default.nix @@ -24,7 +24,7 @@ "ghc-boot".revision = (((hackage."ghc-boot")."8.10.4.20210212").revisions).default; "streaming-commons".revision = (((hackage."streaming-commons")."0.2.2.1").revisions).default; "streaming-commons".flags.use-bytestring-builder = false; - "fmt".revision = (((hackage."fmt")."0.6.3.0").revisions).default; + "fmt".revision = (((hackage."fmt")."0.6.1.2").revisions).default; "old-time".revision = (((hackage."old-time")."1.1.0.3").revisions).default; "ral".revision = (((hackage."ral")."0.1").revisions).default; "ral".flags.distributive = true; @@ -40,7 +40,7 @@ "ghc-prim".revision = (((hackage."ghc-prim")."0.6.1").revisions).default; "wl-pprint-text".revision = (((hackage."wl-pprint-text")."1.2.0.1").revisions).default; "command".revision = (((hackage."command")."0.1.1").revisions).default; - "formatting".revision = (((hackage."formatting")."7.1.3").revisions).default; + "formatting".revision = (((hackage."formatting")."6.3.7").revisions).default; "attoparsec-iso8601".revision = (((hackage."attoparsec-iso8601")."1.0.2.0").revisions).default; "attoparsec-iso8601".flags.developer = false; "attoparsec-iso8601".flags.fast = false; @@ -85,6 +85,7 @@ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.11").revisions).default; "ansi-terminal".flags.example = false; "unliftio-core".revision = (((hackage."unliftio-core")."0.2.0.1").revisions).default; + "strict-list".revision = (((hackage."strict-list")."0.1.6").revisions).default; "free".revision = (((hackage."free")."5.1.3").revisions).default; "exceptions".revision = (((hackage."exceptions")."0.10.4").revisions).default; "time-compat".revision = (((hackage."time-compat")."1.9.6.1").revisions).default; @@ -153,7 +154,6 @@ "wai-app-static".flags.print = false; "tree-diff".revision = (((hackage."tree-diff")."0.2.1").revisions).default; "http-types".revision = (((hackage."http-types")."0.12.3").revisions).default; - "Glob".revision = (((hackage."Glob")."0.10.1").revisions).default; "th-reify-many".revision = (((hackage."th-reify-many")."0.1.10").revisions).default; "streaming-bytestring".revision = (((hackage."streaming-bytestring")."0.2.1").revisions).default; "direct-sqlite".revision = (((hackage."direct-sqlite")."2.3.26").revisions).default; @@ -173,9 +173,6 @@ "protolude".revision = (((hackage."protolude")."0.3.0").revisions).default; "protolude".flags.dev = false; "process".revision = (((hackage."process")."1.6.9.0").revisions).default; - "criterion".revision = (((hackage."criterion")."1.5.11.0").revisions).default; - "criterion".flags.embed-data-files = false; - "criterion".flags.fast = false; "newtype-generics".revision = (((hackage."newtype-generics")."0.6").revisions).default; "half".revision = (((hackage."half")."0.3.1").revisions).default; "int-cast".revision = (((hackage."int-cast")."0.2.0.0").revisions).default; @@ -216,7 +213,6 @@ "entropy".revision = (((hackage."entropy")."0.4.1.6").revisions).default; "entropy".flags.halvm = false; "hpc".revision = (((hackage."hpc")."0.6.1.0").revisions).default; - "binary-orphans".revision = (((hackage."binary-orphans")."1.0.1").revisions).default; "text-conversions".revision = (((hackage."text-conversions")."0.3.1").revisions).default; "tls".revision = (((hackage."tls")."1.5.5").revisions).default; "tls".flags.compat = true; @@ -256,7 +252,6 @@ "base64-bytestring-type".flags.http-api-data = true; "beam-sqlite".revision = (((hackage."beam-sqlite")."0.5.1.0").revisions).default; "beam-sqlite".flags.werror = false; - "js-chart".revision = (((hackage."js-chart")."2.9.4.1").revisions).default; "vector-algorithms".revision = (((hackage."vector-algorithms")."0.8.0.4").revisions).default; "vector-algorithms".flags.unsafechecks = false; "vector-algorithms".flags.llvm = false; @@ -578,6 +573,7 @@ "strict".flags.assoc = true; "http-api-data".revision = (((hackage."http-api-data")."0.4.3").revisions).default; "http-api-data".flags.use-text-show = false; + "deque".revision = (((hackage."deque")."0.4.4").revisions).default; "attoparsec".revision = (((hackage."attoparsec")."0.13.2.5").revisions).default; "attoparsec".flags.developer = false; "persistent-template".revision = (((hackage."persistent-template")."2.12.0.0").revisions).default; @@ -597,8 +593,6 @@ "digest".flags.bytestring-in-base = false; "pem".revision = (((hackage."pem")."0.2.4").revisions).default; "file-embed".revision = (((hackage."file-embed")."0.0.15.0").revisions).default; - "double-conversion".revision = (((hackage."double-conversion")."2.0.2.0").revisions).default; - "double-conversion".flags.developer = false; "colour".revision = (((hackage."colour")."2.3.6").revisions).default; "terminfo".revision = (((hackage."terminfo")."0.4.1.4").revisions).default; "syb".revision = (((hackage."syb")."0.7.2.1").revisions).default; @@ -751,7 +745,9 @@ typed-protocols = ./.plan.nix/typed-protocols.nix; ouroboros-network-testing = ./.plan.nix/ouroboros-network-testing.nix; cardano-addresses = ./.plan.nix/cardano-addresses.nix; + set-algebra = ./.plan.nix/set-algebra.nix; servant-purescript = ./.plan.nix/servant-purescript.nix; + cardano-data = ./.plan.nix/cardano-data.nix; ouroboros-consensus-shelley = ./.plan.nix/ouroboros-consensus-shelley.nix; cardano-slotting = ./.plan.nix/cardano-slotting.nix; playground-common = ./.plan.nix/playground-common.nix; @@ -759,11 +755,9 @@ cardano-protocol-tpraos = ./.plan.nix/cardano-protocol-tpraos.nix; cardano-crypto-class = ./.plan.nix/cardano-crypto-class.nix; cardano-wallet = ./.plan.nix/cardano-wallet.nix; - lobemo-backend-monitoring = ./.plan.nix/lobemo-backend-monitoring.nix; tracer-transformers = ./.plan.nix/tracer-transformers.nix; plutus-tx-plugin = ./.plan.nix/plutus-tx-plugin.nix; measures = ./.plan.nix/measures.nix; - lobemo-scribe-systemd = ./.plan.nix/lobemo-scribe-systemd.nix; quickcheck-dynamic = ./.plan.nix/quickcheck-dynamic.nix; network-mux = ./.plan.nix/network-mux.nix; lobemo-backend-ekg = ./.plan.nix/lobemo-backend-ekg.nix; @@ -779,14 +773,15 @@ cardano-binary-test = ./.plan.nix/cardano-binary-test.nix; plutus-core = ./.plan.nix/plutus-core.nix; cardano-prelude-test = ./.plan.nix/cardano-prelude-test.nix; + ouroboros-consensus-protocol = ./.plan.nix/ouroboros-consensus-protocol.nix; plutus-pab = ./.plan.nix/plutus-pab.nix; typed-protocols-examples = ./.plan.nix/typed-protocols-examples.nix; - cardano-crypto-tests = ./.plan.nix/cardano-crypto-tests.nix; freer-extras = ./.plan.nix/freer-extras.nix; cardano-ledger-byron-test = ./.plan.nix/cardano-ledger-byron-test.nix; plutus-tx = ./.plan.nix/plutus-tx.nix; cardano-wallet-test-utils = ./.plan.nix/cardano-wallet-test-utils.nix; base-deriving-via = ./.plan.nix/base-deriving-via.nix; + strict-stm = ./.plan.nix/strict-stm.nix; non-integral = ./.plan.nix/non-integral.nix; plutus-contract = ./.plan.nix/plutus-contract.nix; iohk-monitoring = ./.plan.nix/iohk-monitoring.nix; @@ -794,7 +789,6 @@ cardano-crypto-test = ./.plan.nix/cardano-crypto-test.nix; web-ghc = ./.plan.nix/web-ghc.nix; cardano-ledger-byron = ./.plan.nix/cardano-ledger-byron.nix; - shelley-spec-ledger-test = ./.plan.nix/shelley-spec-ledger-test.nix; cardano-api = ./.plan.nix/cardano-api.nix; ouroboros-consensus = ./.plan.nix/ouroboros-consensus.nix; cardano-binary = ./.plan.nix/cardano-binary.nix; @@ -803,7 +797,7 @@ ntp-client = ./.plan.nix/ntp-client.nix; text-class = ./.plan.nix/text-class.nix; ouroboros-network-framework = ./.plan.nix/ouroboros-network-framework.nix; - lobemo-backend-aggregation = ./.plan.nix/lobemo-backend-aggregation.nix; + compact-map = ./.plan.nix/compact-map.nix; plutus-chain-index-core = ./.plan.nix/plutus-chain-index-core.nix; plutus-ledger-api = ./.plan.nix/plutus-ledger-api.nix; io-classes = ./.plan.nix/io-classes.nix; @@ -824,12 +818,10 @@ cardano-ledger-core = ./.plan.nix/cardano-ledger-core.nix; cardano-ledger-shelley-ma = ./.plan.nix/cardano-ledger-shelley-ma.nix; goblins = ./.plan.nix/goblins.nix; - lobemo-backend-trace-forwarder = ./.plan.nix/lobemo-backend-trace-forwarder.nix; cardano-addresses-cli = ./.plan.nix/cardano-addresses-cli.nix; prettyprinter-configurable = ./.plan.nix/prettyprinter-configurable.nix; cardano-numeric = ./.plan.nix/cardano-numeric.nix; cardano-crypto = ./.plan.nix/cardano-crypto.nix; - shelley-spec-ledger = ./.plan.nix/shelley-spec-ledger.nix; strict-containers = ./.plan.nix/strict-containers.nix; word-array = ./.plan.nix/word-array.nix; }; @@ -864,7 +856,9 @@ "cardano-addresses" = { flags = { "release" = lib.mkOverride 900 false; }; }; + "set-algebra" = { flags = {}; }; "servant-purescript" = { flags = {}; }; + "cardano-data" = { flags = {}; }; "ouroboros-consensus-shelley" = { flags = { "asserts" = lib.mkOverride 900 false; }; }; @@ -882,7 +876,6 @@ "cardano-wallet" = { flags = { "release" = lib.mkOverride 900 false; }; }; - "lobemo-backend-monitoring" = { flags = {}; }; "tracer-transformers" = { flags = {}; }; "plutus-tx-plugin" = { flags = { "use-ghc-stub" = lib.mkOverride 900 false; }; @@ -890,7 +883,6 @@ "measures" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-scribe-systemd" = { flags = {}; }; "quickcheck-dynamic" = { flags = {}; }; "network-mux" = { flags = { @@ -928,13 +920,13 @@ "cardano-prelude-test" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "ouroboros-consensus-protocol" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "plutus-pab" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; "typed-protocols-examples" = { flags = {}; }; - "cardano-crypto-tests" = { - flags = { "development" = lib.mkOverride 900 false; }; - }; "freer-extras" = { flags = {}; }; "cardano-ledger-byron-test" = { flags = {}; }; "plutus-tx" = { flags = {}; }; @@ -944,6 +936,12 @@ "base-deriving-via" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "strict-stm" = { + flags = { + "checktvarinvariant" = lib.mkOverride 900 false; + "asserts" = lib.mkOverride 900 false; + }; + }; "non-integral" = { flags = {}; }; "plutus-contract" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; @@ -962,7 +960,6 @@ "cardano-ledger-byron" = { flags = { "test-normal-form" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger-test" = { flags = {}; }; "cardano-api" = { flags = {}; }; "ouroboros-consensus" = { flags = { "asserts" = lib.mkOverride 900 false; }; @@ -979,7 +976,7 @@ "ntp-client" = { flags = { "demo" = lib.mkOverride 900 true; }; }; "text-class" = { flags = { "release" = lib.mkOverride 900 false; }; }; "ouroboros-network-framework" = { flags = {}; }; - "lobemo-backend-aggregation" = { flags = {}; }; + "compact-map" = { flags = {}; }; "plutus-chain-index-core" = { flags = {}; }; "plutus-ledger-api" = { flags = {}; }; "io-classes" = { @@ -1017,7 +1014,6 @@ "goblins" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-backend-trace-forwarder" = { flags = {}; }; "cardano-addresses-cli" = { flags = { "release" = lib.mkOverride 900 false; }; }; @@ -1031,7 +1027,6 @@ "golden-tests" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger" = { flags = {}; }; "strict-containers" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -1063,6 +1058,7 @@ "semigroupoids".components.setup.planned = lib.mkOverride 900 true; "row-types".components.library.planned = lib.mkOverride 900 true; "streaming".components.library.planned = lib.mkOverride 900 true; + "strict-stm".components.library.planned = lib.mkOverride 900 true; "containers".components.library.planned = lib.mkOverride 900 true; "lens".components.library.planned = lib.mkOverride 900 true; "io-sim".components.library.planned = lib.mkOverride 900 true; @@ -1149,7 +1145,6 @@ "extra".components.library.planned = lib.mkOverride 900 true; "base-compat-batteries".components.library.planned = lib.mkOverride 900 true; "doctest".components.exes."doctest".planned = lib.mkOverride 900 true; - "lobemo-backend-trace-forwarder".components.library.planned = lib.mkOverride 900 true; "hsc2hs".components.exes."hsc2hs".planned = lib.mkOverride 900 true; "word-array".components.library.planned = lib.mkOverride 900 true; "unix-time".components.library.planned = lib.mkOverride 900 true; @@ -1163,7 +1158,6 @@ "warp-tls".components.library.planned = lib.mkOverride 900 true; "mime-types".components.library.planned = lib.mkOverride 900 true; "prettyprinter-configurable".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger".components.library.planned = lib.mkOverride 900 true; "testing-type-modifiers".components.library.planned = lib.mkOverride 900 true; "prometheus".components.library.planned = lib.mkOverride 900 true; "bech32".components.exes."bech32".planned = lib.mkOverride 900 true; @@ -1210,6 +1204,7 @@ "cardano-prelude-test".components.library.planned = lib.mkOverride 900 true; "base64-bytestring".components.library.planned = lib.mkOverride 900 true; "cardano-binary-test".components.library.planned = lib.mkOverride 900 true; + "ouroboros-consensus-protocol".components.library.planned = lib.mkOverride 900 true; "gray-code".components.library.planned = lib.mkOverride 900 true; "regex-base".components.library.planned = lib.mkOverride 900 true; "asn1-parse".components.library.planned = lib.mkOverride 900 true; @@ -1219,6 +1214,7 @@ "adjunctions".components.library.planned = lib.mkOverride 900 true; "http-api-data".components.library.planned = lib.mkOverride 900 true; "plutus-chain-index".components.library.planned = lib.mkOverride 900 true; + "deque".components.library.planned = lib.mkOverride 900 true; "plutus-ledger-constraints".components.library.planned = lib.mkOverride 900 true; "pem".components.library.planned = lib.mkOverride 900 true; "strict-non-empty-containers".components.library.planned = lib.mkOverride 900 true; @@ -1231,7 +1227,6 @@ "persistent-template".components.library.planned = lib.mkOverride 900 true; "unix-bytestring".components.library.planned = lib.mkOverride 900 true; "generic-lens".components.library.planned = lib.mkOverride 900 true; - "double-conversion".components.library.planned = lib.mkOverride 900 true; "file-embed".components.library.planned = lib.mkOverride 900 true; "colour".components.library.planned = lib.mkOverride 900 true; "terminfo".components.library.planned = lib.mkOverride 900 true; @@ -1279,12 +1274,10 @@ "ouroboros-consensus-byron".components.library.planned = lib.mkOverride 900 true; "tls".components.library.planned = lib.mkOverride 900 true; "process".components.library.planned = lib.mkOverride 900 true; - "criterion".components.library.planned = lib.mkOverride 900 true; "half".components.library.planned = lib.mkOverride 900 true; "contra-tracer".components.library.planned = lib.mkOverride 900 true; "newtype-generics".components.library.planned = lib.mkOverride 900 true; "hpc".components.library.planned = lib.mkOverride 900 true; - "binary-orphans".components.library.planned = lib.mkOverride 900 true; "text-conversions".components.library.planned = lib.mkOverride 900 true; "servant-client-core".components.library.planned = lib.mkOverride 900 true; "aeson-qq".components.library.planned = lib.mkOverride 900 true; @@ -1300,8 +1293,6 @@ "abstract-par".components.library.planned = lib.mkOverride 900 true; "async".components.library.planned = lib.mkOverride 900 true; "protolude".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-monitoring".components.library.planned = lib.mkOverride 900 true; - "Glob".components.library.planned = lib.mkOverride 900 true; "http-types".components.library.planned = lib.mkOverride 900 true; "doctest".components.library.planned = lib.mkOverride 900 true; "conduit".components.library.planned = lib.mkOverride 900 true; @@ -1345,7 +1336,6 @@ "yaml".components.library.planned = lib.mkOverride 900 true; "time-locale-compat".components.library.planned = lib.mkOverride 900 true; "jwt".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger-test".components.library.planned = lib.mkOverride 900 true; "ekg".components.library.planned = lib.mkOverride 900 true; "web-ghc".components.library.planned = lib.mkOverride 900 true; "th-lift-instances".components.library.planned = lib.mkOverride 900 true; @@ -1357,7 +1347,6 @@ "servant".components.library.planned = lib.mkOverride 900 true; "ListLike".components.library.planned = lib.mkOverride 900 true; "conduit-extra".components.library.planned = lib.mkOverride 900 true; - "criterion".components.exes."criterion-report".planned = lib.mkOverride 900 true; "cardano-crypto-wrapper".components.library.planned = lib.mkOverride 900 true; "ansi-terminal".components.library.planned = lib.mkOverride 900 true; "typed-protocols".components.library.planned = lib.mkOverride 900 true; @@ -1380,6 +1369,7 @@ "plutus-pab-executables".components.exes."plutus-pab-nami-demo".planned = lib.mkOverride 900 true; "servant-blaze".components.library.planned = lib.mkOverride 900 true; "ouroboros-network-testing".components.library.planned = lib.mkOverride 900 true; + "strict-list".components.library.planned = lib.mkOverride 900 true; "free".components.library.planned = lib.mkOverride 900 true; "unliftio-core".components.library.planned = lib.mkOverride 900 true; "servant-websockets".components.exes."websocket-stream".planned = lib.mkOverride 900 true; @@ -1440,7 +1430,6 @@ "servant-websockets".components.library.planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."sync-client".planned = lib.mkOverride 900 true; "aeson-casing".components.library.planned = lib.mkOverride 900 true; - "cardano-crypto-tests".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."cardano-wallet".planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."plutus-pab-nami-demo-generator".planned = lib.mkOverride 900 true; "servant-foreign".components.library.planned = lib.mkOverride 900 true; @@ -1533,7 +1522,6 @@ "th-extras".components.library.planned = lib.mkOverride 900 true; "quickcheck-io".components.library.planned = lib.mkOverride 900 true; "beam-sqlite".components.library.planned = lib.mkOverride 900 true; - "js-chart".components.library.planned = lib.mkOverride 900 true; "vector-algorithms".components.library.planned = lib.mkOverride 900 true; "plutus-playground-server".components.sublibs."plutus-playground-usecases".planned = lib.mkOverride 900 true; "megaparsec".components.library.planned = lib.mkOverride 900 true; @@ -1573,7 +1561,6 @@ "temporary".components.library.planned = lib.mkOverride 900 true; "dom-lt".components.library.planned = lib.mkOverride 900 true; "hspec-core".components.library.planned = lib.mkOverride 900 true; - "lobemo-scribe-systemd".components.library.planned = lib.mkOverride 900 true; "hedgehog".components.library.planned = lib.mkOverride 900 true; "system-filepath".components.setup.planned = lib.mkOverride 900 true; "measures".components.library.planned = lib.mkOverride 900 true; @@ -1587,6 +1574,7 @@ "splitmix".components.library.planned = lib.mkOverride 900 true; "generic-lens-core".components.library.planned = lib.mkOverride 900 true; "websockets".components.library.planned = lib.mkOverride 900 true; + "compact-map".components.library.planned = lib.mkOverride 900 true; "x509-store".components.library.planned = lib.mkOverride 900 true; "aeson".components.library.planned = lib.mkOverride 900 true; "th-lift".components.library.planned = lib.mkOverride 900 true; @@ -1604,7 +1592,6 @@ "time-out".components.library.planned = lib.mkOverride 900 true; "typerep-map".components.library.planned = lib.mkOverride 900 true; "quickcheck-classes".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-aggregation".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."local-cluster".planned = lib.mkOverride 900 true; "data-default".components.library.planned = lib.mkOverride 900 true; "text-class".components.library.planned = lib.mkOverride 900 true; @@ -1621,6 +1608,7 @@ "pqueue".components.library.planned = lib.mkOverride 900 true; "playground-common".components.library.planned = lib.mkOverride 900 true; "lattices".components.library.planned = lib.mkOverride 900 true; + "cardano-data".components.library.planned = lib.mkOverride 900 true; "fin".components.library.planned = lib.mkOverride 900 true; "base-orphans".components.library.planned = lib.mkOverride 900 true; "casing".components.library.planned = lib.mkOverride 900 true; @@ -1640,6 +1628,7 @@ "cardano-wallet-launcher".components.library.planned = lib.mkOverride 900 true; "plutus-core".components.sublibs."index-envs".planned = lib.mkOverride 900 true; "transformers-compat".components.library.planned = lib.mkOverride 900 true; + "set-algebra".components.library.planned = lib.mkOverride 900 true; "fmlist".components.library.planned = lib.mkOverride 900 true; "memory".components.library.planned = lib.mkOverride 900 true; "cardano-protocol-tpraos".components.library.planned = lib.mkOverride 900 true; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/Win32-network.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/Win32-network.nix index 6e544d7038..332eecf10a 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/Win32-network.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/Win32-network.nix @@ -110,11 +110,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }) // { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/base-deriving-via.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/base-deriving-via.nix index c316b3c2c2..3498dd2300 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/base-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/base-deriving-via.nix @@ -44,11 +44,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-chain.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-chain.nix index 5280c281d8..f65b601581 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-chain.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-chain.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -63,6 +64,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."data-ordlist" or (errorHandler.buildDepError "data-ordlist")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -86,11 +88,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-ledger.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-ledger.nix index d70f5873bc..d2994b4e16 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-ledger.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-ledger.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -75,6 +76,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -105,11 +107,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses-cli.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses-cli.nix index 75fedd0ce6..f47dcfdc8c 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses-cli.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses-cli"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses-cli"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -158,11 +158,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses.nix index 8dd6c5c6d7..f1eeb03c9c 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -124,11 +124,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix index e8ec8b1c76..219892a95c 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix @@ -11,7 +11,7 @@ flags = {}; package = { specVersion = "3.0"; - identifier = { name = "cardano-api"; version = "1.32.1"; }; + identifier = { name = "cardano-api"; version = "1.33.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -46,6 +46,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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")) @@ -54,6 +55,7 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) @@ -68,6 +70,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (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")) @@ -75,8 +78,8 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -236,11 +239,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }) // { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary-test.nix index fad23992f7..eaf3a09ec0 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary-test.nix @@ -63,11 +63,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary.nix index 1198947dee..9220444ed5 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary.nix @@ -103,11 +103,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-class.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-class.nix index a104df059e..e5ef46c2a9 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-class.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-class.nix @@ -117,11 +117,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-praos.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-praos.nix index 108dee4ab2..14808d689d 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-praos.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-praos.nix @@ -78,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-test.nix index fc4f407b02..72846d7cb0 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-test.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-tests.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-tests.nix deleted file mode 100644 index 8d9a92e93b..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-tests.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ 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" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "4"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/cardano-crypto-tests; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-wrapper.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-wrapper.nix index a66c7eb51e..63a580ccc6 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-wrapper.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-wrapper.nix @@ -119,11 +119,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto.nix index dae8fb29bc..cf7784670b 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto.nix @@ -141,11 +141,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }) // { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-data.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-data.nix new file mode 100644 index 0000000000..4c4fa88364 --- /dev/null +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-data.nix @@ -0,0 +1,80 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "cardano-data"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Specialized data for Cardano project"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.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."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (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")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + ]; + buildable = true; + modules = [ + "Data/AbstractSize" + "Data/Relation" + "Data/CanonicalMaps" + "Data/MemoBytes" + "Data/Coders" + "Data/Pulse" + "Data/Sharing" + "Data/BiMap" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/cardano-data; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-alonzo.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-alonzo.nix index ea744a03ef..32981e8b96 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-alonzo.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-alonzo.nix @@ -39,11 +39,11 @@ (hsPkgs."base64-bytestring" or (errorHandler.buildDepError "base64-bytestring")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default" or (errorHandler.buildDepError "data-default")) @@ -56,6 +56,7 @@ (hsPkgs."plutus-core" or (errorHandler.buildDepError "plutus-core")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -92,11 +93,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron-test.nix index c782568df7..7e0c205a50 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron-test.nix @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron.nix index 5e4cf422f4..7a3547c08a 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron.nix @@ -208,6 +208,7 @@ "Test/Cardano/Chain/Byron/API" "Test/Cardano/Chain/Buildable" "Test/Cardano/Chain/Common/Address" + "Test/Cardano/Chain/Common/Attributes" "Test/Cardano/Chain/Common/CBOR" "Test/Cardano/Chain/Common/Compact" "Test/Cardano/Chain/Common/Example" @@ -286,13 +287,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/eras/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-core.nix index 5cff5b972b..630bf54eb5 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-core.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-core.nix @@ -42,9 +42,11 @@ (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) @@ -57,6 +59,7 @@ (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -91,13 +94,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-ledger-core; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-ledger-core; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-pretty.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-pretty.nix index a3303d5079..f3dcbfc270 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-pretty.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-pretty.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) @@ -44,10 +45,12 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -64,11 +67,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-ma.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-ma.nix index d0f9bedf8b..ea895fb7f4 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-ma.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-ma.nix @@ -38,6 +38,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -52,6 +53,7 @@ (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -76,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-test.nix index fc8a7a7a9f..255b8bf7a7 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-test.nix @@ -58,6 +58,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -73,6 +74,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -88,6 +90,7 @@ buildable = true; modules = [ "Test/Cardano/Crypto/VRF/Fake" + "Test/Cardano/Ledger/TerseTools" "Test/Cardano/Ledger/Shelley/Address/Bootstrap" "Test/Cardano/Ledger/Shelley/Address/CompactAddr" "Test/Cardano/Ledger/Shelley/BenchmarkFunctions" @@ -141,6 +144,7 @@ (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) @@ -152,6 +156,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) @@ -161,6 +166,7 @@ (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -174,6 +180,7 @@ buildable = true; modules = [ "Test/Control/Iterate/SetAlgebra" + "Test/Control/Iterate/SplitMapRules" "Test/Cardano/Ledger/Shelley/Examples" "Test/Cardano/Ledger/Shelley/Examples/Combinators" "Test/Cardano/Ledger/Shelley/Examples/EmptyBlock" @@ -211,6 +218,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -223,6 +231,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -242,11 +251,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley.nix index 5c5b4f4cdc..4c6eb72636 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley.nix @@ -41,12 +41,14 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."constraints" or (errorHandler.buildDepError "constraints")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) @@ -54,9 +56,11 @@ (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -69,7 +73,6 @@ "Cardano/Ledger/Chain" "Cardano/Ledger/Shelley" "Cardano/Ledger/Shelley/Constraints" - "Cardano/Ledger/Shelley/Address" "Cardano/Ledger/Shelley/Address/Bootstrap" "Cardano/Ledger/Shelley/API" "Cardano/Ledger/Shelley/API/ByronTranslation" @@ -78,31 +81,24 @@ "Cardano/Ledger/Shelley/API/Validation" "Cardano/Ledger/Shelley/API/Wallet" "Cardano/Ledger/Shelley/API/Mempool" - "Cardano/Ledger/Shelley/BaseTypes" "Cardano/Ledger/Shelley/BlockChain" "Cardano/Ledger/Shelley/CompactAddr" - "Cardano/Ledger/Shelley/Credential" "Cardano/Ledger/Shelley/Delegation/Certificates" "Cardano/Ledger/Shelley/Delegation/PoolParams" "Cardano/Ledger/Shelley/EpochBoundary" "Cardano/Ledger/Shelley/Genesis" "Cardano/Ledger/Shelley/HardForks" - "Cardano/Ledger/Shelley/Keys" "Cardano/Ledger/Shelley/LedgerState" "Cardano/Ledger/Shelley/Metadata" - "Cardano/Ledger/Shelley/OCert" "Cardano/Ledger/Shelley/Orphans" - "Cardano/Ledger/Shelley/OverlaySchedule" "Cardano/Ledger/Shelley/PParams" "Cardano/Ledger/Shelley/Rewards" "Cardano/Ledger/Shelley/RewardProvenance" "Cardano/Ledger/Shelley/RewardUpdate" "Cardano/Ledger/Shelley/Scripts" - "Cardano/Ledger/Shelley/Slot" "Cardano/Ledger/Shelley/SoftForks" "Cardano/Ledger/Shelley/StabilityWindow" "Cardano/Ledger/Shelley/Rules/Bbody" - "Cardano/Ledger/Shelley/Rules/Chain" "Cardano/Ledger/Shelley/Rules/Deleg" "Cardano/Ledger/Shelley/Rules/Delegs" "Cardano/Ledger/Shelley/Rules/Delpl" @@ -113,16 +109,12 @@ "Cardano/Ledger/Shelley/Rules/Mir" "Cardano/Ledger/Shelley/Rules/NewEpoch" "Cardano/Ledger/Shelley/Rules/Newpp" - "Cardano/Ledger/Shelley/Rules/Ocert" - "Cardano/Ledger/Shelley/Rules/Overlay" "Cardano/Ledger/Shelley/Rules/Pool" "Cardano/Ledger/Shelley/Rules/PoolReap" "Cardano/Ledger/Shelley/Rules/Ppup" - "Cardano/Ledger/Shelley/Rules/Prtcl" "Cardano/Ledger/Shelley/Rules/Rupd" "Cardano/Ledger/Shelley/Rules/Snap" "Cardano/Ledger/Shelley/Rules/Tick" - "Cardano/Ledger/Shelley/Rules/Tickn" "Cardano/Ledger/Shelley/Rules/Updn" "Cardano/Ledger/Shelley/Rules/Upec" "Cardano/Ledger/Shelley/Rules/Utxo" @@ -136,11 +128,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-numeric.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-numeric.nix index c44b5eb551..0263cb43d1 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-numeric.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-numeric.nix @@ -61,11 +61,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude-test.nix index 10b98291af..5e2ac56fce 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude-test.nix @@ -92,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude.nix index 8f75670bc3..229b2f48b7 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude.nix @@ -84,11 +84,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-protocol-tpraos.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-protocol-tpraos.nix index f437562ec9..9b16292698 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-protocol-tpraos.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-protocol-tpraos.nix @@ -45,12 +45,12 @@ (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; modules = [ - "Cardano/Protocol/TPraos" "Cardano/Protocol/TPraos/BHeader" "Cardano/Protocol/TPraos/OCert" "Cardano/Protocol/TPraos/Rules/OCert" @@ -64,13 +64,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-slotting.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-slotting.nix index 26cab8f9ff..5f76a0c5cb 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-slotting.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-slotting.nix @@ -59,11 +59,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-cli.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-cli.nix index 41f76a72e2..43ca25c69e 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-cli.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-cli"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-cli"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core-integration.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core-integration.nix index b74535f36f..18e9566dc6 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core-integration.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core-integration.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-core-integration"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -142,11 +142,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core.nix index 00e5957e5a..18b046f305 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-core"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-core"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -118,14 +118,14 @@ (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-client" or (errorHandler.buildDepError "servant-client")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."split" or (errorHandler.buildDepError "split")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."statistics" or (errorHandler.buildDepError "statistics")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streaming-commons" or (errorHandler.buildDepError "streaming-commons")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."string-interpolate" or (errorHandler.buildDepError "string-interpolate")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -164,6 +164,7 @@ "Cardano/Pool/DB/Sqlite/TH" "Cardano/Pool/Metadata" "Cardano/Wallet" + "Cardano/Wallet/Address/Pool" "Cardano/Wallet/Api" "Cardano/Wallet/Api/Client" "Cardano/Wallet/Api/Link" @@ -176,6 +177,7 @@ "Cardano/Wallet/DB/MVar" "Cardano/Wallet/DB/Model" "Cardano/Wallet/DB/Sqlite" + "Cardano/Wallet/DB/Sqlite/AddressBook" "Cardano/Wallet/DB/Sqlite/CheckpointsOld" "Cardano/Wallet/DB/Sqlite/Migration" "Cardano/Wallet/DB/Sqlite/TH" @@ -327,7 +329,6 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."pretty-simple" or (errorHandler.buildDepError "pretty-simple")) (hsPkgs."regex-pcre-builtin" or (errorHandler.buildDepError "regex-pcre-builtin")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."OddWord" or (errorHandler.buildDepError "OddWord")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -340,7 +341,6 @@ (hsPkgs."scrypt" or (errorHandler.buildDepError "scrypt")) (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."should-not-typecheck" or (errorHandler.buildDepError "should-not-typecheck")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) @@ -376,6 +376,7 @@ "Cardano/Pool/DB/MVarSpec" "Cardano/Pool/DB/Properties" "Cardano/Pool/DB/SqliteSpec" + "Cardano/Wallet/Address/PoolSpec" "Cardano/Wallet/Api/Malformed" "Cardano/Wallet/Api/Server/TlsSpec" "Cardano/Wallet/Api/ServerSpec" @@ -477,11 +478,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-launcher.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-launcher.nix index 579decfe38..d13b5ffa73 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-launcher.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-launcher.nix @@ -11,10 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { - name = "cardano-wallet-launcher"; - version = "2021.12.15"; - }; + identifier = { name = "cardano-wallet-launcher"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -95,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-test-utils.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-test-utils.nix index 6ba57158f9..fcce82b313 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-test-utils.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-test-utils.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-test-utils"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet.nix index 9aee178ec7..8e5e9eddb6 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2020 IOHK"; maintainer = "operations@iohk.io"; @@ -84,7 +84,6 @@ (hsPkgs."retry" or (errorHandler.buildDepError "retry")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) @@ -188,8 +187,11 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-addresses" or (errorHandler.buildDepError "cardano-addresses")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) + (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-wallet" or (errorHandler.buildDepError "cardano-wallet")) (hsPkgs."cardano-wallet-core" or (errorHandler.buildDepError "cardano-wallet-core")) @@ -204,6 +206,7 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."fmt" or (errorHandler.buildDepError "fmt")) + (hsPkgs."generic-arbitrary" or (errorHandler.buildDepError "generic-arbitrary")) (hsPkgs."generic-lens" or (errorHandler.buildDepError "generic-lens")) (hsPkgs."hspec-core" or (errorHandler.buildDepError "hspec-core")) (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) @@ -215,7 +218,6 @@ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."text-class" or (errorHandler.buildDepError "text-class")) @@ -323,11 +325,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/compact-map.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/compact-map.nix new file mode 100644 index 0000000000..b7c0e80e91 --- /dev/null +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/compact-map.nix @@ -0,0 +1,110 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "compact-map"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "A KeyMap that is based on collisionless HashMap implementation"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."vector" or (errorHandler.buildDepError "vector")) + (hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms")) + ]; + buildable = true; + modules = [ + "Data/Compact/KVVector" + "Data/Compact/KeyMap" + "Data/Compact/HashMap" + "Data/Compact/VMap" + "Data/Compact/SmallArray" + "Data/Compact/SplitMap" + ]; + hsSourceDirs = [ "src" ]; + }; + tests = { + "tests" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."quickcheck-classes-base" or (errorHandler.buildDepError "quickcheck-classes-base")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + modules = [ + "Test/Compact/SplitMap" + "Test/Compact/KeyMap" + "Test/Compact/VMap" + ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; + benchmarks = { + "bench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + hsSourceDirs = [ "bench" ]; + }; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/compact-map; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/contra-tracer.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/contra-tracer.nix index d9968adc85..7a24d0f661 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/contra-tracer.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/contra-tracer.nix @@ -42,11 +42,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/dbvar.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/dbvar.nix index e84f481172..86c53051f9 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/dbvar.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/dbvar.nix @@ -45,6 +45,7 @@ (hsPkgs."safe" or (errorHandler.buildDepError "safe")) (hsPkgs."say" or (errorHandler.buildDepError "say")) (hsPkgs."semigroupoids" or (errorHandler.buildDepError "semigroupoids")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; @@ -81,11 +82,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/flat.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/flat.nix index 06c4c66217..83ae97a9a5 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/flat.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/flat.nix @@ -224,11 +224,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }) // { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/io-classes.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/io-classes.nix index b68712e663..e1dde418dd 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/io-classes.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/io-classes.nix @@ -48,7 +48,6 @@ "Control/Monad/Class/MonadSay" "Control/Monad/Class/MonadST" "Control/Monad/Class/MonadSTM" - "Control/Monad/Class/MonadSTM/Strict" "Control/Monad/Class/MonadThrow" "Control/Monad/Class/MonadTime" "Control/Monad/Class/MonadTimer" diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/io-sim.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/io-sim.nix index 2ba20839d1..22a10c86d1 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/io-sim.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/io-sim.nix @@ -58,6 +58,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."time" or (errorHandler.buildDepError "time")) diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/iohk-monitoring.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/iohk-monitoring.nix index 3d657f5bb7..ee9ed01c0a 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/iohk-monitoring.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/iohk-monitoring.nix @@ -180,11 +180,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-aggregation.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-aggregation.nix deleted file mode 100644 index 85602eda5e..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-aggregation.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-aggregation"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation to aggregate traced values"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Aggregation" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-ekg.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-ekg.nix index ac6ec28b62..0097328bd0 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-ekg.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-ekg.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-monitoring.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-monitoring.nix deleted file mode 100644 index 04c8dc69c1..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-monitoring.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-backend-monitoring"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation for monitoring"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Monitoring" ]; - hsSourceDirs = [ "src" ]; - }; - tests = { - "tests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."lobemo-backend-monitoring" or (errorHandler.buildDepError "lobemo-backend-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."clock" or (errorHandler.buildDepError "clock")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."semigroups" or (errorHandler.buildDepError "semigroups")) - (hsPkgs."split" or (errorHandler.buildDepError "split")) - (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."temporary" or (errorHandler.buildDepError "temporary")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."time-units" or (errorHandler.buildDepError "time-units")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - (hsPkgs."vector" or (errorHandler.buildDepError "vector")) - (hsPkgs."void" or (errorHandler.buildDepError "void")) - (hsPkgs."yaml" or (errorHandler.buildDepError "yaml")) - (hsPkgs."libyaml" or (errorHandler.buildDepError "libyaml")) - ]; - buildable = true; - modules = [ "Cardano/BM/Test/Monitoring" ]; - hsSourceDirs = [ "test" ]; - mainPath = [ "Test.lhs" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-trace-forwarder.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-trace-forwarder.nix deleted file mode 100644 index 38c57593bb..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-trace-forwarder.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-trace-forwarder"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2020 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "this backend forwards log items to a trace acceptor"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unix-compat" or (errorHandler.buildDepError "unix-compat")) - ]; - buildable = true; - modules = [ "Cardano/BM/Backend/TraceForwarder" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-scribe-systemd.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-scribe-systemd.nix deleted file mode 100644 index f68109f212..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-scribe-systemd.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-scribe-systemd"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend for logging to systemd/journal"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."katip" or (errorHandler.buildDepError "katip")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ - (hsPkgs."unix" or (errorHandler.buildDepError "unix")) - ])) ++ (pkgs.lib).optionals (system.isLinux) [ - (hsPkgs."hsyslog" or (errorHandler.buildDepError "hsyslog")) - (hsPkgs."libsystemd-journal" or (errorHandler.buildDepError "libsystemd-journal")) - ]; - buildable = true; - modules = [ "Cardano/BM/Scribe/Systemd" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/measures.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/measures.nix index 4de6596185..f38b7ca289 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/measures.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/measures.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/network-mux.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/network-mux.nix index 4185c94cf8..771ff1ce01 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/network-mux.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/network-mux.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."array" or (errorHandler.buildDepError "array")) @@ -106,6 +107,7 @@ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -124,6 +126,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/non-integral.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/non-integral.nix index 2ba9fc0cad..c8fbe9288f 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/non-integral.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/non-integral.nix @@ -53,11 +53,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/orphans-deriving-via.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/orphans-deriving-via.nix index 6aad6f59fd..a8d90bea4d 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/orphans-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/orphans-deriving-via.nix @@ -45,11 +45,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-cardano.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-cardano.nix index dbe4146d50..04575fe3e6 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-cardano.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-cardano.nix @@ -55,6 +55,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) ]; buildable = true; @@ -85,6 +86,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-protocol.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-protocol.nix new file mode 100644 index 0000000000..d9566217e2 --- /dev/null +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-protocol.nix @@ -0,0 +1,74 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "3.0"; + identifier = { + name = "ouroboros-consensus-protocol"; + version = "0.1.0.0"; + }; + license = "NONE"; + copyright = ""; + maintainer = "nick@topos.org.uk"; + author = "IOHK Formal methods team"; + homepage = ""; + url = ""; + synopsis = "Cardano consensus protocols."; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (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."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Protocol/Ledger/HotKey" + "Ouroboros/Consensus/Protocol/Ledger/Util" + "Ouroboros/Consensus/Protocol/TPraos" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/ouroboros-consensus-protocol; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-shelley.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-shelley.nix index 17d6492285..ae8318eace 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-shelley.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus-shelley.nix @@ -63,6 +63,7 @@ (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) ]; buildable = true; modules = [ @@ -81,9 +82,6 @@ "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" ]; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus.nix index 443e7bf3b0..734ade4895 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-consensus.nix @@ -74,6 +74,7 @@ (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")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) ] ++ (if system.isWindows then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] else [ @@ -279,6 +280,7 @@ "Ouroboros/Consensus/Storage/LedgerDB/DiskPolicy" "Ouroboros/Consensus/Storage/LedgerDB/InMemory" "Ouroboros/Consensus/Storage/LedgerDB/OnDisk" + "Ouroboros/Consensus/Storage/LedgerDB/Types" "Ouroboros/Consensus/Storage/Serialisation" "Ouroboros/Consensus/Storage/VolatileDB" "Ouroboros/Consensus/Storage/VolatileDB/API" diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-framework.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-framework.nix index da9da490d6..c600570161 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-framework.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-framework.nix @@ -57,6 +57,8 @@ (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) @@ -147,6 +149,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ]; @@ -179,7 +182,9 @@ (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (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")) diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-testing.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-testing.nix index d269316f85..1b7d3d4d4a 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-testing.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network-testing.nix @@ -34,11 +34,15 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."deque" or (errorHandler.buildDepError "deque")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) ]; buildable = true; @@ -46,9 +50,27 @@ "Ouroboros/Network/Testing/Serialise" "Ouroboros/Network/Testing/QuickCheck" "Ouroboros/Network/Testing/Utils" + "Ouroboros/Network/Testing/Data/Signal" + "Ouroboros/Network/Testing/Data/Script" + "Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; hsSourceDirs = [ "src" ]; }; + tests = { + "test" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + ]; + buildable = true; + modules = [ "Test/Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network.nix index a2f8ac0775..300b74affb 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/ouroboros-network.nix @@ -69,6 +69,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) @@ -94,7 +95,6 @@ "Ouroboros/Network/BlockFetch/Decision" "Ouroboros/Network/BlockFetch/DeltaQ" "Ouroboros/Network/BlockFetch/State" - "Ouroboros/Network/Counter" "Ouroboros/Network/DeltaQ" "Ouroboros/Network/Diffusion" "Ouroboros/Network/Diffusion/P2P" @@ -191,6 +191,8 @@ (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (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."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ]; buildable = true; @@ -286,6 +288,7 @@ (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."ouroboros-network".components.sublibs.ouroboros-protocol-tests or (errorHandler.buildDepError "ouroboros-network:ouroboros-protocol-tests")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ] ++ (pkgs.lib).optionals (system.isWindows) [ @@ -296,7 +299,6 @@ modules = [ "Ouroboros/Network/BlockFetch/Examples" "Ouroboros/Network/MockNode" - "Data/Signal" "Test/AnchoredFragment" "Test/Chain" "Test/LedgerPeers" @@ -315,7 +317,6 @@ "Test/Ouroboros/Network/PeerSelection/Json" "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" @@ -323,8 +324,6 @@ "Test/Socket" "Test/PeerState" "Test/Version" - "Test/QuickCheck/Signal" - "Test/QuickCheck/Utils" ]; hsSourceDirs = [ "test" ]; mainPath = [ "Main.hs" ]; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix index b93438e05e..0a2473e208 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix @@ -638,11 +638,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ghc-stub.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ghc-stub.nix index 702acdd4f1..6051c84a48 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ghc-stub.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ghc-stub.nix @@ -64,11 +64,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ledger-api.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ledger-api.nix index cc612ad49b..46aed214ab 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ledger-api.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ledger-api.nix @@ -108,11 +108,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix index bfacb35c20..dc5e615c63 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix index 0707993c94..639b72d41c 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/prettyprinter-configurable.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/prettyprinter-configurable.nix index b3d636d53f..0dd1d52f67 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/prettyprinter-configurable.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/prettyprinter-configurable.nix @@ -94,11 +94,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/purescript-bridge.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/purescript-bridge.nix index 779c4855dc..1bae22a95f 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/purescript-bridge.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/purescript-bridge.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }) // { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/servant-purescript.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/servant-purescript.nix index c928f543d0..1b46f1751e 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/servant-purescript.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/servant-purescript.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }) // { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/set-algebra.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/set-algebra.nix new file mode 100644 index 0000000000..08f4b27402 --- /dev/null +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/set-algebra.nix @@ -0,0 +1,66 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "set-algebra"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Set Algebra"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."ansi-wl-pprint" or (errorHandler.buildDepError "ansi-wl-pprint")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + ]; + buildable = true; + modules = [ + "Control/Iterate/BaseTypes" + "Control/Iterate/Collect" + "Control/Iterate/Exp" + "Control/Iterate/SetAlgebra" + "Control/SetAlgebra" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/set-algebra; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger-test.nix deleted file mode 100644 index 369c882128..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger-test.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - 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 = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) - ]; - buildable = true; - modules = [ - "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/Rules/ClassifyTraces" - "Test/Shelley/Spec/Ledger/Rules/TestChain" - "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" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/shelley/chain-and-ledger/shelley-spec-ledger-test; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger.nix deleted file mode 100644 index bfb7c934d0..0000000000 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.2"; - identifier = { name = "shelley-spec-ledger"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = ""; - maintainer = "formal.methods@iohk.io"; - author = "IOHK Formal Methods Team"; - homepage = ""; - url = ""; - synopsis = ""; - description = "Shelley Ledger Executable Model"; - buildType = "Simple"; - isLocal = true; - detailLevel = "FullDetails"; - licenseFiles = []; - dataDir = "."; - dataFiles = []; - extraSrcFiles = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) - (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) - ]; - buildable = true; - modules = [ - "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/CompactAddr" - "Shelley/Spec/Ledger/Credential" - "Shelley/Spec/Ledger/Delegation/Certificates" - "Shelley/Spec/Ledger/Delegation/PoolParams" - "Shelley/Spec/Ledger/EpochBoundary" - "Shelley/Spec/Ledger/Genesis" - "Shelley/Spec/Ledger/HardForks" - "Shelley/Spec/Ledger/Keys" - "Shelley/Spec/Ledger/LedgerState" - "Shelley/Spec/Ledger/Metadata" - "Shelley/Spec/Ledger/OCert" - "Shelley/Spec/Ledger/Orphans" - "Shelley/Spec/Ledger/OverlaySchedule" - "Shelley/Spec/Ledger/PParams" - "Shelley/Spec/Ledger/Rewards" - "Shelley/Spec/Ledger/RewardProvenance" - "Shelley/Spec/Ledger/RewardUpdate" - "Shelley/Spec/Ledger/Scripts" - "Shelley/Spec/Ledger/Slot" - "Shelley/Spec/Ledger/SoftForks" - "Shelley/Spec/Ledger/StabilityWindow" - "Shelley/Spec/Ledger/STS/Bbody" - "Shelley/Spec/Ledger/STS/Chain" - "Shelley/Spec/Ledger/STS/Deleg" - "Shelley/Spec/Ledger/STS/Delegs" - "Shelley/Spec/Ledger/STS/Delpl" - "Shelley/Spec/Ledger/STS/Epoch" - "Shelley/Spec/Ledger/STS/EraMapping" - "Shelley/Spec/Ledger/STS/Ledger" - "Shelley/Spec/Ledger/STS/Ledgers" - "Shelley/Spec/Ledger/STS/Mir" - "Shelley/Spec/Ledger/STS/NewEpoch" - "Shelley/Spec/Ledger/STS/Newpp" - "Shelley/Spec/Ledger/STS/Ocert" - "Shelley/Spec/Ledger/STS/Overlay" - "Shelley/Spec/Ledger/STS/Pool" - "Shelley/Spec/Ledger/STS/PoolReap" - "Shelley/Spec/Ledger/STS/Ppup" - "Shelley/Spec/Ledger/STS/Prtcl" - "Shelley/Spec/Ledger/STS/Rupd" - "Shelley/Spec/Ledger/STS/Snap" - "Shelley/Spec/Ledger/STS/Tick" - "Shelley/Spec/Ledger/STS/Tickn" - "Shelley/Spec/Ledger/STS/Updn" - "Shelley/Spec/Ledger/STS/Upec" - "Shelley/Spec/Ledger/STS/Utxo" - "Shelley/Spec/Ledger/STS/Utxow" - "Shelley/Spec/Ledger/Tx" - "Shelley/Spec/Ledger/TxBody" - "Shelley/Spec/Ledger/UTxO" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/eras/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps-test.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps-test.nix index 1c78a14fe9..00193028c1 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps-test.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps-test.nix @@ -88,13 +88,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/semantics/small-steps-test; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/small-steps-test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps.nix index a0e3c65d5d..68a1bfdd52 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps.nix @@ -35,50 +35,33 @@ 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."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")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) ]; buildable = true; modules = [ "Control/State/Transition" "Control/State/Transition/Extended" "Control/State/Transition/Simple" - "Data/AbstractSize" - "Data/Relation" - "Data/CanonicalMaps" - "Data/MemoBytes" - "Data/Coders" - "Data/Pulse" "Control/Provenance" - "Control/Iterate/SetAlgebra" - "Control/Iterate/Collect" - "Control/SetAlgebra" ]; hsSourceDirs = [ "src" ]; }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-containers.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-containers.nix index 1df2c2154c..7f92971ef5 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-containers.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-containers.nix @@ -56,11 +56,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-non-empty-containers.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-non-empty-containers.nix index e96d53df7e..88e516b8db 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-non-empty-containers.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-non-empty-containers.nix @@ -77,11 +77,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-stm.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-stm.nix new file mode 100644 index 0000000000..8712deb215 --- /dev/null +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/strict-stm.nix @@ -0,0 +1,56 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { checktvarinvariant = false; asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "strict-stm"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2019-2021 Input Output (Hong Kong) Ltd."; + maintainer = ""; + author = "Alexander Vieth, Marcin Szamotulski, Duncan Coutts"; + homepage = ""; + url = ""; + synopsis = "Strict STM interface polymorphic over stm implementation."; + description = "The `strict-stm` package gives a strict interface to stm,\ncurrently either one provided by `stm` package for the\n`IO` monad or `io-sim` package for the `IOSim` monad."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + ]; + buildable = true; + modules = [ "Control/Monad/Class/MonadSTM/Strict" ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/strict-stm; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/text-class.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/text-class.nix index 1acb002a25..71b11b0583 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/text-class.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/text-class.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "text-class"; version = "2021.12.15"; }; + identifier = { name = "text-class"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -69,11 +69,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/tracer-transformers.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/tracer-transformers.nix index 23287c1238..73d479a479 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/tracer-transformers.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/tracer-transformers.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/word-array.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/word-array.nix index fa9ae74de5..780a80b0e6 100644 --- a/nix/pkgs/haskell/materialized-linux/.plan.nix/word-array.nix +++ b/nix/pkgs/haskell/materialized-linux/.plan.nix/word-array.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-linux/default.nix b/nix/pkgs/haskell/materialized-linux/default.nix index ef5fa1432d..b2be02c3fb 100644 --- a/nix/pkgs/haskell/materialized-linux/default.nix +++ b/nix/pkgs/haskell/materialized-linux/default.nix @@ -24,7 +24,7 @@ "ghc-boot".revision = (((hackage."ghc-boot")."8.10.4.20210212").revisions).default; "streaming-commons".revision = (((hackage."streaming-commons")."0.2.2.1").revisions).default; "streaming-commons".flags.use-bytestring-builder = false; - "fmt".revision = (((hackage."fmt")."0.6.3.0").revisions).default; + "fmt".revision = (((hackage."fmt")."0.6.1.2").revisions).default; "old-time".revision = (((hackage."old-time")."1.1.0.3").revisions).default; "ral".revision = (((hackage."ral")."0.1").revisions).default; "ral".flags.distributive = true; @@ -40,7 +40,7 @@ "ghc-prim".revision = (((hackage."ghc-prim")."0.6.1").revisions).default; "wl-pprint-text".revision = (((hackage."wl-pprint-text")."1.2.0.1").revisions).default; "command".revision = (((hackage."command")."0.1.1").revisions).default; - "formatting".revision = (((hackage."formatting")."7.1.3").revisions).default; + "formatting".revision = (((hackage."formatting")."6.3.7").revisions).default; "attoparsec-iso8601".revision = (((hackage."attoparsec-iso8601")."1.0.2.0").revisions).default; "attoparsec-iso8601".flags.developer = false; "attoparsec-iso8601".flags.fast = false; @@ -85,6 +85,7 @@ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.11").revisions).default; "ansi-terminal".flags.example = false; "unliftio-core".revision = (((hackage."unliftio-core")."0.2.0.1").revisions).default; + "strict-list".revision = (((hackage."strict-list")."0.1.6").revisions).default; "free".revision = (((hackage."free")."5.1.3").revisions).default; "exceptions".revision = (((hackage."exceptions")."0.10.4").revisions).default; "time-compat".revision = (((hackage."time-compat")."1.9.6.1").revisions).default; @@ -153,7 +154,6 @@ "wai-app-static".flags.print = false; "tree-diff".revision = (((hackage."tree-diff")."0.2.1").revisions).default; "http-types".revision = (((hackage."http-types")."0.12.3").revisions).default; - "Glob".revision = (((hackage."Glob")."0.10.1").revisions).default; "th-reify-many".revision = (((hackage."th-reify-many")."0.1.10").revisions).default; "streaming-bytestring".revision = (((hackage."streaming-bytestring")."0.2.1").revisions).default; "direct-sqlite".revision = (((hackage."direct-sqlite")."2.3.26").revisions).default; @@ -173,9 +173,6 @@ "protolude".revision = (((hackage."protolude")."0.3.0").revisions).default; "protolude".flags.dev = false; "process".revision = (((hackage."process")."1.6.9.0").revisions).default; - "criterion".revision = (((hackage."criterion")."1.5.11.0").revisions).default; - "criterion".flags.embed-data-files = false; - "criterion".flags.fast = false; "newtype-generics".revision = (((hackage."newtype-generics")."0.6").revisions).default; "half".revision = (((hackage."half")."0.3.1").revisions).default; "int-cast".revision = (((hackage."int-cast")."0.2.0.0").revisions).default; @@ -185,7 +182,6 @@ "monad-control".revision = (((hackage."monad-control")."1.0.3.1").revisions).default; "random".revision = (((hackage."random")."1.2.1").revisions).default; "code-page".revision = (((hackage."code-page")."0.2.1").revisions).default; - "pipes-safe".revision = (((hackage."pipes-safe")."2.3.3").revisions).default; "string-conversions".revision = (((hackage."string-conversions")."0.4.0.1").revisions).default; "errors".revision = (((hackage."errors")."2.3.0").revisions).default; "unix-compat".revision = (((hackage."unix-compat")."0.5.3").revisions).default; @@ -217,7 +213,6 @@ "entropy".revision = (((hackage."entropy")."0.4.1.6").revisions).default; "entropy".flags.halvm = false; "hpc".revision = (((hackage."hpc")."0.6.1.0").revisions).default; - "binary-orphans".revision = (((hackage."binary-orphans")."1.0.1").revisions).default; "text-conversions".revision = (((hackage."text-conversions")."0.3.1").revisions).default; "tls".revision = (((hackage."tls")."1.5.5").revisions).default; "tls".flags.compat = true; @@ -257,7 +252,6 @@ "base64-bytestring-type".flags.http-api-data = true; "beam-sqlite".revision = (((hackage."beam-sqlite")."0.5.1.0").revisions).default; "beam-sqlite".flags.werror = false; - "js-chart".revision = (((hackage."js-chart")."2.9.4.1").revisions).default; "vector-algorithms".revision = (((hackage."vector-algorithms")."0.8.0.4").revisions).default; "vector-algorithms".flags.unsafechecks = false; "vector-algorithms".flags.llvm = false; @@ -522,7 +516,6 @@ "semigroups".flags.hashable = true; "semigroups".flags.unordered-containers = true; "semigroups".flags.text = true; - "uniplate".revision = (((hackage."uniplate")."1.6.13").revisions).default; "parsec".revision = (((hackage."parsec")."3.1.14.0").revisions).default; "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.10.4.20210212").revisions).default; "libyaml".revision = (((hackage."libyaml")."0.1.2").revisions).default; @@ -580,6 +573,7 @@ "strict".flags.assoc = true; "http-api-data".revision = (((hackage."http-api-data")."0.4.3").revisions).default; "http-api-data".flags.use-text-show = false; + "deque".revision = (((hackage."deque")."0.4.4").revisions).default; "attoparsec".revision = (((hackage."attoparsec")."0.13.2.5").revisions).default; "attoparsec".flags.developer = false; "persistent-template".revision = (((hackage."persistent-template")."2.12.0.0").revisions).default; @@ -599,8 +593,6 @@ "digest".flags.bytestring-in-base = false; "pem".revision = (((hackage."pem")."0.2.4").revisions).default; "file-embed".revision = (((hackage."file-embed")."0.0.15.0").revisions).default; - "double-conversion".revision = (((hackage."double-conversion")."2.0.2.0").revisions).default; - "double-conversion".flags.developer = false; "colour".revision = (((hackage."colour")."2.3.6").revisions).default; "terminfo".revision = (((hackage."terminfo")."0.4.1.4").revisions).default; "syb".revision = (((hackage."syb")."0.7.2.1").revisions).default; @@ -622,8 +614,6 @@ "comonad".flags.indexed-traversable = true; "comonad".flags.containers = true; "natural-transformation".revision = (((hackage."natural-transformation")."0.4").revisions).default; - "hsyslog".revision = (((hackage."hsyslog")."5.0.2").revisions).default; - "hsyslog".flags.install-examples = false; "lifted-async".revision = (((hackage."lifted-async")."0.10.2.1").revisions).default; "ghc-heap".revision = (((hackage."ghc-heap")."8.10.4.20210212").revisions).default; "dictionary-sharing".revision = (((hackage."dictionary-sharing")."0.1.0.0").revisions).default; @@ -670,7 +660,6 @@ "hourglass".revision = (((hackage."hourglass")."0.2.12").revisions).default; "appar".revision = (((hackage."appar")."0.1.8").revisions).default; "indexed-traversable-instances".revision = (((hackage."indexed-traversable-instances")."0.1").revisions).default; - "libsystemd-journal".revision = (((hackage."libsystemd-journal")."1.4.5").revisions).default; "testing-type-modifiers".revision = (((hackage."testing-type-modifiers")."0.1.0.1").revisions).default; "mime-types".revision = (((hackage."mime-types")."0.1.0.9").revisions).default; "prometheus".revision = (((hackage."prometheus")."2.2.2").revisions).default; @@ -756,7 +745,9 @@ typed-protocols = ./.plan.nix/typed-protocols.nix; ouroboros-network-testing = ./.plan.nix/ouroboros-network-testing.nix; cardano-addresses = ./.plan.nix/cardano-addresses.nix; + set-algebra = ./.plan.nix/set-algebra.nix; servant-purescript = ./.plan.nix/servant-purescript.nix; + cardano-data = ./.plan.nix/cardano-data.nix; ouroboros-consensus-shelley = ./.plan.nix/ouroboros-consensus-shelley.nix; cardano-slotting = ./.plan.nix/cardano-slotting.nix; playground-common = ./.plan.nix/playground-common.nix; @@ -764,11 +755,9 @@ cardano-protocol-tpraos = ./.plan.nix/cardano-protocol-tpraos.nix; cardano-crypto-class = ./.plan.nix/cardano-crypto-class.nix; cardano-wallet = ./.plan.nix/cardano-wallet.nix; - lobemo-backend-monitoring = ./.plan.nix/lobemo-backend-monitoring.nix; tracer-transformers = ./.plan.nix/tracer-transformers.nix; plutus-tx-plugin = ./.plan.nix/plutus-tx-plugin.nix; measures = ./.plan.nix/measures.nix; - lobemo-scribe-systemd = ./.plan.nix/lobemo-scribe-systemd.nix; quickcheck-dynamic = ./.plan.nix/quickcheck-dynamic.nix; network-mux = ./.plan.nix/network-mux.nix; lobemo-backend-ekg = ./.plan.nix/lobemo-backend-ekg.nix; @@ -784,14 +773,15 @@ cardano-binary-test = ./.plan.nix/cardano-binary-test.nix; plutus-core = ./.plan.nix/plutus-core.nix; cardano-prelude-test = ./.plan.nix/cardano-prelude-test.nix; + ouroboros-consensus-protocol = ./.plan.nix/ouroboros-consensus-protocol.nix; plutus-pab = ./.plan.nix/plutus-pab.nix; typed-protocols-examples = ./.plan.nix/typed-protocols-examples.nix; - cardano-crypto-tests = ./.plan.nix/cardano-crypto-tests.nix; freer-extras = ./.plan.nix/freer-extras.nix; cardano-ledger-byron-test = ./.plan.nix/cardano-ledger-byron-test.nix; plutus-tx = ./.plan.nix/plutus-tx.nix; cardano-wallet-test-utils = ./.plan.nix/cardano-wallet-test-utils.nix; base-deriving-via = ./.plan.nix/base-deriving-via.nix; + strict-stm = ./.plan.nix/strict-stm.nix; non-integral = ./.plan.nix/non-integral.nix; plutus-contract = ./.plan.nix/plutus-contract.nix; iohk-monitoring = ./.plan.nix/iohk-monitoring.nix; @@ -799,7 +789,6 @@ cardano-crypto-test = ./.plan.nix/cardano-crypto-test.nix; web-ghc = ./.plan.nix/web-ghc.nix; cardano-ledger-byron = ./.plan.nix/cardano-ledger-byron.nix; - shelley-spec-ledger-test = ./.plan.nix/shelley-spec-ledger-test.nix; cardano-api = ./.plan.nix/cardano-api.nix; ouroboros-consensus = ./.plan.nix/ouroboros-consensus.nix; cardano-binary = ./.plan.nix/cardano-binary.nix; @@ -808,7 +797,7 @@ ntp-client = ./.plan.nix/ntp-client.nix; text-class = ./.plan.nix/text-class.nix; ouroboros-network-framework = ./.plan.nix/ouroboros-network-framework.nix; - lobemo-backend-aggregation = ./.plan.nix/lobemo-backend-aggregation.nix; + compact-map = ./.plan.nix/compact-map.nix; plutus-chain-index-core = ./.plan.nix/plutus-chain-index-core.nix; plutus-ledger-api = ./.plan.nix/plutus-ledger-api.nix; io-classes = ./.plan.nix/io-classes.nix; @@ -829,12 +818,10 @@ cardano-ledger-core = ./.plan.nix/cardano-ledger-core.nix; cardano-ledger-shelley-ma = ./.plan.nix/cardano-ledger-shelley-ma.nix; goblins = ./.plan.nix/goblins.nix; - lobemo-backend-trace-forwarder = ./.plan.nix/lobemo-backend-trace-forwarder.nix; cardano-addresses-cli = ./.plan.nix/cardano-addresses-cli.nix; prettyprinter-configurable = ./.plan.nix/prettyprinter-configurable.nix; cardano-numeric = ./.plan.nix/cardano-numeric.nix; cardano-crypto = ./.plan.nix/cardano-crypto.nix; - shelley-spec-ledger = ./.plan.nix/shelley-spec-ledger.nix; strict-containers = ./.plan.nix/strict-containers.nix; word-array = ./.plan.nix/word-array.nix; }; @@ -869,7 +856,9 @@ "cardano-addresses" = { flags = { "release" = lib.mkOverride 900 false; }; }; + "set-algebra" = { flags = {}; }; "servant-purescript" = { flags = {}; }; + "cardano-data" = { flags = {}; }; "ouroboros-consensus-shelley" = { flags = { "asserts" = lib.mkOverride 900 false; }; }; @@ -887,7 +876,6 @@ "cardano-wallet" = { flags = { "release" = lib.mkOverride 900 false; }; }; - "lobemo-backend-monitoring" = { flags = {}; }; "tracer-transformers" = { flags = {}; }; "plutus-tx-plugin" = { flags = { "use-ghc-stub" = lib.mkOverride 900 false; }; @@ -895,7 +883,6 @@ "measures" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-scribe-systemd" = { flags = {}; }; "quickcheck-dynamic" = { flags = {}; }; "network-mux" = { flags = { @@ -933,13 +920,13 @@ "cardano-prelude-test" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "ouroboros-consensus-protocol" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "plutus-pab" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; "typed-protocols-examples" = { flags = {}; }; - "cardano-crypto-tests" = { - flags = { "development" = lib.mkOverride 900 false; }; - }; "freer-extras" = { flags = {}; }; "cardano-ledger-byron-test" = { flags = {}; }; "plutus-tx" = { flags = {}; }; @@ -949,6 +936,12 @@ "base-deriving-via" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "strict-stm" = { + flags = { + "checktvarinvariant" = lib.mkOverride 900 false; + "asserts" = lib.mkOverride 900 false; + }; + }; "non-integral" = { flags = {}; }; "plutus-contract" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; @@ -967,7 +960,6 @@ "cardano-ledger-byron" = { flags = { "test-normal-form" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger-test" = { flags = {}; }; "cardano-api" = { flags = {}; }; "ouroboros-consensus" = { flags = { "asserts" = lib.mkOverride 900 false; }; @@ -984,7 +976,7 @@ "ntp-client" = { flags = { "demo" = lib.mkOverride 900 true; }; }; "text-class" = { flags = { "release" = lib.mkOverride 900 false; }; }; "ouroboros-network-framework" = { flags = {}; }; - "lobemo-backend-aggregation" = { flags = {}; }; + "compact-map" = { flags = {}; }; "plutus-chain-index-core" = { flags = {}; }; "plutus-ledger-api" = { flags = {}; }; "io-classes" = { @@ -1022,7 +1014,6 @@ "goblins" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-backend-trace-forwarder" = { flags = {}; }; "cardano-addresses-cli" = { flags = { "release" = lib.mkOverride 900 false; }; }; @@ -1036,7 +1027,6 @@ "golden-tests" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger" = { flags = {}; }; "strict-containers" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -1068,6 +1058,7 @@ "semigroupoids".components.setup.planned = lib.mkOverride 900 true; "row-types".components.library.planned = lib.mkOverride 900 true; "streaming".components.library.planned = lib.mkOverride 900 true; + "strict-stm".components.library.planned = lib.mkOverride 900 true; "containers".components.library.planned = lib.mkOverride 900 true; "lens".components.library.planned = lib.mkOverride 900 true; "io-sim".components.library.planned = lib.mkOverride 900 true; @@ -1154,7 +1145,6 @@ "extra".components.library.planned = lib.mkOverride 900 true; "base-compat-batteries".components.library.planned = lib.mkOverride 900 true; "doctest".components.exes."doctest".planned = lib.mkOverride 900 true; - "lobemo-backend-trace-forwarder".components.library.planned = lib.mkOverride 900 true; "hsc2hs".components.exes."hsc2hs".planned = lib.mkOverride 900 true; "word-array".components.library.planned = lib.mkOverride 900 true; "unix-time".components.library.planned = lib.mkOverride 900 true; @@ -1168,7 +1158,6 @@ "warp-tls".components.library.planned = lib.mkOverride 900 true; "mime-types".components.library.planned = lib.mkOverride 900 true; "prettyprinter-configurable".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger".components.library.planned = lib.mkOverride 900 true; "testing-type-modifiers".components.library.planned = lib.mkOverride 900 true; "prometheus".components.library.planned = lib.mkOverride 900 true; "bech32".components.exes."bech32".planned = lib.mkOverride 900 true; @@ -1180,7 +1169,6 @@ "hourglass".components.library.planned = lib.mkOverride 900 true; "signal".components.exes."test".planned = lib.mkOverride 900 true; "indexed-traversable-instances".components.library.planned = lib.mkOverride 900 true; - "libsystemd-journal".components.library.planned = lib.mkOverride 900 true; "appar".components.library.planned = lib.mkOverride 900 true; "plutus-pab-executables".components.tests."plutus-pab-test-full-long-running".planned = lib.mkOverride 900 true; "hspec-discover".components.exes."hspec-discover".planned = lib.mkOverride 900 true; @@ -1194,7 +1182,6 @@ "statistics".components.library.planned = lib.mkOverride 900 true; "sqlite-simple".components.library.planned = lib.mkOverride 900 true; "lifted-async".components.library.planned = lib.mkOverride 900 true; - "hsyslog".components.library.planned = lib.mkOverride 900 true; "ghc-heap".components.library.planned = lib.mkOverride 900 true; "filelock".components.library.planned = lib.mkOverride 900 true; "type-equality".components.library.planned = lib.mkOverride 900 true; @@ -1217,6 +1204,7 @@ "cardano-prelude-test".components.library.planned = lib.mkOverride 900 true; "base64-bytestring".components.library.planned = lib.mkOverride 900 true; "cardano-binary-test".components.library.planned = lib.mkOverride 900 true; + "ouroboros-consensus-protocol".components.library.planned = lib.mkOverride 900 true; "gray-code".components.library.planned = lib.mkOverride 900 true; "regex-base".components.library.planned = lib.mkOverride 900 true; "asn1-parse".components.library.planned = lib.mkOverride 900 true; @@ -1226,6 +1214,7 @@ "adjunctions".components.library.planned = lib.mkOverride 900 true; "http-api-data".components.library.planned = lib.mkOverride 900 true; "plutus-chain-index".components.library.planned = lib.mkOverride 900 true; + "deque".components.library.planned = lib.mkOverride 900 true; "plutus-ledger-constraints".components.library.planned = lib.mkOverride 900 true; "pem".components.library.planned = lib.mkOverride 900 true; "strict-non-empty-containers".components.library.planned = lib.mkOverride 900 true; @@ -1238,7 +1227,6 @@ "persistent-template".components.library.planned = lib.mkOverride 900 true; "unix-bytestring".components.library.planned = lib.mkOverride 900 true; "generic-lens".components.library.planned = lib.mkOverride 900 true; - "double-conversion".components.library.planned = lib.mkOverride 900 true; "file-embed".components.library.planned = lib.mkOverride 900 true; "colour".components.library.planned = lib.mkOverride 900 true; "terminfo".components.library.planned = lib.mkOverride 900 true; @@ -1270,7 +1258,6 @@ "hspec-discover".components.library.planned = lib.mkOverride 900 true; "orphans-deriving-via".components.library.planned = lib.mkOverride 900 true; "optparse-applicative".components.library.planned = lib.mkOverride 900 true; - "pipes-safe".components.library.planned = lib.mkOverride 900 true; "string-conversions".components.library.planned = lib.mkOverride 900 true; "plutus-ledger".components.library.planned = lib.mkOverride 900 true; "unix-compat".components.library.planned = lib.mkOverride 900 true; @@ -1287,12 +1274,10 @@ "ouroboros-consensus-byron".components.library.planned = lib.mkOverride 900 true; "tls".components.library.planned = lib.mkOverride 900 true; "process".components.library.planned = lib.mkOverride 900 true; - "criterion".components.library.planned = lib.mkOverride 900 true; "half".components.library.planned = lib.mkOverride 900 true; "contra-tracer".components.library.planned = lib.mkOverride 900 true; "newtype-generics".components.library.planned = lib.mkOverride 900 true; "hpc".components.library.planned = lib.mkOverride 900 true; - "binary-orphans".components.library.planned = lib.mkOverride 900 true; "text-conversions".components.library.planned = lib.mkOverride 900 true; "servant-client-core".components.library.planned = lib.mkOverride 900 true; "aeson-qq".components.library.planned = lib.mkOverride 900 true; @@ -1308,8 +1293,6 @@ "abstract-par".components.library.planned = lib.mkOverride 900 true; "async".components.library.planned = lib.mkOverride 900 true; "protolude".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-monitoring".components.library.planned = lib.mkOverride 900 true; - "Glob".components.library.planned = lib.mkOverride 900 true; "http-types".components.library.planned = lib.mkOverride 900 true; "doctest".components.library.planned = lib.mkOverride 900 true; "conduit".components.library.planned = lib.mkOverride 900 true; @@ -1353,7 +1336,6 @@ "yaml".components.library.planned = lib.mkOverride 900 true; "time-locale-compat".components.library.planned = lib.mkOverride 900 true; "jwt".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger-test".components.library.planned = lib.mkOverride 900 true; "ekg".components.library.planned = lib.mkOverride 900 true; "web-ghc".components.library.planned = lib.mkOverride 900 true; "th-lift-instances".components.library.planned = lib.mkOverride 900 true; @@ -1365,7 +1347,6 @@ "servant".components.library.planned = lib.mkOverride 900 true; "ListLike".components.library.planned = lib.mkOverride 900 true; "conduit-extra".components.library.planned = lib.mkOverride 900 true; - "criterion".components.exes."criterion-report".planned = lib.mkOverride 900 true; "cardano-crypto-wrapper".components.library.planned = lib.mkOverride 900 true; "ansi-terminal".components.library.planned = lib.mkOverride 900 true; "typed-protocols".components.library.planned = lib.mkOverride 900 true; @@ -1388,6 +1369,7 @@ "plutus-pab-executables".components.exes."plutus-pab-nami-demo".planned = lib.mkOverride 900 true; "servant-blaze".components.library.planned = lib.mkOverride 900 true; "ouroboros-network-testing".components.library.planned = lib.mkOverride 900 true; + "strict-list".components.library.planned = lib.mkOverride 900 true; "free".components.library.planned = lib.mkOverride 900 true; "unliftio-core".components.library.planned = lib.mkOverride 900 true; "servant-websockets".components.exes."websocket-stream".planned = lib.mkOverride 900 true; @@ -1448,7 +1430,6 @@ "servant-websockets".components.library.planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."sync-client".planned = lib.mkOverride 900 true; "aeson-casing".components.library.planned = lib.mkOverride 900 true; - "cardano-crypto-tests".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."cardano-wallet".planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."plutus-pab-nami-demo-generator".planned = lib.mkOverride 900 true; "servant-foreign".components.library.planned = lib.mkOverride 900 true; @@ -1541,7 +1522,6 @@ "th-extras".components.library.planned = lib.mkOverride 900 true; "quickcheck-io".components.library.planned = lib.mkOverride 900 true; "beam-sqlite".components.library.planned = lib.mkOverride 900 true; - "js-chart".components.library.planned = lib.mkOverride 900 true; "vector-algorithms".components.library.planned = lib.mkOverride 900 true; "plutus-playground-server".components.sublibs."plutus-playground-usecases".planned = lib.mkOverride 900 true; "megaparsec".components.library.planned = lib.mkOverride 900 true; @@ -1581,7 +1561,6 @@ "temporary".components.library.planned = lib.mkOverride 900 true; "dom-lt".components.library.planned = lib.mkOverride 900 true; "hspec-core".components.library.planned = lib.mkOverride 900 true; - "lobemo-scribe-systemd".components.library.planned = lib.mkOverride 900 true; "hedgehog".components.library.planned = lib.mkOverride 900 true; "system-filepath".components.setup.planned = lib.mkOverride 900 true; "measures".components.library.planned = lib.mkOverride 900 true; @@ -1595,6 +1574,7 @@ "splitmix".components.library.planned = lib.mkOverride 900 true; "generic-lens-core".components.library.planned = lib.mkOverride 900 true; "websockets".components.library.planned = lib.mkOverride 900 true; + "compact-map".components.library.planned = lib.mkOverride 900 true; "x509-store".components.library.planned = lib.mkOverride 900 true; "aeson".components.library.planned = lib.mkOverride 900 true; "th-lift".components.library.planned = lib.mkOverride 900 true; @@ -1605,7 +1585,6 @@ "semigroups".components.library.planned = lib.mkOverride 900 true; "plutus-ledger-api".components.library.planned = lib.mkOverride 900 true; "cardano-binary".components.library.planned = lib.mkOverride 900 true; - "uniplate".components.library.planned = lib.mkOverride 900 true; "parsec".components.library.planned = lib.mkOverride 900 true; "ghc-boot-th".components.library.planned = lib.mkOverride 900 true; "ouroboros-network-framework".components.library.planned = lib.mkOverride 900 true; @@ -1613,7 +1592,6 @@ "time-out".components.library.planned = lib.mkOverride 900 true; "typerep-map".components.library.planned = lib.mkOverride 900 true; "quickcheck-classes".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-aggregation".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."local-cluster".planned = lib.mkOverride 900 true; "data-default".components.library.planned = lib.mkOverride 900 true; "text-class".components.library.planned = lib.mkOverride 900 true; @@ -1630,6 +1608,7 @@ "pqueue".components.library.planned = lib.mkOverride 900 true; "playground-common".components.library.planned = lib.mkOverride 900 true; "lattices".components.library.planned = lib.mkOverride 900 true; + "cardano-data".components.library.planned = lib.mkOverride 900 true; "fin".components.library.planned = lib.mkOverride 900 true; "base-orphans".components.library.planned = lib.mkOverride 900 true; "casing".components.library.planned = lib.mkOverride 900 true; @@ -1649,6 +1628,7 @@ "cardano-wallet-launcher".components.library.planned = lib.mkOverride 900 true; "plutus-core".components.sublibs."index-envs".planned = lib.mkOverride 900 true; "transformers-compat".components.library.planned = lib.mkOverride 900 true; + "set-algebra".components.library.planned = lib.mkOverride 900 true; "fmlist".components.library.planned = lib.mkOverride 900 true; "memory".components.library.planned = lib.mkOverride 900 true; "cardano-protocol-tpraos".components.library.planned = lib.mkOverride 900 true; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/Win32-network.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/Win32-network.nix index 6e544d7038..332eecf10a 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/Win32-network.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/Win32-network.nix @@ -110,11 +110,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }) // { - url = "12"; + url = "14"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/base-deriving-via.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/base-deriving-via.nix index c316b3c2c2..3498dd2300 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/base-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/base-deriving-via.nix @@ -44,11 +44,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-chain.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-chain.nix index 5280c281d8..f65b601581 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-chain.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-chain.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -63,6 +64,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."data-ordlist" or (errorHandler.buildDepError "data-ordlist")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -86,11 +88,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-ledger.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-ledger.nix index d70f5873bc..d2994b4e16 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-ledger.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-ledger.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) @@ -75,6 +76,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) @@ -105,11 +107,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses-cli.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses-cli.nix index 75fedd0ce6..f47dcfdc8c 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses-cli.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses-cli"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses-cli"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -158,11 +158,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses.nix index 8dd6c5c6d7..f1eeb03c9c 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses"; version = "3.6.0"; }; + identifier = { name = "cardano-addresses"; version = "3.7.0"; }; license = "Apache-2.0"; copyright = "2021 IOHK"; maintainer = "operations@iohk.io"; @@ -124,11 +124,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }) // { - url = "6"; + url = "12"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-api.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-api.nix index e8ec8b1c76..219892a95c 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-api.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-api.nix @@ -11,7 +11,7 @@ flags = {}; package = { specVersion = "3.0"; - identifier = { name = "cardano-api"; version = "1.32.1"; }; + identifier = { name = "cardano-api"; version = "1.33.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -46,6 +46,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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")) @@ -54,6 +55,7 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) @@ -68,6 +70,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (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")) @@ -75,8 +78,8 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -236,11 +239,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }) // { - url = "11"; + url = "6"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary-test.nix index fad23992f7..eaf3a09ec0 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary-test.nix @@ -63,11 +63,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary.nix index 1198947dee..9220444ed5 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary.nix @@ -103,11 +103,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-class.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-class.nix index a104df059e..e5ef46c2a9 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-class.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-class.nix @@ -117,11 +117,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-praos.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-praos.nix index 108dee4ab2..14808d689d 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-praos.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-praos.nix @@ -78,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-test.nix index fc4f407b02..72846d7cb0 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-test.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-tests.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-tests.nix deleted file mode 100644 index 8d9a92e93b..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-tests.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ 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" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "4"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/cardano-crypto-tests; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-wrapper.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-wrapper.nix index a66c7eb51e..63a580ccc6 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-wrapper.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-wrapper.nix @@ -119,11 +119,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto.nix index dae8fb29bc..cf7784670b 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto.nix @@ -141,11 +141,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }) // { - url = "3"; + url = "11"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-data.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-data.nix new file mode 100644 index 0000000000..4c4fa88364 --- /dev/null +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-data.nix @@ -0,0 +1,80 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "cardano-data"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Specialized data for Cardano project"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.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."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (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")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + ]; + buildable = true; + modules = [ + "Data/AbstractSize" + "Data/Relation" + "Data/CanonicalMaps" + "Data/MemoBytes" + "Data/Coders" + "Data/Pulse" + "Data/Sharing" + "Data/BiMap" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/cardano-data; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-alonzo.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-alonzo.nix index ea744a03ef..32981e8b96 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-alonzo.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-alonzo.nix @@ -39,11 +39,11 @@ (hsPkgs."base64-bytestring" or (errorHandler.buildDepError "base64-bytestring")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default" or (errorHandler.buildDepError "data-default")) @@ -56,6 +56,7 @@ (hsPkgs."plutus-core" or (errorHandler.buildDepError "plutus-core")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -92,11 +93,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron-test.nix index c782568df7..7e0c205a50 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron-test.nix @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron.nix index 5e4cf422f4..7a3547c08a 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron.nix @@ -208,6 +208,7 @@ "Test/Cardano/Chain/Byron/API" "Test/Cardano/Chain/Buildable" "Test/Cardano/Chain/Common/Address" + "Test/Cardano/Chain/Common/Attributes" "Test/Cardano/Chain/Common/CBOR" "Test/Cardano/Chain/Common/Compact" "Test/Cardano/Chain/Common/Example" @@ -286,13 +287,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/eras/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-core.nix index 5cff5b972b..630bf54eb5 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-core.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-core.nix @@ -42,9 +42,11 @@ (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (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."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) @@ -57,6 +59,7 @@ (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -91,13 +94,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-ledger-core; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-ledger-core; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-pretty.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-pretty.nix index a3303d5079..f3dcbfc270 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-pretty.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-pretty.nix @@ -36,6 +36,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-alonzo" or (errorHandler.buildDepError "cardano-ledger-alonzo")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."cardano-ledger-shelley-ma" or (errorHandler.buildDepError "cardano-ledger-shelley-ma")) @@ -44,10 +45,12 @@ (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) @@ -64,11 +67,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-ma.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-ma.nix index d0f9bedf8b..ea895fb7f4 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-ma.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-ma.nix @@ -38,6 +38,7 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -52,6 +53,7 @@ (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -76,11 +78,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-test.nix index fc8a7a7a9f..255b8bf7a7 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-test.nix @@ -58,6 +58,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -73,6 +74,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -88,6 +90,7 @@ buildable = true; modules = [ "Test/Cardano/Crypto/VRF/Fake" + "Test/Cardano/Ledger/TerseTools" "Test/Cardano/Ledger/Shelley/Address/Bootstrap" "Test/Cardano/Ledger/Shelley/Address/CompactAddr" "Test/Cardano/Ledger/Shelley/BenchmarkFunctions" @@ -141,6 +144,7 @@ (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) (hsPkgs."cardano-ledger-byron" or (errorHandler.buildDepError "cardano-ledger-byron")) @@ -152,6 +156,7 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) @@ -161,6 +166,7 @@ (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -174,6 +180,7 @@ buildable = true; modules = [ "Test/Control/Iterate/SetAlgebra" + "Test/Control/Iterate/SplitMapRules" "Test/Cardano/Ledger/Shelley/Examples" "Test/Cardano/Ledger/Shelley/Examples/Combinators" "Test/Cardano/Ledger/Shelley/Examples/EmptyBlock" @@ -211,6 +218,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-praos" or (errorHandler.buildDepError "cardano-crypto-praos")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) @@ -223,6 +231,7 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (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")) @@ -242,11 +251,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley.nix index 5c5b4f4cdc..4c6eb72636 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley.nix @@ -41,12 +41,14 @@ (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-data" or (errorHandler.buildDepError "cardano-data")) (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-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) (hsPkgs."constraints" or (errorHandler.buildDepError "constraints")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."data-default-class" or (errorHandler.buildDepError "data-default-class")) @@ -54,9 +56,11 @@ (hsPkgs."groups" or (errorHandler.buildDepError "groups")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -69,7 +73,6 @@ "Cardano/Ledger/Chain" "Cardano/Ledger/Shelley" "Cardano/Ledger/Shelley/Constraints" - "Cardano/Ledger/Shelley/Address" "Cardano/Ledger/Shelley/Address/Bootstrap" "Cardano/Ledger/Shelley/API" "Cardano/Ledger/Shelley/API/ByronTranslation" @@ -78,31 +81,24 @@ "Cardano/Ledger/Shelley/API/Validation" "Cardano/Ledger/Shelley/API/Wallet" "Cardano/Ledger/Shelley/API/Mempool" - "Cardano/Ledger/Shelley/BaseTypes" "Cardano/Ledger/Shelley/BlockChain" "Cardano/Ledger/Shelley/CompactAddr" - "Cardano/Ledger/Shelley/Credential" "Cardano/Ledger/Shelley/Delegation/Certificates" "Cardano/Ledger/Shelley/Delegation/PoolParams" "Cardano/Ledger/Shelley/EpochBoundary" "Cardano/Ledger/Shelley/Genesis" "Cardano/Ledger/Shelley/HardForks" - "Cardano/Ledger/Shelley/Keys" "Cardano/Ledger/Shelley/LedgerState" "Cardano/Ledger/Shelley/Metadata" - "Cardano/Ledger/Shelley/OCert" "Cardano/Ledger/Shelley/Orphans" - "Cardano/Ledger/Shelley/OverlaySchedule" "Cardano/Ledger/Shelley/PParams" "Cardano/Ledger/Shelley/Rewards" "Cardano/Ledger/Shelley/RewardProvenance" "Cardano/Ledger/Shelley/RewardUpdate" "Cardano/Ledger/Shelley/Scripts" - "Cardano/Ledger/Shelley/Slot" "Cardano/Ledger/Shelley/SoftForks" "Cardano/Ledger/Shelley/StabilityWindow" "Cardano/Ledger/Shelley/Rules/Bbody" - "Cardano/Ledger/Shelley/Rules/Chain" "Cardano/Ledger/Shelley/Rules/Deleg" "Cardano/Ledger/Shelley/Rules/Delegs" "Cardano/Ledger/Shelley/Rules/Delpl" @@ -113,16 +109,12 @@ "Cardano/Ledger/Shelley/Rules/Mir" "Cardano/Ledger/Shelley/Rules/NewEpoch" "Cardano/Ledger/Shelley/Rules/Newpp" - "Cardano/Ledger/Shelley/Rules/Ocert" - "Cardano/Ledger/Shelley/Rules/Overlay" "Cardano/Ledger/Shelley/Rules/Pool" "Cardano/Ledger/Shelley/Rules/PoolReap" "Cardano/Ledger/Shelley/Rules/Ppup" - "Cardano/Ledger/Shelley/Rules/Prtcl" "Cardano/Ledger/Shelley/Rules/Rupd" "Cardano/Ledger/Shelley/Rules/Snap" "Cardano/Ledger/Shelley/Rules/Tick" - "Cardano/Ledger/Shelley/Rules/Tickn" "Cardano/Ledger/Shelley/Rules/Updn" "Cardano/Ledger/Shelley/Rules/Upec" "Cardano/Ledger/Shelley/Rules/Utxo" @@ -136,11 +128,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-numeric.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-numeric.nix index c44b5eb551..0263cb43d1 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-numeric.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-numeric.nix @@ -61,11 +61,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude-test.nix index 10b98291af..5e2ac56fce 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude-test.nix @@ -92,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude.nix index 8f75670bc3..229b2f48b7 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude.nix @@ -84,11 +84,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }) // { - url = "5"; + url = "10"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-protocol-tpraos.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-protocol-tpraos.nix index f437562ec9..9b16292698 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-protocol-tpraos.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-protocol-tpraos.nix @@ -45,12 +45,12 @@ (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."non-integral" or (errorHandler.buildDepError "non-integral")) + (hsPkgs."set-algebra" or (errorHandler.buildDepError "set-algebra")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; modules = [ - "Cardano/Protocol/TPraos" "Cardano/Protocol/TPraos/BHeader" "Cardano/Protocol/TPraos/OCert" "Cardano/Protocol/TPraos/Rules/OCert" @@ -64,13 +64,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/cardano-protocol-tpraos; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-slotting.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-slotting.nix index 26cab8f9ff..5f76a0c5cb 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-slotting.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-slotting.nix @@ -59,11 +59,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-cli.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-cli.nix index 41f76a72e2..43ca25c69e 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-cli.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-cli"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-cli"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core-integration.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core-integration.nix index b74535f36f..18e9566dc6 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core-integration.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core-integration.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-core-integration"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -142,11 +142,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core.nix index 00e5957e5a..18b046f305 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-core"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet-core"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -118,14 +118,14 @@ (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-client" or (errorHandler.buildDepError "servant-client")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."split" or (errorHandler.buildDepError "split")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."statistics" or (errorHandler.buildDepError "statistics")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streaming-commons" or (errorHandler.buildDepError "streaming-commons")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."string-interpolate" or (errorHandler.buildDepError "string-interpolate")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."text" or (errorHandler.buildDepError "text")) @@ -164,6 +164,7 @@ "Cardano/Pool/DB/Sqlite/TH" "Cardano/Pool/Metadata" "Cardano/Wallet" + "Cardano/Wallet/Address/Pool" "Cardano/Wallet/Api" "Cardano/Wallet/Api/Client" "Cardano/Wallet/Api/Link" @@ -176,6 +177,7 @@ "Cardano/Wallet/DB/MVar" "Cardano/Wallet/DB/Model" "Cardano/Wallet/DB/Sqlite" + "Cardano/Wallet/DB/Sqlite/AddressBook" "Cardano/Wallet/DB/Sqlite/CheckpointsOld" "Cardano/Wallet/DB/Sqlite/Migration" "Cardano/Wallet/DB/Sqlite/TH" @@ -327,7 +329,6 @@ (hsPkgs."plutus-ledger-api" or (errorHandler.buildDepError "plutus-ledger-api")) (hsPkgs."pretty-simple" or (errorHandler.buildDepError "pretty-simple")) (hsPkgs."regex-pcre-builtin" or (errorHandler.buildDepError "regex-pcre-builtin")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."OddWord" or (errorHandler.buildDepError "OddWord")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -340,7 +341,6 @@ (hsPkgs."scrypt" or (errorHandler.buildDepError "scrypt")) (hsPkgs."servant" or (errorHandler.buildDepError "servant")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger-test" or (errorHandler.buildDepError "shelley-spec-ledger-test")) (hsPkgs."should-not-typecheck" or (errorHandler.buildDepError "should-not-typecheck")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) @@ -376,6 +376,7 @@ "Cardano/Pool/DB/MVarSpec" "Cardano/Pool/DB/Properties" "Cardano/Pool/DB/SqliteSpec" + "Cardano/Wallet/Address/PoolSpec" "Cardano/Wallet/Api/Malformed" "Cardano/Wallet/Api/Server/TlsSpec" "Cardano/Wallet/Api/ServerSpec" @@ -477,11 +478,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-launcher.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-launcher.nix index 579decfe38..d13b5ffa73 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-launcher.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-launcher.nix @@ -11,10 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { - name = "cardano-wallet-launcher"; - version = "2021.12.15"; - }; + identifier = { name = "cardano-wallet-launcher"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -95,11 +92,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-test-utils.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-test-utils.nix index 6ba57158f9..fcce82b313 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-test-utils.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-test-utils.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-test-utils"; - version = "2021.12.15"; + version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; @@ -122,11 +122,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet.nix index 9aee178ec7..8e5e9eddb6 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet"; version = "2021.12.15"; }; + identifier = { name = "cardano-wallet"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2020 IOHK"; maintainer = "operations@iohk.io"; @@ -84,7 +84,6 @@ (hsPkgs."retry" or (errorHandler.buildDepError "retry")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."servant-server" or (errorHandler.buildDepError "servant-server")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) (hsPkgs."strict-non-empty-containers" or (errorHandler.buildDepError "strict-non-empty-containers")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) @@ -188,8 +187,11 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-addresses" or (errorHandler.buildDepError "cardano-addresses")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) + (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-wallet" or (errorHandler.buildDepError "cardano-wallet")) (hsPkgs."cardano-wallet-core" or (errorHandler.buildDepError "cardano-wallet-core")) @@ -204,6 +206,7 @@ (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."fmt" or (errorHandler.buildDepError "fmt")) + (hsPkgs."generic-arbitrary" or (errorHandler.buildDepError "generic-arbitrary")) (hsPkgs."generic-lens" or (errorHandler.buildDepError "generic-lens")) (hsPkgs."hspec-core" or (errorHandler.buildDepError "hspec-core")) (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) @@ -215,7 +218,6 @@ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."text-class" or (errorHandler.buildDepError "text-class")) @@ -323,11 +325,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/compact-map.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/compact-map.nix new file mode 100644 index 0000000000..b7c0e80e91 --- /dev/null +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/compact-map.nix @@ -0,0 +1,110 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "compact-map"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "A KeyMap that is based on collisionless HashMap implementation"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."prettyprinter" or (errorHandler.buildDepError "prettyprinter")) + (hsPkgs."primitive" or (errorHandler.buildDepError "primitive")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) + (hsPkgs."vector" or (errorHandler.buildDepError "vector")) + (hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms")) + ]; + buildable = true; + modules = [ + "Data/Compact/KVVector" + "Data/Compact/KeyMap" + "Data/Compact/HashMap" + "Data/Compact/VMap" + "Data/Compact/SmallArray" + "Data/Compact/SplitMap" + ]; + hsSourceDirs = [ "src" ]; + }; + tests = { + "tests" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."quickcheck-classes-base" or (errorHandler.buildDepError "quickcheck-classes-base")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + modules = [ + "Test/Compact/SplitMap" + "Test/Compact/KeyMap" + "Test/Compact/VMap" + ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; + benchmarks = { + "bench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + ]; + buildable = true; + hsSourceDirs = [ "bench" ]; + }; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/compact-map; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/contra-tracer.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/contra-tracer.nix index d9968adc85..7a24d0f661 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/contra-tracer.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/contra-tracer.nix @@ -42,11 +42,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/dbvar.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/dbvar.nix index e84f481172..86c53051f9 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/dbvar.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/dbvar.nix @@ -45,6 +45,7 @@ (hsPkgs."safe" or (errorHandler.buildDepError "safe")) (hsPkgs."say" or (errorHandler.buildDepError "say")) (hsPkgs."semigroupoids" or (errorHandler.buildDepError "semigroupoids")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; @@ -81,11 +82,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/flat.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/flat.nix index 06c4c66217..83ae97a9a5 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/flat.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/flat.nix @@ -224,11 +224,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }) // { - url = "0"; + url = "2"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/io-classes.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/io-classes.nix index b68712e663..e1dde418dd 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/io-classes.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/io-classes.nix @@ -48,7 +48,6 @@ "Control/Monad/Class/MonadSay" "Control/Monad/Class/MonadST" "Control/Monad/Class/MonadSTM" - "Control/Monad/Class/MonadSTM/Strict" "Control/Monad/Class/MonadThrow" "Control/Monad/Class/MonadTime" "Control/Monad/Class/MonadTimer" diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/io-sim.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/io-sim.nix index 2ba20839d1..22a10c86d1 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/io-sim.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/io-sim.nix @@ -58,6 +58,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."time" or (errorHandler.buildDepError "time")) diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/iohk-monitoring.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/iohk-monitoring.nix index 3d657f5bb7..ee9ed01c0a 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/iohk-monitoring.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/iohk-monitoring.nix @@ -180,11 +180,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-aggregation.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-aggregation.nix deleted file mode 100644 index 85602eda5e..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-aggregation.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-aggregation"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation to aggregate traced values"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Aggregation" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-ekg.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-ekg.nix index ac6ec28b62..0097328bd0 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-ekg.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-ekg.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-monitoring.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-monitoring.nix deleted file mode 100644 index 04c8dc69c1..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-monitoring.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-backend-monitoring"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend implementation for monitoring"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ (hsPkgs."unix" or (errorHandler.buildDepError "unix")) ]); - buildable = true; - modules = [ "Cardano/BM/Backend/Monitoring" ]; - hsSourceDirs = [ "src" ]; - }; - tests = { - "tests" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."lobemo-backend-monitoring" or (errorHandler.buildDepError "lobemo-backend-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."clock" or (errorHandler.buildDepError "clock")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."random" or (errorHandler.buildDepError "random")) - (hsPkgs."semigroups" or (errorHandler.buildDepError "semigroups")) - (hsPkgs."split" or (errorHandler.buildDepError "split")) - (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."temporary" or (errorHandler.buildDepError "temporary")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."time-units" or (errorHandler.buildDepError "time-units")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - (hsPkgs."vector" or (errorHandler.buildDepError "vector")) - (hsPkgs."void" or (errorHandler.buildDepError "void")) - (hsPkgs."yaml" or (errorHandler.buildDepError "yaml")) - (hsPkgs."libyaml" or (errorHandler.buildDepError "libyaml")) - ]; - buildable = true; - modules = [ "Cardano/BM/Test/Monitoring" ]; - hsSourceDirs = [ "test" ]; - mainPath = [ "Test.lhs" ]; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-trace-forwarder.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-trace-forwarder.nix deleted file mode 100644 index 38c57593bb..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-trace-forwarder.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { - name = "lobemo-backend-trace-forwarder"; - version = "0.1.0.0"; - }; - license = "Apache-2.0"; - copyright = "2020 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "this backend forwards log items to a trace acceptor"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."unix-compat" or (errorHandler.buildDepError "unix-compat")) - ]; - buildable = true; - modules = [ "Cardano/BM/Backend/TraceForwarder" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-scribe-systemd.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-scribe-systemd.nix deleted file mode 100644 index f68109f212..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-scribe-systemd.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.0"; - identifier = { name = "lobemo-scribe-systemd"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2019 IOHK"; - maintainer = "operations@iohk.io"; - author = "Alexander Diemand"; - homepage = "https://github.com/input-output-hk/iohk-monitoring-framework"; - url = ""; - synopsis = "provides a backend for logging to systemd/journal"; - description = ""; - 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."iohk-monitoring" or (errorHandler.buildDepError "iohk-monitoring")) - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."katip" or (errorHandler.buildDepError "katip")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) - (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) - ] ++ (if system.isWindows - then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] - else [ - (hsPkgs."unix" or (errorHandler.buildDepError "unix")) - ])) ++ (pkgs.lib).optionals (system.isLinux) [ - (hsPkgs."hsyslog" or (errorHandler.buildDepError "hsyslog")) - (hsPkgs."libsystemd-journal" or (errorHandler.buildDepError "libsystemd-journal")) - ]; - buildable = true; - modules = [ "Cardano/BM/Scribe/Systemd" ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "9"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/measures.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/measures.nix index 4de6596185..f38b7ca289 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/measures.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/measures.nix @@ -58,11 +58,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/network-mux.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/network-mux.nix index 4185c94cf8..771ff1ce01 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/network-mux.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/network-mux.nix @@ -35,6 +35,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."array" or (errorHandler.buildDepError "array")) @@ -106,6 +107,7 @@ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -124,6 +126,7 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/non-integral.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/non-integral.nix index 2ba9fc0cad..c8fbe9288f 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/non-integral.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/non-integral.nix @@ -53,11 +53,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/orphans-deriving-via.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/orphans-deriving-via.nix index 6aad6f59fd..a8d90bea4d 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/orphans-deriving-via.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/orphans-deriving-via.nix @@ -45,11 +45,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-cardano.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-cardano.nix index dbe4146d50..04575fe3e6 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-cardano.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-cardano.nix @@ -55,6 +55,7 @@ (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-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) ]; buildable = true; @@ -85,6 +86,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."nothunks" or (errorHandler.buildDepError "nothunks")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."strict-containers" or (errorHandler.buildDepError "strict-containers")) diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-protocol.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-protocol.nix new file mode 100644 index 0000000000..d9566217e2 --- /dev/null +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-protocol.nix @@ -0,0 +1,74 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { asserts = false; }; + package = { + specVersion = "3.0"; + identifier = { + name = "ouroboros-consensus-protocol"; + version = "0.1.0.0"; + }; + license = "NONE"; + copyright = ""; + maintainer = "nick@topos.org.uk"; + author = "IOHK Formal methods team"; + homepage = ""; + url = ""; + synopsis = "Cardano consensus protocols."; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) + (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (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."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + ]; + buildable = true; + modules = [ + "Ouroboros/Consensus/Protocol/Ledger/HotKey" + "Ouroboros/Consensus/Protocol/Ledger/Util" + "Ouroboros/Consensus/Protocol/TPraos" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/ouroboros-consensus-protocol; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-shelley.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-shelley.nix index 17d6492285..ae8318eace 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-shelley.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus-shelley.nix @@ -63,6 +63,7 @@ (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-protocol" or (errorHandler.buildDepError "ouroboros-consensus-protocol")) ]; buildable = true; modules = [ @@ -81,9 +82,6 @@ "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" ]; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus.nix index 443e7bf3b0..734ade4895 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-consensus.nix @@ -74,6 +74,7 @@ (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")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) ] ++ (if system.isWindows then [ (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) ] else [ @@ -279,6 +280,7 @@ "Ouroboros/Consensus/Storage/LedgerDB/DiskPolicy" "Ouroboros/Consensus/Storage/LedgerDB/InMemory" "Ouroboros/Consensus/Storage/LedgerDB/OnDisk" + "Ouroboros/Consensus/Storage/LedgerDB/Types" "Ouroboros/Consensus/Storage/Serialisation" "Ouroboros/Consensus/Storage/VolatileDB" "Ouroboros/Consensus/Storage/VolatileDB/API" diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-framework.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-framework.nix index da9da490d6..c600570161 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-framework.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-framework.nix @@ -57,6 +57,8 @@ (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) @@ -147,6 +149,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ]; @@ -179,7 +182,9 @@ (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."monoidal-synchronisation" or (errorHandler.buildDepError "monoidal-synchronisation")) (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")) diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-testing.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-testing.nix index d269316f85..1b7d3d4d4a 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-testing.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network-testing.nix @@ -34,11 +34,15 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."deque" or (errorHandler.buildDepError "deque")) (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) ]; buildable = true; @@ -46,9 +50,27 @@ "Ouroboros/Network/Testing/Serialise" "Ouroboros/Network/Testing/QuickCheck" "Ouroboros/Network/Testing/Utils" + "Ouroboros/Network/Testing/Data/Signal" + "Ouroboros/Network/Testing/Data/Script" + "Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; hsSourceDirs = [ "src" ]; }; + tests = { + "test" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) + ]; + buildable = true; + modules = [ "Test/Ouroboros/Network/Testing/Data/AbsBearerInfo" ]; + hsSourceDirs = [ "test" ]; + mainPath = [ "Main.hs" ]; + }; + }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network.nix index a2f8ac0775..300b74affb 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/ouroboros-network.nix @@ -69,6 +69,7 @@ (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-cborg" or (errorHandler.buildDepError "typed-protocols-cborg")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) @@ -94,7 +95,6 @@ "Ouroboros/Network/BlockFetch/Decision" "Ouroboros/Network/BlockFetch/DeltaQ" "Ouroboros/Network/BlockFetch/State" - "Ouroboros/Network/Counter" "Ouroboros/Network/DeltaQ" "Ouroboros/Network/Diffusion" "Ouroboros/Network/Diffusion/P2P" @@ -191,6 +191,8 @@ (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (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."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ]; buildable = true; @@ -286,6 +288,7 @@ (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."ouroboros-network".components.sublibs.ouroboros-protocol-tests or (errorHandler.buildDepError "ouroboros-network:ouroboros-protocol-tests")) + (hsPkgs."strict-stm" or (errorHandler.buildDepError "strict-stm")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ] ++ (pkgs.lib).optionals (system.isWindows) [ @@ -296,7 +299,6 @@ modules = [ "Ouroboros/Network/BlockFetch/Examples" "Ouroboros/Network/MockNode" - "Data/Signal" "Test/AnchoredFragment" "Test/Chain" "Test/LedgerPeers" @@ -315,7 +317,6 @@ "Test/Ouroboros/Network/PeerSelection/Json" "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" @@ -323,8 +324,6 @@ "Test/Socket" "Test/PeerState" "Test/Version" - "Test/QuickCheck/Signal" - "Test/QuickCheck/Utils" ]; hsSourceDirs = [ "test" ]; mainPath = [ "Main.hs" ]; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix index b93438e05e..0a2473e208 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix @@ -638,11 +638,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ghc-stub.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ghc-stub.nix index 702acdd4f1..6051c84a48 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ghc-stub.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ghc-stub.nix @@ -64,11 +64,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ledger-api.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ledger-api.nix index cc612ad49b..46aed214ab 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ledger-api.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ledger-api.nix @@ -108,11 +108,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix index bfacb35c20..dc5e615c63 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix index 0707993c94..639b72d41c 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix @@ -125,11 +125,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/prettyprinter-configurable.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/prettyprinter-configurable.nix index b3d636d53f..0dd1d52f67 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/prettyprinter-configurable.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/prettyprinter-configurable.nix @@ -94,11 +94,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/purescript-bridge.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/purescript-bridge.nix index 779c4855dc..1bae22a95f 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/purescript-bridge.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/purescript-bridge.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }) // { - url = "1"; + url = "4"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/servant-purescript.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/servant-purescript.nix index c928f543d0..1b46f1751e 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/servant-purescript.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/servant-purescript.nix @@ -86,11 +86,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }) // { - url = "2"; + url = "3"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/set-algebra.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/set-algebra.nix new file mode 100644 index 0000000000..08f4b27402 --- /dev/null +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/set-algebra.nix @@ -0,0 +1,66 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = {}; + package = { + specVersion = "2.2"; + identifier = { name = "set-algebra"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Set Algebra"; + description = ""; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = []; + dataDir = "."; + dataFiles = []; + extraSrcFiles = [ "CHANGELOG.md" ]; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."ansi-wl-pprint" or (errorHandler.buildDepError "ansi-wl-pprint")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."cardano-data" or (errorHandler.buildDepError "cardano-data")) + (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) + (hsPkgs."compact-map" or (errorHandler.buildDepError "compact-map")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + ]; + buildable = true; + modules = [ + "Control/Iterate/BaseTypes" + "Control/Iterate/Collect" + "Control/Iterate/Exp" + "Control/Iterate/SetAlgebra" + "Control/SetAlgebra" + ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "7"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "7"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/libs/set-algebra; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger-test.nix deleted file mode 100644 index 369c882128..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger-test.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - 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 = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-shelley-test" or (errorHandler.buildDepError "cardano-ledger-shelley-test")) - ]; - buildable = true; - modules = [ - "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/Rules/ClassifyTraces" - "Test/Shelley/Spec/Ledger/Rules/TestChain" - "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" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/shelley/chain-and-ledger/shelley-spec-ledger-test; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger.nix deleted file mode 100644 index bfb7c934d0..0000000000 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.2"; - identifier = { name = "shelley-spec-ledger"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = ""; - maintainer = "formal.methods@iohk.io"; - author = "IOHK Formal Methods Team"; - homepage = ""; - url = ""; - synopsis = ""; - description = "Shelley Ledger Executable Model"; - buildType = "Simple"; - isLocal = true; - detailLevel = "FullDetails"; - licenseFiles = []; - dataDir = "."; - dataFiles = []; - extraSrcFiles = []; - extraTmpFiles = []; - extraDocFiles = []; - }; - components = { - "library" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-ledger-core" or (errorHandler.buildDepError "cardano-ledger-core")) - (hsPkgs."cardano-ledger-shelley" or (errorHandler.buildDepError "cardano-ledger-shelley")) - (hsPkgs."cardano-protocol-tpraos" or (errorHandler.buildDepError "cardano-protocol-tpraos")) - ]; - buildable = true; - modules = [ - "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/CompactAddr" - "Shelley/Spec/Ledger/Credential" - "Shelley/Spec/Ledger/Delegation/Certificates" - "Shelley/Spec/Ledger/Delegation/PoolParams" - "Shelley/Spec/Ledger/EpochBoundary" - "Shelley/Spec/Ledger/Genesis" - "Shelley/Spec/Ledger/HardForks" - "Shelley/Spec/Ledger/Keys" - "Shelley/Spec/Ledger/LedgerState" - "Shelley/Spec/Ledger/Metadata" - "Shelley/Spec/Ledger/OCert" - "Shelley/Spec/Ledger/Orphans" - "Shelley/Spec/Ledger/OverlaySchedule" - "Shelley/Spec/Ledger/PParams" - "Shelley/Spec/Ledger/Rewards" - "Shelley/Spec/Ledger/RewardProvenance" - "Shelley/Spec/Ledger/RewardUpdate" - "Shelley/Spec/Ledger/Scripts" - "Shelley/Spec/Ledger/Slot" - "Shelley/Spec/Ledger/SoftForks" - "Shelley/Spec/Ledger/StabilityWindow" - "Shelley/Spec/Ledger/STS/Bbody" - "Shelley/Spec/Ledger/STS/Chain" - "Shelley/Spec/Ledger/STS/Deleg" - "Shelley/Spec/Ledger/STS/Delegs" - "Shelley/Spec/Ledger/STS/Delpl" - "Shelley/Spec/Ledger/STS/Epoch" - "Shelley/Spec/Ledger/STS/EraMapping" - "Shelley/Spec/Ledger/STS/Ledger" - "Shelley/Spec/Ledger/STS/Ledgers" - "Shelley/Spec/Ledger/STS/Mir" - "Shelley/Spec/Ledger/STS/NewEpoch" - "Shelley/Spec/Ledger/STS/Newpp" - "Shelley/Spec/Ledger/STS/Ocert" - "Shelley/Spec/Ledger/STS/Overlay" - "Shelley/Spec/Ledger/STS/Pool" - "Shelley/Spec/Ledger/STS/PoolReap" - "Shelley/Spec/Ledger/STS/Ppup" - "Shelley/Spec/Ledger/STS/Prtcl" - "Shelley/Spec/Ledger/STS/Rupd" - "Shelley/Spec/Ledger/STS/Snap" - "Shelley/Spec/Ledger/STS/Tick" - "Shelley/Spec/Ledger/STS/Tickn" - "Shelley/Spec/Ledger/STS/Updn" - "Shelley/Spec/Ledger/STS/Upec" - "Shelley/Spec/Ledger/STS/Utxo" - "Shelley/Spec/Ledger/STS/Utxow" - "Shelley/Spec/Ledger/Tx" - "Shelley/Spec/Ledger/TxBody" - "Shelley/Spec/Ledger/UTxO" - ]; - hsSourceDirs = [ "src" ]; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; - rev = "minimal"; - sha256 = ""; - }) // { - url = "10"; - rev = "minimal"; - sha256 = ""; - }; - postUnpack = "sourceRoot+=/eras/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps-test.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps-test.nix index 1c78a14fe9..00193028c1 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps-test.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps-test.nix @@ -88,13 +88,13 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; - postUnpack = "sourceRoot+=/semantics/small-steps-test; echo source root reset to \$sourceRoot"; + postUnpack = "sourceRoot+=/libs/small-steps-test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps.nix index a0e3c65d5d..68a1bfdd52 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps.nix @@ -35,50 +35,33 @@ 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."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")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) ]; buildable = true; modules = [ "Control/State/Transition" "Control/State/Transition/Extended" "Control/State/Transition/Simple" - "Data/AbstractSize" - "Data/Relation" - "Data/CanonicalMaps" - "Data/MemoBytes" - "Data/Coders" - "Data/Pulse" "Control/Provenance" - "Control/Iterate/SetAlgebra" - "Control/Iterate/Collect" - "Control/SetAlgebra" ]; hsSourceDirs = [ "src" ]; }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }) // { - url = "10"; + url = "7"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-containers.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-containers.nix index 1df2c2154c..7f92971ef5 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-containers.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-containers.nix @@ -56,11 +56,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }) // { - url = "4"; + url = "9"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-non-empty-containers.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-non-empty-containers.nix index e96d53df7e..88e516b8db 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-non-empty-containers.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-non-empty-containers.nix @@ -77,11 +77,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-stm.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-stm.nix new file mode 100644 index 0000000000..8712deb215 --- /dev/null +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/strict-stm.nix @@ -0,0 +1,56 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { checktvarinvariant = false; asserts = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "strict-stm"; version = "0.1.0.0"; }; + license = "Apache-2.0"; + copyright = "2019-2021 Input Output (Hong Kong) Ltd."; + maintainer = ""; + author = "Alexander Vieth, Marcin Szamotulski, Duncan Coutts"; + homepage = ""; + url = ""; + synopsis = "Strict STM interface polymorphic over stm implementation."; + description = "The `strict-stm` package gives a strict interface to stm,\ncurrently either one provided by `stm` package for the\n`IO` monad or `io-sim` package for the `IOSim` monad."; + buildType = "Simple"; + isLocal = true; + detailLevel = "FullDetails"; + licenseFiles = [ "LICENSE" "NOTICE" ]; + dataDir = "."; + dataFiles = []; + extraSrcFiles = []; + extraTmpFiles = []; + extraDocFiles = []; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."io-classes" or (errorHandler.buildDepError "io-classes")) + ]; + buildable = true; + modules = [ "Control/Monad/Class/MonadSTM/Strict" ]; + hsSourceDirs = [ "src" ]; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "8"; + rev = "minimal"; + sha256 = ""; + }) // { + url = "8"; + rev = "minimal"; + sha256 = ""; + }; + postUnpack = "sourceRoot+=/strict-stm; echo source root reset to \$sourceRoot"; + } \ No newline at end of file diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/text-class.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/text-class.nix index 1acb002a25..71b11b0583 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/text-class.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/text-class.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "text-class"; version = "2021.12.15"; }; + identifier = { name = "text-class"; version = "2022.1.18"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; @@ -69,11 +69,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }) // { - url = "7"; + url = "5"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/tracer-transformers.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/tracer-transformers.nix index 23287c1238..73d479a479 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/tracer-transformers.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/tracer-transformers.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }) // { - url = "9"; + url = "0"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/word-array.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/word-array.nix index fa9ae74de5..780a80b0e6 100644 --- a/nix/pkgs/haskell/materialized-windows/.plan.nix/word-array.nix +++ b/nix/pkgs/haskell/materialized-windows/.plan.nix/word-array.nix @@ -73,11 +73,11 @@ }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }) // { - url = "14"; + url = "1"; rev = "minimal"; sha256 = ""; }; diff --git a/nix/pkgs/haskell/materialized-windows/default.nix b/nix/pkgs/haskell/materialized-windows/default.nix index 65148ac901..62e59910c4 100644 --- a/nix/pkgs/haskell/materialized-windows/default.nix +++ b/nix/pkgs/haskell/materialized-windows/default.nix @@ -24,7 +24,7 @@ "ghc-boot".revision = (((hackage."ghc-boot")."8.10.4.20210212").revisions).default; "streaming-commons".revision = (((hackage."streaming-commons")."0.2.2.1").revisions).default; "streaming-commons".flags.use-bytestring-builder = false; - "fmt".revision = (((hackage."fmt")."0.6.3.0").revisions).default; + "fmt".revision = (((hackage."fmt")."0.6.1.2").revisions).default; "old-time".revision = (((hackage."old-time")."1.1.0.3").revisions).default; "ral".revision = (((hackage."ral")."0.1").revisions).default; "ral".flags.distributive = true; @@ -40,7 +40,7 @@ "ghc-prim".revision = (((hackage."ghc-prim")."0.6.1").revisions).default; "wl-pprint-text".revision = (((hackage."wl-pprint-text")."1.2.0.1").revisions).default; "command".revision = (((hackage."command")."0.1.1").revisions).default; - "formatting".revision = (((hackage."formatting")."7.1.3").revisions).default; + "formatting".revision = (((hackage."formatting")."6.3.7").revisions).default; "attoparsec-iso8601".revision = (((hackage."attoparsec-iso8601")."1.0.2.0").revisions).default; "attoparsec-iso8601".flags.developer = false; "attoparsec-iso8601".flags.fast = false; @@ -85,6 +85,7 @@ "ansi-terminal".revision = (((hackage."ansi-terminal")."0.11").revisions).default; "ansi-terminal".flags.example = false; "unliftio-core".revision = (((hackage."unliftio-core")."0.2.0.1").revisions).default; + "strict-list".revision = (((hackage."strict-list")."0.1.6").revisions).default; "free".revision = (((hackage."free")."5.1.3").revisions).default; "exceptions".revision = (((hackage."exceptions")."0.10.4").revisions).default; "time-compat".revision = (((hackage."time-compat")."1.9.6.1").revisions).default; @@ -153,7 +154,6 @@ "wai-app-static".flags.print = false; "tree-diff".revision = (((hackage."tree-diff")."0.2.1").revisions).default; "http-types".revision = (((hackage."http-types")."0.12.3").revisions).default; - "Glob".revision = (((hackage."Glob")."0.10.1").revisions).default; "th-reify-many".revision = (((hackage."th-reify-many")."0.1.10").revisions).default; "streaming-bytestring".revision = (((hackage."streaming-bytestring")."0.2.1").revisions).default; "direct-sqlite".revision = (((hackage."direct-sqlite")."2.3.26").revisions).default; @@ -172,9 +172,6 @@ "protolude".revision = (((hackage."protolude")."0.3.0").revisions).default; "protolude".flags.dev = false; "process".revision = (((hackage."process")."1.6.9.0").revisions).default; - "criterion".revision = (((hackage."criterion")."1.5.11.0").revisions).default; - "criterion".flags.embed-data-files = false; - "criterion".flags.fast = false; "newtype-generics".revision = (((hackage."newtype-generics")."0.6").revisions).default; "half".revision = (((hackage."half")."0.3.1").revisions).default; "int-cast".revision = (((hackage."int-cast")."0.2.0.0").revisions).default; @@ -214,7 +211,6 @@ "aeson-qq".revision = (((hackage."aeson-qq")."0.8.4").revisions).default; "entropy".revision = (((hackage."entropy")."0.4.1.6").revisions).default; "entropy".flags.halvm = false; - "binary-orphans".revision = (((hackage."binary-orphans")."1.0.1").revisions).default; "text-conversions".revision = (((hackage."text-conversions")."0.3.1").revisions).default; "tls".revision = (((hackage."tls")."1.5.5").revisions).default; "tls".flags.compat = true; @@ -255,7 +251,6 @@ "base64-bytestring-type".flags.http-api-data = true; "beam-sqlite".revision = (((hackage."beam-sqlite")."0.5.1.0").revisions).default; "beam-sqlite".flags.werror = false; - "js-chart".revision = (((hackage."js-chart")."2.9.4.1").revisions).default; "vector-algorithms".revision = (((hackage."vector-algorithms")."0.8.0.4").revisions).default; "vector-algorithms".flags.unsafechecks = false; "vector-algorithms".flags.llvm = false; @@ -573,6 +568,7 @@ "strict".flags.assoc = true; "http-api-data".revision = (((hackage."http-api-data")."0.4.3").revisions).default; "http-api-data".flags.use-text-show = false; + "deque".revision = (((hackage."deque")."0.4.4").revisions).default; "attoparsec".revision = (((hackage."attoparsec")."0.13.2.5").revisions).default; "attoparsec".flags.developer = false; "persistent-template".revision = (((hackage."persistent-template")."2.12.0.0").revisions).default; @@ -591,8 +587,6 @@ "digest".flags.bytestring-in-base = false; "pem".revision = (((hackage."pem")."0.2.4").revisions).default; "file-embed".revision = (((hackage."file-embed")."0.0.15.0").revisions).default; - "double-conversion".revision = (((hackage."double-conversion")."2.0.2.0").revisions).default; - "double-conversion".flags.developer = false; "colour".revision = (((hackage."colour")."2.3.6").revisions).default; "syb".revision = (((hackage."syb")."0.7.2.1").revisions).default; "safe-exceptions".revision = (((hackage."safe-exceptions")."0.1.7.2").revisions).default; @@ -739,7 +733,9 @@ typed-protocols = ./.plan.nix/typed-protocols.nix; ouroboros-network-testing = ./.plan.nix/ouroboros-network-testing.nix; cardano-addresses = ./.plan.nix/cardano-addresses.nix; + set-algebra = ./.plan.nix/set-algebra.nix; servant-purescript = ./.plan.nix/servant-purescript.nix; + cardano-data = ./.plan.nix/cardano-data.nix; ouroboros-consensus-shelley = ./.plan.nix/ouroboros-consensus-shelley.nix; cardano-slotting = ./.plan.nix/cardano-slotting.nix; playground-common = ./.plan.nix/playground-common.nix; @@ -747,11 +743,9 @@ cardano-protocol-tpraos = ./.plan.nix/cardano-protocol-tpraos.nix; cardano-crypto-class = ./.plan.nix/cardano-crypto-class.nix; cardano-wallet = ./.plan.nix/cardano-wallet.nix; - lobemo-backend-monitoring = ./.plan.nix/lobemo-backend-monitoring.nix; tracer-transformers = ./.plan.nix/tracer-transformers.nix; plutus-tx-plugin = ./.plan.nix/plutus-tx-plugin.nix; measures = ./.plan.nix/measures.nix; - lobemo-scribe-systemd = ./.plan.nix/lobemo-scribe-systemd.nix; quickcheck-dynamic = ./.plan.nix/quickcheck-dynamic.nix; network-mux = ./.plan.nix/network-mux.nix; lobemo-backend-ekg = ./.plan.nix/lobemo-backend-ekg.nix; @@ -767,14 +761,15 @@ cardano-binary-test = ./.plan.nix/cardano-binary-test.nix; plutus-core = ./.plan.nix/plutus-core.nix; cardano-prelude-test = ./.plan.nix/cardano-prelude-test.nix; + ouroboros-consensus-protocol = ./.plan.nix/ouroboros-consensus-protocol.nix; plutus-pab = ./.plan.nix/plutus-pab.nix; typed-protocols-examples = ./.plan.nix/typed-protocols-examples.nix; - cardano-crypto-tests = ./.plan.nix/cardano-crypto-tests.nix; freer-extras = ./.plan.nix/freer-extras.nix; cardano-ledger-byron-test = ./.plan.nix/cardano-ledger-byron-test.nix; plutus-tx = ./.plan.nix/plutus-tx.nix; cardano-wallet-test-utils = ./.plan.nix/cardano-wallet-test-utils.nix; base-deriving-via = ./.plan.nix/base-deriving-via.nix; + strict-stm = ./.plan.nix/strict-stm.nix; non-integral = ./.plan.nix/non-integral.nix; plutus-contract = ./.plan.nix/plutus-contract.nix; iohk-monitoring = ./.plan.nix/iohk-monitoring.nix; @@ -782,7 +777,6 @@ cardano-crypto-test = ./.plan.nix/cardano-crypto-test.nix; web-ghc = ./.plan.nix/web-ghc.nix; cardano-ledger-byron = ./.plan.nix/cardano-ledger-byron.nix; - shelley-spec-ledger-test = ./.plan.nix/shelley-spec-ledger-test.nix; cardano-api = ./.plan.nix/cardano-api.nix; ouroboros-consensus = ./.plan.nix/ouroboros-consensus.nix; cardano-binary = ./.plan.nix/cardano-binary.nix; @@ -791,7 +785,7 @@ ntp-client = ./.plan.nix/ntp-client.nix; text-class = ./.plan.nix/text-class.nix; ouroboros-network-framework = ./.plan.nix/ouroboros-network-framework.nix; - lobemo-backend-aggregation = ./.plan.nix/lobemo-backend-aggregation.nix; + compact-map = ./.plan.nix/compact-map.nix; plutus-chain-index-core = ./.plan.nix/plutus-chain-index-core.nix; plutus-ledger-api = ./.plan.nix/plutus-ledger-api.nix; io-classes = ./.plan.nix/io-classes.nix; @@ -812,12 +806,10 @@ cardano-ledger-core = ./.plan.nix/cardano-ledger-core.nix; cardano-ledger-shelley-ma = ./.plan.nix/cardano-ledger-shelley-ma.nix; goblins = ./.plan.nix/goblins.nix; - lobemo-backend-trace-forwarder = ./.plan.nix/lobemo-backend-trace-forwarder.nix; cardano-addresses-cli = ./.plan.nix/cardano-addresses-cli.nix; prettyprinter-configurable = ./.plan.nix/prettyprinter-configurable.nix; cardano-numeric = ./.plan.nix/cardano-numeric.nix; cardano-crypto = ./.plan.nix/cardano-crypto.nix; - shelley-spec-ledger = ./.plan.nix/shelley-spec-ledger.nix; strict-containers = ./.plan.nix/strict-containers.nix; word-array = ./.plan.nix/word-array.nix; }; @@ -852,7 +844,9 @@ "cardano-addresses" = { flags = { "release" = lib.mkOverride 900 false; }; }; + "set-algebra" = { flags = {}; }; "servant-purescript" = { flags = {}; }; + "cardano-data" = { flags = {}; }; "ouroboros-consensus-shelley" = { flags = { "asserts" = lib.mkOverride 900 false; }; }; @@ -870,7 +864,6 @@ "cardano-wallet" = { flags = { "release" = lib.mkOverride 900 false; }; }; - "lobemo-backend-monitoring" = { flags = {}; }; "tracer-transformers" = { flags = {}; }; "plutus-tx-plugin" = { flags = { "use-ghc-stub" = lib.mkOverride 900 true; }; @@ -878,7 +871,6 @@ "measures" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-scribe-systemd" = { flags = {}; }; "quickcheck-dynamic" = { flags = {}; }; "network-mux" = { flags = { @@ -916,13 +908,13 @@ "cardano-prelude-test" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "ouroboros-consensus-protocol" = { + flags = { "asserts" = lib.mkOverride 900 false; }; + }; "plutus-pab" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; }; "typed-protocols-examples" = { flags = {}; }; - "cardano-crypto-tests" = { - flags = { "development" = lib.mkOverride 900 false; }; - }; "freer-extras" = { flags = {}; }; "cardano-ledger-byron-test" = { flags = {}; }; "plutus-tx" = { flags = {}; }; @@ -932,6 +924,12 @@ "base-deriving-via" = { flags = { "development" = lib.mkOverride 900 false; }; }; + "strict-stm" = { + flags = { + "checktvarinvariant" = lib.mkOverride 900 false; + "asserts" = lib.mkOverride 900 false; + }; + }; "non-integral" = { flags = {}; }; "plutus-contract" = { flags = { "defer-plugin-errors" = lib.mkOverride 900 false; }; @@ -950,7 +948,6 @@ "cardano-ledger-byron" = { flags = { "test-normal-form" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger-test" = { flags = {}; }; "cardano-api" = { flags = {}; }; "ouroboros-consensus" = { flags = { "asserts" = lib.mkOverride 900 false; }; @@ -967,7 +964,7 @@ "ntp-client" = { flags = { "demo" = lib.mkOverride 900 true; }; }; "text-class" = { flags = { "release" = lib.mkOverride 900 false; }; }; "ouroboros-network-framework" = { flags = {}; }; - "lobemo-backend-aggregation" = { flags = {}; }; + "compact-map" = { flags = {}; }; "plutus-chain-index-core" = { flags = {}; }; "plutus-ledger-api" = { flags = {}; }; "io-classes" = { @@ -1005,7 +1002,6 @@ "goblins" = { flags = { "development" = lib.mkOverride 900 false; }; }; - "lobemo-backend-trace-forwarder" = { flags = {}; }; "cardano-addresses-cli" = { flags = { "release" = lib.mkOverride 900 false; }; }; @@ -1019,7 +1015,6 @@ "golden-tests" = lib.mkOverride 900 false; }; }; - "shelley-spec-ledger" = { flags = {}; }; "strict-containers" = { flags = { "development" = lib.mkOverride 900 false; }; }; @@ -1049,6 +1044,7 @@ "semigroupoids".components.setup.planned = lib.mkOverride 900 true; "row-types".components.library.planned = lib.mkOverride 900 true; "streaming".components.library.planned = lib.mkOverride 900 true; + "strict-stm".components.library.planned = lib.mkOverride 900 true; "containers".components.library.planned = lib.mkOverride 900 true; "lens".components.library.planned = lib.mkOverride 900 true; "io-sim".components.library.planned = lib.mkOverride 900 true; @@ -1134,7 +1130,6 @@ "lzma".components.library.planned = lib.mkOverride 900 true; "extra".components.library.planned = lib.mkOverride 900 true; "base-compat-batteries".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-trace-forwarder".components.library.planned = lib.mkOverride 900 true; "hsc2hs".components.exes."hsc2hs".planned = lib.mkOverride 900 true; "word-array".components.library.planned = lib.mkOverride 900 true; "unix-time".components.library.planned = lib.mkOverride 900 true; @@ -1148,7 +1143,6 @@ "warp-tls".components.library.planned = lib.mkOverride 900 true; "mime-types".components.library.planned = lib.mkOverride 900 true; "prettyprinter-configurable".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger".components.library.planned = lib.mkOverride 900 true; "testing-type-modifiers".components.library.planned = lib.mkOverride 900 true; "prometheus".components.library.planned = lib.mkOverride 900 true; "bech32".components.exes."bech32".planned = lib.mkOverride 900 true; @@ -1194,6 +1188,7 @@ "cardano-prelude-test".components.library.planned = lib.mkOverride 900 true; "base64-bytestring".components.library.planned = lib.mkOverride 900 true; "cardano-binary-test".components.library.planned = lib.mkOverride 900 true; + "ouroboros-consensus-protocol".components.library.planned = lib.mkOverride 900 true; "gray-code".components.library.planned = lib.mkOverride 900 true; "regex-base".components.library.planned = lib.mkOverride 900 true; "asn1-parse".components.library.planned = lib.mkOverride 900 true; @@ -1203,6 +1198,7 @@ "adjunctions".components.library.planned = lib.mkOverride 900 true; "http-api-data".components.library.planned = lib.mkOverride 900 true; "plutus-chain-index".components.library.planned = lib.mkOverride 900 true; + "deque".components.library.planned = lib.mkOverride 900 true; "plutus-ledger-constraints".components.library.planned = lib.mkOverride 900 true; "pem".components.library.planned = lib.mkOverride 900 true; "strict-non-empty-containers".components.library.planned = lib.mkOverride 900 true; @@ -1214,7 +1210,6 @@ "cardano-ledger-shelley-test".components.library.planned = lib.mkOverride 900 true; "persistent-template".components.library.planned = lib.mkOverride 900 true; "generic-lens".components.library.planned = lib.mkOverride 900 true; - "double-conversion".components.library.planned = lib.mkOverride 900 true; "file-embed".components.library.planned = lib.mkOverride 900 true; "colour".components.library.planned = lib.mkOverride 900 true; "safe-exceptions".components.library.planned = lib.mkOverride 900 true; @@ -1261,11 +1256,9 @@ "lzma-clib".components.library.planned = lib.mkOverride 900 true; "tls".components.library.planned = lib.mkOverride 900 true; "process".components.library.planned = lib.mkOverride 900 true; - "criterion".components.library.planned = lib.mkOverride 900 true; "half".components.library.planned = lib.mkOverride 900 true; "contra-tracer".components.library.planned = lib.mkOverride 900 true; "newtype-generics".components.library.planned = lib.mkOverride 900 true; - "binary-orphans".components.library.planned = lib.mkOverride 900 true; "text-conversions".components.library.planned = lib.mkOverride 900 true; "servant-client-core".components.library.planned = lib.mkOverride 900 true; "aeson-qq".components.library.planned = lib.mkOverride 900 true; @@ -1281,8 +1274,6 @@ "abstract-par".components.library.planned = lib.mkOverride 900 true; "async".components.library.planned = lib.mkOverride 900 true; "protolude".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-monitoring".components.library.planned = lib.mkOverride 900 true; - "Glob".components.library.planned = lib.mkOverride 900 true; "http-types".components.library.planned = lib.mkOverride 900 true; "conduit".components.library.planned = lib.mkOverride 900 true; "data-default-instances-old-locale".components.library.planned = lib.mkOverride 900 true; @@ -1325,7 +1316,6 @@ "yaml".components.library.planned = lib.mkOverride 900 true; "time-locale-compat".components.library.planned = lib.mkOverride 900 true; "jwt".components.library.planned = lib.mkOverride 900 true; - "shelley-spec-ledger-test".components.library.planned = lib.mkOverride 900 true; "ekg".components.library.planned = lib.mkOverride 900 true; "web-ghc".components.library.planned = lib.mkOverride 900 true; "th-lift-instances".components.library.planned = lib.mkOverride 900 true; @@ -1337,7 +1327,6 @@ "servant".components.library.planned = lib.mkOverride 900 true; "ListLike".components.library.planned = lib.mkOverride 900 true; "conduit-extra".components.library.planned = lib.mkOverride 900 true; - "criterion".components.exes."criterion-report".planned = lib.mkOverride 900 true; "cardano-crypto-wrapper".components.library.planned = lib.mkOverride 900 true; "ansi-terminal".components.library.planned = lib.mkOverride 900 true; "typed-protocols".components.library.planned = lib.mkOverride 900 true; @@ -1360,6 +1349,7 @@ "plutus-pab-executables".components.exes."plutus-pab-nami-demo".planned = lib.mkOverride 900 true; "servant-blaze".components.library.planned = lib.mkOverride 900 true; "ouroboros-network-testing".components.library.planned = lib.mkOverride 900 true; + "strict-list".components.library.planned = lib.mkOverride 900 true; "free".components.library.planned = lib.mkOverride 900 true; "unliftio-core".components.library.planned = lib.mkOverride 900 true; "servant-websockets".components.exes."websocket-stream".planned = lib.mkOverride 900 true; @@ -1418,7 +1408,6 @@ "servant-websockets".components.library.planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."sync-client".planned = lib.mkOverride 900 true; "aeson-casing".components.library.planned = lib.mkOverride 900 true; - "cardano-crypto-tests".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."cardano-wallet".planned = lib.mkOverride 900 true; "plutus-pab-executables".components.exes."plutus-pab-nami-demo-generator".planned = lib.mkOverride 900 true; "servant-foreign".components.library.planned = lib.mkOverride 900 true; @@ -1509,7 +1498,6 @@ "th-extras".components.library.planned = lib.mkOverride 900 true; "quickcheck-io".components.library.planned = lib.mkOverride 900 true; "beam-sqlite".components.library.planned = lib.mkOverride 900 true; - "js-chart".components.library.planned = lib.mkOverride 900 true; "vector-algorithms".components.library.planned = lib.mkOverride 900 true; "plutus-playground-server".components.sublibs."plutus-playground-usecases".planned = lib.mkOverride 900 true; "megaparsec".components.library.planned = lib.mkOverride 900 true; @@ -1550,7 +1538,6 @@ "temporary".components.library.planned = lib.mkOverride 900 true; "dom-lt".components.library.planned = lib.mkOverride 900 true; "hspec-core".components.library.planned = lib.mkOverride 900 true; - "lobemo-scribe-systemd".components.library.planned = lib.mkOverride 900 true; "hedgehog".components.library.planned = lib.mkOverride 900 true; "system-filepath".components.setup.planned = lib.mkOverride 900 true; "measures".components.library.planned = lib.mkOverride 900 true; @@ -1564,6 +1551,7 @@ "splitmix".components.library.planned = lib.mkOverride 900 true; "generic-lens-core".components.library.planned = lib.mkOverride 900 true; "websockets".components.library.planned = lib.mkOverride 900 true; + "compact-map".components.library.planned = lib.mkOverride 900 true; "x509-store".components.library.planned = lib.mkOverride 900 true; "aeson".components.library.planned = lib.mkOverride 900 true; "th-lift".components.library.planned = lib.mkOverride 900 true; @@ -1581,7 +1569,6 @@ "time-out".components.library.planned = lib.mkOverride 900 true; "typerep-map".components.library.planned = lib.mkOverride 900 true; "quickcheck-classes".components.library.planned = lib.mkOverride 900 true; - "lobemo-backend-aggregation".components.library.planned = lib.mkOverride 900 true; "cardano-wallet".components.exes."local-cluster".planned = lib.mkOverride 900 true; "data-default".components.library.planned = lib.mkOverride 900 true; "text-class".components.library.planned = lib.mkOverride 900 true; @@ -1598,6 +1585,7 @@ "pqueue".components.library.planned = lib.mkOverride 900 true; "playground-common".components.library.planned = lib.mkOverride 900 true; "lattices".components.library.planned = lib.mkOverride 900 true; + "cardano-data".components.library.planned = lib.mkOverride 900 true; "fin".components.library.planned = lib.mkOverride 900 true; "base-orphans".components.library.planned = lib.mkOverride 900 true; "casing".components.library.planned = lib.mkOverride 900 true; @@ -1617,6 +1605,7 @@ "cardano-wallet-launcher".components.library.planned = lib.mkOverride 900 true; "plutus-core".components.sublibs."index-envs".planned = lib.mkOverride 900 true; "transformers-compat".components.library.planned = lib.mkOverride 900 true; + "set-algebra".components.library.planned = lib.mkOverride 900 true; "fmlist".components.library.planned = lib.mkOverride 900 true; "memory".components.library.planned = lib.mkOverride 900 true; "cardano-protocol-tpraos".components.library.planned = lib.mkOverride 900 true;