Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCP-1066 reorganizing plc-agda #2254

Merged
merged 13 commits into from
Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages: plutus-core
plutus-contract
deployment-server
iots-export
metatheory
plutus-metatheory
prettyprinter-configurable
doc

Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ in rec {
projectPackages =
pkgs.haskell-nix.haskellLib.selectProjectPackages packages
# Need to list this manually to work around https://github.com/input-output-hk/haskell.nix/issues/464
// { inherit (packages) plc-agda; };
// { inherit (packages) plutus-metatheory; };

muslProject = import ./nix/haskell.nix { inherit (pkgsMusl) lib stdenv pkgs haskell-nix buildPackages; inherit agdaPackages checkMaterialization; };
# All the packages defined by our project, built for musl
Expand Down
18 changes: 0 additions & 18 deletions metatheory/Setup.hs

This file was deleted.

1,549 changes: 0 additions & 1,549 deletions metatheory/plc-agda.cabal

This file was deleted.

19 changes: 10 additions & 9 deletions nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,19 @@ let
# In this case we can just propagate the native dependencies for the build of the test executable,
# which are actually set up right (we have a build-tool-depends on the executable we need)
# I'm slightly surprised this works, hooray for laziness!
plc-agda.components.tests.test-plc-agda.preCheck = ''
PATH=${lib.makeBinPath project.hsPkgs.plc-agda.components.tests.test-plc-agda.executableToolDepends }:$PATH
plutus-metatheory.components.tests.test1.preCheck = ''
PATH=${lib.makeBinPath project.hsPkgs.plutus-metatheory.components.tests.test1.executableToolDepends }:$PATH
'';
# FIXME: Somehow this is broken even with setting the path up as above
plc-agda.components.tests.test2-plc-agda.doCheck = false;
plutus-metatheory.components.tests.test2.doCheck = false;

# plc-agda needs agda with the stdlib around for the custom setup
# plutus-metatheory needs agda with the stdlib around for the custom setup
# I can't figure out a way to apply this as a blanket change for all the components in the package, oh well
plc-agda.components.exes.plc-agda.build-tools = [ agdaWithStdlib ];
plc-agda.components.tests.test-plc-agda.build-tools = [ agdaWithStdlib ];
plc-agda.components.tests.test2-plc-agda.build-tools = [ agdaWithStdlib ];
plc-agda.components.tests.test3-plc-agda.build-tools = [ agdaWithStdlib ];
plutus-metatheory.components.library.build-tools = [ agdaWithStdlib ];
plutus-metatheory.components.exes.plc-agda.build-tools = [ agdaWithStdlib ];
plutus-metatheory.components.tests.test1.build-tools = [ agdaWithStdlib ];
plutus-metatheory.components.tests.test2.build-tools = [ agdaWithStdlib ];
plutus-metatheory.components.tests.test3.build-tools = [ agdaWithStdlib ];

# Relies on cabal-doctest, just turn it off in the Nix build
prettyprinter-configurable.components.tests.prettyprinter-configurable-doctest.buildable = lib.mkForce false;
Expand Down Expand Up @@ -115,7 +116,7 @@ let
marlowe-playground-server.package.ghcOptions = "-Werror";
playground-common.package.ghcOptions = "-Werror";
# FIXME: has warnings
#plc-agda.package.ghcOptions = "-Werror";
#plutus-metatheory.package.ghcOptions = "-Werror";
plutus-book.package.ghcOptions = "-Werror";
plutus-contract.package.ghcOptions = "-Werror";
plutus-ledger.package.ghcOptions = "-Werror";
Expand Down
2 changes: 1 addition & 1 deletion nix/stack.materialized/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading