Skip to content
This repository was archived by the owner on Dec 2, 2024. It is now read-only.

Commit d37997b

Browse files
authored
PLT-5533 Remove Marconi from plutus-apps (#1105)
1 parent 14ae5a4 commit d37997b

File tree

91 files changed

+84
-13861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+84
-13861
lines changed

__std__/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A description of the arguments follows:
2121
- `inputs.self`\
2222
This is a path pointing to the top-level of the repository.\
2323
It is the *only* way to reference source files inside the repository.\
24-
Example: `{ src = inputs.self + /marconi-core; }`
24+
Example: `{ src = inputs.self + /plutus-ledger; }`
2525

2626
- `inputs.cells`\
2727
Provides access to all cells.\
@@ -75,11 +75,11 @@ While these blocks are not exposed directly to the flake (they are not "harveste
7575
`nix (develop|build|run) .#<system>.<cell>.<cell-block>.<valid.attr.path>`
7676

7777
For example:
78-
`nix build .#x86_64-linux.plutus-apps.library.plutus-apps-project.hsPkgs.marconi-sidechain.components.exes.marconi-sidechain`
78+
`nix build .#x86_64-linux.plutus-apps.library.plutus-apps-project.hsPkgs.plutus-chain-index.components.exes.plutus-chain-index`
7979

8080
## Reference example
8181

82-
As an example, consider the file `./__std__/cells/plutus-apps/packages/marconi-chain-index.nix`:
82+
As an example, consider the file `./__std__/cells/plutus-apps/packages/plutus-chain-index.nix`:
8383

8484
- `./__std__/cells` is the `cellsFrom` value in `flake.nix`
8585
- `/plutus-apps` is the cell name
@@ -88,11 +88,11 @@ As an example, consider the file `./__std__/cells/plutus-apps/packages/marconi-c
8888
- `/packages` is the cell block name
8989
- `/packages/*` are accessible via `cell.packages.*` (while inside `cells/plutus-apps`)
9090
- `/packages/*` are accessible via `inputs.cells.plutus-apps.packages.*` (everywhere)
91-
- `/marconi-chain-index.nix` contains a *single derivation*
92-
- `marconi-chain-index` is the name of the flake fragment
93-
- A derivation named `marconi-chain-index` is accessible via `cell.packages.marconi-chain-index` (while inside `cells/plutus-apps`)
94-
- And also accessible via `inputs.cells.plutus-apps.packages.marconi-chain-index` (everywhere)
95-
- And also buildable via `nix build .#marconi-chain-index`
91+
- `/plutus-chain-index.nix` contains a *single derivation*
92+
- `plutus-chain-index` is the name of the flake fragment
93+
- A derivation named `plutus-chain-index` is accessible via `cell.packages.plutus-chain-index` (while inside `cells/plutus-apps`)
94+
- And also accessible via `inputs.cells.plutus-apps.packages.plutus-chain-index` (everywhere)
95+
- And also buildable via `nix build .#plutus-chain-index`
9696

9797
As another example, consider the file `./__std__/cells/plutus-apps/library/default.nix`
9898

__std__/cells/plutus-apps/library/make-plutus-apps-project.nix

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ let
5151
freer-extras.package.buildable = false;
5252
cardano-node-emulator.package.buildable = false;
5353
cardano-node-socket-emulator.package.buildable = false;
54-
cardano-streaming.package.buildable = false;
55-
marconi-chain-index.package.buildable = false;
56-
marconi-core.package.buildable = false;
5754
pab-blockfrost.package.buildable = false;
5855
plutus-benchmark.package.buildable = false;
5956
plutus-chain-index.package.buildable = false;
@@ -113,29 +110,6 @@ let
113110
})
114111
({ pkgs, config, ... }: {
115112
packages = {
116-
marconi-core.doHaddock = deferPluginErrors;
117-
marconi-core.flags.defer-plugin-errors = deferPluginErrors;
118-
119-
marconi-chain-index.doHaddock = deferPluginErrors;
120-
marconi-chain-index.flags.defer-plugin-errors = deferPluginErrors;
121-
122-
# The lines `export CARDANO_NODE=...` and `export CARDANO_CLI=...`
123-
# is necessary to prevent the error
124-
# `../dist-newstyle/cache/plan.json: openBinaryFile: does not exist (No such file or directory)`.
125-
# See https://github.com/input-output-hk/cardano-node/issues/4194.
126-
#
127-
# The line 'export CARDANO_NODE_SRC=...' is used to specify the
128-
# root folder used to fetch the `configuration.yaml` file (in
129-
# plutus-apps, it's currently in the
130-
# `configuration/defaults/byron-mainnet` directory.
131-
# Else, we'll get the error
132-
# `/nix/store/ls0ky8x6zi3fkxrv7n4vs4x9czcqh1pb-plutus-apps/marconi/test/configuration.yaml: openFile: does not exist (No such file or directory)`
133-
marconi-chain-index.preCheck = "
134-
export CARDANO_CLI=${config.hsPkgs.cardano-cli.components.exes.cardano-cli}/bin/cardano-cli${pkgs.stdenv.hostPlatform.extensions.executable}
135-
export CARDANO_NODE=${config.hsPkgs.cardano-node.components.exes.cardano-node}/bin/cardano-node${pkgs.stdenv.hostPlatform.extensions.executable}
136-
export CARDANO_NODE_SRC=${src}
137-
";
138-
139113
plutus-contract.doHaddock = deferPluginErrors;
140114
plutus-contract.flags.defer-plugin-errors = deferPluginErrors;
141115

@@ -174,9 +148,6 @@ let
174148
cardano-wallet.doHaddock = false;
175149

176150
# Werror everything. This is a pain, see https://github.com/input-output-hk/haskell.nix/issues/519
177-
cardano-streaming.ghcOptions = [ "-Werror" ];
178-
marconi-chain-index.ghcOptions = [ "-Werror" ];
179-
marconi-core.ghcOptions = [ "-Werror" ];
180151
pab-blockfrost.ghcOptions = [ "-Werror" ];
181152
plutus-chain-index.ghcOptions = [ "-Werror" ];
182153
plutus-chain-index-core.ghcOptions = [ "-Werror" ];

__std__/cells/plutus-apps/packages/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454

5555
plutus-chain-index = import ./plutus-chain-index.nix block;
5656

57-
marconi-chain-index = import ./marconi-chain-index.nix block;
58-
5957
plutus-playground-client-entrypoint = import ./plutus-playground-client-entrypoint.nix block;
6058

6159
create-script-context = import ./create-script-context.nix block;

__std__/cells/plutus-apps/packages/marconi-chain-index.nix

Lines changed: 0 additions & 4 deletions
This file was deleted.

cabal.project

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ index-state:
2020

2121
packages: cardano-node-emulator
2222
cardano-node-socket-emulator
23-
cardano-streaming
2423
doc
2524
freer-extras
26-
marconi-chain-index
27-
marconi-core
2825
pab-blockfrost
2926
plutus-chain-index
3027
plutus-chain-index-core
@@ -204,3 +201,12 @@ source-repository-package
204201
libs/small-steps
205202
libs/small-steps-test
206203
libs/non-integral
204+
205+
source-repository-package
206+
type: git
207+
location: https://github.com/input-output-hk/marconi
208+
tag: 7285a3bc1ae53bf672c7cc2359210c6c29fbce44
209+
subdir:
210+
cardano-streaming
211+
marconi-chain-index
212+
marconi-core

cardano-streaming/CHANGELOG.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

cardano-streaming/NOTICE

Lines changed: 0 additions & 14 deletions
This file was deleted.

cardano-streaming/README.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

cardano-streaming/cardano-streaming.cabal

Lines changed: 0 additions & 120 deletions
This file was deleted.

cardano-streaming/changelog.d/scriv.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)